Update dependency posthog-js to v1.438.24

2026-11-13 01:12:29 +00:00 · 2026-11-01 01:02:48 +00:00
186 changed files with 2647 additions and 10628 deletions
@@ -14,7 +14,7 @@ permissions:
 jobs:
  prevent-blocked:
    name: Prevent blocked
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      pull-requests: read
    steps:
@@ -17,7 +17,7 @@ env:
 jobs:
  build_and_deploy:
    name: Build & publish docker
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      contents: write # required to upload release asset
      packages: write # needed for publishing packages to GHCR
@@ -29,7 +29,7 @@ on:
 jobs:
  build:
    name: Build Element Call
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
@@ -25,7 +25,7 @@ jobs:
    # Deploy main branch to call.element.dev after build completes
    if: github.ref == 'refs/heads/main'
    needs: build_full_element_call
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Deploy to call.element.dev
        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
@@ -92,7 +92,7 @@ jobs:
  build_storybook:
    name: Build Storybook
    if: contains(github.event.pull_request.labels.*.name, 'storybook build')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
@@ -13,7 +13,7 @@ permissions:

 jobs:
  pr-changelog-label:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # 2.2.2
        with:
@@ -13,7 +13,7 @@ jobs:
    name: Review
    # Only run on labelling and skip forks.
    if: github.event.label.name == 'Claude-Review' && github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
@@ -32,7 +32,7 @@ on:

 jobs:
  deploy:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      deployments: write
    environment: Netlify
@@ -10,7 +10,7 @@ on:
 jobs:
  lint:
    name: Lint, format & type check
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
@@ -17,7 +17,7 @@ jobs:
      github.event.workflow_run.conclusion == 'success' &&
      github.event.workflow_run.event == 'pull_request' &&
      github.event.workflow_run.head_repository.full_name == github.repository
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      pr_number: ${{ steps.prdetails.outputs.pr_id }}
      pr_data_json: ${{ steps.prdetails.outputs.data }}
@@ -17,7 +17,7 @@ permissions: {}
 jobs:
  versioning:
    name: Versioning
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      DRY_RUN: ${{ steps.dry_run.outputs.DRY_RUN }}
      PREFIXED_VERSION: ${{ steps.prefixed_version.outputs.PREFIXED_VERSION }}
@@ -59,7 +59,7 @@ jobs:
  publish_npm:
    needs: versioning
    name: Publish NPM
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      ARTIFACT_VERSION: ${{ steps.artifact_version.outputs.ARTIFACT_VERSION }}
    permissions:
@@ -111,7 +111,7 @@ jobs:
    needs: [versioning, publish_npm]
    if: ${{ needs.versioning.outputs.DRY_RUN == 'false' }}
    name: Update release notes
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    # Shared with publish-embedded-packages.yaml, which appends to the same release: two
    # appends at once would each write back the body without the other's section
    concurrency:
@@ -14,7 +14,7 @@ on:
 jobs:
  versioning:
    name: Versioning
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      DRY_RUN: ${{ steps.dry_run.outputs.DRY_RUN }}
      PREFIXED_VERSION: ${{ steps.prefixed_version.outputs.PREFIXED_VERSION }}
@@ -76,7 +76,7 @@ jobs:
    needs: [build_element_call, versioning]
    if: always()
    name: Publish tarball
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      contents: write # required to upload release asset
    steps:
@@ -107,7 +107,7 @@ jobs:
    needs: [build_element_call, versioning]
    if: always()
    name: Publish NPM
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      ARTIFACT_VERSION: ${{ steps.artifact_version.outputs.ARTIFACT_VERSION }}
    permissions:
@@ -152,7 +152,7 @@ jobs:
    needs: [build_element_call, versioning]
    if: always()
    name: Publish Android AAR
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      ARTIFACT_VERSION: ${{ steps.artifact_version.outputs.ARTIFACT_VERSION }}
    permissions:
@@ -212,7 +212,7 @@ jobs:
    needs: [build_element_call, versioning]
    if: always()
    name: Publish SwiftPM Library
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    outputs:
      ARTIFACT_VERSION: ${{ steps.artifact_version.outputs.ARTIFACT_VERSION }}
    permissions:
@@ -282,7 +282,7 @@ jobs:
    needs: [versioning, publish_npm, publish_android, publish_ios]
    if: always()
    name: Update release notes
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    # Shared with publish-component.yaml, which appends to the same release: two appends
    # at once would each write back the body without the other's section
    concurrency:
@@ -23,7 +23,7 @@ jobs:
    needs: build_element_call
    if: always()
    name: Publish tarball
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      contents: write # required to upload release asset
      packages: write
@@ -68,7 +68,7 @@ jobs:
  add_docker_release_note:
    needs: publish_docker
    name: Add docker release note
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Add release note
        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
@@ -25,7 +25,7 @@ on:
 jobs:
  vitest:
    name: Run unit tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
@@ -71,27 +71,10 @@ jobs:
          flags: unittests
          fail_ci_if_error: true
  playwright:
-    name: Run end-to-end tests (${{ matrix.part }})
+    name: Run end-to-end tests
    if: ${{ !inputs.disable_e2e_tests }}
    timeout-minutes: 60
-    runs-on: ubuntu-24.04
-    # We manually shard the tests across runners. Playwright's own shards cut
-    # the list of tests into equal counts in file order, which would leave the
-    # widget suite, the slowest tests by far, together at the end.
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - part: chromium-1
-            args: --project=chromium --shard=1/2
-          - part: chromium-2
-            args: --project=chromium --shard=2/2
-          - part: widget-1
-            args: --project=widget --shard=1/2
-          - part: widget-2
-            args: --project=widget --shard=2/2
-          - part: firefox-mobile
-            args: --project=firefox --project=mobile
+    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
@@ -124,64 +107,17 @@ jobs:
        run: pnpm playwright install --with-deps
      - name: Run backend components
        run: |
-          # Make sure the directory for the embedded build exists as Docker might
-          # create it with wrong access rights otherwise.
-          mkdir -p embedded/web/dist
          docker compose -f docker-compose-dev.yml -f docker-compose-playwright.yml pull
          docker compose -f docker-compose-dev.yml -f docker-compose-playwright.yml up -d
          docker ps
      - name: Run Playwright tests
        env:
          USE_DOCKER: 1
-          ARGS: ${{ matrix.args }}
-        # Unquoted on purpose: the part's arguments are several words
-        run: pnpm exec playwright test $ARGS
+        run: pnpm exec playwright test
      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        if: ${{ !cancelled() }}
-        with:
-          name: blob-report-${{ matrix.part }}
-          path: blob-report
-          if-no-files-found: error
-          # Only read by the merge below.
-          retention-days: 1
-
-  e2e_report:
-    # Combines the blobs into a single HTML report and blocks PRs on failure.
-    name: Run end-to-end tests
-    needs: playwright
-    if: ${{ always() && !inputs.disable_e2e_tests }}
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-        with:
-          # Inside a called workflow, github.repository is the caller so we need to make sure to still check out the EC repo here.
-          repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-call' || github.repository }}
-          persist-credentials: false
-      - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          cache: "pnpm"
-          node-version-file: ".node-version"
-      - name: Install dependencies
-        run: scripts/layered.sh --ignore-pnpmfile
-        env:
-          PR_HEAD_REPO_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
-          JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-      - name: Download the parts' reports
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
-        with:
-          pattern: blob-report-*
-          path: all-blob-reports
-          merge-multiple: true
-      - name: Merge into one HTML report
-        run: pnpm exec playwright merge-reports --reporter html ./all-blob-reports
-      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: html-report
          path: playwright-report
          if-no-files-found: error
          retention-days: 4
-      - name: Fail on a failed part
-        if: ${{ needs.playwright.result != 'success' }}
-        run: exit 1
@@ -7,7 +7,7 @@ on:

 jobs:
  download:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      contents: read

@@ -8,7 +8,7 @@ on:

 jobs:
  upload:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      contents: read

@@ -10,7 +10,7 @@ permissions: {}
 jobs:
  zizmor:
    name: Run zizmor 🌈
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files.
    steps:
@@ -221,68 +221,119 @@ See also:

 - [Developing with linked packages](./docs/linking.md)

-#### Element Call as a component
+#### Element Call as a component (experimental)

-Element Call can be rendered inside another React app instead of an iframe.
-The host supplies its own Matrix client, and the call stays inside the element
-it is mounted in.
+Element Call can also be embedded directly into another React application
+rather than being loaded in an iframe as a widget. `pnpm build:component`
+builds it as a library into `component/dist` (the bundle, its stylesheet and
+type declarations), and

-##### Install
+```sh
+pnpm dev:component
+```
+
+serves a harness on port 3001 that stands in for such an application: it signs
+in twice against the development backend and shows two calls side by side, in
+resizable boxes, with page furniture of its own around them. Use it to see how
+Element Call behaves when it does not own the page — the size it is given,
+whether it stays inside its container, and what it says to its host, which is
+logged along the bottom. The harness is served with the same development
+certificate as the app, so unless the development CA is trusted, the browser
+needs a certificate exception for `https://localhost:3001` as well (see the
+note under [Backend](#backend)). It reads the same `public/config.json` as
+`pnpm dev` if one exists, and runs with Element Call's defaults otherwise.
+
+The call lays itself out for the size of the element it is mounted in, not the
+window: a host that shrinks the container to a corner of its page gets the
+picture-in-picture layout, just as a host that shrank the whole iframe used to.
+The breakpoints in the stylesheets the component uses are
+`@container element-call` queries against its root element for the same reason;
+for the standalone app the root is the page, so they mean what the media queries
+they replaced did. (The standalone-only views, such as the home and login pages,
+still use plain media queries, since the component never shows them.)
+
+The component's stylesheet is confined to the element it is mounted in: the
+build rewrites every selector so that it matches only Element Call's root or
+what is inside it, with `html`, `body` and `:root` standing for that root (see
+`component/build/scopeStylesToRoot.ts`). A host's own page keeps its styles,
+and Element Call brings its own fonts and design tokens along.
+
+The component speaks every language the app does. English is bundled in; the
+other locales are split into chunks the host's bundler loads the first time
+they are needed. It starts in the browser's language, and follows the host's
+own language setting through the `language` prop (`supportedLanguages` lists
+the tags it accepts, and anything else falls back to its base language or to
+English). The `theme` prop works the same way and takes the same values as the
+widget's `theme` URL parameter: `light`, `dark`, `light-high-contrast` or
+`dark-high-contrast`. Both can change while a call is running without
+disturbing it.
+
+A host must call and await `initializeElementCall(config)` once before
+rendering the component: it loads the `Intl` polyfills, applies the
+deployment-wide `config.json`-style configuration and sets up translations.
+The component itself takes the host's `client` and the `roomId` to call in, an
+`intent` saying what the user asked for (which decides whether to show the
+lobby, ring, and so on), an optional `config` overriding what the intent
+implies, and an optional `hostBridge` through which Element Call tells the host
+that the user has joined or hung up, that it wants to stay on screen, and so
+on. The host makes its own requests (`join`, `hangUp`, `setDeviceMute`) through
+the handle exposed on `ref`. The full API is documented in the type declarations
+(`component/index.tsx` and `component/host.ts`).
+
+A few things differ from the widget on purpose: the component draws a solid
+background rather than a gradient unless told otherwise, never offers to edit
+the user's profile (the account is the host's), scopes its keyboard shortcuts to
+its own root element so that several instances can share a page, and only shows
+its own post-call and error screens when the host has not supplied a `close()`
+callback; with one, it asks the host to unmount it instead. The
+[global JS controls](./docs/controls.md) on `window` are unchanged and remain
+page-wide, so with several instances on one page they apply to all of them.
+
+Each release publishes the package to npm, with the same version as the release:

 ```sh
 npm install @element-hq/element-call-component
 ```

-Releases publish the package with the same version as Element Call. For an
-unreleased commit, depend on this repository directly:
+To use an unreleased commit, a host can instead install it as a git dependency
+on the `component` directory of this repository,

 ```json
 "@element-hq/element-call-component": "github:element-hq/element-call#main&path:/component"
 ```

-This builds on install, so the host needs pnpm (via Corepack) and must allow
-the build (`allowBuilds` in its `pnpm-workspace.yaml`).
+whose `prepare` script runs the build on install. That build needs pnpm (via
+Corepack) on the host's machine, runs a full `pnpm install` of this repository,
+since it inherits the `--max-old-space-size` setting of
+the app build; the host's pnpm also has to allow it to run at all
+(`allowBuilds` in its `pnpm-workspace.yaml`). Note that `component/` is a pnpm
+project of its own for this reason, so pnpm commands run from inside that
+directory target it rather than the repository; run them from the repository
+root. The host imports the component from
+`@element-hq/element-call-component` and the stylesheet from
+`@element-hq/element-call-component/style.css`, and has to provide `react`,
+`react-dom`, `matrix-js-sdk`, `@vector-im/compound-web` and
+`@vector-im/compound-design-tokens` itself, since the bundle leaves them
+external.
+Compound's stylesheet are the host's to load too: the component shares
+the host's copy of Compound, (required for example for tooltips)

-##### Use
+The component is large, and a host will usually load it lazily, only once a
+call is shown. Everything a host needs in order to talk about a call before
+then is also exported
+from `@element-hq/element-call-component/api` (a small entry point that does not
+load the component).

-1. Provide the externals yourself: `react`, `react-dom`, `matrix-js-sdk`,
-   `@vector-im/compound-web`, `@vector-im/compound-design-tokens`, and
-   Compound's stylesheet.
-2. Import `@element-hq/element-call-component/style.css`.
-3. Await `initializeElementCall(config)` once before rendering.
-4. Render the component with `client`, `roomId` and an `intent`; optionally
-   pass `config`, `hostBridge`, `language` and `theme` (both can change
-   mid-call). Control it through the `ref` handle (`join`, `hangUp`,
-   `setDeviceMute`).
-
-Load the component lazily. Types, enums and `configurationForIntent` are
-available without it from `@element-hq/element-call-component/api`. The full
-API is in `component/index.tsx`, `component/api.ts` and `component/host.ts`.
-
-##### How it differs from the widget
-
- It lays out for its container, not the window: a small container gets the
-  picture-in-picture layout.
- Its styles and keyboard shortcuts are scoped to its root, so the host page is
-  untouched and several instances can share a page. The
-  [global JS controls](./docs/controls.md) stay page-wide.
- It draws a solid background by default and never offers profile editing.
- If the host bridge implements `close()`, it asks to be unmounted instead of
-  showing its own post-call and error screens.
- Sounds, images and the MediaPipe runtime are separate files the host's
-  bundler copies (webpack 5, Vite, Rollup); MediaPipe is fetched only when a
-  background effect is first used.
-
-##### Develop
-
- `pnpm build:component` builds the library into `component/dist`.
- `pnpm dev:component` serves a test host on `https://localhost:3001`: two
-  calls side by side in resizable boxes, with host messages logged at the
-  bottom. It uses the development backend, `public/config.json` if present,
-  and needs the same certificate exception as `pnpm dev` (see
-  [Backend](#backend)).
- Run pnpm commands from the repository root; `component/` is its own pnpm
-  project.
+- props and the types they are made of
+- the handle
+- the host bridge
+- `UserIntent`
+- `HeaderStyle`
+- `BackgroundStyle` enums
+- `configurationForIntent`, the defaults each intent implies
+  Import from it wherever a value such as
+  `BackgroundStyle.Solid` is needed on a path that must stay light; the main
+  entry point re-exports all of it too.

 ### Backend

@@ -26,7 +26,8 @@
  "features": {
    "feature_element_call_video_rooms": true,
    "feature_video_rooms": true,
-    "feature_group_calls": true
+    "feature_group_calls": true,
+    "feature_release_announcement": false
  },
  "default_federate": true,
  "default_theme": "light",
@@ -39,10 +40,7 @@
  },
  "setting_defaults": {
    "breadcrumbs": true,
-    "feature_group_calls": true,
-    "releaseAnnouncementData": {
-      "room_list_section": true
-    }
+    "feature_group_calls": true
  },
  "jitsi": {
    "preferred_domain": "meet.element.io"
@@ -26,7 +26,8 @@
  "features": {
    "feature_element_call_video_rooms": true,
    "feature_video_rooms": true,
-    "feature_group_calls": true
+    "feature_group_calls": true,
+    "feature_release_announcement": false
  },
  "default_federate": true,
  "default_theme": "light",
@@ -39,10 +40,7 @@
  },
  "setting_defaults": {
    "breadcrumbs": true,
-    "feature_group_calls": true,
-    "releaseAnnouncementData": {
-      "room_list_section": true
-    }
+    "feature_group_calls": true
  },
  "jitsi": {
    "preferred_domain": "meet.element.io"
@@ -109,12 +109,4 @@ describe("scopeStylesToRoot", () => {
      ".a .b_abc12:hover { border: 0 }",
    );
  });
-
-  it("leaves an excluded stylesheet as it is", async () => {
-    const css = "body { margin: 0 } .menu { color: red }";
-    const result = await postcss([
-      scopeStylesToRoot({ exclude: [/host\.css$/] }),
-    ]).process(css, { from: "/app/host.css" });
-    expect(result.css).toBe(css);
-  });
 });
@@ -60,18 +60,12 @@ const IS_ROOT = `:where(${ROOT_SELECTOR})`;
 * tokens, the component styles, the fonts — is not in this build at all: the
 * host supplies it, unscoped, along with its copy of Compound.
 */
-interface Options {
-  /** Stylesheets left as they are: a host's own, which it doesn't scope. */
-  exclude?: RegExp[];
-}
-
-export function scopeStylesToRoot({ exclude = [] }: Options = {}): Plugin {
+export function scopeStylesToRoot(): Plugin {
  return {
    postcssPlugin: "element-call-scope-styles-to-root",
    Once(root) {
-      const file = root.source?.input.file ?? "";
-      if (exclude.some((pattern) => pattern.test(file))) return;
-      const isModule = file.endsWith(".module.css");
+      const isModule =
+        root.source?.input.file?.endsWith(".module.css") ?? false;
      root.walkRules((rule) => {
        if (isRelative(rule)) return;
        rule.selector = (isModule ? scopeBare : scopeAll).processSync(
@@ -72,10 +72,9 @@ import {
  useUrlParams,
 } from "../src/UrlParams";
 import { MediaDevicesContext } from "../src/MediaDevicesContext";
-import { AppViewModel } from "../src/state/AppViewModel";
-import { hostClientSession } from "../src/state/ClientSession";
+import { MediaDevices } from "../src/state/MediaDevices";
 import { ObservableScope } from "../src/state/ObservableScope";
-import { BackgroundEffectsProvider } from "../src/tracks/BackgroundEffectsContext";
+import { ProcessorProvider } from "../src/tracks/TrackProcessorContext";
 import { Config } from "../src/config/Config";
 import { type ConfigOptions } from "../src/config/ConfigOptions";
 import { i18n } from "../src/utils/i18n";
@@ -190,25 +189,22 @@ export const ElementCall: FC<ElementCallProps> = ({
    [roomId, intent, stableConfig],
  );

+  // Created in an effect so that the scope it lives in ends when the component
+  // is unmounted (or these options change), rather than keeping its device
+  // observers running for the rest of the page's life. Null until then, which
+  // is one render.
  const { controlledAudioDevices, callIntent } = params;
-  const [vm, setVm] = useState<AppViewModel | null>(null);
+  const [mediaDevices, setMediaDevices] = useState<MediaDevices | null>(null);
  useEffect(() => {
    const scope = new ObservableScope();
-    setVm(
-      new AppViewModel(
-        scope,
-        { controlledAudioDevices, callIntent },
-        // The host owns the client. We create a clientSession wrapping the host client.
-        hostClientSession(client),
-        // The host owns the session too, so there is nothing to manage here
-        null,
-      ),
+    setMediaDevices(
+      new MediaDevices(scope, { controlledAudioDevices, callIntent }),
    );
    return (): void => {
-      setVm(null);
+      setMediaDevices(null);
      scope.end();
    };
-  }, [controlledAudioDevices, callIntent, client]);
+  }, [controlledAudioDevices, callIntent]);

  const room = client.getRoom(roomId);
  const rtcSession = useMemo(
@@ -226,7 +222,8 @@ export const ElementCall: FC<ElementCallProps> = ({
  // is told that Element Call has loaded, as the widget tells its client once
  // its own initialisation is over. Once per mount, however often the pieces
  // are later swapped out.
-  const ready = container !== null && rtcSession !== null && vm !== null;
+  const ready =
+    container !== null && rtcSession !== null && mediaDevices !== null;
  const announcedLoaded = useRef(false);
  useEffect(() => {
    if (!ready || announcedLoaded.current) return;
@@ -256,11 +253,9 @@ export const ElementCall: FC<ElementCallProps> = ({
                    >
                      <Decoration>
                        <TooltipProvider>
-                          <ClientProvider session={vm.clientSession}>
-                            <MediaDevicesContext value={vm.mediaDevices}>
-                              <BackgroundEffectsProvider
-                                effects={vm.backgroundEffects}
-                              >
+                          <ClientProvider client={client}>
+                            <MediaDevicesContext value={mediaDevices}>
+                              <ProcessorProvider>
                                <CallView
                                  client={client}
                                  rtcSession={rtcSession}
@@ -269,7 +264,7 @@ export const ElementCall: FC<ElementCallProps> = ({
                                  preload={params.preload}
                                  skipLobby={params.skipLobby}
                                />
-                              </BackgroundEffectsProvider>
+                              </ProcessorProvider>
                            </MediaDevicesContext>
                          </ClientProvider>
                        </TooltipProvider>
@@ -3,7 +3,7 @@ networks:

 services:
  auth-service:
-    image: ghcr.io/element-hq/lk-jwt-service:0.10.0
+    image: ghcr.io/element-hq/lk-jwt-service:0.8.0
    pull_policy: always
    hostname: auth-server
    environment:
@@ -33,7 +33,7 @@ services:
      - ecbackend

  auth-service-1:
-    image: ghcr.io/element-hq/lk-jwt-service:0.10.0
+    image: ghcr.io/element-hq/lk-jwt-service:0.8.0
    pull_policy: always
    hostname: auth-server-1
    environment:
@@ -19,12 +19,7 @@ services:
      - ./backend/playwright_homeserver-othersite.yaml:/data/cfg/homeserver.yaml:Z
  element-web:
    # Pin to a SHA so that upstream cannot break our tests. Renovate handles regular updates.
-    image: ghcr.io/element-hq/element-web:develop@sha256:72791f0b2541208f8f7edd9c6b5a7eaf88accd8ed1f0c4db1bc62bfe18eb90fe
+    image: ghcr.io/element-hq/element-web:develop@sha256:60ff0513da71c7641843f4e55b45cf56ae9a18c20f0ed690ef384d4e670d61f0
  element-web-1:
    # Pin to a SHA so that upstream cannot break our tests. Renovate handles regular updates.
-    image: ghcr.io/element-hq/element-web:develop@sha256:72791f0b2541208f8f7edd9c6b5a7eaf88accd8ed1f0c4db1bc62bfe18eb90fe
-    volumes:
-      # The other site opens the embedded package under test in place of the
-      # copy its image bundles (the first site opens the dev server's app.
-      # Built by the Playwright run (see build.setup.ts).
-      - ./embedded/web/dist:/app/widgets/element-call:ro,Z
+    image: ghcr.io/element-hq/element-web:develop@sha256:60ff0513da71c7641843f4e55b45cf56ae9a18c20f0ed690ef384d4e670d61f0
@@ -34,10 +34,6 @@ translations. The browser is Playwright's, so a fresh clone needs

 ## End-to-end

-The Element Web instance `HOST1` opens the app the dev server serves. The instance
-`HOST2` (the other site) opens the embedded package as a host ships it. This package
-is built by the `build-embedded` setup project and mounted in `docker-compose-playwright.yml`.
-
 - `playwright/*.spec.ts` — standalone, on Chromium and Firefox.
 - `playwright/widget/` — widget mode, where cross-context bugs surface.
 - `playwright/component/` — the component in a host page, via the harness on port
@@ -52,8 +48,6 @@ Test what a user observes: the peer sees the change, it survives a reconnect, it
 right after a reload. Reuse `playwright/spa-helpers.ts`,
 `playwright/widget/test-helpers.ts`, `playwright/fixtures/`.

-To mark new release announcements as viewed, add them in `backend/ew.test*.config.json`.
-
 ```sh
 pnpm test                   # unit + storybook
 pnpm backend                # Synapse + LiveKit, required for e2e
@@ -9,4 +9,4 @@ android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref

 [plugins]
 android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
-maven_publish = { id = "com.vanniktech.maven.publish", version = "0.37.0" }
+maven_publish = { id = "com.vanniktech.maven.publish", version = "0.36.0" }
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -7,13 +7,13 @@
    "features": ["plural_postfix_us", "filter_untranslated"],
    "files": [
      {
-        "pattern": "locales/en/app.json",
+        "pattern": "locales/en/*.json",
        "lang": "inherited"
      },
      {
        "group": "existing",
-        "pattern": "locales/*/app.json",
-        "excludes": ["locales/en/app.json"],
+        "pattern": "locales/*/*.json",
+        "excludes": ["locales/en/*.json"],
        "lang": "${autodetectLang}"
      }
    ]
@@ -22,7 +22,6 @@
  "download": {
    "files": [
      {
-        "conditions": ["equals: ${file}, app.json"],
        "output": "locales/${langLsrDash}/${file}"
      }
    ],
@@ -3,7 +3,7 @@
    "user_menu": "User menu"
  },
  "action": {
-    "add_background_image": "Add image",
+    "blur_background": "Blur background",
    "close": "Close",
    "copy_link": "Copy link",
    "edit": "Edit",
@@ -23,13 +23,6 @@
    "upload_file": "Upload file"
  },
  "analytics_notice": "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <6>Cookie Policy</6>.",
-  "background_effects": {
-    "blur": "Blur",
-    "none": "None",
-    "numbered": "Background {{n}}",
-    "slow": "Background effects run slowly on this platform, which may cause your video to stutter.",
-    "unavailable": "Background effects are not supported on this platform."
-  },
  "call_ended_view": {
    "create_account_button": "Create account",
    "create_account_prompt": "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>",
@@ -99,10 +92,6 @@
  },
  "disconnected_banner": "Connectivity to the server has been lost.",
  "error": {
-    "background_animated": "Animated images cannot be used as a background",
-    "background_not_an_image": "That file is not a supported image",
-    "background_not_kept": "That background could not be saved",
-    "background_undecodable": "That image could not be opened",
    "call_is_not_supported": "Call is not supported",
    "call_not_found": "Call not found",
    "call_not_found_description": "<0>That link doesn't appear to belong to any existing call. Check that you have the right link, or <2>create a new one</2>.</0>",
@@ -223,7 +212,6 @@
    "auto_gain_control_label": "Automatic gain control",
    "background_blur_header": "Background",
    "background_blur_label": "Blur the background of the video",
-    "background_effects_header": "Background effects",
    "bitrate_label": "Bitrate",
    "blur_not_supported_by_browser": "(Background blur is not supported by this device.)",
    "camera_header": "Camera quality",
@@ -57,6 +57,7 @@
    "@formatjs/intl-durationformat": "^0.10.0",
    "@formatjs/intl-segmenter": "^11.7.3",
    "@livekit/components-core": "^0.12.0",
+    "@livekit/components-react": "^2.0.0",
    "@livekit/track-processors": "^0.7.1",
    "@mediapipe/tasks-vision": "^0.10.18",
    "@playwright/test": "^1.60.0",
@@ -87,7 +88,7 @@
    "@typescript-eslint/utils": "^8.61.0",
    "@use-gesture/react": "^10.2.11",
    "@vector-im/compound-design-tokens": "^11.0.0",
-    "@vector-im/compound-web": "^10.5.0",
+    "@vector-im/compound-web": "^10.4.0",
    "@vitejs/plugin-react": "^6.0.2",
    "@vitest/browser-playwright": "^4.1.5",
    "@vitest/coverage-v8": "^4.0.18",
@@ -97,7 +98,6 @@
    "copy-to-clipboard": "^3.3.3",
    "eslint-plugin-element-call": "link:eslint",
    "eslint-plugin-storybook": "^10.3.6",
-    "fake-indexeddb": "^6.2.5",
    "fetch-mock": "11.1.5",
    "i18next": "^26.0.0",
    "i18next-browser-languagedetector": "^8.0.0",
@@ -107,7 +107,7 @@
    "livekit-client": "^2.18.1",
    "lodash-es": "^4.17.21",
    "loglevel": "^1.9.1",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#dc8610e796c92553c658300a4882dde961a0678a",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#3f05dc4d104a3dfc753c5e3549a18c74fab4b076",
    "matrix-widget-api": "^1.18.0",
    "node-stdlib-browser": "^1.3.1",
    "normalize.css": "^8.0.1",
@@ -118,7 +118,7 @@
    "postcss": "^8.4.41",
    "postcss-preset-env": "^10.0.0",
    "postcss-selector-parser": "^7.1.1",
-    "posthog-js": "1.408.2",
+    "posthog-js": "1.438.24",
    "qrcode": "^1.5.4",
    "react": "19",
    "react-dom": "19",
@@ -26,19 +26,6 @@ process.env.NODE_EXTRA_CA_CERTS = join(
  "backend/dev_tls_local-ca.crt",
 );

-const desktopChrome = {
-  ...devices["Desktop Chrome"],
-  permissions: ["clipboard-write", "clipboard-read", "microphone", "camera"],
-  ignoreHTTPSErrors: true,
-  launchOptions: {
-    args: [
-      "--use-fake-ui-for-media-stream",
-      "--use-fake-device-for-media-stream",
-      "--mute-audio",
-    ],
-  },
-};
-
 /**
 * See https://playwright.dev/docs/test-configuration.
 */
@@ -56,11 +43,11 @@ export default defineConfig({
   * Reporter to use. See https://playwright.dev/docs/test-reporters
   *
   * On CI, `list` prints a line per test as it finishes, which keeps the job
-   * log moving; `github` annotates failures on the PR; the `blob` format is
-   * uploaded by sharded CI runs and combined into a HTML report by the workflow.
+   * log moving; `github` annotates failures on the PR; `html` is uploaded as
+   * an artifact and must never try to open a browser there.
   */
  reporter: process.env.CI
-    ? [["list"], ["github"], ["blob"]]
+    ? [["list"], ["github"], ["html", { open: "never" }]]
    : [["list"], ["html"]],
  /* Stop a broken run early on CI instead of waiting out every retry. */
  maxFailures: process.env.CI ? 5 : undefined,
@@ -76,28 +63,29 @@ export default defineConfig({
  },
  /* Configure projects for major browsers */
  projects: [
-    {
-      // Builds the embedded package into the directory the other site's
-      // Element Web container serves it from (see docker-compose-playwright.yml).
-      name: "build-embedded",
-      testMatch: "**/widget/embedded/build.setup.ts",
-    },
    {
      name: "chromium",
-      testIgnore: ["**/mobile/**", "**/widget/**"],
-      use: desktopChrome,
-    },
-    {
-      // Element Call as a widget in Element Web, on Chromium. This uses its
-      // own project so that it can be sharded on CI.
-      name: "widget",
-      dependencies: ["build-embedded"],
-      testMatch: "**/widget/**/*.@(spec|test).ts",
-      use: desktopChrome,
+      testIgnore: "**/mobile/**",
+      use: {
+        ...devices["Desktop Chrome"],
+        permissions: [
+          "clipboard-write",
+          "clipboard-read",
+          "microphone",
+          "camera",
+        ],
+        ignoreHTTPSErrors: true,
+        launchOptions: {
+          args: [
+            "--use-fake-ui-for-media-stream",
+            "--use-fake-device-for-media-stream",
+            "--mute-audio",
+          ],
+        },
+      },
    },
    {
      name: "firefox",
-      dependencies: ["build-embedded"],
      testIgnore: "**/mobile/**",
      use: {
        ...devices["Desktop Firefox"],
@@ -1,952 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, test, type Browser, type Page } from "@playwright/test";
-
-import { SpaHelpers } from "./spa-helpers.ts";
-import {
-  averageColour,
-  cameraColour,
-  type Colour,
-  distance,
-} from "./utils/colour.ts";
-
-// Background effects need WebGL2, and headless Firefox on a CI runner has none,
-// so it rightly offers none of them.
-test.skip(
-  ({ browserName }) => browserName === "firefox",
-  "Background effects need WebGL2, which headless Firefox on CI does not have",
-);
-
-test.describe("background effects", () => {
-  test("pre-join preview shows the chosen effect", async ({ page }) => {
-    test.slow();
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Effect user", "Background effects");
-    const preview = page.locator("video").first();
-    const camera = await cameraColour(preview);
-
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    const tile = page
-      .getByRole("group", { name: "Background effects" })
-      .getByRole("menuitemradio", { name: "Background 1" });
-    await tile.click();
-    await expect(tile).toHaveAttribute("aria-checked", "true");
-
-    // The fake camera shows no person, so the whole frame is background: the
-    // preview takes on the picture's colours and leaves the camera's.
-    const picture = await averageColour(tile.locator("img"));
-    // Long enough for the first effect of a session to be built.
-    await expect
-      .poll(async () => distance(await averageColour(preview), picture), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, picture) / 2);
-  });
-});
-
-test.describe("no effect", () => {
-  test("draws nothing, even after blurring", async ({ page }) => {
-    test.setTimeout(120_000);
-    await countDraws(page);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Idle user", "No effect after blur");
-
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    const effects = page.getByRole("group", { name: "Background effects" });
-    await effects.getByRole("menuitemradio", { name: "Blur" }).click();
-    // Long enough for the first effect of a session to be built.
-    await expect
-      .poll(async () => drawsPerSecond(page), { timeout: 60_000 })
-      .toBeGreaterThan(0);
-    const blurred = await drawsPerSecond(page);
-
-    await effects.getByRole("menuitemradio", { name: "None" }).click();
-    // A frame already on its way may still be drawn.
-    await expect.poll(async () => drawsPerSecond(page)).toBe(0);
-    test.info().annotations.push({
-      type: "WebGL draws per second",
-      description: `blurred ${blurred}, none 0`,
-    });
-  });
-});
-
-/** Counts every WebGL draw on the page, the segmenter's and the effect's. */
-async function countDraws(page: Page): Promise<void> {
-  await page.addInitScript(() => {
-    const counter = { draws: 0 };
-    (window as unknown as { webglDraws: typeof counter }).webglDraws = counter;
-    for (const name of ["drawArrays", "drawElements"] as const) {
-      const draw = WebGL2RenderingContext.prototype[name] as (
-        ...args: unknown[]
-      ) => void;
-      WebGL2RenderingContext.prototype[name] = function (
-        this: WebGL2RenderingContext,
-        ...args: unknown[]
-      ): void {
-        counter.draws += 1;
-        draw.apply(this, args);
-      } as never;
-    }
-  });
-}
-
-/** WebGL draws over the next second. */
-async function drawsPerSecond(page: Page): Promise<number> {
-  return page.evaluate(async () => {
-    const counter = (window as unknown as { webglDraws: { draws: number } })
-      .webglDraws;
-    const before = counter.draws;
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-    return counter.draws - before;
-  });
-}
-
-test.describe("the camera menu's preview", () => {
-  test("shows the camera with the effect in force", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Preview user", "Preview in the menu");
-    const camera = await cameraColour(page.locator("video").first());
-
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    const preview = page.getByRole("menu").locator("video");
-    await expect(preview).toBeVisible();
-    await expect
-      .poll(async () => distance(await averageColour(preview), camera), {
-        timeout: 20_000,
-      })
-      .toBeLessThan(30);
-
-    const tile = page.getByRole("menuitemradio", { name: "Background 1" });
-    await tile.click();
-    const picture = await averageColour(tile.locator("img"));
-    await expect
-      .poll(async () => distance(await averageColour(preview), picture), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, picture) / 2);
-  });
-
-  test("shows the call's own camera once joined", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(
-      page,
-      "Call preview user",
-      "Preview in the call's menu",
-      true,
-    );
-    await expect(page.getByTestId("incall_videomute")).toBeEnabled({
-      timeout: 10_000,
-    });
-    const camera = await cameraColour(page.locator("video").first());
-
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    const preview = page.getByRole("menu").locator("video");
-    await expect(preview).toBeVisible();
-    await expect
-      .poll(async () => distance(await averageColour(preview), camera), {
-        timeout: 20_000,
-      })
-      .toBeLessThan(30);
-
-    const tile = page.getByRole("menuitemradio", { name: "Background 1" });
-    await tile.click();
-    const picture = await averageColour(tile.locator("img"));
-    await expect
-      .poll(async () => distance(await averageColour(preview), picture), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, picture) / 2);
-  });
-});
-
-test.describe("background effects section", () => {
-  test("section stays within the call area at every size", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Sizes user", "Background effect sizes");
-
-    for (const size of [
-      { width: 1280, height: 800 },
-      { width: 800, height: 600 },
-      { width: 600, height: 420 },
-      { width: 480, height: 360 },
-      { width: 360, height: 640 },
-    ]) {
-      await page.setViewportSize(size);
-      await page.getByRole("button", { name: "Camera", exact: true }).click();
-      const menu = page.getByRole("menu");
-      await expect(menu).toBeVisible();
-
-      const box = (await menu.boundingBox())!;
-      const where = `at ${size.width}x${size.height}`;
-      expect(box.x, where).toBeGreaterThanOrEqual(0);
-      expect(box.y, where).toBeGreaterThanOrEqual(0);
-      expect(box.x + box.width, where).toBeLessThanOrEqual(size.width);
-      expect(box.y + box.height, where).toBeLessThanOrEqual(size.height);
-
-      const last = page
-        .getByRole("group", { name: "Background effects" })
-        .getByRole("menuitemradio")
-        .last();
-      await last.scrollIntoViewIfNeeded();
-      await expect(last, where).toBeInViewport({ ratio: 1 });
-      await last.click();
-      await expect(last, where).toHaveAttribute("aria-checked", "true");
-
-      // Back to no effect for the next size, and close.
-      await page
-        .getByRole("group", { name: "Background effects" })
-        .getByRole("menuitemradio", { name: "None" })
-        .click();
-      await page.keyboard.press("Escape");
-      await expect(menu).toBeHidden();
-    }
-  });
-});
-
-test.describe("a pipeline that fails to build", () => {
-  test("offers no effects for the session, and keeps the choice", async ({
-    page,
-  }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Failing user", "Pipeline fails");
-    const preview = page.locator("video").first();
-    const camera = await cameraColour(preview);
-    await page.route("**/*.tflite*", async (route) => route.abort());
-
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    const tile = page.getByRole("menuitemradio", { name: "Background 1" });
-    await tile.click();
-    await expect(
-      page.getByText("Background effects are not supported on this platform."),
-    ).toBeVisible({ timeout: 30_000 });
-    await expect(tile).toBeDisabled();
-    await page.keyboard.press("Escape");
-    // The camera and microphone carry on without it.
-    expect(distance(await cameraColour(preview), camera)).toBeLessThan(30);
-    await expect(page.getByTestId("incall_mute")).toHaveAttribute(
-      "aria-checked",
-      "true",
-    );
-
-    await page.unroute("**/*.tflite*");
-    await page.reload();
-    await expect(page.getByTestId("lobby_joinCall")).toBeVisible();
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    await expect(tile).toHaveAttribute("aria-checked", "true");
-    const picture = await averageColour(tile.locator("img"));
-    await expect
-      .poll(async () => distance(await averageColour(preview), picture), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, picture) / 2);
-  });
-});
-
-test.describe("the chosen effect", () => {
-  test("chosen effect survives leaving and rejoining", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Returning user", "Effect remembered");
-    const { camera, picture } = await chooseAndWear(page, "Background 1");
-    await page.getByTestId("lobby_joinCall").click();
-    await page.getByTestId("incall_leave").click();
-    await expect(page.getByRole("heading")).toContainText(
-      "your call has ended",
-    );
-
-    await page.goto("/");
-    await page.getByTestId("home_callName").fill("Effect remembered again");
-    await page.getByTestId("home_go").click();
-    await expect(page.getByTestId("lobby_joinCall")).toBeVisible();
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    const tile = page
-      .getByRole("group", { name: "Background effects" })
-      .getByRole("menuitemradio", { name: "Background 1" });
-    await expect(tile).toHaveAttribute("aria-checked", "true");
-    const preview = page.locator("video").first();
-    await expect
-      .poll(async () => distance(await averageColour(preview), picture), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, picture) / 2);
-  });
-
-  test("second session still shows the existing error", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Two tabs", "Effect in two tabs");
-    await chooseAndWear(page, "Background 1");
-
-    const second = await page.context().newPage();
-    await second.goto("/");
-    await expect(
-      page.getByRole("heading", { name: "Opened in another tab" }),
-    ).toBeVisible();
-  });
-});
-
-/** Chooses an effect in the lobby, and waits until the preview wears it. */
-async function chooseAndWear(
-  page: Page,
-  name: string,
-): Promise<{ camera: Colour; picture: Colour }> {
-  const preview = page.locator("video").first();
-  const camera = await cameraColour(preview);
-  await page.getByRole("button", { name: "Camera", exact: true }).click();
-  const tile = page.getByRole("menuitemradio", { name });
-  await tile.click();
-  const picture = await averageColour(tile.locator("img"));
-  await expect
-    .poll(async () => distance(await averageColour(preview), picture), {
-      timeout: 60_000,
-    })
-    .toBeLessThan(distance(camera, picture) / 2);
-  await page.keyboard.press("Escape");
-  return { camera, picture };
-}
-
-test.describe("a background of one's own", () => {
-  test("adds an image from the device", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Adding user", "Own background");
-    const preview = page.locator("video").first();
-    const camera = await cameraColour(preview);
-    const red = await redImage(page);
-
-    await addImage(page, red);
-    const mine = page
-      .getByRole("group", { name: "Background effects" })
-      .getByRole("menuitemradio", { name: "Background 3" });
-    await expect(mine).toBeVisible();
-    await expect(mine).toHaveAttribute("aria-checked", "false");
-
-    await mine.click();
-    await expect
-      .poll(async () => distance(await averageColour(preview), RED), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, RED) / 2);
-  });
-
-  test("adding an image makes no upload", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Private user", "Own background kept");
-    const preview = page.locator("video").first();
-    const camera = await cameraColour(preview);
-    const red = await redImage(page);
-    const sent: { request: string; body: Buffer | null }[] = [];
-    page.on("request", (request) =>
-      sent.push({
-        request: `${request.method()} ${request.url()}`,
-        body: request.postDataBuffer(),
-      }),
-    );
-
-    await addImage(page, red);
-    await page
-      .getByRole("group", { name: "Background effects" })
-      .getByRole("menuitemradio", { name: "Background 3" })
-      .click();
-    // Kept, chosen and in force: anything that would send it has had its turn.
-    await expect
-      .poll(async () => distance(await averageColour(preview), RED), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, RED) / 2);
-    // The file as given, and the copy kept, which is encoded anew.
-    const samples = [red, await keptBytes(page)].map((bytes) =>
-      bytes.subarray(bytes.length - 64),
-    );
-    const carriesIt = sent.filter(
-      ({ request, body }) =>
-        request.includes("/_matrix/media/") ||
-        samples.some((sample) => body?.includes(sample)),
-    );
-    expect(carriesIt.map(({ request }) => request)).toEqual([]);
-  });
-
-  test("added image survives rejoining and is gone after storage is cleared", async ({
-    page,
-  }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Keeping user", "Own background again");
-    const preview = page.locator("video").first();
-    const camera = await cameraColour(preview);
-    const red = await redImage(page);
-    await addImage(page, red);
-    const mine = page
-      .getByRole("group", { name: "Background effects" })
-      .getByRole("menuitemradio", { name: "Background 3" });
-    await mine.click();
-    await page.keyboard.press("Escape");
-
-    await page.reload();
-    await expect(page.getByTestId("lobby_joinCall")).toBeVisible();
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    await expect(mine).toHaveAttribute("aria-checked", "true");
-    await page.keyboard.press("Escape");
-    await expect
-      .poll(async () => distance(await averageColour(preview), RED), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, RED) / 2);
-
-    await page.evaluate(
-      async () =>
-        new Promise<void>((resolve, reject) => {
-          const request = indexedDB.deleteDatabase(
-            "element-call-background-images",
-          );
-          request.onsuccess = (): void => resolve();
-          request.onerror = (): void => reject(request.error);
-          request.onblocked = (): void => resolve();
-        }),
-    );
-    await page.reload();
-    await expect(page.getByTestId("lobby_joinCall")).toBeVisible();
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    await expect(
-      page.getByRole("group", { name: "Background effects" }),
-    ).toBeVisible();
-    await expect(mine).toHaveCount(0);
-    await page.keyboard.press("Escape");
-
-    await addImage(page, red);
-    await expect(mine).toBeVisible();
-  });
-
-  test("a removed image stays removed", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(
-      page,
-      "Removing user",
-      "Own background removed",
-    );
-    await addImage(page, await redImage(page));
-    const mine = page
-      .getByRole("group", { name: "Background effects" })
-      .getByRole("menuitemradio", { name: "Background 3" });
-    await expect(mine).toHaveAttribute("aria-keyshortcuts", "Delete");
-    await mine.focus();
-    await page.keyboard.press("Delete");
-    await expect(mine).toHaveCount(0);
-
-    await page.reload();
-    await expect(page.getByTestId("lobby_joinCall")).toBeVisible();
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    await expect(
-      page.getByRole("group", { name: "Background effects" }),
-    ).toBeVisible();
-    await expect(mine).toHaveCount(0);
-    expect(await keptImages(page)).toEqual([]);
-  });
-});
-
-test.describe("what can be added", () => {
-  test("refuses an animated image", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Refused user", "Animated refused");
-    await addImage(page, ANIMATED_GIF, {
-      name: "moving.gif",
-      type: "image/gif",
-    });
-
-    await expect(
-      page.getByText("Animated images cannot be used as a background"),
-    ).toBeVisible();
-    const section = page.getByRole("group", { name: "Background effects" });
-    await expect(
-      section.getByRole("menuitemradio", { name: "Background 3" }),
-    ).toHaveCount(0);
-    await expect(
-      section.getByRole("menuitemradio", { name: "None" }),
-    ).toHaveAttribute("aria-checked", "true");
-    expect(await keptImages(page)).toEqual([]);
-  });
-
-  test("reduces an oversized image", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Large user", "Oversized reduced");
-    await addImage(page, await pngImage(page, { width: 4000, height: 3000 }));
-
-    await expect(
-      page
-        .getByRole("group", { name: "Background effects" })
-        .getByRole("menuitemradio", { name: "Background 3" }),
-    ).toBeVisible();
-    await expect(page.getByRole("alert")).toHaveCount(0);
-    const [kept] = await keptImages(page);
-    expect(kept).toMatchObject({ width: 1920, height: 1440 });
-  });
-
-  test("lays every image on an opaque ground", async ({ page }) => {
-    test.setTimeout(120_000);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Logo user", "Transparent made opaque");
-    await addImage(
-      page,
-      await pngImage(page, { width: 320, height: 180, transparent: true }),
-    );
-
-    await expect(
-      page
-        .getByRole("group", { name: "Background effects" })
-        .getByRole("menuitemradio", { name: "Background 3" }),
-    ).toBeVisible();
-    const [kept] = await keptImages(page);
-    expect(kept.minAlpha).toBe(255);
-  });
-});
-
-/** Two frames of one pixel, red then blue. */
-const ANIMATED_GIF = Buffer.from(
-  "R0lGODlhAQABAPEAAP8AAAAA/wAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQACgAAACwAAAAAAQABAAACAkQBACH5BAAKAAAALAAAAAABAAEAAAICTAEAOw==",
-  "base64",
-);
-
-/** A red PNG of the given size; transparent leaves its right half empty. */
-async function pngImage(
-  page: Page,
-  size: { width: number; height: number; transparent?: boolean },
-): Promise<Buffer> {
-  const dataUrl = await page.evaluate(({ width, height, transparent }) => {
-    const canvas = document.createElement("canvas");
-    canvas.width = width;
-    canvas.height = height;
-    const context = canvas.getContext("2d")!;
-    context.fillStyle = "rgb(255, 0, 0)";
-    context.fillRect(0, 0, transparent ? width / 2 : width, height);
-    return canvas.toDataURL("image/png");
-  }, size);
-  return Buffer.from(dataUrl.split(",")[1], "base64");
-}
-
-/** The images the device keeps, as it keeps them. */
-async function keptImages(
-  page: Page,
-): Promise<{ width: number; height: number; minAlpha: number }[]> {
-  return page.evaluate(async () => {
-    const db = await new Promise<IDBDatabase>((resolve, reject) => {
-      const request = indexedDB.open("element-call-background-images");
-      request.onsuccess = (): void => resolve(request.result);
-      request.onerror = (): void => reject(request.error);
-    });
-    if (!db.objectStoreNames.contains("backgrounds")) return [];
-    const kept = await new Promise<{ image: Blob }[]>((resolve, reject) => {
-      const request = db
-        .transaction("backgrounds")
-        .objectStore("backgrounds")
-        .getAll();
-      request.onsuccess = (): void => resolve(request.result);
-      request.onerror = (): void => reject(request.error);
-    });
-    db.close();
-    return Promise.all(
-      kept.map(async ({ image }) => {
-        const bitmap = await createImageBitmap(image);
-        const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);
-        const context = canvas.getContext("2d")!;
-        context.drawImage(bitmap, 0, 0);
-        const { data } = context.getImageData(
-          0,
-          0,
-          bitmap.width,
-          bitmap.height,
-        );
-        let minAlpha = 255;
-        for (let i = 3; i < data.length; i += 4)
-          minAlpha = Math.min(minAlpha, data[i]);
-        return { width: bitmap.width, height: bitmap.height, minAlpha };
-      }),
-    );
-  });
-}
-
-/** The bytes of the one image the device keeps. */
-async function keptBytes(page: Page): Promise<Buffer> {
-  const base64 = await page.evaluate(
-    async () =>
-      new Promise<string>((resolve, reject) => {
-        const open = indexedDB.open("element-call-background-images");
-        open.onerror = (): void => reject(open.error);
-        open.onsuccess = (): void => {
-          const all = open.result
-            .transaction("backgrounds")
-            .objectStore("backgrounds")
-            .getAll();
-          all.onerror = (): void => reject(all.error);
-          all.onsuccess = (): void => {
-            const reader = new FileReader();
-            reader.onload = (): void =>
-              resolve((reader.result as string).split(",")[1]);
-            reader.readAsDataURL((all.result[0] as { image: Blob }).image);
-          };
-        };
-      }),
-  );
-  return Buffer.from(base64, "base64");
-}
-
-const RED: Colour = [255, 0, 0];
-
-/** A solid red PNG, unlike the camera and the shipped pictures. */
-async function redImage(page: Page): Promise<Buffer> {
-  const dataUrl = await page.evaluate(() => {
-    const canvas = document.createElement("canvas");
-    canvas.width = 320;
-    canvas.height = 180;
-    const context = canvas.getContext("2d")!;
-    context.fillStyle = "rgb(255, 0, 0)";
-    context.fillRect(0, 0, canvas.width, canvas.height);
-    return canvas.toDataURL("image/png");
-  });
-  return Buffer.from(dataUrl.split(",")[1], "base64");
-}
-
-/** Adds an image from the camera menu's add tile, leaving the menu open. */
-async function addImage(
-  page: Page,
-  image: Buffer,
-  { name, type } = { name: "mine.png", type: "image/png" },
-): Promise<void> {
-  if (!(await page.getByRole("menu").isVisible()))
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-  const chooser = page.waitForEvent("filechooser");
-  await page.getByRole("menuitem", { name: "Add image" }).click();
-  await (await chooser).setFiles({ name, mimeType: type, buffer: image });
-}
-
-test.describe("joining with a background chosen", () => {
-  test("publishes no frame of the room", async ({ browser }) => {
-    // Two first builds of the pipeline, one of them held back.
-    test.setTimeout(180_000);
-    const hostContext = await browser.newContext();
-    const host = await hostContext.newPage();
-    await recordIncomingFrames(host);
-    await host.goto("/");
-    await SpaHelpers.createCall(host, "Host", "Join with a background", true);
-    await expect(host.getByTestId("incall_videomute")).toBeEnabled({
-      timeout: 10_000,
-    });
-    const inviteLink = await SpaHelpers.getCallInviteLink(host);
-    await host.keyboard.press("Escape");
-
-    const guestContext = await browser.newContext();
-    const guest = await guestContext.newPage();
-    await guest.goto(inviteLink);
-    await guest.getByTestId("joincall_displayName").fill("Guest");
-    await guest.getByTestId("joincall_joincall").click();
-    const preview = guest.locator("video").first();
-    await expect(preview).toBeVisible();
-    const camera = await cameraColour(preview);
-    await guest.getByRole("button", { name: "Camera", exact: true }).click();
-    const tile = guest.getByRole("menuitemradio", { name: "Background 1" });
-    await tile.click();
-    const picture = await averageColour(tile.locator("img"));
-    await expect
-      .poll(async () => distance(await averageColour(preview), picture), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, picture) / 2);
-    // Were the pipeline built again for the call's track, it would take as
-    // long as on the slower route. Routing bypasses the cache, so it waits.
-    let heldBack = 0;
-    await guest.route("**/*.tflite*", async (route) => {
-      heldBack += 1;
-      await new Promise((resolve) => setTimeout(resolve, 15_000));
-      await route.continue();
-    });
-    await guest.keyboard.press("Escape");
-    await guest.getByTestId("lobby_joinCall").click();
-
-    const guestTile = host
-      .getByTestId("videoTile")
-      .filter({ has: host.getByTestId("name_tag").getByText("Guest") });
-    await expect(guestTile.locator("video")).toBeVisible({ timeout: 60_000 });
-    // Visible can come before the stream is attached.
-    let trackId: string | undefined;
-    await expect
-      .poll(async () => {
-        trackId = await guestTile
-          .locator("video")
-          .evaluate(
-            (video: HTMLVideoElement) =>
-              (video.srcObject as MediaStream | null)?.getVideoTracks()[0]?.id,
-          );
-        return trackId;
-      })
-      .toBeDefined();
-    await expectNoFrameOfTheRoom(host, trackId!, 0, camera, picture);
-    // The join adopts the lobby's pipeline, so the model is never fetched again.
-    expect(heldBack).toBe(0);
-
-    await hostContext.close();
-    await guestContext.close();
-  });
-});
-
-test.describe("the first build", () => {
-  test("survives the camera turned off and on while it runs", async ({
-    page,
-  }) => {
-    test.setTimeout(120_000);
-    const failures: string[] = [];
-    page.on("console", (m) => {
-      if (m.text().includes("Failed to attach video processor"))
-        failures.push(m.text());
-    });
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Toggling user", "Toggle while building");
-    const preview = page.locator("video").first();
-    const camera = await cameraColour(preview);
-
-    const held = await holdBackTheModel(page);
-    await page.getByRole("button", { name: "Camera", exact: true }).click();
-    const tile = page.getByRole("menuitemradio", { name: "Background 1" });
-    await tile.click();
-    const picture = await averageColour(tile.locator("img"));
-    await page.keyboard.press("Escape");
-    // New preview tracks, each attached while the first is still building.
-    for (let i = 0; i < 2; i++) {
-      await page.getByTestId("incall_videomute").click();
-      await page.getByTestId("incall_videomute").click();
-    }
-
-    await expect
-      .poll(async () => distance(await averageColour(preview), picture), {
-        timeout: 60_000,
-      })
-      .toBeLessThan(distance(camera, picture) / 2);
-    expect(failures).toEqual([]);
-    expect(held()).toBeGreaterThan(0);
-  });
-});
-
-test.describe("turning the camera on with a background chosen", () => {
-  test("publishes no frame of the room when the camera started off", async ({
-    browser,
-  }) => {
-    test.setTimeout(120_000);
-    const { host, guest, close } = await hostAndGuest(browser);
-    const camera = await cameraColour(guest.locator("video").first());
-    await guest.getByTestId("incall_videomute").click();
-    await guest.getByTestId("lobby_joinCall").click();
-
-    const picture = await chooseBackground(guest);
-    const held = await holdBackTheModel(guest);
-    await guest.getByTestId("incall_videomute").click();
-
-    const trackId = await incomingTrackId(host);
-    await expectNoFrameOfTheRoom(host, trackId, 0, camera, picture);
-    expect(held()).toBeGreaterThan(0);
-    await close();
-  });
-
-  test("publishes no frame of the room when the camera was turned off", async ({
-    browser,
-  }) => {
-    test.setTimeout(120_000);
-    const { host, guest, close } = await hostAndGuest(browser);
-    const camera = await cameraColour(guest.locator("video").first());
-    await guest.getByTestId("lobby_joinCall").click();
-    const trackId = await incomingTrackId(host);
-    await expect
-      .poll(async () => (await framesOf(host, trackId)).length, {
-        timeout: 20_000,
-      })
-      .toBeGreaterThan(0);
-    await guest.getByTestId("incall_videomute").click();
-
-    const picture = await chooseBackground(guest);
-    const held = await holdBackTheModel(guest);
-    const before = (await framesOf(host, trackId)).length;
-    await guest.getByTestId("incall_videomute").click();
-
-    await expectNoFrameOfTheRoom(host, trackId, before, camera, picture);
-    expect(held()).toBeGreaterThan(0);
-    await close();
-  });
-});
-
-/** A host in a call, recording what it receives, and a guest in its lobby. */
-async function hostAndGuest(browser: Browser): Promise<{
-  host: Page;
-  guest: Page;
-  close: () => Promise<void>;
-}> {
-  const hostContext = await browser.newContext();
-  const host = await hostContext.newPage();
-  await recordIncomingFrames(host);
-  await host.goto("/");
-  await SpaHelpers.createCall(host, "Host", "Camera with a background", true);
-  await expect(host.getByTestId("incall_videomute")).toBeEnabled({
-    timeout: 10_000,
-  });
-  const inviteLink = await SpaHelpers.getCallInviteLink(host);
-  await host.keyboard.press("Escape");
-
-  const guestContext = await browser.newContext();
-  const guest = await guestContext.newPage();
-  await guest.goto(inviteLink);
-  await guest.getByTestId("joincall_displayName").fill("Guest");
-  await guest.getByTestId("joincall_joincall").click();
-  await expect(guest.locator("video").first()).toBeVisible();
-  return {
-    host,
-    guest,
-    close: async (): Promise<void> => {
-      await hostContext.close();
-      await guestContext.close();
-    },
-  };
-}
-
-/** Chooses the first shipped picture in the call, and answers its colour. */
-async function chooseBackground(guest: Page): Promise<Colour> {
-  // The lobby has a camera button of its own, so wait for the call's.
-  await expect(guest.getByTestId("incall_leave")).toBeVisible({
-    timeout: 30_000,
-  });
-  await expect(guest.getByTestId("incall_videomute")).toBeEnabled({
-    timeout: 10_000,
-  });
-  await guest.getByRole("button", { name: "Camera", exact: true }).click();
-  const tile = guest.getByRole("menuitemradio", { name: "Background 1" });
-  await tile.click();
-  await expect(tile).toHaveAttribute("aria-checked", "true");
-  const picture = await averageColour(tile.locator("img"));
-  await guest.keyboard.press("Escape");
-  return picture;
-}
-
-/** Makes the pipeline's first build as slow as on the slower route. */
-/** Answers how often it held the model back, which a check should see. */
-async function holdBackTheModel(page: Page): Promise<() => number> {
-  let held = 0;
-  // Routing bypasses the cache, so it waits.
-  await page.route("**/*.tflite*", async (route) => {
-    held += 1;
-    await new Promise((resolve) => setTimeout(resolve, 5_000));
-    await route.continue();
-  });
-  return () => held;
-}
-
-/** The id of the guest's camera track, as the host receives it. */
-async function incomingTrackId(host: Page): Promise<string> {
-  const guestTile = host
-    .getByTestId("videoTile")
-    .filter({ has: host.getByTestId("name_tag").getByText("Guest") });
-  await expect(guestTile.locator("video")).toBeVisible({ timeout: 60_000 });
-  // Visible can come before the stream is attached.
-  let trackId: string | undefined;
-  await expect
-    .poll(async () => {
-      trackId = await guestTile
-        .locator("video")
-        .evaluate(
-          (video: HTMLVideoElement) =>
-            (video.srcObject as MediaStream | null)?.getVideoTracks()[0]?.id,
-        );
-      return trackId;
-    })
-    .toBeDefined();
-  return trackId!;
-}
-
-/** Waits for the picture to arrive, then finds no frame of the room since. */
-async function expectNoFrameOfTheRoom(
-  host: Page,
-  trackId: string,
-  since: number,
-  camera: Colour,
-  picture: Colour,
-): Promise<void> {
-  await expect
-    .poll(
-      async () => {
-        const frames = (await framesOf(host, trackId)).slice(since);
-        // A black frame, as a track starts, is nearer the picture than the
-        // camera, but shows neither.
-        return frames.some(
-          (f) =>
-            distance(f, picture) <
-            Math.min(distance(f, camera), distance(f, [0, 0, 0])),
-        );
-      },
-      { timeout: 60_000 },
-    )
-    .toBe(true);
-  const frames = (await framesOf(host, trackId)).slice(since);
-  expect(
-    frames.filter((f) => distance(f, camera) < distance(f, picture)),
-  ).toEqual([]);
-}
-
-/**
- * Records the mean colour of every frame of every video track the page
- * receives, from the moment it arrives: a tile may attach it later than its
- * first frame.
- */
-async function recordIncomingFrames(page: Page): Promise<void> {
-  await page.addInitScript(() => {
-    const frames: Record<string, [number, number, number][]> = {};
-    (window as unknown as { receivedFrames: typeof frames }).receivedFrames =
-      frames;
-    const record = (track: MediaStreamTrack): void => {
-      if (track.kind !== "video" || frames[track.id]) return;
-      const seen: [number, number, number][] = (frames[track.id] = []);
-      const video = document.createElement("video");
-      video.muted = true;
-      video.srcObject = new MediaStream([track]);
-      const canvas = document.createElement("canvas");
-      canvas.width = canvas.height = 16;
-      const context = canvas.getContext("2d", { willReadFrequently: true })!;
-      const step = (): void => {
-        context.drawImage(video, 0, 0, 16, 16);
-        const { data } = context.getImageData(0, 0, 16, 16);
-        const sum = [0, 0, 0];
-        for (let i = 0; i < data.length; i += 4)
-          for (let c = 0; c < 3; c++) sum[c] += data[i + c];
-        seen.push(sum.map((v) => v / (data.length / 4)) as Colour);
-        video.requestVideoFrameCallback(step);
-      };
-      video.requestVideoFrameCallback(step);
-      void video.play();
-    };
-    const Connection = window.RTCPeerConnection;
-    window.RTCPeerConnection = class extends Connection {
-      public constructor(...args: ConstructorParameters<typeof Connection>) {
-        super(...args);
-        this.addEventListener("track", (e) => record(e.track));
-      }
-    };
-  });
-}
-
-async function framesOf(page: Page, trackId: string): Promise<Colour[]> {
-  return page.evaluate(
-    (id) =>
-      (
-        window as unknown as {
-          receivedFrames: Record<string, [number, number, number][]>;
-        }
-      ).receivedFrames[id] ?? [],
-    trackId,
-  );
-}
@@ -1,85 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, type Locator, type Page, test } from "@playwright/test";
-
-import { createUserAndRoom, resizeContainer, startHarness } from "./harness.ts";
-import { averageColour, cameraColour, expectWearing } from "../utils/colour.ts";
-
-// Background effects need WebGL2, and headless Firefox on a CI runner has none,
-// so it rightly offers none of them.
-test.skip(
-  ({ browserName }) => browserName === "firefox",
-  "Background effects need WebGL2, which headless Firefox on CI does not have",
-);
-
-/**
- * Background effects with Element Call as a component in a host page: the
- * pipeline's model and WebAssembly have to load from the component's bundle,
- * and the portalled menu has to be sized against the call, not the window.
- * Driven from the lobby, which builds the same menu and pipeline.
- */
-
-// Sign-in, crypto setup and sync happen twice before anything shows.
-test.describe.configure({ timeout: 180_000 });
-
-test("puts a picture on the call's preview", async ({ page }) => {
-  const { username, roomId } = await createUserAndRoom("effects");
-  const panes = await startHarness(page, username, roomId);
-  const pane = panes.first();
-  await resizeContainer(pane.getByTestId("call-container"), {
-    width: 900,
-    height: 480,
-  });
-  await expect(pane.getByTestId("lobby_joinCall")).toBeVisible({
-    timeout: 60_000,
-  });
-  const preview = pane.locator("video").first();
-  const camera = await cameraColour(preview);
-
-  const tile = await openEffect(page, pane, "Background 1");
-  const picture = await averageColour(tile.locator("img"));
-  await tile.click();
-  await expect(tile).toHaveAttribute("aria-checked", "true");
-  await expectWearing(preview, picture, camera);
-});
-
-test("keeps every effect reachable in a small container", async ({ page }) => {
-  const { username, roomId } = await createUserAndRoom("effectsreach");
-  const panes = await startHarness(page, username, roomId);
-  const pane = panes.first();
-  const container = pane.getByTestId("call-container");
-  await resizeContainer(container, { width: 400, height: 360 });
-  await expect(pane.getByTestId("lobby_joinCall")).toBeVisible({
-    timeout: 60_000,
-  });
-
-  const last = await openEffect(page, pane, "Background 2");
-  const list = page.locator("[role='menu'] div[role='none']").first();
-  expect((await list.boundingBox())!.height).toBeLessThanOrEqual(
-    (await container.boundingBox())!.height,
-  );
-  await last.scrollIntoViewIfNeeded();
-  await expect(last).toBeInViewport({ ratio: 1 });
-  await last.click();
-  await expect(last).toHaveAttribute("aria-checked", "true");
-});
-
-/** Opens a component's camera menu and returns one of its effects. */
-async function openEffect(
-  page: Page,
-  pane: Locator,
-  name: string,
-): Promise<Locator> {
-  await pane
-    .getByRole("button", { name: "Camera", exact: true })
-    .click({ timeout: 60_000 });
-  // Portalled out of the pane, so found on the page.
-  return page
-    .getByRole("group", { name: "Background effects" })
-    .getByRole("menuitemradio", { name });
-}
@@ -125,24 +125,25 @@ test("leaves the host's own page unstyled", async ({ page }) => {
    timeout: 60_000,
  });

-  // Element Call's page-wide CSS (normalize.css and the tokens in base.css)
-  // should not reach the host's page. Compound CSS that gets loaded to EW (host)
-  // on the other hand should impact the host. So probe with styles only Element Call sets:
-  // - A fresh <sub> keeps the browser's `vertical-align: sub` unless
-  //   normalize.css leaked; it turns that into `baseline`.
-  // - `--font-scale` is Element Call's own token, so `:root` must not have it.
+  // Element Call's stylesheet is written for a page of its own: normalize.css
+  // gives `html` a line height, Compound gives `body` its font and feature
+  // settings, and the design tokens live on `:root`. None of that may reach the
+  // host's document — the harness sets none of these itself, so anything other
+  // than the browser's defaults here came from us.
  const host = await page.evaluate(() => {
-    const sub = document.body.appendChild(document.createElement("sub"));
-    const verticalAlign = getComputedStyle(sub).verticalAlign;
-    sub.remove();
+    const html = getComputedStyle(document.documentElement);
+    const body = getComputedStyle(document.body);
    return {
-      verticalAlign,
-      token: getComputedStyle(document.documentElement).getPropertyValue(
-        "--font-scale",
-      ),
+      lineHeight: html.lineHeight,
+      fontFeatureSettings: body.fontFeatureSettings,
+      token: html.getPropertyValue("--cpd-color-text-primary"),
    };
  });
-  expect(host).toEqual({ verticalAlign: "sub", token: "" });
+  expect(host).toEqual({
+    lineHeight: "normal",
+    fontFeatureSettings: "normal",
+    token: "",
+  });

  // While inside the container, the same rules do apply
  const root = panes.first().locator("[data-element-call-root]");
@@ -29,10 +29,47 @@ export interface MyFixtures {
  addUser: (username: string, host: string) => Promise<UserBaseFixture>;
 }

+// Minimal config.json for the local element-web instance
+const CONFIG_JSON = {
+  default_server_config: {
+    "m.homeserver": {
+      base_url: "https://synapse.m.localhost",
+      server_name: "synapse.m.localhost",
+    },
+  },
+
+  element_call: {
+    participant_limit: 8,
+    brand: "Element Call",
+  },
+
+  // The default language is set here for test consistency
+  setting_defaults: {
+    language: "en-GB",
+    feature_group_calls: true,
+  },
+
+  // the location tests want a map style url.
+  map_style_url:
+    "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx",
+
+  features: {
+    // We don't want to go through the feature announcement during the e2e test
+    feature_release_announcement: false,
+    feature_element_call_video_rooms: true,
+    feature_video_rooms: true,
+    feature_group_calls: true,
+  },
+};
+
 export const widgetTest = test.extend<MyFixtures>({
  // allow per-test override: `widgetTest.use({ callType: "dm" })`
  callType: ["room", { option: true }],
-  asWidget: async ({ browser, callType }, pUse) => {
+  asWidget: async ({ browser, context, callType }, pUse) => {
+    await context.route(`http://localhost:8081/config.json*`, async (route) => {
+      await route.fulfill({ json: CONFIG_JSON });
+    });
+
    const brooksDisplayName = `brooks_${Date.now()}`;
    const whistlerDisplayName = `whistler_${Date.now()}`;

@@ -72,7 +109,15 @@ export const widgetTest = test.extend<MyFixtures>({
      await TestHelpers.dismissInviteUnknownUserModal(ewPage1);

      // Accept the invite
-      await TestHelpers.openRoomInvite(ewPage2, "Welcome Room");
+      await TestHelpers.closeReleaseAnnouncement(
+        ewPage2,
+        "Introducing Sections",
+      );
+      await TestHelpers.expandAllSections(ewPage2);
+      await expect(
+        TestHelpers.roomListItem(ewPage2, "Welcome Room"),
+      ).toBeVisible();
+      await TestHelpers.roomListItem(ewPage2, "Welcome Room").click();
      await ewPage2.getByRole("button", { name: "Accept" }).click();
      await expect(
        ewPage2
@@ -80,7 +125,17 @@ export const widgetTest = test.extend<MyFixtures>({
          .getByRole("heading", { name: "Welcome Room" }),
      ).toBeVisible();
    } else if (callType === "dm") {
-      await TestHelpers.chooseFromRoomListNewMenu(ewPage1, "Start chat");
+      await TestHelpers.closeReleaseAnnouncement(
+        ewPage1,
+        "Introducing Sections",
+      );
+
+      await ewPage1
+        .getByRole("navigation", { name: "Room list" })
+        .getByRole("button", { name: "New", exact: true })
+        .click();
+
+      await ewPage1.getByRole("menuitem", { name: "Start chat" }).click();
      await ewPage1.getByRole("textbox", { name: "Search" }).click();
      await ewPage1.getByRole("textbox", { name: "Search" }).fill(whistlerMxId);
      await ewPage1.getByRole("button", { name: "Go" }).click();
@@ -102,7 +157,12 @@ export const widgetTest = test.extend<MyFixtures>({
      ).toBeVisible();

      // Accept the DM invite from brooks
-      await TestHelpers.openRoomInvite(ewPage2, brooksDisplayName);
+      await TestHelpers.closeReleaseAnnouncement(
+        ewPage2,
+        "Introducing Sections",
+      );
+      await TestHelpers.expandAllSections(ewPage2);
+      await TestHelpers.roomListItem(ewPage2, brooksDisplayName).click();
      await ewPage2.getByRole("button", { name: "Start chatting" }).click();
    }

@@ -127,14 +187,13 @@ export const widgetTest = test.extend<MyFixtures>({
   * Provide a way to add additional users within a test.
   * The returned user will be registered on the default homeserver, the name will be made unique by appending a timestamp.
   */
-  addUser: async ({ browser }, use, testInfo) => {
+  addUser: async ({ browser }, use) => {
    await use(
      async (
        username: string,
        host: string = HOST1,
      ): Promise<UserBaseFixture> => {
-        // Tests in parallel workers can reach this in the same millisecond.
-        const uniqueSuffix = `${Date.now()}_${testInfo.parallelIndex}`;
+        const uniqueSuffix = Date.now();
        const { page, clientHandle, mxId } = await TestHelpers.registerUser(
          browser,
          `${username.toLowerCase()}_${uniqueSuffix}`,
@@ -1,55 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, type Locator } from "@playwright/test";
-
-export type Colour = [number, number, number];
-
-/** The camera's colour, once the preview is showing it rather than nothing. */
-export async function cameraColour(preview: Locator): Promise<Colour> {
-  await expect
-    .poll(async () => Math.max(...(await averageColour(preview))))
-    .toBeGreaterThan(40);
-  return averageColour(preview);
-}
-
-/** The mean colour of a video's current frame or an image, drawn small. */
-export async function averageColour(element: Locator): Promise<Colour> {
-  return element.evaluate(
-    async (source: HTMLVideoElement | HTMLImageElement) => {
-      if (source instanceof HTMLImageElement) await source.decode();
-      const canvas = document.createElement("canvas");
-      canvas.width = canvas.height = 32;
-      const context = canvas.getContext("2d")!;
-      context.drawImage(source, 0, 0, 32, 32);
-      const { data } = context.getImageData(0, 0, 32, 32);
-      const sum = [0, 0, 0];
-      for (let i = 0; i < data.length; i += 4)
-        for (let c = 0; c < 3; c++) sum[c] += data[i + c];
-      const pixels = data.length / 4;
-      return sum.map((s) => s / pixels) as Colour;
-    },
-  );
-}
-
-export function distance(a: Colour, b: Colour): number {
-  return Math.hypot(a[0] - b[0], a[1] - b[1], a[2] - b[2]);
-}
-
-/** Waits until a preview shows a picture rather than the camera. */
-export async function expectWearing(
-  preview: Locator,
-  picture: Colour,
-  camera: Colour,
-): Promise<void> {
-  // Long enough for the first effect of a session to be built.
-  await expect
-    .poll(async () => distance(await averageColour(preview), picture), {
-      timeout: 60_000,
-    })
-    .toBeLessThan(distance(camera, picture) / 2);
-}
@@ -1,43 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, test } from "@playwright/test";
-
-import { widgetTest } from "../fixtures/widget-user.ts";
-import { TestHelpers } from "./test-helpers.ts";
-import { averageColour, cameraColour, expectWearing } from "../utils/colour.ts";
-
-// Background effects need WebGL2, and headless Firefox on a CI runner has none,
-// so it rightly offers none of them.
-test.skip(
-  ({ browserName }) => browserName === "firefox",
-  "Background effects need WebGL2, which headless Firefox on CI does not have",
-);
-
-widgetTest(
-  "puts a picture on the preview inside Element Web",
-  async ({ asWidget }) => {
-    test.slow();
-    const { brooks } = asWidget;
-    await TestHelpers.startCallInCurrentRoom(brooks.page, false);
-    const frame = brooks.page
-      .locator('iframe[title="Element Call"]')
-      .contentFrame();
-    await expect(frame.getByTestId("lobby_joinCall")).toBeVisible();
-    const preview = frame.locator("video").first();
-    const camera = await cameraColour(preview);
-
-    await frame.getByRole("button", { name: "Camera", exact: true }).click();
-    const tile = frame
-      .getByRole("group", { name: "Background effects" })
-      .getByRole("menuitemradio", { name: "Background 1" });
-    const picture = await averageColour(tile.locator("img"));
-    await tile.click();
-    await expect(tile).toHaveAttribute("aria-checked", "true");
-    await expectWearing(preview, picture, camera);
-  },
-);
@@ -1,20 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { test as setup } from "@playwright/test";
-import { execFileSync } from "node:child_process";
-import { mkdirSync } from "node:fs";
-
-const EMBEDDED_DIST = "embedded/web/dist";
-
-setup("build the embedded package", () => {
-  setup.setTimeout(10 * 60 * 1000);
-  mkdirSync(EMBEDDED_DIST, { recursive: true });
-  execFileSync("pnpm", ["build:embedded", "--outDir", EMBEDDED_DIST], {
-    stdio: "inherit",
-  });
-});
@@ -1,56 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, type Route } from "@playwright/test";
-
-import { widgetTest } from "../../fixtures/widget-user.ts";
-import { HOST2, TestHelpers } from "../test-helpers.ts";
-
-/** Where the other site's Element Web serves the embedded package from */
-const CONFIG_JSON = "**/widgets/element-call/config.json";
-
-const HOST_ANSWERS: Record<string, (route: Route) => Promise<void>> = {
-  "a 404": async (route) => route.fulfill({ status: 404 }),
-  "a failed fetch": async (route) => route.abort("failed"),
-  "an HTML page": async (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "text/html",
-      body: "<!doctype html><title>Element</title>",
-    }),
-};
-
-widgetTest.skip(
-  ({ browserName }) => browserName === "firefox",
-  "The widget suite does not run on Firefox, see the other specs here",
-);
-
-for (const [answer, respond] of Object.entries(HOST_ANSWERS)) {
-  widgetTest(
-    `reaches the lobby when config.json gets ${answer}`,
-    async ({ addUser }) => {
-      const { page } = await addUser("Brooks", HOST2);
-      await TestHelpers.createRoom("Config Room", page);
-
-      let answered = 0;
-      await page.route(CONFIG_JSON, async (route) => {
-        answered++;
-        await respond(route);
-      });
-
-      await TestHelpers.startCallInCurrentRoom(page);
-
-      await expect(
-        page
-          .locator('iframe[title="Element Call"]')
-          .contentFrame()
-          .getByTestId("lobby_joinCall"),
-      ).toBeVisible({ timeout: 15000 });
-      expect(answered).toBeGreaterThan(0);
-    },
-  );
-}
@@ -144,11 +144,7 @@ export class TestHelpers {

    await this.dismissStartupToasts(page);

-    // The other site's Element Web opens the embedded package it serves itself
-    // (see docker-compose-playwright.yml), not the dev server's app.
-    if (host !== HOST2) {
-      await TestHelpers.setDevToolElementCallDevUrl(page);
-    }
+    await TestHelpers.setDevToolElementCallDevUrl(page);

    const clientHandle = await page.evaluateHandle(() =>
      window.mxMatrixClientPeg.get(),
@@ -157,40 +153,29 @@ export class TestHelpers {
    return { page, clientHandle, mxId };
  }

-  // Dismisses the toasts a fresh device gets after sign-in.
-  //
-  // Toasts stack and only the top one can be dismissed, so look
-  // at what is on top each time.
+  // Dismisses any toasts that appear on startup, such as "Failed to load service worker" or "Back up your chats".
+  // Toast can be stacked, and only the top one can be dismiss, so just look at what is on top and
+  // dismiss (if part of expected toats)
  public static async dismissStartupToasts(page: Page): Promise<void> {
-    const expectedToasts: {
-      title: string;
-      button: string;
-      confirm?: string;
-    }[] = [
+    const expectedToasts = [
      { title: "Failed to load service worker", button: "OK" },
-      { title: "Verify this device", button: "Later" },
      { title: "Back up your chats", button: "Not now" },
-      {
-        title: "Turn on key storage",
-        button: "Dismiss",
-        confirm: "Yes, dismiss",
-      },
-      { title: "Notifications", button: "Dismiss" },
+      { title: "Turn on key storage", button: "Dismiss" },
      { title: "Element does not support this browser", button: "Dismiss" },
    ];

    const toast = page.locator(".mx_Toast_toast");
-    const toastTitle = toast.locator(".mx_Toast_title h2");

    // eslint-disable-next-line no-constant-condition
    while (true) {
      try {
        await toast.waitFor({ state: "visible", timeout: 700 });
-        const title = await toastTitle.textContent();
-        if (!title) break;
+        const title = await toast.locator(".mx_Toast_title h2").textContent();

        // Find the matching toast config
-        const toastConfig = expectedToasts.find((t) => title.includes(t.title));
+        const toastConfig = expectedToasts.find((t) =>
+          title?.includes(t.title),
+        );

        if (toastConfig) {
          // Bounded so that a renamed button leaves the toast in place and the
@@ -198,16 +183,6 @@ export class TestHelpers {
          await toast
            .getByRole("button", { name: toastConfig.button })
            .click({ timeout: 5000 });
-          if (toastConfig.confirm) {
-            const dialog = page.getByRole("dialog");
-            await dialog
-              .getByRole("button", { name: toastConfig.confirm })
-              .click({ timeout: 5000 });
-            await expect(dialog).toBeHidden({ timeout: 5000 });
-          }
-          // The same element shows the next toast a moment after the click, so
-          // reading it straight away acts on the dismissed one a second time
-          await expect(toastTitle).not.toHaveText(title, { timeout: 5000 });
        } else {
          // Unknown toast. We don't want to act on unknown toasts
          break;
@@ -219,6 +194,20 @@ export class TestHelpers {
    }
  }

+  public static async closeReleaseAnnouncement(
+    page: Page,
+    name: string,
+  ): Promise<void> {
+    try {
+      await page
+        .getByRole("dialog", { name })
+        .getByRole("button", { name: "OK" })
+        .click({ timeout: 2000 });
+    } catch {
+      // Announcement not shown; nothing to do
+    }
+  }
+
  public static async expandAllSections(page: Page): Promise<void> {
    try {
      await page
@@ -234,7 +223,16 @@ export class TestHelpers {
    page: Page,
    andInvite: string[] = [],
  ): Promise<void> {
-    await TestHelpers.chooseFromRoomListNewMenu(page, "New Room");
+    await TestHelpers.closeReleaseAnnouncement(page, "Introducing Sections");
+
+    await page
+      .getByRole("navigation", { name: "Room list" })
+      .getByRole("button", { name: "New", exact: true })
+      .click();
+
+    await page.getByRole("menuitem", { name: "New Room" }).click({
+      timeout: 5000,
+    });
    await page.getByRole("textbox", { name: "Name" }).fill(name);
    await page.getByRole("button", { name: "Create room" }).click();
    await expect(page.getByText("You created this room.")).toBeVisible({
@@ -261,24 +259,6 @@ export class TestHelpers {
    }
  }

-  /**
-   * Opens the room list's "New" menu and picks the given item.
-   *
-   * Driven by keyboard, as a toast arriving late sits over the button and
-   * swallows clicks.
-   */
-  public static async chooseFromRoomListNewMenu(
-    page: Page,
-    itemName: string,
-  ): Promise<void> {
-    await TestHelpers.dismissStartupToasts(page);
-    await page
-      .getByRole("navigation", { name: "Room list" })
-      .getByRole("button", { name: "New", exact: true })
-      .press("Enter");
-    await page.getByRole("menuitem", { name: itemName }).press("Enter");
-  }
-
  /**
   * Accepts a room invite using the room name.
   * Locatest the invite in the room list.
@@ -288,7 +268,9 @@ export class TestHelpers {
    roomName: string,
    page: Page,
  ): Promise<void> {
-    await TestHelpers.openRoomInvite(page, roomName);
+    await TestHelpers.closeReleaseAnnouncement(page, "Introducing Sections");
+    await TestHelpers.expandAllSections(page);
+    await TestHelpers.roomListItem(page, roomName).click({ timeout: 10000 });
    await page.getByRole("button", { name: "Accept" }).click({
      timeout: 5000,
    });
@@ -394,28 +376,6 @@ export class TestHelpers {
    return page.locator(`[aria-label^="Open room ${roomName}"]`);
  }

-  /**
-   * Opens a pending invite from the room list by its room name.
-   *
-   * Element Web collapses the Invites section every time it appears, so it is
-   * expanded here once the invite has arrived.
-   */
-  public static async openRoomInvite(
-    page: Page,
-    roomName: string,
-  ): Promise<void> {
-    const invitesSection = page.getByRole("button", {
-      name: "Toggle Invites section",
-    });
-    await expect(invitesSection).toBeVisible({ timeout: 10000 });
-    // Toasts sit over the top of the room list, where this header is.
-    await TestHelpers.dismissStartupToasts(page);
-    if ((await invitesSection.getAttribute("aria-expanded")) !== "true") {
-      await invitesSection.click();
-    }
-    await TestHelpers.roomListItem(page, roomName).click({ timeout: 10000 });
-  }
-
  /**
   * Switches to a room in the room list by its name.
   * @param page - The EW page
@@ -8,7 +8,7 @@ overrides:
  '@livekit/components-core>rxjs': ^7.8.1
  '@livekit/track-processors>@mediapipe/tasks-vision': ^0.10.18
  tar: ^7.5.11
-  minimatch: ^11.0.0
+  minimatch: ^10.2.3
  glob: ^10.5.0
  qs: ^6.15.2
  js-yaml: ^4.2.0
@@ -40,6 +40,9 @@ importers:
      '@livekit/components-core':
        specifier: ^0.12.0
        version: 0.12.15(livekit-client@2.23.0(@types/dom-mediacapture-record@1.0.22))(tslib@2.8.1)
+      '@livekit/components-react':
+        specifier: ^2.0.0
+        version: 2.9.24(livekit-client@2.23.0(@types/dom-mediacapture-record@1.0.22))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(tslib@2.8.1)
      '@livekit/track-processors':
        specifier: ^0.7.1
        version: 0.7.2(@types/dom-mediacapture-transform@0.1.11)(livekit-client@2.23.0(@types/dom-mediacapture-record@1.0.22))
@@ -63,7 +66,7 @@ importers:
        version: 10.1.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
      '@rolldown/plugin-babel':
        specifier: ^0.2.3
-        version: 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.8)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))
+        version: 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))
      '@sentry/react':
        specifier: ^8.0.0
        version: 8.55.2(react@19.2.8)
@@ -131,11 +134,11 @@ importers:
        specifier: ^11.0.0
        version: 11.3.1(@types/react@19.2.18)(react@19.2.8)
      '@vector-im/compound-web':
-        specifier: ^10.5.0
-        version: 10.5.0(@fontsource/inconsolata@5.3.0)(@fontsource/inter@5.3.0)(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(@vector-im/compound-design-tokens@11.3.1(@types/react@19.2.18)(react@19.2.8))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        specifier: ^10.4.0
+        version: 10.4.0(@fontsource/inconsolata@5.3.0)(@fontsource/inter@5.3.0)(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(@vector-im/compound-design-tokens@11.3.1(@types/react@19.2.18)(react@19.2.8))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
      '@vitejs/plugin-react':
        specifier: ^6.0.2
-        version: 6.1.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.8)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))
+        version: 6.1.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))
      '@vitest/browser-playwright':
        specifier: ^4.1.5
        version: 4.1.11(playwright@1.62.1)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))(vitest@4.1.11)
@@ -160,9 +163,6 @@ importers:
      eslint-plugin-storybook:
        specifier: ^10.3.6
        version: 10.6.2(eslint@8.57.1(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)
-      fake-indexeddb:
-        specifier: ^6.2.5
-        version: 6.2.5
      fetch-mock:
        specifier: 11.1.5
        version: 11.1.5(node-fetch@2.7.0)
@@ -191,8 +191,8 @@ importers:
        specifier: ^1.9.1
        version: 1.9.2
      matrix-js-sdk:
-        specifier: github:matrix-org/matrix-js-sdk#dc8610e796c92553c658300a4882dde961a0678a
-        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/dc8610e796c92553c658300a4882dde961a0678a
+        specifier: github:matrix-org/matrix-js-sdk#3f05dc4d104a3dfc753c5e3549a18c74fab4b076
+        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3f05dc4d104a3dfc753c5e3549a18c74fab4b076
      matrix-widget-api:
        specifier: ^1.18.0
        version: 1.20.0
@@ -224,8 +224,8 @@ importers:
        specifier: ^7.1.1
        version: 7.1.6
      posthog-js:
-        specifier: 1.408.2
-        version: 1.408.2
+        specifier: 1.438.24
+        version: 1.438.24(@types/react@19.2.18)(react@19.2.8)
      qrcode:
        specifier: ^1.5.4
        version: 1.5.4
@@ -397,8 +397,8 @@ packages:
    resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==}
    engines: {node: '>=6.9.0'}

-  '@babel/runtime@8.0.8':
-    resolution: {integrity: sha512-dEu8nGlRqjsJsvviUUoSMfcRHpwomCiRlXsc2mPfJ79+ffTpDm+JtfUtTMzUrqCApHQnCsVPD3gT1ZT8RgBRCQ==}
+  '@babel/runtime@8.0.0':
+    resolution: {integrity: sha512-sL6cvO2IfkSu/iU+zs2S/w01B7A8V7suXSIKEN4hPFFdZoiPGxrj5pAG0lCaqLWiEIrjKzdznIWuaLcxPR53qw==}

  '@babel/template@7.29.7':
    resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
@@ -1145,9 +1145,6 @@ packages:
    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
    engines: {node: '>=12'}

-  '@isaacs/nonrecursive-glob-match@1.0.3':
-    resolution: {integrity: sha512-SI7kyKHq4XXDRozw+r9GlRZkia1ZkFrpLW98r2IC2Bpr8YkFGE3fvjzmxCG0x78A++69HmDNrDvSMYBZmHGpKA==}
-
  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0':
    resolution: {integrity: sha512-qvsTEwEFefhdirGOPnu9Wp6ChfIwy2dBCRuETU3uE+4cC+PFoxMSiiEhxk4lOluA34eARHA0OxqsEUYDqRMgeQ==}
    peerDependencies:
@@ -1183,6 +1180,19 @@ packages:
      livekit-client: ^2.20.1
      tslib: ^2.6.2

+  '@livekit/components-react@2.9.24':
+    resolution: {integrity: sha512-qw5Oy1EfPg1f/xrKYrFielSrmtxY8BZ9mDt6299G5aikotQIztmldBfTNosrVS7VSNit7qeYfOFSyKaML20W6Q==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@livekit/krisp-noise-filter': ^0.2.12 || ^0.3.0 || ^0.4.0
+      livekit-client: ^2.20.1
+      react: '>=18'
+      react-dom: '>=18'
+      tslib: ^2.6.2
+    peerDependenciesMeta:
+      '@livekit/krisp-noise-filter':
+        optional: true
+
  '@livekit/mutex@1.1.1':
    resolution: {integrity: sha512-EsshAucklmpuUAfkABPxJNhzj9v2sG7JuzFDL4ML1oJQSV14sqrpTYnsaOudMAw9yOaW53NU3QQTlUQoRs4czw==}

@@ -1997,14 +2007,14 @@ packages:
  '@polka/url@1.0.0-next.29':
    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}

-  '@posthog/browser-common@0.2.5':
-    resolution: {integrity: sha512-g95viLlEqPl92+ar3hEzlQbPqKB0Hp7AoYVaEmvXdjUiYfG3XP+qwzPRFmULNEGLDMSKL7T+MFHvs2/EswcE+g==}
+  '@posthog/browser-common@0.9.12':
+    resolution: {integrity: sha512-pKYLYgV0o4UK5PAQ3OTlZpQnKvcBpG+UOqWYa+W41Omec8TlI6FXzGMHdYMTmaymxii0vi9R4jLVi7JQSr4vnQ==}

-  '@posthog/core@1.46.4':
-    resolution: {integrity: sha512-ZfUqZ+6f+4x3usHKjq6ZGQalCMrkKGycIS9ojlVshTdj9bT5slTbv/K6nY95ecWiyKUMoaVQnuXiSB5x6lWHcQ==}
+  '@posthog/core@1.62.0':
+    resolution: {integrity: sha512-KjNwGC7s0141wnWWHubNMdg1lOhZjqKRw2OTNstuzdVvNDfvv2RbFJQSSvvABmbCmTXwlMpdnbb/M/aAigDnNQ==}

-  '@posthog/types@1.400.0':
-    resolution: {integrity: sha512-0VVOXFrkh0TEAfmptoUqFGbhEzygQyWYQZYPlw0v0QYJfXTYlnlhr/QMMF3NAGKakFwOAn9ZZnlpEFeaLhZ/Cg==}
+  '@posthog/types@1.419.0':
+    resolution: {integrity: sha512-XX7zRYt/vK8AzaD6V+oDquAzacZf5exJv971dja9En8Qf6g84Qvc3rpT0w6hDYYLWrjaSSkdjFfvvoXI0ouJDg==}

  '@radix-ui/number@1.1.3':
    resolution: {integrity: sha512-Road2bidD0uu/1BGDOWNdPI06g0lIRy6IF9GZcIrDK2KGItfor8IQwQa+yM2ERgHM1MmHxaxpTzk0/Jp42lNfA==}
@@ -3300,8 +3310,8 @@ packages:
      react:
        optional: true

-  '@vector-im/compound-web@10.5.0':
-    resolution: {integrity: sha512-dcxIAKtTKBLKz2Y83mNkXyYx3shtSs80KvdGKN5ryFvo6OnVOhHPEHiQNbaPQ0EDjc6xStjY9+oz2Fh4c+kniQ==}
+  '@vector-im/compound-web@10.4.0':
+    resolution: {integrity: sha512-Tt5hsNK7ulhGdRuy9lzSm5C+T8M/4O4kLDFLkaU+Hi1kVWj6tj/5awW+U+GvtpWRh5llbHN2HRCh79+gQhek+A==}
    peerDependencies:
      '@fontsource/inconsolata': ^5
      '@fontsource/inter': ^5
@@ -3533,8 +3543,8 @@ packages:
  boolbase@1.0.0:
    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}

-  brace-expansion@5.0.12:
-    resolution: {integrity: sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
    engines: {node: 20 || >=22}

  braces@3.0.3:
@@ -3678,6 +3688,10 @@ packages:
  cliui@6.0.0:
    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}

+  clsx@2.1.1:
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+    engines: {node: '>=6'}
+
  color-convert@2.0.1:
    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
    engines: {node: '>=7.0.0'}
@@ -4054,10 +4068,6 @@ packages:
    resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==}
    engines: {node: '>=12.0.0'}

-  fake-indexeddb@6.2.5:
-    resolution: {integrity: sha512-CGnyrvbhPlWYMngksqrSSUT1BAVP49dZocrHuK0SvtR0D5TMs5wP0o3j7jexDJW01KSadjBp1M/71o/KR3nD1w==}
-    engines: {node: '>=18'}
-
  fast-deep-equal@3.1.3:
    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}

@@ -4517,6 +4527,9 @@ packages:
  jose@6.2.13:
    resolution: {integrity: sha512-7TIg10ZE1x82YediN+lcrPNvGMKge9yFHQD+Qho/b8y2adfugU3AsvvHfxV0fzyFllT6l9xCjf4RWY9g/Z9PJQ==}

+  jose@6.2.9:
+    resolution: {integrity: sha512-XrchZOFZUl/T3vTwRe8XK+cJrGtMF4th1ARnDfwbBXFKThGhlsxEE4Zu03AD/bjJSt/9jT/mxrOCkJWOg77aPA==}
+
  js-tokens@10.0.0:
    resolution: {integrity: sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==}

@@ -4672,6 +4685,9 @@ packages:
  lodash-es@4.18.1:
    resolution: {integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==}

+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
  lodash.merge@4.6.2:
    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}

@@ -4734,9 +4750,9 @@ packages:
  matrix-events-sdk@0.0.1:
    resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==}

-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/dc8610e796c92553c658300a4882dde961a0678a:
-    resolution: {gitHosted: true, integrity: sha512-Ldt/VkCzBtre6m1cn0FqgrzRV0GrgWIoARgQUQO58ef2Edu2ERFCINPzp/psFS5RwoN3RIy9Rm4oPVc1ATkEWA==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/dc8610e796c92553c658300a4882dde961a0678a}
-    version: 45.0.0
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3f05dc4d104a3dfc753c5e3549a18c74fab4b076:
+    resolution: {gitHosted: true, integrity: sha512-Ly8eS7fNNKDo9KmPvTkE49KvD8iMUmrVWJMNERNuxc8UksMLMG36NLz3fs8HytdwrB7AKPfyVo392VZsxILDIg==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3f05dc4d104a3dfc753c5e3549a18c74fab4b076}
+    version: 44.0.0
    engines: {node: '>=22.0.0'}

  matrix-widget-api@1.20.0:
@@ -4771,9 +4787,9 @@ packages:
  minimalistic-crypto-utils@1.0.1:
    resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==}

-  minimatch@11.0.4:
-    resolution: {integrity: sha512-/UJ1dEoVQTjPNDh6SGlUo+ueLMmoHTas4q+8yaAR/5t6nLAIiBDJtoYUh20IYleix7ehiQkgczb84PE3uzHkxg==}
-    engines: {node: 20 || >=22}
+  minimatch@10.2.6:
+    resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==}
+    engines: {node: 18 || 20 || >=22}

  minimist@1.2.8:
    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
@@ -4946,8 +4962,8 @@ packages:
    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
    engines: {node: '>=10'}

-  p-retry@9.0.0:
-    resolution: {integrity: sha512-HuEats8gYn/UUYa5uyveyQGv75mQmwdFtuMgnZlS12dj/7bdnJSO6keaTjgcZUhvkANTj5EO3lACUmV3xmgj0Q==}
+  p-retry@8.0.1:
+    resolution: {integrity: sha512-NAigyu8hfvJe7MsS18mnc4is0MZtau3QMdBklaJKK23oBQb6occO3UPM3vHmTckW8KhfyjMZaUOqdTFEYliHgg==}
    engines: {node: '>=22'}

  p-try@2.2.0:
@@ -5241,8 +5257,16 @@ packages:
    resolution: {integrity: sha512-YUbWYCgErwnMAVkjUnYa+KlMBzGpHwiIt/DE7f0G33AuX2LH9UcTk6KgWxd3zRU+pN3u/C+Xl3EnMLM4Hea7Sg==}
    engines: {node: ^10 || ^12 || >=14}

-  posthog-js@1.408.2:
-    resolution: {integrity: sha512-5aIjBy98bbob+6StDa3ZwW7IkB7MAT+61uA2In2yRmP5O2vU6ytX3caZJZGXCphJvW2b2u+AQsBuWNBM5cxzyg==}
+  posthog-js@1.438.24:
+    resolution: {integrity: sha512-spRkm2eZjBKpJovgoMq30S1lvnwD7s8ZQcTjADf6iLHFCD1RdIjakZ8mKy+Lnt1Wj7kkRe+mXVb+lUCDKa6aQw==}
+    peerDependencies:
+      '@types/react': '>=16.8.0'
+      react: '>=16.8.0'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      react:
+        optional: true

  preact@10.29.8:
    resolution: {integrity: sha512-ej2aVZ+vZ8WO7tvlQWRM9N63A0KzF9q4mWJfDUHgYaIofWY9hu74QdnQrjoPMmZi2/nZ5gN0bJCQF49xQqx09Q==}
@@ -5318,10 +5342,6 @@ packages:
  randomfill@1.0.4:
    resolution: {integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==}

-  re2js@2.9.1:
-    resolution: {integrity: sha512-JIT3bEEUZTOR2YS1walNEIfH4cF/cQeZcBUFq7ldqO6lR6g0X5CBq/S8rsa9omzZcsNf8qc36jCkWpKKtncrZg==}
-    engines: {node: '>=20.0.0'}
-
  react-docgen-typescript@2.4.0:
    resolution: {integrity: sha512-ZtAp5XTO5HRzQctjPU0ybY0RRCQO19X/8fxn3w7y2VVTUbGHDKULPTL4ky3vB05euSgG5NpALhEhDPvQ56wvXg==}
    peerDependencies:
@@ -5967,6 +5987,12 @@ packages:
    peerDependencies:
      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0

+  usehooks-ts@3.1.1:
+    resolution: {integrity: sha512-I4diPp9Cq6ieSUH2wu+fDAVQO43xwtulo+fKEidHUwZPnYImbtkTjzIJYcDcJqxgmX31GVqNFURodvcgHcW0pA==}
+    engines: {node: '>=16.15.0'}
+    peerDependencies:
+      react: ^16.8.0  || ^17 || ^18 || ^19 || ^19.0.0-rc
+
  util-deprecate@1.0.2:
    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}

@@ -6113,8 +6139,11 @@ packages:
    resolution: {integrity: sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==}
    engines: {node: 20 || >=22}

-  web-vitals@5.3.0:
-    resolution: {integrity: sha512-q6LWsLatGYZp5VGBIOvbTj6JBV2nOmC8KvWztXBmwJcfFAzhwKwbOxhUH306XY3CcaZDUlSmSuNPBsCn0bFu+g==}
+  web-vitals@6.2.1:
+    resolution: {integrity: sha512-rLcLXA2sx6+9dE88NHFubwTtGxpK4yYBLj6qHPdFoCaLr0cXGb4efOqtKLlm4loGA4OEKHIQKMKzZkKyOh5ctw==}
+
+  web-vitals@6.2.3:
+    resolution: {integrity: sha512-Dmy+vdO1UPMqXiAtZSNayhl4f794Bxfd94W4HIj2HlYtczEQfEOon969memlcpcHrTuOKLa5baFjX7WbgmOq+A==}

  webidl-conversions@3.0.1:
    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
@@ -6406,7 +6435,7 @@ snapshots:

  '@babel/runtime@7.29.7': {}

-  '@babel/runtime@8.0.8': {}
+  '@babel/runtime@8.0.0': {}

  '@babel/template@7.29.7':
    dependencies:
@@ -6909,7 +6938,7 @@ snapshots:
      ignore: 5.3.2
      import-fresh: 3.3.1
      js-yaml: 4.3.1
-      minimatch: 11.0.4
+      minimatch: 10.2.6
      strip-json-comments: 3.1.1
    transitivePeerDependencies:
      - supports-color
@@ -6988,7 +7017,7 @@ snapshots:
    dependencies:
      '@humanwhocodes/object-schema': 2.0.3
      debug: 4.4.3(supports-color@7.2.0)
-      minimatch: 11.0.4
+      minimatch: 10.2.6
    transitivePeerDependencies:
      - supports-color

@@ -7124,8 +7153,6 @@ snapshots:
      wrap-ansi: 8.1.0
      wrap-ansi-cjs: wrap-ansi@7.0.0

-  '@isaacs/nonrecursive-glob-match@1.0.3': {}
-
  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(typescript@5.9.3)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))':
    dependencies:
      glob: 10.5.0
@@ -7166,6 +7193,18 @@ snapshots:
      rxjs: 7.8.2
      tslib: 2.8.1

+  '@livekit/components-react@2.9.24(livekit-client@2.23.0(@types/dom-mediacapture-record@1.0.22))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(tslib@2.8.1)':
+    dependencies:
+      '@livekit/components-core': 0.12.15(livekit-client@2.23.0(@types/dom-mediacapture-record@1.0.22))(tslib@2.8.1)
+      clsx: 2.1.1
+      events: 3.3.0
+      jose: 6.2.9
+      livekit-client: 2.23.0(@types/dom-mediacapture-record@1.0.22)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      tslib: 2.8.1
+      usehooks-ts: 3.1.1(react@19.2.8)
+
  '@livekit/mutex@1.1.1': {}

  '@livekit/protocol@1.52.1':
@@ -7674,16 +7713,19 @@ snapshots:

  '@polka/url@1.0.0-next.29': {}

-  '@posthog/browser-common@0.2.5':
+  '@posthog/browser-common@0.9.12':
    dependencies:
-      '@posthog/core': 1.46.4
-      '@posthog/types': 1.400.0
+      '@posthog/core': 1.62.0
+      '@posthog/types': 1.419.0
+      preact: 10.29.8
+    transitivePeerDependencies:
+      - preact-render-to-string

-  '@posthog/core@1.46.4':
+  '@posthog/core@1.62.0':
    dependencies:
-      '@posthog/types': 1.400.0
+      '@posthog/types': 1.419.0

-  '@posthog/types@1.400.0': {}
+  '@posthog/types@1.419.0': {}

  '@radix-ui/number@1.1.3': {}

@@ -8118,13 +8160,13 @@ snapshots:
  '@rolldown/binding-win32-x64-msvc@1.2.15':
    optional: true

-  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.8)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))':
+  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))':
    dependencies:
      '@babel/core': 7.29.7(supports-color@7.2.0)
      picomatch: 4.0.4
      rolldown: 1.2.15
    optionalDependencies:
-      '@babel/runtime': 8.0.8
+      '@babel/runtime': 8.0.0
      vite: 8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0)

  '@rolldown/pluginutils@1.0.1': {}
@@ -8785,7 +8827,7 @@ snapshots:
      '@typescript-eslint/types': 8.69.0
      '@typescript-eslint/visitor-keys': 8.69.0
      debug: 4.4.3(supports-color@7.2.0)
-      minimatch: 11.0.4
+      minimatch: 10.2.6
      semver: 7.8.5
      tinyglobby: 0.2.17
      ts-api-utils: 2.5.0(typescript@5.9.3)
@@ -8800,7 +8842,7 @@ snapshots:
      '@typescript-eslint/types': 8.72.0
      '@typescript-eslint/visitor-keys': 8.72.0
      debug: 4.4.3(supports-color@7.2.0)
-      minimatch: 11.0.4
+      minimatch: 10.2.6
      semver: 7.8.5
      tinyglobby: 0.2.17
      ts-api-utils: 2.5.0(typescript@5.9.3)
@@ -8854,7 +8896,7 @@ snapshots:
      '@types/react': 19.2.18
      react: 19.2.8

-  '@vector-im/compound-web@10.5.0(@fontsource/inconsolata@5.3.0)(@fontsource/inter@5.3.0)(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(@vector-im/compound-design-tokens@11.3.1(@types/react@19.2.18)(react@19.2.8))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@vector-im/compound-web@10.4.0(@fontsource/inconsolata@5.3.0)(@fontsource/inter@5.3.0)(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(@vector-im/compound-design-tokens@11.3.1(@types/react@19.2.18)(react@19.2.8))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
    dependencies:
      '@floating-ui/react': 0.27.20(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
      '@floating-ui/react-dom': 2.1.9(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
@@ -8876,12 +8918,12 @@ snapshots:
      - '@types/react-dom'
      - react-dom

-  '@vitejs/plugin-react@6.1.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.8)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))':
+  '@vitejs/plugin-react@6.1.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))':
    dependencies:
      '@rolldown/pluginutils': 1.0.1
      vite: 8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0)
    optionalDependencies:
-      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.8)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))
+      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.2.15)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))
      babel-plugin-react-compiler: 1.0.0

  '@vitest/browser-playwright@4.1.11(playwright@1.62.1)(vite@8.2.4(@types/node@24.13.3)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.103.1)(terser@5.46.1)(yaml@2.9.0))(vitest@4.1.11)':
@@ -9125,7 +9167,7 @@ snapshots:

  boolbase@1.0.0: {}

-  brace-expansion@5.0.12:
+  brace-expansion@5.0.9:
    dependencies:
      balanced-match: 4.0.4

@@ -9303,6 +9345,8 @@ snapshots:
      strip-ansi: 6.0.1
      wrap-ansi: 6.2.0

+  clsx@2.1.1: {}
+
  color-convert@2.0.1:
    dependencies:
      color-name: 1.1.4
@@ -9670,7 +9714,7 @@ snapshots:
      json-stable-stringify-without-jsonify: 1.0.1
      levn: 0.4.1
      lodash.merge: 4.6.2
-      minimatch: 11.0.4
+      minimatch: 10.2.6
      natural-compare: 1.4.0
      optionator: 0.9.4
      strip-ansi: 6.0.1
@@ -9728,8 +9772,6 @@ snapshots:

  expect-type@1.4.0: {}

-  fake-indexeddb@6.2.5: {}
-
  fast-deep-equal@3.1.3: {}

  fast-glob@3.3.3:
@@ -9790,7 +9832,7 @@ snapshots:

  filelist@1.0.6:
    dependencies:
-      minimatch: 11.0.4
+      minimatch: 10.2.6

  fill-range@7.1.1:
    dependencies:
@@ -9890,7 +9932,7 @@ snapshots:
    dependencies:
      foreground-child: 3.3.1
      jackspeak: 3.4.3
-      minimatch: 11.0.4
+      minimatch: 10.2.6
      minipass: 7.1.3
      package-json-from-dist: 1.0.1
      path-scurry: 1.11.1
@@ -10015,7 +10057,7 @@ snapshots:
      jiti: 2.7.0
      jsonc-parser: 3.3.1
      magic-string: 1.2.3
-      minimatch: 11.0.4
+      minimatch: 10.2.6
      ora: 9.4.1
      react: 19.2.8
      react-i18next: 17.0.13(i18next@26.4.1(typescript@5.9.3))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@5.9.3)
@@ -10196,6 +10238,8 @@ snapshots:

  jose@6.2.13: {}

+  jose@6.2.9: {}
+
  js-tokens@10.0.0: {}

  js-tokens@4.0.0: {}
@@ -10356,6 +10400,8 @@ snapshots:

  lodash-es@4.18.1: {}

+  lodash.debounce@4.0.8: {}
+
  lodash.merge@4.6.2: {}

  log-symbols@7.0.1:
@@ -10413,9 +10459,9 @@ snapshots:

  matrix-events-sdk@0.0.1: {}

-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/dc8610e796c92553c658300a4882dde961a0678a:
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3f05dc4d104a3dfc753c5e3549a18c74fab4b076:
    dependencies:
-      '@babel/runtime': 8.0.8
+      '@babel/runtime': 8.0.0
      '@matrix-org/matrix-sdk-crypto-wasm': 18.9.0
      another-json: 0.2.0
      bs58: 6.0.0
@@ -10423,8 +10469,7 @@ snapshots:
      loglevel: 1.9.2
      matrix-events-sdk: 0.0.1
      matrix-widget-api: 1.20.0
-      p-retry: 9.0.0
-      re2js: 2.9.1
+      p-retry: 8.0.1
      sdp-transform: 3.0.0
      unhomoglyph: 1.0.6

@@ -10459,10 +10504,9 @@ snapshots:

  minimalistic-crypto-utils@1.0.1: {}

-  minimatch@11.0.4:
+  minimatch@10.2.6:
    dependencies:
-      '@isaacs/nonrecursive-glob-match': 1.0.3
-      brace-expansion: 5.0.12
+      brace-expansion: 5.0.9

  minimist@1.2.8: {}

@@ -10746,7 +10790,7 @@ snapshots:
    dependencies:
      p-limit: 3.1.0

-  p-retry@9.0.0:
+  p-retry@8.0.1:
    dependencies:
      is-network-error: 1.3.2

@@ -11092,17 +11136,21 @@ snapshots:
      picocolors: 1.1.1
      source-map-js: 1.2.2

-  posthog-js@1.408.2:
+  posthog-js@1.438.24(@types/react@19.2.18)(react@19.2.8):
    dependencies:
-      '@posthog/browser-common': 0.2.5
-      '@posthog/core': 1.46.4
-      '@posthog/types': 1.400.0
+      '@posthog/browser-common': 0.9.12
+      '@posthog/core': 1.62.0
+      '@posthog/types': 1.419.0
      core-js: 3.49.0
      dompurify: 3.4.12
      fflate: 0.4.8
      preact: 10.29.8
      query-selector-shadow-dom: 1.0.1
-      web-vitals: 5.3.0
+      web-vitals: 6.2.3
+      web-vitals-soft-navs: web-vitals@6.2.1
+    optionalDependencies:
+      '@types/react': 19.2.18
+      react: 19.2.8
    transitivePeerDependencies:
      - preact-render-to-string

@@ -11170,8 +11218,6 @@ snapshots:
      randombytes: 2.1.0
      safe-buffer: 5.2.1

-  re2js@2.9.1: {}
-
  react-docgen-typescript@2.4.0(typescript@5.9.3):
    dependencies:
      typescript: 5.9.3
@@ -11818,6 +11864,11 @@ snapshots:
    dependencies:
      react: 19.2.8

+  usehooks-ts@3.1.1(react@19.2.8):
+    dependencies:
+      lodash.debounce: 4.0.8
+      react: 19.2.8
+
  util-deprecate@1.0.2: {}

  util@0.12.5:
@@ -11952,7 +12003,9 @@ snapshots:

  walk-up-path@4.0.0: {}

-  web-vitals@5.3.0: {}
+  web-vitals@6.2.1: {}
+
+  web-vitals@6.2.3: {}

  webidl-conversions@3.0.1: {}

@@ -27,7 +27,7 @@ overrides:
  # Security fixes:
  # - https://github.com/advisories/GHSA-7r86-cg39-jmmj
  # - https://github.com/advisories/GHSA-23c5-xmqv-rm74
-  "minimatch": "^11.0.0"
+  "minimatch": "^10.2.3"
  # Security fix: https://github.com/element-hq/element-call/security/dependabot/109
  "glob": "^10.5.0"
  # Security fixes:
@@ -126,15 +126,10 @@ probe that decides whether the service that issued the token can take over the
 delayed leave, which picks the delayed leave timings the join uses. The join
 waits for the publisher to hold its token, so that the LiveKit room exists
 before a subscriber, who lacks the permission to create it, asks for a token
-of its own. The tracks are created once the membership is `joined`, with their
-upstream paused until then. A lobby that wants them earlier captures them with
-`createLocalMedia`, on the browser's devices alone so that any backend fits, and
-hands the media to `join()` as `publish`: the tracks are moved, not shared — they
-leave the lobby's `tracks$`, their objects are finished, and the backend
-publishes the very same device tracks and the processor already running on them,
-so nothing is captured or initialised again at the join. The upstream flows
-exactly while the membership is `joined`: a sync outage pauses it, and `leave()`
-pauses it for good and sends the leave.
+of its own. Until `join()` the tracks exist but their upstream is paused: a host
+can show a preview without anyone hearing it. The upstream flows exactly while the
+membership is `joined`: a sync outage pauses it, and `leave()` pauses it for good
+and sends the leave.

 ## Vocabulary

@@ -543,7 +538,7 @@ backend is handed the whole session's view and gives back media:
 type MemberMediaFields = Pick<RTCMember, "tracks$" | "encryptionError$">;

 export interface MediaBackend {
-  readonly transportTypes: readonly string[]; // ["m.livekit", "livekit"]
+  readonly transportType: string; // "livekit"
  /** Authenticate with the transport the client found; the probe for delegation runs here. */
  prepareLocalTransport(
    transport: Transport,
@@ -61,13 +61,8 @@ export {
  createLivekitBackend,
  type LivekitBackendOptions,
 } from "./src/media-backend/livekit/LivekitBackend";
-// Tracks for a lobby, captured ahead of the join and handed to it
-export { createLocalMedia } from "./src/LocalMedia";
-// For a host whose processor is a livekit-client one, such as @livekit/track-processors
-export {
-  fromLivekitProcessor,
-  toLivekitProcessor,
-} from "./src/media-backend/livekit/videoProcessor";
+// For a host that creates LiveKit tracks itself, such as a preview before joining
+export { convertToLivekitProcessor } from "./src/media-backend/livekit/videoProcessor";
 // For a developer panel to check a transport before using it
 export {
  getSFUConfig as authenticateWithTransport,
@@ -1,238 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { beforeAll, describe, expect, it, vi } from "vitest";
-
-import { createLocalMedia, type GetUserMedia } from "./LocalMedia";
-import { type LocalVideoMediaTrack, type VideoProcessor } from "./media-api";
-
-describe("createLocalMedia", () => {
-  it("opens the microphone and the camera in one request", async () => {
-    const getUserMedia = fakeGetUserMedia();
-    const media = createLocalMedia(getUserMedia);
-
-    const tracks = await media.capture([
-      { source: "microphone", deviceId: "mic" },
-      {
-        source: "camera",
-        capture: { resolution: { width: 640, height: 480 } },
-      },
-    ]);
-
-    expect(getUserMedia).toHaveBeenCalledExactlyOnceWith({
-      audio: { deviceId: "mic" },
-      video: { width: 640, height: 480, frameRate: undefined },
-    });
-    expect(tracks.map((t) => t.source)).toEqual(["microphone", "camera"]);
-    expect(media.tracks$.value).toEqual(tracks);
-    expect(media.requests.map((r) => r.source)).toEqual([
-      "microphone",
-      "camera",
-    ]);
-  });
-
-  it("joins an identical capture still in flight rather than opening the devices again", async () => {
-    const getUserMedia = fakeGetUserMedia();
-    const media = createLocalMedia(getUserMedia);
-    const requests = [{ source: "camera" as const }];
-
-    const [first, second] = await Promise.all([
-      media.capture(requests),
-      media.capture(requests),
-    ]);
-
-    expect(getUserMedia).toHaveBeenCalledOnce();
-    expect(second).toEqual(first);
-    expect(media.tracks$.value).toEqual(first);
-  });
-
-  it("shows the processor's output, initialised once", async () => {
-    const processor = fakeProcessor();
-    const media = createLocalMedia(fakeGetUserMedia());
-    const [camera] = await media.capture([{ source: "camera", processor }]);
-    const element = document.createElement("video");
-
-    camera.attach(element);
-
-    expect(processor.init).toHaveBeenCalledOnce();
-    expect(tracksOn(element)).toEqual([processor.output]);
-  });
-
-  it("hands the tracks over as they are: no second capture, no second init", async () => {
-    const getUserMedia = fakeGetUserMedia();
-    const processor = fakeProcessor();
-    const media = createLocalMedia(getUserMedia);
-    const [microphone, camera] = await media.capture([
-      { source: "microphone" },
-      { source: "camera", processor },
-    ]);
-
-    const taken = media.takeTracks();
-
-    expect(taken.get("microphone")?.track).toBe(trackBehind(microphone));
-    expect(taken.get("camera")).toEqual({
-      track: trackBehind(camera),
-      constraints: {},
-      muted: false,
-      processor: { processor, processedTrack: processor.output },
-    });
-    expect(media.tracks$.value).toEqual([]);
-    expect(getUserMedia).toHaveBeenCalledOnce();
-    expect(processor.init).toHaveBeenCalledOnce();
-    expect(processor.destroy).not.toHaveBeenCalled();
-    media.stop();
-    expect(taken.get("camera")!.track.stop).not.toHaveBeenCalled();
-  });
-
-  it("finishes a handed-over track", async () => {
-    const media = createLocalMedia(fakeGetUserMedia());
-    const [camera] = await media.capture([{ source: "camera" }]);
-    const element = document.createElement("video");
-    camera.attach(element);
-
-    media.takeTracks();
-
-    expect(element.srcObject).toBeNull();
-    await expect(camera.setEnabled(false)).rejects.toThrow("handed over");
-    expect(() => camera.attach(element)).toThrow("handed over");
-  });
-
-  it("mutes by disabling the track and hands the mute over", async () => {
-    const media = createLocalMedia(fakeGetUserMedia());
-    const [microphone] = await media.capture([{ source: "microphone" }]);
-
-    await expect(microphone.setEnabled(false)).resolves.toBe(false);
-
-    expect(microphone.muted$.value).toBe(true);
-    expect(trackBehind(microphone).enabled).toBe(false);
-    expect(media.takeTracks().get("microphone")?.muted).toBe(true);
-  });
-
-  it("switches the device by opening it anew", async () => {
-    const getUserMedia = fakeGetUserMedia();
-    const processor = fakeProcessor();
-    const media = createLocalMedia(getUserMedia);
-    const [camera] = await media.capture([{ source: "camera", processor }]);
-    const first = trackBehind(camera);
-    const element = document.createElement("video");
-    camera.attach(element);
-
-    await camera.setDevice("other");
-
-    expect(getUserMedia).toHaveBeenLastCalledWith({
-      video: { deviceId: "other" },
-    });
-    expect(first.stop).toHaveBeenCalled();
-    expect(processor.restart).toHaveBeenCalledOnce();
-    const [restartedOn, input] = vi.mocked(processor.restart).mock.calls[0];
-    expect(restartedOn).not.toBe(first);
-    expect(input).toBe(vi.mocked(processor.init).mock.calls[0][1]);
-    expect(tracksOn(element)).toEqual([processor.output]);
-    expect(media.takeTracks().get("camera")?.constraints).toEqual({
-      deviceId: "other",
-    });
-  });
-
-  it("reports the facing mode and switches it", async () => {
-    const getUserMedia = fakeGetUserMedia({ facingMode: "user" });
-    const media = createLocalMedia(getUserMedia);
-    const [camera] = (await media.capture([{ source: "camera" }])) as [
-      LocalVideoMediaTrack,
-    ];
-    expect(camera.facingMode$.value).toBe("user");
-
-    await camera.switchFacingMode();
-
-    expect(getUserMedia).toHaveBeenLastCalledWith({
-      video: { facingMode: "environment" },
-    });
-  });
-
-  it("releases one device and stops the rest", async () => {
-    const media = createLocalMedia(fakeGetUserMedia());
-    const [microphone, camera] = await media.capture([
-      { source: "microphone" },
-      { source: "camera" },
-    ]);
-
-    media.release("camera");
-    expect(trackBehind(camera).stop).toHaveBeenCalled();
-    expect(media.tracks$.value).toEqual([microphone]);
-    expect(media.requests.map((r) => r.source)).toEqual(["microphone"]);
-
-    media.stop();
-    expect(trackBehind(microphone).stop).toHaveBeenCalled();
-    expect(media.tracks$.value).toEqual([]);
-  });
-
-  it("refuses a screen share", async () => {
-    const media = createLocalMedia(fakeGetUserMedia());
-    await expect(media.capture([{ source: "screenShare" }])).rejects.toThrow(
-      "screen share",
-    );
-  });
-});
-
-class FakeMediaStream {
-  public constructor(private readonly tracks: MediaStreamTrack[]) {}
-  public getTracks(): MediaStreamTrack[] {
-    return this.tracks;
-  }
-}
-
-beforeAll(() => {
-  globalThis.MediaStream = FakeMediaStream as unknown as typeof MediaStream;
-});
-
-let nextId = 0;
-const tracksById = new Map<string, MediaStreamTrack>();
-
-function fakeTrack(
-  kind: "audio" | "video",
-  settings: MediaTrackSettings = {},
-): MediaStreamTrack {
-  const track = {
-    kind,
-    id: `${kind}-${nextId++}`,
-    enabled: true,
-    stop: vi.fn(),
-    getSettings: () => settings,
-  } as unknown as MediaStreamTrack;
-  tracksById.set(track.id, track);
-  return track;
-}
-
-function fakeGetUserMedia(videoSettings?: MediaTrackSettings): GetUserMedia {
-  return vi.fn(async (constraints: MediaStreamConstraints) => {
-    const tracks: MediaStreamTrack[] = [];
-    if (constraints.audio) tracks.push(fakeTrack("audio"));
-    if (constraints.video) tracks.push(fakeTrack("video", videoSettings));
-    return Promise.resolve(
-      new FakeMediaStream(tracks) as unknown as MediaStream,
-    );
-  });
-}
-
-function fakeProcessor(): VideoProcessor & { output: MediaStreamTrack } {
-  const output = fakeTrack("video");
-  return {
-    name: "blur",
-    output,
-    init: vi.fn(async () => Promise.resolve(output)),
-    restart: vi.fn(async () => Promise.resolve(output)),
-    destroy: vi.fn(async () => Promise.resolve()),
-  };
-}
-
-/** The device's track, which a media track was created on and keeps the id of. */
-function trackBehind(mediaTrack: { id: string }): MediaStreamTrack {
-  return tracksById.get(mediaTrack.id)!;
-}
-
-function tracksOn(element: HTMLMediaElement): MediaStreamTrack[] {
-  return (element.srcObject as unknown as FakeMediaStream).getTracks();
-}
@@ -1,336 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { BehaviorSubject, type Observable, of } from "rxjs";
-
-import { MatrixRTCError } from "./errors";
-import {
-  type HandedOverTrack,
-  type LocalAudioMediaTrack,
-  type LocalMedia,
-  type LocalVideoMediaTrack,
-  type MediaSource,
-  type MediaStreamStats,
-  type PublishRequest,
-  type VideoProcessor,
-} from "./media-api";
-import { constant } from "./reactive/Behavior";
-import { inTurn } from "./utils/processorTurns";
-
-type Source = "microphone" | "camera";
-type Request = Extract<PublishRequest, { source: Source }>;
-export type GetUserMedia = (
-  constraints: MediaStreamConstraints,
-) => Promise<MediaStream>;
-
-/**
- * Local media on the browser's devices alone, for a lobby ahead of a join:
- * no backend is involved, so whichever backend joins can take the tracks
- * over. Activity and level are not measured; stats are none.
- */
-export function createLocalMedia(
-  getUserMedia: GetUserMedia = async (constraints) =>
-    navigator.mediaDevices.getUserMedia(constraints),
-): LocalMedia {
-  const capturedTracks = new Map<Source, CapturedTrack>();
-  const requests = new Map<Source, Request>();
-  const tracks$ = new BehaviorSubject<
-    (LocalAudioMediaTrack | LocalVideoMediaTrack)[]
-  >([]);
-  const publishCapturedTracks = (): void =>
-    tracks$.next(
-      [...capturedTracks.values()].map(({ mediaTrack }) => mediaTrack),
-    );
-
-  // A second identical capture while the first is open joins it: a host that
-  // mounts twice (React's strict mode) must not open the devices twice and
-  // replace the tracks it is already showing
-  const pending = new Map<
-    string,
-    Promise<(LocalAudioMediaTrack | LocalVideoMediaTrack)[]>
-  >();
-  const capture = async (
-    wanted: PublishRequest[],
-  ): Promise<(LocalAudioMediaTrack | LocalVideoMediaTrack)[]> => {
-    const key = JSON.stringify(
-      wanted.map((request) => ({ ...request, processor: undefined })),
-    );
-    const running = pending.get(key);
-    if (running) return running;
-    const started = captureNow(wanted).finally(() => pending.delete(key));
-    pending.set(key, started);
-    return started;
-  };
-
-  const captureNow = async (
-    wanted: PublishRequest[],
-  ): Promise<(LocalAudioMediaTrack | LocalVideoMediaTrack)[]> => {
-    const bySource = new Map<Source, Request>();
-    for (const request of wanted) {
-      if (request.source === "screenShare")
-        throw new MatrixRTCError(
-          "A screen share cannot be captured ahead of a join",
-        );
-      bySource.set(request.source, request);
-    }
-    const constraints: MediaStreamConstraints = {};
-    for (const request of bySource.values())
-      constraints[request.source === "microphone" ? "audio" : "video"] =
-        trackConstraints(request);
-    const stream = await getUserMedia(constraints);
-    const captured: CapturedTrack[] = [];
-    for (const track of stream.getTracks()) {
-      const source: Source = track.kind === "audio" ? "microphone" : "camera";
-      const request = bySource.get(source)!;
-      capturedTracks.get(source)?.stop();
-      const captured_ = new CapturedTrack(
-        source,
-        track,
-        trackConstraints(request),
-        getUserMedia,
-      );
-      capturedTracks.set(source, captured_);
-      requests.set(source, request);
-      if (request.source === "camera" && request.processor)
-        await captured_.setProcessor(request.processor);
-      captured.push(captured_);
-    }
-    publishCapturedTracks();
-    return captured.map(({ mediaTrack }) => mediaTrack);
-  };
-
-  const release = (source: MediaSource): void => {
-    if (source !== "microphone" && source !== "camera") return;
-    capturedTracks.get(source)?.stop();
-    capturedTracks.delete(source);
-    requests.delete(source);
-    publishCapturedTracks();
-  };
-
-  const stop = (): void => {
-    for (const track of capturedTracks.values()) track.stop();
-    capturedTracks.clear();
-    publishCapturedTracks();
-  };
-
-  const takeTracks = (): Map<Source, HandedOverTrack> => {
-    const taken = new Map<Source, HandedOverTrack>();
-    for (const [source, track] of capturedTracks)
-      taken.set(source, track.handOver());
-    capturedTracks.clear();
-    publishCapturedTracks();
-    return taken;
-  };
-
-  return {
-    get requests(): PublishRequest[] {
-      return [...requests.values()];
-    },
-    tracks$,
-    capture,
-    release,
-    stop,
-    takeTracks,
-  };
-}
-
-/** The constraints a request means to the browser. */
-function trackConstraints(request: Request): MediaTrackConstraints {
-  const device = request.deviceId && { deviceId: request.deviceId };
-  if (request.source === "microphone") return { ...device, ...request.capture };
-  const resolution = request.capture?.resolution;
-  return {
-    ...device,
-    ...(resolution && {
-      width: resolution.width,
-      height: resolution.height,
-      frameRate: resolution.frameRate,
-    }),
-  };
-}
-
-/**
- * Internal Class that is the owner of the tracks.
- * Will get stored in `capturedTracks` of `createLocalMedia`.
- * To the outside this class will return the `LocalMedia` interface.
- */
-class CapturedTrack {
-  public readonly mediaTrack: LocalAudioMediaTrack | LocalVideoMediaTrack;
-  private readonly muted$ = new BehaviorSubject(false);
-  private readonly facingMode$: BehaviorSubject<
-    "user" | "environment" | undefined
-  >;
-  private readonly elements = new Set<HTMLMediaElement>();
-  private processor: HandedOverTrack["processor"];
-  /** What the processor reads frames from; a processor needs a playing element. */
-  private processorInput?: HTMLVideoElement;
-  private finished = false;
-
-  public constructor(
-    public readonly source: Source,
-    private track: MediaStreamTrack,
-    private constraints: MediaTrackConstraints,
-    private readonly getUserMedia: GetUserMedia,
-  ) {
-    this.facingMode$ = new BehaviorSubject(facingModeOf(track));
-    this.mediaTrack = this.asMediaTrack();
-  }
-
-  public handOver(): HandedOverTrack {
-    const { track, processor } = this;
-    // The device actually in use, so that a backend asked for it again
-    // recognises it rather than restarting the track
-    const { deviceId } = track.getSettings();
-    const constraints = { ...this.constraints, ...(deviceId && { deviceId }) };
-    this.finish();
-    return { track, constraints, muted: this.muted$.value, processor };
-  }
-
-  public stop(): void {
-    const { processor } = this;
-    if (processor)
-      void inTurn(processor.processor, async () =>
-        processor.processor.destroy(),
-      );
-    this.processor?.processedTrack.stop();
-    this.track.stop();
-    this.finish();
-  }
-
-  public async setProcessor(
-    processor: VideoProcessor | undefined,
-  ): Promise<void> {
-    this.live();
-    if (processor === this.processor?.processor) return;
-    const previous = this.processor?.processor;
-    if (previous) await inTurn(previous, async () => previous.destroy());
-    this.processor = processor && {
-      processor,
-      processedTrack: await inTurn(processor, async () =>
-        processor.init(this.track, this.input()),
-      ),
-    };
-    this.show();
-  }
-
-  private input(): HTMLVideoElement {
-    this.processorInput ??= document.createElement("video");
-    this.processorInput.muted = true;
-    this.processorInput.playsInline = true;
-    play(this.processorInput, this.track);
-    return this.processorInput;
-  }
-
-  private finish(): void {
-    this.finished = true;
-    for (const element of this.elements) element.srcObject = null;
-    this.elements.clear();
-  }
-
-  private live(): void {
-    if (this.finished)
-      throw new MatrixRTCError(
-        `The ${this.source} was handed over to a participation`,
-      );
-  }
-
-  private shown(): MediaStreamTrack {
-    return this.processor?.processedTrack ?? this.track;
-  }
-
-  private show(): void {
-    for (const element of this.elements) play(element, this.shown());
-  }
-
-  private async reacquire(constraints: MediaTrackConstraints): Promise<void> {
-    this.live();
-    this.constraints = { ...this.constraints, ...constraints };
-    const stream = await this.getUserMedia({
-      [this.track.kind]: this.constraints,
-    });
-    this.track.stop();
-    this.track = stream.getTracks()[0];
-    this.track.enabled = !this.muted$.value;
-    const { processor } = this;
-    if (processor)
-      processor.processedTrack = await inTurn(processor.processor, async () =>
-        processor.processor.restart(this.track, this.input()),
-      );
-    this.facingMode$.next(facingModeOf(this.track));
-    this.show();
-  }
-
-  private asMediaTrack(): LocalAudioMediaTrack | LocalVideoMediaTrack {
-    const base = {
-      source: this.source,
-      id: this.track.id,
-      muted$: this.muted$,
-      // Nothing leaves the device before the track is published, so there is
-      // nothing unencrypted to report
-      encrypted: true,
-      stats$: (): Observable<MediaStreamStats> => of(undefined),
-      attach: (element: HTMLMediaElement): void => {
-        this.live();
-        this.elements.add(element);
-        play(element, this.shown());
-      },
-      detach: (element: HTMLMediaElement): void => {
-        if (this.elements.delete(element)) element.srcObject = null;
-      },
-      setEnabled: async (enabled: boolean): Promise<boolean> => {
-        this.live();
-        this.track.enabled = enabled;
-        this.muted$.next(!enabled);
-        return Promise.resolve(enabled);
-      },
-      setDevice: async (deviceId: string): Promise<void> => {
-        if (this.track.getSettings().deviceId === deviceId) return;
-        await this.reacquire({ deviceId });
-      },
-    };
-    if (this.source === "microphone")
-      return {
-        ...base,
-        kind: "audio",
-        isActive$: constant(false),
-        audioLevel$: constant(0),
-        setAudioContext: () => {},
-        setVolume: () => {},
-      };
-    return {
-      ...base,
-      kind: "video",
-      facingMode$: this.facingMode$,
-      switchFacingMode: async () => {
-        const facingMode = this.facingMode$.value;
-        if (facingMode === undefined) return;
-        await this.reacquire({
-          facingMode: facingMode === "user" ? "environment" : "user",
-        });
-        return this.track.getSettings().deviceId;
-      },
-      setProcessor: async (processor) => this.setProcessor(processor),
-    };
-  }
-}
-
-function play(element: HTMLMediaElement, track: MediaStreamTrack): void {
-  element.srcObject = new MediaStream([track]);
-  // Autoplay is not a given for a stream set after mount; a test DOM returns
-  // nothing from play
-  const playing = element.play() as Promise<void> | undefined;
-  playing?.catch(() => undefined);
-}
-
-function facingModeOf(
-  track: MediaStreamTrack,
-): "user" | "environment" | undefined {
-  const { facingMode } = track.getSettings();
-  return facingMode === "user" || facingMode === "environment"
-    ? facingMode
-    : undefined;
-}
@@ -164,7 +164,7 @@ function setup(
    context: MediaBackendContext,
  ): MediaBackend => {
    const backend: MediaBackend = {
-      transportTypes: ["m.livekit", "livekit"],
+      transportType: "livekit",
      prepareLocalTransport: async () => fake.prepared.promise,
      delegateDelayedLeave: fake.delegateDelayedLeave,
      local: {
@@ -136,8 +136,7 @@ export function createRTCParticipation(
  // fallback: another member's SFU may let us publish (MSC4195). LiveKit only,
  // so it stays out of the backend interface
  const transportFromBackends = async (): Promise<Transport | null> =>
-    backend.transportTypes.includes("m.livekit") ||
-    backend.transportTypes.includes("livekit")
+    backend.transportType === "livekit"
      ? findRemotePublishLivekitTransport({
          client,
          // A snapshot: if nobody with a usable SFU is here yet, the user has
@@ -153,7 +152,7 @@ export function createRTCParticipation(
  const preparedTransport$ = from(
    discoverLocalTransport(
      client,
-      backend.transportTypes,
+      backend.transportType,
      options,
      transportFromBackends,
      logger,
@@ -184,7 +183,6 @@ export function createRTCParticipation(
          encryptMedia: encryptionSystem.kind !== E2eeType.NONE,
          matrixRTCMode,
          sendNotificationType: options.sendNotificationType,
-          callIntent: options.callIntent,
          applicationData: options.applicationData,
          timings,
          delayedLeave,
@@ -12,7 +12,6 @@ Please see LICENSE in the repository root for full details.
 */

 import {
-  type RTCCallIntent,
  type RTCNotificationType,
  type Transport,
 } from "matrix-js-sdk/lib/matrixrtc";
@@ -21,7 +20,6 @@ import { type Observable } from "rxjs";
 import { type Behavior } from "./reactive/Behavior";
 import {
  type LocalAudioMediaTrack,
-  type LocalMedia,
  type LocalMemberMedia,
  type LocalVideoMediaTrack,
  type MediaSource,
@@ -86,15 +84,12 @@ export interface RTCSlot {

 export interface RTCParticipationOptions {
  /**
-   * What the local member publishes at the join: requests the SDK captures
-   * itself, or the media a lobby captured ahead of the join, which the
-   * participation takes over (its tracks leave `media.tracks$`) and publishes
-   * in place of capturing. `publish` on the participation adds to either from
-   * then on. Kept as an option, rather than only the method, because the
-   * LiveKit backend reads it to build the room's default capture options
-   * before the first connection exists.
+   * Published at the join; `publish` on the participation adds to it from then
+   * on. Kept as an option, rather than only the method, because the LiveKit
+   * backend reads the initial requests to build the room's default capture
+   * options before the first connection exists.
   */
-  publish: PublishRequest[] | LocalMedia;
+  publish: PublishRequest[];
  /**
   * LEGACY
   *
@@ -104,14 +99,11 @@ export interface RTCParticipationOptions {
   * to a notification (ringing, timeouts, declines) is the application's job.
   */
  sendNotificationType?: RTCNotificationType;
-  /**
-   * The kind of call the local member intends to take part in: `"m.audio"`
-   * or `"m.video"`. Carried by the membership as a field of its own.
-   */
-  callIntent?: RTCCallIntent;
  /**
   * Whatever the application wants to say about itself in the membership,
-   * under namespaced keys. Opaque to the SDK.
+   * under namespaced keys. Opaque to the SDK, apart from `m.call.intent`
+   * (`"audio"` or `"video"`), which the membership format carries as a
+   * field of its own.
   */
  applicationData?: Record<string, unknown>;
  /** Timings the host has configured; the defaults otherwise. */
@@ -238,7 +230,7 @@ export interface DataMessage {
 * backend-specific developer panel and for connection diagnostics.
 */
 export interface TransportMetadata {
-  /** `"m.livekit"` or `"livekit"` today. */
+  /** `"livekit"` today. */
  type: string;
  /** Stable key, unique per transport in the slot: the raw transport, serialised with sorted keys. */
  id: string;
@@ -291,7 +283,7 @@ export interface RTCMember {
  memberId: string;
  /** Which transport this member is on; undefined when the membership has none. */
  transport$: Behavior<TransportMetadata | undefined>;
-  /** What the member's application says about itself, e.g. `intent`. */
+  /** What the member's application says about itself, e.g. `m.call.intent`. */
  applicationData$: Behavior<Record<string, unknown>>;

  displayName$: Behavior<string>;
@@ -48,7 +48,7 @@ describe("discoverLocalTransport", () => {
    await expect(
      discoverLocalTransport(
        c,
-        ["m.livekit", "livekit"],
+        "livekit",
        { transport: hostTransport },
        fromBackends(),
        logger,
@@ -61,7 +61,7 @@ describe("discoverLocalTransport", () => {
    await expect(
      discoverLocalTransport(
        client([homeserverTransport]),
-        ["m.livekit", "livekit"],
+        "livekit",
        { fallbackTransport: hostTransport },
        fromBackends(),
        logger,
@@ -73,7 +73,7 @@ describe("discoverLocalTransport", () => {
    await expect(
      discoverLocalTransport(
        client([{ type: "not_livekit" }]),
-        ["m.livekit", "livekit"],
+        "livekit",
        { fallbackTransport: hostTransport },
        fromBackends(),
        logger,
@@ -87,7 +87,7 @@ describe("discoverLocalTransport", () => {
    await expect(
      discoverLocalTransport(
        client([homeserverTransport]),
-        ["m.livekit", "livekit"],
+        "livekit",
        {},
        backends,
        logger,
@@ -99,7 +99,7 @@ describe("discoverLocalTransport", () => {
  it("fails naming the homeserver where there is no transport at all", async () => {
    const promise = discoverLocalTransport(
      client([]),
-      ["m.livekit", "livekit"],
+      "livekit",
      {},
      fromBackends(),
      logger,
@@ -15,15 +15,14 @@ import { TransportAutoDiscovery } from "./TransportAutoDiscovery";

 /**
 * The transport the local member advertises: the one the host names, else the
- * homeserver's first of the most preferred type the backend serves, else the
- * host's fallback, else the first the backends can provide, which are asked
- * only then.
+ * homeserver's first of the type the backend serves, else the host's fallback,
+ * else the first the backends can provide, which are asked only then.
 *
 * @throws {MatrixRTCTransportMissingError} where none of these exists.
 */
 export async function discoverLocalTransport(
  client: Pick<MatrixClient, "getDomain" | "_unstable_getRTCTransports">,
-  transportTypes: readonly string[],
+  transportType: string,
  {
    transport: override,
    fallbackTransport,
@@ -35,7 +34,7 @@ export async function discoverLocalTransport(
    override ??
    (await new TransportAutoDiscovery({
      client,
-      transportTypes,
+      transportType,
      fallbackTransport,
      logger,
    }).discoverPreferredTransport()) ??
@@ -61,7 +61,7 @@ describe("TransportAutoDiscovery", () => {

      const discovery = new TransportAutoDiscovery({
        client,
-        transportTypes: ["m.livekit", "livekit"],
+        transportType: "livekit",
        fallbackTransport: configTransport,
        logger: rootLogger,
      });
@@ -75,29 +75,6 @@ describe("TransportAutoDiscovery", () => {
    },
  );

-  it("prefers a transport of an earlier type over one listed before it", async () => {
-    const mLivekit: Transport = {
-      type: "m.livekit",
-      url: "wss://sfu.example.org",
-    };
-    const client = makeClient();
-    client._unstable_getRTCTransports.mockResolvedValue([
-      backendTransport,
-      mLivekit,
-    ]);
-
-    const discovery = new TransportAutoDiscovery({
-      client,
-      transportTypes: ["m.livekit", "livekit"],
-      fallbackTransport: configTransport,
-      logger: rootLogger,
-    });
-
-    await expect(discovery.discoverPreferredTransport()).resolves.toStrictEqual(
-      mLivekit,
-    );
-  });
-
  it("Retries limit_exceeded backend transport", async () => {
    const client = makeClient();
    client._unstable_getRTCTransports
@@ -115,7 +92,7 @@ describe("TransportAutoDiscovery", () => {

    const discovery = new TransportAutoDiscovery({
      client,
-      transportTypes: ["m.livekit", "livekit"],
+      transportType: "livekit",
      fallbackTransport: configTransport,
      logger: rootLogger,
    });
@@ -139,7 +116,7 @@ describe("TransportAutoDiscovery", () => {

      const discovery = new TransportAutoDiscovery({
        client,
-        transportTypes: ["m.livekit", "livekit"],
+        transportType: "livekit",
        fallbackTransport: configTransport,
        logger: rootLogger,
      });
@@ -156,7 +133,7 @@ describe("TransportAutoDiscovery", () => {

    const discovery = new TransportAutoDiscovery({
      client,
-      transportTypes: ["m.livekit", "livekit"],
+      transportType: "livekit",
      fallbackTransport: undefined,
      logger: rootLogger,
    });
@@ -17,27 +17,27 @@ type TransportDiscoveryClient = Pick<

 export interface TransportAutoDiscoveryProps {
  client: TransportDiscoveryClient;
-  /** The transport types we want to discover. Those are the ones, the local media backend supports. most preferred first. */
-  transportTypes: readonly string[];
-  /** A transport to use when the homeserver advertises none of the types. */
+  /** The transport type the media backend serves. */
+  transportType: string;
+  /** A transport to use when the homeserver advertises none of the type. */
  fallbackTransport?: Transport;
  logger: Logger;
 }

 export class TransportAutoDiscovery {
  private readonly client: TransportDiscoveryClient;
-  private readonly transportTypes: readonly string[];
+  private readonly transportType: string;
  private readonly fallbackTransport: Transport | undefined;
  private readonly logger: Logger;

  public constructor({
    client,
-    transportTypes,
+    transportType,
    fallbackTransport,
    logger,
  }: TransportAutoDiscoveryProps) {
    this.client = client;
-    this.transportTypes = transportTypes;
+    this.transportType = transportType;
    this.fallbackTransport = fallbackTransport;
    this.logger = logger.getChild("[TransportAutoDiscovery]");
  }
@@ -64,7 +64,7 @@ export class TransportAutoDiscovery {
  }

  /**
-   * Fetches the first transport of the backend's most preferred type from the homeserver.
+   * Fetches the first transport of the backend's type from the homeserver.
   * This will not throw errors, but instead just log them and return null if the expected config is not found or malformed.
   * @private
   */
@@ -76,16 +76,17 @@ export class TransportAutoDiscovery {
      const transportList = await doNetworkOperationWithRetry(async () =>
        client._unstable_getRTCTransports(),
      );
-      for (const type of this.transportTypes) {
-        const first = transportList.find(
-          (transport) => transport.type === type,
-        );
-        if (first) return first;
-      }
-      this.logger.info(
-        `No ${this.transportTypes.join(" or ")} transport found in getRTCTransports end point`,
-        transportList,
+      const first = transportList.find(
+        (transport) => transport.type === this.transportType,
      );
+      if (first) {
+        return first;
+      } else {
+        this.logger.info(
+          `No ${this.transportType} transport found in getRTCTransports end point`,
+          transportList,
+        );
+      }
    } catch (ex) {
      this.logger.info(`Failed to use getRTCTransports end point: ${ex}`);
    }
@@ -60,7 +60,7 @@ describe("joinJsSdkSession", () => {
    expect(s.join).toHaveBeenCalledWith(ownMemberMock, [transportWithAlias], {
      notificationType: "ring",
      callIntent: undefined,
-      applicationData: undefined,
+      applicationData: {},
      manageMediaKeys: true,
      delayedLeaveEventRestartMs: 300_000,
      delayedLeaveEventDelayMs: 3_600_000,
@@ -95,14 +95,13 @@ describe("joinJsSdkSession", () => {
    );
  });

-  it("passes the call intent and application data through and sends sticky events in Matrix 2.0 mode", () => {
+  it("lifts the call intent out of the application data and sends sticky events in Matrix 2.0 mode", () => {
    const s = session();

    joinJsSdkSession("!room:example.org", s, ownMemberMock, transport, {
      encryptMedia: true,
      matrixRTCMode: MatrixRTCMode.Matrix_2_0,
-      callIntent: "m.audio",
-      applicationData: { custom: 1 },
+      applicationData: { "m.call.intent": "audio", custom: 1 },
      timings: defaultSessionTimings,
      delayedLeave: defaultSessionTimings.delayedLeave,
    });
@@ -111,7 +110,7 @@ describe("joinJsSdkSession", () => {
      ownMemberMock,
      [transportWithAlias],
      expect.objectContaining({
-        callIntent: "m.audio",
+        callIntent: "audio",
        applicationData: { custom: 1 },
        unstableSendStickyEvents: true,
      }),
@@ -125,8 +124,7 @@ describe("joinJsSdkSession", () => {
    joinJsSdkSession("!room:example.org", s, ownMemberMock, transport, {
      encryptMedia: true,
      matrixRTCMode: MatrixRTCMode.Matrix_2_0,
-      callIntent: "m.audio",
-      applicationData: { custom: 1 },
+      applicationData: { "m.call.intent": "audio", custom: 1 },
      timings: defaultSessionTimings,
      delayedLeave: defaultSessionTimings.delayedLeave,
    });
@@ -135,7 +133,7 @@ describe("joinJsSdkSession", () => {
      ownMemberMock,
      [transport],
      expect.objectContaining({
-        callIntent: "m.audio",
+        callIntent: "audio",
        applicationData: { custom: 1 },
        unstableSendStickyEvents: true,
      }),
@@ -23,7 +23,6 @@ interface Options {
  encryptMedia: boolean;
  matrixRTCMode: MatrixRTCMode;
  sendNotificationType?: RTCNotificationType;
-  callIntent?: RTCCallIntent;
  applicationData?: Record<string, unknown>;
  timings: SessionTimings;
  /** The delayed leave timings to use: delegated to the SFU or not. */
@@ -44,12 +43,15 @@ export function joinJsSdkSession(
    encryptMedia,
    matrixRTCMode,
    sendNotificationType,
-    callIntent,
    applicationData,
    timings,
    delayedLeave,
  }: Options,
 ): void {
+  // The membership format carries the intent as a field of its own
+  const { "m.call.intent": intent, ...rest } = applicationData ?? {};
+  const callIntent =
+    typeof intent === "string" ? (intent as RTCCallIntent) : undefined;
  // Give up on the network as soon as either the sync has been down for the
  // grace period or the delayed leave has probably been sent, whichever is
  // sooner
@@ -76,7 +78,7 @@ export function joinJsSdkSession(
    {
      notificationType: sendNotificationType,
      callIntent,
-      applicationData,
+      applicationData: rest,
      manageMediaKeys: encryptMedia,
      delayedLeaveEventRestartMs: delayedLeave.restart_ms,
      delayedLeaveEventDelayMs: delayedLeave.delay_ms,
@@ -185,45 +185,3 @@ export interface MemberMedia {
 export interface LocalMemberMedia extends MemberMedia {
  tracks$: Behavior<(LocalAudioMediaTrack | LocalVideoMediaTrack)[] | null>;
 }
-
-/**
- * Tracks captured ahead of a join, for a lobby: the same local tracks a
- * participation hands out, on nothing but the browser's devices, so they fit
- * whichever backend joins. Handed to `join` as `publish`, they are moved once
- * the participation publishes them: they leave `tracks$`, their objects are
- * finished (controls reject, elements detached), and the same devices come
- * back under `localMember$.tracks$` as new objects. `stop` releases only what
- * was not moved; `capture` works again afterwards.
- */
-export interface LocalMedia {
-  /** What was captured with, one per source; a join reads its defaults from here. */
-  readonly requests: PublishRequest[];
-  tracks$: Behavior<(LocalAudioMediaTrack | LocalVideoMediaTrack)[]>;
-  /**
-   * Opens the devices, in one permission prompt where the browser asks for
-   * one. Rejects where a device cannot be opened, having opened none of them.
-   * A source captured already is replaced.
-   */
-  capture(
-    requests: PublishRequest[],
-  ): Promise<(LocalAudioMediaTrack | LocalVideoMediaTrack)[]>;
-  /** Closes the device behind a source; nothing where it was not captured. */
-  release(source: MediaSource): void;
-  /** Closes every device still held. */
-  stop(): void;
-  /**
-   * For a media backend, as it starts publishing: moves every track out,
-   * finishing its object here. Not for a host; the participation calls it.
-   */
-  takeTracks(): Map<"microphone" | "camera", HandedOverTrack>;
-}
-
-/** One track as a backend receives it: the device's own track and what runs on it. */
-export interface HandedOverTrack {
-  track: MediaStreamTrack;
-  /** What it was opened with, for a backend that restarts it. */
-  constraints: MediaTrackConstraints;
-  muted: boolean;
-  /** Where a processor runs: it and its output, to adopt rather than initialise again. */
-  processor?: { processor: VideoProcessor; processedTrack: MediaStreamTrack };
-}
@@ -20,7 +20,6 @@ import { type Observable } from "rxjs";
 import { type ResolvedTransport, type RTCMember } from "../api";
 import {
  type LocalAudioMediaTrack,
-  type LocalMedia,
  type LocalMemberMedia,
  type LocalVideoMediaTrack,
  type MediaSource,
@@ -57,8 +56,8 @@ export interface MediaBackendContext {
  /** The slot the session is in, `application#id`; a token is issued for it. */
  slotId: string;
  ownMembershipIdentity: CallMembershipIdentityParts;
-  /** What the local member publishes at the join: requests, or a lobby's media. */
-  publish: PublishRequest[] | LocalMedia;
+  /** What the local member publishes at the join. */
+  publish: PublishRequest[];
  encryptionSystem: EncryptionSystem;
  /**
   * Every media key the session knows: the current ones replayed on
@@ -114,11 +113,8 @@ export interface DataPacket {
 }

 export interface MediaBackend {
-  /**
-   * The membership transport types this backend serves, ordered decreasingly
-   * by preference.
-   */
-  readonly transportTypes: readonly string[];
+  /** The membership transport type this backend serves: "livekit". */
+  readonly transportType: string;

  /**
   * Makes `transport` usable as the one the local member publishes on. The
@@ -92,7 +92,7 @@ export function createLivekitBackend(
    roomId,
    slotId,
    ownMembershipIdentity,
-    publish: requestsOrMedia,
+    publish,
    encryptionSystem,
    mediaKeys$,
    timings,
@@ -101,9 +101,6 @@ export function createLivekitBackend(
  { client, mediaQuality }: LivekitBackendOptions,
 ): MediaBackend {
  const logger = parentLogger.getChild("[LivekitBackend]");
-  const [publish, media] = Array.isArray(requestsOrMedia)
-    ? [requestsOrMedia, undefined]
-    : [requestsOrMedia.requests, requestsOrMedia];
  const keyProvider = createKeyProvider(encryptionSystem, mediaKeys$, logger);
  const transports = createTransportRegistry(scope);
  const localTransport$ = new BehaviorSubject<TransportLocator | null>(null);
@@ -140,7 +137,6 @@ export function createLivekitBackend(
    connectionMap$,
    localTransport$,
    publish,
-    media,
    audioOutputDeviceId$,
    encryptionSystem,
    logger,
@@ -283,7 +279,7 @@ export function createLivekitBackend(
  });

  return {
-    transportTypes: ["m.livekit", "livekit"],
+    transportType: "livekit",
    prepareLocalTransport,
    delegateDelayedLeave: delegateLeave,
    local: localMedia_,
@@ -8,7 +8,6 @@ Please see LICENSE in the repository root for full details.
 import { EventEmitter } from "events";
 import {
  type LocalParticipant,
-  LocalVideoTrack,
  ParticipantEvent,
  RemoteAudioTrack,
  type RemoteParticipant,
@@ -18,22 +17,10 @@ import {
  TrackEvent,
  type TrackPublication,
 } from "livekit-client";
-import {
-  afterEach,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  onTestFinished,
-  vi,
-} from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";

 import { ObservableScope } from "../../reactive/ObservableScope";
-import {
-  type AudioMediaTrack,
-  type LocalVideoMediaTrack,
-  type VideoProcessor,
-} from "../../media-api";
+import { type AudioMediaTrack } from "../../media-api";
 import {
  createLivekitMediaTrack,
  createLocalLivekitMediaTrack,
@@ -218,100 +205,8 @@ describe("createLivekitMediaTrack", () => {
    await expect(track.setEnabled(false)).resolves.toBe(false);
    expect(setEnabled).toHaveBeenCalledWith("microphone", false);
    await track.setDevice("mic-2");
-    expect(switchActiveDevice).toHaveBeenCalledWith(
-      "audioinput",
-      "mic-2",
-      false,
-    );
+    expect(switchActiveDevice).toHaveBeenCalledWith("audioinput", "mic-2");
  });
-
-  // LiveKit's media stream track is the processed one while a processor runs,
-  // and that one names no device; the camera behind it does
-  it.each([
-    { deviceId: "cam-1", switches: false },
-    { deviceId: "cam-2", switches: true },
-  ])(
-    "leaves a processed camera alone unless its device changes: $deviceId",
-    async ({ deviceId, switches }) => {
-      vi.stubGlobal("MediaStreamTrack", class {});
-      onTestFinished(() => {
-        vi.unstubAllGlobals();
-      });
-      const camera = Object.assign(Object.create(LocalVideoTrack.prototype), {
-        source: Track.Source.Camera,
-        _mediaStreamTrack: {
-          readyState: "live",
-          label: "",
-          getSettings: () => ({ deviceId: "cam-1" }),
-        },
-        // What LiveKit shows as the track, with no device of its own
-        processor: {
-          processedTrack: { label: "", getSettings: () => ({}) },
-        },
-      }) as LocalVideoTrack;
-      const switchActiveDevice = vi.fn().mockResolvedValue(true);
-      const { participant, publication, room } = fakes({
-        track: camera as unknown as FakeTrack,
-      });
-      const track = createLocalLivekitMediaTrack(
-        scope,
-        Object.assign(participant, {
-          isLocal: true,
-        }) as unknown as LocalParticipant,
-        publication as unknown as TrackPublication,
-        Object.assign(room, { switchActiveDevice }),
-        vi.fn(),
-      );
-
-      await track.setDevice(deviceId);
-      expect(switchActiveDevice.mock.calls).toEqual(
-        switches ? [["videoinput", deviceId, false]] : [],
-      );
-    },
-  );
-
-  // LiveKit stops a camera that is turned off; the processor is built when it
-  // is turned on again
-  it.each([
-    { state: "is off", isMuted: true, takes: true },
-    { state: "has stopped for good", isMuted: false, takes: false },
-  ])(
-    "gives a processor to a camera that $state: $takes",
-    async ({ isMuted, takes }) => {
-      // jsdom has none; LiveKit's facing mode checks against it
-      vi.stubGlobal("MediaStreamTrack", class {});
-      onTestFinished(() => {
-        vi.unstubAllGlobals();
-      });
-      const camera = Object.assign(Object.create(LocalVideoTrack.prototype), {
-        isMuted,
-        _mediaStreamTrack: {
-          readyState: "ended",
-          label: "",
-          getSettings: () => ({}),
-        },
-        getProcessor: () => undefined,
-        setProcessor: vi.fn().mockResolvedValue(undefined),
-      }) as LocalVideoTrack;
-      const { participant, publication, room } = fakes({
-        track: camera as unknown as FakeTrack,
-      });
-      const track = createLocalLivekitMediaTrack(
-        scope,
-        Object.assign(participant, {
-          isLocal: true,
-        }) as unknown as LocalParticipant,
-        publication as unknown as TrackPublication,
-        room,
-        vi.fn(),
-      ) as LocalVideoMediaTrack;
-
-      await track.setProcessor({ name: "blur" } as VideoProcessor);
-      expect(vi.mocked(camera.setProcessor).mock.calls.length).toBe(
-        takes ? 1 : 0,
-      );
-    },
-  );
 });

 type FakeTrack = Track & {
@@ -50,7 +50,7 @@ import {
  type VideoMediaTrack,
 } from "../../media-api";
 import { MatrixRTCError } from "../../errors";
-import { toLivekitProcessor, type LivekitProcessor } from "./videoProcessor";
+import { convertToLivekitProcessor } from "./videoProcessor";

 export const mediaSources: Record<Track.Source, MediaSource> = {
  [Track.Source.Microphone]: "microphone",
@@ -197,21 +197,9 @@ export function createLocalLivekitMediaTrack(
    setDevice: async (deviceId: string): Promise<void> => {
      if (base.source !== "microphone" && base.source !== "camera")
        throw new MatrixRTCError(`A ${base.source} track has no device`);
-      // LiveKit decides whether to restart by the constraints it keeps, which
-      // a browser that does not echo the device id back (Firefox) leaves
-      // without one; a track already on the device is left alone here. Asked
-      // of the camera track itself: with a processor on, LiveKit's media
-      // stream track is the processed one, which names no device
-      const current = publication.track;
-      if (
-        current instanceof LocalTrack &&
-        (await current.getDeviceId(false)) === deviceId
-      )
-        return;
      await room.switchActiveDevice(
        base.kind === "audio" ? "audioinput" : "videoinput",
        deviceId,
-        false,
      );
    },
  };
@@ -240,17 +228,11 @@ export function createLocalLivekitMediaTrack(
    },
    setProcessor: async (processor) => {
      const track = videoTrack();
-      // A camera that is off has a stopped track and takes the processor on
-      // turning on again; one stopped for good takes none
-      if (
-        !track ||
-        (track.mediaStreamTrack.readyState === "ended" && !track.isMuted)
-      )
-        return;
-      const current = track.getProcessor() as LivekitProcessor | undefined;
-      if (processor === current?.source) return;
-      if (processor) await track.setProcessor(toLivekitProcessor(processor));
-      else if (current) await track.stopProcessor();
+      // A processor cannot be built on a track that has already ended
+      if (!track || track.mediaStreamTrack.readyState === "ended") return;
+      if (processor)
+        await track.setProcessor(convertToLivekitProcessor(processor));
+      else if (track.getProcessor()) await track.stopProcessor();
    },
  };
 }
@@ -27,7 +27,6 @@ import {

 import {
  type LocalAudioMediaTrack,
-  type LocalMedia,
  type LocalVideoMediaTrack,
  type MediaSource,
  type PublishRequest,
@@ -58,8 +57,6 @@ interface Props {
  /** The transport we publish on; null until the session has found it. */
  localTransport$: Behavior<TransportLocator | null>;
  publish: PublishRequest[];
-  /** Tracks the host captured ahead of the join; the publisher takes them over. */
-  media?: LocalMedia;
  /** Read by the connection factory for the rooms it creates from now on. */
  audioOutputDeviceId$: BehaviorSubject<string | undefined>;
  encryptionSystem: EncryptionSystem;
@@ -82,7 +79,6 @@ export function createLivekitLocalMedia({
  connectionMap$,
  localTransport$,
  publish: initialRequests,
-  media,
  audioOutputDeviceId$,
  encryptionSystem,
  logger: parentLogger,
@@ -123,7 +119,6 @@ export function createLivekitLocalMedia({
      connection.livekitRoom,
      desired,
      logger.getChild(`[Publisher ${JSON.stringify(connection.transport)}]`),
-      media,
    );
    publisher$.next(publisher);
    return Promise.resolve(async (): Promise<void> => {
@@ -11,32 +11,16 @@ import {
  LocalParticipant,
  type LocalTrack,
  type LocalTrackPublication,
-  LocalVideoTrack,
  ParticipantEvent,
  type Room as LivekitRoom,
  Track,
-  type TrackPublishOptions,
 } from "livekit-client";
 import { logger } from "matrix-js-sdk/lib/logger";
-import {
-  afterEach,
-  beforeAll,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-} from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";

-import {
-  type HandedOverTrack,
-  type LocalMedia,
-  type PublishRequest,
-  type VideoProcessor,
-} from "../../media-api";
+import { type PublishRequest } from "../../media-api";
 import { flushPromises } from "../../utils/test";
 import { type DesiredMedia, Publisher } from "./Publisher";
-import { type LivekitProcessor } from "./videoProcessor";

 describe("Publisher", () => {
  describe("setAudioOutputDevice", () => {
@@ -120,24 +104,6 @@ describe("Publisher", () => {
      expect(participant.createTracks).not.toHaveBeenCalled();
    });

-    it("creates both with the options of requests made since the join", async () => {
-      const processor: VideoProcessor = {
-        name: "effect",
-        init: vi.fn(),
-        restart: vi.fn(),
-        destroy: vi.fn(),
-      };
-      want(microphone, { source: "camera", deviceId: "front", processor });
-
-      publisher.start();
-      await flushPromises();
-
-      expect(room.options.videoCaptureDefaults).toMatchObject({
-        deviceId: "front",
-        processor: expect.objectContaining({ source: processor }),
-      });
-    });
-
    it("asks for the camera and the microphone in one call", async () => {
      const enableBoth = vi.spyOn(participant, "enableCameraAndMicrophone");
      want(microphone, camera);
@@ -361,143 +327,6 @@ function fakeRoom(
  return { room, switchActiveDevice };
 }

-// A lobby's tracks come as the device's own MediaStreamTracks; LiveKit's
-// track classes are real here so that what is published is what LiveKit will
-// restart and stop as its own
-describe("adopting a lobby's tracks", () => {
-  // LiveKit wraps every track in a MediaStream, which jsdom does not have
-  beforeAll(() => {
-    globalThis.MediaStream = class {
-      public constructor(private readonly tracks: MediaStreamTrack[]) {}
-      public getTracks(): MediaStreamTrack[] {
-        return this.tracks;
-      }
-    } as unknown as typeof MediaStream;
-  });
-
-  function setup(
-    source: "microphone" | "camera",
-    handed: HandedOverTrack,
-  ): { participant: LocalParticipant; publisher: Publisher } {
-    const participant = fakeLocalParticipant(async () => Promise.resolve());
-    const room = {
-      options: {},
-      setE2EEEnabled: () => undefined,
-      localParticipant: participant,
-    } as unknown as LivekitRoom;
-    const desired: DesiredMedia = new Map([
-      [source, { request: { source }, enabled: true }],
-    ]);
-    const media = {
-      takeTracks: () => new Map([[source, handed]]),
-    } as unknown as LocalMedia;
-    const publisher = new Publisher(room, desired, logger, media);
-    return { participant, publisher };
-  }
-
-  it("publishes the lobby's track as its own rather than capturing", async () => {
-    const handed = handedOver("video");
-    const { participant, publisher } = setup("camera", handed);
-
-    publisher.start();
-    await flushPromises();
-
-    expect(participant.createTracks).not.toHaveBeenCalled();
-    const [published, options] = vi.mocked(participant.publishTrack).mock
-      .calls[0] as [LocalVideoTrack, TrackPublishOptions];
-    expect(published).toBeInstanceOf(LocalVideoTrack);
-    expect(published.mediaStreamTrack).toBe(handed.track);
-    expect(published.isUserProvided).toBe(false);
-    expect(options.source).toBe(Track.Source.Camera);
-  });
-
-  it("adopts the processor's output without initialising it again", async () => {
-    const setProcessor = vi
-      .spyOn(LocalVideoTrack.prototype, "setProcessor")
-      .mockResolvedValue(undefined);
-    const processor = {
-      name: "blur",
-      init: vi.fn(),
-      restart: vi.fn(),
-      destroy: vi.fn(),
-    } as unknown as VideoProcessor;
-    const processedTrack = fakeMediaStreamTrack("video");
-    const handed = handedOver("video", {
-      processor: { processor, processedTrack },
-    });
-    const { publisher } = setup("camera", handed);
-
-    publisher.start();
-    await flushPromises();
-
-    const adapter = setProcessor.mock.calls[0][0] as LivekitProcessor;
-    await adapter.init({ kind: Track.Kind.Video, track: handed.track });
-    expect(adapter.processedTrack).toBe(processedTrack);
-    expect(adapter.source).toBe(processor);
-    expect(processor.init).not.toHaveBeenCalled();
-    setProcessor.mockRestore();
-  });
-
-  // A development build mounts, unmounts and mounts the call again: the first
-  // publisher must not have taken the tracks the second one needs
-  it("leaves the lobby's tracks alone until it starts", async () => {
-    const participant = fakeLocalParticipant(async () => Promise.resolve());
-    const room = {
-      options: {},
-      setE2EEEnabled: () => undefined,
-      localParticipant: participant,
-    } as unknown as LivekitRoom;
-    const takeTracks = vi.fn(() => new Map());
-    const media = { takeTracks } as unknown as LocalMedia;
-
-    const publisher = new Publisher(room, new Map(), logger, media);
-    await publisher.destroy();
-
-    expect(takeTracks).not.toHaveBeenCalled();
-  });
-
-  it("joins muted where the lobby muted", async () => {
-    const { participant, publisher } = setup(
-      "microphone",
-      handedOver("audio", { muted: true }),
-    );
-
-    publisher.start();
-    await flushPromises();
-
-    const [published] = vi.mocked(participant.publishTrack).mock.calls[0];
-    expect((published as LocalTrack).isMuted).toBe(true);
-  });
-});
-
-function fakeMediaStreamTrack(kind: "audio" | "video"): MediaStreamTrack {
-  return {
-    kind,
-    id: `${kind}-track`,
-    label: "",
-    enabled: true,
-    readyState: "live",
-    getSettings: () => ({}),
-    getConstraints: () => ({}),
-    getCapabilities: () => ({}),
-    addEventListener: vi.fn(),
-    removeEventListener: vi.fn(),
-    stop: vi.fn(),
-  } as unknown as MediaStreamTrack;
-}
-
-function handedOver(
-  kind: "audio" | "video",
-  extra: Partial<HandedOverTrack> = {},
-): HandedOverTrack {
-  return {
-    track: fakeMediaStreamTrack(kind),
-    constraints: { deviceId: "lobby" },
-    muted: false,
-    ...extra,
-  };
-}
-
 function fakeLocalTrack(source: Track.Source): LocalTrack {
  const state = { isMuted: false, isUpstreamPaused: false };
  const track = {
@@ -6,23 +6,15 @@ Please see LICENSE in the repository root for full details.
 */

 import {
-  LocalAudioTrack,
  type LocalTrackPublication,
-  LocalVideoTrack,
  ParticipantEvent,
  type Room as LivekitRoom,
  type Track,
 } from "livekit-client";
 import { type Logger } from "matrix-js-sdk/lib/logger";

-import {
-  type HandedOverTrack,
-  type LocalMedia,
-  type MediaSource,
-  type PublishRequest,
-} from "../../media-api";
+import { type MediaSource, type PublishRequest } from "../../media-api";
 import { livekitSources, mediaSources } from "./LivekitMediaTrack";
-import { toLivekitProcessor } from "./videoProcessor";
 import {
  audioCaptureOptions,
  screenShareCaptureOptions,
@@ -39,9 +31,6 @@ export interface DesiredPublication {

 export type DesiredMedia = Map<MediaSource, DesiredPublication>;

-/** A lobby's tracks, moved out of its media, until each is published. */
-export type HandedOverTracks = ReturnType<LocalMedia["takeTracks"]>;
-
 /**
 * Publishes the local media on one LiveKit room, following the host's
 * requests.
@@ -57,19 +46,10 @@ export class Publisher {
  public started = false;
  private readonly room: LivekitRoom;

-  /** A lobby's tracks, taken over at `start`; each leaves the map as it is published. */
-  private captured: HandedOverTracks = new Map();
-
-  /**
-   * @param media - What a lobby opened ahead of the join, published in place
-   * of capturing. Taken over only at `start`, so that a publisher torn down
-   * before it publishes leaves the tracks to the next one.
-   */
  public constructor(
    room: LivekitRoom,
    private readonly desired: DesiredMedia,
    private readonly logger: Logger,
-    private readonly media?: LocalMedia,
  ) {
    this.room = room;
    room.setE2EEEnabled(room.options.e2ee !== undefined)?.catch((e: Error) => {
@@ -99,106 +79,33 @@ export class Publisher {
  public start(): void {
    if (this.started) return;
    this.started = true;
-    this.captured = this.media?.takeTracks() ?? new Map();
-    // A track muted in the lobby joins muted
-    for (const [source, { muted }] of this.captured) {
-      const wanted = this.desired.get(source);
-      if (wanted && muted) wanted.enabled = false;
-    }
    const requests = [...this.desired.values()]
-      .filter(
-        ({ request, enabled }) => enabled || this.hasCaptured(request.source),
-      )
+      .filter(({ enabled }) => enabled)
      .map(({ request }) => request);
-    const toCapture = new Set(
-      requests
-        .map((request) => request.source)
-        .filter((source) => !this.hasCaptured(source)),
-    );
+    const sources = new Set(requests.map((request) => request.source));
    // Microphone and camera in one call so that the browser asks for
    // permission once; the room defaults carry their options. LiveKit
    // resolves these once the track is published, which may block on the
    // connection; LocalTrackPublished is what tells us a track exists.
-    const captureBoth = toCapture.has("microphone") && toCapture.has("camera");
-    if (captureBoth) {
-      this.takeCaptureDefaults(requests);
+    if (sources.has("microphone") && sources.has("camera"))
      void this.room.localParticipant.enableCameraAndMicrophone();
-    }
    for (const request of requests)
      if (
        request.source === "screenShare" ||
-        this.hasCaptured(request.source) ||
-        !captureBoth
+        !(sources.has("microphone") && sources.has("camera"))
      )
        this.publish(request).catch((e) => {
          this.logger.error(`Failed to publish the ${request.source}`, e);
        });
  }

-  /**
-   * Makes the requests the room's capture defaults. The room took its defaults
-   * from the requests at the join, but one made since, such as a camera turned
-   * on before the start, has options of its own: a video processor dropped
-   * here would let the room see the camera before it is applied.
-   */
-  private takeCaptureDefaults(requests: PublishRequest[]): void {
-    const options = this.room.options;
-    for (const request of requests)
-      if (request.source === "microphone")
-        options.audioCaptureDefaults = {
-          ...options.audioCaptureDefaults,
-          ...audioCaptureOptions(request),
-        };
-      else if (request.source === "camera")
-        options.videoCaptureDefaults = {
-          ...options.videoCaptureDefaults,
-          ...videoCaptureOptions(request),
-        };
-  }
-
-  private hasCaptured(source: MediaSource): boolean {
-    return (
-      (source === "microphone" || source === "camera") &&
-      this.captured.has(source)
-    );
-  }
-
-  private takeCaptured(request: PublishRequest): HandedOverTrack | undefined {
-    if (request.source === "screenShare") return undefined;
-    const track = this.captured.get(request.source);
-    this.captured.delete(request.source);
-    return track;
-  }
-
-  /** A lobby's track as if this participant had captured it: LiveKit restarts and stops it as its own. */
-  private async adopt(
-    { track, constraints, muted, processor }: HandedOverTrack,
-    request: PublishRequest,
-  ): Promise<LocalTrackPublication> {
-    const local =
-      track.kind === "audio"
-        ? new LocalAudioTrack(track, constraints, false)
-        : new LocalVideoTrack(track, constraints, false);
-    if (muted) await local.mute();
-    if (processor && local instanceof LocalVideoTrack)
-      await local.setProcessor(
-        toLivekitProcessor(processor.processor, processor.processedTrack),
-      );
-    return this.room.localParticipant.publishTrack(local, {
-      source: livekitSources[request.source],
-      ...(request.source === "camera" && videoPublishOptions(request.capture)),
-    });
-  }
-
  /** Publishes one request and resolves with its publication once LiveKit has it. */
  public async publish(
    request: PublishRequest,
  ): Promise<LocalTrackPublication | undefined> {
    const participant = this.room.localParticipant;
    let publication: LocalTrackPublication | undefined;
-    const captured = this.takeCaptured(request);
-    if (captured) publication = await this.adopt(captured, request);
-    else if (request.source === "microphone")
+    if (request.source === "microphone")
      publication = await participant.setMicrophoneEnabled(
        true,
        audioCaptureOptions(request),
@@ -13,7 +13,6 @@ import {
 } from "matrix-js-sdk/lib/matrixrtc";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";

-import { serverNameOfTransport } from "../../utils/serverName";
 import { isCsApiUnavailable } from "./auth";
 import * as csApi from "./auth/csApi";
 import { decodeSFUJWTPayload } from "./auth/types";
@@ -60,7 +59,7 @@ export async function findRemotePublishLivekitTransport({
      if (!isUnstableLivekitTransport(transport) || !("url" in transport))
        continue;
      const { url } = transport;
-      const serverName = serverNameOfTransport(transport, membership.userId);
+      const serverName = membership.getTransportServerName(transport);
      const key = JSON.stringify([url, serverName]);
      if (tried.has(key)) continue;
      tried.add(key);
@@ -16,7 +16,7 @@ import {
  type PublishRequest,
  type VideoCaptureSettings,
 } from "../../media-api";
-import { toLivekitProcessor } from "./videoProcessor";
+import { convertToLivekitProcessor } from "./videoProcessor";

 export type PublishRequestFor<S extends PublishRequest["source"]> = Extract<
  PublishRequest,
@@ -40,7 +40,7 @@ export function videoCaptureOptions({
  if (!deviceId && !processor && !capture?.resolution) return undefined;
  return {
    ...(deviceId && { deviceId }),
-    ...(processor && { processor: toLivekitProcessor(processor) }),
+    ...(processor && { processor: convertToLivekitProcessor(processor) }),
    ...(capture?.resolution && { resolution: capture.resolution }),
  };
 }
@@ -5,18 +5,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */

-import {
-  LocalVideoTrack,
-  Track,
-  type TrackProcessor,
-  type VideoProcessorOptions,
-} from "livekit-client";
-import { beforeAll, describe, expect, it, vi } from "vitest";
+import { Track, type VideoProcessorOptions } from "livekit-client";
+import { describe, expect, it, vi } from "vitest";

 import { type VideoProcessor } from "../../media-api";
-import { fromLivekitProcessor, toLivekitProcessor } from "./videoProcessor";
+import { convertToLivekitProcessor } from "./videoProcessor";

-describe("toLivekitProcessor", () => {
+describe("convertToLivekitProcessor", () => {
  const captured = { id: "captured" } as MediaStreamTrack;
  const processed = { id: "processed" } as MediaStreamTrack;
  const restarted = { id: "restarted" } as MediaStreamTrack;
@@ -38,7 +33,7 @@ describe("toLivekitProcessor", () => {

  it("holds the processed track where LiveKit reads it", async () => {
    const processor = fakeProcessor();
-    const adapter = toLivekitProcessor(processor);
+    const adapter = convertToLivekitProcessor(processor);
    expect(adapter.name).toBe("blur");
    expect(adapter.processedTrack).toBeUndefined();

@@ -52,202 +47,4 @@ describe("toLivekitProcessor", () => {
    await adapter.destroy();
    expect(processor.destroy).toHaveBeenCalled();
  });
-
-  // A stopped track tears its processor down without waiting, while the track
-  // replacing it initialises the same one
-  it("runs a destroy and the next init on one processor in turn, across adapters", async () => {
-    const processor = fakeProcessor();
-    let finishDestroy = (): void => {};
-    vi.mocked(processor.destroy).mockImplementation(
-      async () =>
-        new Promise<void>((resolve) => {
-          finishDestroy = resolve;
-        }),
-    );
-    const previous = toLivekitProcessor(processor);
-    const next = toLivekitProcessor(processor);
-    await previous.init(options);
-    vi.mocked(processor.init).mockClear();
-
-    const destroying = previous.destroy();
-    const initialising = next.init(options);
-    await Promise.resolve();
-    expect(processor.init).not.toHaveBeenCalled();
-
-    finishDestroy();
-    await Promise.all([destroying, initialising]);
-    expect(processor.init).toHaveBeenCalledOnce();
-    expect(next.processedTrack).toBe(processed);
-  });
-});
-
-describe("a processor set on a camera that is off", () => {
-  const ended = { id: "ended", readyState: "ended" } as MediaStreamTrack;
-
-  function fakeProcessor(): VideoProcessor {
-    return {
-      name: "blur",
-      init: vi.fn().mockResolvedValue({ id: "processed" }),
-      restart: vi.fn().mockResolvedValue({ id: "restarted" }),
-      destroy: vi.fn().mockResolvedValue(undefined),
-    };
-  }
-
-  it("builds on the restart that turns the camera on, not before", async () => {
-    const processor = fakeProcessor();
-    const adapter = toLivekitProcessor(processor);
-
-    await adapter.init({ kind: Track.Kind.Video, track: ended });
-    expect(processor.init).not.toHaveBeenCalled();
-    expect(adapter.processedTrack).toBeUndefined();
-
-    const live = { id: "live", readyState: "live" } as MediaStreamTrack;
-    await adapter.restart({ kind: Track.Kind.Video, track: live });
-    expect(processor.init).toHaveBeenCalledWith(live, undefined);
-    expect(processor.restart).not.toHaveBeenCalled();
-    expect(adapter.processedTrack).toEqual({ id: "processed" });
-  });
-
-  // The processor may be the app's one pipeline, running on another track
-  it("leaves the processor alone when let go before it was built", async () => {
-    const processor = fakeProcessor();
-    const adapter = toLivekitProcessor(processor);
-    await adapter.init({ kind: Track.Kind.Video, track: ended });
-    await adapter.destroy();
-    expect(processor.destroy).not.toHaveBeenCalled();
-  });
-
-  // LiveKit's own camera track, so that the order of its restart is what is
-  // tested: a raw frame handed to the sender would reach the room
-  describe("on LiveKit's camera track", () => {
-    // jsdom has no MediaStream; LiveKit wraps every track in one
-    beforeAll(() => {
-      const original = globalThis.MediaStream;
-      globalThis.MediaStream = class {
-        public constructor(private readonly tracks: MediaStreamTrack[] = []) {}
-        public getTracks(): MediaStreamTrack[] {
-          return this.tracks;
-        }
-        public getVideoTracks(): MediaStreamTrack[] {
-          return this.tracks.filter(({ kind }) => kind === "video");
-        }
-        public getAudioTracks(): MediaStreamTrack[] {
-          return this.tracks.filter(({ kind }) => kind === "audio");
-        }
-        public addTrack(track: MediaStreamTrack): void {
-          this.tracks.push(track);
-        }
-        public removeTrack(track: MediaStreamTrack): void {
-          this.tracks.splice(this.tracks.indexOf(track), 1);
-        }
-      } as unknown as typeof MediaStream;
-      // LiveKit plays its processor element and catches a refusal
-      const play = vi
-        .spyOn(HTMLMediaElement.prototype, "play")
-        .mockResolvedValue(undefined);
-      return (): void => {
-        globalThis.MediaStream = original;
-        play.mockRestore();
-      };
-    });
-
-    function deviceTrack(id: string): MediaStreamTrack {
-      const track = {
-        kind: "video",
-        id,
-        label: "",
-        enabled: true,
-        readyState: "live",
-        getSettings: () => ({}),
-        getConstraints: () => ({}),
-        getCapabilities: () => ({}),
-        applyConstraints: vi.fn().mockResolvedValue(undefined),
-        addEventListener: vi.fn(),
-        removeEventListener: vi.fn(),
-        stop: vi.fn(() => {
-          Object.assign(track, { readyState: "ended" });
-        }),
-      };
-      return track as unknown as MediaStreamTrack;
-    }
-
-    it("hands the sender only processed frames when the camera turns on", async () => {
-      const reacquired = deviceTrack("reacquired");
-      Object.defineProperty(navigator, "mediaDevices", {
-        configurable: true,
-        value: {
-          getUserMedia: vi.fn().mockResolvedValue({
-            getTracks: () => [reacquired],
-          }),
-        },
-      });
-      const processedTrack = { id: "processed" } as MediaStreamTrack;
-      const processor = {
-        ...fakeProcessor(),
-        init: vi.fn().mockResolvedValue(processedTrack),
-      };
-      const camera = new LocalVideoTrack(deviceTrack("first"), {}, false);
-      camera.source = Track.Source.Camera;
-      const replaceTrack = vi.fn().mockResolvedValue(undefined);
-      Object.assign(camera, {
-        sender: {
-          replaceTrack,
-          getParameters: () => ({ encodings: [] }),
-          setParameters: vi.fn().mockResolvedValue(undefined),
-        },
-      });
-
-      await camera.mute();
-      expect(camera.mediaStreamTrack.readyState).toBe("ended");
-      // What the camera sent before it was turned off is not in question
-      replaceTrack.mockClear();
-      await camera.setProcessor(toLivekitProcessor(processor));
-      await camera.unmute();
-
-      expect(processor.init).toHaveBeenCalledWith(
-        reacquired,
-        expect.anything(),
-      );
-      expect(replaceTrack.mock.calls).toEqual([[processedTrack]]);
-      // LiveKit plays attached elements again on a timer
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
-  });
-});
-
-describe("fromLivekitProcessor", () => {
-  const captured = { id: "captured" } as MediaStreamTrack;
-  const processed = { id: "processed" } as MediaStreamTrack;
-
-  function fakeLivekitProcessor(
-    processedTrack: MediaStreamTrack | undefined,
-  ): TrackProcessor<Track.Kind.Video> {
-    return {
-      name: "background-blur",
-      processedTrack,
-      init: vi.fn().mockResolvedValue(undefined),
-      restart: vi.fn().mockResolvedValue(undefined),
-      destroy: vi.fn().mockResolvedValue(undefined),
-    };
-  }
-
-  it("resolves with the track the LiveKit processor produced", async () => {
-    const livekitProcessor = fakeLivekitProcessor(processed);
-    const processor = fromLivekitProcessor(livekitProcessor);
-    expect(processor.name).toBe("background-blur");
-    await expect(processor.init(captured)).resolves.toBe(processed);
-    expect(livekitProcessor.init).toHaveBeenCalledWith({
-      kind: Track.Kind.Video,
-      track: captured,
-    });
-    await expect(processor.restart(captured)).resolves.toBe(processed);
-    await processor.destroy();
-    expect(livekitProcessor.destroy).toHaveBeenCalled();
-  });
-
-  it("rejects where the LiveKit processor produced no track", async () => {
-    await expect(
-      fromLivekitProcessor(fakeLivekitProcessor(undefined)).init(captured),
-    ).rejects.toThrow("produced no track");
-  });
 });
@@ -5,84 +5,30 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */

-import { Track, type TrackProcessor } from "livekit-client";
+import { type Track, type TrackProcessor } from "livekit-client";

 import { type VideoProcessor } from "../../media-api";
-import { inTurn } from "../../utils/processorTurns";
-
-export interface LivekitProcessor extends TrackProcessor<Track.Kind.Video> {
-  /** The processor this adapts, so that setting the same one again is a no-op. */
-  source: VideoProcessor;
-}

 /**
- * A `VideoProcessor` as a livekit-client processor. LiveKit reads the
- * processed track off the processor after `init` and `restart` rather than
- * taking it as their result, so the adapter keeps it there. A processor a
- * lobby already runs on the track is adopted with its output, `running`, so
- * that the join does not initialise it again. Every step takes its turn on
- * the processor, which a stopped track tears down without waiting for the
- * next one's init.
- *
- * Set on a camera that is off, whose track LiveKit has stopped, the build
- * waits for the restart that turns it back on. LiveKit restarts a processor
- * before it hands the new track to the sender, so the camera's first frame
- * out is already processed.
+ * A `VideoProcessor` as livekit-client wants it. LiveKit reads the processed
+ * track off the processor after `init` and `restart` rather than taking it as
+ * their result, so the adapter keeps it there.
 */
-export function toLivekitProcessor(
+export function convertToLivekitProcessor(
  processor: VideoProcessor,
-  running?: MediaStreamTrack,
-): LivekitProcessor {
-  let built = false;
-  const adapter: LivekitProcessor = {
+): TrackProcessor<Track.Kind.Video> {
+  const adapter: TrackProcessor<Track.Kind.Video> = {
    name: processor.name,
-    source: processor,
-    init: async (opts) =>
-      inTurn(processor, async () => {
-        if (running === undefined && opts.track.readyState === "ended") return;
-        adapter.processedTrack =
-          running ?? (await processor.init(opts.track, opts.element));
-        running = undefined;
-        built = true;
-      }),
-    restart: async (opts) =>
-      inTurn(processor, async () => {
-        adapter.processedTrack = built
-          ? await processor.restart(opts.track, opts.element)
-          : await processor.init(opts.track, opts.element);
-        built = true;
-      }),
-    destroy: async () =>
-      inTurn(processor, async () => {
-        if (built) await processor.destroy();
-      }),
-  };
-  return adapter;
-}
-
-/**
- * A livekit-client processor, such as one from `@livekit/track-processors`,
- * as a `VideoProcessor`: `init` and `restart` resolve with the track it
- * leaves on itself.
- */
-export function fromLivekitProcessor(
-  processor: TrackProcessor<Track.Kind.Video>,
-): VideoProcessor {
-  const processedTrack = (): MediaStreamTrack => {
-    if (processor.processedTrack === undefined)
-      throw new Error(`Processor ${processor.name} produced no track`);
-    return processor.processedTrack;
-  };
-  return {
-    name: processor.name,
-    init: async (track, element) => {
-      await processor.init({ kind: Track.Kind.Video, track, element });
-      return processedTrack();
+    init: async (opts) => {
+      adapter.processedTrack = await processor.init(opts.track, opts.element);
    },
-    restart: async (track, element) => {
-      await processor.restart({ kind: Track.Kind.Video, track, element });
-      return processedTrack();
+    restart: async (opts) => {
+      adapter.processedTrack = await processor.restart(
+        opts.track,
+        opts.element,
+      );
    },
    destroy: async () => processor.destroy(),
  };
+  return adapter;
 }
@@ -1,26 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { type VideoProcessor } from "../media-api";
-
-const turns = new WeakMap<VideoProcessor, Promise<unknown>>();
-
-/**
- * One operation at a time on a processor. A host shares one across the
- * tracks it captures and publishes, and a second init while the first still
- * loads its model, or a destroy while an init runs, leaves it broken: the
- * backend's own locking is per track, and a track that is stopped tears its
- * processor down without waiting.
- */
-export async function inTurn<T>(
-  processor: VideoProcessor,
-  run: () => Promise<T>,
-): Promise<T> {
-  const turn = (turns.get(processor) ?? Promise.resolve()).then(run, run);
-  turns.set(processor, turn);
-  return turn;
-}
@@ -23,18 +23,19 @@ import {
 import * as Sentry from "@sentry/react";
 import { TooltipProvider } from "@vector-im/compound-web";
 import { logger } from "matrix-js-sdk/lib/logger";
+import { type MatrixClient } from "matrix-js-sdk";
 import { I18nextProvider } from "react-i18next";

 import { HomePage } from "./home/HomePage";
 import { LoginPage } from "./auth/LoginPage";
 import { RegisterPage } from "./auth/RegisterPage";
 import { RoomPage } from "./room/RoomPage";
-import { ClientManagerProvider, ClientProvider } from "./ClientContext";
+import { ClientProvider } from "./ClientContext";
 import { ErrorPage, LoadingPage } from "./FullScreenView";
 import { Initializer } from "./initializer";
 import { type WidgetHelpers } from "./widget";
 import { useTheme } from "./useTheme";
-import { BackgroundEffectsProvider } from "./tracks/BackgroundEffectsContext";
+import { ProcessorProvider } from "./tracks/TrackProcessorContext";
 import { type AppViewModel } from "./state/AppViewModel";
 import { MediaDevicesContext } from "./MediaDevicesContext";
 import {
@@ -130,11 +131,24 @@ export const App: FC<Props> = ({ vm, widget }) => {
      .catch(logger.error);
  });

-  const content = loaded ? (
-    <ClientProvider session={vm.clientSession}>
-      <ClientManagerProvider value={vm.clientManager}>
+  // As a widget, the client comes from the host over the widget API. Standalone,
+  // Element Call finds one itself, so there is nothing to wait for here.
+  const [widgetClient, setWidgetClient] = useState<MatrixClient | undefined>(
+    undefined,
+  );
+  useEffect(() => {
+    if (widget === null) return;
+    widget.client
+      .then(setWidgetClient)
+      .catch((e) => logger.error("Failed to obtain the host's client", e));
+  }, [widget]);
+  const clientReady = widget === null || widgetClient !== undefined;
+
+  const content =
+    loaded && clientReady ? (
+      <ClientProvider client={widgetClient}>
        <MediaDevicesContext value={vm.mediaDevices}>
-          <BackgroundEffectsProvider effects={vm.backgroundEffects}>
+          <ProcessorProvider>
            <Sentry.ErrorBoundary
              fallback={(error) => <ErrorPage error={error} />}
            >
@@ -145,13 +159,12 @@ export const App: FC<Props> = ({ vm, widget }) => {
                <SentryRoute path="*" element={<RoomPage />} />
              </Routes>
            </Sentry.ErrorBoundary>
-          </BackgroundEffectsProvider>
+          </ProcessorProvider>
        </MediaDevicesContext>
-      </ClientManagerProvider>
-    </ClientProvider>
-  ) : (
-    <LoadingPage />
-  );
+      </ClientProvider>
+    ) : (
+      <LoadingPage />
+    );

  return (
    <I18nextProvider i18n={i18n}>
@@ -12,7 +12,6 @@ import { type FC, type PropsWithChildren } from "react";

 import { ClientContextProvider } from "./ClientContext";
 import { Avatar } from "./Avatar";
-import { hostClientSession } from "./state/ClientSession";
 import { mockMatrixRoomMember, mockRtcMembership } from "./utils/test";
 import {
  type HostBridge,
@@ -27,7 +26,22 @@ const TestComponent: FC<
  }>
 > = ({ client, hostBridge = nullHostBridge, children }) => {
  return (
-    <ClientContextProvider value={hostClientSession(client)}>
+    <ClientContextProvider
+      value={{
+        state: "valid",
+        disconnected: false,
+        supportedFeatures: {
+          reactions: true,
+        },
+        setClient: vi.fn(),
+        authenticated: {
+          client,
+          isPasswordlessUser: true,
+          changePassword: vi.fn(),
+          logout: vi.fn(),
+        },
+      }}
+    >
      <HostBridgeProvider value={hostBridge}>{children}</HostBridgeProvider>
    </ClientContextProvider>
  );
@@ -15,7 +15,7 @@ import {
 import { Avatar as CompoundAvatar } from "@vector-im/compound-web";
 import { type MatrixClient } from "matrix-js-sdk";

-import { useClient } from "./ClientContext";
+import { useClientState } from "./ClientContext";
 import { useHostBridge } from "./HostBridge";

 export enum Size {
@@ -74,7 +74,7 @@ export const Avatar: FC<Props> = ({
  style,
  ...props
 }) => {
-  const { client } = useClient();
+  const clientState = useClientState();
  const hostBridge = useHostBridge();

  const sizePx = useMemo(
@@ -87,7 +87,7 @@ export const Avatar: FC<Props> = ({

  const [avatarUrl, setAvatarUrl] = useState<string | undefined>(undefined);

-  // In theory, a change in `client` or `sizePx` could run extra media
+  // In theory, a change in `clientState` or `sizePx` could run extra media
  // downloads, but in practice they should be stable long before this code runs.
  useEffect(() => {
    if (!src) {
@@ -99,8 +99,12 @@ export const Avatar: FC<Props> = ({

    if (hostBridge.downloadMedia) {
      blob = hostBridge.downloadMedia(src);
-    } else if (client && sizePx) {
-      blob = getAvatarFromServer(client, src, sizePx);
+    } else if (
+      clientState?.state === "valid" &&
+      clientState.authenticated?.client &&
+      sizePx
+    ) {
+      blob = getAvatarFromServer(clientState.authenticated.client, src, sizePx);
    } else {
      setAvatarUrl(undefined);
      return;
@@ -129,7 +133,7 @@ export const Avatar: FC<Props> = ({
        URL.revokeObjectURL(objectUrl);
      }
    };
-  }, [client, hostBridge, src, sizePx]);
+  }, [clientState, hostBridge, src, sizePx]);

  return (
    <CompoundAvatar
@@ -6,25 +6,12 @@ Please see LICENSE in the repository root for full details.
 */

 import { expect, test, vi } from "vitest";
-import { act, render, renderHook } from "@testing-library/react";
+import { render, waitFor } from "@testing-library/react";
 import { BrowserRouter } from "react-router-dom";
 import { type MatrixClient } from "matrix-js-sdk";
 import { type FC } from "react";
-import { BehaviorSubject } from "rxjs";

-import {
-  ClientManagerProvider,
-  ClientProvider,
-  useClientManager,
-  useClientManagerIfAny,
-  useClientSessionState,
-} from "./ClientContext";
-import {
-  type ClientManager,
-  type ClientSession,
-  type ClientSessionState,
-  hostClientSession,
-} from "./state/ClientSession";
+import { ClientProvider, useClientState } from "./ClientContext";

 const mockClient = (userId = "@alice:example.org"): MatrixClient =>
  ({
@@ -37,47 +24,67 @@ const mockClient = (userId = "@alice:example.org"): MatrixClient =>

 /** Reports what the context says, so a test can assert on it. */
 const ShowClientState: FC = () => {
-  const state = useClientSessionState();
-  switch (state.state) {
-    case "signedIn":
-      return <span>{state.client.getUserId()}</span>;
-    case "signedOut":
-      return <span>unauthenticated</span>;
-    default:
-      return <span>{state.state}</span>;
-  }
+  const state = useClientState();
+  if (state === undefined) return <span>loading</span>;
+  if (state.state === "error") return <span>error</span>;
+  return (
+    <span>{state.authenticated?.client.getUserId() ?? "unauthenticated"}</span>
+  );
 };

-const renderProvider = (
-  session: ClientSession,
-  children = <ShowClientState />,
-): ReturnType<typeof render> =>
-  render(
+test("uses a client supplied by the host without waiting", () => {
+  const client = mockClient();
+
+  const { container } = render(
    <BrowserRouter>
-      <ClientProvider session={session}>{children}</ClientProvider>
+      <ClientProvider client={client}>
+        <ShowClientState />
+      </ClientProvider>
    </BrowserRouter>,
  );

-test("uses a client supplied by the host without waiting", () => {
-  const { container } = renderProvider(hostClientSession(mockClient()));
-
  // Available on the very first render: a supplied client needs no session
  // restoring, so there is no loading state to pass through.
  expect(container.textContent).toBe("@alice:example.org");
 });

+test("does not claim exclusive use of storage when given a client", () => {
+  // The channel is created when the module loads, so spy on the prototype
+  // rather than trying to replace the global.
+  const postMessage = vi.spyOn(BroadcastChannel.prototype, "postMessage");
+
+  render(
+    <BrowserRouter>
+      <ClientProvider client={mockClient()}>
+        <ShowClientState />
+      </ClientProvider>
+    </BrowserRouter>,
+  );
+
+  // The broadcast shuts down other instances to protect Element Call's own
+  // stores. A host's client brings its own, so there is nothing to protect.
+  expect(postMessage).not.toHaveBeenCalled();
+
+  postMessage.mockRestore();
+});
+
 test("follows the client when the host swaps it", () => {
-  const { container, rerender } = renderProvider(
-    hostClientSession(mockClient()),
+  const first = mockClient();
+  const second = mockClient("@bob:example.org");
+
+  const { container, rerender } = render(
+    <BrowserRouter>
+      <ClientProvider client={first}>
+        <ShowClientState />
+      </ClientProvider>
+    </BrowserRouter>,
  );
  expect(container.textContent).toBe("@alice:example.org");

  // A host that re-authenticates hands us a new client on a mounted component
  rerender(
    <BrowserRouter>
-      <ClientProvider
-        session={hostClientSession(mockClient("@bob:example.org"))}
-      >
+      <ClientProvider client={second}>
        <ShowClientState />
      </ClientProvider>
    </BrowserRouter>,
@@ -86,63 +93,23 @@ test("follows the client when the host swaps it", () => {
  expect(container.textContent).toBe("@bob:example.org");
 });

-test("follows a session of its own as it is restored", () => {
-  const state$ = new BehaviorSubject<ClientSessionState>({ state: "loading" });
-  const { container } = renderProvider({ state$ });
+test("finds a client of its own when the host supplies none", async () => {
+  const client = mockClient();
+  vi.doMock("./utils/spa", () => ({
+    initSPA: vi.fn().mockResolvedValue({ client, passwordlessUser: true }),
+  }));
+
+  const { container } = render(
+    <BrowserRouter>
+      <ClientProvider>
+        <ShowClientState />
+      </ClientProvider>
+    </BrowserRouter>,
+  );

  // Nothing to show until a session has been restored or created
  expect(container.textContent).toBe("loading");
-  act(() =>
-    state$.next({
-      state: "signedIn",
-      client: mockClient(),
-      passwordlessUser: true,
-    }),
-  );
-  expect(container.textContent).toBe("@alice:example.org");
-});
+  await waitFor(() => expect(container.textContent).toBe("@alice:example.org"));

-test("has no one signed in when the session says so", () => {
-  const { container } = renderProvider({
-    state$: new BehaviorSubject<ClientSessionState>({ state: "signedOut" }),
-  });
-  expect(container.textContent).toBe("unauthenticated");
-});
-
-test("shows the session's error in place of its children", () => {
-  const { container } = renderProvider({
-    state$: new BehaviorSubject<ClientSessionState>({
-      state: "error",
-      error: new Error("Opened elsewhere"),
-    }),
-  });
-  // The error page, not the children
-  expect(container.textContent).not.toContain("error");
-  expect(container.textContent).toContain("Something went wrong");
-});
-
-test("hands the session's manager to views that need one", () => {
-  const manager: ClientManager = {
-    login: vi.fn(),
-    register: vi.fn(),
-    logout: vi.fn(),
-  };
-  const { result } = renderHook(
-    () => [useClientManager(), useClientManagerIfAny()],
-    {
-      wrapper: ({ children }) => (
-        <ClientManagerProvider value={manager}>
-          <>{children}</>
-        </ClientManagerProvider>
-      ),
-    },
-  );
-  expect(result.current).toEqual([manager, manager]);
-});
-
-test("has no manager for a host's session", () => {
-  // The component and the widget provide none; a view that insists on one is
-  // in the wrong build
-  expect(renderHook(() => useClientManagerIfAny()).result.current).toBeNull();
-  expect(() => renderHook(() => useClientManager())).toThrow();
+  vi.doUnmock("./utils/spa");
 });
@@ -5,18 +5,30 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */

-import { type FC, useEffect, createContext, use, type JSX } from "react";
-import { type MatrixClient } from "matrix-js-sdk";
+import {
+  type FC,
+  useCallback,
+  useEffect,
+  useState,
+  createContext,
+  use,
+  useRef,
+  useMemo,
+  type JSX,
+} from "react";
+import { logger } from "matrix-js-sdk/lib/logger";
+import { type ISyncStateData, type SyncState } from "matrix-js-sdk/lib/sync";
+import { ClientEvent, type MatrixClient } from "matrix-js-sdk";

 import { ErrorPage } from "./FullScreenView";
-import { PosthogAnalytics } from "./analytics/PosthogAnalytics";
-import { useBehavior } from "./useBehavior";
-import { constant } from "./state/Behavior";
+import { useHostBridge } from "./HostBridge";
+import { useLeaveToHome } from "./LeaveToHomeContext";
 import {
-  type ClientManager,
-  type ClientSession,
-  type ClientSessionState,
-} from "./state/ClientSession";
+  PosthogAnalytics,
+  RegistrationType,
+} from "./analytics/PosthogAnalytics";
+import { useEventTarget } from "./useEvents";
+import { OpenElsewhereError } from "./RichError";

 declare global {
  interface Window {
@@ -25,70 +37,360 @@ declare global {
  }
 }

-// Without a provider, no one is signed in and there is no session to act on
-const noClientSession: ClientSession = {
-  state$: constant({ state: "signedOut" }),
+export type ClientState = ValidClientState | ErrorState;
+
+export type ValidClientState = {
+  state: "valid";
+  authenticated?: AuthenticatedClient;
+  // 'Disconnected' rather than 'connected' because it tracks specifically
+  // whether the client is supposed to be connected but is not
+  disconnected: boolean;
+  supportedFeatures: {
+    reactions: boolean;
+  };
+  setClient: (client: MatrixClient, session: Session) => void;
 };

-const ClientContext = createContext<ClientSession>(noClientSession);
+export type AuthenticatedClient = {
+  client: MatrixClient;
+  isPasswordlessUser: boolean;
+  changePassword: (password: string) => Promise<void>;
+  logout: () => void;
+};
+
+export type ErrorState = {
+  state: "error";
+  error: Error;
+};
+
+const ClientContext = createContext<ClientState | undefined>(undefined);

 export const ClientContextProvider = ClientContext.Provider;

-export const useClientSessionState = (): ClientSessionState =>
-  useBehavior(use(ClientContext).state$);
+export const useClientState = (): ClientState | undefined => use(ClientContext);

-export function useClient(): { client?: MatrixClient } {
-  const state = useClientSessionState();
-  return { client: state.state === "signedIn" ? state.client : undefined };
+export function useClient(): {
+  client?: MatrixClient;
+  setClient?: (client: MatrixClient, session: Session) => void;
+} {
+  let client;
+  let setClient;
+
+  const clientState = useClientState();
+  if (clientState?.state === "valid") {
+    client = clientState.authenticated?.client;
+    setClient = clientState.setClient;
+  }
+
+  return { client, setClient };
 }

-// Null where the session is a host's: the component, and the widget
-const ClientManagerContext = createContext<ClientManager | null>(null);
+// Plain representation of the `ClientContext` as a helper for old components that expected an object with multiple fields.
+export function useClientLegacy(): {
+  client?: MatrixClient;
+  setClient?: (client: MatrixClient, session: Session) => void;
+  passwordlessUser: boolean;
+  loading: boolean;
+  authenticated: boolean;
+  logout?: () => void;
+  error?: Error;
+} {
+  const clientState = useClientState();

-export const ClientManagerProvider = ClientManagerContext.Provider;
+  let client;
+  let setClient;
+  let passwordlessUser = false;
+  let loading = true;
+  let error;
+  let authenticated = false;
+  let logout;

-/**
- * The manager of a session that is Element Call's own, for views that only
- * the standalone app mounts: the login and registration pages. Throws
- * elsewhere, as those views have no business being there.
- */
-export function useClientManager(): ClientManager {
-  const manager = use(ClientManagerContext);
-  if (manager === null)
-    throw new Error("This view needs a session of Element Call's own");
-  return manager;
+  if (clientState?.state === "valid") {
+    client = clientState.authenticated?.client;
+    setClient = clientState.setClient;
+    passwordlessUser = clientState.authenticated?.isPasswordlessUser ?? false;
+    loading = false;
+    authenticated = client !== undefined;
+    logout = clientState.authenticated?.logout;
+  } else if (clientState?.state === "error") {
+    error = clientState.error;
+    loading = false;
+  }
+
+  return {
+    client,
+    setClient,
+    passwordlessUser,
+    loading,
+    authenticated,
+    logout,
+    error,
+  };
 }

-/**
- * The session's manager, or null where the session is a host's. For views
- * shared with the widget, which can offer to sign out only when that is ours
- * to do.
- */
-export const useClientManagerIfAny = (): ClientManager | null =>
-  use(ClientManagerContext);
+const loadChannel =
+  "BroadcastChannel" in window ? new BroadcastChannel("load") : null;

 interface Props {
  children: JSX.Element;
-  /** a session from Element Call SPA, from a widget or the host (EW) */
-  session: ClientSession;
+  /**
+   * The client Element Call should use.
+   *
+   * An application hosting Element Call as a component already has a client,
+   * and owns the user's session; supplying it here means Element Call neither
+   * authenticates anyone nor manages their session. Left out, Element Call finds a client
+   * itself — from the widget API, or by restoring or creating a session of its
+   * own.
+   */
+  client?: MatrixClient;
 }

-export const ClientProvider: FC<Props> = ({ children, session }) => {
-  const state = useBehavior(session.state$);
+export const ClientProvider: FC<Props> = ({ children, client }) => {
+  const leaveToHome = useLeaveToHome();
+  const hostBridge = useHostBridge();
+
+  // null = signed out, undefined = loading
+  const [initClientState, setInitClientState] = useState<
+    InitResult | null | undefined
+  >(
+    client === undefined
+      ? undefined
+      : // A supplied client belongs to the host, so there is no session of ours
+        // to restore and nothing to wait for.
+        { client, passwordlessUser: false },
+  );
+
+  const initializing = useRef(false);
+  useEffect(() => {
+    if (client !== undefined) {
+      // Nothing to load, but a host may hand us a different client later — on
+      // re-authenticating, say — so follow whichever one it has given us.
+      setInitClientState((current) =>
+        current?.client === client
+          ? current
+          : { client, passwordlessUser: false },
+      );
+      // Analytics still need to follow the user's choices.
+      if (PosthogAnalytics.instance.isEnabled())
+        PosthogAnalytics.instance.startListeningToSettingsChanges();
+      return;
+    }
+    // In case the component is mounted, unmounted, and remounted quickly (as
+    // React does in strict mode), we need to make sure not to doubly initialize
+    // the client.
+    if (initializing.current) return;
+    initializing.current = true;
+
+    loadClient()
+      .then((initResult) => {
+        setInitClientState(initResult);
+        if (PosthogAnalytics.instance.isEnabled())
+          PosthogAnalytics.instance.startListeningToSettingsChanges();
+      })
+      .catch((err) => logger.error(err))
+      .finally(() => (initializing.current = false));
+  }, [client]);
+
+  const changePassword = useCallback(
+    async (password: string) => {
+      const session = loadSession();
+      if (!initClientState?.client || !session) {
+        return;
+      }
+
+      await initClientState.client.setPassword(
+        {
+          type: "m.login.password",
+          identifier: {
+            type: "m.id.user",
+            user: session.user_id,
+          },
+          user: session.user_id,
+          password: session.tempPassword,
+        },
+        password,
+      );
+
+      saveSession({ ...session, passwordlessUser: false });
+
+      setInitClientState({
+        ...initClientState,
+        passwordlessUser: false,
+      });
+    },
+    [initClientState],
+  );
+
+  const setClient = useCallback(
+    (client: MatrixClient, session: Session) => {
+      const oldClient = initClientState?.client;
+      if (oldClient && oldClient !== client) {
+        oldClient.stopClient();
+      }
+
+      saveSession(session);
+      setInitClientState({
+        client,
+        passwordlessUser: session.passwordlessUser,
+      });
+      if (PosthogAnalytics.instance.isEnabled())
+        PosthogAnalytics.instance.startListeningToSettingsChanges();
+    },
+    [initClientState?.client],
+  );
+
+  const logout = useCallback(async () => {
+    const client = initClientState?.client;
+    if (!client) {
+      return;
+    }
+
+    await client.logout(true);
+    await client.clearStores();
+    clearSession();
+    setInitClientState(null);
+    leaveToHome?.();
+    PosthogAnalytics.instance.logout();
+    PosthogAnalytics.instance.setRegistrationType(RegistrationType.Guest);
+  }, [leaveToHome, initClientState?.client]);
+
+  // To protect against multiple sessions writing to the same storage
+  // simultaneously, we send a broadcast message that shuts down all other
+  // running instances of the app. Element Call only has storage of its own to
+  // protect when it created the session itself; given a client — by a host, or
+  // over the widget API — it is mostly stateless.
+  const ownsSession = client === undefined;
+  useEffect(() => {
+    if (ownsSession) loadChannel?.postMessage({});
+  }, [ownsSession]);
+
+  const [alreadyOpenedErr, setAlreadyOpenedErr] = useState<Error | undefined>(
+    undefined,
+  );
+  useEventTarget(
+    loadChannel,
+    "message",
+    useCallback(() => {
+      initClientState?.client.stopClient();
+      setAlreadyOpenedErr(new OpenElsewhereError());
+    }, [initClientState?.client, setAlreadyOpenedErr]),
+  );
+
+  const [isDisconnected, setIsDisconnected] = useState(false);
+  const [supportsReactions, setSupportsReactions] = useState(false);
+
+  const state: ClientState | undefined = useMemo(() => {
+    if (alreadyOpenedErr) {
+      return { state: "error", error: alreadyOpenedErr };
+    }
+
+    if (initClientState === undefined) return undefined;
+
+    const authenticated =
+      initClientState === null
+        ? undefined
+        : {
+            client: initClientState.client,
+            isPasswordlessUser: initClientState.passwordlessUser,
+            changePassword,
+            logout,
+          };
+
+    return {
+      state: "valid",
+      authenticated,
+      setClient,
+      disconnected: isDisconnected,
+      supportedFeatures: {
+        reactions: supportsReactions,
+      },
+    };
+  }, [
+    alreadyOpenedErr,
+    changePassword,
+    initClientState,
+    logout,
+    setClient,
+    isDisconnected,
+    supportsReactions,
+  ]);
+
+  const onSync = useCallback(
+    (state: SyncState, _old: SyncState | null, data?: ISyncStateData) => {
+      setIsDisconnected(clientIsDisconnected(state, data));
+    },
+    [],
+  );

  useEffect(() => {
-    if (state.state !== "signedIn") return;
-    window.matrixclient = state.client;
-    window.passwordlessUser = state.passwordlessUser;
+    if (!initClientState) {
+      return;
+    }
+
+    window.matrixclient = initClientState.client;
+    window.passwordlessUser = initClientState.passwordlessUser;

    if (PosthogAnalytics.hasInstance())
      PosthogAnalytics.instance.onLoginStatusChanged();
-    // Analytics follow the user's choices whoever the client belongs to
-    if (PosthogAnalytics.instance.isEnabled())
-      PosthogAnalytics.instance.startListeningToSettingsChanges();
-  }, [state]);

-  if (state.state === "error") return <ErrorPage error={state.error} />;
+    if (initClientState.client) {
+      initClientState.client.on(ClientEvent.Sync, onSync);
+    }

-  return <ClientContext value={session}>{children}</ClientContext>;
+    if (!hostBridge.supportsReactions)
+      logger.warn("The host does not permit reactions");
+    setSupportsReactions(hostBridge.supportsReactions);
+
+    return (): void => {
+      if (initClientState.client) {
+        initClientState.client.removeListener(ClientEvent.Sync, onSync);
+      }
+    };
+  }, [initClientState, onSync, hostBridge]);
+
+  if (alreadyOpenedErr) {
+    return <ErrorPage error={alreadyOpenedErr} />;
+  }
+
+  return <ClientContext value={state}>{children}</ClientContext>;
 };
+
+export type InitResult = {
+  client: MatrixClient;
+  passwordlessUser: boolean;
+};
+
+/**
+ * Restores or creates a session of Element Call's own. Only reached when no
+ * client was supplied for it to use.
+ */
+async function loadClient(): Promise<InitResult | null> {
+  const { initSPA } = await import("./utils/spa");
+  return initSPA(loadSession, clearSession);
+}
+
+export interface Session {
+  user_id: string;
+  device_id: string;
+  access_token: string;
+  passwordlessUser: boolean;
+  tempPassword?: string;
+}
+
+const clearSession = (): void => localStorage.removeItem("matrix-auth-store");
+const saveSession = (s: Session): void =>
+  localStorage.setItem("matrix-auth-store", JSON.stringify(s));
+const loadSession = (): Session | undefined => {
+  const data = localStorage.getItem("matrix-auth-store");
+  if (!data) {
+    return undefined;
+  }
+
+  return JSON.parse(data);
+};
+
+const clientIsDisconnected = (
+  syncState: SyncState,
+  syncData?: ISyncStateData,
+): boolean =>
+  syncState === "ERROR" && syncData?.error?.name === "ConnectionError";
@@ -1,43 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, test, vi } from "vitest";
-import { act, render } from "@testing-library/react";
-import { type MatrixClient } from "matrix-js-sdk";
-
-import { ClientProvider } from "./ClientContext";
-import { DisconnectedBanner } from "./DisconnectedBanner";
-import { hostClientSession } from "./state/ClientSession";
-
-test("shows while the client's sync fails to connect", () => {
-  const client = {
-    on: vi.fn(),
-    removeListener: vi.fn(),
-    getUserId: () => "@alice:example.org",
-  } as Partial<MatrixClient> as MatrixClient;
-  const { container } = render(
-    <ClientProvider session={hostClientSession(client)}>
-      <DisconnectedBanner />
-    </ClientProvider>,
-  );
-  expect(container.textContent).toBe("");
-
-  const [, onSync] = vi.mocked(client.on).mock.calls[0] as [
-    unknown,
-    (state: string, old: null, data?: { error?: Error }) => void,
-  ];
-  const connectionError = Object.assign(new Error("offline"), {
-    name: "ConnectionError",
-  });
-  act(() => onSync("ERROR", null, { error: connectionError }));
-  expect(container.textContent).not.toBe("");
-  // Any other failure is not a connection problem
-  act(() => onSync("ERROR", null, { error: new Error("rate limited") }));
-  expect(container.textContent).toBe("");
-  act(() => onSync("SYNCING", null));
-  expect(container.textContent).toBe("");
-});
@@ -6,60 +6,30 @@ Please see LICENSE in the repository root for full details.
 */

 import classNames from "classnames";
-import {
-  type FC,
-  type HTMLAttributes,
-  type ReactNode,
-  useEffect,
-  useState,
-} from "react";
+import { type FC, type HTMLAttributes, type ReactNode } from "react";
 import { useTranslation } from "react-i18next";
-import { ClientEvent, type MatrixClient } from "matrix-js-sdk";
-import { type ISyncStateData, type SyncState } from "matrix-js-sdk/lib/sync";

 import styles from "./DisconnectedBanner.module.css";
-import { useClient } from "./ClientContext";
+import { type ValidClientState, useClientState } from "./ClientContext";

 interface Props extends HTMLAttributes<HTMLElement> {
  children?: ReactNode;
  className?: string;
 }

-/**
- * Shown while the signed-in client is supposed to be connected but is not.
- */
 export const DisconnectedBanner: FC<Props> = ({
  children,
  className,
  ...rest
 }) => {
  const { t } = useTranslation();
-  const { client } = useClient();
-  // Tagged with the client it describes, so that a swapped client does not
-  // inherit the old one's verdict before its first sync
-  const [disconnected, setDisconnected] = useState<
-    [MatrixClient, boolean] | null
-  >(null);
+  const clientState = useClientState();
+  let shouldShowBanner = false;

-  useEffect(() => {
-    if (client === undefined) return;
-    const onSync = (
-      syncState: SyncState,
-      _old: SyncState | null,
-      data?: ISyncStateData,
-    ): void => {
-      const clientIsDisconnected =
-        syncState === "ERROR" && data?.error?.name === "ConnectionError";
-      setDisconnected([client, clientIsDisconnected]);
-    };
-    client.on(ClientEvent.Sync, onSync);
-    return (): void => {
-      client.removeListener(ClientEvent.Sync, onSync);
-    };
-  }, [client]);
-
-  const shouldShowBanner =
-    disconnected !== null && disconnected[0] === client && disconnected[1];
+  if (clientState?.state === "valid") {
+    const validClientState = clientState as ValidClientState;
+    shouldShowBanner = validClientState.disconnected;
+  }

  return (
    <>
@@ -18,8 +18,6 @@ Please see LICENSE in the repository root for full details.
 */

 import {
-  RTC_CALL_INTENT_AUDIO,
-  RTC_CALL_INTENT_VIDEO,
  type RTCCallIntent,
  type RTCNotificationType,
 } from "matrix-js-sdk/lib/matrixrtc";
@@ -181,40 +179,40 @@ export function configurationForIntent(intent: UserIntent): UrlConfiguration {
  switch (intent) {
    case UserIntent.StartNewCall:
      preset.skipLobby = false;
-      preset.callIntent = RTC_CALL_INTENT_VIDEO;
+      preset.callIntent = "video";
      break;
    case UserIntent.JoinExistingCall:
      // On desktop this will be overridden based on which button was used to join the call
      preset.skipLobby = false;
-      preset.callIntent = RTC_CALL_INTENT_VIDEO;
+      preset.callIntent = "video";
      break;
    case UserIntent.StartNewCallVoice:
      preset.skipLobby = false;
-      preset.callIntent = RTC_CALL_INTENT_AUDIO;
+      preset.callIntent = "audio";
      break;
    case UserIntent.JoinExistingCallVoice:
      // On desktop this will be overridden based on which button was used to join the call
      preset.skipLobby = false;
-      preset.callIntent = RTC_CALL_INTENT_AUDIO;
+      preset.callIntent = "audio";
      break;
    case UserIntent.StartNewCallDMVoice:
-      preset.callIntent = RTC_CALL_INTENT_AUDIO;
+      preset.callIntent = "audio";
    // Fall through
    case UserIntent.StartNewCallDM:
      preset.skipLobby = true;
      preset.sendNotificationType = "ring";
      preset.autoLeaveWhenOthersLeft = true;
      preset.waitForCallPickup = true;
-      preset.callIntent = preset.callIntent ?? RTC_CALL_INTENT_VIDEO;
+      preset.callIntent = preset.callIntent ?? "video";
      break;
    case UserIntent.JoinExistingCallDMVoice:
-      preset.callIntent = RTC_CALL_INTENT_AUDIO;
+      preset.callIntent = "audio";
    // Fall through
    case UserIntent.JoinExistingCallDM:
      // On desktop this will be overridden based on which button was used to join the call
      preset.skipLobby = true;
      preset.autoLeaveWhenOthersLeft = true;
-      preset.callIntent = preset.callIntent ?? RTC_CALL_INTENT_VIDEO;
+      preset.callIntent = preset.callIntent ?? "video";
      break;
    // Non widget usecase defaults
    default:
@@ -21,10 +21,6 @@ import {
  UserIntent,
 } from "../src/UrlParams";
 import { mockConfig } from "./utils/test";
-import {
-  RTC_CALL_INTENT_AUDIO,
-  RTC_CALL_INTENT_VIDEO,
-} from "matrix-js-sdk/lib/matrixrtc";

 const ROOM_NAME = "roomNameHere";
 const ROOM_ID = "!d45f138fsd";
@@ -279,7 +275,7 @@ describe("UrlParams", () => {
      ).toMatchObject({
        ...startNewCallDefaults("desktop"),
        skipLobby: false,
-        callIntent: RTC_CALL_INTENT_VIDEO,
+        callIntent: "video",
      });
    });

@@ -326,7 +322,7 @@ describe("UrlParams", () => {
      ).toMatchObject({
        ...startNewCallDefaults("desktop"),
        skipLobby: false,
-        callIntent: RTC_CALL_INTENT_AUDIO,
+        callIntent: "audio",
      });
    });

@@ -337,7 +333,7 @@ describe("UrlParams", () => {
        ),
      ).toMatchObject({
        ...joinExistingCallDefaults("desktop"),
-        callIntent: RTC_CALL_INTENT_AUDIO,
+        callIntent: "audio",
      });
    });

@@ -352,7 +348,7 @@ describe("UrlParams", () => {
        sendNotificationType: "ring",
        autoLeaveWhenOthersLeft: true,
        waitForCallPickup: true,
-        callIntent: RTC_CALL_INTENT_AUDIO,
+        callIntent: "audio",
      });
    });

@@ -367,7 +363,7 @@ describe("UrlParams", () => {
        skipLobby: true,
        autoLeaveWhenOthersLeft: true,
        waitForCallPickup: false,
-        callIntent: RTC_CALL_INTENT_VIDEO,
+        callIntent: "video",
      });
    });

@@ -381,7 +377,7 @@ describe("UrlParams", () => {
        skipLobby: true,
        autoLeaveWhenOthersLeft: true,
        waitForCallPickup: false,
-        callIntent: RTC_CALL_INTENT_AUDIO,
+        callIntent: "audio",
      });
    });
  });
@@ -1,96 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, test, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { BrowserRouter } from "react-router-dom";
-import { type MatrixClient } from "matrix-js-sdk";
-import { TooltipProvider } from "@vector-im/compound-web";
-import { BehaviorSubject } from "rxjs";
-
-import { ClientManagerProvider, ClientProvider } from "./ClientContext";
-import { LeaveToHomeProvider } from "./LeaveToHomeContext";
-import {
-  type ClientManager,
-  type ClientSession,
-  type ClientSessionState,
-  hostClientSession,
-} from "./state/ClientSession";
-import { UserMenuContainer } from "./UserMenuContainer";
-import { flushPromises } from "./utils/test";
-
-vi.mock("./settings/SettingsModal", () => ({
-  defaultSettingsTab: "audio",
-  SettingsModal: (): null => null,
-}));
-
-const mockClient = (): MatrixClient =>
-  ({
-    on: vi.fn(),
-    removeListener: vi.fn(),
-    getUserId: () => "@alice:example.org",
-    getUserIdLocalpart: () => "alice",
-    getDeviceId: () => "AAAA",
-    getUser: () => null,
-    stopClient: vi.fn(),
-  }) as Partial<MatrixClient> as MatrixClient;
-
-test("leaves for home after logging out of the session", async () => {
-  const logout = vi.fn().mockResolvedValue(undefined);
-  const leaveToHome = vi.fn();
-  renderMenu(
-    {
-      state$: new BehaviorSubject<ClientSessionState>({
-        state: "signedIn",
-        client: mockClient(),
-        passwordlessUser: false,
-      }),
-    },
-    { login: vi.fn(), register: vi.fn(), logout },
-    leaveToHome,
-  );
-
-  await selectSignOut();
-  expect(logout).toHaveBeenCalled();
-  expect(leaveToHome).toHaveBeenCalled();
-});
-
-test("cannot end a session that is not ours", async () => {
-  const leaveToHome = vi.fn();
-  renderMenu(hostClientSession(mockClient()), null, leaveToHome);
-
-  await selectSignOut();
-  expect(leaveToHome).not.toHaveBeenCalled();
-});
-
-async function selectSignOut(): Promise<void> {
-  const user = userEvent.setup();
-  await user.click(screen.getByTestId("usermenu_open"));
-  await user.click(await screen.findByTestId("usermenu_logout"));
-  await flushPromises();
-}
-
-function renderMenu(
-  session: ClientSession,
-  manager: ClientManager | null,
-  leaveToHome: (() => void) | null = null,
-): void {
-  render(
-    <BrowserRouter>
-      <TooltipProvider>
-        <LeaveToHomeProvider value={leaveToHome}>
-          <ClientProvider session={session}>
-            <ClientManagerProvider value={manager}>
-              <UserMenuContainer />
-            </ClientManagerProvider>
-          </ClientProvider>
-        </LeaveToHomeProvider>
-      </TooltipProvider>
-    </BrowserRouter>,
-  );
-}
@@ -9,12 +9,7 @@ import { type FC, useCallback, useState } from "react";
 import { useNavigate, useLocation } from "react-router-dom";
 import { logger } from "matrix-js-sdk/lib/logger";

-import {
-  useClient,
-  useClientManagerIfAny,
-  useClientSessionState,
-} from "./ClientContext";
-import { useLeaveToHome } from "./LeaveToHomeContext";
+import { useClientLegacy } from "./ClientContext";
 import { useProfile } from "./profile/useProfile";
 import { defaultSettingsTab, SettingsModal } from "./settings/SettingsModal";
 import { UserMenu } from "./UserMenu";
@@ -26,13 +21,7 @@ interface Props {
 export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
  const location = useLocation();
  const navigate = useNavigate();
-  const { client } = useClient();
-  const session = useClientSessionState();
-  const passwordlessUser =
-    session.state === "signedIn" && session.passwordlessUser;
-  // Absent when the session is a host's, which Element Call cannot end
-  const logout = useClientManagerIfAny()?.logout;
-  const leaveToHome = useLeaveToHome();
+  const { client, logout, authenticated, passwordlessUser } = useClientLegacy();
  const { displayName, avatarUrl } = useProfile(client);
  const [settingsModalOpen, setSettingsModalOpen] = useState(false);
  const onDismissSettingsModal = useCallback(
@@ -54,9 +43,7 @@ export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
          setSettingsModalOpen(true);
          break;
        case "logout":
-          logout?.()
-            .then(() => leaveToHome?.())
-            .catch((e) => logger.error("Failed to log out", e));
+          logout?.();
          break;
        case "login":
          navigate("/login", { state: { from: location } })?.catch((error) =>
@@ -65,7 +52,7 @@ export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
          break;
      }
    },
-    [navigate, location, logout, leaveToHome, setSettingsModalOpen],
+    [navigate, location, logout, setSettingsModalOpen],
  );

  const userName = client?.getUserIdLocalpart() ?? "";
@@ -73,7 +60,7 @@ export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
    <>
      <UserMenu
        preventNavigation={preventNavigation}
-        isAuthenticated={client !== undefined}
+        isAuthenticated={authenticated}
        isPasswordlessUser={passwordlessUser}
        avatarUrl={avatarUrl}
        onAction={onAction}
@@ -1,78 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { afterEach, beforeEach, expect, test, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { type FC } from "react";
-import { MemoryRouter, useLocation } from "react-router-dom";
-import { type MatrixClient } from "matrix-js-sdk";
-
-import { LoginPage } from "./LoginPage";
-import { ClientManagerProvider } from "../ClientContext";
-import { type ClientManager } from "../state/ClientSession";
-import { Config } from "../config/Config";
-
-beforeEach(() => {
-  vi.spyOn(Config, "defaultHomeserverUrl").mockReturnValue(
-    "https://hs.example.org",
-  );
-});
-afterEach(() => {
-  vi.restoreAllMocks();
-  vi.clearAllMocks();
-});
-
-test("signs in with the session's manager and goes home", async () => {
-  const manager = mockManager();
-  vi.mocked(manager.login).mockResolvedValue({} as MatrixClient);
-  renderLogin(manager);
-
-  await submit("alice", "hunter2");
-
-  expect(manager.login).toHaveBeenCalledWith(
-    "https://hs.example.org",
-    "alice",
-    "hunter2",
-  );
-  expect(await screen.findByText("at /")).toBeVisible();
-});
-
-test("shows why signing in failed", async () => {
-  const manager = mockManager();
-  vi.mocked(manager.login).mockRejectedValue(new Error("Wrong password"));
-  renderLogin(manager);
-
-  await submit("alice", "hunter2");
-
-  expect(await screen.findByText("Wrong password")).toBeVisible();
-  expect(screen.getByText("at /login")).toBeVisible();
-});
-
-async function submit(username: string, password: string): Promise<void> {
-  const user = userEvent.setup();
-  await user.type(screen.getByTestId("login_username"), username);
-  await user.type(screen.getByTestId("login_password"), password);
-  await user.click(screen.getByTestId("login_login"));
-}
-
-function mockManager(): ClientManager {
-  return { login: vi.fn(), register: vi.fn(), logout: vi.fn() };
-}
-
-const WhereAmI: FC = () => <span>at {useLocation().pathname}</span>;
-
-function renderLogin(manager: ClientManager): void {
-  render(
-    <MemoryRouter initialEntries={["/login"]}>
-      <ClientManagerProvider value={manager}>
-        <LoginPage />
-        <WhereAmI />
-      </ClientManagerProvider>
-    </MemoryRouter>,
-  );
-}
@@ -11,9 +11,10 @@ import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@vector-im/compound-web";

 import Logo from "../icons/LogoLarge.svg?react";
-import { useClientManager } from "../ClientContext";
+import { useClient } from "../ClientContext";
 import { FieldRow, InputField, ErrorMessage } from "../input/Input";
 import styles from "./LoginPage.module.css";
+import { useInteractiveLogin } from "./useInteractiveLogin";
 import { usePageTitle } from "../usePageTitle";
 import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
 import { Config } from "../config/Config";
@@ -23,7 +24,8 @@ export const LoginPage: FC = () => {
  const { t } = useTranslation();
  usePageTitle(t("login_title"));

-  const { login } = useClientManager();
+  const { client, setClient } = useClient();
+  const login = useInteractiveLogin(client);
  const homeserver = Config.defaultHomeserverUrl(); // TODO: Make this configurable
  const usernameRef = useRef<HTMLInputElement>(null);
  const passwordRef = useRef<HTMLInputElement>(null);
@@ -44,8 +46,15 @@ export const LoginPage: FC = () => {
        setLoading(false);
        return;
      }
+
      login(homeserver, usernameRef.current.value, passwordRef.current.value)
-        .then(async () => {
+        .then(async ([client, session]) => {
+          if (!setClient) {
+            return;
+          }
+
+          setClient(client, session);
+
          const locationState = location.state;
          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
          // @ts-ignore
@@ -63,7 +72,7 @@ export const LoginPage: FC = () => {
          setLoading(false);
        });
    },
-    [login, location, navigate, homeserver],
+    [login, location, navigate, homeserver, setClient],
  );
  // we need to limit the length of the homserver name to not cover the whole loginview input with the string.
  let shortendHomeserverName = Config.defaultServerName()?.slice(0, 25);
@@ -1,133 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { afterEach, expect, test, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { type FC } from "react";
-import { MemoryRouter, useLocation } from "react-router-dom";
-import { type MatrixClient } from "matrix-js-sdk";
-import { BehaviorSubject } from "rxjs";
-
-import { RegisterPage } from "./RegisterPage";
-import { ClientContextProvider, ClientManagerProvider } from "../ClientContext";
-import {
-  type ClientManager,
-  type ClientSessionState,
-} from "../state/ClientSession";
-
-vi.mock("./useRecaptcha", () => ({
-  useRecaptcha: () => ({
-    execute: vi.fn().mockResolvedValue("captcha-response"),
-    reset,
-    recaptchaId: "recaptcha",
-  }),
-}));
-vi.mock("./useRegistrationTerms", () => ({
-  useRegistrationTerms: () => ({ recaptchaKey: "site-key" }),
-}));
-
-const reset = vi.fn();
-
-afterEach(() => vi.clearAllMocks());
-
-test("waits for the session to be restored", () => {
-  renderRegister({ state: "loading" }, mockManager());
-  expect(screen.getByRole("heading", { name: "Loading…" })).toBeVisible();
-});
-
-test("registers an account, signs in and goes home", async () => {
-  const manager = mockManager();
-  const setSignedIn = vi.fn();
-  vi.mocked(manager.register).mockResolvedValue({
-    client: {} as MatrixClient,
-    setSignedIn,
-  });
-  renderRegister({ state: "signedOut" }, manager);
-
-  await submit("alice", "hunter2");
-
-  expect(manager.register).toHaveBeenCalledWith(
-    "alice",
-    "hunter2",
-    "alice",
-    "captcha-response",
-    false,
-  );
-  expect(setSignedIn).toHaveBeenCalled();
-  expect(await screen.findByText("at /")).toBeVisible();
-});
-
-test("upgrades a passwordless user to a full account", async () => {
-  const manager = mockManager();
-  vi.mocked(manager.register).mockResolvedValue({
-    client: {} as MatrixClient,
-    setSignedIn: vi.fn(),
-  });
-  renderRegister(
-    {
-      state: "signedIn",
-      client: { getUserId: () => "@guest:example.org" } as MatrixClient,
-      passwordlessUser: true,
-    },
-    manager,
-  );
-
-  await submit("alice", "hunter2");
-
-  expect(manager.register).toHaveBeenCalledWith(
-    "alice",
-    "hunter2",
-    "alice",
-    "captcha-response",
-    true,
-  );
-});
-
-test("shows why registering failed and resets the captcha", async () => {
-  const manager = mockManager();
-  vi.mocked(manager.register).mockRejectedValue(new Error("Name taken"));
-  renderRegister({ state: "signedOut" }, manager);
-
-  await submit("alice", "hunter2");
-
-  expect(await screen.findByText("Name taken")).toBeVisible();
-  expect(reset).toHaveBeenCalled();
-  expect(screen.getByText("at /register")).toBeVisible();
-});
-
-async function submit(username: string, password: string): Promise<void> {
-  const user = userEvent.setup();
-  await user.type(screen.getByTestId("register_username"), username);
-  await user.type(screen.getByTestId("register_password"), password);
-  await user.type(screen.getByTestId("register_confirm_password"), password);
-  await user.click(screen.getByTestId("register_register"));
-}
-
-function mockManager(): ClientManager {
-  return { login: vi.fn(), register: vi.fn(), logout: vi.fn() };
-}
-
-const WhereAmI: FC = () => <span>at {useLocation().pathname}</span>;
-
-function renderRegister(
-  state: ClientSessionState,
-  manager: ClientManager,
-): void {
-  render(
-    <MemoryRouter initialEntries={["/register"]}>
-      <ClientContextProvider
-        value={{ state$: new BehaviorSubject<ClientSessionState>(state) }}
-      >
-        <ClientManagerProvider value={manager}>
-          <RegisterPage />
-          <WhereAmI />
-        </ClientManagerProvider>
-      </ClientContextProvider>
-    </MemoryRouter>,
-  );
-}
@@ -22,12 +22,8 @@ import { logger } from "matrix-js-sdk/lib/logger";
 import { Button, Text } from "@vector-im/compound-web";

 import { FieldRow, InputField, ErrorMessage } from "../input/Input";
-import {
-  useClient,
-  useClientManager,
-  useClientSessionState,
-} from "../ClientContext";
-import { useRegistrationTerms } from "./useRegistrationTerms";
+import { useClientLegacy } from "../ClientContext";
+import { useInteractiveRegistration } from "./useInteractiveRegistration";
 import styles from "./LoginPage.module.css";
 import Logo from "../icons/LogoLarge.svg?react";
 import { LoadingPage } from "../FullScreenView";
@@ -41,13 +37,8 @@ export const RegisterPage: FC = () => {
  const { t } = useTranslation();
  usePageTitle(t("action.register"));

-  const session = useClientSessionState();
-  const loading = session.state === "loading";
-  const passwordlessUser =
-    session.state === "signedIn" && session.passwordlessUser;
-  const { client } = useClient();
-  const authenticated = client !== undefined;
-  const { register } = useClientManager();
+  const { loading, authenticated, passwordlessUser, client, setClient } =
+    useClientLegacy();

  const confirmPasswordRef = useRef<HTMLInputElement>(null);
  const navigate = useNavigate();
@@ -56,7 +47,7 @@ export const RegisterPage: FC = () => {
  const [error, setError] = useState<Error>();
  const [password, setPassword] = useState("");
  const [passwordConfirmation, setPasswordConfirmation] = useState("");
-  const { recaptchaKey } = useRegistrationTerms();
+  const { recaptchaKey, register } = useInteractiveRegistration(client);
  const { execute, reset, recaptchaId } = useRecaptcha(recaptchaKey);

  const onSubmitRegisterForm = useCallback(
@@ -73,7 +64,7 @@ export const RegisterPage: FC = () => {
        setRegistering(true);

        const recaptchaResponse = await execute();
-        const { client: newClient, setSignedIn } = await register(
+        const [newClient, session] = await register(
          userName,
          password,
          userName,
@@ -104,7 +95,7 @@ export const RegisterPage: FC = () => {
          }
        }

-        setSignedIn();
+        setClient?.(newClient, session);
        PosthogAnalytics.instance.eventSignup.cacheSignupEnd(new Date());
      };

@@ -126,7 +117,16 @@ export const RegisterPage: FC = () => {
          reset();
        });
    },
-    [register, location, navigate, passwordlessUser, reset, execute, client],
+    [
+      register,
+      location,
+      navigate,
+      passwordlessUser,
+      reset,
+      execute,
+      client,
+      setClient,
+    ],
  );

  useEffect(() => {
@@ -1,104 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { afterEach, expect, test, vi } from "vitest";
-import { createClient, type MatrixClient, MatrixError } from "matrix-js-sdk";
-import type * as MatrixJsSdk from "matrix-js-sdk";
-
-import { loginWithPassword, registerWithPassword } from "./interactiveAuth";
-
-vi.mock("matrix-js-sdk", async (importOriginal) => ({
-  ...(await importOriginal<typeof MatrixJsSdk>()),
-  createClient: vi.fn(),
-}));
-
-const credentials = {
-  user_id: "@alice:example.org",
-  device_id: "AAAA",
-  access_token: "secret",
-};
-
-// What interactive auth asks of the client besides the request itself
-const authClient = { generateClientSecret: () => "client-secret" };
-
-afterEach(() => {
-  vi.clearAllMocks();
-});
-
-test("logs in with a password", async () => {
-  const login = vi.fn().mockResolvedValue({ ...credentials, extra: "ignored" });
-  vi.mocked(createClient).mockReturnValue({
-    ...authClient,
-    login,
-  } as Partial<MatrixClient> as MatrixClient);
-
-  await expect(
-    loginWithPassword("https://hs.example.org", "alice", "hunter2"),
-  ).resolves.toEqual(credentials);
-
-  expect(createClient).toHaveBeenCalledWith({
-    baseUrl: "https://hs.example.org",
-  });
-  expect(login).toHaveBeenCalledWith("m.login.password", {
-    identifier: { type: "m.id.user", user: "alice" },
-    password: "hunter2",
-  });
-});
-
-test("registers, agreeing to the terms and answering the recaptcha", async () => {
-  // The homeserver turns the first request away with the stages to complete
-  // No error in it: that is the shape of a challenge rather than a refusal
-  const challenge = new MatrixError(
-    {
-      session: "session",
-      flows: [{ stages: ["m.login.terms", "m.login.recaptcha"] }],
-      params: {},
-      completed: [],
-    },
-    401,
-  );
-  const registerRequest = vi
-    .fn()
-    .mockImplementation(({ auth }: { auth?: { type: string } }) => {
-      if (auth === undefined) throw challenge;
-      challenge.data.completed = [
-        ...(challenge.data.completed as string[]),
-        auth.type,
-      ];
-      if (challenge.data.completed.length < 2) throw challenge;
-      return credentials;
-    });
-  vi.mocked(createClient).mockReturnValue({
-    ...authClient,
-    registerRequest,
-  } as Partial<MatrixClient> as MatrixClient);
-
-  await expect(
-    registerWithPassword(
-      "https://hs.example.org",
-      "alice",
-      "hunter2",
-      "captcha",
-    ),
-  ).resolves.toEqual(credentials);
-
-  expect(registerRequest).toHaveBeenCalledWith(
-    expect.objectContaining({
-      username: "alice",
-      password: "hunter2",
-      auth: expect.objectContaining({ type: "m.login.terms" }),
-    }),
-  );
-  expect(registerRequest).toHaveBeenCalledWith(
-    expect.objectContaining({
-      auth: expect.objectContaining({
-        type: "m.login.recaptcha",
-        response: "captcha",
-      }),
-    }),
-  );
-});
@@ -1,106 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import {
-  createClient,
-  InteractiveAuth,
-  type LoginResponse,
-  type RegisterResponse,
-} from "matrix-js-sdk";
-import { logger } from "matrix-js-sdk/lib/logger";
-
-import { type StoredSession } from "../state/ClientSession";
-
-/** What the homeserver hands out for a new session. */
-export type Credentials = Pick<
-  StoredSession,
-  "user_id" | "device_id" | "access_token"
->;
-
-/**
- * Logs in to the given homeserver with a password.
- */
-export async function loginWithPassword(
-  homeserver: string,
-  username: string,
-  password: string,
-): Promise<Credentials> {
-  const authClient = createClient({ baseUrl: homeserver });
-  const interactiveAuth = new InteractiveAuth({
-    matrixClient: authClient,
-    doRequest: async (): Promise<LoginResponse> =>
-      authClient.login("m.login.password", {
-        identifier: {
-          type: "m.id.user",
-          user: username,
-        },
-        password,
-      }),
-    stateUpdated: (): void => {},
-    requestEmailToken: async (): Promise<{ sid: string }> =>
-      Promise.resolve({ sid: "" }),
-  });
-  return credentials(await interactiveAuth.attemptAuth());
-}
-
-/**
- * Registers an account on the given homeserver, accepting its terms and
- * answering its recaptcha challenge.
- */
-export async function registerWithPassword(
-  homeserver: string,
-  username: string,
-  password: string,
-  recaptchaResponse: string,
-): Promise<Credentials> {
-  const authClient = createClient({ baseUrl: homeserver });
-  const interactiveAuth = new InteractiveAuth({
-    matrixClient: authClient,
-    doRequest: async (auth): Promise<RegisterResponse> =>
-      authClient.registerRequest({
-        username,
-        password,
-        auth: auth || undefined,
-      }),
-    stateUpdated: (nextStage, status): void => {
-      if (status.error) {
-        throw new Error(status.error);
-      }
-
-      if (nextStage === "m.login.terms") {
-        interactiveAuth
-          .submitAuthDict({
-            type: "m.login.terms",
-          })
-          .catch((e) => {
-            logger.error(e);
-          });
-      } else if (nextStage === "m.login.recaptcha") {
-        interactiveAuth
-          .submitAuthDict({
-            type: "m.login.recaptcha",
-            response: recaptchaResponse,
-          })
-          .catch((e) => {
-            logger.error(e);
-          });
-      }
-    },
-    requestEmailToken: async (): Promise<{ sid: string }> =>
-      Promise.resolve({ sid: "dummy" }),
-  });
-  return credentials(await interactiveAuth.attemptAuth());
-}
-
-// XXX: attemptAuth claims to return an IAuthData which contains none of these
-// things - the js-sdk types may be wrong?
-function credentials(authData: unknown): Credentials {
-  /* eslint-disable camelcase */
-  const { user_id, access_token, device_id } = authData as Credentials;
-  return { user_id, access_token, device_id };
-  /* eslint-enable camelcase */
-}
@@ -0,0 +1,84 @@
+/*
+Copyright 2022-2024 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE in the repository root for full details.
+*/
+
+import { useCallback } from "react";
+import { InteractiveAuth } from "matrix-js-sdk";
+import {
+  createClient,
+  type LoginResponse,
+  type MatrixClient,
+} from "matrix-js-sdk";
+
+import { initClient } from "../utils/matrix";
+import { type Session } from "../ClientContext";
+/**
+ * This provides the login method to login using user credentials.
+ * @param oldClient If there is an already authenticated client it should be passed to this hook
+ * this allows the interactive login to sign out the client before logging in.
+ * @returns A async method that can be called/awaited to log in with the provided credentials.
+ */
+export function useInteractiveLogin(
+  oldClient?: MatrixClient,
+): (
+  homeserver: string,
+  username: string,
+  password: string,
+) => Promise<[MatrixClient, Session]> {
+  return useCallback<
+    (
+      homeserver: string,
+      username: string,
+      password: string,
+    ) => Promise<[MatrixClient, Session]>
+  >(
+    async (homeserver: string, username: string, password: string) => {
+      const authClient = createClient({ baseUrl: homeserver });
+
+      const interactiveAuth = new InteractiveAuth({
+        matrixClient: authClient,
+        doRequest: async (): Promise<LoginResponse> =>
+          authClient.login("m.login.password", {
+            identifier: {
+              type: "m.id.user",
+              user: username,
+            },
+            password,
+          }),
+        stateUpdated: (): void => {},
+        requestEmailToken: async (): Promise<{ sid: string }> =>
+          Promise.resolve({ sid: "" }),
+      });
+
+      // XXX: This claims to return an IAuthData which contains none of these
+      // things - the js-sdk types may be wrong?
+      /* eslint-disable camelcase,@typescript-eslint/no-explicit-any */
+      const { user_id, access_token, device_id } =
+        (await interactiveAuth.attemptAuth()) as any;
+      const session = {
+        user_id,
+        access_token,
+        device_id,
+        passwordlessUser: false,
+      };
+
+      // To not confuse the rust crypto sessions we need to logout the old client before initializing the new one.
+      await oldClient?.logout(true);
+      const client = await initClient(
+        {
+          baseUrl: homeserver,
+          accessToken: access_token,
+          userId: user_id,
+          deviceId: device_id,
+        },
+        false,
+      );
+      /* eslint-enable camelcase */
+      return [client, session];
+    },
+    [oldClient],
+  );
+}
@@ -0,0 +1,145 @@
+/*
+Copyright 2022-2024 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE in the repository root for full details.
+*/
+
+import { useState, useEffect, useCallback, useRef } from "react";
+import { InteractiveAuth } from "matrix-js-sdk";
+import {
+  createClient,
+  type MatrixClient,
+  type RegisterResponse,
+} from "matrix-js-sdk";
+import { logger } from "matrix-js-sdk/lib/logger";
+
+import { initClient } from "../utils/matrix";
+import { type Session } from "../ClientContext";
+import { Config } from "../config/Config";
+import { useUrlParams } from "../UrlParams";
+
+export const useInteractiveRegistration = (
+  oldClient?: MatrixClient,
+): {
+  privacyPolicyUrl?: string;
+  recaptchaKey?: string;
+  register: (
+    username: string,
+    password: string,
+    displayName: string,
+    recaptchaResponse: string,
+    passwordlessUser: boolean,
+  ) => Promise<[MatrixClient, Session]>;
+} => {
+  const { isWidget } = useUrlParams();
+  const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState<string | undefined>(
+    undefined,
+  );
+  const [recaptchaKey, setRecaptchaKey] = useState<string | undefined>(
+    undefined,
+  );
+
+  const authClient = useRef<MatrixClient | undefined>(undefined);
+  if (!authClient.current) {
+    authClient.current = createClient({
+      baseUrl: Config.defaultHomeserverUrl()!,
+    });
+  }
+
+  useEffect(() => {
+    if (isWidget) return;
+    // An empty registerRequest is used to get the privacy policy and recaptcha key.
+    authClient.current!.registerRequest({}).catch((error) => {
+      setPrivacyPolicyUrl(
+        error.data?.params["m.login.terms"]?.policies?.privacy_policy?.en?.url,
+      );
+      setRecaptchaKey(error.data?.params["m.login.recaptcha"]?.public_key);
+    });
+  }, [isWidget]);
+
+  const register = useCallback(
+    async (
+      username: string,
+      password: string,
+      displayName: string,
+      recaptchaResponse: string,
+      passwordlessUser: boolean,
+    ): Promise<[MatrixClient, Session]> => {
+      const interactiveAuth = new InteractiveAuth({
+        matrixClient: authClient.current!,
+        doRequest: async (auth): Promise<RegisterResponse> =>
+          authClient.current!.registerRequest({
+            username,
+            password,
+            auth: auth || undefined,
+          }),
+        stateUpdated: (nextStage, status): void => {
+          if (status.error) {
+            throw new Error(status.error);
+          }
+
+          if (nextStage === "m.login.terms") {
+            interactiveAuth
+              .submitAuthDict({
+                type: "m.login.terms",
+              })
+              .catch((e) => {
+                logger.error(e);
+              });
+          } else if (nextStage === "m.login.recaptcha") {
+            interactiveAuth
+              .submitAuthDict({
+                type: "m.login.recaptcha",
+                response: recaptchaResponse,
+              })
+              .catch((e) => {
+                logger.error(e);
+              });
+          }
+        },
+        requestEmailToken: async (): Promise<{ sid: string }> =>
+          Promise.resolve({ sid: "dummy" }),
+      });
+
+      // XXX: This claims to return an IAuthData which contains none of these
+      // things - the js-sdk types may be wrong?
+      /* eslint-disable camelcase,@typescript-eslint/no-explicit-any */
+      const { user_id, access_token, device_id } =
+        (await interactiveAuth.attemptAuth()) as any;
+      await oldClient?.logout(true);
+      const client = await initClient(
+        {
+          baseUrl: Config.defaultHomeserverUrl()!,
+          accessToken: access_token,
+          userId: user_id,
+          deviceId: device_id,
+        },
+        false,
+      );
+
+      await client.setDisplayName(displayName);
+
+      const session: Session = {
+        user_id,
+        device_id,
+        access_token,
+        passwordlessUser,
+      };
+      /* eslint-enable camelcase */
+
+      if (passwordlessUser) {
+        session.tempPassword = password;
+      }
+
+      const user = client.getUser(client.getUserId()!)!;
+      user.setRawDisplayName(displayName);
+      user.setDisplayName(displayName);
+
+      return [client, session];
+    },
+    [oldClient],
+  );
+
+  return { privacyPolicyUrl, recaptchaKey, register };
+};
@@ -1,116 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { afterEach, expect, test, vi } from "vitest";
-import { renderHook } from "@testing-library/react";
-import { type FC, type PropsWithChildren } from "react";
-import { type MatrixClient } from "matrix-js-sdk";
-
-import { useRegisterPasswordlessUser } from "./useRegisterPasswordlessUser";
-import { ClientManagerProvider } from "../ClientContext";
-import { type ClientManager } from "../state/ClientSession";
-import { computeUrlParams, UrlParamsProvider } from "../UrlParams";
-
-vi.mock("./useRecaptcha", () => ({
-  useRecaptcha: () => ({
-    execute: vi.fn().mockResolvedValue("captcha-response"),
-    reset,
-    recaptchaId: "recaptcha",
-  }),
-}));
-vi.mock("./useRegistrationTerms", () => ({
-  useRegistrationTerms: () => ({
-    privacyPolicyUrl: "https://hs.example.org/privacy",
-    recaptchaKey: "site-key",
-  }),
-}));
-vi.mock("./generateRandomName", () => ({
-  generateRandomName: () => "Random Name",
-}));
-
-const reset = vi.fn();
-
-afterEach(() => vi.clearAllMocks());
-
-test("registers a user under a random name and signs them in", async () => {
-  const setSignedIn = vi.fn();
-  const manager = mockManager();
-  vi.mocked(manager.register).mockResolvedValue({
-    client: {} as MatrixClient,
-    setSignedIn,
-  });
-
-  const { result } = renderHook(() => useRegisterPasswordlessUser(), {
-    wrapper: wrapper(manager, false),
-  });
-  await result.current.registerPasswordlessUser("Alice");
-
-  expect(manager.register).toHaveBeenCalledWith(
-    "Random Name",
-    expect.stringMatching(/^.{16}$/),
-    "Alice",
-    "captcha-response",
-    true,
-  );
-  expect(setSignedIn).toHaveBeenCalled();
-  expect(result.current.privacyPolicyUrl).toBe(
-    "https://hs.example.org/privacy",
-  );
-  expect(result.current.recaptchaId).toBe("recaptcha");
-});
-
-test("resets the captcha when registration fails", async () => {
-  const manager = mockManager();
-  vi.mocked(manager.register).mockRejectedValue(new Error("Nope"));
-
-  const { result } = renderHook(() => useRegisterPasswordlessUser(), {
-    wrapper: wrapper(manager, false),
-  });
-
-  await expect(
-    result.current.registerPasswordlessUser("Alice"),
-  ).rejects.toThrow("Nope");
-  expect(reset).toHaveBeenCalled();
-});
-
-test("cannot register on a session that is not ours", async () => {
-  const { result } = renderHook(() => useRegisterPasswordlessUser(), {
-    wrapper: wrapper(null, false),
-  });
-
-  await expect(
-    result.current.registerPasswordlessUser("Alice"),
-  ).rejects.toThrow("This session cannot register");
-});
-
-test("never registers as a widget", async () => {
-  const manager = mockManager();
-  const { result } = renderHook(() => useRegisterPasswordlessUser(), {
-    wrapper: wrapper(manager, true),
-  });
-
-  await expect(
-    result.current.registerPasswordlessUser("Alice"),
-  ).rejects.toThrow(/embedded mode/);
-  expect(manager.register).not.toHaveBeenCalled();
-});
-
-function mockManager(): ClientManager {
-  return { login: vi.fn(), register: vi.fn(), logout: vi.fn() };
-}
-
-function wrapper(
-  manager: ClientManager | null,
-  isWidget: boolean,
-): FC<PropsWithChildren> {
-  const params = { ...computeUrlParams(), isWidget };
-  return ({ children }) => (
-    <UrlParamsProvider value={params}>
-      <ClientManagerProvider value={manager}>{children}</ClientManagerProvider>
-    </UrlParamsProvider>
-  );
-}
@@ -8,8 +8,8 @@ Please see LICENSE in the repository root for full details.
 import { useCallback } from "react";
 import { secureRandomString } from "matrix-js-sdk/lib/randomstring";

-import { useClientManagerIfAny } from "../ClientContext";
-import { useRegistrationTerms } from "../auth/useRegistrationTerms";
+import { useClient } from "../ClientContext";
+import { useInteractiveRegistration } from "../auth/useInteractiveRegistration";
 import { generateRandomName } from "../auth/generateRandomName";
 import { useRecaptcha } from "../auth/useRecaptcha";
 import { useUrlParams } from "../UrlParams";
@@ -21,16 +21,16 @@ interface UseRegisterPasswordlessUserType {
 }

 export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
-  // Null in the widget, which never registers anyone
-  const register = useClientManagerIfAny()?.register;
+  const { setClient } = useClient();
  const { isWidget } = useUrlParams();
-  const { privacyPolicyUrl, recaptchaKey } = useRegistrationTerms();
+  const { privacyPolicyUrl, recaptchaKey, register } =
+    useInteractiveRegistration();
  const { execute, reset, recaptchaId } = useRecaptcha(recaptchaKey);

  const registerPasswordlessUser = useCallback(
    async (displayName: string) => {
-      if (!register) {
-        throw new Error("This session cannot register");
+      if (!setClient) {
+        throw new Error("No client context");
      }
      if (isWidget) {
        throw new Error(
@@ -41,20 +41,20 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
      try {
        const recaptchaResponse = await execute();
        const userName = generateRandomName();
-        const { setSignedIn } = await register(
+        const [client, session] = await register(
          userName,
          secureRandomString(16),
          displayName,
          recaptchaResponse,
          true,
        );
-        setSignedIn();
+        setClient(client, session);
      } catch (e) {
        reset();
        throw e;
      }
    },
-    [execute, reset, register, isWidget],
+    [execute, reset, register, setClient, isWidget],
  );

  return { privacyPolicyUrl, registerPasswordlessUser, recaptchaId };
@@ -1,98 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { afterEach, beforeEach, expect, test, vi } from "vitest";
-import { renderHook, waitFor } from "@testing-library/react";
-import type * as MatrixJsSdk from "matrix-js-sdk";
-import { createClient, type MatrixClient } from "matrix-js-sdk";
-import { type FC, type PropsWithChildren } from "react";
-
-import { useRegistrationTerms } from "./useRegistrationTerms";
-import { computeUrlParams, UrlParamsProvider } from "../UrlParams";
-import { Config } from "../config/Config";
-
-vi.mock("matrix-js-sdk", async (importOriginal) => ({
-  ...(await importOriginal<typeof MatrixJsSdk>()),
-  createClient: vi.fn(),
-}));
-
-const registerRequest = vi.fn();
-
-beforeEach(() => {
-  vi.spyOn(Config, "defaultHomeserverUrl").mockReturnValue(
-    "https://hs.example.org",
-  );
-  vi.mocked(createClient).mockReturnValue({
-    registerRequest,
-  } as Partial<MatrixClient> as MatrixClient);
-});
-afterEach(() => {
-  vi.restoreAllMocks();
-  vi.clearAllMocks();
-});
-
-test("reads the terms the homeserver asks for from a registration attempt", async () => {
-  registerRequest.mockRejectedValue({
-    data: {
-      params: {
-        "m.login.terms": {
-          policies: {
-            privacy_policy: { en: { url: "https://hs.example.org/privacy" } },
-          },
-        },
-        "m.login.recaptcha": { public_key: "site-key" },
-      },
-    },
-  });
-
-  const { result } = renderHook(() => useRegistrationTerms(), {
-    wrapper: wrapper(false),
-  });
-
-  expect(createClient).toHaveBeenCalledWith({
-    baseUrl: "https://hs.example.org",
-  });
-  await waitFor(() =>
-    expect(result.current).toEqual({
-      privacyPolicyUrl: "https://hs.example.org/privacy",
-      recaptchaKey: "site-key",
-    }),
-  );
-});
-
-test("has nothing to agree to where the homeserver asks for nothing", async () => {
-  registerRequest.mockRejectedValue({ data: { params: {} } });
-
-  const { result } = renderHook(() => useRegistrationTerms(), {
-    wrapper: wrapper(false),
-  });
-
-  await waitFor(() => expect(registerRequest).toHaveBeenCalled());
-  expect(result.current).toEqual({
-    privacyPolicyUrl: undefined,
-    recaptchaKey: undefined,
-  });
-});
-
-test("asks the homeserver nothing as a widget", () => {
-  const { result } = renderHook(() => useRegistrationTerms(), {
-    wrapper: wrapper(true),
-  });
-
-  expect(createClient).not.toHaveBeenCalled();
-  expect(result.current).toEqual({
-    privacyPolicyUrl: undefined,
-    recaptchaKey: undefined,
-  });
-});
-
-function wrapper(isWidget: boolean): FC<PropsWithChildren> {
-  const params = { ...computeUrlParams(), isWidget };
-  return ({ children }) => (
-    <UrlParamsProvider value={params}>{children}</UrlParamsProvider>
-  );
-}
@@ -1,46 +0,0 @@
-/*
-Copyright 2022-2024 New Vector Ltd.
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { useEffect, useState } from "react";
-import { createClient } from "matrix-js-sdk";
-
-import { Config } from "../config/Config";
-import { useUrlParams } from "../UrlParams";
-
-/**
- * What the homeserver asks of a registration: its privacy policy to agree to
- * and the recaptcha key to answer a challenge with.
- */
-export function useRegistrationTerms(): {
-  privacyPolicyUrl?: string;
-  recaptchaKey?: string;
-} {
-  const { isWidget } = useUrlParams();
-  const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState<string | undefined>(
-    undefined,
-  );
-  const [recaptchaKey, setRecaptchaKey] = useState<string | undefined>(
-    undefined,
-  );
-
-  useEffect(() => {
-    if (isWidget) return;
-    // An empty registerRequest is used to get the privacy policy and recaptcha key.
-    createClient({ baseUrl: Config.defaultHomeserverUrl()! })
-      .registerRequest({})
-      .catch((error) => {
-        setPrivacyPolicyUrl(
-          error.data?.params["m.login.terms"]?.policies?.privacy_policy?.en
-            ?.url,
-        );
-        setRecaptchaKey(error.data?.params["m.login.recaptcha"]?.public_key);
-      });
-  }, [isWidget]);
-
-  return { privacyPolicyUrl, recaptchaKey };
-}
@@ -1,131 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-.grid {
-  display: grid;
-  /* A zero floor, so a long label wraps inside its tile rather than widening
-     the grid past the menu. */
-  grid-template-columns: repeat(3, minmax(0, 1fr));
-  grid-auto-rows: 1fr;
-  gap: var(--cpd-space-3x);
-  padding: var(--cpd-space-2x) var(--cpd-space-4x) 0;
-}
-
-/* Within the grid, to outweigh the menu item styles the tiles are built on. */
-.grid .tile {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: var(--cpd-space-1x);
-  min-inline-size: 0;
-  padding: var(--cpd-space-3x) var(--cpd-space-2x);
-  /* Not hidden: that makes the tile a scroll container, which focus scrolls
-     into view without its border, and so without the focus ring. */
-  overflow: clip;
-  border: var(--cpd-border-width-2) solid
-    var(--cpd-color-border-interactive-secondary);
-  border-radius: var(--cpd-space-2x);
-  background: none;
-  color: var(--cpd-color-icon-secondary);
-  font: inherit;
-  cursor: pointer;
-}
-
-/* As the menu items highlight on hover. */
-.grid .tile[data-highlighted] {
-  background: var(--cpd-color-bg-action-secondary-hovered);
-}
-
-.grid .tile[aria-checked="true"] {
-  border-color: var(--cpd-color-border-accent);
-}
-
-.grid .tile[data-disabled] {
-  cursor: default;
-  opacity: 0.55;
-}
-
-.tile[data-disabled] .picture {
-  filter: grayscale(1);
-}
-
-.swatch {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.picture {
-  position: absolute;
-  inset: 0;
-  inline-size: 100%;
-  block-size: 100%;
-  object-fit: cover;
-}
-
-/* Positioned, or the picture, positioned itself, would cover it. */
-.mark {
-  position: relative;
-  display: inline-flex;
-  color: var(--cpd-color-icon-accent-primary);
-}
-
-/* On a picture the mark needs a ground of its own to be seen. */
-.picture ~ .mark {
-  border-radius: 50%;
-  background: var(--cpd-color-bg-canvas-default);
-  box-shadow: 0 0 0 var(--cpd-border-width-2) var(--cpd-color-bg-canvas-default);
-}
-
-.label {
-  max-inline-size: 100%;
-  font: var(--cpd-font-body-sm-medium);
-  color: var(--cpd-color-text-primary);
-  text-align: center;
-  overflow-wrap: anywhere;
-}
-
-.removable {
-  position: relative;
-  display: flex;
-  min-inline-size: 0;
-}
-
-.removable > .tile {
-  flex: 1;
-}
-
-/* Clear of the target for choosing the tile. */
-.remove {
-  position: absolute;
-  inset-block-start: 0;
-  inset-inline-end: 0;
-  translate: 20% -20%;
-  display: none;
-  align-items: center;
-  justify-content: center;
-  inline-size: 28px;
-  block-size: 28px;
-  border-radius: 50%;
-  background: var(--cpd-color-bg-canvas-default);
-  color: var(--cpd-color-icon-critical-primary);
-  box-shadow: 0 1.2px 2.4px 0 rgb(0 0 0 / 15%);
-  cursor: pointer;
-}
-
-.remove:hover {
-  background: var(--cpd-color-bg-critical-subtle-hovered);
-  box-shadow: 0 0 0 var(--cpd-border-width-1)
-    var(--cpd-color-border-critical-subtle);
-}
-
-.removable:hover .remove,
-.removable:focus-within .remove {
-  display: flex;
-}
@@ -1,224 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { type FC, type KeyboardEvent, type ReactElement } from "react";
-import { useTranslation } from "react-i18next";
-import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
-import { InlineSpinner, MenuItem, Tooltip } from "@vector-im/compound-web";
-import {
-  BlockIcon,
-  BlurIcon,
-  CheckCircleSolidIcon,
-  CloseIcon,
-  PlusIcon,
-} from "@vector-im/compound-design-tokens/assets/web/icons";
-
-import styles from "./BackgroundEffectGrid.module.css";
-
-/**
- * One choice in the camera menu's Background effects section, as the view
- * model offers it. The grid names it: pictures are numbered in order.
- */
-export interface BackgroundEffectGridItem {
-  /** Its option id, as `backgroundEffect` gives the one in force. */
-  id: string;
-  kind: "none" | "blur" | "image";
-  /** For kind "image". */
-  imageUrl?: string;
-  /** Whether it is the user's to remove. */
-  removable?: boolean;
-}
-
-interface Props {
-  effects: BackgroundEffectGridItem[];
-  selected: string | undefined;
-  /** Undefined where effects can't run: all but no effect are disabled. */
-  onSelect: ((id: string) => void) | undefined;
-  /** Shown on the selected tile until its effect is on screen. */
-  settling?: boolean;
-  /** Id of the text saying what the user should know before choosing. */
-  describedBy?: string;
-  /** Offers to add a background of one's own. Omit to leave that tile out. */
-  onAdd?: () => void;
-  addLabel?: string;
-  /** Removes a removable one, never the one in force. Omit to offer none. */
-  onRemove?: (id: string) => void;
-  removeLabel?: string;
-}
-
-/**
- * The background effects as a grid of tiles: one radio choice, walked by the
- * menu's arrow keys like the device rows. Sits in a menu section, which names
- * it.
- */
-export const BackgroundEffectGrid: FC<Props> = ({
-  effects,
-  selected,
-  onSelect,
-  settling = false,
-  describedBy,
-  onAdd,
-  addLabel,
-  onRemove,
-  removeLabel,
-}) => {
-  const { t } = useTranslation();
-  const choose = (id: string): void => {
-    if (id !== selected) onSelect?.(id);
-  };
-  let pictures = 0;
-  const tiles = effects.map((effect) => {
-    const label =
-      effect.kind === "none"
-        ? t("background_effects.none")
-        : effect.kind === "blur"
-          ? t("background_effects.blur")
-          : t("background_effects.numbered", { n: ++pictures });
-    const checked = effect.id === selected;
-    const disabled = onSelect === undefined && effect.kind !== "none";
-    const remove =
-      effect.removable && !checked && onRemove !== undefined
-        ? (): void => onRemove(effect.id)
-        : undefined;
-    const removeProps =
-      remove === undefined
-        ? {}
-        : {
-            "aria-keyshortcuts": "Delete",
-            onKeyDown: (e: KeyboardEvent): void => {
-              if (e.key !== "Delete" && e.key !== "Backspace") return;
-              e.preventDefault();
-              remove();
-            },
-          };
-    const content = (
-      <TileContent
-        effect={effect}
-        label={label}
-        checked={checked}
-        settling={checked && settling}
-      />
-    );
-    const tile = (
-      <MenuItem
-        key={effect.id}
-        role="menuitemradio"
-        aria-checked={checked}
-        aria-busy={checked && settling}
-        disabled={disabled}
-        data-disabled={disabled ? "" : undefined}
-        label={null}
-        hideChevron
-        className={styles.tile}
-        // Without a handler it isn't one of the menu's items, so the keyboard
-        // passes over it.
-        onSelect={
-          disabled
-            ? null
-            : (e): void => {
-                // Kept open, so the user sees what they chose take effect.
-                e.preventDefault();
-                choose(effect.id);
-              }
-        }
-        {...removeProps}
-      >
-        {content}
-      </MenuItem>
-    );
-    if (remove === undefined) return tile;
-    // Beside the item, not in it: inside, the item takes the press first and
-    // the tile is chosen instead.
-    return (
-      <div key={effect.id} className={styles.removable}>
-        {tile}
-        <Tooltip label={removeLabel ?? ""}>
-          {/* Not a control of its own, so the menu keeps one keyboard model:
-              the keyboard reaches the same action through Delete. */}
-          <span aria-hidden className={styles.remove} onClick={remove}>
-            <CloseIcon width={20} height={20} />
-          </span>
-        </Tooltip>
-      </div>
-    );
-  });
-
-  // A command rather than a choice, so an item beside the radios.
-  const addContent = (
-    <>
-      <span aria-hidden className={styles.swatch}>
-        <PlusIcon width={24} height={24} />
-      </span>
-      <VisuallyHidden>{addLabel}</VisuallyHidden>
-    </>
-  );
-  const addTile =
-    onAdd === undefined ? null : (
-      <MenuItem
-        label={null}
-        hideChevron
-        className={styles.tile}
-        onSelect={(e) => {
-          e.preventDefault();
-          onAdd();
-        }}
-      >
-        {addContent}
-      </MenuItem>
-    );
-
-  return (
-    // A group of its own, as the section's can't carry the description.
-    <div role="group" aria-describedby={describedBy} className={styles.grid}>
-      {tiles}
-      {addTile}
-    </div>
-  );
-};
-
-function TileContent({
-  effect,
-  label,
-  checked,
-  settling,
-}: {
-  effect: BackgroundEffectGridItem;
-  /** The tile's accessible name; drawn only where the tile has no picture. */
-  label: string;
-  checked: boolean;
-  settling: boolean;
-}): ReactElement {
-  return (
-    <>
-      <span aria-hidden className={styles.swatch}>
-        {effect.kind === "image" && (
-          <img className={styles.picture} src={effect.imageUrl} alt="" />
-        )}
-        {settling ? (
-          <span className={styles.mark}>
-            <InlineSpinner size={20} />
-          </span>
-        ) : checked ? (
-          <CheckCircleSolidIcon
-            className={styles.mark}
-            width={20}
-            height={20}
-          />
-        ) : effect.kind === "none" ? (
-          <BlockIcon width={20} height={20} />
-        ) : effect.kind === "blur" ? (
-          <BlurIcon width={20} height={20} />
-        ) : null}
-      </span>
-      {effect.kind === "image" ? (
-        <VisuallyHidden>{label}</VisuallyHidden>
-      ) : (
-        <span className={styles.label}>{label}</span>
-      )}
-    </>
-  );
-}
@@ -22,7 +22,6 @@ import { MediaDevices } from "../state/MediaDevices";
 import { globalScope } from "../state/ObservableScope";
 import { constant } from "../state/Behavior";
 import { type LayoutMode } from "../state/LayoutSwitchViewModel";
-import { shippedBackgrounds } from "../tracks/backgroundEffectCatalog";

 // consts for tests
 const reactionIdentifier = "@user:example.com:DEVICE";
@@ -124,24 +123,8 @@ export const Default: Story = {
    toggleAudio: fn(),
    toggleVideo: fn(),
    toggleScreenSharing: fn(),
-    selectBackgroundEffect: fn(),
-    backgroundEffect: "blur",
-    backgroundEffects: [
-      { id: "none", kind: "none", removable: false },
-      { id: "blur", kind: "blur", removable: false },
-      ...shippedBackgrounds.map((background) => ({
-        id: `image:${background.id}`,
-        kind: "image" as const,
-        imageUrl: background.imagePath,
-        removable: false,
-      })),
-    ],
-    backgroundEffectNotice: undefined,
-    backgroundEffectSettling: false,
-    backgroundImageRefusal: undefined,
-    addBackgroundImage: fn(),
-    removeBackgroundEffect: fn(),
-    cameraTrack: null,
+    toggleBlur: fn(),
+    videoBlurEnabled: true,
    hangup: fn(),
    buttonSize: "lg",
    showFooter: true,
@@ -7,7 +7,6 @@ Please see LICENSE in the repository root for full details.

 import { type FC, type JSX, type Ref, useMemo } from "react";
 import classNames from "classnames";
-import { useTranslation } from "react-i18next";

 import LogoMark from "../icons/LogoMark.svg?react";
 import LogoType from "../icons/LogoType.svg?react";
@@ -32,14 +31,6 @@ import { type ViewModel } from "../state/ViewModel";
 import { useBehavior } from "../useBehavior";
 import { type LayoutSwitchViewModel } from "../state/LayoutSwitchViewModel";
 import { LayoutSwitch } from "../room/LayoutSwitch";
-import { type BackgroundEffectGridItem } from "./BackgroundEffectGrid";
-import { SelfPreview } from "./SelfPreview";
-import { type UnusableReason } from "../tracks/backgroundImages";
-import { type LocalVideoMediaTrack } from "@element-hq/matrixrtc-sdk";
-
-export interface BackgroundImageRefusal {
-  reason: UnusableReason | "not-kept";
-}

 export interface AudioOutputSwitcher {
  targetOutput: string;
@@ -65,37 +56,20 @@ export interface FooterActions {
  toggleAudio: (() => void) | undefined;
  /** Also controls if the videoMute button is disabled */
  toggleVideo: (() => void) | undefined;
-  /** Undefined where background effects can't be chosen. */
-  selectBackgroundEffect: ((id: string) => void) | undefined;
-  /** Undefined where no background can be added. */
-  addBackgroundImage: ((file: File) => void) | undefined;
-  /** Removes an added background by its option id; never the one in force. */
-  removeBackgroundEffect: ((id: string) => void) | undefined;
+  toggleBlur: (() => void) | undefined;
  toggleScreenSharing: (() => void) | undefined;
  /** Also controls if the settings button is visible */
  openSettings: (() => void) | undefined;
  /** Also controls if the hangup button is visible */
  hangup: (() => void) | undefined;
 }
-
 // we do not use any ? optional properties so that the vm type is including all fields.
 export interface FooterState {
  audioEnabled: boolean;
  audioBusy: boolean;
  videoEnabled: boolean;
  videoBusy: boolean;
-  /** The background effect in force, as its option id. */
-  backgroundEffect: string;
-  /** Every effect on offer, in the order they are shown. */
-  backgroundEffects: BackgroundEffectGridItem[];
-  /** What the user is told about effects here, if anything. */
-  backgroundEffectNotice: "unavailable" | "slow" | undefined;
-  /** Whether the first effect chosen is still being prepared. */
-  backgroundEffectSettling: boolean;
-  /** Why the last file offered couldn't be kept, if it couldn't. */
-  backgroundImageRefusal: BackgroundImageRefusal | undefined;
-  /** The camera to preview, with the effect in force; null while it is off. */
-  cameraTrack: LocalVideoMediaTrack | null;
+  videoBlurEnabled: boolean;
  showFooter: boolean;

  /* This is needed for WindowMode = "flat" */
@@ -143,14 +117,12 @@ export interface FooterProps {
  children?: JSX.Element | JSX.Element[] | false;
  vm: ViewModel<FooterSnapshot>;
 }
-
 export const CallFooter: FC<FooterProps> = ({
  className,
  ref,
  children,
  vm,
 }) => {
-  const { t } = useTranslation();
  const asOverlay = useBehavior(vm.asOverlay$);
  const showFooter = useBehavior(vm.showFooter$);
  const hideControls = useBehavior(vm.hideControls$);
@@ -179,29 +151,8 @@ export const CallFooter: FC<FooterProps> = ({
  const selectedAudioOutput = useBehavior(vm.selectedAudioOutput$);
  const selectAudioOutputOption = useBehavior(vm.selectAudioOutputOption$);
  const selectVideoButtonOption = useBehavior(vm.selectVideoButtonOption$);
-  const backgroundEffect = useBehavior(vm.backgroundEffect$);
-  const selectBackgroundEffect = useBehavior(vm.selectBackgroundEffect$);
-  const backgroundEffectNotice = useBehavior(vm.backgroundEffectNotice$);
-  const backgroundEffectSettling = useBehavior(vm.backgroundEffectSettling$);
-  const addBackgroundImage = useBehavior(vm.addBackgroundImage$);
-  const removeBackgroundEffect = useBehavior(vm.removeBackgroundEffect$);
-  const cameraTrack = useBehavior(vm.cameraTrack$);
-  const refusal = useBehavior(vm.backgroundImageRefusal$);
-  const refusalMessage = useMemo(() => {
-    switch (refusal?.reason) {
-      case undefined:
-        return undefined;
-      case "not-an-image":
-        return { text: t("error.background_not_an_image") };
-      case "animated":
-        return { text: t("error.background_animated") };
-      case "undecodable":
-        return { text: t("error.background_undecodable") };
-      case "not-kept":
-        return { text: t("error.background_not_kept") };
-    }
-  }, [refusal, t]);
-  const backgroundEffects = useBehavior(vm.backgroundEffects$);
+  const toggleBlur = useBehavior(vm.toggleBlur$);
+  const videoBlurEnabled = useBehavior(vm.videoBlurEnabled$);
  const buttonSize = useBehavior(vm.buttonSize$);
  const showLogo = useBehavior(vm.showLogo$);

@@ -263,21 +214,8 @@ export const CallFooter: FC<FooterProps> = ({
        options={videoOptions}
        selectedOption={selectedVideo}
        onSelect={selectVideoButtonOption}
-        backgroundEffects={backgroundEffects}
-        selectedBackgroundEffect={backgroundEffect}
-        onSelectBackgroundEffect={selectBackgroundEffect}
-        backgroundEffectSettling={backgroundEffectSettling}
-        onAddBackgroundImage={addBackgroundImage}
-        onRemoveBackgroundEffect={removeBackgroundEffect}
-        selfPreview={<SelfPreview track={cameraTrack} />}
-        backgroundImageRefusal={refusalMessage}
-        backgroundEffectNotice={
-          backgroundEffectNotice === "unavailable"
-            ? t("background_effects.unavailable")
-            : backgroundEffectNotice === "slow"
-              ? t("background_effects.slow")
-              : undefined
-        }
+        videoBlurToggleClick={toggleBlur}
+        videoBlurEnabled={videoBlurEnabled}
      />,
    );
  } else {
@@ -5,37 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */

-import { afterEach, describe, expect, it, vi } from "vitest";
-import { BehaviorSubject } from "rxjs";
-import { type LocalVideoMediaTrack } from "@element-hq/matrixrtc-sdk";
+import { describe, expect, it, vi } from "vitest";

-import {
-  flushPromises,
-  testScope,
-  mockMuteStates,
-  mockMediaDevices,
-  mockVideoTrack,
-} from "../utils/test";
-import { type Behavior, constant } from "../state/Behavior";
-import { type BackgroundEffectsState } from "../state/BackgroundEffects";
+import { testScope, mockMuteStates, mockMediaDevices } from "../utils/test";
+import { constant } from "../state/Behavior";
 import type { CallViewModel } from "../state/CallViewModel/CallViewModel";
 import type { Layout } from "../state/layout-types";
 import type { SpotlightTileViewModel } from "../state/TileViewModel";
 import type { DeviceLabel } from "../state/MediaDevices";
-import {
-  createCallFooterViewModel,
-  createLobbyFooterViewModel,
-} from "./CallFooterViewModel";
+import { createCallFooterViewModel } from "./CallFooterViewModel";
 import { HeaderStyle } from "../UrlParams";
-import { backgroundEffect as backgroundEffectSetting } from "../settings/settings";
-import { shippedBackgrounds } from "../tracks/backgroundEffectCatalog";
-import type * as BackgroundImages from "../tracks/backgroundImages";
-import {
-  type AddedBackground,
-  addedBackgrounds,
-  maxAddedBackgrounds,
-  UnusableImage,
-} from "../tracks/backgroundImages";

 const platformMock = vi.hoisted(() => vi.fn(() => "desktop"));
 vi.mock("../Platform", () => ({
@@ -44,30 +23,12 @@ vi.mock("../Platform", () => ({
  },
 }));

-// The SDK's own check needs WebGL and canvas APIs jsdom does not have.
-const sdkSupportMock = vi.hoisted(() => vi.fn(() => false));
-const modernRouteMock = vi.hoisted(() => vi.fn(() => true));
+// Prevent supportsBackgroundProcessors from throwing in jsdom – it is not
+// exercised by these tests (only used in `videoToggles`, not `videoOptions`).
 vi.mock("@livekit/track-processors", () => ({
-  supportsBackgroundProcessors: (): boolean => sdkSupportMock(),
-  supportsModernBackgroundProcessors: (): boolean => modernRouteMock(),
+  supportsBackgroundProcessors: (): boolean => false,
 }));

-const store = vi.hoisted(() => ({
-  add: vi.fn<(file: Blob) => Promise<string>>(),
-  remove: vi.fn<(id: string) => Promise<void>>(),
-}));
-vi.mock("../tracks/backgroundImages", async (original) => {
-  const { BehaviorSubject } = await import("rxjs");
-  return {
-    ...(await original<typeof BackgroundImages>()),
-    addedBackgrounds: {
-      added$: new BehaviorSubject<AddedBackground[] | undefined>([]),
-      add: store.add,
-      remove: store.remove,
-    },
-  };
-});
-
 const outputSelectionMock = vi.hoisted(() => vi.fn(() => true));
 vi.mock("livekit-client", () => ({
  supportsAudioOutputSelection: (): boolean => outputSelectionMock(),
@@ -81,7 +42,6 @@ vi.mock("livekit-client", () => ({
 function buildMinimalCallViewModel(layout: Layout): CallViewModel {
  return {
    layout$: constant(layout),
-    camera$: constant(undefined),
    edgeToEdge$: constant(false),
    showHeader$: constant(false),
    hangup: (): void => {},
@@ -113,16 +73,6 @@ const pipLayout: Layout = {
  spotlight: {} as SpotlightTileViewModel,
 };

-const noPipeline = constant<BackgroundEffectsState>({
-  supported: false,
-  processor: undefined,
-});
-
-/** The provider's verdict, which the SDK's check stands for here. */
-function pipelineAsTheSdkSays(): Behavior<BackgroundEffectsState> {
-  return constant({ supported: sdkSupportMock(), processor: undefined });
-}
-
 const twoMicsAndOneCamMediaDevices = mockMediaDevices({
  audioInput: {
    available$: constant(
@@ -154,7 +104,6 @@ describe("createCallFooterViewModel", () => {
        buildMinimalCallViewModel(gridLayout),
        mockMuteStates(),
        twoMicsAndOneCamMediaDevices,
-        noPipeline,
        /* reactionIdentifier */ undefined,
        { showControls: true, header: HeaderStyle.Standard },
      );
@@ -197,7 +146,6 @@ describe("createCallFooterViewModel", () => {
            select: vi.fn(),
          },
        }),
-        noPipeline,
        /* reactionIdentifier */ undefined,
        { showControls: true, header: HeaderStyle.Standard },
      );
@@ -216,7 +164,6 @@ describe("createCallFooterViewModel", () => {
        buildMinimalCallViewModel(layout),
        mockMuteStates(),
        twoMicsAndOneCamMediaDevices,
-        noPipeline,
        /* reactionIdentifier */ undefined,
        { showControls: true, header: HeaderStyle.Standard },
      );
@@ -239,7 +186,6 @@ describe("createCallFooterViewModel", () => {
        buildMinimalCallViewModel(gridLayout),
        mockMuteStates(),
        twoMicsAndOneCamMediaDevices,
-        noPipeline,
        /* reactionIdentifier */ undefined,
        { showControls: true, header: HeaderStyle.Standard },
      );
@@ -271,266 +217,4 @@ describe("createCallFooterViewModel", () => {
      ]);
    });
  });
-
-  describe("background effects", () => {
-    afterEach(() => backgroundEffectSetting.setValue("none"));
-
-    // The lobby, because in a call the whole device switcher is already
-    // withheld on a phone, whatever the verdict says.
-    function lobbyOn(
-      platform: string,
-    ): ReturnType<typeof createLobbyFooterViewModel> {
-      platformMock.mockReturnValue(platform);
-      return createLobbyFooterViewModel(
-        testScope(),
-        mockMuteStates(),
-        twoMicsAndOneCamMediaDevices,
-        pipelineAsTheSdkSays(),
-        /* camera$ */ constant(null),
-        /* openSettings */ undefined,
-        /* hangup */ undefined,
-        /* showLogo */ false,
-      );
-    }
-
-    it("offers them on a phone whose browser can run them", () => {
-      sdkSupportMock.mockReturnValue(true);
-      expect(lobbyOn("ios").selectBackgroundEffect$.value).toBeDefined();
-    });
-
-    it("offers them on a desktop whose browser can run them", () => {
-      sdkSupportMock.mockReturnValue(true);
-      expect(lobbyOn("desktop").selectBackgroundEffect$.value).toBeDefined();
-    });
-
-    it("offers nothing where the browser itself cannot run them", () => {
-      sdkSupportMock.mockReturnValue(false);
-      expect(lobbyOn("desktop").selectBackgroundEffect$.value).toBeUndefined();
-      expect(lobbyOn("desktop").addBackgroundImage$.value).toBeUndefined();
-    });
-
-    it("puts no effect in force where the browser cannot run them", () => {
-      backgroundEffectSetting.setValue("blur");
-      sdkSupportMock.mockReturnValue(false);
-      expect(lobbyOn("desktop").backgroundEffect$.value).toBe("none");
-      sdkSupportMock.mockReturnValue(true);
-      expect(lobbyOn("desktop").backgroundEffect$.value).toBe("blur");
-    });
-
-    it("stores the effect chosen", () => {
-      sdkSupportMock.mockReturnValue(true);
-      const vm = lobbyOn("desktop");
-      vm.selectBackgroundEffect$.value?.("image:arc");
-      expect(vm.backgroundEffect$.value).toBe("image:arc");
-      // What isn't an effect on offer is stored as none.
-      vm.selectBackgroundEffect$.value?.("image:gone");
-      expect(backgroundEffectSetting.getValue()).toBe("none");
-    });
-
-    it("says they run slowly where only the slower route exists", () => {
-      sdkSupportMock.mockReturnValue(true);
-      modernRouteMock.mockReturnValue(false);
-      const slow = lobbyOn("desktop");
-      expect(slow.backgroundEffectNotice$.value).toBe("slow");
-      expect(slow.selectBackgroundEffect$.value).toBeDefined();
-      modernRouteMock.mockReturnValue(true);
-      expect(lobbyOn("desktop").backgroundEffectNotice$.value).toBeUndefined();
-    });
-
-    it("offers every effect in order, the added ones removable", () => {
-      sdkSupportMock.mockReturnValue(true);
-      const added$ = addedBackgrounds.added$ as BehaviorSubject<
-        AddedBackground[] | undefined
-      >;
-      added$.next([{ id: "mine", url: "blob:mine" }]);
-      expect(lobbyOn("desktop").backgroundEffects$.value).toEqual([
-        { id: "none", kind: "none", removable: false },
-        { id: "blur", kind: "blur", removable: false },
-        ...shippedBackgrounds.map((background) => ({
-          id: `image:${background.id}`,
-          kind: "image",
-          imageUrl: background.imagePath,
-          removable: false,
-        })),
-        {
-          id: "added:mine",
-          kind: "image",
-          imageUrl: "blob:mine",
-          removable: true,
-        },
-      ]);
-      added$.next([]);
-    });
-
-    it("says they are unavailable where they cannot be chosen", () => {
-      sdkSupportMock.mockReturnValue(false);
-      expect(lobbyOn("desktop").backgroundEffectNotice$.value).toBe(
-        "unavailable",
-      );
-    });
-
-    it("passes on the wait for the first effect", () => {
-      platformMock.mockReturnValue("desktop");
-      const pipeline$ = new BehaviorSubject<BackgroundEffectsState>({
-        supported: true,
-        processor: undefined,
-        wait: "settling",
-      });
-      const vm = createLobbyFooterViewModel(
-        testScope(),
-        mockMuteStates(),
-        twoMicsAndOneCamMediaDevices,
-        pipeline$,
-        /* camera$ */ constant(null),
-        /* openSettings */ undefined,
-        /* hangup */ undefined,
-        /* showLogo */ false,
-      );
-      expect(vm.backgroundEffectSettling$.value).toBe(true);
-      pipeline$.next({ ...pipeline$.value, wait: undefined });
-      expect(vm.backgroundEffectSettling$.value).toBe(false);
-    });
-
-    it("offers nothing once the pipeline fails to build, keeping the choice", () => {
-      platformMock.mockReturnValue("desktop");
-      backgroundEffectSetting.setValue("blur");
-      const pipeline$ = new BehaviorSubject<BackgroundEffectsState>({
-        supported: true,
-        processor: undefined,
-      });
-      const vm = createLobbyFooterViewModel(
-        testScope(),
-        mockMuteStates(),
-        twoMicsAndOneCamMediaDevices,
-        pipeline$,
-        /* camera$ */ constant(null),
-        /* openSettings */ undefined,
-        /* hangup */ undefined,
-        /* showLogo */ false,
-      );
-      expect(vm.backgroundEffect$.value).toBe("blur");
-
-      pipeline$.next({ supported: false, processor: undefined });
-      expect(vm.selectBackgroundEffect$.value).toBeUndefined();
-      expect(vm.addBackgroundImage$.value).toBeUndefined();
-      expect(vm.backgroundEffect$.value).toBe("none");
-      expect(backgroundEffectSetting.getValue()).toBe("blur");
-    });
-
-    it("adding is unavailable at the limit", () => {
-      sdkSupportMock.mockReturnValue(true);
-      const added$ = addedBackgrounds.added$ as BehaviorSubject<
-        AddedBackground[] | undefined
-      >;
-      const vm = lobbyOn("desktop");
-      expect(vm.addBackgroundImage$.value).toBeDefined();
-      added$.next(
-        Array.from({ length: maxAddedBackgrounds }, (_, i) => ({
-          id: `${i}`,
-          url: `blob:${i}`,
-        })),
-      );
-      expect(vm.addBackgroundImage$.value).toBeUndefined();
-      added$.next(added$.value!.slice(1));
-      expect(vm.addBackgroundImage$.value).toBeDefined();
-      added$.next([]);
-    });
-
-    it("says why each refused file was refused", async () => {
-      sdkSupportMock.mockReturnValue(true);
-      const vm = lobbyOn("desktop");
-      store.add.mockRejectedValue(new UnusableImage("animated"));
-      vm.addBackgroundImage$.value!(new File(["x"], "a.gif"));
-      await flushPromises();
-      const first = vm.backgroundImageRefusal$.value;
-      expect(first).toEqual({ reason: "animated" });
-
-      // The same again is a refusal of its own, so it is shown again.
-      vm.addBackgroundImage$.value!(new File(["x"], "a.gif"));
-      await flushPromises();
-      expect(vm.backgroundImageRefusal$.value).toEqual({ reason: "animated" });
-      expect(vm.backgroundImageRefusal$.value).not.toBe(first);
-
-      store.add.mockRejectedValue(new Error("quota"));
-      vm.addBackgroundImage$.value!(new File(["x"], "b.png"));
-      await flushPromises();
-      expect(vm.backgroundImageRefusal$.value).toEqual({ reason: "not-kept" });
-
-      store.add.mockResolvedValue("kept");
-      vm.addBackgroundImage$.value!(new File(["x"], "c.png"));
-      await flushPromises();
-      expect(vm.backgroundImageRefusal$.value).toBeUndefined();
-    });
-
-    it("never removes the background in force", () => {
-      sdkSupportMock.mockReturnValue(true);
-      store.remove.mockResolvedValue();
-      const vm = lobbyOn("desktop");
-      backgroundEffectSetting.setValue("added:worn");
-      vm.removeBackgroundEffect$.value!("added:worn");
-      expect(store.remove).not.toHaveBeenCalled();
-      vm.removeBackgroundEffect$.value!("added:spare");
-      expect(store.remove).toHaveBeenCalledWith("spare");
-    });
-
-    it("previews the lobby's camera while there is one", () => {
-      const track = mockVideoTrack({});
-      const camera$ = new BehaviorSubject<LocalVideoMediaTrack | null>(track);
-      const vm = createLobbyFooterViewModel(
-        testScope(),
-        mockMuteStates(),
-        twoMicsAndOneCamMediaDevices,
-        noPipeline,
-        camera$,
-        /* openSettings */ undefined,
-        /* hangup */ undefined,
-        /* showLogo */ false,
-      );
-      expect(vm.cameraTrack$.value).toBe(track);
-      // The lobby releases the camera when it is turned off
-      camera$.next(null);
-      expect(vm.cameraTrack$.value).toBeNull();
-    });
-
-    it("previews the call's camera only while it is not muted", () => {
-      const muted$ = new BehaviorSubject(false);
-      const track = mockVideoTrack({ muted$ });
-      const vm = createCallFooterViewModel(
-        testScope(),
-        { ...buildMinimalCallViewModel(gridLayout), camera$: constant(track) },
-        mockMuteStates(),
-        twoMicsAndOneCamMediaDevices,
-        noPipeline,
-        /* reactionIdentifier */ undefined,
-        { showControls: true, header: HeaderStyle.Standard },
-      );
-      expect(vm.cameraTrack$.value).toBe(track);
-      muted$.next(true);
-      expect(vm.cameraTrack$.value).toBeNull();
-      muted$.next(false);
-      expect(vm.cameraTrack$.value).toBe(track);
-    });
-
-    it("availability is the same before and during a call", () => {
-      for (const supported of [true, false]) {
-        sdkSupportMock.mockReturnValue(supported);
-        const lobby = lobbyOn("desktop");
-        const inCall = createCallFooterViewModel(
-          testScope(),
-          buildMinimalCallViewModel(gridLayout),
-          mockMuteStates(),
-          twoMicsAndOneCamMediaDevices,
-          pipelineAsTheSdkSays(),
-          /* reactionIdentifier */ undefined,
-          { showControls: true, header: HeaderStyle.Standard },
-        );
-        const offeredInLobby =
-          lobby.selectBackgroundEffect$.value !== undefined;
-        expect(inCall.selectBackgroundEffect$.value !== undefined).toBe(
-          offeredInLobby,
-        );
-        expect(offeredInLobby).toBe(supported);
-      }
-    });
-  });
 });
@@ -5,38 +5,15 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */

-import {
-  BehaviorSubject,
-  combineLatest,
-  distinctUntilChanged,
-  map,
-  type Observable,
-  of,
-  switchMap,
-} from "rxjs";
+import { combineLatest, map, type Observable, switchMap } from "rxjs";
+import { supportsBackgroundProcessors } from "@livekit/track-processors";
 import { supportsAudioOutputSelection } from "livekit-client";
-import { type LocalVideoMediaTrack } from "@element-hq/matrixrtc-sdk";
-import { supportsModernBackgroundProcessors } from "@livekit/track-processors";
-import { logger } from "matrix-js-sdk/lib/logger";
-
-import {
-  parseEffect,
-  serializeEffect,
-  shippedBackgrounds,
-} from "../tracks/backgroundEffectCatalog";
-import {
-  type AddedBackground,
-  addedBackgrounds,
-  maxAddedBackgrounds,
-  UnusableImage,
-} from "../tracks/backgroundImages";

 import { type CallViewModel } from "../state/CallViewModel/CallViewModel";
-import { type BackgroundEffectsState } from "../state/BackgroundEffects";
 import { type MenuOptions } from "./MediaMuteAndSwitchButton";
 import { type MediaDevices } from "../state/MediaDevices";
 import {
-  backgroundEffect as backgroundEffectSetting,
+  backgroundBlur as backgroundBlurSettings,
  debugTileLayout as debugTileLayoutSetting,
 } from "../settings/settings";
 import { type Behavior, constant } from "../state/Behavior";
@@ -45,8 +22,7 @@ import { type MuteStates } from "../state/MuteStates";
 import { createStaticViewModel, type ViewModel } from "../state/ViewModel";
 import { HeaderStyle } from "../UrlParams";
 import { platform } from "../Platform";
-import { type BackgroundImageRefusal, type FooterSnapshot } from "./CallFooter";
-import { type BackgroundEffectGridItem } from "./BackgroundEffectGrid";
+import { type FooterSnapshot } from "./CallFooter";

 /**
 * Shared helper: maps MuteStates into the audio/video enabled + toggle behaviors
@@ -80,16 +56,13 @@ function buildMuteBehaviors(

 /**
 * Shared helper: maps MediaDevices into the audio/video device-list behaviors
- * needed by FooterSnapshot (options, selection, callbacks, background effect).
+ * needed by FooterSnapshot (options, selection, callbacks, blur toggle).
 */
 function buildDeviceBehaviors(
  scope: ObservableScope,
  mediaDevices: MediaDevices,
  /** return empty arrays for  audioOptions and videoOptions*/
  disableSwitcher$: Behavior<boolean>,
-  backgroundEffectsState$: Observable<BackgroundEffectsState>,
-  /** The camera as the pipeline has it, for the menu's preview. */
-  camera$: Observable<LocalVideoMediaTrack | null | undefined>,
 ): Pick<
  ViewModel<FooterSnapshot>,
  | "audioOptions$"
@@ -101,15 +74,8 @@ function buildDeviceBehaviors(
  | "videoOptions$"
  | "selectedVideo$"
  | "selectVideoButtonOption$"
-  | "backgroundEffect$"
-  | "selectBackgroundEffect$"
-  | "backgroundEffects$"
-  | "backgroundEffectNotice$"
-  | "backgroundEffectSettling$"
-  | "addBackgroundImage$"
-  | "backgroundImageRefusal$"
-  | "removeBackgroundEffect$"
-  | "cameraTrack$"
+  | "toggleBlur$"
+  | "videoBlurEnabled$"
 > {
  const options$ = (
    available$: Behavior<Map<string, MenuOptions["label"]>>,
@@ -126,19 +92,6 @@ function buildDeviceBehaviors(
      ),
    );

-  // Also false once the pipeline has failed to build this session.
-  const supported$ = backgroundEffectsState$.pipe(
-    map(({ supported }) => supported === true),
-    distinctUntilChanged(),
-  );
-  const slow = !supportsModernBackgroundProcessors();
-  const offered$ = combineLatest([disableSwitcher$, supported$]).pipe(
-    map(([switcherDisabled, supported]) => !switcherDisabled && supported),
-  );
-  // A new object for each refusal, so the same one twice is shown twice.
-  const refusal$ = new BehaviorSubject<BackgroundImageRefusal | undefined>(
-    undefined,
-  );
  return {
    audioOptions$: scope.behavior(options$(mediaDevices.audioInput.available$)),
    selectedAudio$: scope.behavior(
@@ -163,93 +116,18 @@ function buildDeviceBehaviors(
      mediaDevices.videoInput.selected$.pipe(map((s) => s?.id)),
    ),
    selectVideoButtonOption$: constant(mediaDevices.videoInput.select),
-    backgroundEffect$: scope.behavior(
-      combineLatest([backgroundEffectSetting.value$, supported$]).pipe(
-        map(([raw, supported]) =>
-          supported ? serializeEffect(parseEffect(raw)) : "none",
-        ),
-      ),
-    ),
-    selectBackgroundEffect$: scope.behavior(
-      offered$.pipe(
-        map((offered) =>
-          offered
-            ? (id: string): void =>
-                backgroundEffectSetting.setValue(
-                  serializeEffect(parseEffect(id)),
-                )
-            : undefined,
-        ),
-      ),
-    ),
-    backgroundEffects$: scope.behavior(
-      addedBackgrounds.added$.pipe(
-        map((added) => backgroundEffectChoices(added ?? [])),
-      ),
-    ),
-    backgroundEffectNotice$: scope.behavior(
-      offered$.pipe(
-        map((offered) =>
-          !offered ? "unavailable" : slow ? "slow" : undefined,
-        ),
-      ),
-    ),
-    backgroundEffectSettling$: scope.behavior(
-      backgroundEffectsState$.pipe(
-        map(({ wait }) => wait !== undefined),
-        distinctUntilChanged(),
-      ),
-      false,
-    ),
-    // Kept and offered, not put on: that waits for the user to choose it.
-    addBackgroundImage$: scope.behavior(
-      combineLatest([offered$, addedBackgrounds.added$]).pipe(
-        map(([offered, added]) =>
-          offered && (added?.length ?? 0) < maxAddedBackgrounds
-            ? (file: File): void => {
-                refusal$.next(undefined);
-                addedBackgrounds.add(file).catch((e) => {
-                  logger.warn("Could not keep that background", e);
-                  refusal$.next({
-                    reason: e instanceof UnusableImage ? e.reason : "not-kept",
-                  });
-                });
+    toggleBlur$: scope.behavior(
+      combineLatest([backgroundBlurSettings.value$, disableSwitcher$]).pipe(
+        map(([current, switcherDisabled]) => {
+          return !switcherDisabled && supportsBackgroundProcessors()
+            ? (): void => {
+                backgroundBlurSettings.setValue(!current);
              }
-            : undefined,
-        ),
-      ),
-    ),
-    backgroundImageRefusal$: refusal$,
-    // None while muted: the call mutes its track rather than releasing it.
-    cameraTrack$: scope.behavior(
-      camera$.pipe(
-        switchMap((camera) =>
-          camera
-            ? camera.muted$.pipe(map((muted) => (muted ? null : camera)))
-            : of(null),
-        ),
-      ),
-      null,
-    ),
-    // Never the one in force: taking it away would leave nothing chosen.
-    removeBackgroundEffect$: scope.behavior(
-      offered$.pipe(
-        map((offered) =>
-          offered
-            ? (optionId: string): void => {
-                const effect = parseEffect(optionId);
-                if (effect.kind !== "added") return;
-                if (backgroundEffectSetting.getValue() === optionId) return;
-                addedBackgrounds
-                  .remove(effect.id)
-                  .catch((e) =>
-                    logger.warn("Could not remove that background", e),
-                  );
-              }
-            : undefined,
-        ),
+            : undefined;
+        }),
      ),
    ),
+    videoBlurEnabled$: backgroundBlurSettings.value$,
  };
 }

@@ -260,8 +138,6 @@ function buildDeviceBehaviors(
 * @param callModel - The root CallViewModel; provides layout, grid mode, reactions, etc.
 * @param muteStates - Audio and video mute state + toggles.
 * @param mediaDevices - Available and selected input devices.
- * @param backgroundEffectsState$ - The background pipeline's state: whether
- *   effects run here, and the wait for the first.
 * @param reactionIdentifier - The local user's reaction identifier string, or
 *   undefined when reactions are not supported (hides the reaction button).
 * @param options - `showControls`: whether the call controls should be shown.
@@ -272,7 +148,6 @@ export function createCallFooterViewModel(
  callModel: CallViewModel,
  muteStates: MuteStates,
  mediaDevices: MediaDevices,
-  backgroundEffectsState$: Observable<BackgroundEffectsState>,
  reactionIdentifier: string | undefined,
  options: { showControls: boolean; header: HeaderStyle },
 ): ViewModel<FooterSnapshot> {
@@ -287,13 +162,7 @@ export function createCallFooterViewModel(
  );
  return {
    ...buildMuteBehaviors(scope, muteStates),
-    ...buildDeviceBehaviors(
-      scope,
-      mediaDevices,
-      disableDeviceSwitcher$,
-      backgroundEffectsState$,
-      callModel.camera$,
-    ),
+    ...buildDeviceBehaviors(scope, mediaDevices, disableDeviceSwitcher$),
    // candidat to move into the FooterViewModel
    showFooter$: callModel.showFooter$,
    hideControls$: constant(!showControls),
@@ -355,9 +224,6 @@ export function createCallFooterViewModel(
 * @param scope - ObservableScope that bounds the lifetime of derived behaviors.
 * @param muteStates - Audio and video mute state + toggles.
 * @param mediaDevices - Available and selected input devices.
- * @param backgroundEffectsState$ - The background pipeline's state: whether
- *   effects run here, and the wait for the first.
- * @param camera$ - The lobby's camera, for the camera menu's preview.
 * @param openSettings - Callback to open the settings modal, or undefined.
 * @param hangup - Callback to leave/cancel, or undefined (hides the button).
 * @param showLogo - Whether to show the Element Call logo.
@@ -366,8 +232,6 @@ export function createLobbyFooterViewModel(
  scope: ObservableScope,
  muteStates: MuteStates,
  mediaDevices: MediaDevices,
-  backgroundEffectsState$: Observable<BackgroundEffectsState>,
-  camera$: Behavior<LocalVideoMediaTrack | null>,
  openSettings: (() => void) | undefined,
  hangup: (() => void) | undefined,
  showLogo: boolean,
@@ -411,33 +275,6 @@ export function createLobbyFooterViewModel(
      selectVideoButtonOption: undefined,
    }),
    ...buildMuteBehaviors(scope, muteStates),
-    ...buildDeviceBehaviors(
-      scope,
-      mediaDevices,
-      constant(false),
-      backgroundEffectsState$,
-      camera$,
-    ),
+    ...buildDeviceBehaviors(scope, mediaDevices, constant(false)),
  };
 }
-
-function backgroundEffectChoices(
-  added: AddedBackground[],
-): BackgroundEffectGridItem[] {
-  return [
-    { id: serializeEffect({ kind: "none" }), kind: "none", removable: false },
-    { id: serializeEffect({ kind: "blur" }), kind: "blur", removable: false },
-    ...shippedBackgrounds.map((background) => ({
-      id: serializeEffect({ kind: "shipped", id: background.id }),
-      kind: "image" as const,
-      imageUrl: background.imagePath,
-      removable: false,
-    })),
-    ...added.map((background) => ({
-      id: serializeEffect({ kind: "added", id: background.id }),
-      kind: "image" as const,
-      imageUrl: background.url,
-      removable: true,
-    })),
-  ];
-}
@@ -36,17 +36,20 @@ Please see LICENSE in the repository root for full details.
  }
 }

-/* The width design sets: a long device name wraps. */
 .menu {
-  inline-size: 296px;
+  display: flex;
+  flex-direction: column;
 }

-/* Its share of the measured call area: the menu is portalled out of the root,
-   so CSS can't size it against the call. */
+/* Only the device lists scroll, bounded by the measured call area: the menu is
+   portalled out of the root, so CSS can't size it against the call. */
 .deviceList {
+  overflow-y: auto;
+  min-block-size: 0;
  max-block-size: var(--device-list-max-height);
-  /* The raised headings stay raised within the list, under the menu's frame. */
-  isolation: isolate;
+  /* Keeps a row reached by keyboard clear of the sticky heading and meter. */
+  scroll-padding-block: var(--device-list-scroll-padding-start, 0)
+    var(--device-list-scroll-padding-end, 0);
 }

 /* Compound's heading rule heads each section; the design adds space below it. */
@@ -59,10 +62,23 @@ Please see LICENSE in the repository root for full details.
  margin-block-start: var(--cpd-space-7x);
 }

-/* Raised, or the positioned effect tiles scroll over the heading they sit
-   under. Compound's sticky heading is the section's aria-hidden first child. */
-.deviceList [role="group"] > [aria-hidden="true"]:first-child {
-  z-index: 1;
+/* Sticky within its own section. Opaque and inset a border width so it doesn't
+   paint over the menu's outline. */
+.sectionHeading {
+  position: sticky;
+  inset-block-start: 0;
+  background: var(--cpd-color-bg-canvas-default);
+  margin-inline: var(--cpd-border-width-1);
+  margin-block-start: var(--cpd-border-width-1);
+}
+
+/* Sticky at the foot of the microphone section; opaque and inset as above. */
+.stickyMeter {
+  position: sticky;
+  inset-block-end: 0;
+  background: var(--cpd-color-bg-canvas-default);
+  margin-inline: var(--cpd-border-width-1);
+  margin-block-end: var(--cpd-border-width-1);
 }

 /* Radix focuses whatever the pointer is over, so the browser's ring would
@@ -76,56 +92,3 @@ Please see LICENSE in the repository root for full details.
  outline: var(--cpd-border-width-2) solid var(--cpd-color-border-focused);
  outline-offset: calc(-1 * var(--cpd-border-width-2));
 }
-
-.notice {
-  display: flex;
-  align-items: flex-start;
-  gap: var(--cpd-space-3x);
-  margin: var(--cpd-space-2x) var(--cpd-space-4x) 0;
-  padding: var(--cpd-space-3x);
-  border-radius: var(--cpd-space-2x);
-  background: var(--cpd-color-bg-subtle-secondary);
-  color: var(--cpd-color-text-primary);
-  font: var(--cpd-font-body-md-regular);
-}
-
-.notice > svg {
-  flex-shrink: 0;
-  color: var(--cpd-color-icon-secondary);
-}
-
-.refusal {
-  margin: var(--cpd-space-2x) var(--cpd-space-4x) 0;
-}
-
-.selfPreview {
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-  aspect-ratio: 16 / 9;
-  margin-block-end: var(--cpd-space-2x);
-  overflow: clip;
-  border-start-start-radius: var(--cpd-space-3x);
-  border-start-end-radius: var(--cpd-space-3x);
-  background: var(--cpd-color-bg-subtle-secondary);
-  color: var(--cpd-color-icon-secondary);
-}
-
-.selfPreview > video {
-  position: absolute;
-  inset: 0;
-  inline-size: 100%;
-  block-size: 100%;
-  object-fit: cover;
-  /* Rounded itself too: a video can be drawn on a layer of its own, which the
-     frame's rounded clip doesn't always reach. */
-  border-radius: inherit;
-}
-
-/* Up to the menu's frame, over the padding at its top. */
-.selfPreviewPinned,
-.deviceListLeadsWithPreview {
-  margin-block-start: calc(-1 * var(--cpd-space-5x));
-}
@@ -11,9 +11,6 @@ import { useEffect, useState, type FC, type JSX, type ReactNode } from "react";
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { MediaMuteAndSwitchButton } from "./MediaMuteAndSwitchButton";
 import styles from "./MediaMuteAndSwitchButton.module.css";
-import { type BackgroundEffectGridItem } from "./BackgroundEffectGrid";
-import { SelfPreview } from "./SelfPreview";
-import { shippedBackgrounds } from "../tracks/backgroundEffectCatalog";
 import meterStyles from "./MicrophoneLevelMeter.module.css";
 import { MediaDevicesContext } from "../MediaDevicesContext";
 import { RootElementProvider } from "../RootElementContext";
@@ -61,64 +58,15 @@ const WithAMicrophone: FC<{ children: ReactNode }> = ({ children }) => {
  return <>{children}</>;
 };

-/** A camera for the preview: a figure against a room, drawn to a stream. */
-const FakeCamera: FC = () => {
-  const [stream, setStream] = useState<MediaStream>();
-  useEffect(() => {
-    const canvas = document.createElement("canvas");
-    canvas.width = 640;
-    canvas.height = 360;
-    const context = canvas.getContext("2d")!;
-    const draw = (): void => {
-      context.fillStyle = "#6b7f8e";
-      context.fillRect(0, 0, 640, 360);
-      context.fillStyle = "#c9a27e";
-      context.beginPath();
-      context.arc(320, 150, 62, 0, 2 * Math.PI);
-      context.fill();
-      context.fillStyle = "#34495e";
-      context.beginPath();
-      context.ellipse(320, 380, 150, 140, 0, Math.PI, 2 * Math.PI);
-      context.fill();
-    };
-    draw();
-    // Redrawn, so the stream keeps delivering frames.
-    const timer = setInterval(draw, 200);
-    const captured = canvas.captureStream(10);
-    setStream(captured);
-    return (): void => {
-      clearInterval(timer);
-      captured.getTracks().forEach((track) => track.stop());
-    };
-  }, []);
-  return (
-    <video
-      data-testid="preview-camera"
-      autoPlay
-      muted
-      playsInline
-      ref={(video): void => {
-        if (video && stream && video.srcObject !== stream)
-          video.srcObject = stream;
-      }}
-    />
-  );
-};
-
 /** Supplies a call-sized root. Without one the list is bounded by the whole Storybook frame. */
-const WithACallArea: FC<{ children: ReactNode; blockSize?: number }> = ({
-  children,
-  // A call's size: anything smaller makes a short device list scroll, and a
-  // narrower one narrows the menu.
-  blockSize = 720,
-}) => {
+const WithACallArea: FC<{ children: ReactNode }> = ({ children }) => {
  const [callArea, setCallArea] = useState<HTMLElement | null>(null);
  return (
    <div
      ref={setCallArea}
      style={{
-        blockSize,
-        inlineSize: 1024,
+        // A call's size: anything smaller makes a short device list scroll.
+        blockSize: 720,
        display: "flex",
        alignItems: "flex-end",
        justifyContent: "center",
@@ -149,10 +97,6 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-// By place: Compound's section heading is aria-hidden, as its group carries
-// the name.
-const SECTION_HEADING = "[role='group'] > [aria-hidden]";
-
 export const Default: Story = {
  args: {
    iconsAndLabels: "audio",
@@ -183,6 +127,8 @@ export const AudioMute: Story = {
      { label: { type: "name", name: "Microphone 1" }, id: "1" },
      { label: { type: "name", name: "Microphone 2" }, id: "2" },
    ],
+    videoBlurEnabled: true,
+    videoBlurToggleClick: fn(),
    selectedOption: "2",
  },
  play: async ({ args, canvasElement }) => {
@@ -216,21 +162,11 @@ export const VideoMute: Story = {
      { label: { type: "name", name: "Camera 1" }, id: "1" },
      { label: { type: "name", name: "Camera 2" }, id: "2" },
    ],
+
    selectedOption: "1",
-    selfPreview: <SelfPreview track={null} />,
  },
 };

-const effects: BackgroundEffectGridItem[] = [
-  { id: "none", kind: "none" },
-  { id: "blur", kind: "blur" },
-  ...shippedBackgrounds.map((background) => ({
-    id: `image:${background.id}`,
-    kind: "image" as const,
-    imageUrl: background.imagePath,
-  })),
-];
-
 export const VideoUnmute: Story = {
  args: {
    iconsAndLabels: "video",
@@ -239,486 +175,9 @@ export const VideoUnmute: Story = {
      { label: { type: "name", name: "Camera 1" }, id: "1" },
      { label: { type: "name", name: "Camera 2" }, id: "2" },
    ],
+    videoBlurEnabled: true,
+    videoBlurToggleClick: fn(),
    selectedOption: "2",
-    backgroundEffects: effects,
-    selectedBackgroundEffect: "none",
-    onSelectBackgroundEffect: fn(),
-    onAddBackgroundImage: fn(),
-    // As the footer always gives the camera menu one.
-    selfPreview: <FakeCamera />,
-  },
-};
-
-/** One choice among no effect, blur and the shipped images, under the cameras. */
-export const BackgroundEffects: Story = {
-  args: VideoUnmute.args,
-  play: async ({ args, canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const menu = within(document.body);
-    const section = await menu.findByRole("group", {
-      name: "Background effects",
-    });
-    const tiles = within(section).getAllByRole("menuitemradio");
-    await expect(tiles.map((tile) => tile.textContent)).toEqual([
-      "None",
-      "Blur",
-      "Background 1",
-      "Background 2",
-    ]);
-    await expect(
-      within(section).getByRole("menuitemradio", { checked: true }),
-    ).toHaveTextContent("None");
-
-    const cameras = menu.getByRole("group", { name: "Camera" });
-    await expect(
-      cameras.compareDocumentPosition(section) &
-        Node.DOCUMENT_POSITION_FOLLOWING,
-    ).toBeTruthy();
-    const [first, second, third, fourth] = tiles.map((tile) =>
-      tile.getBoundingClientRect(),
-    );
-    await expect(second.top).toBe(first.top);
-    await expect(third.top).toBe(first.top);
-    await expect(fourth.top).toBeGreaterThan(first.bottom);
-    const frame = document.body
-      .querySelector("[role='menu']")!
-      .getBoundingClientRect();
-    for (const tile of [first, second, third])
-      await expect(tile.left >= frame.left && tile.right <= frame.right).toBe(
-        true,
-      );
-
-    const add = within(section).getByRole("menuitem", { name: "Add image" });
-    await expect(
-      tiles[3].compareDocumentPosition(add) & Node.DOCUMENT_POSITION_FOLLOWING,
-    ).toBeTruthy();
-
-    await userEvent.click(menu.getByRole("menuitemradio", { name: "Blur" }));
-    await expect(args.onSelectBackgroundEffect).toHaveBeenCalledWith("blur");
-    await expect(menu.getByRole("menu")).toBeVisible();
-  },
-};
-
-/** Where effects can't run: shown, disabled and explained, except no effect. */
-export const BackgroundEffectsUnavailable: Story = {
-  args: {
-    ...VideoUnmute.args,
-    onSelectBackgroundEffect: undefined,
-    backgroundEffectNotice:
-      "Background effects are not supported on this platform.",
-  },
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const menu = within(document.body);
-    const section = await menu.findByRole("group", {
-      name: "Background effects",
-    });
-    // On the tiles' own group: the section's can't carry a description.
-    await expect(
-      within(section).getByRole("group"),
-    ).toHaveAccessibleDescription(
-      "Background effects are not supported on this platform.",
-    );
-    for (const tile of within(section).getAllByRole("menuitemradio"))
-      if (tile.textContent === "None") await expect(tile).toBeEnabled();
-      else await expect(tile).toBeDisabled();
-  },
-};
-
-/** Where only the slower route exists: offered and choosable, with the cost said. */
-export const BackgroundEffectsSlowInThisBrowser: Story = {
-  args: {
-    ...VideoUnmute.args,
-    backgroundEffectNotice:
-      "Background effects run slowly on this platform, which may cause your video to stutter.",
-  },
-  play: async ({ args, canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const menu = within(document.body);
-    const section = await menu.findByRole("group", {
-      name: "Background effects",
-    });
-    // On the tiles' own group: the section's can't carry a description.
-    await expect(
-      within(section).getByRole("group"),
-    ).toHaveAccessibleDescription(
-      "Background effects run slowly on this platform, which may cause your video to stutter.",
-    );
-    for (const tile of within(section).getAllByRole("menuitemradio"))
-      await expect(tile).not.toHaveAttribute("aria-disabled");
-    await userEvent.click(
-      within(section).getByRole("menuitemradio", { name: "Background 1" }),
-    );
-    await expect(args.onSelectBackgroundEffect).toHaveBeenCalledWith(
-      "image:arc",
-    );
-
-    const notice = document.body.querySelector(`.${styles.notice}`)!;
-    const frame = document.body
-      .querySelector("[role='menu']")!
-      .getBoundingClientRect();
-    await expect(frame.width).toBeLessThanOrEqual(296);
-    await expect(notice.getBoundingClientRect().right).toBeLessThanOrEqual(
-      frame.right,
-    );
-  },
-};
-
-/** The first effect of a session shows its wait on its own tile. */
-export const BackgroundEffectsSettling: Story = {
-  args: {
-    ...VideoUnmute.args,
-    selectedBackgroundEffect: "blur",
-    backgroundEffectSettling: true,
-  },
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const menu = within(document.body);
-    const chosen = await menu.findByRole("menuitemradio", {
-      name: "Blur",
-      checked: true,
-    });
-    await expect(chosen).toHaveAttribute("aria-busy", "true");
-    const marks = chosen.querySelectorAll("svg");
-    await expect(marks).toHaveLength(1);
-    await expect(getComputedStyle(marks[0]).animationName).not.toBe("none");
-    const section = menu.getByRole("group", { name: "Background effects" });
-    for (const other of within(section).getAllByRole("menuitemradio", {
-      checked: false,
-    }))
-      await expect(other).toHaveAttribute("aria-busy", "false");
-    await expect(menu.queryByTestId("preview-camera")).toBeNull();
-    const frames = document.body.querySelectorAll(`.${styles.selfPreview} svg`);
-    await expect(frames).toHaveLength(1);
-  },
-};
-
-/** A file that can't be used: said where it was chosen, and nothing changes. */
-export const BackgroundImageRefused: Story = {
-  args: {
-    ...VideoUnmute.args,
-    selectedBackgroundEffect: "blur",
-    backgroundEffectNotice:
-      "Background effects run slowly on this platform, which may cause your video to stutter.",
-    backgroundImageRefusal: { text: "That file is not a supported image" },
-  },
-  decorators: [
-    (Story): JSX.Element => (
-      <WithACallArea blockSize={300}>
-        <Story />
-      </WithACallArea>
-    ),
-  ],
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const menu = within(document.body);
-    const message = await menu.findByText("That file is not a supported image");
-    const list = document.body.querySelector<HTMLElement>(
-      `.${styles.deviceList}`,
-    )!;
-    await expect(list.scrollHeight).toBeGreaterThan(list.clientHeight);
-    const scrollport = list.getBoundingClientRect();
-    const shown = message.getBoundingClientRect();
-    await expect(shown.bottom).toBeLessThanOrEqual(scrollport.bottom + 1);
-    await expect(shown.top).toBeGreaterThanOrEqual(scrollport.top - 1);
-    await expect(menu.queryByText(/run slowly/)).toBeNull();
-    await expect(
-      menu.getByRole("menuitemradio", { name: "Blur" }),
-    ).toHaveAttribute("aria-checked", "true");
-  },
-};
-
-/** A flat picture, for backgrounds of one's own. */
-function swatch(colour: string): string {
-  return `data:image/svg+xml,${encodeURIComponent(
-    `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="9"><rect width="16" height="9" fill="${colour}"/></svg>`,
-  )}`;
-}
-
-/** One's own backgrounds are removable, never the one in force. */
-export const AddedBackgroundsCanBeRemoved: Story = {
-  args: {
-    ...VideoUnmute.args,
-    backgroundEffects: [
-      ...effects,
-      {
-        id: "added:one",
-        kind: "image",
-        imageUrl: swatch("#c2410c"),
-        removable: true,
-      },
-      {
-        id: "added:two",
-        kind: "image",
-        imageUrl: swatch("#1d4ed8"),
-        removable: true,
-      },
-    ],
-    selectedBackgroundEffect: "added:one",
-    onRemoveBackgroundEffect: fn(),
-  },
-  play: async ({ args, canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const body = within(document.body);
-
-    const inForce = await body.findByRole("menuitemradio", {
-      name: "Background 3",
-    });
-    await expect(inForce).not.toHaveAttribute("aria-keyshortcuts");
-
-    const other = body.getByRole("menuitemradio", { name: "Background 4" });
-    await expect(other).toHaveAttribute("aria-keyshortcuts", "Delete");
-    other.focus();
-    await userEvent.keyboard("{Delete}");
-    await expect(args.onRemoveBackgroundEffect).toHaveBeenCalledWith(
-      "added:two",
-    );
-
-    const wrapper = other.parentElement!;
-    await userEvent.hover(wrapper);
-    const cross = wrapper.querySelector<HTMLElement>(
-      "[aria-hidden]:last-child",
-    )!;
-    const probe = document.createElement("span");
-    probe.style.color = "var(--cpd-color-icon-critical-primary)";
-    cross.append(probe);
-    const critical = getComputedStyle(probe).color;
-    probe.remove();
-    await expect(getComputedStyle(cross).color).toBe(critical);
-    const tile = other.getBoundingClientRect();
-    const box = cross.getBoundingClientRect();
-    await expect(box.right).toBeGreaterThan(tile.right);
-    await expect(box.top).toBeLessThan(tile.top);
-
-    await userEvent.hover(cross);
-    await waitFor(async () =>
-      expect(
-        [...document.body.querySelectorAll("div")].some(
-          (d) => d.textContent === "Remove" && d.offsetParent !== null,
-        ),
-      ).toBe(true),
-    );
-  },
-};
-
-/** Removing by pointer while the selection really changes. */
-export const RemovingWithLiveSelection: Story = {
-  args: AddedBackgroundsCanBeRemoved.args,
-  render: function WithLiveSelection(args): JSX.Element {
-    const [selected, setSelected] = useState("none");
-    const [offered, setOffered] = useState(args.backgroundEffects ?? []);
-    return (
-      <MediaMuteAndSwitchButton
-        {...args}
-        backgroundEffects={offered}
-        selectedBackgroundEffect={selected}
-        onSelectBackgroundEffect={setSelected}
-        onRemoveBackgroundEffect={(id): void =>
-          setOffered((current) => current.filter((o) => o.id !== id))
-        }
-      />
-    );
-  },
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const body = within(document.body);
-
-    const tile = await body.findByRole("menuitemradio", {
-      name: "Background 4",
-    });
-    await userEvent.hover(tile);
-    const cross = tile.parentElement!.querySelector<HTMLElement>(
-      "[aria-hidden]:last-child",
-    )!;
-    await expect(cross).toBeVisible();
-    await userEvent.click(cross);
-
-    await waitFor(async () =>
-      expect(
-        body.queryByRole("menuitemradio", { name: "Background 4" }),
-      ).toBeNull(),
-    );
-    await expect(
-      body.getByRole("menuitemradio", { name: "None" }),
-    ).toHaveAttribute("aria-checked", "true");
-  },
-};
-
-/** Where the call leaves room, the camera holds the top while the options scroll. */
-export const BackgroundEffectsWithPreview: Story = {
-  args: {
-    ...VideoUnmute.args,
-    // Enough that the list fills its share, so the preview's cost counts.
-    options: Array.from({ length: 8 }, (_, i) => ({
-      label: { type: "name" as const, name: `Camera ${i + 1}` },
-      id: `${i + 1}`,
-    })),
-  },
-  decorators: [
-    (Story): JSX.Element => (
-      <WithACallArea blockSize={640}>
-        <Story />
-      </WithACallArea>
-    ),
-  ],
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const picture = await within(document.body).findByTestId("preview-camera");
-    const preview = picture.parentElement!;
-    const list = document.body.querySelector<HTMLElement>(
-      `.${styles.deviceList}`,
-    )!;
-    const frame = document.body
-      .querySelector("[role='menu']")!
-      .getBoundingClientRect();
-
-    const box = preview.getBoundingClientRect();
-    await expect(list.contains(preview)).toBe(false);
-    await expect(box.top - frame.top).toBeLessThanOrEqual(2);
-    await expect(frame.width - box.width).toBeLessThanOrEqual(2);
-    await expect(box.width / box.height).toBeCloseTo(16 / 9, 1);
-    await expect(box.bottom).toBeLessThanOrEqual(
-      list.getBoundingClientRect().top,
-    );
-
-    const listShare = Math.round(640 * 0.6);
-    // The list runs on through the menu's padding at its foot, which isn't
-    // part of its share.
-    const listEnd =
-      list.getBoundingClientRect().bottom -
-      Number.parseFloat(getComputedStyle(list).paddingBlockEnd);
-    await expect(listEnd - box.top).toBeLessThanOrEqual(listShare + 1);
-
-    await expect(list.scrollHeight).toBeGreaterThan(list.clientHeight);
-    list.scrollTop = list.scrollHeight;
-    await expect(preview.getBoundingClientRect().top).toBe(box.top);
-  },
-};
-
-/** With the camera off the preview says so, and effects can still be chosen. */
-export const BackgroundEffectsPreviewWithTheCameraOff: Story = {
-  args: {
-    ...VideoUnmute.args,
-    enabled: false,
-    selfPreview: <SelfPreview track={null} />,
-  },
-  play: async ({ args, canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const menu = within(document.body);
-    await menu.findByRole("group", { name: "Background effects" });
-    const preview = document.body.querySelector(`.${styles.selfPreview}`)!;
-    await expect(preview.querySelector("video")).toBeNull();
-    await expect(preview.querySelector("svg")).not.toBeNull();
-
-    await userEvent.click(menu.getByRole("menuitemradio", { name: "Blur" }));
-    await expect(args.onSelectBackgroundEffect).toHaveBeenCalledWith("blur");
-  },
-};
-
-/** In a call too short to hold it, the camera leads the options and scrolls away. */
-export const BackgroundEffectsPreviewScrollsWithTheList: Story = {
-  args: VideoUnmute.args,
-  decorators: [
-    (Story): JSX.Element => (
-      <WithACallArea blockSize={300}>
-        <Story />
-      </WithACallArea>
-    ),
-  ],
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const picture = await within(document.body).findByTestId("preview-camera");
-    const preview = picture.parentElement!;
-    const list = document.body.querySelector<HTMLElement>(
-      `.${styles.deviceList}`,
-    )!;
-    await expect(list.contains(preview)).toBe(true);
-    const cameras = within(document.body).getByRole("group", {
-      name: "Camera",
-    });
-    await expect(
-      preview.compareDocumentPosition(cameras) &
-        Node.DOCUMENT_POSITION_FOLLOWING,
-    ).toBeTruthy();
-
-    list.scrollTop = list.scrollHeight;
-    await expect(preview.getBoundingClientRect().bottom).toBeLessThan(
-      list.getBoundingClientRect().top,
-    );
-  },
-};
-
-/** In a short call the effects scroll into view with the list. */
-export const BackgroundEffectsScrollWhenTheyDoNotFit: Story = {
-  args: {
-    ...VideoUnmute.args,
-    // It sits with the effects, so it must fit the same share of the call.
-    backgroundEffectNotice:
-      "Background effects run slowly on this platform, which may cause your video to stutter.",
-  },
-  decorators: [
-    (Story): JSX.Element => (
-      <WithACallArea blockSize={300}>
-        <Story />
-      </WithACallArea>
-    ),
-  ],
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const menu = within(document.body);
-    const last = await menu.findByRole("menuitemradio", {
-      name: "Background 2",
-    });
-    const list = document.body.querySelector<HTMLElement>(
-      `.${styles.deviceList}`,
-    )!;
-    await expect(list.scrollHeight).toBeGreaterThan(list.clientHeight);
-    await expect(last.getBoundingClientRect().top).toBeGreaterThan(
-      list.getBoundingClientRect().bottom,
-    );
-
-    // Scrolled under the section's heading, the tiles pass beneath it. By
-    // position: Compound's heading is the section's hidden first child.
-    const heading = menu.getByRole("group", { name: "Background effects" })
-      .firstElementChild as HTMLElement;
-    list.scrollTop = heading.offsetTop + 30;
-    await waitFor(async () => {
-      const box = heading.getBoundingClientRect();
-      const drawn = document.elementFromPoint(
-        box.left + box.width / 2,
-        box.bottom - 2,
-      );
-      await expect(heading.contains(drawn)).toBe(true);
-    });
-    list.scrollTop = 0;
-
-    for (let i = 0; i < 10 && document.activeElement !== last; i++)
-      await userEvent.keyboard("{ArrowDown}");
-    await expect(document.activeElement).toBe(last);
-    const scrollport = list.getBoundingClientRect();
-    const reached = last.getBoundingClientRect();
-    await expect(reached.bottom).toBeLessThanOrEqual(scrollport.bottom + 1);
-    await expect(reached.top).toBeGreaterThanOrEqual(scrollport.top - 1);
-
-    const callArea = canvasElement
-      .querySelector<HTMLElement>("[style*='block-size: 300px']")!
-      .getBoundingClientRect();
-    const frame = document.body
-      .querySelector("[role='menu']")!
-      .getBoundingClientRect();
-    await expect(frame.top).toBeGreaterThanOrEqual(callArea.top);
-    await expect(frame.bottom).toBeLessThanOrEqual(callArea.bottom);
  },
 };

@@ -760,8 +219,9 @@ export const SpeakerAndMicrophoneSections: Story = {
    await expect(
      document.body.querySelectorAll("[role='separator']"),
    ).toHaveLength(0);
-    const headings =
-      document.body.querySelectorAll<HTMLElement>(SECTION_HEADING);
+    const headings = document.body.querySelectorAll<HTMLElement>(
+      `.${styles.sectionHeading}`,
+    );
    await expect(headings).toHaveLength(2);
    const frame = menu.getBoundingClientRect();
    for (const heading of headings) {
@@ -796,37 +256,6 @@ export const SpeakerAndMicrophoneSections: Story = {
  },
 };

-/** A long name wraps rather than widening the menu, which design sets. */
-export const LongDeviceNameWraps: Story = {
-  args: {
-    ...SpeakerAndMicrophoneSections.args,
-    outputOptions: [
-      {
-        label: {
-          type: "name",
-          name: "Logitech BRIO 4K Ultra HD Pro Business Webcam Speakers (046d:085e)",
-        },
-        id: "long",
-      },
-      { label: { type: "name", name: "Headset" }, id: "spk2" },
-    ],
-    selectedOutputOption: "long",
-  },
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole("button", { name: "Microphone" }));
-    const body = within(document.body);
-    const long = await body.findByRole("menuitemradio", { name: /Logitech/ });
-    const short = await body.findByRole("menuitemradio", { name: "Headset" });
-
-    const menu = document.body.querySelector("[role='menu']")!;
-    await expect(Math.round(menu.getBoundingClientRect().width)).toBe(296);
-    await expect(long.getBoundingClientRect().height).toBeGreaterThan(
-      short.getBoundingClientRect().height,
-    );
-  },
-};
-
 export const OutputCannotBeChosen: Story = {
  args: {
    ...Default.args,
@@ -973,14 +402,14 @@ export const ManyDevices: Story = {
    await userEvent.click(canvas.getByRole("button", { name: "Microphone" }));
    const menu = within(document.body);

-    // The meter's box rather than its level: without a fake microphone (as on
+    // The sticky wrapper rather than the meter: without a fake microphone (as on
    // WebKit) the meter shows a message instead of a level.
    const list = document.body.querySelector<HTMLElement>(
      `.${styles.deviceList}`,
    )!;
    const sticky = await waitFor(() => {
      const element = document.body.querySelector<HTMLElement>(
-        `.${meterStyles.meter}`,
+        `.${styles.stickyMeter}`,
      );
      if (element === null) throw new Error("the meter has not rendered yet");
      return element;
@@ -1007,6 +436,10 @@ export const ManyDevices: Story = {
      .getBoundingClientRect();
    await expect(frame.top).toBeGreaterThanOrEqual(0);
    await expect(frame.bottom).toBeLessThanOrEqual(window.innerHeight + 1);
+
+    // The meter is the menu's one opaque part, so it must stay inside the frame.
+    await expect(pinned.left).toBeGreaterThan(frame.left);
+    await expect(pinned.right).toBeLessThan(frame.right);
  },
 };

@@ -1103,7 +536,7 @@ export const KeyboardReachesEveryDevice: Story = {

    const meter = await waitFor(() => {
      const element = document.body.querySelector<HTMLElement>(
-        `.${meterStyles.meter}`,
+        `.${styles.stickyMeter}`,
      );
      if (element === null) throw new Error("the meter has not rendered yet");
      return element;
@@ -1112,7 +545,9 @@ export const KeyboardReachesEveryDevice: Story = {
    // Drawn over the list: the sticky headings and the meter.
    const overlays = [
      meter,
-      ...document.body.querySelectorAll<HTMLElement>(SECTION_HEADING),
+      ...document.body.querySelectorAll<HTMLElement>(
+        `.${styles.sectionHeading}`,
+      ),
    ];
    const items = within(document.body).getAllByRole("menuitemradio");

@@ -1156,7 +591,10 @@ export const HeadingsStayWhileScrolling: Story = {
      `.${styles.deviceList}`,
    )!;
    const group = await menu.findByRole("group", { name: "Microphone" });
-    const heading = group.querySelector<HTMLElement>(":scope > [aria-hidden]")!;
+    // By class: the heading is aria-hidden, and its group carries the name.
+    const heading = group.querySelector<HTMLElement>(
+      `.${styles.sectionHeading}`,
+    )!;

    // Far enough that the heading is only on screen if it is stuck there.
    list.scrollTop +=
@@ -1169,6 +607,13 @@ export const HeadingsStayWhileScrolling: Story = {
    await expect(heading.getBoundingClientRect().bottom).toBeGreaterThan(
      scrollport.top,
    );
+    // Clear of the menu's frame.
+    const frame = document.body
+      .querySelector("[role='menu']")!
+      .getBoundingClientRect();
+    await expect(heading.getBoundingClientRect().left).toBeGreaterThan(
+      frame.left,
+    );
  },
 };

@@ -1183,23 +628,31 @@ function overlapping(element: Element, overlays: Element[]): number {
  }, 0);
 }

-/** The effect tiles get the keyboard ring the device rows get. */
-export const FocusRingCoversTheEffectTiles: Story = {
-  args: VideoUnmute.args,
+/** The blur toggle gets the keyboard ring too: it is the menu's child, not the list's. */
+export const FocusRingCoversTheBlurToggle: Story = {
+  args: {
+    ...VideoUnmute.args,
+    iconsAndLabels: "video",
+    videoBlurEnabled: false,
+    videoBlurToggleClick: fn(),
+  },
  play: async ({ canvasElement }) => {
    const canvas = within(canvasElement);
    await userEvent.click(canvas.getByRole("button", { name: "Camera" }));
-    const tile = await within(document.body).findByRole("menuitemradio", {
-      name: "Blur",
+    const toggle = await within(document.body).findByRole("menuitemcheckbox", {
+      name: /Blur background/,
    });

-    for (let i = 0; i < 6 && document.activeElement !== tile; i++)
+    // Arrow down past the cameras to the toggle.
+    for (let i = 0; i < 6 && document.activeElement !== toggle; i++)
      await userEvent.keyboard("{ArrowDown}");
-    await expect(document.activeElement).toBe(tile);
-    await expect(outlineWidth(tile)).toBeGreaterThan(0);
+    await expect(document.activeElement).toBe(toggle);
+    // The same ring the device rows get.
+    await expect(outlineWidth(toggle)).toBeGreaterThan(0);

-    await userEvent.hover(tile);
-    await expect(document.activeElement).toBe(tile);
-    await expect(outlineWidth(tile)).toBe(0);
+    // And the pointer takes it away, with the toggle still focused.
+    await userEvent.hover(toggle);
+    await expect(document.activeElement).toBe(toggle);
+    await expect(outlineWidth(toggle)).toBe(0);
  },
 };
--- a/Show More
+++ b/Show More