Expect the default output entry to carry no name

- main stopped labelling the virtual default output with the first device's
  name (426acd22): a pinned sink is not re-routed, and which device the browser
  default resolves to is not knowable from here.
- The exploration still carried the older file, so this check passed locally
  and failed in CI, which tests the branch merged with main.
- AC8 is unchanged — Default is still a distinct entry beside the device it
  resolves to. Only the label it carries has moved.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

.github/labels.yml

@@ -102,9 +102,6 @@
 - name: "backport-candidate"
   description: "Something that is a candidate for backport to a particular release branch"
   color: "0B8D85"
-- name: "Claude-Review"
-  description: "Request code review from Claude"
-  color: "e57157"
 - name: "customer-retainer"
   color: "F44A5F"
 - name: "dependencies"

.github/workflows/build-element-call.yaml

@@ -44,9 +44,7 @@ jobs:
           node-version-file: ".node-version"
       - name: Install dependencies
         # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present)
-        run: "scripts/layered.sh --ignore-pnpmfile"
-        env:
-          PR_HEAD_REPO_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
+        run: "pnpm install --frozen-lockfile --ignore-pnpmfile"
       - name: Build Element Call
         run: pnpm run build:"$PACKAGE":"$BUILD_MODE"
         env:

.github/workflows/claude.yaml

@@ -1,90 +0,0 @@
-name: Claude
-on:
-  pull_request:
-    types: [labeled]
-
-permissions:
-  # The action exchanges the GitHub OIDC token for a short-lived Anthropic
-  # access token. GitHub API access goes through CLAUDE_GH_TOKEN instead.
-  id-token: write
-
-jobs:
-  review:
-    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-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
-        with:
-          # The review looks at the individual commits, not just the combined diff
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Review
-        uses: anthropics/claude-code-action@6fed3ca145920b639991cb756090506e1bcaf515 # v1.0.245
-        with:
-          anthropic_federation_rule_id: fdrl_01XQmWo4nka1ZTqZdsdeScyr
-          anthropic_organization_id: dfbc9a23-d636-4653-8970-035204ef60fa
-          anthropic_service_account_id: svac_018Ay5qaA7ZW8X7XsbdekqUM
-          anthropic_workspace_id: wrkspc_01Aw8LHjBS6fZysu9yqzYifW
-          # The token used here must grant read access to code, issues, and metadata as well as
-          # read and write access to pull requests.
-          github_token: ${{ secrets.CLAUDE_GH_TOKEN }}
-          use_sticky_comment: true
-          track_progress: true
-          prompt: |
-            Review this pull request under the following (and no further) angles:
-
-            1. Scope:
-
-               - Does the PR do one thing?
-               - Is the PR free of unrelated fixes and drive-by refactorings?
-               - If the PR is large, could it reasonably be split into smaller PRs
-                 that still deliver value?
-
-            2. Commits:
-               
-               - Is the work split into self-contained commits of reasonable size?
-               - Are the commits arranged in a sensible order?
-               - Have required refactorings been split out into separate commits?
-               - Is the history free of "wip", checkpoint and fixup-style commits
-                 which only correct an earlier commit in the same PR?
-
-            3. Code:
-
-               - Are the code changes functionally correct?
-               - Do the changes introduce new security vulnerabilities or metadata
-                 leaks?
-               - Is the new code performant enough?
-               - Don't check anything that is already validated via other GitHub
-                 workflows like linting, formatting or tests passing.
-
-            Read the commits themselves with `git log` and `git diff` against
-            the base branch of the PR.
-
-            Drop any findings that are outside the above review angles or that don't
-            require resolution. Grade the severity of each finding as either "🟡 low",
-            "🟠 medium" or "🔴 high". Devise at least one possible resolution for each
-            finding.
-
-            Report the graded findings and resolutions from the "Code" angle as inline
-            comments. Add a footer "_-- Finding from automated review_" to each inline
-            comment.
-
-            Finally, report your overall result as PR comment. Start your message with
-            "# Automated review". Then add one section per review angle with:
-
-            - A verdict of "✅ PASS" or "❌ NEEDS WORK"
-            - A bullet list summarizing the remaining non-inlined graded findings and
-              resolutions (as nested bullets).
-
-            Be brief and concise in all your communication. Do not mention what you have
-            not covered and don't bring up issues that have already been fixed.
-
-            Use Markdown links for anything that can be navigated to on GitHub such
-            as files, commits, issues, pull requests, workflow runs, etc.
-          claude_args: |
-            --model claude-fable-5-1
-            --allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(git log:*),Bash(git diff:*),Bash(git show:*)"
-            --max-turns 50

.github/workflows/lint.yaml

@@ -1,12 +1,6 @@
 name: Lint, format & type check
 on:
   pull_request: {}
-  workflow_call:
-    inputs:
-      matrix-js-sdk-sha:
-        type: string
-        required: false
-        description: The matrix-js-sdk commit to build against instead of the locked one
 jobs:
   lint:
     name: Lint, format & type check
@@ -15,8 +9,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         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
@@ -27,10 +19,7 @@ jobs:
           node-version-file: ".node-version"
       - name: Install dependencies
         # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present)
-        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 }}
+        run: "pnpm install --frozen-lockfile --ignore-pnpmfile"
       - name: Formatting
         run: "pnpm run format:check"
       - name: i18n

.github/workflows/test.yaml

@@ -3,25 +3,6 @@ on:
   pull_request: {}
   push:
     branches: [main]
-  workflow_call:
-    inputs:
-      matrix-js-sdk-sha:
-        type: string
-        required: false
-        description: The matrix-js-sdk commit to build against instead of the locked one
-      disable_coverage:
-        type: boolean
-        required: false
-        default: false
-        description: Skip generating and uploading coverage reports
-      disable_e2e_tests:
-        type: boolean
-        required: false
-        default: false
-        description: Skip the end-to-end tests
-    secrets:
-      CODECOV_TOKEN:
-        required: false
 jobs:
   vitest:
     name: Run unit tests
@@ -30,8 +11,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         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
@@ -42,10 +21,7 @@ jobs:
           node-version-file: ".node-version"
       - name: Install dependencies
         # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present)
-        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 }}
+        run: "pnpm install --frozen-lockfile --ignore-pnpmfile"
       - name: Get Playwright version
         run: echo "PLAYWRIGHT_VERSION=$(pnpm list @playwright/test --depth=0 --json | jq -r '.[0].devDependencies["@playwright/test"].version')" >> $GITHUB_ENV
       - name: Cache Playwright binaries
@@ -59,11 +35,8 @@ jobs:
         if: steps.playwright-cache.outputs.cache-hit != 'true'
         run: pnpm playwright install --with-deps
       - name: Vitest
-        run: pnpm vitest --coverage.enabled="$ENABLE_COVERAGE"
-        env:
-          ENABLE_COVERAGE: ${{ !inputs.disable_coverage }}
+        run: "pnpm run test:coverage"
       - name: Upload to codecov
-        if: ${{ !inputs.disable_coverage }}
         uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -72,14 +45,11 @@ jobs:
           fail_ci_if_error: true
   playwright:
     name: Run end-to-end tests
-    if: ${{ !inputs.disable_e2e_tests }}
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         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
@@ -89,10 +59,7 @@ jobs:
           node-version-file: ".node-version"
       - name: Install dependencies
         # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present)
-        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 }}
+        run: pnpm install --frozen-lockfile --ignore-pnpmfile
       - name: Get Playwright version
         run: echo "PLAYWRIGHT_VERSION=$(pnpm list @playwright/test --depth=0 --json | jq -r '.[0].devDependencies["@playwright/test"].version')" >> $GITHUB_ENV
       - name: Cache Playwright binaries

.gitignore

@@ -2,7 +2,6 @@ node_modules
 .DS_Store
 .env
 dist
-dist-embedded
 dist-ssr
 *.local
 *.bkp
@@ -42,6 +41,3 @@ yarn-error.log
 
 *storybook.log
 storybook-static
-
-# Nested checkout made by scripts/layered.sh
-/matrix-js-sdk/

AGENTS.md

@@ -48,8 +48,6 @@ pnpm i18n:check
 - View model + marble tests, thin view, a story per state, an e2e spec.
 - Any new shared component called out explicitly, with why nothing existing fit.
 - Template filled for real: what, why, before/after screenshots, repro steps.
-- Comments only where the code can't give the reason — see
-  [code-style.md](docs/agents/code-style.md#comments).
 - Anything that redraws continuously — an animation frame, a stream — says what it
   costs, or better, counts the redraws in a test.
 - Branch `<handle>/<topic>`. Plain imperative commit subjects, no prefixes.

README.md

@@ -34,16 +34,16 @@ You can find the latest development version continuously deployed to
 ## ✨ Key Features
 
 ✅ **Decentralized & Federated** – No central authority; works across Matrix
-homeservers.
-✅ **End-to-End Encrypted** – Secure and private calls.
+homeservers.  
+✅ **End-to-End Encrypted** – Secure and private calls.  
 ✅ **Standalone, Widget & Component Mode** – Use as an independent app, embed
 in Matrix clients as a widget, or (experimentally) mount it as a React component
-inside your own application.
-✅ **WebRTC-based** – No additional software required.
+inside your own application.  
+✅ **WebRTC-based** – No additional software required.  
 ✅ **Scalable with LiveKit** – Supports large meetings via SFU
-([MSC4195: MatrixRTC using LiveKit backend](https://github.com/hughns/matrix-spec-proposals/blob/hughns/matrixrtc-livekit/proposals/4195-matrixrtc-livekit.md)).
+([MSC4195: MatrixRTC using LiveKit backend](https://github.com/hughns/matrix-spec-proposals/blob/hughns/matrixrtc-livekit/proposals/4195-matrixrtc-livekit.md)).  
 ✅ **Raise Hand** – Participants can signal when they want to speak, helping to
-organize the flow of the meeting.
+organize the flow of the meeting.  
 ✅ **Emoji Reactions** – Users can react with emojis 👍️ 🎉 👏 🤘, adding
 engagement and interactivity to the conversation.
 
@@ -297,8 +297,8 @@ The package is not published yet. A host installs it as a git dependency on the
 ```
 
 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
+Corepack) on the host's machine, runs a full `pnpm install` of this repository
+and is memory-hungry, 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
@@ -306,28 +306,8 @@ 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)
-
-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).
-
-- 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.
+`react-dom`, `matrix-js-sdk` and `livekit-client` itself, since the bundle leaves
+them external.
 
 ### Backend
 
@@ -361,33 +341,6 @@ pnpm backend
 # podman-compose -f docker-compose-dev.yml up
 ```
 
-The two Element Web instances load the Element Call widget from
-`./dist-embedded`, which is mounted over the copy bundled in the Element Web
-image. Build it from the current sources before starting the backend, and keep
-it rebuilding on change:
-
-```sh
-VITE_MATRIX_RTC_MODE=matrix_2_0 pnpm build:embedded:development --outDir dist-embedded --watch
-```
-
-Build it at least once before the first `pnpm backend`, since Docker otherwise
-creates an empty `dist-embedded` directory that the build cannot write to.
-Reload the page after a rebuild to pick up the new widget. The widget has no
-`config.json` in this setup, so `VITE_MATRIX_RTC_MODE` sets the default
-MatrixRTC mode of the build instead (see
-[docs/matrix_rtc_modes.md](docs/matrix_rtc_modes.md)); it can still be changed
-under Settings → Developer. Do not delete `dist-embedded` while the backend is
-running: the containers hold a mount of the directory, and a new directory of
-the same name is not picked up until they are recreated.
-
-> [!NOTE]
-> When Docker runs in a VM (colima, Docker Desktop), the SFUs' container IPs
-> are not routable from the host, so they advertise `127.0.0.1` as their ICE
-> candidate instead and the browser reaches them through the published ports.
-> This only works in Chromium-based browsers: Firefox ignores loopback
-> candidates, and calls drop about fifteen seconds after joining. Media runs
-> over ICE-TCP, since the UDP port ranges are not forwarded out of the VM.
-
 > [!NOTE]
 > To ensure your local development frontend functions properly, you’ll need to
 > add certificate exceptions in your browser for `https://localhost:3000` and

backend/app-service-othersite.yaml

@@ -5,7 +5,7 @@ sender_localpart: "_lk_jwt_service"
 namespaces:
   users:
     - exclusive: false
-      regex: "@.*:synapse\\.othersite\\.m\\.localhost" # Cover all local users
+      regex: "@.*:homeserver-1" # Cover all local users
 # Required for Synapse to call POST /_matrix/app/v1/ping on this service.
 url: "http://auth-server-1:16080"
 # Enable membership look-ups via /is_joined.

backend/app-service.yaml

@@ -5,7 +5,7 @@ sender_localpart: "_lk_jwt_service"
 namespaces:
   users:
     - exclusive: false
-      regex: "@.*:synapse\\.m\\.localhost" # Cover all local users
+      regex: "@.*:homeserver" # Cover all local users
 # Required for Synapse to call POST /_matrix/app/v1/ping on this service.
 url: "http://auth-server:6080"
 # Enable membership look-ups via /is_joined.

backend/dev_livekit-othersite.yaml

@@ -6,11 +6,6 @@ rtc:
   port_range_start: 50300
   port_range_end: 50400
   use_external_ip: false
-  # Advertise the loopback address instead of the container IP, which is not
-  # routable from the host when Docker runs in a VM (colima, Docker Desktop).
-  # The browser then reaches the SFU through the published ports. Firefox
-  # ignores loopback candidates, so this only works in Chromium-based browsers.
-  node_ip: 127.0.0.1
 turn:
   enabled: false
   domain: localhost

backend/dev_livekit.yaml

@@ -6,11 +6,6 @@ rtc:
   port_range_start: 50100
   port_range_end: 50200
   use_external_ip: false
-  # Advertise the loopback address instead of the container IP, which is not
-  # routable from the host when Docker runs in a VM (colima, Docker Desktop).
-  # The browser then reaches the SFU through the published ports. Firefox
-  # ignores loopback candidates, so this only works in Chromium-based browsers.
-  node_ip: 127.0.0.1
 turn:
   enabled: false
   domain: localhost

component/CallPortalRoot.test.tsx

@@ -1,57 +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 "vitest";
-import { render, screen } from "@testing-library/react";
-import { type ReactNode } from "react";
-import { Tooltip, TooltipProvider } from "@vector-im/compound-web";
-
-import { CallPortalRoot } from "./CallPortalRoot";
-
-// A button whose accessible name comes from its tooltip, as every icon button
-// in the call does: the name is lost whenever the tooltip has nowhere to go.
-const LabelledButton = (): ReactNode => (
-  <TooltipProvider>
-    <Tooltip label="Microphone">
-      <button>🎤</button>
-    </Tooltip>
-  </TooltipProvider>
-);
-
-test("floats into the host document with no root", () => {
-  render(
-    <CallPortalRoot root={undefined}>
-      <LabelledButton />
-    </CallPortalRoot>,
-  );
-  expect(screen.getByRole("button", { name: "Microphone" })).toBeTruthy();
-});
-
-test("floats into the root it is given", () => {
-  const root = document.createElement("div");
-  document.body.appendChild(root);
-  render(
-    <CallPortalRoot root={root}>
-      <LabelledButton />
-    </CallPortalRoot>,
-  );
-  const button = screen.getByRole("button", { name: "Microphone" });
-  const label = document.getElementById(
-    button.getAttribute("aria-labelledby")!,
-  );
-  expect(root.contains(label)).toBe(true);
-  root.remove();
-});
-
-test("waits for a root that is not available yet", () => {
-  render(
-    <CallPortalRoot root={null}>
-      <LabelledButton />
-    </CallPortalRoot>,
-  );
-  expect(screen.queryByRole("button", { name: "Microphone" })).toBeNull();
-});

component/CallPortalRoot.tsx

@@ -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 FC, type ReactNode } from "react";
-import { PortalRoot } from "@vector-im/compound-web";
-
-interface Props {
-  root: HTMLElement | null | undefined;
-  children: ReactNode;
-}
-
-/**
- * Where Compound floats the call's menus and tooltips. With no `root` the call
- * is not wrapped at all and they go into the host document's body; `null` is
- * Compound's "not available yet", and the floating parts wait for it.
- */
-export const CallPortalRoot: FC<Props> = ({ root, children }): ReactNode =>
-  root === undefined ? (
-    children
-  ) : (
-    <PortalRoot root={root}>{children}</PortalRoot>
-  );

component/ElementCall.module.css

@@ -34,18 +34,10 @@ component rather than a page makes. */
   -webkit-tap-highlight-color: transparent;
 }
 
-/* The call itself. It is a stacking context of its own, as the standalone
-page's `#root` is, so that the layers the call view uses for its header, footer
-and overlays stay below the modals and toasts, which are portalled into the
-root and carry no layer of their own.
-
-What Compound floats — tooltips, menus — is not in here at all: it goes into
-the host's body, as it would for any other component on the host's page, and is
-styled and layered by the host's copy of Compound. */
-.content {
-  display: flex;
-  flex-direction: column;
-  block-size: 100%;
+/* Compound's overlay container, which holds tooltips and popovers, has to fill
+the container for the elements inside it to be positioned against it. The
+standalone page does the same for the container under `#root`. */
+.root > [data-overlay-container] {
   position: relative;
-  isolation: isolate;
+  block-size: 100%;
 }

component/api.ts

@@ -1,138 +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.
-*/
-
-/**
- * EXPERIMENTAL
- *
- * What a host needs in order to talk about Element Call, without Element Call:
- * the component's props and the types they are made of, the handle and the
- * host bridge, the intents a call can be started with and the configuration
- * each implies.
- *
- * This is an entry point of its own, `@element-hq/element-call-component/api`,
- * so that a host can import it on a path that must stay light — a call model
- * that needs `BackgroundStyle.Solid` as a value, say — and load the component
- * itself, and everything it brings, only when a call is shown. The main entry
- * point re-exports all of it, so a host that does not care may import
- * everything from there.
- *
- * Nothing in here may reach anything that is not a type or a constant: the
- * point of this module is what it does not import.
- */
-
-import type { Ref } from "react";
-import type { MatrixClient } from "matrix-js-sdk";
-
-import type { UrlProperties } from "../src/UrlParams";
-import type { ElementCallHandle, ElementCallHostBridge } from "./host";
-import {
-  BackgroundStyle,
-  configurationForIntent,
-  HeaderStyle,
-  type UrlConfiguration,
-  UserIntent,
-} from "../src/UrlConfiguration";
-
-// How the host and Element Call talk to each other, and what they say
-export type { ElementCallHandle, ElementCallHostBridge } from "./host";
-export type { DeviceMuteRequest, DeviceMuteState } from "../src/HostBridge";
-export type { JoinCallData } from "../src/widget";
-// The deployment-wide configuration, as distinct from ElementCallConfiguration
-// below, which is per call
-export type { ConfigOptions } from "../src/config/ConfigOptions";
-// The values that appear in ElementCallConfiguration and in the intent, and
-// what each intent means by default
-export {
-  BackgroundStyle,
-  configurationForIntent,
-  HeaderStyle,
-  type UrlConfiguration,
-  UserIntent,
-};
-
-/**
- * How Element Call should behave. Everything is optional; anything left out
- * takes the default that {@link ElementCallProps.intent} implies.
- *
- * This is the behaviour a widget can be configured with through its URL, plus
- * the one fact about the call a host has a say in here, the background. The
- * rest of what a widget's URL carries — who the user is, how to reach the
- * homeserver, where to report analytics, the shared secret of a room that is
- * encrypted with one — a component host supplies by other routes, or not at
- * all; and what can change while the call is running, the theme and the
- * language, is a prop of its own.
- */
-export type ElementCallConfiguration = Partial<UrlConfiguration> &
-  Partial<Pick<UrlProperties, "background">>;
-
-export interface ElementCallProps {
-  /**
-   * The client to place the call with. Element Call does not authenticate
-   * anyone or manage a session of its own; this one is the host's.
-   */
-  client: MatrixClient;
-  /** The room to call in. The host's client must already know about it. */
-  roomId: string;
-  /**
-   * What the user asked for — whether they started the call or joined one that
-   * was already running, and whether it is a call in a group or a DM. Element
-   * Call decides what each of those means: whether to show the lobby first,
-   * whether to ring, and so on.
-   *
-   * Defaults to joining an existing group call, which is the most conservative
-   * reading, but a host that knows which button the user pressed should say so.
-   */
-  intent?: UserIntent;
-  /**
-   * How Element Call should behave, overriding whatever {@link intent} implies.
-   * A host that finds itself setting a lot of these probably wants a different
-   * intent instead.
-   *
-   * Compared by value, so it is fine to write this inline; only a change to
-   * what it says restarts anything.
-   */
-  config?: ElementCallConfiguration;
-  /**
-   * What Element Call tells the host while the call is running: that the user
-   * has joined or hung up, that it would like to be kept on screen, and so on.
-   * Without one, Element Call assumes nobody is listening.
-   */
-  hostBridge?: ElementCallHostBridge;
-  /**
-   * What the host tells Element Call: to hang up, to mute, to join. Available
-   * once the component has rendered.
-   */
-  ref?: Ref<ElementCallHandle>;
-  /**
-   * The theme to show Element Call in, `light` or `dark`. Left out, Element
-   * Call picks. Changes take effect at once, and cost nothing else.
-   */
-  theme?: string;
-  /**
-   * The language to show Element Call in, as a BCP 47 tag: one of the
-   * `supportedLanguages` the main entry point exports, or something that falls
-   * back to one (`de-AT` to `de`). Left out, the browser's language is used.
-   *
-   * Translations are one thing shared by every Element Call on the page, so
-   * the most recently set language wins for all of them.
-   */
-  language?: string;
-  /**
-   * Where the parts of Element Call that float above it — its menus and
-   * tooltips, which Compound portals out of the call — are rendered. Left out,
-   * they go into the host document's body, as they do for any other component
-   * on the host's page.
-   *
-   * A host that moves Element Call's DOM into another document, such as a
-   * Document Picture-in-Picture window, passes that document's body here so
-   * that a menu opens in the window its button is in. Changes take effect at
-   * once. `null` means the root is not available yet, as from a callback ref
-   * that has not fired: menus and tooltips wait for it rather than falling
-   * back to the body.
-   */
-  portalRoot?: HTMLElement | null;
-}

component/build/scopeStylesToRoot.ts

@@ -40,10 +40,10 @@ const IS_ROOT = `:where(${ROOT_SELECTOR})`;
  * Element Call as a component.
  *
  * As a page of its own, Element Call can style the document: normalize.css and
- * its own base styles speak of `html`, `body` and bare elements, and its custom
- * properties are declared on `:root`. As a component, all of that would land on
- * the host's document too. This rewrites every selector so that it matches only
- * the root or its descendants:
+ * Compound speak of `html`, `body` and bare elements, and the design tokens are
+ * declared on `:root`. As a component, all of that would land on the host's
+ * document too. This rewrites every selector so that it matches only the root
+ * or its descendants:
  *
  * - `html`, `body` and `:root` become the root element, which is what stands in
  *   for the document inside a host.
@@ -55,10 +55,9 @@ const IS_ROOT = `:where(${ROOT_SELECTOR})`;
  * CSS modules are scoped by their class names already, so only their selectors
  * that would match by element alone — `pre` rather than `.pre` — are touched.
  *
- * The root's custom properties are still inherited by everything inside it,
- * the way they were from `:root`. Compound's own stylesheet — the design
- * tokens, the component styles, the fonts — is not in this build at all: the
- * host supplies it, unscoped, along with its copy of Compound.
+ * The root's fonts and design tokens are still inherited by everything inside
+ * it, the way they were from `body` and `:root`, and `@font-face` declarations
+ * stay global, which they are by nature.
  */
 export function scopeStylesToRoot(): Plugin {
   return {

component/dev/main.tsx

@@ -9,16 +9,6 @@ import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { logger } from "matrix-js-sdk/lib/logger";
 
-// What a host provides along with its copy of Compound: its stylesheet, the
-// design tokens and the fonts they name. The component does not bundle them.
-import "@fontsource/inter/400.css";
-import "@fontsource/inter/500.css";
-import "@fontsource/inter/600.css";
-import "@fontsource/inter/700.css";
-import "@fontsource/inconsolata/400.css";
-import "@fontsource/inconsolata/700.css";
-import "@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css";
-import "@vector-im/compound-web/dist/style.css";
 import { type ConfigOptions, initializeElementCall } from "../index";
 import { Harness } from "./Harness";
 // After Element Call's, so that the host has the last word on its own page

component/index.tsx

@@ -17,37 +17,33 @@ Please see LICENSE in the repository root for full details.
  * host instead, or is confined to the container it is mounted in.
  */
 
-// The element defaults and custom properties every Element Call stylesheet
+// The design tokens, fonts and element defaults every Element Call stylesheet
 // builds on. Written for a page, they speak of `html`, `body` and bare
 // elements; the component build confines them, and every other stylesheet in
 // this bundle, to the root element below (see build/scopeStylesToRoot.ts), so
 // that the host's document is left as it was.
 //
-// Compound is not in here. The component uses the host's copy of it (a peer
-// dependency, left external by the build), and the host loads Compound's
-// stylesheet, design tokens and fonts along with it: what Compound floats into
-// the host's body — tooltips, menus — is then styled by the same stylesheet as
-// everything else there, and Element Call's root takes the tokens and fonts of
-// the theme class it carries, as any element on the host's page would.
-//
 // Where these land relative to the component stylesheets is the bundler's
 // choice — the standalone app puts them first, this build puts them in the
 // middle — so nothing in base.css may depend on winning or losing against a
 // component's own rules at equal specificity. It currently does not: what it
 // declares unlayered is custom properties on Element Call's root, which
-// components inherit rather than compete with.
+// components inherit rather than compete with, and everything from Compound
+// sits in a `@layer`, which loses to unlayered rules either way.
 import "../src/base.css";
 
 import {
   type FC,
   type JSX,
   type ReactNode,
+  type Ref,
   useEffect,
   useLayoutEffect,
   useMemo,
   useRef,
   useState,
 } from "react";
+import { type MatrixClient } from "matrix-js-sdk";
 import { logger } from "matrix-js-sdk/lib/logger";
 import { I18nextProvider } from "react-i18next";
 import { TooltipProvider } from "@vector-im/compound-web";
@@ -66,8 +62,10 @@ import { RootElementProvider, useRootElement } from "../src/RootElementContext";
 import {
   configurationForIntent,
   componentProperties,
+  type UrlConfiguration,
   type UrlParams,
   UrlParamsProvider,
+  type UrlProperties,
   UserIntent,
   useUrlParams,
 } from "../src/UrlParams";
@@ -81,17 +79,102 @@ import { i18n } from "../src/utils/i18n";
 import { useTheme } from "../src/useTheme";
 import { useStableValue } from "../src/useStableValue";
 import styles from "./ElementCall.module.css";
-import { useComponentHostBridge } from "./host";
-import { CallPortalRoot } from "./CallPortalRoot";
-import { type ElementCallProps } from "./api";
+import {
+  type ElementCallHandle,
+  type ElementCallHostBridge,
+  useComponentHostBridge,
+} from "./host";
 import { supportedLanguages, translationsBackend } from "./localization";
 
 // The languages Element Call can be shown in
 export { supportedLanguages } from "./localization";
-// Everything a host needs to talk about Element Call — the props, the handle,
-// the host bridge, the intents and what each means — also available without
-// the component itself from `@element-hq/element-call-component/api`
-export * from "./api";
+
+// How the host and Element Call talk to each other, and what they say
+export { type ElementCallHandle, type ElementCallHostBridge } from "./host";
+export {
+  type DeviceMuteRequest,
+  type DeviceMuteState,
+} from "../src/HostBridge";
+export { type JoinCallData } from "../src/widget";
+// The deployment-wide configuration, as distinct from ElementCallConfiguration
+// above, which is per call
+export { type ConfigOptions } from "../src/config/ConfigOptions";
+// The values that appear in ElementCallConfiguration and in the intent
+export {
+  BackgroundStyle,
+  HeaderStyle,
+  UserIntent,
+  type UrlConfiguration,
+} from "../src/UrlParams";
+
+/**
+ * How Element Call should behave. Everything is optional; anything left out
+ * takes the default that {@link ElementCallProps.intent} implies.
+ *
+ * This is the behaviour a widget can be configured with through its URL, plus
+ * the one fact about the call a host has a say in here, the background. The
+ * rest of what a widget's URL carries — who the user is, how to reach the
+ * homeserver, where to report analytics, the shared secret of a room that is
+ * encrypted with one — a component host supplies by other routes, or not at
+ * all; and what can change while the call is running, the theme and the
+ * language, is a prop of its own.
+ */
+export type ElementCallConfiguration = Partial<UrlConfiguration> &
+  Partial<Pick<UrlProperties, "background">>;
+
+export interface ElementCallProps {
+  /**
+   * The client to place the call with. Element Call does not authenticate
+   * anyone or manage a session of its own; this one is the host's.
+   */
+  client: MatrixClient;
+  /** The room to call in. The host's client must already know about it. */
+  roomId: string;
+  /**
+   * What the user asked for — whether they started the call or joined one that
+   * was already running, and whether it is a call in a group or a DM. Element
+   * Call decides what each of those means: whether to show the lobby first,
+   * whether to ring, and so on.
+   *
+   * Defaults to joining an existing group call, which is the most conservative
+   * reading, but a host that knows which button the user pressed should say so.
+   */
+  intent?: UserIntent;
+  /**
+   * How Element Call should behave, overriding whatever {@link intent} implies.
+   * A host that finds itself setting a lot of these probably wants a different
+   * intent instead.
+   *
+   * Compared by value, so it is fine to write this inline; only a change to
+   * what it says restarts anything.
+   */
+  config?: ElementCallConfiguration;
+  /**
+   * What Element Call tells the host while the call is running: that the user
+   * has joined or hung up, that it would like to be kept on screen, and so on.
+   * Without one, Element Call assumes nobody is listening.
+   */
+  hostBridge?: ElementCallHostBridge;
+  /**
+   * What the host tells Element Call: to hang up, to mute, to join. Available
+   * once the component has rendered.
+   */
+  ref?: Ref<ElementCallHandle>;
+  /**
+   * The theme to show Element Call in, `light` or `dark`. Left out, Element
+   * Call picks. Changes take effect at once, and cost nothing else.
+   */
+  theme?: string;
+  /**
+   * The language to show Element Call in, as a BCP 47 tag: one of
+   * {@link supportedLanguages}, or something that falls back to one (`de-AT`
+   * to `de`). Left out, the browser's language is used.
+   *
+   * Translations are one thing shared by every Element Call on the page, so
+   * the most recently set language wins for all of them.
+   */
+  language?: string;
+}
 
 /**
  * Prepares the things Element Call needs before it can be shown: translations,
@@ -155,7 +238,6 @@ export const ElementCall: FC<ElementCallProps> = ({
   ref,
   theme,
   language,
-  portalRoot,
 }): ReactNode => {
   const hostBridge = useComponentHostBridge(suppliedHostBridge, ref, theme);
 
@@ -239,40 +321,34 @@ export const ElementCall: FC<ElementCallProps> = ({
         <UrlParamsProvider value={params}>
           <div ref={setContainer} className={styles.root}>
             {ready && (
-              // Stands in for the standalone page's `#root`: see `.content`
-              // in ElementCall.module.css
-              <div className={styles.content}>
-                <CallPortalRoot root={portalRoot}>
-                  <RootElementProvider value={container}>
-                    {/* Whatever goes wrong in here is shown in here. Left to
-                    propagate, an error would unmount the host's own tree. */}
-                    <ErrorBoundary
-                      fallback={(error) => <ErrorPage error={error} />}
-                      // A broken call should not hold the host on screen
-                      onError={() => void hostBridge.setAlwaysOnScreen(false)}
-                    >
-                      <Decoration>
-                        <TooltipProvider>
-                          <ClientProvider client={client}>
-                            <MediaDevicesContext value={mediaDevices}>
-                              <ProcessorProvider>
-                                <CallView
-                                  client={client}
-                                  rtcSession={rtcSession}
-                                  isPasswordlessUser={false}
-                                  confineToRoom={params.confineToRoom}
-                                  preload={params.preload}
-                                  skipLobby={params.skipLobby}
-                                />
-                              </ProcessorProvider>
-                            </MediaDevicesContext>
-                          </ClientProvider>
-                        </TooltipProvider>
-                      </Decoration>
-                    </ErrorBoundary>
-                  </RootElementProvider>
-                </CallPortalRoot>
-              </div>
+              <RootElementProvider value={container}>
+                {/* Whatever goes wrong in here is shown in here. Left to
+                  propagate, an error would unmount the host's own tree. */}
+                <ErrorBoundary
+                  fallback={(error) => <ErrorPage error={error} />}
+                  // A broken call should not hold the host on screen
+                  onError={() => void hostBridge.setAlwaysOnScreen(false)}
+                >
+                  <Decoration>
+                    <TooltipProvider>
+                      <ClientProvider client={client}>
+                        <MediaDevicesContext value={mediaDevices}>
+                          <ProcessorProvider>
+                            <CallView
+                              client={client}
+                              rtcSession={rtcSession}
+                              isPasswordlessUser={false}
+                              confineToRoom={params.confineToRoom}
+                              preload={params.preload}
+                              skipLobby={params.skipLobby}
+                            />
+                          </ProcessorProvider>
+                        </MediaDevicesContext>
+                      </ClientProvider>
+                    </TooltipProvider>
+                  </Decoration>
+                </ErrorBoundary>
+              </RootElementProvider>
             )}
           </div>
         </UrlParamsProvider>

component/package.json

@@ -25,10 +25,6 @@
       "types": "./dist/types/component/index.d.ts",
       "default": "./dist/element-call.js"
     },
-    "./api": {
-      "types": "./dist/types/component/api.d.ts",
-      "default": "./dist/api.js"
-    },
     "./style.css": "./dist/element-call.css"
   },
   "sideEffects": [
@@ -38,8 +34,7 @@
     "prepare": "cd .. && pnpm install --frozen-lockfile && pnpm build:component"
   },
   "peerDependencies": {
-    "@vector-im/compound-design-tokens": "^11.0.0",
-    "@vector-im/compound-web": "^10.3.1",
+    "livekit-client": "^2.18.1",
     "matrix-js-sdk": "*",
     "react": "^19",
     "react-dom": "^19"

component/tsconfig.build.json

@@ -13,8 +13,8 @@
     "rootDir": "..",
     "outDir": "./dist/types"
   },
-  // The entry points, plus the ambient declarations (CSS modules, `?react` SVGs,
-  // `import.meta.env`, …) that the sources they reach rely on.
-  "include": ["./index.tsx", "./api.ts", "../src/@types/*.d.ts"],
+  // The entry point, plus the ambient declarations (CSS modules, `?react` SVGs,
+  // `import.meta.env`, …) that the sources it reaches rely on.
+  "include": ["./index.tsx", "../src/@types/*.d.ts"],
   "exclude": []
 }

config/config.devenv.json

@@ -7,6 +7,7 @@
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_session": {
+    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   }

config/config.sample.json

@@ -11,6 +11,7 @@
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_mode": "compatibility",
   "matrix_rtc_session": {
+    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   }

config/config_netlify_preview.json

@@ -7,6 +7,7 @@
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_session": {
+    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   },

config/config_netlify_preview_sdk.json

@@ -7,6 +7,7 @@
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_session": {
+    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,
     "network_error_retry_ms": 100
   }

docker-compose-dev.yml

@@ -3,7 +3,7 @@ networks:
 
 services:
   auth-service:
-    image: ghcr.io/element-hq/lk-jwt-service:0.8.0
+    image: ghcr.io/element-hq/lk-jwt-service:0.7.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.8.0
+    image: ghcr.io/element-hq/lk-jwt-service:0.7.0
     pull_policy: always
     hostname: auth-server-1
     environment:
@@ -157,9 +157,6 @@ services:
     pull_policy: always
     volumes:
       - ./backend/ew.test.config.json:/app/config.json:Z
-      # Replaces the Element Call widget bundled in the image with the embedded
-      # build of the current sources. See "Backend" in README.md.
-      - ./dist-embedded:/app/widgets/element-call:ro,Z
     environment:
       ELEMENT_WEB_PORT: 8081
     ports:
@@ -172,9 +169,6 @@ services:
     pull_policy: always
     volumes:
       - ./backend/ew.test.othersite.config.json:/app/config.json:Z
-      # Replaces the Element Call widget bundled in the image with the embedded
-      # build of the current sources. See "Backend" in README.md.
-      - ./dist-embedded:/app/widgets/element-call:ro,Z
     environment:
       ELEMENT_WEB_PORT: 18081
     ports:

docker-compose-playwright.yml

@@ -19,7 +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:d43e8d26361b546a9ceed13602cc13892ff212df7024b2282147ee8ec370977e
+    image: ghcr.io/element-hq/element-web:develop@sha256:3993d53bc2c784c0376b86e00230aef0ee2c9a705b2166e9229555117e8db167
   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:d43e8d26361b546a9ceed13602cc13892ff212df7024b2282147ee8ec370977e
+    image: ghcr.io/element-hq/element-web:develop@sha256:3993d53bc2c784c0376b86e00230aef0ee2c9a705b2166e9229555117e8db167

docs/agents/architecture.md

@@ -76,12 +76,4 @@ Code that builds in only one is a bug.
 - `build:component` — `@element-hq/element-call-component`, sources in `component/`
   (its own pnpm project; run pnpm from the repo root). Host API is in the README;
   `pnpm lint:externals` rejects an import of a `react` / `react-dom` /
-  `matrix-js-sdk` / `@vector-im/compound-web` /
-  `@vector-im/compound-design-tokens` subpath the externals list omits.
-  `livekit-client` is bundled on purpose: no host imports it, and the pinned
-  version travels with the component.
-  Compound's stylesheets are loaded by `src/index.css` for the page and by the
-  host for the component, never by `src/base.css`. Two entry
-  points: `index.tsx` (the component) and `api.ts` (types, enums and
-  `configurationForIntent`, for a host that must not load the component). `api.ts`
-  may only reach types and constants — `src/UrlConfiguration.ts`, not `UrlParams`.
+  `matrix-js-sdk` / `livekit-client` subpath the externals list omits.

docs/agents/code-style.md

@@ -31,28 +31,7 @@ copy, the PR says so.
 - **Suites.** Test cases first, helpers below. Older suites invert this; follow the
   rule in new ones, don't reorder old ones.
 - **Names.** What a thing means, not what it is made of: `naturalLayout$`, not
-  `computedLayout$`.
-
-## Comments
-
-No comment is the default. One earns its place by giving a reason the code
-cannot: a platform quirk, an outside constraint, a trap that looks like a
-simplification.
-
-- Say the reason, then stop. Test each sentence: does the reason still stand
-  without it? If so, cut it. Most reasons fit on a line, so a long comment is
-  worth a second look — it is usually carrying something that isn't one.
-- Write about the line the comment sits on, in terms of what the code does
-  there — leave layout to the stylesheet and measurements to the design.
-- Name the condition ("where the platform can't route audio"), not the browser
-  or the spec entry.
-- Put history — what was tried, removed or rejected, the dev journal — in the
-  commit or the PR description.
-- In tests, comment only structure that looks wrong but isn't: batching, timers,
-  why this scroll position.
-
-Before keeping one: would it still be true after a CSS change or a refactor of
-its caller? If not, cut it.
+  `computedLayout$`. Comments explain why, never what.
 
 ## TypeScript, React and RxJS idiom win on a clash
 

docs/linking.md

@@ -60,21 +60,6 @@ git config --local core.hooksPath .githooks
 
 This will add the hook path for this repository only to .gihooks. which is a tracked (by git) folder containing the pre-commit hook.
 
-## Testing against a matrix-js-sdk branch in CI
-
-Linking covers local development. In CI, `scripts/layered.sh` plays the same
-role for `matrix-js-sdk`: after the usual frozen install, `scripts/fetchdep.sh`
-looks for a matrix-js-sdk branch with the same name as the pull request's head
-branch (in the fork first, when the pull request comes from one). If there is
-one, it is cloned, packed and installed over the locked version. If there is
-none, the install stays as `pnpm-lock.yaml` pins it.
-
-This means a change that needs a not yet merged matrix-js-sdk change can be tested
-by giving both branches the same name. This mirrors how element-web tests against
-matrix-js-sdk. Once the matrix-js-sdk branch is merged and deleted, the pull
-request falls back to the lockfile and needs a lockfile bump to stay green,
-which is also what keeps `main` consistent after the merge.
-
 ## Background
 
 Information, why this approach is used can be found in the [linking concept reasoning](./linking_concept_reasoning.md) document.

docs/matrix_rtc_modes.md

@@ -24,7 +24,7 @@ homeserver does not support sticky events. This is the default.
 MSC4354 and all clients on v0.17.0 or later. The local membership requests its
 token from the Matrix 2.0 JWT endpoint of the
 [MatrixRTC Authorization Service](https://github.com/element-hq/lk-jwt-service)
-and identifies the room by a hashed identity instead of the Matrix `room_id`.
+and identifies the room by a hashed identity instead of a `livekit_alias`.
 (Remote memberships always try the new endpoint first and fall back to the
 legacy one, so remote participants can be on either.)
 
@@ -46,11 +46,3 @@ Valid values are `compatibility` and `matrix_2_0`; an invalid value is
 ignored (with a warning) and the user's choice applies. Pinning `matrix_2_0` on a
 homeserver without sticky event support makes joining fail with a "sticky events
 required" error.
-
-A build can change the default mode, for setups without a `config.json` by setting
-`VITE_MATRIX_RTC_MODE` at build time:
-
-```sh
-VITE_MATRIX_RTC_MODE=matrix_2_0 pnpm build:embedded
-```
-

docs/url_params.md

@@ -61,6 +61,7 @@ These parameters are relevant to both [widget](./embedded_standalone.md) and [st
 | `homeserver`                                   |                                                                                                                                                                    | Not applicable                                                                                    | No                           | Homeserver for registering a new (guest) user, configures non-default guest user server when creating a spa link.                                                                                                                                                                                                                                                                                   |
 | `lang`                                         | [BCP 47](https://www.rfc-editor.org/info/bcp47) code                                                                                                               | No                                                                                                | No                           | The language the app should use.                                                                                                                                                                                                                                                                                                                                                                    |
 | `password`                                     |                                                                                                                                                                    | No                                                                                                | No                           | E2EE password when using a shared secret. (For individual sender keys in embedded mode this is not required.)                                                                                                                                                                                                                                                                                       |
+| `perParticipantE2EE`                           | `true` or `false`                                                                                                                                                  | No, defaults to `false`                                                                           | No, defaults to `false`      | Enables per participant encryption with Keys exchanged over encrypted matrix room messages.                                                                                                                                                                                                                                                                                                         |
 | `controlledAudioDevices`                       | `true` or `false`                                                                                                                                                  | No, defaults to `false`                                                                           | No, defaults to `false`      | Whether the [global JS controls for audio devices](./controls.md#audio-devices) should be enabled, allowing the list of audio devices to be controlled by the app hosting Element Call.                                                                                                                                                                                                             |
 | `roomId`                                       | [Matrix Room ID](https://spec.matrix.org/v1.12/appendices/#room-ids)                                                                                               | Yes                                                                                               | No                           | Anything about what room we're pointed to should be from useRoomIdentifier which parses the path and resolves alias with respect to the default server name, however roomId is an exception as we need the room ID in embedded widget mode, and not the room alias (or even the via params because we are not trying to join it). This is also not validated, where it is in `useRoomIdentifier()`. |
 | `showControls`                                 | `true` or `false`                                                                                                                                                  | No, defaults to `true`                                                                            | No, defaults to `true`       | Displays controls like mute, screen-share, invite, and hangup buttons during a call.                                                                                                                                                                                                                                                                                                                |

locales/en/app.json

@@ -59,10 +59,10 @@
   "developer_mode": {
     "always_show_iphone_earpiece": "Show iPhone earpiece option on all platforms",
     "crypto_version": "Crypto version: {{version}}",
-    "custom_transport": {
-      "current": "Currently set to: ",
+    "custom_livekit_url": {
+      "current_url": "Currently set to: ",
       "from_config": "Currently, no overwrite is set. Url from config is used.",
-      "label": "Custom transport JSON",
+      "label": "Custom Livekit-url",
       "reset": "Reset overwrite",
       "save": "Save",
       "saving": "Saving..."
@@ -166,7 +166,7 @@
   "microphone_level": {
     "label": "Microphone level",
     "no_device": "No microphone found. Connect one, then try again.",
-    "permission_denied": "Microphone access is blocked. Allow it, then try again.",
+    "permission_denied": "Element Call cannot use your microphone. Allow access in your browser settings.",
     "value": "{{level}} of {{max}}"
   },
   "microphone_off": "Microphone off",

package.json

@@ -8,7 +8,7 @@
     "dev:embedded": "vite --config vite-embedded.config.js",
     "dev:component": "vite --config vite-component-dev.config.ts",
     "build": "pnpm build:full",
-    "build:full": "node --max-old-space-size=16384 node_modules/vite/bin/vite.js build",
+    "build:full": "NODE_OPTIONS=--max-old-space-size=16384 vite build",
     "build:full:production": "pnpm build:full",
     "build:full:development": "pnpm build:full --mode development",
     "build:embedded": "pnpm build:full --config vite-embedded.config.js",
@@ -83,8 +83,8 @@
     "@types/sdp-transform": "^2.4.5",
     "@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.4.0",
+    "@vector-im/compound-design-tokens": "^10.0.0",
+    "@vector-im/compound-web": "^10.0.0",
     "@vitejs/plugin-react": "^6.0.2",
     "@vitest/browser-playwright": "^4.1.5",
     "@vitest/coverage-v8": "^4.0.18",
@@ -107,6 +107,7 @@
     "matrix-widget-api": "^1.18.0",
     "node-stdlib-browser": "^1.3.1",
     "normalize.css": "^8.0.1",
+    "observable-hooks": "^4.2.3",
     "oxfmt": "^0.66.0",
     "oxlint": "^1.70.0",
     "oxlint-tsgolint": "^0.25.0",
@@ -129,6 +130,7 @@
     "uuid": "^14.0.0",
     "vaul": "^1.0.0",
     "vite": "^8.0.0",
+    "vite-plugin-generate-file": "^0.3.0",
     "vite-plugin-html": "^3.2.2",
     "vite-plugin-node-polyfills": "^0.28.0",
     "vite-plugin-node-stdlib-browser": "^0.2.1",

playwright.config.ts

@@ -38,20 +38,8 @@ export default defineConfig({
   retries: process.env.CI ? 2 : 0,
   /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : undefined,
-  /**
-   * 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; `html` is uploaded as
-   * an artifact and must never try to open a browser there.
-   */
-  reporter: process.env.CI
-    ? [["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,
-  /* Under the job's 60 minute limit, so a hung run still ends with a report. */
-  globalTimeout: process.env.CI ? 50 * 60 * 1000 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: "html",
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */

playwright/audio-menu.spec.ts

@@ -18,9 +18,11 @@ test.describe("the quick audio menu", () => {
     await joinACall(page, "Menu user", "Audio menu");
     await openAudioMenu(page);
 
+    // The speaker list is what the settings modal used to be the only home of.
     await expect(page.getByRole("group", { name: "Speaker" })).toBeVisible();
     await expect(page.getByRole("group", { name: "Microphone" })).toBeVisible();
-    // By name, not count: the browser adds its own fake output and a Default.
+    // Named rather than counted: the browser contributes its own fake output
+    // and a "Default" entry, so a total would be a fact about the browser.
     for (const n of [1, 2, 3])
       await expect(
         page
@@ -28,6 +30,8 @@ test.describe("the quick audio menu", () => {
           .getByRole("menuitemradio", { name: `Fake Speaker ${n}` }),
       ).toBeVisible();
 
+    // Only one entry of a kind is marked, and the meter reports a number
+    // rather than a colour.
     await expect(
       page.getByRole("menuitemradio", { checked: true }),
     ).toHaveCount(2);
@@ -36,7 +40,10 @@ test.describe("the quick audio menu", () => {
     await expect(meter).toHaveAttribute("aria-valuenow", /\d+/);
     await expect(meter).toHaveAttribute("aria-valuetext", /\d+ of \d+/);
 
-    // Both browsers here can route audio; the platform that can't is a unit check.
+    // Both browsers in the matrix can route audio to a chosen output, so the
+    // section offers a real choice. The case where a platform cannot — Safari,
+    // and anything without setSinkId — is covered by a unit check, since no
+    // browser here can reach it.
     await expect(
       page
         .getByRole("group", { name: "Speaker" })
@@ -48,7 +55,7 @@ test.describe("the quick audio menu", () => {
   test("moves the microphone and the speaker without disturbing the call", async ({
     browser,
   }) => {
-    // Two browsers and a real call.
+    // Two browsers, two joins and a real call between them.
     test.slow();
     const hostContext = await browser.newContext({ reducedMotion: "reduce" });
     const host = await hostContext.newPage();
@@ -66,7 +73,9 @@ test.describe("the quick audio menu", () => {
     await openAudioMenu(host);
     await selectDevice(host, "Speaker", "Fake Speaker 2");
 
-    // Not a rejoin: neither side drops, and the guest still has both tiles.
+    // The point of the criterion: the switch is not a rejoin. Neither side
+    // sees the call drop, and the guest still has both tiles — so the host
+    // never left and came back.
     await expect(
       host.getByRole("dialog", { name: "Reconnecting…" }),
     ).not.toBeVisible();
@@ -83,7 +92,7 @@ test.describe("the quick audio menu", () => {
   test("keeps the meter moving while muted, and sends nothing", async ({
     browser,
   }) => {
-    // Two browsers and a real call.
+    // Two browsers, two joins and a real call between them.
     test.slow();
     const hostContext = await browser.newContext({ reducedMotion: "reduce" });
     const host = await hostContext.newPage();
@@ -101,12 +110,15 @@ test.describe("the quick audio menu", () => {
     await expect(mute).toHaveAttribute("aria-checked", "false");
     await openAudioMenu(host);
 
+    // The microphone is held open while muted, so the meter still reports the
+    // hardware. The mute control is what says nothing is being transmitted.
     const meter = host.getByRole("meter", { name: "Microphone level" });
     await expect(meter).toBeVisible();
-    // By test id: the modal menu hides the rest of the call from the a11y tree.
+    // Queried by test id, not by role: the menu is modal, so Radix takes the
+    // rest of the call out of the accessibility tree while it is open.
     await expect(mute).toHaveAttribute("aria-checked", "false");
     await expect(mute).toBeVisible();
-    // And the guest is shown the mute.
+    // And the listener is told so, rather than being left to guess from silence.
     await expect(
       guest.getByTestId("videoTile").filter({ hasText: "Muted host" }),
     ).toBeVisible();
@@ -125,8 +137,9 @@ test.describe("the quick audio menu", () => {
     const meter = page.getByRole("meter", { name: "Microphone level" });
     await expect(meter).toBeVisible();
 
-    // Scrolled so the microphones start at the top: only there does a pinned
-    // meter differ from one that is simply last.
+    // Scrolled so the microphones start at the top of the list and run past its
+    // bottom: the position that tells a pinned meter from one that merely
+    // happens to be last.
     const list = page.locator("[role='menu'] div[role='none']").first();
     await list.evaluate((element) => {
       const group = element.querySelector("[role='group'][aria-label*='icro']");
@@ -137,6 +150,7 @@ test.describe("the quick audio menu", () => {
 
     await expect(meter).toBeInViewport();
     await expectPinnedInside(meter, list);
+    // Every entry stays reachable, which is what the scroll is for.
     await expect(
       page.getByRole("menuitemradio", { name: "Fake Microphone 20" }),
     ).toBeVisible();
@@ -155,14 +169,16 @@ test.describe("the quick audio menu", () => {
     await openAudioMenu(page);
 
     const first = page.getByRole("menuitemradio").first();
-    // Opened by pointer: no ring, though Radix has moved focus into the menu.
+    // Opened by pointer, so no ring, even though Radix has moved focus into the
+    // menu already.
     await expect.poll(async () => outlineWidth(first)).toBe(0);
 
     await page.keyboard.press("ArrowDown");
     const focused = page.locator("[role='menuitemradio']:focus");
     await expect.poll(async () => outlineWidth(focused)).toBeGreaterThan(0);
 
-    // And the pointer takes it away again.
+    // The pointer takes it away again: the menu focuses whatever it is over, so
+    // a ring that followed focus alone would trail the mouse.
     await first.hover();
     await expect.poll(async () => outlineWidth(focused)).toBe(0);
   });
@@ -177,7 +193,8 @@ async function joinACall(
   await page.goto("/");
   await SpaHelpers.createCall(page, userName, callName, true);
   await expect(page.getByTestId("name_tag")).toContainText(userName);
-  // The media controls stay disabled until devices have enumerated.
+  // The media controls stay disabled until the devices have enumerated, and
+  // every test here drives them.
   await expect(page.getByTestId("incall_mute")).toBeEnabled({
     timeout: 10_000,
   });
@@ -197,12 +214,19 @@ async function selectDevice(
     .getByRole("group", { name: section })
     .getByRole("menuitemradio", { name });
   await item.click();
-  // Selecting doesn't close the menu, so dismiss it.
+  // Selecting does not close the menu — the component prevents the default so
+  // the list survives a mis-click — so it is dismissed explicitly.
   await page.keyboard.press("Escape");
   await expect(page.getByRole("menu")).not.toBeVisible();
 }
 
-/** Asserts the meter sits within the scrollport and inside the menu's frame. */
+/**
+ * Asserts the meter sits within the scrollport, and inside the menu's frame.
+ *
+ * The meter is the one opaque element in the menu, so it is the one thing that
+ * can paint over the border. Whether it actually does needs a screenshot; this
+ * pins the geometry that decides it.
+ */
 async function expectPinnedInside(
   meter: Locator,
   list: Locator,
@@ -219,7 +243,7 @@ async function expectPinnedInside(
   expect(meterBox.x + meterBox.width).toBeLessThan(frame.x + frame.width);
 }
 
-/** Painted outline width, in px. */
+/** The painted outline width in pixels, however the stylesheet spells it. */
 async function outlineWidth(item: Locator): Promise<number> {
   if ((await item.count()) === 0) return 0;
   return item.first().evaluate((element) => {

playwright/component/audio-menu.spec.ts

@@ -11,12 +11,22 @@ import { createUserAndRoom, resizeContainer, startHarness } from "./harness.ts";
 import { installFakeDevices } from "../utils/fake-devices.ts";
 
 /**
- * The device menu with Element Call as a component in a host page, where the
- * portalled menu must be sized against the call, not the window. Driven from
- * the lobby: it builds the same menu, without two connections' worth of flake.
+ * The device menu where Element Call is a component in a host's page rather
+ * than the whole of one.
+ *
+ * This is the case the stylesheets cannot describe: the menu is portalled to
+ * the document, so a container query and a viewport unit both measure the wrong
+ * thing — the first has no container to resolve against out there, the second
+ * measures a page Element Call does not own. The menu has to be sized against
+ * the space the call is actually drawn in.
+ *
+ * Driven from the lobby rather than a joined call. The footer builds the same
+ * menu from the same device behaviours in both, and the container is the same
+ * size either way, so joining would only add two connections' worth of flake.
  */
 
-// Sign-in, crypto setup and sync happen twice before anything shows.
+// Signing in, setting up crypto and syncing happen twice before anything is on
+// screen, as in component-call.spec.ts
 test.describe.configure({ timeout: 180_000 });
 
 test("sizes the device list against the call, not the window", async ({
@@ -27,7 +37,8 @@ test("sizes the device list against the call, not the window", async ({
   const panes = await startHarness(page, username, roomId);
   const pane = panes.first();
 
-  // A short call in a much taller page.
+  // A short call in a much taller page: the difference between measuring the
+  // call and measuring the window.
   const container = pane.getByTestId("call-container");
   await resizeContainer(container, { width: 900, height: 400 });
   await expect(pane.getByTestId("lobby_joinCall")).toBeVisible({
@@ -39,6 +50,8 @@ test("sizes the device list against the call, not the window", async ({
   const windowHeight = page.viewportSize()!.height;
   const listHeight = (await list.boundingBox())!.height;
 
+  // Sized against the call. Were it sized against the window the list would be
+  // half as tall again, and the assertion below would not be able to tell.
   expect(callHeight).toBeLessThan(windowHeight * 0.75);
   expect(listHeight).toBeLessThanOrEqual(callHeight);
   expect(listHeight).toBeLessThan(windowHeight * 0.6);
@@ -59,7 +72,9 @@ test("follows the call area when the host resizes it", async ({ page }) => {
   const list = await openDeviceList(page, pane);
   const whenShort = (await list.boundingBox())!.height;
 
-  // The host grows the call while the menu is open.
+  // The host grows the space Element Call is drawn in while the menu is open —
+  // a panel opening, a window dragged, a phone turned. A bound taken once on
+  // opening would still describe the smaller call.
   await resizeContainer(container, { width: 900, height: 700 });
   await expect
     .poll(async () => (await list.boundingBox())!.height)
@@ -73,13 +88,15 @@ test("keeps every device reachable in a small container", async ({ page }) => {
   const pane = panes.first();
 
   const container = pane.getByTestId("call-container");
+  // Narrow as well as short, which is where entries get pushed out of reach.
   await resizeContainer(container, { width: 400, height: 360 });
   await expect(pane.getByTestId("lobby_joinCall")).toBeVisible({
     timeout: 60_000,
   });
 
   const list = await openDeviceList(page, pane);
-  // More devices than fit, so the list must scroll.
+  // More devices than the space allows, so the list has to scroll rather than
+  // put entries somewhere they cannot be got at.
   expect(await list.evaluate((el) => el.scrollHeight > el.clientHeight)).toBe(
     true,
   );
@@ -87,12 +104,14 @@ test("keeps every device reachable in a small container", async ({ page }) => {
   const last = page.getByRole("menuitemradio", { name: "Fake Microphone 20" });
   await last.scrollIntoViewIfNeeded();
   await expect(last).toBeInViewport();
-  // Reachable means clickable: the menu may be drawn outside the call area.
+  // Reachable means usable, not merely painted: D11 accepts that the menu may
+  // be drawn outside the call area, so this asserts reach rather than
+  // containment.
   await last.click();
   await expect(last).toHaveAttribute("aria-checked", "true");
 });
 
-test("tracks the focus source of its own call, not the page", async ({
+test("tracks the focus modality of its own call, not the page", async ({
   page,
 }) => {
   await installFakeDevices(page);
@@ -105,31 +124,42 @@ test("tracks the focus source of its own call, not the page", async ({
     timeout: 60_000,
   });
   await openDeviceList(page, pane);
+  // The menu owns the modality, because every item it can focus has to answer
+  // to it — the device rows and the camera menu's blur toggle alike.
   const menu = page.getByRole("menu");
 
-  // Asserted on the attribute: the component build's scoped stylesheet doesn't
-  // reach the portalled menu, so its ring can't be read here.
-  await expect(menu).toHaveAttribute("data-focus-source", "pointer");
+  // Asserted on the attribute rather than the painted ring, which cannot be
+  // read here: the menu is portalled outside the call root, and the component
+  // build scopes the stylesheet to it, so neither the ring nor the rule that
+  // suppresses the browser's own reaches this menu. The paint is asserted
+  // standalone instead — in the story and in audio-menu.spec.ts. What is on
+  // trial here is which call the tracking answers for.
+  await expect(menu).toHaveAttribute("data-focus-modality", "pointer");
 
-  // A key pressed in the other call says nothing about this menu.
+  // A key pressed in the other call on this page — or anywhere in the host's
+  // own page — says nothing about how this menu is being used.
   await other.evaluate((element) =>
     element.dispatchEvent(
       new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }),
     ),
   );
-  await expect(menu).toHaveAttribute("data-focus-source", "pointer");
+  await expect(menu).toHaveAttribute("data-focus-modality", "pointer");
 
+  // A key pressed in this menu does.
   await page.keyboard.press("ArrowDown");
-  await expect(menu).toHaveAttribute("data-focus-source", "keyboard");
+  await expect(menu).toHaveAttribute("data-focus-modality", "keyboard");
 });
 
-/** Opens a component's microphone menu and returns its device list. */
+/**
+ * Opens the microphone menu of one component and returns its scrolling device
+ * list, which lives outside the component: the menu is portalled to the page.
+ */
 async function openDeviceList(page: Page, pane: Locator): Promise<Locator> {
   await pane
     .getByRole("button", { name: "Microphone" })
     .click({ timeout: 60_000 });
   await expect(page.getByRole("menu")).toBeVisible();
-  const list = page.getByRole("menu").getByTestId("device-list");
+  const list = page.locator("[role='menu'] div[role='none']").first();
   await expect(list).toBeVisible();
   return list;
 }

playwright/component/harness.ts

@@ -92,12 +92,6 @@ export async function expectWithin(
   outer: Locator,
 ): Promise<void> {
   await expect(inner).toBeVisible();
-  // Wait for animations to settle.
-  await inner.evaluate(async (element) => {
-    for (const animation of element.getAnimations({ subtree: true }))
-      await animation.finished;
-  });
-
   const innerBox = await inner.boundingBox();
   const outerBox = await outer.boundingBox();
   if (innerBox === null || outerBox === null)

playwright/errors.spec.ts

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { expect, test } from "@playwright/test";
 
-import { createJWTToken } from "./fixtures/jwt-token";
+import { createJTWToken } from "./fixtures/jwt-token";
 
 test("Should show error screen if fails to get JWT token", async ({ page }) => {
   await page.goto("/");
@@ -95,7 +95,7 @@ test("Should show error screen if call creation is restricted", async ({
         contentType: "application/json",
         body: JSON.stringify({
           url: "wss://badurltotricktest/livekit/sfu",
-          jwt: createJWTToken("@fake:user", "!fake:room"),
+          jwt: createJTWToken("@fake:user", "!fake:room"),
         }),
       }),
   );

playwright/fixtures/jwt-token.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-export function createJWTToken(sub: string, room: string): string {
+export function createJTWToken(sub: string, room: string): string {
   return [
     {}, // header
     {

playwright/fixtures/widget-user.ts

@@ -132,7 +132,7 @@ export const widgetTest = test.extend<MyFixtures>({
 
       await ewPage1
         .getByRole("navigation", { name: "Room list" })
-        .getByRole("button", { name: "New", exact: true })
+        .getByRole("button", { name: "New conversation" })
         .click();
 
       await ewPage1.getByRole("menuitem", { name: "Start chat" }).click();

playwright/url-transport.spec.ts

@@ -1,493 +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 Page, test } from "@playwright/test";
-
-import { SpaHelpers } from "./spa-helpers";
-import { type RtcMode } from "./widget/test-helpers.ts";
-
-const sfuUrl = "wss://matrix-rtc.m.localhost/livekit/sfu";
-const serviceUrl = "https://matrix-rtc.m.localhost/livekit/jwt";
-
-const otherHomeserver = {
-  base_url: "https://synapse.othersite.m.localhost",
-  server_name: "synapse.othersite.m.localhost",
-};
-const otherSfuUrl = "wss://matrix-rtc.othersite.m.localhost/livekit/sfu";
-
-interface Transport {
-  type: "livekit";
-  url?: string;
-  livekit_service_url?: string;
-}
-
-/**
- * The transport shapes a homeserver may advertise while migrating to the
- * latest MSC4195. `legacy` is what the e2e Synapse advertises on its own.
- */
-const shapes = {
-  url: { type: "livekit", url: sfuUrl },
-  both: { type: "livekit", url: sfuUrl, livekit_service_url: serviceUrl },
-  legacy: null,
-} satisfies Record<string, Transport | null>;
-type Shape = keyof typeof shapes;
-
-/** Which endpoint a page asks for its SFU tokens. */
-type Flow = "cs-api" | "service-legacy" | "service-default";
-
-const cases: {
-  hostShape: Shape;
-  guestShape: Shape;
-  /** The MatrixRTC mode both sides use; the default is compatibility mode. */
-  mode?: RtcMode;
-  hostFlows: Flow[];
-  guestFlows: Flow[];
-}[] = [
-  {
-    hostShape: "url",
-    guestShape: "url",
-    hostFlows: ["cs-api"],
-    guestFlows: ["cs-api"],
-  },
-  {
-    // Publishers keep the legacy participant identity that clients predating
-    // MSC4195 expect, which only the JWT service assigns.
-    hostShape: "both",
-    guestShape: "both",
-    hostFlows: ["service-legacy"],
-    guestFlows: ["service-legacy"],
-  },
-  {
-    // The MatrixRTC mode has no bearing on the choice.
-    hostShape: "both",
-    guestShape: "both",
-    mode: "2_0",
-    hostFlows: ["service-legacy"],
-    guestFlows: ["service-legacy"],
-  },
-  {
-    hostShape: "url",
-    guestShape: "legacy",
-    hostFlows: ["cs-api", "service-default"],
-    guestFlows: ["service-legacy", "cs-api"],
-  },
-];
-
-for (const { hostShape, guestShape, mode, hostFlows, guestFlows } of cases) {
-  test(`One to one call with ${hostShape} host and ${guestShape} guest transport${mode === "2_0" ? " in Matrix 2.0 mode" : ""}`, async ({
-    browser,
-    page,
-    browserName,
-  }) => {
-    skipOnFirefox(browserName);
-
-    // The host starts the call.
-    await advertiseTransport(page, shapes[hostShape]);
-    const hostRequests = recordAuthRequests(page);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Androl", "HelloCall", true, mode);
-    const inviteLink = await SpaHelpers.getCallInviteLink(page);
-
-    // The guest joins.
-    const guestContext = await browser.newContext({ reducedMotion: "reduce" });
-    const guestPage = await guestContext.newPage();
-    await advertiseTransport(guestPage, shapes[guestShape]);
-    const guestRequests = recordAuthRequests(guestPage);
-    await SpaHelpers.joinCallFromInviteLink(
-      guestPage,
-      inviteLink,
-      "Pevara",
-      mode,
-    );
-
-    // Wait for the call to connect and render.
-    await SpaHelpers.expectVideoTilesCount(page, 2);
-    await SpaHelpers.expectVideoTilesCount(guestPage, 2);
-
-    // The host and guest ran through the expected flows.
-    expect(flowsOf(hostRequests)).toEqual(new Set(hostFlows));
-    expect(flowsOf(guestRequests)).toEqual(new Set(guestFlows));
-
-    // All requests succeeded and the SFU URL was set on C-S requests.
-    for (const request of [...hostRequests, ...guestRequests]) {
-      expect(request.status).toBe(200);
-      if (request.flow === "cs-api") expect(request.sfuUrl).toBe(sfuUrl);
-      // Clients predating MSC4195 match a publisher by the legacy identity,
-      // which only the JWT service's legacy endpoint assigns. The other flows
-      // hash it.
-      expect(request.identity).toMatch(
-        request.flow === "service-legacy" ? legacyIdentity : hashedIdentity,
-      );
-    }
-  });
-}
-
-test("Subscriber falls back to the JWT service when the homeserver lacks MSC4195", async ({
-  browser,
-  page,
-  browserName,
-}) => {
-  skipOnFirefox(browserName);
-
-  // The host starts the call with both transport shapes.
-  await advertiseTransport(page, shapes.both);
-  await page.goto("/");
-  await SpaHelpers.createCall(page, "Androl", "HelloCall", true);
-  const inviteLink = await SpaHelpers.getCallInviteLink(page);
-
-  // The guest joins but their C-S requests fail.
-  const guestContext = await browser.newContext({ reducedMotion: "reduce" });
-  const guestPage = await guestContext.newPage();
-  await rejectCsApiTokens(guestPage);
-  const guestRequests = recordAuthRequests(guestPage);
-  await SpaHelpers.joinCallFromInviteLink(guestPage, inviteLink, "Pevara");
-
-  // Wait for the call to connect and render.
-  await SpaHelpers.expectVideoTilesCount(page, 2);
-  await SpaHelpers.expectVideoTilesCount(guestPage, 2);
-
-  // The guest ran through all flows.
-  expect(flowsOf(guestRequests)).toEqual(
-    new Set<Flow>(["cs-api", "service-legacy", "service-default"]),
-  );
-
-  // The C-S token requests failed.
-  for (const request of guestRequests) {
-    expect(request.status).toBe(request.flow === "cs-api" ? 404 : 200);
-  }
-
-  // The C-S token requests preceeded the fallback request.
-  const flows = guestRequests.map((r) => r.flow);
-  expect(flows.indexOf("service-default")).toBeGreaterThan(
-    flows.indexOf("cs-api"),
-  );
-});
-
-test("Publisher shows an error when the homeserver lacks MSC4195", async ({
-  page,
-  browserName,
-}) => {
-  skipOnFirefox(browserName);
-
-  // The host tries to start a call with only the C-S transport shape available but
-  // their C-S requests fail.
-  await advertiseTransport(page, shapes.url);
-  await rejectCsApiTokens(page);
-  await page.goto("/");
-  await SpaHelpers.createCall(page, "Androl", "HelloCall", true);
-
-  // We land on an error page.
-  await expect(
-    page.getByRole("heading", { name: "Something went wrong" }),
-  ).toBeVisible();
-  await expect(
-    page.getByText(
-      "The authorization service for your media server (SFU) is out of date.",
-    ),
-  ).toBeVisible();
-});
-
-/**
- * Delegation follows the flow that authenticated the publisher: the homeserver
- * for a `url`-only transport, the JWT service wherever there is one.
- */
-const delegationCases: { shape: Shape; via: Delegation["via"] }[] = [
-  { shape: "url", via: "homeserver" },
-  { shape: "legacy", via: "service" },
-  { shape: "both", via: "service" },
-];
-
-for (const { shape, via } of delegationCases) {
-  test(`Delayed leave event delegated through the ${via} for a ${shape} transport gets sent on disconnect`, async ({
-    browser,
-    page,
-    browserName,
-  }) => {
-    skipOnFirefox(browserName);
-
-    // The host starts the call.
-    await advertiseTransport(page, shapes[shape]);
-    await page.goto("/");
-    await SpaHelpers.createCall(page, "Androl", "HelloCall", true);
-    const inviteLink = await SpaHelpers.getCallInviteLink(page);
-
-    // The guest joins.
-    const guestContext = await browser.newContext({ reducedMotion: "reduce" });
-    const guestPage = await guestContext.newPage();
-    await advertiseTransport(guestPage, shapes[shape]);
-    const delayedLeave = recordDelayedLeave(guestPage);
-    const delegations = recordDelegations(guestPage);
-    await SpaHelpers.joinCallFromInviteLink(guestPage, inviteLink, "Pevara");
-
-    // Wait for the call to connect and render.
-    await SpaHelpers.expectVideoTilesCount(page, 2);
-    await SpaHelpers.expectVideoTilesCount(guestPage, 2);
-
-    // The guest handed its delayed leave over, after probing for delegation
-    // support with bodiless requests, which count as supported unless they
-    // 404. The homeserver is always probed; the JWT service only when there
-    // is one.
-    await expect
-      .poll(() => delegations.at(-1))
-      .toEqual({
-        via,
-        status: 200,
-        delayId: delayedLeave.delayId,
-        ...(via === "homeserver" && { sfuUrl }),
-      });
-    const probes = delegations.slice(0, -1);
-    expect(probes.some((probe) => probe.via === via)).toBe(true);
-    for (const probe of probes) {
-      expect(probe.status).toBeGreaterThanOrEqual(400);
-      expect(probe.status).not.toBe(404);
-    }
-
-    // The delay is long enough that a leave within the window below cannot
-    // come from the delayed event expiring on its own.
-    expect(delayedLeave.delayMs).toBeGreaterThan(60_000);
-
-    // The guest drops without leaving.
-    await guestPage.reload();
-
-    // The host eventually sees the guest go once the delayed event fires.
-    await expect(page.getByTestId("videoTile")).toHaveCount(1, {
-      timeout: 30_000,
-    });
-  });
-}
-
-test("Subscribers get tokens for a remote homeserver's SFU over federation", async ({
-  browser,
-  page,
-  browserName,
-}) => {
-  skipOnFirefox(browserName);
-
-  // The host lives on the other homeserver and publishes on its SFU.
-  await useHomeserver(page, otherHomeserver);
-  await advertiseTransport(page, { type: "livekit", url: otherSfuUrl });
-  const hostRequests = recordAuthRequests(page);
-  await page.goto("/");
-  await SpaHelpers.createCall(page, "Androl", "HelloCall", true);
-  const inviteLink = await SpaHelpers.getCallInviteLink(page);
-
-  // The guest lives on the default homeserver and joins over federation.
-  const guestContext = await browser.newContext({ reducedMotion: "reduce" });
-  const guestPage = await guestContext.newPage();
-  await advertiseTransport(guestPage, shapes.url);
-  const guestRequests = recordAuthRequests(guestPage);
-  await SpaHelpers.joinCallFromInviteLink(
-    guestPage,
-    `${inviteLink}&viaServers=${otherHomeserver.server_name}`,
-    "Pevara",
-  );
-
-  // Wait for the call to connect and render.
-  await SpaHelpers.expectVideoTilesCount(page, 2);
-  await SpaHelpers.expectVideoTilesCount(guestPage, 2);
-
-  // Each side got a token for its own SFU and for the other side's SFU, all
-  // through its own homeserver.
-  for (const requests of [hostRequests, guestRequests]) {
-    expect(flowsOf(requests)).toEqual(new Set<Flow>(["cs-api"]));
-    expect(new Set(requests.map((r) => r.sfuUrl))).toEqual(
-      new Set([sfuUrl, otherSfuUrl]),
-    );
-    for (const request of requests) expect(request.status).toBe(200);
-  }
-});
-
-/** Skips the calling test if we're running on Firefox. */
-function skipOnFirefox(browserName: string): void {
-  test.skip(
-    browserName === "firefox",
-    "The is test is not working on firefox CI environment. No mic/audio device inputs so cam/mic are disabled",
-  );
-}
-
-/** Points this page's Element Call at another homeserver. */
-async function useHomeserver(
-  page: Page,
-  homeserver: typeof otherHomeserver,
-): Promise<void> {
-  await page.route("**/config.json", async (route) => {
-    const response = await route.fetch();
-    const config = (await response.json()) as Record<string, unknown>;
-    await route.fulfill({
-      response,
-      json: {
-        ...config,
-        default_server_config: { "m.homeserver": homeserver },
-      },
-    });
-  });
-}
-
-/**
- * Maps recorded requests to a set of flows. Publisher and subscriber connections
- * start concurrently so using arrays for comparison isn't convenient.
- */
-function flowsOf(requests: AuthRequest[]): Set<Flow> {
-  return new Set(requests.map((r) => r.flow));
-}
-
-/**
- * Replaces the transports the homeserver advertises to this page. The real
- * response is fetched first so its CORS headers carry over.
- */
-async function advertiseTransport(
-  page: Page,
-  transport: Transport | null,
-): Promise<void> {
-  if (transport === null) return;
-  await page.route("**/org.matrix.msc4143/rtc/transports", async (route) => {
-    if (route.request().method() !== "GET") return route.continue();
-    const response = await route.fetch();
-    await route.fulfill({ response, json: { rtc_transports: [transport] } });
-  });
-}
-
-/**
- * Makes the homeserver look like one without MSC4195: its `get_token`
- * endpoint answers as Synapse does for an unknown route.
- */
-async function rejectCsApiTokens(page: Page): Promise<void> {
-  await page.route("**/rtc/livekit/get_token", async (route) => {
-    if (route.request().method() !== "POST") return route.continue();
-    await route.fulfill({
-      status: 404,
-      json: { errcode: "M_UNRECOGNIZED", error: "Unrecognized request" },
-      headers: { "Access-Control-Allow-Origin": "*" },
-    });
-  });
-}
-
-/** A recorded delayed leave event. */
-interface DelayedLeave {
-  delayMs?: number;
-  delayId?: string;
-}
-
-/** Records the delayed leave event the page schedules on joining. */
-function recordDelayedLeave(page: Page): DelayedLeave {
-  const delayedLeave: DelayedLeave = {};
-  page.on("response", (response) => {
-    const delay = new URL(response.request().url()).searchParams.get(
-      "org.matrix.msc4140.delay",
-    );
-    if (delay === null || response.status() !== 200) return;
-    delayedLeave.delayMs = Number(delay);
-    response
-      .json()
-      .then((body: { delay_id: string }) => {
-        delayedLeave.delayId = body.delay_id;
-      })
-      .catch(() => {});
-  });
-  return delayedLeave;
-}
-
-/** A recorded delegation request for a delayed leave event. */
-interface Delegation {
-  /** Who was asked to send the leave event on the guest's behalf. */
-  via: "homeserver" | "service";
-  status: number;
-  sfuUrl?: string;
-  delayId?: string;
-}
-
-/**
- * Records requests that delegate a delayed leave event, or probe for support:
- * the MSC4195 `delegate_delayed_leave` endpoint of the homeserver, and the JWT
- * service's `delegate_delayed_leave` probe and `/sfu/get` with delay fields.
- */
-function recordDelegations(page: Page): Delegation[] {
-  const delegations: Delegation[] = [];
-  page.on("response", (response) => {
-    const request = response.request();
-    if (request.method() !== "POST") return;
-    const url = request.url();
-    const body = request.postDataJSON() as {
-      url?: string;
-      delay_id?: string;
-    } | null;
-    if (url.endsWith("/rtc/livekit/delegate_delayed_leave")) {
-      delegations.push({
-        via: "homeserver",
-        status: response.status(),
-        ...(body && { sfuUrl: body.url, delayId: body.delay_id }),
-      });
-    } else if (url.endsWith("/livekit/jwt/delegate_delayed_leave")) {
-      delegations.push({ via: "service", status: response.status() });
-    } else if (url.endsWith("/livekit/jwt/sfu/get") && body?.delay_id) {
-      delegations.push({
-        via: "service",
-        status: response.status(),
-        delayId: body.delay_id,
-      });
-    }
-  });
-  return delegations;
-}
-
-/** A recorded token request. */
-interface AuthRequest {
-  flow: Flow;
-  status: number;
-  /** The SFU a request to the MSC4195 `get_token` endpoint asked for. */
-  sfuUrl?: string;
-  /** The participant identity the issued token carries. */
-  identity?: string;
-}
-
-/** The legacy `<user_id>:<device_id>` participant identity. */
-const legacyIdentity = /^@[^:]+:[^:]+:[A-Z]+$/;
-/** A hashed participant identity: unpadded base64 of a SHA-256. */
-const hashedIdentity = /^[A-Za-z0-9+/]{43}$/;
-
-/** Reads the subject of a JWT without verifying it. */
-function jwtSubject(jwt: string): string {
-  const [, payload] = jwt.split(".");
-  return (
-    JSON.parse(Buffer.from(payload, "base64url").toString()) as {
-      sub: string;
-    }
-  ).sub;
-}
-
-/** Records token requests, including the identity each token carries. */
-function recordAuthRequests(page: Page): AuthRequest[] {
-  const requests: AuthRequest[] = [];
-  page.on("response", (response) => {
-    const request = response.request();
-    if (request.method() !== "POST") return;
-    const url = request.url();
-    let entry: AuthRequest;
-    if (url.endsWith("/rtc/livekit/get_token")) {
-      entry = {
-        flow: "cs-api",
-        status: response.status(),
-        sfuUrl: (request.postDataJSON() as { url: string }).url,
-      };
-    } else if (url.endsWith("/livekit/jwt/sfu/get")) {
-      entry = { flow: "service-legacy", status: response.status() };
-    } else if (url.endsWith("/livekit/jwt/get_token")) {
-      entry = { flow: "service-default", status: response.status() };
-    } else {
-      return;
-    }
-    requests.push(entry);
-    if (entry.status !== 200) return;
-    response
-      .json()
-      .then((body: { jwt: string }) => {
-        entry.identity = jwtSubject(body.jwt);
-      })
-      .catch(() => {});
-  });
-  return requests;
-}

playwright/utils/fake-devices.ts

@@ -8,10 +8,20 @@ Please see LICENSE in the repository root for full details.
 import { type Page } from "@playwright/test";
 
 /**
- * Adds synthetic devices beside the browser's one fake microphone and speaker,
- * so the menu has a choice to show. They share one capture and `setSinkId` is
- * accepted but not honoured: routing still needs hardware and a manual check.
- * Call before the page navigates.
+ * Gives the browser more fake devices than it ships with.
+ *
+ * A headless browser's fake capture offers one microphone and one speaker,
+ * which is one short of what a device menu is for: with no choice to make, every
+ * entry renders disabled. These are synthetic entries on top of the real fake
+ * device, so the menu has a list to show and a selection to move, and the app
+ * runs its real device pipeline against them.
+ *
+ * What they do not do is route audio: every entry is backed by the same capture,
+ * and `setSinkId` is accepted rather than honoured. A test can prove that
+ * choosing a device changes the app's state and does not disturb the call. That
+ * a listener hears the change needs hardware, and stays a manual check.
+ *
+ * Must be called before the page navigates.
  */
 export async function installFakeDevices(
   page: Page,
@@ -48,7 +58,8 @@ export async function installFakeDevices(
         ...synthetic("audiooutput", speakers, "Fake Speaker"),
       ];
 
-      // Our ids name no hardware, so drop the exact-device constraint.
+      // Our ids name no hardware, so an exact-device constraint on one would be
+      // rejected. Drop it and let the one real fake device answer.
       const getUserMedia = devices.getUserMedia.bind(devices);
       devices.getUserMedia = async (
         constraints?: MediaStreamConstraints,
@@ -66,8 +77,10 @@ export async function installFakeDevices(
         return getUserMedia(constraints);
       };
 
-      // Accept routing to our ids on both media elements and the AudioContext,
-      // which the app also routes.
+      // Routing to a device that does not exist would reject, and the app
+      // treats that as a failed switch. Both sinks are patched: Element Call
+      // routes its own AudioContext as well as the media elements, and leaving
+      // that one alone logs a NotFoundError for every switch.
       for (const proto of [
         HTMLMediaElement.prototype,
         AudioContext.prototype,

playwright/widget/federated-call.test.ts

@@ -37,6 +37,8 @@ modePairs.forEach(([rtcMode1, rtcMode2]) => {
 
       await TestHelpers.acceptRoomInvite(roomName, timo.page);
 
+      await florian.page.pause();
+
       await TestHelpers.openWidgetSetEmbeddedElementCallRtcModeCloseWidget(
         florian.page,
         rtcMode1,
@@ -72,6 +74,8 @@ modePairs.forEach(([rtcMode1, rtcMode2]) => {
 
         await TestHelpers.expectVisibleVideoCount(frame, 2);
       }
+
+      // await florian.page.pause();
     },
   );
 });

playwright/widget/test-helpers.ts

@@ -223,7 +223,7 @@ export class TestHelpers {
 
     await page
       .getByRole("navigation", { name: "Room list" })
-      .getByRole("button", { name: "New", exact: true })
+      .getByRole("button", { name: "New conversation" })
       .click();
 
     await page.getByRole("menuitem", { name: "New Room" }).click({

playwright/widget/url-transport.test.ts

@@ -1,108 +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 Page, test } from "@playwright/test";
-
-import { widgetTest } from "../fixtures/widget-user.ts";
-import { HOST1, TestHelpers } from "./test-helpers.ts";
-
-const sfuUrl = "wss://matrix-rtc.m.localhost/livekit/sfu";
-const serviceUrl = "https://matrix-rtc.m.localhost/livekit/jwt";
-
-/** Which endpoint a page asks for its SFU tokens. */
-type Flow = "cs-api" | "service-legacy" | "service-default";
-
-widgetTest(
-  "Call between a url + livekit_service_url transport and a legacy one",
-  async ({ addUser, browserName }) => {
-    test.skip(
-      browserName === "firefox",
-      "The is test is not working on firefox CI environment. No mic/audio device inputs so cam/mic are disabled",
-    );
-    test.slow();
-
-    const [host, guest] = await Promise.all([
-      addUser("Androl", HOST1),
-      addUser("Pevara", HOST1),
-    ]);
-
-    // The host's homeserver has started advertising a `url` next to its JWT
-    // service; the guest's still advertises the JWT service alone.
-    await advertiseTransport(host.page, {
-      type: "livekit",
-      url: sfuUrl,
-      livekit_service_url: serviceUrl,
-    });
-    // Element Web answers the widget from a cache it filled at login, so make
-    // it fetch the transports again now that they are rerouted
-    await host.clientHandle.evaluate(async (client) => {
-      await client.cachedRtcTransports.refresh();
-    });
-    const hostFlows = recordFlows(host.page);
-    const guestFlows = recordFlows(guest.page);
-
-    const roomName = "Transport Room";
-    await TestHelpers.createRoom(roomName, host.page, [guest.mxId]);
-    await TestHelpers.acceptRoomInvite(roomName, guest.page);
-
-    await TestHelpers.startCallInCurrentRoom(host.page, false);
-    await TestHelpers.joinCallFromLobby(host.page);
-    await TestHelpers.joinCallInCurrentRoom(guest.page);
-
-    for (const user of [host, guest]) {
-      const frame = user.page
-        .locator('iframe[title="Element Call"]')
-        .contentFrame();
-      await expect(frame.getByTestId("videoTile")).toHaveCount(2, {
-        timeout: 10000,
-      });
-      await expect(frame.getByText("Waiting for media...")).not.toBeVisible({
-        timeout: 10000,
-      });
-      await TestHelpers.expectVisibleVideoCount(frame, 2);
-    }
-
-    // Element Web does not expose the MSC4195 endpoints to widgets yet, so
-    // neither side reached the CS API. The host published through the JWT
-    // service's legacy endpoint and subscribed to the guest through its
-    // default one; the guest published the same way and fell back to the
-    // default endpoint for the host's transport.
-    expect(hostFlows).toEqual(new Set(["service-legacy", "service-default"]));
-    expect(guestFlows).toEqual(new Set(["service-legacy", "service-default"]));
-  },
-);
-
-/**
- * Replaces the transports the homeserver advertises to this page, including
- * to the widget host, which fetches them on the widget's behalf. The real
- * response is fetched first so its CORS headers carry over.
- */
-async function advertiseTransport(
-  page: Page,
-  transport: { type: "livekit"; url?: string; livekit_service_url?: string },
-): Promise<void> {
-  await page.route("**/org.matrix.msc4143/rtc/transports", async (route) => {
-    if (route.request().method() !== "GET") return route.continue();
-    const response = await route.fetch();
-    await route.fulfill({ response, json: { rtc_transports: [transport] } });
-  });
-}
-
-/** Records which token endpoints the page's widget asks. */
-function recordFlows(page: Page): Set<Flow> {
-  const flows = new Set<Flow>();
-  page.on("response", (response) => {
-    const request = response.request();
-    if (request.method() !== "POST") return;
-    const url = request.url();
-    if (url.endsWith("/rtc/livekit/get_token")) flows.add("cs-api");
-    else if (url.endsWith("/livekit/jwt/sfu/get")) flows.add("service-legacy");
-    else if (url.endsWith("/livekit/jwt/get_token"))
-      flows.add("service-default");
-  });
-  return flows;
-}

pnpm-lock.yaml

@@ -131,11 +131,11 @@ importers:
         specifier: ^10.2.11
         version: 10.3.1(react@19.2.8)
       '@vector-im/compound-design-tokens':
-        specifier: ^11.0.0
-        version: 11.2.0(@types/react@19.2.18)(react@19.2.8)
+        specifier: ^10.0.0
+        version: 10.2.4(@types/react@19.2.18)(react@19.2.8)
       '@vector-im/compound-web':
-        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.2.0(@types/react@19.2.18)(react@19.2.8))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        specifier: ^10.0.0
+        version: 10.0.1(@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@10.2.4(@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.0)(rolldown@1.2.7)(vite@8.2.2(@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.2(@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))
@@ -192,16 +192,19 @@ importers:
         version: 1.9.2
       matrix-js-sdk:
         specifier: github:matrix-org/matrix-js-sdk#develop
-        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4df2f2bfb5826c25f05d9535a8556acecaf2e570
+        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/24929be0e741be6a5d0a7226f1c682e245263b8a
       matrix-widget-api:
         specifier: ^1.18.0
-        version: 1.20.0
+        version: 1.19.0
       node-stdlib-browser:
         specifier: ^1.3.1
         version: 1.3.1
       normalize.css:
         specifier: ^8.0.1
         version: 8.0.1
+      observable-hooks:
+        specifier: ^4.2.3
+        version: 4.2.4(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rxjs@7.8.2)
       oxfmt:
         specifier: ^0.66.0
         version: 0.66.0
@@ -222,7 +225,7 @@ importers:
         version: 10.6.1(postcss@8.5.26)
       postcss-selector-parser:
         specifier: ^7.1.1
-        version: 7.1.6
+        version: 7.1.3
       posthog-js:
         specifier: 1.408.2
         version: 1.408.2
@@ -268,6 +271,9 @@ importers:
       vite:
         specifier: ^8.0.0
         version: 8.2.2(@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)
+      vite-plugin-generate-file:
+        specifier: ^0.3.0
+        version: 0.3.1
       vite-plugin-html:
         specifier: ^3.2.2
         version: 3.2.2(vite@8.2.2(@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))
@@ -1191,8 +1197,8 @@ packages:
       '@types/dom-mediacapture-transform': ^0.1.9
       livekit-client: ^1.12.0 || ^2.1.0
 
-  '@matrix-org/matrix-sdk-crypto-wasm@18.9.0':
-    resolution: {integrity: sha512-NtLzNDTEfNASBjNCTGZHuk7N0jrQhS6Zx2CM857rCHZYYh/rpbKGQNrJ7azktm4S1P5Jy3WU3nwJTGohGw26qQ==}
+  '@matrix-org/matrix-sdk-crypto-wasm@18.5.0':
+    resolution: {integrity: sha512-E826Hy1rG26LanPjtSsOiVRcVoHfSgPgj2r2Xsb5RPScpaKi9XJADQ0u3dNjRCitZPX4oyLNl1FDd5AfDlmIwQ==}
     engines: {node: '>= 18'}
 
   '@mdx-js/react@3.1.1':
@@ -3223,8 +3229,8 @@ packages:
     peerDependencies:
       react: '>= 16.8.0'
 
-  '@vector-im/compound-design-tokens@11.2.0':
-    resolution: {integrity: sha512-XGwO63ZqFVXdkhCVLm3wa/tpx2Lw8pyaQYskObrLZIUkjs3aUmgq8CNhGcjkqRJXYGsLNJE2azov4DaM74h2PQ==}
+  '@vector-im/compound-design-tokens@10.2.4':
+    resolution: {integrity: sha512-2aCjhSvJxktPWnvh5s9Xdc0Rd76AfHqbDbN4QjOxo2VIac6zYdLyQbxMUQ5ZeoR9G3vAxILd0H1UvApRfMilpQ==}
     peerDependencies:
       '@adobe/leonardo-contrast-colors': ^1.0.0
       '@types/react': '*'
@@ -3240,13 +3246,13 @@ packages:
       react:
         optional: true
 
-  '@vector-im/compound-web@10.4.0':
-    resolution: {integrity: sha512-Tt5hsNK7ulhGdRuy9lzSm5C+T8M/4O4kLDFLkaU+Hi1kVWj6tj/5awW+U+GvtpWRh5llbHN2HRCh79+gQhek+A==}
+  '@vector-im/compound-web@10.0.1':
+    resolution: {integrity: sha512-CT3aGMalPSf53o3JUbBF7EA10Rfp+auftIuBwOUSna+hfZ/zPxGLTFcuCuOJ7L8hrzijM+V4I8L0PUkfyOczpg==}
     peerDependencies:
       '@fontsource/inconsolata': ^5
       '@fontsource/inter': ^5
       '@types/react': '*'
-      '@vector-im/compound-design-tokens': '>=1.6.1 <12.0.0'
+      '@vector-im/compound-design-tokens': '>=1.6.1 <11.0.0'
       react: ^18 || ^19.0.0
     peerDependenciesMeta:
       '@types/react':
@@ -3656,8 +3662,8 @@ packages:
   constants-browserify@1.0.0:
     resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}
 
-  content-type@3.1.1:
-    resolution: {integrity: sha512-GW4qUsfFo59d0HbUibDlWv5wPz+vAAcaTWbKIuKCf0JkC7wWkSyf8f13IpXn5JkeMlB2P8iTSSIjwXljorg2vA==}
+  content-type@3.0.0:
+    resolution: {integrity: sha512-AIi5H6p0xk5uknXcN3/rmhP8jgp69OfSe/JuKiQAFprJ7UGw7mwj7m4XcmDzlrnJDG+cGpphAINGdU3g3g7kDw==}
     engines: {node: '>=22'}
 
   convert-source-map@2.0.0:
@@ -4462,6 +4468,10 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
+  js-yaml@4.3.0:
+    resolution: {integrity: sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==}
+    hasBin: true
+
   js-yaml@4.3.1:
     resolution: {integrity: sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==}
     hasBin: true
@@ -4673,13 +4683,13 @@ 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/4df2f2bfb5826c25f05d9535a8556acecaf2e570:
-    resolution: {gitHosted: true, integrity: sha512-b1o6ywaPY9jakj+3GIgx3samM9AbqohzPQ5nZKbyOGYB16IHQtNMyjEo/PY0fW/s0uwBVApEHNb/MMtN40c/rQ==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4df2f2bfb5826c25f05d9535a8556acecaf2e570}
-    version: 43.0.0
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/24929be0e741be6a5d0a7226f1c682e245263b8a:
+    resolution: {gitHosted: true, integrity: sha512-0EGwbXzvG88sBOxq4ZlCRwT4VpQj2xkizfyy0A3bTSK0ysb6/gXJ/o1WPFoqCjRGMDgPq4gAsk92xGtHA7EhPg==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/24929be0e741be6a5d0a7226f1c682e245263b8a}
+    version: 42.2.0
     engines: {node: '>=22.0.0'}
 
-  matrix-widget-api@1.20.0:
-    resolution: {integrity: sha512-qwFP37rgns7mPesM5/vvZgknzb+kvyRB5BISv5sCuBxsGMceMr+Kogf7OkjRxBXdMCPBFuf6gIuYRe5S+lpzQw==}
+  matrix-widget-api@1.19.0:
+    resolution: {integrity: sha512-Qe7L6G1mQJphBC47/Bzp5ljPIK1UARgLiuGgS+/KmEs/eaNHkQ3+ArD0/0kvMV+d6kCGAZ9OKRqsnuPjizI+tw==}
 
   md5.js@1.3.5:
     resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
@@ -4696,6 +4706,14 @@ packages:
     resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==}
     hasBin: true
 
+  mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+
   mimic-function@5.0.1:
     resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
     engines: {node: '>=18'}
@@ -4798,6 +4816,13 @@ packages:
     resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==}
     engines: {node: '>= 0.4'}
 
+  observable-hooks@4.2.4:
+    resolution: {integrity: sha512-FdTQgyw1h5bG/QHCBIqctdBSnv9VARJCEilgpV6L2qlw1yeLqFIwPm4U15dMtl5kDmNN0hSt+Nl6iYbLFwEcQA==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+      rxjs: '>=6.0.0'
+
   obug@2.1.4:
     resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==}
     engines: {node: '>=12.20.0'}
@@ -4880,8 +4905,8 @@ packages:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
 
-  p-retry@8.0.1:
-    resolution: {integrity: sha512-NAigyu8hfvJe7MsS18mnc4is0MZtau3QMdBklaJKK23oBQb6occO3UPM3vHmTckW8KhfyjMZaUOqdTFEYliHgg==}
+  p-retry@8.0.0:
+    resolution: {integrity: sha512-kFVqH1HxOHp8LupNsOys7bSV09VYTRLxarH/mokO4Rqhk6wGi70E0jh4VzvVGXfEVNggHoHLAMWsQqHyU1Ey9A==}
     engines: {node: '>=22'}
 
   p-try@2.2.0:
@@ -5160,8 +5185,8 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  postcss-selector-parser@7.1.6:
-    resolution: {integrity: sha512-7qASPzhKF2l2KLboRZux8CCTRMdGiV08vWmyKzPz22qZ7ZjQBOeY7rNzNoCLSUiftJ7HUq0GERHmxw/t0dCdMw==}
+  postcss-selector-parser@7.1.3:
+    resolution: {integrity: sha512-ajnd7iZnqjJDkyHNfznl/ZVO0lWqvBmQXfKKENx9/p/bEiF/L3eHwdydNUg9RXZx6xfZWOCmXmBa5oeB+YrAPQ==}
     engines: {node: '>=4'}
 
   postcss-value-parser@4.2.0:
@@ -5889,6 +5914,9 @@ packages:
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
       react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
 
+  vite-plugin-generate-file@0.3.1:
+    resolution: {integrity: sha512-tiA3gkPM21MS2+RyqsBMT33GSlM9LM1TJjf6vGvV/e/ml3e3vTKfuH3l2N0NpUgcayvj1fXnmlo5YBuahA6bsg==}
+
   vite-plugin-html@3.2.2:
     resolution: {integrity: sha512-vb9C9kcdzcIo/Oc3CLZVS03dL5pDlOFuhGlZYDCJ840BhWl/0nGeZWf3Qy7NlOayscY4Cm/QRgULCQkEZige5Q==}
     peerDependencies:
@@ -6397,9 +6425,9 @@ snapshots:
 
   '@csstools/postcss-cascade-layers@5.0.2(postcss@8.5.26)':
     dependencies:
-      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.6)
+      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.3)
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   '@csstools/postcss-color-function-display-p3-linear@1.0.1(postcss@8.5.26)':
     dependencies:
@@ -6505,9 +6533,9 @@ snapshots:
 
   '@csstools/postcss-is-pseudo-class@5.0.3(postcss@8.5.26)':
     dependencies:
-      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.6)
+      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.3)
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   '@csstools/postcss-light-dark-function@2.0.11(postcss@8.5.26)':
     dependencies:
@@ -6609,7 +6637,7 @@ snapshots:
   '@csstools/postcss-scope-pseudo-class@4.0.1(postcss@8.5.26)':
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   '@csstools/postcss-sign-functions@1.1.4(postcss@8.5.26)':
     dependencies:
@@ -6653,13 +6681,13 @@ snapshots:
     dependencies:
       postcss: 8.5.26
 
-  '@csstools/selector-resolve-nested@3.1.0(postcss-selector-parser@7.1.6)':
+  '@csstools/selector-resolve-nested@3.1.0(postcss-selector-parser@7.1.3)':
     dependencies:
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
-  '@csstools/selector-specificity@5.0.0(postcss-selector-parser@7.1.6)':
+  '@csstools/selector-specificity@5.0.0(postcss-selector-parser@7.1.3)':
     dependencies:
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   '@csstools/utilities@2.0.0(postcss@8.5.26)':
     dependencies:
@@ -7083,7 +7111,7 @@ snapshots:
       '@types/dom-mediacapture-transform': 0.1.11
       livekit-client: 2.22.3(@types/dom-mediacapture-record@1.0.22)
 
-  '@matrix-org/matrix-sdk-crypto-wasm@18.9.0': {}
+  '@matrix-org/matrix-sdk-crypto-wasm@18.5.0': {}
 
   '@mdx-js/react@3.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
@@ -8667,12 +8695,12 @@ snapshots:
       '@use-gesture/core': 10.3.1
       react: 19.2.8
 
-  '@vector-im/compound-design-tokens@11.2.0(@types/react@19.2.18)(react@19.2.8)':
+  '@vector-im/compound-design-tokens@10.2.4(@types/react@19.2.18)(react@19.2.8)':
     optionalDependencies:
       '@types/react': 19.2.18
       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.2.0(@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.0.1(@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@10.2.4(@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)
@@ -8684,7 +8712,7 @@ snapshots:
       '@radix-ui/react-progress': 1.1.16(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-separator': 1.1.15(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-slot': 1.3.3(@types/react@19.2.18)(react@19.2.8)
-      '@vector-im/compound-design-tokens': 11.2.0(@types/react@19.2.18)(react@19.2.8)
+      '@vector-im/compound-design-tokens': 10.2.4(@types/react@19.2.18)(react@19.2.8)
       classnames: 2.5.1
       react: 19.2.8
       vaul: 1.1.2(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
@@ -9145,7 +9173,7 @@ snapshots:
 
   constants-browserify@1.0.0: {}
 
-  content-type@3.1.1: {}
+  content-type@3.0.0: {}
 
   convert-source-map@2.0.0: {}
 
@@ -9216,13 +9244,13 @@ snapshots:
   css-blank-pseudo@7.0.1(postcss@8.5.26):
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   css-has-pseudo@7.0.3(postcss@8.5.26):
     dependencies:
-      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.6)
+      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.3)
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
       postcss-value-parser: 4.2.0
 
   css-prefers-color-scheme@10.0.0(postcss@8.5.26):
@@ -10016,6 +10044,10 @@ snapshots:
 
   js-tokens@4.0.0: {}
 
+  js-yaml@4.3.0:
+    dependencies:
+      argparse: 2.0.1
+
   js-yaml@4.3.1:
     dependencies:
       argparse: 2.0.1
@@ -10227,21 +10259,21 @@ snapshots:
 
   matrix-events-sdk@0.0.1: {}
 
-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4df2f2bfb5826c25f05d9535a8556acecaf2e570:
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/24929be0e741be6a5d0a7226f1c682e245263b8a:
     dependencies:
       '@babel/runtime': 8.0.0
-      '@matrix-org/matrix-sdk-crypto-wasm': 18.9.0
+      '@matrix-org/matrix-sdk-crypto-wasm': 18.5.0
       another-json: 0.2.0
       bs58: 6.0.0
-      content-type: 3.1.1
+      content-type: 3.0.0
       loglevel: 1.9.2
       matrix-events-sdk: 0.0.1
-      matrix-widget-api: 1.20.0
-      p-retry: 8.0.1
+      matrix-widget-api: 1.19.0
+      p-retry: 8.0.0
       sdp-transform: 3.0.0
       unhomoglyph: 1.0.6
 
-  matrix-widget-api@1.20.0:
+  matrix-widget-api@1.19.0:
     dependencies:
       '@types/events': 3.0.3
       events: 3.3.0
@@ -10264,6 +10296,12 @@ snapshots:
       bn.js: 4.12.3
       brorand: 1.1.0
 
+  mime-db@1.52.0: {}
+
+  mime-types@2.1.35:
+    dependencies:
+      mime-db: 1.52.0
+
   mimic-function@5.0.1: {}
 
   min-indent@1.0.1: {}
@@ -10372,6 +10410,12 @@ snapshots:
       has-symbols: 1.1.0
       object-keys: 1.1.1
 
+  observable-hooks@4.2.4(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rxjs@7.8.2):
+    dependencies:
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      rxjs: 7.8.2
+
   obug@2.1.4: {}
 
   once@1.4.0:
@@ -10556,7 +10600,7 @@ snapshots:
     dependencies:
       p-limit: 3.1.0
 
-  p-retry@8.0.1:
+  p-retry@8.0.0:
     dependencies:
       is-network-error: 1.3.2
 
@@ -10666,7 +10710,7 @@ snapshots:
   postcss-attribute-case-insensitive@7.0.1(postcss@8.5.26):
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   postcss-clamp@4.1.0(postcss@8.5.26):
     dependencies:
@@ -10717,12 +10761,12 @@ snapshots:
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   postcss-dir-pseudo-class@9.0.1(postcss@8.5.26):
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   postcss-double-position-gradients@6.0.4(postcss@8.5.26):
     dependencies:
@@ -10734,12 +10778,12 @@ snapshots:
   postcss-focus-visible@10.0.1(postcss@8.5.26):
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   postcss-focus-within@9.0.1(postcss@8.5.26):
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   postcss-font-variant@5.0.0(postcss@8.5.26):
     dependencies:
@@ -10771,10 +10815,10 @@ snapshots:
 
   postcss-nesting@13.0.2(postcss@8.5.26):
     dependencies:
-      '@csstools/selector-resolve-nested': 3.1.0(postcss-selector-parser@7.1.6)
-      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.6)
+      '@csstools/selector-resolve-nested': 3.1.0(postcss-selector-parser@7.1.3)
+      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.3)
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   postcss-opacity-percentage@3.0.0(postcss@8.5.26):
     dependencies:
@@ -10872,7 +10916,7 @@ snapshots:
   postcss-pseudo-class-any-link@10.0.1(postcss@8.5.26):
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
   postcss-replace-overflow-wrap@4.0.0(postcss@8.5.26):
     dependencies:
@@ -10881,9 +10925,9 @@ snapshots:
   postcss-selector-not@8.0.1(postcss@8.5.26):
     dependencies:
       postcss: 8.5.26
-      postcss-selector-parser: 7.1.6
+      postcss-selector-parser: 7.1.3
 
-  postcss-selector-parser@7.1.6:
+  postcss-selector-parser@7.1.3:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
@@ -11624,6 +11668,13 @@ snapshots:
       - '@types/react'
       - '@types/react-dom'
 
+  vite-plugin-generate-file@0.3.1:
+    dependencies:
+      ejs: 3.1.10
+      js-yaml: 4.3.0
+      mime-types: 2.1.35
+      picocolors: 1.1.1
+
   vite-plugin-html@3.2.2(vite@8.2.2(@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:
       '@rollup/pluginutils': 4.2.1

scripts/check-component-externals.mjs

@@ -9,11 +9,9 @@ Please see LICENSE in the repository root for full details.
  * Checks that the component build leaves the packages a host must supply to
  * the host.
  *
- * A host application already has React, the Matrix SDK and Compound,
- * and a second copy of any of them is worse than dead weight: React would hold
- * two sets of hooks, the Matrix client would run two sync loops, and a second
- * Compound would style the tooltips it floats into the host's body with class
- * names the host's stylesheet does not know. So the
+ * A host application already has React, the Matrix SDK and LiveKit, and a
+ * second copy of any of them is worse than dead weight: React would hold two
+ * sets of hooks, and the Matrix client would run two sync loops. So the
  * component build lists them as external — but that list has to name every
  * subpath, since the bundler silently ignores the pattern and callback forms
  * of the option, and an import it does not cover is bundled with no warning at
@@ -35,17 +33,13 @@ import { loadConfigFromFile } from "vite";
 
 const CONFIG = "vite-component.config.ts";
 const SOURCES = ["src", "component"];
-// The development harness is a host, not part of the component: it is the
-// one that imports what a host supplies (Compound's stylesheets, say).
-const EXCLUDED = ["component/dev"];
 
 /** The packages whose duplication would break a host, rather than merely enlarge it. */
 const MUST_BE_EXTERNAL = [
   "react",
   "react-dom",
   "matrix-js-sdk",
-  "@vector-im/compound-web",
-  "@vector-im/compound-design-tokens",
+  "livekit-client",
 ];
 
 const isTestFile = (name) =>
@@ -55,7 +49,6 @@ const isTestFile = (name) =>
 async function* sourceFiles(dir) {
   for (const entry of await readdir(dir, { withFileTypes: true })) {
     const path = join(dir, entry.name);
-    if (EXCLUDED.includes(path)) continue;
     if (entry.isDirectory()) yield* sourceFiles(path);
     else if (/\.(ts|tsx)$/.test(entry.name) && !isTestFile(entry.name))
       yield path;

scripts/fetchdep.sh

@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-
-# Clones the branch of a dependency's repository that has the same name as
-# the pull request branch under test, so a change spanning both repositories
-# can be tested before either side is merged. Inspired by scripts/fetchdep.sh 
-# element-web.
-#
-# Usage: scripts/fetchdep.sh <org> <repo> [ref]
-#
-# The clone lands in ./<repo>. When the pull request comes from a fork and
-# PR_HEAD_REPO_OWNER was set, the fork's own copy of the repository is tried
-# before <org>'s. Exits 0 when a branch was cloned and 1 when there is none,
-# so the caller can keep the locked version in that case. Without a ref,
-# nothing is closed outside a pull request.
-
-set -eu
-
-org=$1
-repo=$2
-ref=${3:-}
-
-rm -rf "$repo"
-
-# If a ref was passed, try to clone it or die.
-if [ -n "$ref" ]; then
-    echo "fetchdep.sh: Using $org/$repo at $ref"
-    git clone --depth 1 "https://github.com/$org/$repo.git" "$repo"
-    git -C "$repo" fetch --depth 1 origin "$ref"
-    git -C "$repo" -c advice.detachedHead=false checkout FETCH_HEAD
-    git -C "$repo" log -1
-    exit 0
-fi
-
-# Otherwise ensure that we're on a pull request.
-head_ref=${GITHUB_HEAD_REF:-}
-if [ -z "$head_ref" ]; then
-    echo "fetchdep.sh: Not a pull request, nothing to match"
-    exit 1
-fi
-
-# Bots name their branches the same way in every repository, so a match on
-# one of theirs would be a coincidence rather than a paired change.
-case "$head_ref" in
-    renovate/* | dependabot/*)
-        echo "fetchdep.sh: Not matching bot branch $head_ref"
-        exit 1
-        ;;
-esac
-
-# Clones a branch if it exists and ends the script on success.
-clone() {
-    local try_org=$1
-    local branch=$2
-    echo "fetchdep.sh: Trying to use $try_org/$repo#$branch"
-    # Disable auth prompts: https://serverfault.com/a/665959
-    if GIT_TERMINAL_PROMPT=0 git clone "https://github.com/$try_org/$repo.git" "$repo" --branch "$branch" --depth 1; then
-        git -C "$repo" log -1
-        # Surface the match on the workflow run summary.
-        echo "::notice title=Matched $repo branch::Using $try_org/$repo#$branch at $(git -C "$repo" rev-parse HEAD)"
-        exit 0
-    fi
-}
-
-# Try cloning from the fork, then from the org.
-head_owner=${PR_HEAD_REPO_OWNER:-}
-if [ -n "$head_owner" ] && [ "$head_owner" != "${GITHUB_REPOSITORY_OWNER:-}" ]; then
-    clone "$head_owner" "$head_ref"
-fi
-clone "$org" "$head_ref"
-
-# Nothing worked. Die.
-echo "fetchdep.sh: No branch named $head_ref in $org/$repo"
-exit 1

scripts/layered.sh

@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-# Installs dependencies, then swaps matrix-js-sdk for a branch of the same
-# name as the pull request branch under test if one exists. This is what
-# lets CI test an Element Call branch together with a matrix-js-sdk branch
-# before either is merged. Inspired by scripts/layered.sh in element-web.
-#
-# Usage: scripts/layered.sh [pnpm install flags]
-#
-# The layering is only performed when package.json uses the develop branch of
-# matrix-js-sdk and the run is for a pull request whose branch has a matrix-js-sdk
-# counterpart. Otherwise the dependency is left as pnpm-lock.yaml pins it.
-#
-# The matrix-js-sdk checkout is nested inside this directory because some CI
-# systems do not allow moving above the primary checkout. It is git-ignored.
-#
-# Set JS_SDK_GITHUB_BASE_REF to a ref to use that exact ref of matrix-js-sdk
-# instead of looking for a matching branch.
-#
-# This script is only meant to be used in CI. For local development use
-# see docs/linking.md.
-
-set -ex
-
-# Paths below are relative to the repository root.
-cd "$(dirname "$0")/.."
-
-pnpm install --frozen-lockfile "$@"
-
-js_sdk_dep=$(jq -r '.devDependencies["matrix-js-sdk"]' < package.json)
-
-# Only layer when package.json follows the branch head rather than pinning a
-# release, so a release build keeps its pinned version.
-if [ "$js_sdk_dep" != "github:matrix-org/matrix-js-sdk#develop" ]; then
-    echo "layered.sh: Skipping matrix-js-sdk fetch and install as package.json pins $js_sdk_dep"
-    exit 0
-fi
-
-if ! scripts/fetchdep.sh matrix-org matrix-js-sdk "${JS_SDK_GITHUB_BASE_REF:-}"; then
-    echo "layered.sh: No matching matrix-js-sdk branch, keeping the locked version"
-    exit 0
-fi
-
-# matrix-js-sdk pins its pnpm version in `devEngines` only. Under corepack,
-# pnpm does not switch versions on its own and corepack, finding no
-# `packageManager` field there, would walk up to this project's and use
-# ours. Pinning it in the clone makes every pnpm invocation inside that
-# directory, including the `prepare` script run by pack, use the right one.
-js_sdk_pnpm="pnpm@$(jq -r '.devEngines.packageManager.version' < matrix-js-sdk/package.json)"
-jq --arg pm "$js_sdk_pnpm" '.packageManager = $pm' matrix-js-sdk/package.json > matrix-js-sdk/package.json.tmp
-mv matrix-js-sdk/package.json.tmp matrix-js-sdk/package.json
-export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
-
-# Install matrix-js-sdk's build dependencies. `prepare` runs on pack below,
-# so it is skipped here.
-(cd matrix-js-sdk && pnpm install --frozen-lockfile --ignore-scripts)
-
-# Rather than `pnpm link`, build matrix-js-sdk into a tarball and install
-# that. This better reflects a clean install: dependencies may be hoisted
-# and shared, and there is no tsconfig.json to pick up sources from.
-(cd matrix-js-sdk && pnpm pack --out matrix-js-sdk.tgz)
-pnpm install "$(pwd)/matrix-js-sdk/matrix-js-sdk.tgz" "$@"

sdk/README.md

@@ -26,7 +26,7 @@ This file needs to be hosted. Locally (via `npx serve -l 81234 --cors`) or on a
 Now you just need to add the widget to element web via:
 
 ```
-/addwidget http://localhost:3000?widgetId=$matrix_widget_id&userId=$matrix_user_id&deviceId=$org.matrix.msc3819.matrix_device_id&baseUrl=$org.matrix.msc4039.matrix_base_url&roomId=$matrix_room_id
+/addwidget http://localhost:3000?widgetId=$matrix_widget_id&perParticipantE2EE=true&userId=$matrix_user_id&deviceId=$org.matrix.msc3819.matrix_device_id&baseUrl=$org.matrix.msc4039.matrix_base_url&roomId=$matrix_room_id
 ```
 
 ## Widgets
@@ -42,6 +42,7 @@ by the matrixRTCSdk to start the postmessage widget api (communication between t
 
 ```
 widgetId = $matrix_widget_id
+perParticipantE2EE = true
 userId = $matrix_user_id
 deviceId = $org.matrix.msc3819.matrix_device_id
 baseUrl = $org.matrix.msc4039.matrix_base_url
@@ -52,7 +53,7 @@ baseUrl = $org.matrix.msc4039.matrix_base_url
 Full template use as `<widgetUrl>`:
 
 ```
-http://localhost:3000?widgetId=$matrix_widget_id&userId=$matrix_user_id&deviceId=$org.matrix.msc3819.matrix_device_id&baseUrl=$org.matrix.msc4039.matrix_base_url&roomId=$matrix_room_id
+http://localhost:3000?widgetId=$matrix_widget_id&perParticipantE2EE=true&userId=$matrix_user_id&deviceId=$org.matrix.msc3819.matrix_device_id&baseUrl=$org.matrix.msc4039.matrix_base_url&roomId=$matrix_room_id
 ```
 
 the `$` prefixed variables will be replaced by EW on widget instantiation. (e.g. `$matrix_user_id` -> `@user:example.com` (url encoding will also be applied automatically by EW) -> `%40user%3Aexample.com`)

sdk/main.ts

@@ -231,7 +231,7 @@ export async function createMatrixRTCSdk(
       complete: () => {
         logger.info("Livekit room items subscription completed");
         for (const item of callViewModel.livekitRoomItems$.value) {
-          logger.info("unregistering room item from room", item.transport);
+          logger.info("unregistering room item from room", item.url);
           item.livekitRoom.unregisterTextStreamHandler(TEXT_LK_TOPIC);
         }
       },

src/MediaDevicesContext.ts

@@ -6,9 +6,9 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { createContext, use, useMemo } from "react";
+import { useObservableEagerState } from "observable-hooks";
 
 import { type MediaDevices } from "./state/MediaDevices";
-import { useBehavior } from "./useBehavior";
 
 export const MediaDevicesContext = createContext<MediaDevices | undefined>(
   undefined,
@@ -35,7 +35,7 @@ export const useEarpieceAudioConfig = (): {
   volume: number;
 } => {
   const devices = useMediaDevices();
-  const audioOutput = useBehavior(devices.audioOutput.selected$);
+  const audioOutput = useObservableEagerState(devices.audioOutput.selected$);
   const isVirtualEarpiece = audioOutput?.virtualEarpiece ?? false;
   return {
     // We use only the right speaker (pan = 1) for the earpiece.

src/Modal.test.tsx

@@ -11,7 +11,6 @@ import { type ReactNode, useState } from "react";
 import userEvent from "@testing-library/user-event";
 
 import { Modal } from "./Modal";
-import { RootElementProvider } from "./RootElementContext";
 
 const originalMatchMedia = window.matchMedia;
 afterEach(() => {
@@ -71,31 +70,3 @@ test("the modal renders as a drawer in mobile viewports", () => {
   );
   expect(queryByRole("dialog")).toMatchSnapshot();
 });
-
-test("the modal can be closed by clicking the backdrop, in another window too", async () => {
-  // A dialog moved into another window, as a host does for a Document
-  // Picture-in-Picture window: its nodes are not `Node`s of this window
-  const frame = document.createElement("iframe");
-  document.body.appendChild(frame);
-  const otherBody = frame.contentDocument!.body;
-
-  function ModalFn(): ReactNode {
-    const [isOpen, setOpen] = useState(true);
-    return (
-      <RootElementProvider value={otherBody}>
-        <Modal title="My modal" open={isOpen} onDismiss={() => setOpen(false)}>
-          <p>This is the content.</p>
-        </Modal>
-      </RootElementProvider>
-    );
-  }
-  render(<ModalFn />);
-  const dialog = otherBody.querySelector('[role="dialog"]');
-  expect(dialog).not.toBeNull();
-  const backdrop = dialog!.previousElementSibling as HTMLElement;
-
-  const user = userEvent.setup({ document: frame.contentDocument! });
-  await user.click(backdrop);
-  expect(otherBody.querySelector('[role="dialog"]')).toBeNull();
-  frame.remove();
-});

src/Modal.tsx

@@ -160,12 +160,6 @@ export const Modal: FC<Props> = ({
         <DialogPortal container={rootElement}>
           <DialogOverlay
             className={classNames(overlayStyles.bg, overlayStyles.animate)}
-            // Radix dismisses on a pointer down outside the dialog, but only
-            // for event targets that are a `Node` of the window it was loaded
-            // in. A host can move the dialog into another window (a Document
-            // Picture-in-Picture window), whose nodes fail that check, so the
-            // backdrop closes the dialog itself.
-            onClick={() => onDismiss?.()}
           />
           <DialogContent
             asChild

src/RTCConnectionStats.tsx

@@ -16,21 +16,30 @@ import classNames from "classnames";
 import { Modal } from "./Modal";
 import styles from "./RTCConnectionStats.module.css";
 import mediaViewStyles from "../src/tile/MediaView.module.css";
-import { type UnstableLivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
-
 interface Props {
   audio?: RTCInboundRtpStreamStats | RTCOutboundRtpStreamStats;
   video?: RTCInboundRtpStreamStats | RTCOutboundRtpStreamStats;
-  transport?: UnstableLivekitTransport;
+  focusUrl?: string;
   rtcBackendIdentity?: string;
 }
 
+const extractDomain = (url: string): string => {
+  try {
+    const parsedUrl = new URL(url);
+    return parsedUrl.hostname; // Returns "kdk.cpm"
+  } catch (error) {
+    console.error("Invalid URL:", error);
+    return url;
+  }
+};
+
 // This is only used in developer mode for debugging purposes, so we don't need full localization
 export const RTCConnectionStats: FC<Props> = ({
   audio,
   video,
-  transport,
+  focusUrl,
   rtcBackendIdentity,
+  ...rest
 }) => {
   const [showModal, setShowModal] = useState(false);
   const [modalContents, setModalContents] = useState<
@@ -67,10 +76,10 @@ export const RTCConnectionStats: FC<Props> = ({
       <Text as="span" size="xs" title="rtcBackendIdentity">
         rtcBackendIdentity:{rtcBackendIdentity}
       </Text>
-      {transport && (
+      {focusUrl && (
         <div>
-          <Text as="span" size="xs" title="transport">
-            &nbsp;{JSON.stringify(transport)}
+          <Text as="span" size="xs" title="focusURL">
+            &nbsp;{extractDomain(focusUrl)}
           </Text>
         </div>
       )}

src/UrlConfiguration.ts

@@ -1,235 +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.
-*/
-
-/**
- * How Element Call can be told to behave, and what each intent means.
- *
- * Kept apart from {@link UrlParams} on purpose: everything here is constants,
- * types and one function of them, so that a host of the component can import
- * these — the enums it needs as values, the defaults an intent implies — without
- * loading Element Call itself. UrlParams, which reads them from a URL, needs
- * the router, the config and the rest of the app; this module must not.
- * `component/api.ts` is built from it as an entry point of its own.
- */
-
-import {
-  type RTCCallIntent,
-  type RTCNotificationType,
-} from "matrix-js-sdk/lib/matrixrtc";
-
-import { platform } from "./Platform";
-
-export enum UserIntent {
-  StartNewCall = "start_call",
-  JoinExistingCall = "join_existing",
-  StartNewCallVoice = "start_call_voice",
-  JoinExistingCallVoice = "join_existing_voice",
-  StartNewCallDM = "start_call_dm",
-  StartNewCallDMVoice = "start_call_dm_voice",
-  JoinExistingCallDM = "join_existing_dm",
-  JoinExistingCallDMVoice = "join_existing_dm_voice",
-  Unknown = "unknown",
-}
-
-export enum HeaderStyle {
-  None = "none",
-  Standard = "standard",
-  AppBar = "app_bar",
-}
-
-export enum BackgroundStyle {
-  Solid = "solid",
-  Gradient = "gradient",
-}
-
-/**
- * The configuration for the app, which can be set via URL parameters.
- * Those property are different to the UrlProperties, since they are all optional
- * and configure the behavior of the app. Their value is the same if EC is used in
- * the same context but with different accounts/users.
- *
- * Their defaults can be controlled by the `intent` property.
- */
-export interface UrlConfiguration {
-  /**
-   * Whether the app should keep the user confined to the current call/room.
-   */
-  confineToRoom: boolean;
-  /**
-   * Whether the app should pause before joining the call until it sees an
-   * io.element.join widget action, allowing it to be preloaded.
-   */
-  preload: boolean;
-  /**
-   * The style of headers to show. "standard" is the default arrangement, "none"
-   * hides the header entirely, and "app_bar" produces a header with a back
-   * button like you might see in mobile apps. The callback for the back button
-   * is window.controls.onBackButtonPressed.
-   */
-  header: HeaderStyle;
-  /**
-   * Whether the controls should be shown. For screen recording no controls can be desired.
-   */
-  showControls: boolean;
-  /**
-   * Whether to hide the screen-sharing button.
-   */
-  hideScreensharing: boolean;
-
-  /**
-   * Whether the app is allowed to use fallback STUN servers for ICE in case the
-   * user's homeserver doesn't provide any.
-   */
-  allowIceFallback: boolean;
-  /**
-   * Whether the global JS controls for audio output devices should be enabled,
-   * allowing the list of output devices to be controlled by the app hosting
-   * Element Call.
-   */
-  controlledAudioDevices: boolean;
-  /**
-   * Setting this flag skips the lobby and brings you in the call directly.
-   * In the widget this can be combined with preload to pass the device settings
-   * with the join widget action.
-   */
-  skipLobby: boolean;
-  /**
-   * Setting this flag makes element call show the lobby after leaving a call.
-   * This is useful for video rooms.
-   */
-  returnToLobby: boolean;
-  /**
-   * Whether and what type of notification EC should send, when the user joins the call.
-   */
-  sendNotificationType?: RTCNotificationType;
-  /**
-   * Whether the app should automatically leave the call when there
-   * is no one left in the call.
-   * This is one part to make the call matrixRTC session behave like a telephone call.
-   */
-  autoLeaveWhenOthersLeft: boolean;
-
-  /**
-   * If the client should behave like it is awaiting an answer if a notification was sent (wait for call pick up).
-   * This is a no-op if not combined with sendNotificationType.
-   *
-   * This entails:
-   *  - show ui that it is awaiting an answer
-   *  - play a sound that indicates that it is awaiting an answer
-   *  - auto-dismiss the call widget once the notification lifetime expires on the receivers side.
-   */
-  waitForCallPickup: boolean;
-
-  /**
-   * Whether to enable echo cancellation for audio capture.
-   * Defaults to true.
-   */
-  echoCancellation?: boolean;
-  /**
-   * Whether to enable noise suppression for audio capture.
-   * Defaults to true.
-   */
-  noiseSuppression?: boolean;
-
-  callIntent?: RTCCallIntent;
-}
-
-// If you need to add a new flag to this interface, prefer a name that describes
-// a specific behavior (such as 'confineToRoom'), rather than one that describes
-// the situations that call for this behavior ('isEmbedded'). This makes it
-// clearer what each flag means, and helps us avoid coupling Element Call's
-// behavior to the needs of specific consumers.
-
-/**
- * The configuration implied by what the user meant to do — if they pressed a
- * Start Call button this would be `start_call`, and if they pressed Join Call,
- * `join_existing`.
- *
- * These are platform-specific defaults, so that a host can start a call by
- * saying what the user asked for rather than by setting every parameter itself,
- * and so that what each intent means is Element Call's decision, made in one
- * place. A host that wants something else states it alongside the intent.
- *
- * {@link UserIntent.Unknown} means no intent was stated, and gives the
- * standalone app's defaults: Element Call owns the whole page, so it offers the
- * way out of the room that a hosted call must not.
- */
-export function configurationForIntent(intent: UserIntent): UrlConfiguration {
-  // Only constants and `platform` here, so that this depends on nothing but
-  // the intent.
-  let preset: UrlConfiguration = {
-    confineToRoom: true,
-    preload: false,
-    header: platform === "desktop" ? HeaderStyle.None : HeaderStyle.AppBar,
-    showControls: true,
-    hideScreensharing: false,
-    allowIceFallback: true,
-    controlledAudioDevices: platform === "desktop" ? false : true,
-    skipLobby: true,
-    returnToLobby: false,
-    sendNotificationType: "notification",
-    autoLeaveWhenOthersLeft: false,
-    waitForCallPickup: false,
-  };
-  switch (intent) {
-    case UserIntent.StartNewCall:
-      preset.skipLobby = false;
-      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 = "video";
-      break;
-    case UserIntent.StartNewCallVoice:
-      preset.skipLobby = false;
-      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 = "audio";
-      break;
-    case UserIntent.StartNewCallDMVoice:
-      preset.callIntent = "audio";
-    // Fall through
-    case UserIntent.StartNewCallDM:
-      preset.skipLobby = true;
-      preset.sendNotificationType = "ring";
-      preset.autoLeaveWhenOthersLeft = true;
-      preset.waitForCallPickup = true;
-      preset.callIntent = preset.callIntent ?? "video";
-      break;
-    case UserIntent.JoinExistingCallDMVoice:
-      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 ?? "video";
-      break;
-    // Non widget usecase defaults
-    default:
-      preset = {
-        confineToRoom: false,
-        preload: false,
-        header: HeaderStyle.Standard,
-        showControls: true,
-        hideScreensharing: false,
-        allowIceFallback: false,
-        controlledAudioDevices: false,
-        skipLobby: false,
-        returnToLobby: false,
-        sendNotificationType: undefined,
-        autoLeaveWhenOthersLeft: false,
-        waitForCallPickup: false,
-      };
-  }
-  return preset;
-}

src/UrlParams.test.ts

@@ -230,6 +230,7 @@ describe("UrlParams", () => {
       showControls: true,
       hideScreensharing: false,
       allowIceFallback: false,
+      perParticipantE2EE: false,
       controlledAudioDevices: false,
       skipLobby: false,
       returnToLobby: false,
@@ -242,6 +243,7 @@ describe("UrlParams", () => {
       showControls: true,
       hideScreensharing: false,
       allowIceFallback: true,
+      perParticipantE2EE: true,
       controlledAudioDevices: platform === "desktop" ? false : true,
       skipLobby: true,
       returnToLobby: false,
@@ -254,6 +256,7 @@ describe("UrlParams", () => {
       showControls: true,
       hideScreensharing: false,
       allowIceFallback: true,
+      perParticipantE2EE: true,
       controlledAudioDevices: platform === "desktop" ? false : true,
       skipLobby: false,
       returnToLobby: false,
@@ -496,6 +499,7 @@ describe("UrlParams", () => {
         // A host owns navigation, so Element Call must not offer a way out of
         // the room
         confineToRoom: true,
+        perParticipantE2EE: true,
         // The lobby first, so that the user picks their devices rather than
         // being thrown into the call by the act of being rendered
         skipLobby: false,
@@ -508,6 +512,7 @@ describe("UrlParams", () => {
       expect(configurationForIntent(UserIntent.Unknown)).toMatchObject({
         confineToRoom: false,
         header: HeaderStyle.Standard,
+        perParticipantE2EE: false,
       });
     });
   });

src/UrlParams.ts

@@ -9,36 +9,47 @@ Please see LICENSE in the repository root for full details.
 import { createContext, use, useMemo } from "react";
 import { useLocation } from "react-router-dom";
 import { logger } from "matrix-js-sdk/lib/logger";
+import {
+  type RTCCallIntent,
+  type RTCNotificationType,
+} from "matrix-js-sdk/lib/matrixrtc";
 import { pickBy } from "lodash-es";
 
 import { Config } from "./config/Config";
 import { type EncryptionSystem } from "./e2ee/sharedKeyManagement";
 import { E2eeType } from "./e2ee/e2eeType";
-import {
-  BackgroundStyle,
-  configurationForIntent,
-  HeaderStyle,
-  type UrlConfiguration,
-  UserIntent,
-} from "./UrlConfiguration";
+import { platform } from "./Platform";
 import { redact } from "./utils/redact";
 
-// Moved to their own module, so that a host can import them without the rest
-// of this one; re-exported here as they always were
-export {
-  BackgroundStyle,
-  configurationForIntent,
-  HeaderStyle,
-  type UrlConfiguration,
-  UserIntent,
-} from "./UrlConfiguration";
-
 interface RoomIdentifier {
   roomAlias: string | null;
   roomId: string | null;
   viaServers: string[];
 }
 
+export enum UserIntent {
+  StartNewCall = "start_call",
+  JoinExistingCall = "join_existing",
+  StartNewCallVoice = "start_call_voice",
+  JoinExistingCallVoice = "join_existing_voice",
+  StartNewCallDM = "start_call_dm",
+  StartNewCallDMVoice = "start_call_dm_voice",
+  JoinExistingCallDM = "join_existing_dm",
+  JoinExistingCallDMVoice = "join_existing_dm_voice",
+  Unknown = "unknown",
+}
+
+export enum HeaderStyle {
+  None = "none",
+  Standard = "standard",
+  AppBar = "app_bar",
+}
+
+export enum BackgroundStyle {
+  Solid = "solid",
+  Gradient = "gradient",
+}
+
 /**
  * The UrlProperties are used to pass required data to the widget.
  * Those are different in different rooms, users, devices. They do not configure the behavior of the
@@ -155,6 +166,109 @@ export interface UrlProperties {
    */
   background: BackgroundStyle;
 }
+
+/**
+ * The configuration for the app, which can be set via URL parameters.
+ * Those property are different to the UrlProperties, since they are all optional
+ * and configure the behavior of the app. Their value is the same if EC is used in
+ * the same context but with different accounts/users.
+ *
+ * Their defaults can be controlled by the `intent` property.
+ */
+export interface UrlConfiguration {
+  /**
+   * Whether the app should keep the user confined to the current call/room.
+   */
+  confineToRoom: boolean;
+  /**
+   * Whether the app should pause before joining the call until it sees an
+   * io.element.join widget action, allowing it to be preloaded.
+   */
+  preload: boolean;
+  /**
+   * The style of headers to show. "standard" is the default arrangement, "none"
+   * hides the header entirely, and "app_bar" produces a header with a back
+   * button like you might see in mobile apps. The callback for the back button
+   * is window.controls.onBackButtonPressed.
+   */
+  header: HeaderStyle;
+  /**
+   * Whether the controls should be shown. For screen recording no controls can be desired.
+   */
+  showControls: boolean;
+  /**
+   * Whether to hide the screen-sharing button.
+   */
+  hideScreensharing: boolean;
+
+  /**
+   * Whether the app is allowed to use fallback STUN servers for ICE in case the
+   * user's homeserver doesn't provide any.
+   */
+  allowIceFallback: boolean;
+
+  /**
+   * Whether the app should use per participant keys for E2EE.
+   */
+  perParticipantE2EE: boolean;
+  /**
+   * Whether the global JS controls for audio output devices should be enabled,
+   * allowing the list of output devices to be controlled by the app hosting
+   * Element Call.
+   */
+  controlledAudioDevices: boolean;
+  /**
+   * Setting this flag skips the lobby and brings you in the call directly.
+   * In the widget this can be combined with preload to pass the device settings
+   * with the join widget action.
+   */
+  skipLobby: boolean;
+  /**
+   * Setting this flag makes element call show the lobby after leaving a call.
+   * This is useful for video rooms.
+   */
+  returnToLobby: boolean;
+  /**
+   * Whether and what type of notification EC should send, when the user joins the call.
+   */
+  sendNotificationType?: RTCNotificationType;
+  /**
+   * Whether the app should automatically leave the call when there
+   * is no one left in the call.
+   * This is one part to make the call matrixRTC session behave like a telephone call.
+   */
+  autoLeaveWhenOthersLeft: boolean;
+
+  /**
+   * If the client should behave like it is awaiting an answer if a notification was sent (wait for call pick up).
+   * This is a no-op if not combined with sendNotificationType.
+   *
+   * This entails:
+   *  - show ui that it is awaiting an answer
+   *  - play a sound that indicates that it is awaiting an answer
+   *  - auto-dismiss the call widget once the notification lifetime expires on the receivers side.
+   */
+  waitForCallPickup: boolean;
+
+  /**
+   * Whether to enable echo cancellation for audio capture.
+   * Defaults to true.
+   */
+  echoCancellation?: boolean;
+  /**
+   * Whether to enable noise suppression for audio capture.
+   * Defaults to true.
+   */
+  noiseSuppression?: boolean;
+
+  callIntent?: RTCCallIntent;
+}
+
+// If you need to add a new flag to this interface, prefer a name that describes
+// a specific behavior (such as 'confineToRoom'), rather than one that describes
+// the situations that call for this behavior ('isEmbedded'). This makes it
+// clearer what each flag means, and helps us avoid coupling Element Call's
+// behavior to the needs of specific consumers.
 export interface UrlParams extends UrlProperties, UrlConfiguration {}
 
 class ParamParser {
@@ -240,6 +354,97 @@ export const getUrlParams = (
   return params;
 };
 
+/**
+ * The configuration implied by what the user meant to do — if they pressed a
+ * Start Call button this would be `start_call`, and if they pressed Join Call,
+ * `join_existing`.
+ *
+ * These are platform-specific defaults, so that a host can start a call by
+ * saying what the user asked for rather than by setting every parameter itself,
+ * and so that what each intent means is Element Call's decision, made in one
+ * place. A host that wants something else states it alongside the intent.
+ *
+ * {@link UserIntent.Unknown} means no intent was stated, and gives the
+ * standalone app's defaults: Element Call owns the whole page, so it offers the
+ * way out of the room that a hosted call must not.
+ */
+export function configurationForIntent(intent: UserIntent): UrlConfiguration {
+  // Only constants and `platform` here, so that this depends on nothing but
+  // the intent.
+  let preset: UrlConfiguration = {
+    confineToRoom: true,
+    preload: false,
+    header: platform === "desktop" ? HeaderStyle.None : HeaderStyle.AppBar,
+    showControls: true,
+    hideScreensharing: false,
+    allowIceFallback: true,
+    perParticipantE2EE: true,
+    controlledAudioDevices: platform === "desktop" ? false : true,
+    skipLobby: true,
+    returnToLobby: false,
+    sendNotificationType: "notification",
+    autoLeaveWhenOthersLeft: false,
+    waitForCallPickup: false,
+  };
+  switch (intent) {
+    case UserIntent.StartNewCall:
+      preset.skipLobby = false;
+      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 = "video";
+      break;
+    case UserIntent.StartNewCallVoice:
+      preset.skipLobby = false;
+      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 = "audio";
+      break;
+    case UserIntent.StartNewCallDMVoice:
+      preset.callIntent = "audio";
+    // Fall through
+    case UserIntent.StartNewCallDM:
+      preset.skipLobby = true;
+      preset.sendNotificationType = "ring";
+      preset.autoLeaveWhenOthersLeft = true;
+      preset.waitForCallPickup = true;
+      preset.callIntent = preset.callIntent ?? "video";
+      break;
+    case UserIntent.JoinExistingCallDMVoice:
+      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 ?? "video";
+      break;
+    // Non widget usecase defaults
+    default:
+      preset = {
+        confineToRoom: false,
+        preload: false,
+        header: HeaderStyle.Standard,
+        showControls: true,
+        hideScreensharing: false,
+        allowIceFallback: false,
+        perParticipantE2EE: false,
+        controlledAudioDevices: false,
+        skipLobby: false,
+        returnToLobby: false,
+        sendNotificationType: undefined,
+        autoLeaveWhenOthersLeft: false,
+        waitForCallPickup: false,
+      };
+  }
+  return preset;
+}
+
 /**
  * The {@link UrlProperties} for Element Call running as a component inside a
  * host application.
@@ -350,6 +555,7 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => {
     showControls: parser.getFlag("showControls"),
     hideScreensharing: parser.getFlag("hideScreensharing"),
     allowIceFallback: parser.getFlag("allowIceFallback"),
+    perParticipantE2EE: parser.getFlag("perParticipantE2EE"),
     controlledAudioDevices: parser.getFlag("controlledAudioDevices"),
     skipLobby: isWidget ? parser.getFlag("skipLobby") : false,
     // In SPA mode the user should always exit to the home screen when hanging
@@ -372,7 +578,7 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => {
     "intent:",
     intent,
     "\nproperties:",
-    redact(properties, "password", "posthogUserId"),
+    redact(properties, "password"),
     "configuration:",
     configuration,
   );
@@ -500,14 +706,20 @@ export function generateUrlSearchParams(
   const params = new URLSearchParams();
   // The password shouldn't need URL encoding here (we generate URL-safe ones) but encode
   // it in case it came from another client that generated a non url-safe one
-  if (encryptionSystem?.kind === E2eeType.SHARED_KEY) {
-    const encodedPassword = encodeURIComponent(encryptionSystem.secret);
-    if (encodedPassword !== encryptionSystem.secret) {
-      logger.info(
-        "Encoded call password used non URL-safe chars: buggy client?",
-      );
+  switch (encryptionSystem?.kind) {
+    case E2eeType.SHARED_KEY: {
+      const encodedPassword = encodeURIComponent(encryptionSystem.secret);
+      if (encodedPassword !== encryptionSystem.secret) {
+        logger.info(
+          "Encoded call password used non URL-safe chars: buggy client?",
+        );
+      }
+      params.set("password", encodedPassword);
+      break;
     }
-    params.set("password", encodedPassword);
+    case E2eeType.PER_PARTICIPANT:
+      params.set("perParticipantE2EE", "true");
+      break;
   }
   params.set("roomId", roomId);
   viaServers?.forEach((s) => params.set("viaServers", s));

src/__snapshots__/AppBar.test.tsx.snap

@@ -15,7 +15,7 @@ exports[`AppBar > renders 1`] = `
         tabindex="0"
       >
         <div
-          class="_indicator-icon_j097f_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
@@ -58,7 +58,7 @@ exports[`AppBar > renders with title and subtitle 1`] = `
         tabindex="0"
       >
         <div
-          class="_indicator-icon_j097f_17"
+          class="_indicator-icon_147l5_17"
           style="--cpd-icon-button-size: 100%;"
         >
           <svg

src/base.css

@@ -5,24 +5,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-/* The styles Element Call needs wherever it is shown: the element defaults and
-custom properties its own stylesheets build on top of.
+/* The styles Element Call needs wherever it is shown: the design tokens, fonts
+and element defaults its own stylesheets build on top of.
 
 Split out from index.css so that Element Call as a component can have these
 without also being given the standalone page's layout, which would style the
-host's own document. Compound's stylesheets — the design tokens, the component
-styles and the fonts they use — are not here either: as a component, Element
-Call shares the host's copy of Compound (it is a peer dependency, so that what
-Compound floats into the host's body, tooltips and menus, is styled by the
-host's stylesheet), and index.css loads it for the page.
-
-What remains here still speaks of the document — normalize.css and the
-typography below use bare element selectors, and the custom properties are
-declared on `:root` — which is right for the page, and is why the component
-build rewrites it: there every selector is confined to Element Call's root
-element (see component/build/scopeStylesToRoot.ts), with `html`, `body` and
-`:root` becoming that element. Nothing needs to be written differently here for
-that to work, but nothing here may rely on reaching the host's document either.
+host's own document. What remains here still speaks of the
+document — normalize.css and the typography below use bare element selectors,
+and the custom properties are declared on `:root` — which is right for the
+page, and is why the component build rewrites it: there every selector is
+confined to Element Call's root element (see component/build/scopeStylesToRoot.ts),
+with `html`, `body` and `:root` becoming that element. Nothing needs to be
+written differently here for that to work, but nothing here may rely on
+reaching the host's document either.
 
 Nothing here should depend on where it lands relative to Element Call's
 component stylesheets: the bundler decides that, and it decides differently for
@@ -30,7 +25,16 @@ the app and for the component build. */
 
 @layer normalize, compound-legacy, compound;
 
+@import url("@fontsource/inter/400.css");
+@import url("@fontsource/inter/500.css");
+@import url("@fontsource/inter/600.css");
+@import url("@fontsource/inter/700.css");
+@import url("@fontsource/inconsolata/400.css");
+@import url("@fontsource/inconsolata/700.css");
+
 @import url("normalize.css/normalize.css") layer(normalize);
+@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
+@import url("@vector-im/compound-web/dist/style.css") layer(compound.components);
 
 :root {
   --font-scale: 1;

src/button/ReactionToggleButton.module.css

@@ -83,7 +83,7 @@ div.reactionPopupMenuRoot.reactionPopupMenuModal > div > div {
   flex: 0 0 auto;
 }
 
-.reactionPopupMenu .reactionsMenu .reactionButton {
+.reactionButton {
   padding: var(--reaction-button-padding);
   border-radius: var(--cpd-radius-pill-effect);
   font-size: var(--reaction-button-fontsize);

src/button/__snapshots__/ReactionToggleButton.test.tsx.snap

@@ -9,7 +9,7 @@ exports[`Can close reaction dialog 1`] = `
     aria-disabled="false"
     aria-expanded="true"
     aria-haspopup="true"
-    aria-labelledby="_r_bh_"
+    aria-labelledby="_r_bb_"
     class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53"
     data-kind="primary"
     data-size="lg"

src/components/CallFooter.module.css

@@ -43,10 +43,7 @@ Please see LICENSE in the repository root for full details.
   inset-inline: 0;
 }
 
-/* Keep the footer while it is in use: focus inside it, or a menu opened from
-   it. The menu is portalled out, so the trigger's aria-expanded tracks it. */
-.footer.overlay:has(:focus-visible),
-.footer.overlay:has([aria-expanded="true"]) {
+.footer.overlay:has(:focus-visible) {
   opacity: 1;
   pointer-events: initial;
 }

src/components/CallFooter.stories.tsx

@@ -13,7 +13,6 @@ import { Link } from "@vector-im/compound-web";
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { CallFooter, type FooterSnapshot } from "./CallFooter";
 import inCallViewStyles from "../room/InCallView.module.css";
-import styles from "./CallFooter.module.css";
 import { useStaticViewModel } from "../state/ViewModel";
 import { ReactionsSenderContext } from "../reactions/useReactionsSender";
 import { type ReactionOption } from "../reactions";
@@ -176,32 +175,6 @@ export const WithAudioAndVideoOptions: Story = {
   },
 };
 
-export const StaysWhileAMenuIsOpen: Story = {
-  ...Default,
-  args: {
-    ...WithAudioAndVideoOptions.args,
-    // In a short window the footer overlays the call and hides itself.
-    asOverlay: true,
-    showFooter: true,
-  },
-  play: async ({ canvasElement }): Promise<void> => {
-    const footer = canvasElement.querySelector<HTMLElement>(
-      '[data-testid="footer-container"]',
-    )!;
-    await userEvent.click(
-      within(canvasElement).getByRole("button", { name: "Microphone" }),
-    );
-    await expect(document.body.querySelector('[role="menu"]')).not.toBeNull();
-
-    // The call hides the footer with this class.
-    footer.classList.add(styles.hidden);
-
-    // Read after the 0.15s fade, not mid-transition.
-    await new Promise((settled) => setTimeout(settled, 400));
-    await expect(getComputedStyle(footer).opacity).toBe("1");
-  },
-};
-
 export const AudioBusy: Story = {
   ...Default,
   args: {

src/components/CallFooter.tsx

@@ -99,7 +99,7 @@ export interface FooterState {
 
   /** Providing no options `[]` or `undefined` will imply that we dont have a audio fast switcher */
   audioOptions: MenuOptions[];
-  /** Output (speaker) devices. */
+  /** Output devices shown as their own section in the audio menu. */
   audioOutputOptions: MenuOptions[];
   /** Providing no options `[]` or `undefined` will imply that we dont have a audio fast switcher */
   videoOptions: MenuOptions[];

src/components/CallFooterViewModel.test.ts

@@ -116,6 +116,7 @@ describe("createCallFooterViewModel", () => {
 
     it("is withheld where the platform cannot route audio to a chosen device", () => {
       outputSelectionMock.mockReturnValue(false);
+      // Undefined is what renders the speaker section disabled.
       expect(buildFooterVm().selectAudioOutputOption$.value).toBeUndefined();
     });
 
@@ -144,7 +145,9 @@ describe("createCallFooterViewModel", () => {
             selected$: constant(undefined),
             select: vi.fn(),
           },
-          // As Safari: no outputs listed.
+          // Safari enumerates no output devices whatsoever. Reproduced by the
+          // condition rather than by the browser, so it is checked on the
+          // Linux CI runners that have no Safari to check it with.
           audioOutput: {
             available$: constant(new Map<string, DeviceLabel>()),
             selected$: constant(undefined),
@@ -155,7 +158,10 @@ describe("createCallFooterViewModel", () => {
         { showControls: true, header: HeaderStyle.Standard },
       );
 
-      // Empty, not undefined: undefined would hide the section.
+      // Empty rather than undefined: undefined means this menu has no notion
+      // of outputs at all, as the camera menu has none, and hides the section.
+      // Empty means there are none to list, and the menu still shows the
+      // section with a default in it, disabled.
       expect(vm.audioOutputOptions$.value).toEqual([]);
     });
   });

src/components/CallFooterViewModel.tsx

@@ -104,8 +104,8 @@ function buildDeviceBehaviors(
     selectedAudioOutput$: scope.behavior(
       mediaDevices.audioOutput.selected$.pipe(map((s) => s?.id)),
     ),
-    // Withheld where the platform can't route audio to a chosen device, which
-    // disables the speaker section.
+    // Safari and most Firefox builds cannot route audio to a chosen device at
+    // all. Withholding the callback is what renders the section disabled.
     selectAudioOutputOption$: constant(
       supportsAudioOutputSelection()
         ? mediaDevices.audioOutput.select

src/components/MediaMuteAndSwitchButton.module.css

@@ -41,29 +41,55 @@ Please see LICENSE in the repository root for full details.
   flex-direction: column;
 }
 
-/* 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. */
+/* Only the device lists scroll; the level meter stays put beneath them.
+   The bound comes from the measured height of the call area, set by the
+   component: the menu is portalled outside the root, so neither a container
+   query nor a viewport unit describes the space it is allowed to fill. */
 .deviceList {
   overflow-y: auto;
   min-block-size: 0;
   max-block-size: var(--device-list-max-height);
-  /* Keeps a row reached by keyboard clear of the sticky heading and meter. */
+  /* The heading stands over the head of this list and the level meter over its
+     foot. Scrolling a row flush to either edge would put it underneath one of
+     them, which is how a row reached by the keyboard ends up half-readable;
+     this keeps both their heights clear for anything the browser scrolls to.
+     Set by the component, which is the only thing that can measure them. */
   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. */
+/* Each section is headed by its own rule, which Compound draws under a menu
+   heading already. The heading spans the whole menu — the menu has no padding
+   of its own — so that rule runs edge to edge, stopping only where the frame
+   is, rather than inset as a separator between the sections would be.
+
+   Compound's spacing around it is the design's too, bar one thing: the design
+   leaves a section's first device further below the rule than Compound does —
+   measured off the mock, 27px from the rule to the top of the control, against
+   the 16px that Compound's 8px margin and the row's own 8px padding give. The
+   difference goes below the rule, so the rule stays tight under its own text
+   where Compound put it. */
 .menu h3 {
   margin-block-end: var(--cpd-space-5x);
 }
 
-/* And more above a heading that follows another section. */
+/* One section is set much further from the one above it than Compound's 8px
+   heading margin allows: measured off the mock, 41px from the last device's
+   control to the next heading's text, against the 22px we had. Only between
+   sections — the first heading keeps Compound's spacing, because the menu's
+   own padding is already above it. */
 .deviceList [role="group"] + [role="group"] h3 {
   margin-block-start: var(--cpd-space-7x);
 }
 
-/* Sticky within its own section. Opaque and inset a border width so it doesn't
-   paint over the menu's outline. */
+/* Each section's heading stays at the top of the scrollport while any of that
+   section is still in view, so a long list never leaves you wondering which
+   kind of device you are looking at. It leaves with its own section, because
+   sticky only holds while the group it belongs to is in view.
+
+   Opaque, and held a border width clear of the sides, for the same reason as
+   the meter below: this is a positioned element, so it paints above the
+   outline the menu draws its frame with, and would swallow it. */
 .sectionHeading {
   position: sticky;
   inset-block-start: 0;
@@ -72,23 +98,40 @@ Please see LICENSE in the repository root for full details.
   margin-block-start: var(--cpd-border-width-1);
 }
 
-/* Sticky at the foot of the microphone section; opaque and inset as above. */
+/* The meter belongs to the microphone section: it stays at the bottom of the
+   scrollport while that section is in view, and leaves with it when the list
+   is scrolled up to the speakers. The wrapper is deliberately unpositioned —
+   a positioned one paints above the menu's outline and swallows the frame
+   along this whole section. Sticky is resolved against the scroll container,
+   so it does not need one. */
+
 .stickyMeter {
   position: sticky;
   inset-block-end: 0;
+  /* Opaque, so the list does not show through it as it scrolls past. The menu
+     draws its frame as an outline inset by one border width, and the device
+     rows are transparent at rest, so this is the only thing that can cover it:
+     hold it clear on the sides and the bottom. */
   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
-   follow the mouse. Replaced by one shown only for keyboard focus. */
+/* Radix focuses whatever the pointer is over, so the browser's own ring marks
+   the item under the mouse. It cannot distinguish the two modalities here, so
+   it is suppressed and replaced by one that can.
+
+   Every kind of item the menu can focus, not only the device rows: the camera
+   menu's blur toggle is a checkbox item and a child of the menu rather than of
+   the list, and left out it kept the browser's own ring and followed the
+   pointer with it. */
 .menu [role^="menuitem"]:focus,
 .menu [role^="menuitem"]:focus-visible {
   outline: none;
 }
 
-.menu[data-focus-source="keyboard"] [role^="menuitem"]:focus {
+/* Shown only when the keyboard is what moved the focus. */
+.menu[data-focus-modality="keyboard"] [role^="menuitem"]:focus {
   outline: var(--cpd-border-width-2) solid var(--cpd-color-border-focused);
   outline-offset: calc(-1 * var(--cpd-border-width-2));
 }

src/components/MediaMuteAndSwitchButton.stories.tsx

@@ -21,14 +21,24 @@ const mediaDevices = new MediaDevices(globalScope, {
   controlledAudioDevices: false,
 });
 
-/** Supplies a microphone, a wavering tone: a story's invented device ids match no hardware. */
+/**
+ * Gives these stories a microphone to read.
+ *
+ * The menu opens a capture of whichever device it has been told is selected,
+ * and the devices in a story are invented: asking for one by an id no hardware
+ * answers to fails, and the meter reports that — correctly — as there being no
+ * microphone. So the story provides one rather than borrowing the machine's: a
+ * wavering tone played into a real MediaStream, which the meter then runs its
+ * own analyser over. Nothing here stands in for the meter itself.
+ */
 const WithAMicrophone: FC<{ children: ReactNode }> = ({ children }) => {
   useEffect(() => {
     const context = new AudioContext();
     const microphone = context.createMediaStreamDestination();
     const tone = context.createOscillator();
     const loudness = context.createGain();
-    // Wavers between a third and two thirds of full scale, so it reads as live.
+    // Swinging between about a third and two thirds of the range, so the meter
+    // reads as something live rather than as a level someone pinned there.
     const swing = context.createOscillator();
     const depth = context.createGain();
     loudness.gain.value = 0.25;
@@ -43,7 +53,8 @@ const WithAMicrophone: FC<{ children: ReactNode }> = ({ children }) => {
     const devices = navigator.mediaDevices;
     const openedForReal = devices.getUserMedia.bind(devices);
     const opened = Promise.resolve(microphone.stream);
-    // A fresh clone each time, so a caller stopping its tracks doesn't end the next.
+    // A fresh clone each time, so that a caller stopping its tracks when it is
+    // done does not take the microphone away from the next one.
     devices.getUserMedia = async (): Promise<MediaStream> =>
       (await opened).clone();
 
@@ -58,14 +69,26 @@ const WithAMicrophone: FC<{ children: ReactNode }> = ({ children }) => {
   return <>{children}</>;
 };
 
-/** Supplies a call-sized root. Without one the list is bounded by the whole Storybook frame. */
+/**
+ * Gives these stories the call area the menu belongs to.
+ *
+ * The menu sizes its device list against the space Element Call is drawn in,
+ * and takes that from a provider. Without one it falls back to the document
+ * body — which in a story is the whole of Storybook's frame, so the list is
+ * bounded by something far larger than the story it is drawn in and runs off
+ * the top of the canvas. Supplying a root is the same courtesy as supplying the
+ * devices: the story stands in for the call, so it has to say how big it is.
+ */
 const WithACallArea: FC<{ children: ReactNode }> = ({ children }) => {
   const [callArea, setCallArea] = useState<HTMLElement | null>(null);
   return (
     <div
       ref={setCallArea}
       style={{
-        // A call's size: anything smaller makes a short device list scroll.
+        // The size of a call, not of a thumbnail: the device list is bounded to
+        // a share of this, so a small area makes even a two-device menu scroll,
+        // which no real call does. Tall enough to leave the menu room to open
+        // upward and still be wholly on screen in the story's frame.
         blockSize: 720,
         display: "flex",
         alignItems: "flex-end",
@@ -99,6 +122,7 @@ type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
+    title: "SomeMenu",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -106,7 +130,10 @@ export const Default: Story = {
       { label: { type: "name", name: "Option 2" }, id: "2" },
     ],
     selectedOption: "1",
-    // The footer always passes an output list to the audio menu.
+    // The audio menu always has a speaker section: the footer hands it an
+    // output list whenever it draws the chevron at all, so a microphone menu
+    // with no speakers in it is a shape nothing in the app produces. Set here
+    // rather than in each story, since the others build on these.
     outputOptions: [
       { label: { type: "default", name: "Built-in Output" }, id: "default" },
       { label: { type: "name", name: "Headset" }, id: "spk2" },
@@ -121,6 +148,7 @@ export const Default: Story = {
 export const AudioMute: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: false,
     options: [
@@ -144,6 +172,7 @@ export const AudioMute: Story = {
 export const AudioUnmute: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -156,6 +185,7 @@ export const AudioUnmute: Story = {
 
 export const VideoMute: Story = {
   args: {
+    title: "Camera",
     iconsAndLabels: "video",
     enabled: false,
     options: [
@@ -169,6 +199,7 @@ export const VideoMute: Story = {
 
 export const VideoUnmute: Story = {
   args: {
+    title: "Camera",
     iconsAndLabels: "video",
     enabled: true,
     options: [
@@ -184,6 +215,7 @@ export const VideoUnmute: Story = {
 export const SpeakerAndMicrophoneSections: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -208,13 +240,16 @@ export const SpeakerAndMicrophoneSections: Story = {
     await userEvent.click(headset);
     await expect(args.onSelectOutput).toHaveBeenCalledWith("spk2");
 
-    // A few devices fit, so the list doesn't scroll.
+    // A handful of devices fits: only a list longer than the space it is given
+    // scrolls, and a menu that scrolled at four devices would be bounded by
+    // something far smaller than the call it is drawn in.
     const list = document.body.querySelector<HTMLElement>(
       `.${styles.deviceList}`,
     )!;
     await expect(list.scrollHeight).toBe(list.clientHeight);
 
-    // Each section is headed by its own edge-to-edge rule, with no separator.
+    // Each section is headed by its own rule, running the full width of the
+    // menu rather than inset — and nothing divides the sections besides.
     const menu = document.body.querySelector("[role='menu']")!;
     await expect(
       document.body.querySelectorAll("[role='separator']"),
@@ -229,14 +264,16 @@ export const SpeakerAndMicrophoneSections: Story = {
       await expect(
         Number.parseFloat(getComputedStyle(rule).borderBottomWidth),
       ).toBeGreaterThan(0);
-      // Edge to edge, within the frame.
+      // Edge to edge, stopping only where the menu's frame is drawn.
       const box = rule.getBoundingClientRect();
       await expect(box.left - frame.left).toBeLessThanOrEqual(2);
       await expect(frame.right - box.right).toBeLessThanOrEqual(2);
     }
 
-    // The first device sits further below the rule than from the menu's edge.
-    // Asserted as a relationship, not pixels: the asymmetry is the design.
+    // A section's first device sits further below the rule than it does from
+    // the menu's edge. Stated as the relationship rather than a number: what
+    // the design asks for is the asymmetry, and Compound's own heading margin
+    // alone would make the two equal.
     const control = document.body.querySelector("input[type='radio']")!;
     const ruleBottom = headings[0]
       .querySelector("h3")!
@@ -244,8 +281,8 @@ export const SpeakerAndMicrophoneSections: Story = {
     const box = control.getBoundingClientRect();
     await expect(box.top - ruleBottom).toBeGreaterThan(box.left - frame.left);
 
-    // And a section stands further from the one above than from its own first
-    // device.
+    // And one section stands further from the one above it than a heading does
+    // from its own first device — again the relationship, not a number.
     const groups = document.body.querySelectorAll("[role='group']");
     const speakers = groups[0].querySelectorAll("input[type='radio']");
     const lastSpeaker = speakers[speakers.length - 1].getBoundingClientRect();
@@ -259,6 +296,7 @@ export const SpeakerAndMicrophoneSections: Story = {
 export const OutputCannotBeChosen: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -288,6 +326,7 @@ export const OutputCannotBeChosen: Story = {
 export const OnlyOneDevice: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [{ label: { type: "name", name: "Microphone 1" }, id: "mic1" }],
@@ -300,7 +339,7 @@ export const OnlyOneDevice: Story = {
     const canvas = within(canvasElement);
     await userEvent.click(canvas.getByRole("button", { name: "Microphone" }));
 
-    // Shown, disabled, rather than hidden.
+    // Shown rather than hidden, so the menu keeps its shape everywhere.
     const only = await within(document.body).findByRole("menuitemradio", {
       name: "Microphone 1",
     });
@@ -308,10 +347,14 @@ export const OnlyOneDevice: Story = {
   },
 };
 
-/** A requested device hasn't arrived: nothing in either section can be picked. */
+/**
+ * A device has been asked for and has not arrived. Nothing in either section
+ * can be picked until it does, so a second request cannot overtake the first.
+ */
 export const SelectionSettling: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -331,7 +374,8 @@ export const SelectionSettling: Story = {
     await userEvent.click(canvas.getByRole("button", { name: "Microphone" }));
     const menu = within(document.body);
 
-    // selectedOption never changes, so the request stays in flight.
+    // The story never changes `selectedOption`, which is what a device that has
+    // not taken effect yet looks like from here.
     await userEvent.click(
       await menu.findByRole("menuitemradio", { name: "Microphone 2" }),
     );
@@ -343,12 +387,17 @@ export const SelectionSettling: Story = {
 };
 
 /**
- * The ring shows for keyboard focus only. Asserted on the painted outline:
- * asserting data-focus-source would still pass with the CSS rule deleted.
+ * The focus ring belongs to the keyboard. Radix focuses whatever the pointer is
+ * over, so a ring that followed focus alone would trail the mouse.
+ *
+ * Asserted on the painted outline rather than on `data-focus-modality`: the
+ * attribute is what the stylesheet keys off, so asserting it would pass even
+ * with the rule deleted.
  */
 export const KeyboardFocusRing: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -379,10 +428,14 @@ export const KeyboardFocusRing: Story = {
   },
 };
 
-/** The list scrolls; the meter stays at the foot of the microphone section. */
+/**
+ * More devices than the menu can show. The list scrolls, and the meter stays at
+ * the foot of the Microphone section rather than scrolling away with it.
+ */
 export const ManyDevices: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: Array.from({ length: 20 }, (_, i) => ({
@@ -402,8 +455,11 @@ export const ManyDevices: Story = {
     await userEvent.click(canvas.getByRole("button", { name: "Microphone" }));
     const menu = within(document.body);
 
-    // The sticky wrapper rather than the meter: without a fake microphone (as on
-    // WebKit) the meter shows a message instead of a level.
+    // The scroll container and the opaque sticky wrapper, named rather than
+    // walked: the nesting between them is layout, and it moves. The wrapper
+    // rather than the meter itself, because this story is about where the meter
+    // sits, not what it reads — without a fake microphone, as on WebKit, it
+    // says it has no permission instead of showing a level.
     const list = document.body.querySelector<HTMLElement>(
       `.${styles.deviceList}`,
     )!;
@@ -416,8 +472,10 @@ export const ManyDevices: Story = {
     });
     await expect(list.scrollHeight).toBeGreaterThan(list.clientHeight);
 
-    // Scrolled so the microphone section starts at the top: only there does a
-    // pinned meter differ from one that is simply last.
+    // Scrolled so the Microphone section starts at the top of the scrollport.
+    // Its devices then run past the bottom, which is the position that tells a
+    // pinned meter from one that simply happens to be the last element: at the
+    // very bottom of the list the two look identical.
     const group = await menu.findByRole("group", { name: "Microphone" });
     list.scrollTop +=
       group.getBoundingClientRect().top - list.getBoundingClientRect().top;
@@ -430,30 +488,39 @@ export const ManyDevices: Story = {
     await expect(pinned.bottom).toBeLessThanOrEqual(scrollport.bottom + 1);
     await expect(pinned.top).toBeGreaterThanOrEqual(scrollport.top - 1);
 
-    // The whole menu is on screen, not bounded by the document.
+    // The whole menu is on screen. It opens upward from the foot of the call,
+    // so a list bounded by something bigger than the call — the document, say —
+    // runs off the top and takes the speakers with it.
     const frame = document.body
       .querySelector("[role='menu']")!
       .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.
+    // The meter is the one opaque thing in the menu, so it is the one thing
+    // that can cover the frame. Its box has to stay inside the menu's own. The
+    // paint itself needs a screenshot; this pins the geometry that decides it.
     await expect(pinned.left).toBeGreaterThan(frame.left);
     await expect(pinned.right).toBeLessThan(frame.right);
   },
 };
 
-/** Painted outline width, in px. */
+/** The painted outline width, in pixels, however the stylesheet spells it. */
 function outlineWidth(element: HTMLElement): number {
   const { outlineStyle, outlineWidth } = getComputedStyle(element);
   if (outlineStyle === "none") return 0;
   return Number.parseFloat(outlineWidth) || 0;
 }
 
-/** Safari lists no outputs: a disabled, selected Default stands in. */
+/**
+ * A platform that enumerates no output devices and offers no way to choose one
+ * — Safari. The section still names where audio is going, disabled, rather than
+ * leaving a heading with nothing under it.
+ */
 export const OutputNotEnumerated: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -476,10 +543,19 @@ export const OutputNotEnumerated: Story = {
   },
 };
 
-/** The meter's icon shares the radio controls' centre line; only a real browser lays this out. */
+/**
+ * The level meter's icon sits on the same centre line as the radio controls of
+ * the devices above it.
+ *
+ * Held here because it is a fact about two components side by side, and because
+ * layout decides it: the meter's row is inset to keep the menu's frame clear,
+ * and its icon is a different size from a radio control, so the padding that
+ * lines them up is arithmetic that would otherwise go stale in silence.
+ */
 export const MeterAlignsWithTheDeviceRows: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: [
@@ -505,19 +581,29 @@ export const MeterAlignsWithTheDeviceRows: Story = {
   },
 };
 
-/** Inline-axis centre of an element. */
+/** Where an element sits on the inline axis, at its middle. */
 function centre(element: Element): number {
   const box = element.getBoundingClientRect();
   return box.left + box.width / 2;
 }
 
-/** Every row the keyboard reaches is fully visible, not under a heading or the meter. */
+/**
+ * Walking the device list with the keyboard, all the way to the last entry.
+ *
+ * The level meter stands over the foot of the list, so a row scrolled flush to
+ * the bottom edge arrives underneath it and can only half be read. Nothing in
+ * the DOM says an element is covered, so this compares where the two were
+ * actually drawn.
+ */
 export const KeyboardReachesEveryDevice: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
-    // Enough to scroll both ways, so either end can hide a row.
+    // Enough of them that the list scrolls well past its own height, so that
+    // arrowing back up has to scroll too — which is where the heading can hide
+    // a row, as the meter can on the way down.
     options: Array.from({ length: 20 }, (_, i) => ({
       label: { type: "name" as const, name: `Microphone ${i + 1}` },
       id: `mic${i + 1}`,
@@ -542,7 +628,8 @@ export const KeyboardReachesEveryDevice: Story = {
       return element;
     });
 
-    // Drawn over the list: the sticky headings and the meter.
+    // Everything that is drawn over the scrolling list: a heading holds the top
+    // while its section is in view, the meter holds the foot.
     const overlays = [
       meter,
       ...document.body.querySelectorAll<HTMLElement>(
@@ -551,23 +638,32 @@ export const KeyboardReachesEveryDevice: Story = {
     ];
     const items = within(document.body).getAllByRole("menuitemradio");
 
-    // Down to the last device and back up.
+    // Down to the last device, as someone reading the list would, and back up
+    // again: a row can be hidden at either end.
     for (const key of ["{ArrowDown}", "{ArrowUp}"])
       for (let i = 0; i < items.length; i++) {
         await userEvent.keyboard(key);
         const focused = document.activeElement as HTMLElement;
         await expect(focused).toHaveRole("menuitemradio");
-        // Checked as overlap: a heading only covers rows while its section is on
-        // screen.
+        // Nothing is drawn over the row the keyboard has just reached. Stated
+        // as overlap rather than as an edge, because whether a heading is in
+        // the way depends on whether its section is still on screen.
         await expect(overlapping(focused, overlays)).toBeLessThanOrEqual(1);
       }
   },
 };
 
-/** A section's heading stays at the top while the section is in view, and leaves with it. */
+/**
+ * A long list scrolled well into the microphones.
+ *
+ * The heading of the section you are in stays at the top of the list, so it is
+ * always clear which kind of device the rows below are. It leaves with its own
+ * section rather than stacking with the next one.
+ */
 export const HeadingsStayWhileScrolling: Story = {
   args: {
     ...Default.args,
+    title: "Microphone",
     iconsAndLabels: "audio",
     enabled: true,
     options: Array.from({ length: 20 }, (_, i) => ({
@@ -591,12 +687,14 @@ export const HeadingsStayWhileScrolling: Story = {
       `.${styles.deviceList}`,
     )!;
     const group = await menu.findByRole("group", { name: "Microphone" });
-    // By class: the heading is aria-hidden, and its group carries the name.
+    // By class, not role: the heading is aria-hidden decoration, because the
+    // group it belongs to is what carries the name.
     const heading = group.querySelector<HTMLElement>(
       `.${styles.sectionHeading}`,
     )!;
 
-    // Far enough that the heading is only on screen if it is stuck there.
+    // Far enough in that the heading's own place in the list is well above the
+    // top of the scrollport: it is only still on screen if it is stuck there.
     list.scrollTop +=
       group.getBoundingClientRect().top - list.getBoundingClientRect().top + 80;
 
@@ -607,7 +705,7 @@ export const HeadingsStayWhileScrolling: Story = {
     await expect(heading.getBoundingClientRect().bottom).toBeGreaterThan(
       scrollport.top,
     );
-    // Clear of the menu's frame.
+    // And it keeps clear of the menu's frame, as the meter does.
     const frame = document.body
       .querySelector("[role='menu']")!
       .getBoundingClientRect();
@@ -617,7 +715,13 @@ export const HeadingsStayWhileScrolling: Story = {
   },
 };
 
-/** How far the most overlapping of `overlays` covers `element`, in px. */
+/**
+ * How far an element is covered, in pixels, by the most overlapping of others.
+ *
+ * Nothing in the DOM says an element is obscured, and an element scrolled flush
+ * to an edge of its container looks no different there from one a sticky
+ * heading is sitting on top of. The boxes are the only witness.
+ */
 function overlapping(element: Element, overlays: Element[]): number {
   const box = element.getBoundingClientRect();
   return overlays.reduce((worst, overlay) => {
@@ -628,7 +732,13 @@ function overlapping(element: Element, overlays: Element[]): number {
   }, 0);
 }
 
-/** The blur toggle gets the keyboard ring too: it is the menu's child, not the list's. */
+/**
+ * The camera menu's blur toggle, which the keyboard reaches after the cameras.
+ *
+ * It is a checkbox item and a child of the menu rather than of the device list,
+ * so a focus ring hung on the list alone left it with the browser's own —
+ * which follows the pointer, and is what the ring exists to replace.
+ */
 export const FocusRingCoversTheBlurToggle: Story = {
   args: {
     ...VideoUnmute.args,
@@ -643,14 +753,16 @@ export const FocusRingCoversTheBlurToggle: Story = {
       name: /Blur background/,
     });
 
-    // Arrow down past the cameras to the toggle.
+    // Arrowed down past the cameras to the toggle, which is the last thing in
+    // the menu.
     for (let i = 0; i < 6 && document.activeElement !== toggle; i++)
       await userEvent.keyboard("{ArrowDown}");
     await expect(document.activeElement).toBe(toggle);
     // The same ring the device rows get.
     await expect(outlineWidth(toggle)).toBeGreaterThan(0);
 
-    // And the pointer takes it away, with the toggle still focused.
+    // And the pointer takes it away again, with the toggle still focused — so
+    // there is something to light up and it is not lit.
     await userEvent.hover(toggle);
     await expect(document.activeElement).toBe(toggle);
     await expect(outlineWidth(toggle)).toBe(0);

src/components/MediaMuteAndSwitchButton.test.tsx

@@ -5,7 +5,7 @@ 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, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { axe } from "vitest-axe";
 import {
   act,
@@ -15,51 +15,37 @@ import {
   type RenderResult,
 } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { Profiler, type JSX, useState, type ReactNode } from "react";
+import { type JSX, useState, type ReactNode } from "react";
 import { TooltipProvider } from "@vector-im/compound-web";
 
-import {
-  MediaMuteAndSwitchButton,
-  type MenuOptions,
-} from "./MediaMuteAndSwitchButton";
+import { MediaMuteAndSwitchButton } from "./MediaMuteAndSwitchButton";
 import { MediaDevicesContext } from "../MediaDevicesContext";
 import { type MediaDevices } from "../state/MediaDevices";
-import { restoreAudioCapture, stubAudioCapture } from "../utils/test";
 
 interface RenderOptions {
   requestDeviceNames: () => void;
 }
 
-function withProviders(
+function renderComponent(
   component: ReactNode,
   { requestDeviceNames = (): void => {} }: Partial<RenderOptions> = {},
-): JSX.Element {
-  return (
+): RenderResult {
+  return render(
     <TooltipProvider>
       <MediaDevicesContext
         value={{ requestDeviceNames } as unknown as MediaDevices}
       >
         {component}
       </MediaDevicesContext>
-    </TooltipProvider>
+    </TooltipProvider>,
   );
 }
 
-function renderComponent(
-  component: ReactNode,
-  options: Partial<RenderOptions> = {},
-): RenderResult {
-  return render(withProviders(component, options));
-}
-
 describe("MediaMuteAndSwitchButton", () => {
-  // Only one test stubs the capture; don't let it leak into the rest.
-  afterEach(restoreAudioCapture);
-
   test("renders", () => {
     const { container } = renderComponent(
       <TooltipProvider>
-        <MediaMuteAndSwitchButton iconsAndLabels={"audio"} />
+        <MediaMuteAndSwitchButton title={"Switcher"} iconsAndLabels={"audio"} />
       </TooltipProvider>,
     );
     expect(container).toMatchSnapshot();
@@ -71,7 +57,11 @@ describe("MediaMuteAndSwitchButton", () => {
       enabled: boolean,
     ): RenderResult => {
       return renderComponent(
-        <MediaMuteAndSwitchButton iconsAndLabels={type} enabled={enabled} />,
+        <MediaMuteAndSwitchButton
+          title={"Switcher"}
+          iconsAndLabels={type}
+          enabled={enabled}
+        />,
       );
     };
     const renderAudioEndabled = renderLabels("audio", true);
@@ -98,6 +88,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onMute = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title={"Switcher"}
         onMuteClick={onMute}
         iconsAndLabels="audio"
         enabled={true}
@@ -114,6 +105,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onMute = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title={"Switcher"}
         onMuteClick={onMute}
         iconsAndLabels="audio"
         enabled={true}
@@ -134,6 +126,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onMute = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title={"Switcher"}
         onMuteClick={onMute}
         iconsAndLabels="video"
         enabled={true}
@@ -153,7 +146,11 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const requestDeviceNames = vi.fn();
     renderComponent(
-      <MediaMuteAndSwitchButton iconsAndLabels="audio" enabled />,
+      <MediaMuteAndSwitchButton
+        title="Switcher"
+        iconsAndLabels="audio"
+        enabled
+      />,
       { requestDeviceNames },
     );
 
@@ -167,6 +164,7 @@ describe("MediaMuteAndSwitchButton", () => {
     renderComponent(
       <>
         <MediaMuteAndSwitchButton
+          title="Switcher"
           iconsAndLabels="audio"
           enabled
           options={[
@@ -176,6 +174,7 @@ describe("MediaMuteAndSwitchButton", () => {
           selectedOption="mic1"
         />
         <MediaMuteAndSwitchButton
+          title="Switcher"
           iconsAndLabels="video"
           enabled
           options={[
@@ -201,6 +200,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onSelect = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -224,6 +224,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onSelect = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -252,6 +253,7 @@ describe("MediaMuteAndSwitchButton", () => {
       const [selectedOption, setSelectedOption] = useState("mic1");
       return (
         <MediaMuteAndSwitchButton
+          title="Switcher"
           iconsAndLabels="audio"
           enabled={true}
           options={[
@@ -311,6 +313,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onVideoBlurToggle = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="video"
         enabled={true}
         videoBlurToggleClick={onVideoBlurToggle}
@@ -335,6 +338,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -358,6 +362,7 @@ describe("MediaMuteAndSwitchButton", () => {
       const [selectedOption, setSelectedOption] = useState("mic1");
       return (
         <MediaMuteAndSwitchButton
+          title="Switcher"
           iconsAndLabels="audio"
           enabled={true}
           options={[
@@ -384,7 +389,8 @@ describe("MediaMuteAndSwitchButton", () => {
       screen.getByRole("menuitemradio", { name: "Microphone 2" }),
     );
 
-    // In flight: nothing else can be picked, in either section.
+    // In flight: nothing else can be picked, in either section, so a second
+    // request cannot overtake the first.
     for (const name of ["Microphone 1", "Speakers", "Headset"]) {
       expect(screen.getByRole("menuitemradio", { name })).toHaveAttribute(
         "aria-disabled",
@@ -397,7 +403,7 @@ describe("MediaMuteAndSwitchButton", () => {
       await promise;
     });
 
-    // Settled: selectable again.
+    // Settled: choosable again.
     expect(
       screen.getByRole("menuitemradio", { name: "Microphone 1" }),
     ).not.toHaveAttribute("aria-disabled", "true");
@@ -406,144 +412,11 @@ describe("MediaMuteAndSwitchButton", () => {
     ).not.toHaveAttribute("aria-disabled", "true");
   });
 
-  test("lets go of a device switch that never arrives", async () => {
-    const user = userEvent.setup();
-    // onSelect never reports back, as when a device is removed mid-switch.
-    const { getByRole } = renderComponent(
-      <MediaMuteAndSwitchButton
-        iconsAndLabels="audio"
-        enabled={true}
-        options={[
-          { label: { type: "name", name: "Microphone 1" }, id: "mic1" },
-          { label: { type: "name", name: "Microphone 2" }, id: "mic2" },
-        ]}
-        selectedOption="mic1"
-        onSelect={vi.fn()}
-        outputOptions={[
-          { label: { type: "name", name: "Speakers" }, id: "spk1" },
-          { label: { type: "name", name: "Headset" }, id: "spk2" },
-        ]}
-        selectedOutputOption="spk1"
-        onSelectOutput={vi.fn()}
-      />,
-    );
-
-    await user.click(getByRole("button", { name: "Microphone" }));
-    await user.click(
-      screen.getByRole("menuitemradio", { name: "Microphone 2" }),
-    );
-    await user.keyboard("{Escape}");
-    await user.click(getByRole("button", { name: "Microphone" }));
-
-    for (const name of ["Microphone 1", "Speakers", "Headset"]) {
-      expect(screen.getByRole("menuitemradio", { name })).not.toHaveAttribute(
-        "aria-disabled",
-        "true",
-      );
-    }
-  });
-
-  test("lets go of a device switch whose device is unplugged", async () => {
-    const user = userEvent.setup();
-    const mics: MenuOptions[] = [
-      { label: { type: "name", name: "Microphone 1" }, id: "mic1" },
-      { label: { type: "name", name: "Microphone 2" }, id: "mic2" },
-    ];
-    const menu = (options: MenuOptions[]): JSX.Element => (
-      <MediaMuteAndSwitchButton
-        iconsAndLabels="audio"
-        enabled={true}
-        options={options}
-        selectedOption="mic1"
-        onSelect={vi.fn()}
-        outputOptions={[
-          { label: { type: "name", name: "Speakers" }, id: "spk1" },
-          { label: { type: "name", name: "Headset" }, id: "spk2" },
-        ]}
-        selectedOutputOption="spk1"
-        onSelectOutput={vi.fn()}
-      />
-    );
-
-    const { getByRole, rerender } = renderComponent(menu(mics));
-    await user.click(getByRole("button", { name: "Microphone" }));
-    await user.click(
-      screen.getByRole("menuitemradio", { name: "Microphone 2" }),
-    );
-
-    // The second microphone is unplugged before the switch lands.
-    rerender(withProviders(menu(mics.slice(0, 1))));
-
-    // Selectable again without closing the menu.
-    expect(
-      screen.getByRole("menuitemradio", { name: "Headset" }),
-    ).not.toHaveAttribute("aria-disabled", "true");
-  });
-
-  test("moves the level without re-rendering anything", async () => {
-    // The level is drawn into the DOM, so a moving level commits nothing.
-    const capture = stubAudioCapture();
-    const user = userEvent.setup();
-    let commits = 0;
-
-    const { getByRole } = renderComponent(
-      <Profiler
-        id="menu"
-        onRender={(): void => {
-          commits++;
-        }}
-      >
-        <MediaMuteAndSwitchButton
-          iconsAndLabels="audio"
-          enabled={true}
-          options={[
-            { label: { type: "name", name: "Microphone 1" }, id: "mic1" },
-            { label: { type: "name", name: "Microphone 2" }, id: "mic2" },
-          ]}
-          selectedOption="mic1"
-          onSelect={vi.fn()}
-          outputOptions={[
-            { label: { type: "name", name: "Speakers" }, id: "spk1" },
-            { label: { type: "name", name: "Headset" }, id: "spk2" },
-          ]}
-          selectedOutputOption="spk1"
-          onSelectOutput={vi.fn()}
-        />
-      </Profiler>,
-    );
-
-    await user.click(getByRole("button", { name: "Microphone" }));
-    capture.grant();
-    await vi.waitFor(() => expect(capture.contexts).toHaveLength(1));
-    const meter = await screen.findByRole("meter");
-    // The capture's arrival is one render: the idle level swapped for its own.
-    await act(async () => {});
-    const settled = commits;
-
-    // The meter smooths by elapsed time, so hand-driven frames need a clock.
-    let elapsed = performance.now();
-    const clock = vi
-      .spyOn(performance, "now")
-      .mockImplementation(() => (elapsed += 16));
-
-    // One frame per task, as a browser delivers them: one act() would batch them.
-    for (let step = 1; step <= 8; step++) {
-      capture.speak(step / 8);
-      await act(async () => {
-        capture.drawFrames(1);
-        await Promise.resolve();
-      });
-    }
-    clock.mockRestore();
-
-    expect(meter.getAttribute("aria-valuenow")).not.toBe("0");
-    expect(commits - settled).toBe(0);
-  });
-
   test("camera menu uses the same selection pattern and keeps the blur toggle", async () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="video"
         enabled={true}
         options={[
@@ -558,8 +431,10 @@ describe("MediaMuteAndSwitchButton", () => {
 
     await user.click(getByRole("button", { name: "Camera" }));
 
+    // Same selection pattern as the microphone menu.
     screen.getByRole("menuitemradio", { name: "Camera 1", checked: true });
     screen.getByRole("menuitemradio", { name: "Camera 2", checked: false });
+    // And background blur is still reachable from here.
     expect(
       screen.getByRole("menuitemcheckbox", { name: "Blur background" }),
     ).toBeInTheDocument();
@@ -569,6 +444,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -583,25 +459,27 @@ describe("MediaMuteAndSwitchButton", () => {
     await user.click(getByRole("button", { name: "Microphone" }));
     const list = screen
       .getByRole("menuitemradio", { name: "Microphone 1" })
-      .closest("[data-focus-source]");
+      .closest("[data-focus-modality]");
 
-    // The menu focuses whatever the pointer is over, so focus alone says nothing.
-    expect(list).toHaveAttribute("data-focus-source", "pointer");
+    // The menu focuses whatever the pointer is over, so focus alone says
+    // nothing about how someone is navigating.
+    expect(list).toHaveAttribute("data-focus-modality", "pointer");
 
     await user.keyboard("{ArrowDown}");
-    expect(list).toHaveAttribute("data-focus-source", "keyboard");
+    expect(list).toHaveAttribute("data-focus-modality", "keyboard");
 
     await user.pointer({
       target: screen.getByRole("menuitemradio", { name: "Microphone 2" }),
       coords: { clientX: 10, clientY: 10 },
     });
-    expect(list).toHaveAttribute("data-focus-source", "pointer");
+    expect(list).toHaveAttribute("data-focus-modality", "pointer");
   });
 
   test("marks the selected device with the accent fill", async () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -619,7 +497,8 @@ describe("MediaMuteAndSwitchButton", () => {
       .getByRole("menuitemradio", { name: "Microphone 2" })
       .querySelector("input[type=radio]");
     expect(selected).toBeChecked();
-    // readOnly would paint the selected radio muted.
+    // A read-only control is painted muted, which loses the accent fill that
+    // marks the selection and makes the menu differ from settings.
     expect(selected).not.toHaveAttribute("readonly");
   });
 
@@ -627,6 +506,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -646,6 +526,8 @@ describe("MediaMuteAndSwitchButton", () => {
 
     await user.click(getByRole("button", { name: "Microphone" }));
 
+    // Includes the menu's own structure: wrappers between the menu and its
+    // items break the relationship the roles describe.
     const menu = document.querySelector('[role="menu"]');
     expect(await axe(menu as HTMLElement)).toHaveNoViolations();
   });
@@ -654,6 +536,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -687,6 +570,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -723,6 +607,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onSelectOutput = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -750,6 +635,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const onSelect = vi.fn();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -762,7 +648,7 @@ describe("MediaMuteAndSwitchButton", () => {
 
     await user.click(getByRole("button", { name: "Microphone" }));
 
-    // Shown, but not selectable.
+    // Shown rather than hidden, so the menu keeps its shape, but not choosable.
     const only = screen.getByRole("menuitemradio", { name: "Microphone 1" });
     expect(only).toHaveAttribute("aria-disabled", "true");
   });
@@ -771,6 +657,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -779,7 +666,8 @@ describe("MediaMuteAndSwitchButton", () => {
         ]}
         selectedOption="mic1"
         onSelect={vi.fn()}
-        // As Safari: no outputs listed.
+        // Safari enumerates no output devices at all, and offers no way to
+        // choose one.
         outputOptions={[]}
         selectedOutputOption={undefined}
         onSelectOutput={undefined}
@@ -788,6 +676,8 @@ describe("MediaMuteAndSwitchButton", () => {
 
     await user.click(getByRole("button", { name: "Microphone" }));
 
+    // A heading with nothing under it says the feature is broken. Audio is
+    // playing somewhere, so the section names that somewhere and disables it.
     const speakers = screen
       .getAllByRole("group")
       .find((group) => group.getAttribute("aria-label") === "Speaker")!;
@@ -795,6 +685,8 @@ describe("MediaMuteAndSwitchButton", () => {
     expect(entries).toHaveLength(1);
     expect(entries[0]).toHaveAccessibleName("Default");
     expect(entries[0]).toHaveAttribute("aria-disabled", "true");
+    // And marked as the selection: it is where audio is going, so an unchecked
+    // lone entry would read as nothing being chosen at all.
     expect(entries[0]).toHaveAttribute("aria-checked", "true");
     expect(
       within(entries[0]).getByRole("radio", { hidden: true }),
@@ -805,6 +697,7 @@ describe("MediaMuteAndSwitchButton", () => {
     const user = userEvent.setup();
     const { getByRole } = renderComponent(
       <MediaMuteAndSwitchButton
+        title="Switcher"
         iconsAndLabels="audio"
         enabled={true}
         options={[
@@ -818,6 +711,7 @@ describe("MediaMuteAndSwitchButton", () => {
           { label: { type: "name", name: "Headset" }, id: "spk2" },
         ]}
         selectedOutputOption="spk1"
+        // No callback: nothing can be picked here.
         onSelectOutput={undefined}
       />,
     );
@@ -830,6 +724,7 @@ describe("MediaMuteAndSwitchButton", () => {
     expect(
       screen.getByRole("menuitemradio", { name: "Headset" }),
     ).toHaveAttribute("aria-disabled", "true");
+    // The microphone section is unaffected.
     expect(
       screen.getByRole("menuitemradio", { name: "Microphone 2" }),
     ).not.toHaveAttribute("aria-disabled", "true");

src/components/MediaMuteAndSwitchButton.tsx

@@ -39,7 +39,8 @@ import {
 import { useMediaDevices } from "../MediaDevicesContext";
 import { useRootElement } from "../RootElementContext";
 import { observeElementSize$ } from "../utils/elementSize";
-import { LiveMicrophoneLevelMeter } from "./MicrophoneLevelMeter";
+import { MicrophoneLevelMeter } from "./MicrophoneLevelMeter";
+import { useMicrophoneLevel } from "./useMicrophoneLevel";
 
 export interface MenuOptions {
   label: DeviceLabel | AudioOutputDeviceLabel;
@@ -47,6 +48,11 @@ export interface MenuOptions {
 }
 
 export interface MediaMuteAndSwitchButtonProps {
+  /**
+   * The accessible name of the menu. Defaults to a translated name for the
+   * media kind. Never shown: each section carries its own heading.
+   */
+  title?: string;
   /** If the Mute button is enabled */
   enabled?: boolean;
   /** Callback if the mute button is clicked */
@@ -58,11 +64,17 @@ export interface MediaMuteAndSwitchButtonProps {
   options?: MenuOptions[];
   /** The option that will currently be rendered as the selected option */
   selectedOption?: string;
-  /** Output (speaker) devices. Audio menu only. */
+  /**
+   * Output (speaker) devices, shown as their own section above the input
+   * section. Audio menu only; omitted entirely for video.
+   */
   outputOptions?: MenuOptions[];
   /** The output option currently rendered as selected */
   selectedOutputOption?: string;
-  /** Picks an output device. Undefined disables the speaker section. */
+  /**
+   * Called when an output device is picked. Undefined means no output can be
+   * chosen here, and the section renders disabled.
+   */
   onSelectOutput?: (id: string) => void;
   videoBlurToggleClick?: () => void;
   videoBlurEnabled?: boolean;
@@ -75,16 +87,33 @@ export interface MediaMuteAndSwitchButtonProps {
 
 const BLUR_ID = "blur";
 
-/** Id of the placeholder "Default" row, shown when the platform lists no outputs. */
+/**
+ * Stands for wherever the platform is sending audio, where it will not say.
+ *
+ * Not a device id the browser would recognise: nothing can be selected on a
+ * platform that lists no outputs, so this is only ever shown, never sent.
+ */
 const DEFAULT_OUTPUT_ID = "default";
 
-/** Largest share of the call area's height the device list may take. */
+/**
+ * The share of the call area the device list may fill.
+ *
+ * The menu carries its headings and the level meter as well, and a list that
+ * took the whole call would hide the call it belongs to.
+ */
 const LIST_SHARE_OF_CALL = 0.6;
 
-/** Smallest device list height in px, so a short call still shows more than one device. */
+/**
+ * The shortest the device list may be, whatever the call measures.
+ *
+ * A share alone collapses in a small call to a list that shows one device and
+ * gives no sign that there are others. Scrolling a short list is the better
+ * failure.
+ */
 const MIN_LIST_HEIGHT = 160;
 
 export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
+  title,
   enabled,
   busy,
   onMuteClick,
@@ -98,34 +127,49 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
   videoBlurToggleClick,
   onSelect,
 }) => {
-  // Requested but not yet selected. Keyed by kind too, since Chrome uses
-  // "default" for both an input and an output.
+  // Which device we have asked for but not yet been given. Carries the kind as
+  // well as the id, because an input and an output can share an id: "default"
+  // names both on Chrome.
   const [plannedSelection, setPlannedSelection] = useState<{
     kind: "input" | "output";
     id: string;
   } | null>(null);
   const [menuOpen, setMenuOpen] = useState(false);
-  const onOpenChange = useCallback((open: boolean): void => {
-    setMenuOpen(open);
-    // Drop a request that never arrived.
-    if (!open) setPlannedSelection(null);
-  }, []);
   const isBusy = busy ?? false;
   const { t } = useTranslation();
   const devices = useMediaDevices();
 
+  // Radix focuses whatever the pointer is over, so the browser's own
+  // :focus-visible cannot tell us whether a person is navigating by keyboard:
+  // Chromium answers yes to everything after any key press, Firefox answers no
+  // to programmatic focus. Track it ourselves and let the styling follow.
   /**
-   * Records on the menu whether the keyboard or the pointer moved focus, for
-   * the focus ring. `:focus-visible` can't tell: Radix focuses whatever the
-   * pointer is over. Listened for on the menu, not the document, so a second
-   * Element Call on the page doesn't answer for this one.
+   * Tracks which modality moved the focus, for as long as the list is mounted.
+   *
+   * A ref rather than an effect on `menuOpen`: that state is ours, the open
+   * menu is Radix's, and the two do not commit together — an effect keyed on
+   * ours can run before Radix has mounted the content, with nothing to attach
+   * to. The list existing is the honest signal that the menu is open.
+   *
+   * Recorded on the menu rather than held in state, because every item the menu
+   * can focus has to answer to it — the device rows and the camera menu's blur
+   * toggle, which is the menu's child and not the list's — and because which
+   * modality someone is using changes nothing that has to be rendered again.
    */
-  const trackFocusSource = useCallback(
+  const trackFocusModality = useCallback(
     (list: HTMLDivElement | null): (() => void) | undefined => {
+      // Watched on the menu, not on the document. Element Call can be mounted
+      // more than once in a host's page, and the menu is portalled out of the
+      // call root, so a document listener would also answer for a key pressed
+      // in the other instance, or in the host's own page. The menu rather than
+      // the list, because the first arrow key arrives while the menu itself
+      // holds focus, above anything we render.
       const menu = list?.closest<HTMLElement>('[role="menu"]');
       if (menu === null || menu === undefined) return;
-      const record = (source: "keyboard" | "pointer"): void => {
-        menu.dataset.focusSource = source;
+      // Each opening starts over: the modality belongs to whoever is using this
+      // menu now, not to whoever last used it.
+      const record = (modality: "keyboard" | "pointer"): void => {
+        menu.dataset.focusModality = modality;
       };
       record("pointer");
       const usedKeyboard = (): void => record("keyboard");
@@ -140,12 +184,18 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
     [],
   );
 
-  // Measured on the call area: CSS can't size the portalled menu against it.
+  // The menu is portalled outside the call root, so nothing in the stylesheets
+  // can size it against the call. Measure the call area rather than the window,
+  // or the menu is wrong wherever Element Call is not the whole page.
   const rootElement = useRootElement();
   const [listMaxHeight, setListMaxHeight] = useState<number>();
   useEffect(() => {
     if (!menuOpen) return;
-    // Followed, since a host can resize the call while the menu is open.
+    // Followed rather than measured once: a host can resize the space Element
+    // Call is drawn in while the menu is open — a panel animating, a window
+    // dragged, a phone turned — and a bound taken on opening then describes a
+    // call area that no longer exists. Quantised before it reaches React, so a
+    // resize re-renders only when the bound itself moves.
     const subscription = observeElementSize$(rootElement)
       .pipe(
         map(({ height }) =>
@@ -157,17 +207,56 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
     return (): void => subscription.unsubscribe();
   }, [menuOpen, rootElement]);
 
-  // Kept clear at the list's foot, so a row reached by keyboard isn't under
-  // the meter.
-  const [meterHeight, meter] = useMeasuredHeight();
+  // Only while the menu is open, so nothing holds a second capture of the
+  // microphone for the length of a call.
+  // The meter sits over the foot of the scrolling list, so the list has to
+  // keep that much of itself clear: a row scrolled to by the keyboard would
+  // otherwise arrive underneath it, half-read. Its own height, measured,
+  // because the failure states are two lines where a level is one.
+  const [meterHeight, setMeterHeight] = useState<number>();
+  const meter = useCallback(
+    (element: HTMLDivElement | null): (() => void) | undefined => {
+      if (element === null) return;
+      const subscription = observeElementSize$(element)
+        .pipe(
+          map(({ height }) => height),
+          distinctUntilChanged(),
+        )
+        .subscribe(setMeterHeight);
+      return (): void => subscription.unsubscribe();
+    },
+    [],
+  );
 
-  // Likewise at its head, for the sticky headings.
-  const [headingHeight, heading] = useMeasuredHeight();
+  // The headings stand over the head of the list, so it has to keep their
+  // height clear too — the same bargain as the meter, at the other end. One
+  // measurement serves both: the sections are headed alike.
+  const [headingHeight, setHeadingHeight] = useState<number>();
+  const heading = useCallback(
+    (element: HTMLDivElement | null): (() => void) | undefined => {
+      if (element === null) return;
+      const subscription = observeElementSize$(element)
+        .pipe(
+          map(({ height }) => height),
+          distinctUntilChanged(),
+        )
+        .subscribe(setHeadingHeight);
+      return (): void => subscription.unsubscribe();
+    },
+    [],
+  );
+
+  const microphoneState = useMicrophoneLevel(
+    selectedOption,
+    menuOpen && iconsAndLabels === "audio",
+  );
 
   useEffect(() => {
     if (menuOpen) devices.requestDeviceNames(); // No-op after the first call
   }, [menuOpen, devices]);
 
+  // The mute control differs between the two only in which button it is and
+  // what it is called; how it behaves is the same, and was worth saying once.
   const MuteButton = iconsAndLabels === "audio" ? MicButton : VideoButton;
   const button = (
     <MuteButton
@@ -185,6 +274,7 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
     />
   );
 
+  // Only the camera menu carries a toggle, and only when the caller offers one.
   const toggles =
     iconsAndLabels === "video" && videoBlurToggleClick !== undefined
       ? [
@@ -197,23 +287,24 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
       : [];
 
   let optionsButtonLabel: string;
-  let menuTitle: string;
+  let defaultMenuTitle: string;
   let numberedLabel: (number: number) => string;
   switch (iconsAndLabels) {
     case "video":
       optionsButtonLabel = t("settings.devices.camera");
-      menuTitle = t("settings.devices.camera_source");
+      defaultMenuTitle = t("settings.devices.camera_source");
       numberedLabel = (n): string =>
         t("settings.devices.camera_numbered", { n });
       break;
     case "audio":
       optionsButtonLabel = t("settings.devices.microphone");
-      menuTitle = t("settings.devices.mic_source");
+      defaultMenuTitle = t("settings.devices.mic_source");
       numberedLabel = (n): string =>
         t("settings.devices.microphone_numbered", { n });
       break;
   }
 
+  /** The text shown for a device, whichever kind of label it carries. */
   const labelText = (
     label: MenuOptions["label"],
     numbered: (n: number) => string,
@@ -234,24 +325,26 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
     }
   };
 
-  // Nothing can be picked while a requested device is on offer but not yet
-  // selected, so a second request can't overtake it.
-  const plannedOutput = plannedSelection?.kind === "output";
-  const selectedOfPlannedKind = plannedOutput
-    ? selectedOutputOption
-    : selectedOption;
-  const offeredOfPlannedKind = plannedOutput ? outputOptions : options;
+  // A device we asked for that has not arrived yet. Until it does, nothing in
+  // the menu can be picked, so a second request cannot overtake the first.
   const settling =
     plannedSelection !== null &&
-    plannedSelection.id !== selectedOfPlannedKind &&
-    offeredOfPlannedKind?.some(({ id }) => id === plannedSelection.id) === true;
+    plannedSelection.id !==
+      (plannedSelection.kind === "output"
+        ? selectedOutputOption
+        : selectedOption);
 
-  // Safari lists no outputs: show a disabled, selected Default rather than an
-  // empty section.
+  // Safari enumerates no output devices at all, and offers no way to choose
+  // one, so the list arrives empty. The section is shown all the same — audio
+  // is playing somewhere — naming that somewhere and disabling it like any
+  // single entry. A heading with nothing beneath it reads as a broken feature,
+  // and leaves the menu a different shape on one browser.
   const noOutputsListed = outputOptions?.length === 0;
   const speakerOptions: MenuOptions[] | undefined = noOutputsListed
     ? [{ id: DEFAULT_OUTPUT_ID, label: { type: "default", name: null } }]
     : outputOptions;
+  // And it is the selection, not merely the only row: it is where audio is
+  // going. An unchecked lone entry reads as nothing being chosen at all.
   const selectedSpeaker = noOutputsListed
     ? DEFAULT_OUTPUT_ID
     : selectedOutputOption;
@@ -264,23 +357,30 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
     numbered: (n: number) => string,
   ): ReactElement[] => {
     const list = items ?? [];
-    // Disabled rather than hidden, so the menu keeps its shape.
+    // Shown but not choosable when nothing can be picked here, or when there is
+    // only one device. The entry stays visible so the menu keeps the same shape
+    // on every platform.
     const disabled = select === undefined || list.length <= 1 || settling;
     return list.map(({ label, id }) => (
       <MenuItem
-        // A radio input may not sit inside a button.
+        // A radio input inside a button is invalid, and the menu needs an
+        // element it can give menuitemradio semantics to.
         as="div"
         hideChevron
         disabled={disabled}
         label={labelText(label, numbered)}
         Icon={
-          // Inert, not aria-hidden: aria-hidden alone leaves it focusable.
+          // Inert, not aria-hidden: a form control inside a menu item must be
+          // out of the focus order and out of the accessibility tree, and
+          // aria-hidden alone leaves it focusable. The item's aria-checked is
+          // what conveys the selection.
           <span inert>
             <RadioInput
               checked={selected === id}
               disabled={disabled}
-              // Not readOnly, which mutes the selected fill. The item handles
-              // the click.
+              // Not readOnly: that styles the control as muted, losing the
+              // accent fill that marks the selection. The menu item owns the
+              // interaction, so the change handler has nothing to do.
               onChange={(): void => {}}
             />
           </span>
@@ -320,11 +420,12 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
       {button}
       <Menu
         className={styles.menu}
-        // Named for screen readers only: each section has its own heading.
-        title={menuTitle}
+        title={title ?? defaultMenuTitle}
+        // Each section carries its own heading, so the menu's own title would
+        // sit on top of the first one. Kept for the accessible name only.
         showTitle={false}
         open={menuOpen}
-        onOpenChange={onOpenChange}
+        onOpenChange={setMenuOpen}
         side="top"
         trigger={
           <Button
@@ -341,11 +442,11 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
         }
       >
         <div
-          ref={trackFocusSource}
-          // Keeps the items the menu's own children for assistive tech.
+          ref={trackFocusModality}
+          // Transparent to assistive technology, so the menu still sees its
+          // items as its own children.
           role="none"
           className={styles.deviceList}
-          data-testid="device-list"
           style={
             {
               "--device-list-max-height":
@@ -360,8 +461,11 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
           {iconsAndLabels === "audio" && speakerOptions && (
             <>
               {/* A menu may only contain items, separators and groups, so each
-                  heading is a hidden part of a named group. */}
+                  heading belongs to a group rather than sitting beside the
+                  items it names. */}
               <div role="group" aria-label={t("settings.devices.speaker")}>
+                {/* The heading is decoration: the group carries the name, and
+                    a menu may only contain items, separators and groups. */}
                 <div aria-hidden className={styles.sectionHeading}>
                   <MenuTitle title={t("settings.devices.speaker")} />
                 </div>
@@ -379,7 +483,8 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
             <div ref={heading} aria-hidden className={styles.sectionHeading}>
               <MenuTitle title={optionsButtonLabel} />
             </div>
-            {/* Apart from the heading, so the sticky meter can't ride over it. */}
+            {/* The heading sits outside, so the meter can never ride up over it:
+              sticky only holds while this block is in view. */}
             <div role="none">
               {deviceItems(
                 "input",
@@ -389,11 +494,9 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
                 numberedLabel,
               )}
               {iconsAndLabels === "audio" && (
-                <LiveMicrophoneLevelMeter
+                <MicrophoneLevelMeter
                   ref={meter}
-                  deviceId={selectedOption}
-                  // Only while open, so the microphone isn't held all call.
-                  active={menuOpen}
+                  state={microphoneState}
                   className={styles.stickyMeter}
                 />
               )}
@@ -416,25 +519,3 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
     </div>
   );
 };
-
-/** Follows an element's height. */
-function useMeasuredHeight(): [
-  number | undefined,
-  (element: HTMLElement | null) => (() => void) | undefined,
-] {
-  const [height, setHeight] = useState<number>();
-  const ref = useCallback(
-    (element: HTMLElement | null): (() => void) | undefined => {
-      if (element === null) return;
-      const subscription = observeElementSize$(element)
-        .pipe(
-          map((size) => size.height),
-          distinctUntilChanged(),
-        )
-        .subscribe(setHeight);
-      return (): void => subscription.unsubscribe();
-    },
-    [],
-  );
-  return [height, ref];
-}

src/components/MicrophoneLevelMeter.module.css

@@ -6,21 +6,20 @@ Please see LICENSE in the repository root for full details.
 */
 
 .meter {
-  /* A device row's icon column, so the bars start where the names do. */
-  --meter-icon-size: 24px;
-
-  /* Compound's radio size, whose centre line the icon shares. */
-  --device-control-size: 20px;
-
   display: flex;
   align-items: center;
   gap: var(--cpd-space-3x);
   padding-block: var(--cpd-space-2x);
-  /* Centres the icon on the radio column: less the row's inset border and half
-     the icon's extra width. Checked in the MeterAlignsWithTheDeviceRows story. */
+  /* The icon shares a centre with the radio controls in the device rows above,
+     which sit one 4x padding in from the menu's edge. Two things pull this row
+     out of line with them, and both come off the padding: the row is inset by a
+     border width so that the menu's frame stays visible behind it (see
+     `.stickyMeter`), and the icon is wider than a radio control, so it has to
+     start further left for the two to share a centre. Both are
+     measured in the MeterAlignsWithTheDeviceRows story rather than trusted:
+     jsdom lays nothing out, so only a real browser can hold this. */
   padding-inline-start: calc(
-    var(--cpd-space-4x) - var(--cpd-border-width-1) -
-      (var(--meter-icon-size) - var(--device-control-size)) / 2
+    var(--cpd-space-4x) - var(--cpd-border-width-1) - 2px
   );
   padding-inline-end: calc(var(--cpd-space-4x) * 2 + var(--cpd-space-2x));
 }
@@ -28,20 +27,33 @@ Please see LICENSE in the repository root for full details.
 .icon {
   color: var(--cpd-color-icon-secondary);
   flex-shrink: 0;
-  inline-size: var(--meter-icon-size);
-  block-size: var(--meter-icon-size);
+  /* Same width as a device row's icon column, so the bars start where the
+     device names start. */
+  inline-size: 24px;
 }
 
 .segments {
-  /* Bars keep one size and the width decides how many; the component reads the
-     sizes back from here. */
+  /* A bar and the space beside it are always the same size; what changes with
+     the width available is how many bars there are. Spreading a fixed number of
+     bars instead would make the meter a different shape in every place it is
+     used, and close them up into one solid block wherever the space ran short —
+     and a meter whose bars touch stops reading as a count, which is what
+     carries the level for anyone who cannot rely on the colour.
+
+     Both sizes are set here and nowhere else: the component reads them back off
+     the rendered bars to work out how many fit. */
   flex: 1;
-  /* So the bars never set the menu's width. */
+  /* The width decides the count, never the other way round. Containment is
+     what enforces that: without it the bars are both a floor under the width
+     and the widest thing in the menu, so the meter would set the menu's width
+     and the device names — which are what a person is reading — would have to
+     fit around it. */
   contain: inline-size;
   min-inline-size: 0;
   display: flex;
   align-items: center;
-  /* Half again a bar's width, per the design. */
+  /* Half again as wide as a bar, as the design has it: bars set as close as
+     their own width read as a solid block long before they touch. */
   gap: var(--cpd-space-1-5x);
 }
 
@@ -53,13 +65,16 @@ Please see LICENSE in the repository root for full details.
   background: var(--cpd-color-bg-subtle-primary);
 }
 
-/* The count of lit bars carries the level as well as their colour. */
+/* Filled segments carry the level by count as well as by colour, so the meter
+   stays readable without relying on hue. */
 .segmentLit {
   background: var(--cpd-color-bg-accent-rest);
 }
 
 .message {
   color: var(--cpd-color-text-secondary);
-  /* A paragraph's margin would lift the text off centre. */
+  /* A paragraph brings a margin below it, which in a centred row does not push
+     the text down but lifts it: the margin box is what gets centred, so the
+     words end up above the middle and the icon beside them looks low. */
   margin-block: 0;
 }

src/components/MicrophoneLevelMeter.stories.tsx

@@ -14,10 +14,17 @@ import {
   type MicrophoneLevelMeterProps,
 } from "./MicrophoneLevelMeter";
 import styles from "./MicrophoneLevelMeter.module.css";
-import { LEVEL_SCALE } from "../state/MicrophoneLevel";
-import { constant } from "../state/Behavior";
+import { METER_SEGMENTS } from "../state/MicrophoneLevel";
 
-/** Roughly the menu's width. It only decides how many bars fit. */
+/**
+ * A width to show the meter at, close to the menu it lives in.
+ *
+ * Not a copy of the menu's width, and nothing depends on the two agreeing: a
+ * bar and the gap beside it are a fixed size now, so this only decides how many
+ * bars there is room for. Without a width at all the stories would shrink-wrap
+ * to almost nothing and show a meter two bars wide, which is no use to anyone
+ * looking at them.
+ */
 const STORY_WIDTH = 256;
 
 const meta = {
@@ -40,22 +47,29 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;
 
-/** A quiet room: hiss below the noise floor lights nothing. */
+/**
+ * A quiet room. Nothing is lit: room hiss below the noise floor must not read
+ * as "it can hear me".
+ */
 export const Silent: Story = {
-  args: { state: { type: "level", level$: constant(0) } },
+  args: { state: { type: "level", level: 0 } },
   play: async ({ canvasElement }) => {
     await expect(litSegments(canvasElement)).toBe(0);
   },
 };
 
 export const QuietSpeech: Story = {
-  args: { state: { type: "level", level$: constant(5) } },
+  args: { state: { type: "level", level: 5 } },
 };
 
 export const NormalSpeech: Story = {
-  args: { state: { type: "level", level$: constant(12) } },
+  args: { state: { type: "level", level: 12 } },
   play: async ({ canvasElement }) => {
-    // A floor, not a count: the count follows from the design's bar and gap sizes.
+    // Shown at something like the width of the menu, so the meter in a story
+    // reads like the meter in a call rather than like a handful of bars. The
+    // design's own mock has sixteen of them at this width; a floor rather than
+    // a count, because the number follows from the bar and gap sizes and those
+    // are the design's to change.
     await expect(
       canvasElement.getElementsByClassName(styles.segment).length,
     ).toBeGreaterThanOrEqual(15);
@@ -63,44 +77,48 @@ export const NormalSpeech: Story = {
 };
 
 export const LoudSpeech: Story = {
-  args: { state: { type: "level", level$: constant(LEVEL_SCALE) } },
+  args: { state: { type: "level", level: METER_SEGMENTS } },
 };
 
-/** The three volumes differ in how many bars are lit, not only in colour. */
+/**
+ * The three volumes differ by how many bars are lit, so the level survives
+ * greyscale and a screen reader as well as it survives colour.
+ */
 export const VolumesAreDistinguishable: Story = {
-  args: { state: { type: "level", level$: constant(5) } },
+  args: { state: { type: "level", level: 5 } },
   play: async ({ canvasElement, mount }) => {
     const lit: number[] = [];
-    for (const level of [5, 12, LEVEL_SCALE]) {
-      await mount(
-        <MicrophoneLevelMeter
-          state={{ type: "level", level$: constant(level) }}
-        />,
-      );
+    for (const level of [5, 12, METER_SEGMENTS]) {
+      await mount(<MicrophoneLevelMeter state={{ type: "level", level }} />);
       lit.push(litSegments(canvasElement));
       await expect(within(canvasElement).getByRole("meter")).toHaveAttribute(
         "aria-valuenow",
         String(level),
       );
     }
+    // Three different counts, rising: the level is carried by how many bars
+    // are lit, not by their colour alone.
     await expect(new Set(lit).size).toBe(lit.length);
     await expect(lit).toEqual([...lit].sort((a, b) => a - b));
   },
 };
 
-/** Permission refused: a message with a next action, not a still meter. */
+/**
+ * Permission refused. A message with a next action, never a still meter that
+ * reads as silence.
+ */
 export const PermissionDenied: Story = {
   args: { state: { type: "permission-denied" } },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
     await expect(canvas.queryByRole("meter")).toBeNull();
     await expect(
-      canvas.getByText(/Microphone access is blocked/),
+      canvas.getByText(/Allow access in your browser settings/),
     ).toBeVisible();
   },
 };
 
-/** No input device, told apart from a refusal. */
+/** No input device at all, told apart from a refusal. */
 export const NoDevice: Story = {
   args: { state: { type: "no-device" } },
   play: async ({ canvasElement }) => {
@@ -108,7 +126,9 @@ export const NoDevice: Story = {
     await expect(canvas.queryByRole("meter")).toBeNull();
     await expect(canvas.getByText(/No microphone found/)).toBeVisible();
 
-    // The icon sits on the middle of the text, however many lines it runs to.
+    // The icon sits on the middle of the words, however many lines they run to.
+    // A paragraph's own margin would centre its margin box instead, leaving the
+    // text high and the icon looking low beside it.
     const middle = (element: Element): number => {
       const box = element.getBoundingClientRect();
       return box.top + box.height / 2;
@@ -119,9 +139,17 @@ export const NoDevice: Story = {
   },
 };
 
-/** The same meter at two widths: the bars keep their size and only their count changes. */
+/**
+ * The same meter at two widths.
+ *
+ * A bar and the space beside it are always the same size; what changes is how
+ * many bars there are. Spreading a fixed number of bars instead would make the
+ * meter a different shape in every place it is used, and close the bars up into
+ * one block wherever the space ran short — and bars that touch cannot be
+ * counted, which is what carries the level without colour.
+ */
 export const ShapeStaysTheSameAtAnyWidth: Story = {
-  args: { state: { type: "level", level$: constant(12) } },
+  args: { state: { type: "level", level: 12 } },
   play: async ({ mount, args }) => {
     const narrow = await measureAt(mount, args, 180);
     const wide = await measureAt(mount, args, 400);
@@ -129,17 +157,17 @@ export const ShapeStaysTheSameAtAnyWidth: Story = {
     await expect(narrow.bar).toBe(wide.bar);
     await expect(narrow.gap).toBe(wide.gap);
     await expect(narrow.count).toBeLessThan(wide.count);
-    // The bars are still separate, not one run of colour.
+    // And the bars are still bars, not one run of colour.
     await expect(narrow.gap).toBeGreaterThan(0);
   },
 };
 
-/** How many bars are lit. */
+/** How many bars are painted as carrying level, rather than as empty. */
 function litSegments(canvasElement: HTMLElement): number {
   return canvasElement.getElementsByClassName(styles.segmentLit).length;
 }
 
-/** Renders the meter at one width and reports its bars' shape. */
+/** Renders the meter at one width and reports the shape of its bars. */
 async function measureAt(
   mount: (ui: JSX.Element) => Promise<unknown>,
   args: MicrophoneLevelMeterProps,

src/components/MicrophoneLevelMeter.test.tsx

@@ -9,27 +9,25 @@ import { describe, expect, test } from "vitest";
 import { render, screen } from "@testing-library/react";
 
 import { MicrophoneLevelMeter } from "./MicrophoneLevelMeter";
-import { LEVEL_SCALE } from "../state/MicrophoneLevel";
-import { constant } from "../state/Behavior";
+import { METER_SEGMENTS } from "../state/MicrophoneLevel";
 
 describe("MicrophoneLevelMeter", () => {
   test("announces the level rather than relying on hue", () => {
-    render(
-      <MicrophoneLevelMeter state={{ type: "level", level$: constant(6) }} />,
-    );
+    render(<MicrophoneLevelMeter state={{ type: "level", level: 6 }} />);
 
     const meter = screen.getByRole("meter", { name: "Microphone level" });
     expect(meter).toHaveAttribute("aria-valuenow", "6");
-    expect(meter).toHaveAttribute("aria-valuemax", String(LEVEL_SCALE));
-    expect(meter).toHaveAttribute("aria-valuetext", `6 of ${LEVEL_SCALE}`);
+    expect(meter).toHaveAttribute("aria-valuemax", String(METER_SEGMENTS));
+    expect(meter).toHaveAttribute("aria-valuetext", `6 of ${METER_SEGMENTS}`);
   });
 
   test("shows distinct messages for denied permission and no input device", () => {
     const denied = render(
       <MicrophoneLevelMeter state={{ type: "permission-denied" }} />,
     );
+    // A next action, not a flat meter that reads as silence.
     expect(
-      denied.getByText(/Microphone access is blocked/),
+      denied.getByText(/Allow access in your browser settings/),
     ).toBeInTheDocument();
     expect(denied.queryByRole("meter")).toBeNull();
 

src/components/MicrophoneLevelMeter.tsx

@@ -5,14 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import {
-  useCallback,
-  useLayoutEffect,
-  useRef,
-  useState,
-  type FC,
-  type Ref,
-} from "react";
+import { useCallback, useState, type FC, type Ref } from "react";
 import { Text } from "@vector-im/compound-web";
 import { MicOnIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 import classNames from "classnames";
@@ -21,126 +14,107 @@ import { useTranslation } from "react-i18next";
 import { distinctUntilChanged, map } from "rxjs";
 
 import styles from "./MicrophoneLevelMeter.module.css";
-import { LEVEL_SCALE, type MicrophoneState } from "../state/MicrophoneLevel";
+import { METER_SEGMENTS, type MicrophoneState } from "../state/MicrophoneLevel";
 import { observeElementSize$ } from "../utils/elementSize";
-import { useMicrophoneLevel } from "./useMicrophoneLevel";
-
-export interface LiveMicrophoneLevelMeterProps {
-  /** The microphone to listen to. */
-  deviceId: string | undefined;
-  /** Whether to hold a capture at all. */
-  active: boolean;
-  className?: string;
-  ref?: Ref<HTMLDivElement>;
-}
-
-/**
- * The meter, wired to a live capture. Its own component so a changing level
- * re-renders the meter, not its parent.
- */
-export const LiveMicrophoneLevelMeter: FC<LiveMicrophoneLevelMeterProps> = ({
-  deviceId,
-  active,
-  className,
-  ref,
-}) => {
-  const state = useMicrophoneLevel(deviceId, active);
-  return <MicrophoneLevelMeter state={state} className={className} ref={ref} />;
-};
 
 export interface MicrophoneLevelMeterProps {
   state: MicrophoneState;
   className?: string;
+  /**
+   * The meter's own element. Its height is what a scroll container has to keep
+   * clear to stop the meter covering the row it has just scrolled to.
+   */
   ref?: Ref<HTMLDivElement>;
 }
 
-/** The input level of a microphone, or why there is none. */
+/**
+ * The live input level of the selected microphone, shown beneath it.
+ *
+ * It says whether the microphone is picking anything up, which is not the same
+ * as whether the user is being heard: it keeps moving while muted, and the mute
+ * control is what says nothing is transmitted.
+ */
 export const MicrophoneLevelMeter: FC<MicrophoneLevelMeterProps> = ({
   state,
   className,
   ref,
 }) => {
   const { t } = useTranslation();
-  // Bars keep one size, so their count follows the width. Starts full so the
-  // first paint, and jsdom, draw a whole meter.
-  const [barCount, setBarCount] = useState(LEVEL_SCALE);
-  const segments = useRef<HTMLDivElement | null>(null);
+  // How many bars there is room for. The bars never change size, so this is
+  // what absorbs a change of width. Starts at the full count so that the first
+  // paint is a meter rather than a single bar, and so that a renderer with no
+  // layout at all — jsdom — still draws the whole thing.
+  const [barCount, setBarCount] = useState(METER_SEGMENTS);
   const track = useCallback(
     (element: HTMLDivElement | null): (() => void) | undefined => {
       if (element === null) return;
-      segments.current = element;
       const subscription = observeElementSize$(element)
         .pipe(
           map(({ width }) => barsThatFit(element, width)),
           distinctUntilChanged(),
         )
         .subscribe(setBarCount);
-      return (): void => {
-        subscription.unsubscribe();
-        segments.current = null;
-      };
+      return (): void => subscription.unsubscribe();
     },
     [],
   );
 
-  // Drawn straight into the DOM: the level changes many times a second, and
-  // re-rendering for each change is what this avoids.
-  useLayoutEffect(() => {
-    const element = segments.current;
-    if (state.type !== "level" || element === null) return;
-    const subscription = state.level$.subscribe((level) => {
-      element.setAttribute("aria-valuenow", String(level));
-      element.setAttribute(
-        "aria-valuetext",
-        t("microphone_level.value", { level, max: LEVEL_SCALE }),
-      );
-      // The level is a share of the scale, not a bar count.
-      const lit = Math.round((level / LEVEL_SCALE) * barCount);
-      Array.from(element.children).forEach((bar, i) =>
-        bar.classList.toggle(styles.segmentLit, i < lit),
-      );
-    });
-    return (): void => subscription.unsubscribe();
-  }, [state, barCount, t]);
-
-  return (
-    <div ref={ref} className={classNames(styles.meter, className)}>
-      <MicOnIcon className={styles.icon} aria-hidden />
-      {state.type !== "level" ? (
+  if (state.type !== "level")
+    return (
+      <div ref={ref} className={classNames(styles.meter, className)}>
+        <MicOnIcon width={24} height={24} className={styles.icon} aria-hidden />
         <Text size="sm" className={styles.message}>
           {state.type === "permission-denied"
             ? t("microphone_level.permission_denied")
             : t("microphone_level.no_device")}
         </Text>
-      ) : (
-        <div
-          ref={track}
-          className={styles.segments}
-          role="meter"
-          aria-label={t("microphone_level.label")}
-          aria-valuemin={0}
-          aria-valuemax={LEVEL_SCALE}
-          // The first paint's value; the effect above keeps it current.
-          aria-valuenow={state.level$.value}
-          aria-valuetext={t("microphone_level.value", {
-            level: state.level$.value,
-            max: LEVEL_SCALE,
-          })}
-        >
-          {Array.from({ length: barCount }, (_, i) => (
-            <span key={i} aria-hidden className={styles.segment} />
-          ))}
-        </div>
-      )}
+      </div>
+    );
+
+  return (
+    <div ref={ref} className={classNames(styles.meter, className)}>
+      <MicOnIcon width={24} height={24} className={styles.icon} aria-hidden />
+      <div
+        ref={track}
+        className={styles.segments}
+        role="meter"
+        aria-label={t("microphone_level.label")}
+        aria-valuemin={0}
+        aria-valuemax={METER_SEGMENTS}
+        aria-valuenow={state.level}
+        aria-valuetext={t("microphone_level.value", {
+          level: state.level,
+          max: METER_SEGMENTS,
+        })}
+      >
+        {Array.from({ length: barCount }, (_, i) => (
+          <span
+            key={i}
+            aria-hidden
+            className={classNames(styles.segment, {
+              // The level is a share of the scale, not a number of bars: how
+              // many bars stand for it depends on how many there are.
+              [styles.segmentLit]:
+                i < Math.round((state.level / METER_SEGMENTS) * barCount),
+            })}
+          />
+        ))}
+      </div>
     </div>
   );
 };
 
-/** How many bars fit across `width`, measured so the stylesheet alone sets their size. */
+/**
+ * How many bars fit across `width`, at the size the stylesheet draws them.
+ *
+ * Measured off a rendered bar rather than told: the size of a bar and of the
+ * space beside it are a design question, settled in the stylesheet, and reading
+ * them back is what keeps them from being settled twice.
+ */
 function barsThatFit(track: HTMLElement, width: number): number {
   const gap = Number.parseFloat(getComputedStyle(track).columnGap);
   const bar = track.firstElementChild?.getBoundingClientRect().width ?? 0;
-  // No layout (jsdom): keep the full count.
-  if (!(bar > 0) || !(gap >= 0)) return LEVEL_SCALE;
+  // A renderer that lays nothing out tells us nothing; keep the full count.
+  if (!(bar > 0) || !(gap >= 0)) return METER_SEGMENTS;
   return Math.max(1, Math.floor((width + gap) / (bar + gap)));
 }

src/components/useMicrophoneLevel.test.tsx

@@ -11,7 +11,9 @@ import { renderHook } from "@testing-library/react";
 import { useMicrophoneLevel } from "./useMicrophoneLevel";
 import { restoreAudioCapture, stubAudioCapture } from "../utils/test";
 
-// Capture and release are covered in MicrophoneLevel.test.ts; this covers the bridge.
+// The capture itself, and releasing it, belong to observeMicrophoneState$ and
+// are covered in src/state/MicrophoneLevel.test.ts. What is left here is the
+// bridging: when the hook watches, and what it reports before it has an answer.
 describe("useMicrophoneLevel", () => {
   afterEach(restoreAudioCapture);
 
@@ -34,8 +36,7 @@ describe("useMicrophoneLevel", () => {
 
     rerender({ id: "mic2" });
 
-    // No level carried over from the previous device.
-    const state = result.current;
-    expect(state.type === "level" ? state.level$.value : state.type).toBe(0);
+    // No level carried over: the meter reads the new device or nothing at all.
+    expect(result.current).toEqual({ type: "level", level: 0 });
   });
 });

src/components/useMicrophoneLevel.ts

@@ -11,11 +11,17 @@ import {
   type MicrophoneState,
   observeMicrophoneState$,
 } from "../state/MicrophoneLevel";
-import { constant } from "../state/Behavior";
 
-const IDLE: MicrophoneState = { type: "level", level$: constant(0) };
+const IDLE: MicrophoneState = { type: "level", level: 0 };
 
-/** The live level of a microphone, captured only while `active`. */
+/**
+ * Reads the live input level of a microphone, while `active`.
+ *
+ * A bridge and nothing else: the capture, its lifetime and the maths belong to
+ * {@link observeMicrophoneState$}. Scoped to `active` so the device is held
+ * only while whatever shows the meter is on screen, rather than for the length
+ * of a call.
+ */
 export function useMicrophoneLevel(
   deviceId: string | undefined,
   active: boolean,
@@ -24,7 +30,8 @@ export function useMicrophoneLevel(
 
   useEffect(() => {
     if (!active) return;
-    // Idle first, so a new device doesn't start from the previous level.
+    // Idle first, so a new device starts from nothing rather than from the
+    // level the previous one was reading.
     setState(IDLE);
     const subscription = observeMicrophoneState$(deviceId).subscribe(setState);
     return (): void => subscription.unsubscribe();

src/config/ConfigOptions.ts

@@ -97,19 +97,11 @@ export interface ConfigOptions {
     };
   };
 
-  /**
-   * Describes the LiveKit configuration to be used.
-   */
+  // Describes the LiveKit configuration to be used.
   livekit?: {
-    /**
-     * The link to the service that returns a livekit url and token to use it.
-     * This is a fallback link in case the homeserver in use does not advertise
-     * a livekit service url over the transports endpoint.
-     *
-     * @deprecated Homeservers should advertise available transports over the
-     *   /_matrix/client/unstable/org.matrix.msc4143/rtc/transports endpoint
-     *   instead.
-     */
+    // The link to the service that returns a livekit url and token to use it.
+    // This is a fallback link in case the homeserver in use does not advertise
+    // a livekit service url over the transports endpoint.
     livekit_service_url: string;
   };
 
@@ -215,6 +207,12 @@ export interface ConfigOptions {
    * Take care when changing these options.
    */
   matrix_rtc_session?: {
+    /**
+     * How long (in milliseconds) to wait before rotating end-to-end media encryption keys
+     * when someone leaves a call.
+     */
+    wait_for_key_rotation_ms?: number;
+
     /**
      * How long we wait before retrying after a network error on any of the requests.
      */

src/grid/CallLayout.test.tsx

@@ -1,187 +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 { act, render, screen } from "@testing-library/react";
-import { BehaviorSubject } from "rxjs";
-import { describe, expect, it, vi } from "vitest";
-
-import { arrangeTiles, type Bounds } from "./CallLayout";
-import { makeGridLayout } from "./GridLayout";
-import { makeSpotlightLandscapeLayout } from "./SpotlightLandscapeLayout";
-import { makeSpotlightPortraitLayout } from "./SpotlightPortraitLayout";
-import { type DragCallback, type LayoutProps } from "./Grid";
-import { constant } from "../state/Behavior";
-import {
-  type Alignment,
-  type GridLayout,
-  type SpotlightLandscapeLayout,
-  type SpotlightPortraitLayout,
-} from "../state/layout-types";
-import { type UserMediaViewModel } from "../state/media/UserMediaViewModel";
-import {
-  GridTileViewModel,
-  SpotlightTileViewModel,
-  type TileViewModel,
-} from "../state/TileViewModel";
-
-// Grid supplies these hooks to the layouts it renders; on their own the
-// layouts have no grid to report to
-vi.mock("./Grid", async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  useUpdateLayout: (): void => {},
-  useVisibleTiles: (): void => {},
-}));
-
-describe("grid layout", () => {
-  it("sizes the tiles from the minimum bounds", () => {
-    const minBounds$ = new BehaviorSubject<Bounds>({ width: 800, height: 600 });
-    const { scrolling: Scrolling } = makeGridLayout({ minBounds$ });
-    render(<Scrolling model={gridModel()} Slot={Slot} />);
-    const layer = screen.getByTestId("slot-0").parentElement!;
-    expect(layer.style.width).toBe("800px");
-    expect(layer.style.getPropertyValue("--width")).toBe(
-      `${Math.floor(arrangeTiles(800, 600, 3).tileWidth)}px`,
-    );
-
-    act(() => minBounds$.next({ width: 400, height: 300 }));
-    expect(layer.style.width).toBe("400px");
-    expect(layer.style.getPropertyValue("--width")).toBe(
-      `${Math.floor(arrangeTiles(400, 300, 3).tileWidth)}px`,
-    );
-  });
-
-  it("moves the spotlight only when a drag reaches another corner", () => {
-    const model = gridModel();
-    const { fixed: Fixed } = makeGridLayout({ minBounds$: bounds });
-    render(<Fixed model={model} Slot={Slot} />);
-    const alignments: Alignment[] = [];
-    model.spotlightAlignment$.subscribe((a) => alignments.push(a));
-    const drag = drags.get("spotlight")!;
-
-    // Still in the bottom right corner
-    act(() => drag({ x: 0, y: 0, xRatio: 0.9, yRatio: 0.9 }));
-    // Over to the bottom left
-    act(() => drag({ x: 0, y: 0, xRatio: 0.1, yRatio: 0.9 }));
-    // And a little further, still bottom left
-    act(() => drag({ x: 0, y: 0, xRatio: 0.2, yRatio: 0.8 }));
-    // Up to the top left
-    act(() => drag({ x: 0, y: 0, xRatio: 0.2, yRatio: 0.1 }));
-
-    expect(alignments).toEqual([
-      { inline: "end", block: "end" },
-      { inline: "start", block: "end" },
-      { inline: "start", block: "start" },
-    ]);
-    const slot = screen.getByTestId("slot-spotlight");
-    expect(slot.getAttribute("data-inline-alignment")).toBe("start");
-    expect(slot.getAttribute("data-block-alignment")).toBe("start");
-  });
-});
-
-describe("spotlight landscape layout", () => {
-  it("puts the spotlight in the fixed layer and the grid in the scrolling one", () => {
-    const { fixed: Fixed, scrolling: Scrolling } = makeSpotlightLandscapeLayout(
-      { minBounds$: bounds },
-    );
-    const model = landscapeModel();
-    const { unmount } = render(<Fixed model={model} Slot={Slot} />);
-    expect(screen.getByTestId("slot-spotlight")).toBeInTheDocument();
-    unmount();
-
-    render(<Scrolling model={model} Slot={Slot} />);
-    expect(slotIds()).toEqual(model.grid.map((tile) => tile.id));
-  });
-});
-
-describe("spotlight portrait layout", () => {
-  it("sizes the grid tiles from the minimum width", () => {
-    const minBounds$ = new BehaviorSubject<Bounds>({ width: 300, height: 700 });
-    const { scrolling: Scrolling } = makeSpotlightPortraitLayout({
-      minBounds$,
-    });
-    const model = portraitModel();
-    render(<Scrolling model={model} Slot={Slot} />);
-    expect(slotIds()).toEqual(model.grid.map((tile) => tile.id));
-    const layer = screen.getByTestId(`slot-${model.grid[0].id}`).parentElement!
-      .parentElement!;
-    expect(layer.style.getPropertyValue("--grid-tile-width")).toBe(
-      `${Math.floor(arrangeTiles(300, 300, 3).tileWidth)}px`,
-    );
-
-    act(() => minBounds$.next({ width: 500, height: 700 }));
-    expect(layer.style.getPropertyValue("--grid-tile-width")).toBe(
-      `${Math.floor(arrangeTiles(500, 500, 3).tileWidth)}px`,
-    );
-  });
-});
-
-const bounds = constant<Bounds>({ width: 800, height: 600 });
-
-// The layouts only pass tile view models through to their slots
-const media = {} as UserMediaViewModel;
-const spotlight = new SpotlightTileViewModel(
-  constant([]),
-  constant(false),
-  constant("solid"),
-);
-const tiles = (): GridTileViewModel[] =>
-  Array.from({ length: 3 }, () => new GridTileViewModel(constant(media)));
-
-function gridModel(): GridLayout {
-  return {
-    type: "grid",
-    spotlight,
-    grid: tiles(),
-    spotlightAlignment$: new BehaviorSubject<Alignment>({
-      inline: "end",
-      block: "end",
-    }),
-    setVisibleTiles: () => {},
-  };
-}
-
-function landscapeModel(): SpotlightLandscapeLayout {
-  return {
-    type: "spotlight-landscape",
-    spotlight,
-    grid: tiles(),
-    setVisibleTiles: () => {},
-  };
-}
-
-function portraitModel(): SpotlightPortraitLayout {
-  return {
-    type: "spotlight-portrait",
-    spotlight,
-    grid: tiles(),
-    setVisibleTiles: () => {},
-  };
-}
-
-// Slots record their drag callback so a test can drag them, and show the id
-// of the tile they hold
-const drags = new Map<string, DragCallback | undefined>();
-const Slot: LayoutProps<unknown, TileViewModel, HTMLDivElement>["Slot"] = ({
-  id,
-  model,
-  onDrag,
-  ...props
-}) => {
-  drags.set(id, onDrag);
-  return (
-    <div data-testid={`slot-${id}`} {...props}>
-      {model instanceof GridTileViewModel ? model.id : "spotlight"}
-    </div>
-  );
-};
-
-function slotIds(): string[] {
-  return screen
-    .getAllByTestId(/^slot-/)
-    .map((slot) => slot.textContent ?? "")
-    .filter((id) => id !== "spotlight");
-}

src/grid/CallLayout.ts

@@ -5,11 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
+import { type Observable } from "rxjs";
 import { type ComponentType } from "react";
 
 import { type LayoutProps } from "./Grid";
 import { type TileViewModel } from "../state/TileViewModel";
-import { type Behavior } from "../state/Behavior";
 
 export interface Bounds {
   width: number;
@@ -20,7 +20,7 @@ export interface CallLayoutInputs {
   /**
    * The minimum bounds of the layout area.
    */
-  minBounds$: Behavior<Bounds>;
+  minBounds$: Observable<Bounds>;
 }
 
 export interface CallLayoutOutputs<Model> {

src/grid/GridLayout.tsx

@@ -11,12 +11,14 @@ import {
   useCallback,
   useMemo,
 } from "react";
+import { distinctUntilChanged } from "rxjs";
+import { useObservableEagerState } from "observable-hooks";
 
 import { type GridLayout as GridLayoutModel } from "../state/layout-types.ts";
 import styles from "./GridLayout.module.css";
+import { useInitial } from "../useInitial";
 import { type CallLayout, arrangeTiles } from "./CallLayout";
 import { type DragCallback, useUpdateLayout, useVisibleTiles } from "./Grid";
-import { useBehavior } from "../useBehavior";
 
 interface GridCSSProperties extends CSSProperties {
   "--gap": string;
@@ -37,18 +39,22 @@ export const makeGridLayout: CallLayout<GridLayoutModel> = ({
   // lives
   fixed: function GridLayoutFixed({ ref, model, Slot }): ReactNode {
     useUpdateLayout();
-    const alignment = useBehavior(model.spotlightAlignment$);
+    const alignment = useObservableEagerState(
+      useInitial(() =>
+        model.spotlightAlignment$.pipe(
+          distinctUntilChanged(
+            (a1, a2) => a1.block === a2.block && a1.inline === a2.inline,
+          ),
+        ),
+      ),
+    );
 
     const onDragSpotlight: DragCallback = useCallback(
-      ({ xRatio, yRatio }) => {
-        const block = yRatio < 0.5 ? "start" : "end";
-        const inline = xRatio < 0.5 ? "start" : "end";
-        // A drag reports the same alignment on every move; only a change is
-        // worth a re-render
-        const current = model.spotlightAlignment$.value;
-        if (current.block !== block || current.inline !== inline)
-          model.spotlightAlignment$.next({ block, inline });
-      },
+      ({ xRatio, yRatio }) =>
+        model.spotlightAlignment$.next({
+          block: yRatio < 0.5 ? "start" : "end",
+          inline: xRatio < 0.5 ? "start" : "end",
+        }),
       [model.spotlightAlignment$],
     );
 
@@ -72,7 +78,7 @@ export const makeGridLayout: CallLayout<GridLayoutModel> = ({
   scrolling: function GridLayout({ ref, model, Slot }): ReactNode {
     useUpdateLayout();
     useVisibleTiles(model.setVisibleTiles);
-    const { width, height: minHeight } = useBehavior(minBounds$);
+    const { width, height: minHeight } = useObservableEagerState(minBounds$);
     const { gap, tileWidth, tileHeight } = useMemo(
       () => arrangeTiles(width, minHeight, model.grid.length),
       [width, minHeight, model.grid.length],

src/grid/OneOnOneDesktopLayout.tsx

@@ -7,6 +7,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type ReactNode, useCallback, useMemo } from "react";
+import { useObservableEagerState } from "observable-hooks";
 import classNames from "classnames";
 
 import { type OneOnOneDesktopLayout as OneOnOneDesktopLayoutModel } from "../state/layout-types.ts";
@@ -36,7 +37,7 @@ export const makeOneOnOneDesktopLayout: CallLayout<
     Slot,
   }): ReactNode {
     useUpdateLayout();
-    const { width, height } = useBehavior(minBounds$);
+    const { width, height } = useObservableEagerState(minBounds$);
     const pipAlignment = useBehavior(model.pipAlignment$);
     const { tileWidth, tileHeight } = useMemo(
       () => arrangeTiles(width, height, 1),

src/grid/SpotlightLandscapeLayout.tsx

@@ -6,6 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type FC, type ReactNode } from "react";
+import { useObservableEagerState } from "observable-hooks";
 import classNames from "classnames";
 
 import { type CallLayout } from "./CallLayout";
@@ -32,7 +33,7 @@ export const makeSpotlightLandscapeLayout: CallLayout<
     Slot,
   }): ReactNode {
     useUpdateLayout();
-    useBehavior(minBounds$);
+    useObservableEagerState(minBounds$);
 
     return (
       <div ref={ref} className={styles.layer}>
@@ -55,7 +56,7 @@ export const makeSpotlightLandscapeLayout: CallLayout<
   }): ReactNode {
     useUpdateLayout();
     useVisibleTiles(model.setVisibleTiles);
-    useBehavior(minBounds$);
+    useObservableEagerState(minBounds$);
 
     return (
       <div ref={ref} className={styles.layer}>

src/grid/SpotlightPortraitLayout.tsx

@@ -6,6 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type ReactNode, type CSSProperties } from "react";
+import { useObservableEagerState } from "observable-hooks";
 import classNames from "classnames";
 
 import { type CallLayout, arrangeTiles } from "./CallLayout";
@@ -57,7 +58,7 @@ export const makeSpotlightPortraitLayout: CallLayout<
   }): ReactNode {
     useUpdateLayout();
     useVisibleTiles(model.setVisibleTiles);
-    const { width } = useBehavior(minBounds$);
+    const { width } = useObservableEagerState(minBounds$);
     const { gap, tileWidth, tileHeight } = arrangeTiles(
       width,
       // TODO: We pretend that the minimum height is the width, because the

src/index.css

@@ -7,24 +7,10 @@ Please see LICENSE in the repository root for full details.
 
 /* Styles for Element Call as a page of its own. The parts that apply wherever
 Element Call is shown live in base.css; these are about owning the document,
-and are not loaded when a host embeds Element Call as a component.
-
-That includes Compound: the page brings the design tokens, the component styles
-and their fonts, where a host embedding the component supplies its own. The
-`compound` layers are ordered by base.css. */
+and are not loaded when a host embeds Element Call as a component. */
 
 @import url("./base.css");
 
-@import url("@fontsource/inter/400.css");
-@import url("@fontsource/inter/500.css");
-@import url("@fontsource/inter/600.css");
-@import url("@fontsource/inter/700.css");
-@import url("@fontsource/inconsolata/400.css");
-@import url("@fontsource/inconsolata/700.css");
-
-@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
-@import url("@vector-im/compound-web/dist/style.css") layer(compound.components);
-
 body {
   background-color: var(--cpd-color-bg-canvas-default);
   color: var(--cpd-color-text-primary);

src/livekit/MatrixAudioRenderer.test.tsx

@@ -24,7 +24,6 @@ import { testAudioContext } from "../useAudioContext.test";
 import * as MediaDevicesContext from "../MediaDevicesContext";
 import { LivekitRoomAudioRenderer } from "./MatrixAudioRenderer";
 import {
-  exampleTransportLocator,
   mockLocalParticipant,
   mockMediaDevices,
   mockRemoteParticipant,
@@ -119,7 +118,7 @@ function renderTestComponent(
       <LivekitRoomAudioRenderer
         validIdentities={participants.map((p) => p.identity)}
         livekitRoom={livekitRoom}
-        transport={exampleTransportLocator}
+        url={""}
       />
     </MediaDevicesProvider>,
   );
@@ -151,7 +150,7 @@ it("should not render or warn for the local participant", () => {
       <LivekitRoomAudioRenderer
         validIdentities={[]}
         livekitRoom={{ remoteParticipants: new Map() } as unknown as Room}
-        transport={exampleTransportLocator}
+        url={""}
       />
     </MediaDevicesProvider>,
   );
@@ -178,7 +177,7 @@ it("should warn only once per unexpected participant", () => {
       <LivekitRoomAudioRenderer
         validIdentities={[]}
         livekitRoom={{ remoteParticipants: new Map() } as unknown as Room}
-        transport={exampleTransportLocator}
+        url={""}
       />
     </MediaDevicesProvider>,
   );

src/livekit/MatrixAudioRenderer.tsx

@@ -19,10 +19,12 @@ import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
 import { useEarpieceAudioConfig } from "../MediaDevicesContext";
 import { useReactiveState } from "../useReactiveState";
 import * as controls from "../controls";
-import { type TransportLocator } from "./auth";
 
 export interface MatrixAudioRendererProps {
-  transport: TransportLocator;
+  /**
+   * The service URL of the LiveKit room.
+   */
+  url: string;
   livekitRoom: LivekitRoom;
   /**
    * The list of participant identities to render audio for.
@@ -52,7 +54,7 @@ export interface MatrixAudioRendererProps {
  * @public
  */
 export function LivekitRoomAudioRenderer({
-  transport,
+  url,
   livekitRoom,
   validIdentities,
   muted,
@@ -86,7 +88,7 @@ export function LivekitRoomAudioRenderer({
         warnedIdentities.current.add(identity);
         // Log that there is an invalid identity, that means that someone is publishing audio that is not expected to be in the call.
         logger.warn(
-          `Audio track ${identity} from ${JSON.stringify(transport)} has no matching matrix call member`,
+          `Audio track ${identity} from ${url} has no matching matrix call member`,
           `current members: ${validIdentities.join()}`,
           `track will not get rendered`,
         );

src/livekit/TrackProcessorContext.tsx

@@ -20,7 +20,8 @@ import {
 } from "react";
 import { type LocalVideoTrack } from "livekit-client";
 import { logger } from "matrix-js-sdk/lib/logger";
-import { combineLatest } from "rxjs";
+import { combineLatest, map, type Observable } from "rxjs";
+import { useObservable } from "observable-hooks";
 
 import {
   backgroundBlur as backgroundBlurSettings,
@@ -30,7 +31,6 @@ import { BlurBackgroundTransformer } from "./BlurBackgroundTransformer";
 import { type Behavior } from "../state/Behavior";
 import { type ObservableScope } from "../state/ObservableScope";
 import { platform } from "../Platform";
-import { useValueBehavior } from "../useValueBehavior";
 
 //TODO-MULTI-SFU: This is not yet fully there.
 // it is a combination of exposing observable and react hooks.
@@ -52,8 +52,18 @@ export function useTrackProcessor(): ProcessorState {
   return state;
 }
 
-export function useTrackProcessorState$(): Behavior<ProcessorState> {
-  return useValueBehavior(useTrackProcessor());
+export function useTrackProcessorObservable$(): Observable<ProcessorState> {
+  const state = use(ProcessorContext);
+  if (state === undefined)
+    throw new Error(
+      "useTrackProcessor must be used within a ProcessorProvider",
+    );
+  const state$ = useObservable(
+    (init$) => init$.pipe(map(([init]) => init)),
+    [state],
+  );
+
+  return state$;
 }
 
 /**

src/livekit/auth/csApi.ts

@@ -1,137 +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 { ConnectionError, HTTPError, type MatrixClient } from "matrix-js-sdk";
-import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
-
-import { extractFullConfigFromToken, type SFUConfig } from "./types.ts";
-import { doNetworkOperationWithRetry } from "../../utils/matrix.ts";
-
-/**
- * In widget mode the host may refuse an action before any request is made
- * which surfaces as a plain error. Asking again cannot change its answer,
- * so only errors from the network are worth retrying.
- */
-function isNetworkError(e: unknown): boolean {
-  return e instanceof HTTPError || e instanceof ConnectionError;
-}
-
-export type ClientGetTokenParts = Pick<
-  MatrixClient,
-  "_unstable_getLivekitToken"
->;
-
-export interface GetSFUConfigParams {
-  /**
-   * The Matrix client.
-   */
-  client: ClientGetTokenParts;
-  /**
-   * Data identifying the local user's session membership.
-   */
-  membership: CallMembershipIdentityParts;
-  /**
-   * The WebSocket URL of the SFU for which we wish to get an access token.
-   */
-  url: string;
-  /**
-   * The name of the homeserver to which the SFU belongs.
-   */
-  serverName: string;
-  /**
-   * The ID of the Matrix room in which the session takes place.
-   */
-  roomId: string;
-  /**
-   * The ID of the MatrixRTC slot in which the session takes place.
-   */
-  slotId: string;
-}
-
-/**
- * Gets an {@link SFUConfig} appropriate for connecting to a given SFU, using
- * the MSC4195 LiveKit client-server API endpoints.
- */
-export async function getSFUConfig({
-  client,
-  membership,
-  url,
-  serverName,
-  roomId,
-  slotId,
-}: GetSFUConfigParams): Promise<SFUConfig> {
-  const res = await doNetworkOperationWithRetry(
-    async () =>
-      client._unstable_getLivekitToken({
-        url,
-        server_name: serverName,
-        room_id: roomId,
-        slot_id: slotId,
-        member_id: membership.memberId,
-      }),
-    isNetworkError,
-  );
-  return extractFullConfigFromToken({ url, jwt: res.jwt });
-}
-
-export type ClientDelegationParts = Pick<
-  MatrixClient,
-  "_unstable_delegateDelayedLeave" | "baseUrl"
->;
-
-export interface DelegateDelayedLeaveParams {
-  /**
-   * The Matrix client.
-   */
-  client: ClientDelegationParts;
-  /**
-   * Data identifying the local user's session membership.
-   */
-  membership: CallMembershipIdentityParts;
-  /**
-   * The WebSocket URL of the SFU to which we are publishing and wish to
-   * delegate the delayed leave event.
-   */
-  url: string;
-  /**
-   * The ID of the Matrix room in which the session takes place.
-   */
-  roomId: string;
-  /**
-   * The ID of the MatrixRTC slot in which the session takes place.
-   */
-  slotId: string;
-  /**
-   * The delay ID of the leave event to be delegated.
-   */
-  delayId: string;
-}
-
-/**
- * Delegates a delayed leave event to a given SFU, so that the event will
- * be sent on our behalf whenever we disconnect from the SFU.
- */
-export async function delegateDelayedLeave({
-  client,
-  membership,
-  url,
-  roomId,
-  slotId,
-  delayId,
-}: DelegateDelayedLeaveParams): Promise<void> {
-  await doNetworkOperationWithRetry(
-    async () =>
-      client._unstable_delegateDelayedLeave({
-        url,
-        room_id: roomId,
-        slot_id: slotId,
-        member_id: membership.memberId,
-        delay_id: delayId,
-      }),
-    isNetworkError,
-  );
-}

src/livekit/auth/index.test.ts

@@ -1,306 +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, type Mocked, vi, describe, it } from "vitest";
-import { type UnstableLivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
-import { logger } from "matrix-js-sdk/lib/logger";
-
-import {
-  aliceDeviceId,
-  aliceId,
-  aliceUserId,
-  createJWTToken,
-} from "../../utils/test-fixtures";
-import type * as csApi from "./csApi";
-import * as openID from "./openID";
-import { delegateDelayedLeave, getSFUConfig } from ".";
-import { mocked } from "storybook/test";
-import { ConnectionError, MatrixError } from "matrix-js-sdk";
-import { NoMatrix2AuthorizationService } from "../../utils/errors";
-import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
-
-vi.mock("./openID", () => ({ getSFUConfig: vi.fn() }));
-vi.useFakeTimers();
-
-const csApiJWTToken = createJWTToken(aliceId, "via CS API");
-const openIDJWTToken = createJWTToken(aliceId, "via OpenID");
-
-mocked(openID).getSFUConfig.mockResolvedValue({
-  url: "mock-openID-url",
-  jwt: openIDJWTToken,
-  livekitAlias: "via OpenID",
-  livekitIdentity: aliceId,
-});
-
-const client: Mocked<
-  csApi.ClientGetTokenParts &
-    csApi.ClientDelegationParts &
-    openID.ClientOpenIDParts
-> = {
-  baseUrl: "https://matrix.example.org",
-  _unstable_getLivekitToken: vi.fn().mockResolvedValue({ jwt: csApiJWTToken }),
-  _unstable_delegateDelayedLeave: vi.fn().mockResolvedValue({}),
-  getOpenIdToken: vi
-    .fn()
-    .mockResolvedValue({ access_token: "mock-openID-token" }),
-};
-
-const membership: CallMembershipIdentityParts = {
-  userId: aliceUserId,
-  deviceId: aliceDeviceId,
-  memberId: "123",
-};
-
-const roomId = "!room:example.org";
-const slotId = "m.call#ROOM";
-
-const unsupportedError = new MatrixError({ errcode: "M_UNSUPPORTED" }, 404);
-
-const urlTransport: UnstableLivekitTransport = {
-  type: "livekit",
-  url: "wss://livekit.example.org",
-};
-
-const serviceUrlTransport: UnstableLivekitTransport = {
-  type: "livekit",
-  livekit_service_url: "https://livekit-jwt.example.org",
-};
-
-const urlAndServiceUrlTransport: UnstableLivekitTransport = {
-  ...urlTransport,
-  ...serviceUrlTransport,
-};
-
-afterEach(() => vi.clearAllMocks());
-
-describe("getSFUConfig", () => {
-  const defaultParams = {
-    client,
-    membership,
-    serverName: "example.org",
-    role: "subscriber" as const,
-    roomId,
-    slotId,
-    logger,
-  };
-
-  it("uses CS API with url transport", async () => {
-    expect(
-      await getSFUConfig({ ...defaultParams, transport: urlTransport }),
-    ).toEqual(
-      expect.objectContaining({
-        jwt: csApiJWTToken,
-        livekitAlias: "via CS API",
-      }),
-    );
-    expect(client._unstable_getLivekitToken).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("does not fall back to OpenID with url transport", async () => {
-    client._unstable_getLivekitToken.mockRejectedValueOnce(unsupportedError);
-    await expect(
-      getSFUConfig({ ...defaultParams, transport: urlTransport }),
-    ).rejects.toThrow(expect.any(NoMatrix2AuthorizationService));
-    expect(client._unstable_getLivekitToken).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("uses OpenID with livekit_service_url transport", async () => {
-    expect(
-      await getSFUConfig({ ...defaultParams, transport: serviceUrlTransport }),
-    ).toEqual(
-      expect.objectContaining({
-        jwt: openIDJWTToken,
-        livekitAlias: "via OpenID",
-      }),
-    );
-    expect(client._unstable_getLivekitToken).not.toHaveBeenCalled();
-    expect(openID.getSFUConfig).toHaveBeenCalled();
-  });
-
-  it("uses CS API with url + livekit_service_url transport", async () => {
-    expect(
-      await getSFUConfig({
-        ...defaultParams,
-        transport: urlAndServiceUrlTransport,
-      }),
-    ).toEqual(
-      expect.objectContaining({
-        jwt: csApiJWTToken,
-        livekitAlias: "via CS API",
-      }),
-    );
-    expect(client._unstable_getLivekitToken).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("falls back to OpenID with url + livekit_service_url transport", async () => {
-    client._unstable_getLivekitToken.mockRejectedValueOnce(unsupportedError);
-    expect(
-      await getSFUConfig({
-        ...defaultParams,
-        transport: urlAndServiceUrlTransport,
-      }),
-    ).toEqual(
-      expect.objectContaining({
-        jwt: openIDJWTToken,
-        livekitAlias: "via OpenID",
-      }),
-    );
-    expect(client._unstable_getLivekitToken).toHaveBeenCalled();
-    expect(openID.getSFUConfig).toHaveBeenCalled();
-  });
-
-  it("falls back to OpenID when the widget host refuses the CS API", async () => {
-    // In widget mode a host without MSC4533 rejects the request before it
-    // reaches the homeserver, with a plain error rather than a Matrix error
-    client._unstable_getLivekitToken.mockRejectedValueOnce(
-      new Error(
-        "The rtc_livekit_get_token action is not supported by the client.",
-      ),
-    );
-    expect(
-      await getSFUConfig({
-        ...defaultParams,
-        transport: urlAndServiceUrlTransport,
-      }),
-    ).toEqual(expect.objectContaining({ jwt: openIDJWTToken }));
-    expect(openID.getSFUConfig).toHaveBeenCalled();
-  });
-
-  it("surfaces the widget host's refusal with url transport", async () => {
-    const error = new Error(
-      "The rtc_livekit_get_token action is not supported by the client.",
-    );
-    client._unstable_getLivekitToken.mockRejectedValueOnce(error);
-    await expect(
-      getSFUConfig({ ...defaultParams, transport: urlTransport }),
-    ).rejects.toThrow(error);
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("uses CS API when publishing with url transport", async () => {
-    expect(
-      await getSFUConfig({
-        ...defaultParams,
-        transport: urlTransport,
-        role: "publisher",
-      }),
-    ).toEqual(expect.objectContaining({ jwt: csApiJWTToken }));
-    expect(client._unstable_getLivekitToken).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("does not fall back to OpenID when publishing", async () => {
-    client._unstable_getLivekitToken.mockRejectedValueOnce(unsupportedError);
-    await expect(
-      getSFUConfig({
-        ...defaultParams,
-        transport: urlTransport,
-        role: "publisher",
-      }),
-    ).rejects.toThrow(expect.any(NoMatrix2AuthorizationService));
-    expect(client._unstable_getLivekitToken).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("uses OpenID when publishing with url + livekit_service_url transport", async () => {
-    // Subscribers predating MSC4195 expect a legacy participant identity from
-    // anyone advertising a state event, which only the JWT service assigns
-    expect(
-      await getSFUConfig({
-        ...defaultParams,
-        transport: urlAndServiceUrlTransport,
-        role: "publisher",
-      }),
-    ).toEqual(
-      expect.objectContaining({
-        jwt: openIDJWTToken,
-        livekitAlias: "via OpenID",
-      }),
-    );
-    expect(client._unstable_getLivekitToken).not.toHaveBeenCalled();
-    expect(openID.getSFUConfig).toHaveBeenCalledWith(
-      expect.objectContaining({ role: "publisher" }),
-    );
-  });
-
-  it("does not fall back to OpenID on connection error", async () => {
-    const client_ = {
-      ...client,
-      _unstable_getLivekitToken: vi
-        .fn()
-        .mockRejectedValue(new ConnectionError("No connection")),
-    };
-    await Promise.all([
-      expect(
-        getSFUConfig({
-          ...defaultParams,
-          client: client_,
-          transport: urlAndServiceUrlTransport,
-        }),
-      ).rejects.toThrow(expect.any(ConnectionError)),
-      vi.runAllTimersAsync(), // Allow request to be retried
-    ]);
-    expect(client_._unstable_getLivekitToken).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-});
-
-describe("delegateDelayedLeave", () => {
-  const defaultParams = {
-    client,
-    membership,
-    roomId,
-    slotId,
-    delayId: "delay123",
-    logger,
-  };
-
-  it("uses CS API with url transport", async () => {
-    await delegateDelayedLeave({ ...defaultParams, transport: urlTransport });
-    expect(client._unstable_delegateDelayedLeave).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("does not fall back to OpenID with url transport", async () => {
-    client._unstable_delegateDelayedLeave.mockRejectedValueOnce(
-      unsupportedError,
-    );
-    await expect(
-      delegateDelayedLeave({ ...defaultParams, transport: urlTransport }),
-    ).rejects.toThrow();
-    expect(client._unstable_delegateDelayedLeave).toHaveBeenCalled();
-    expect(openID.getSFUConfig).not.toHaveBeenCalled();
-  });
-
-  it("uses OpenID with livekit_service_url transport", async () => {
-    await delegateDelayedLeave({
-      ...defaultParams,
-      transport: serviceUrlTransport,
-    });
-    expect(client._unstable_delegateDelayedLeave).not.toHaveBeenCalled();
-    expect(openID.getSFUConfig).toHaveBeenCalled();
-  });
-
-  it("uses OpenID with url + livekit_service_url transport", async () => {
-    // Must match the flow that got the token, so the identities line up
-    await delegateDelayedLeave({
-      ...defaultParams,
-      transport: urlAndServiceUrlTransport,
-    });
-    expect(client._unstable_delegateDelayedLeave).not.toHaveBeenCalled();
-    expect(openID.getSFUConfig).toHaveBeenCalledWith(
-      expect.objectContaining({
-        role: "publisher",
-        delayId: "delay123",
-        delayEndpointBaseUrl: client.baseUrl,
-      }),
-    );
-  });
-});

src/livekit/auth/index.ts

@@ -1,253 +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 CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
-import { type Logger } from "matrix-js-sdk/lib/logger";
-
-import { ConnectionError, MatrixError } from "matrix-js-sdk";
-import { type UnstableLivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
-import * as openID from "./openID";
-import * as csApi from "./csApi";
-import { type SFUConfig } from "./types";
-import { NoMatrix2AuthorizationService } from "../../utils/errors";
-
-export type { ClientOpenIDParts } from "./openID";
-export type { ClientGetTokenParts, ClientDelegationParts } from "./csApi";
-export type * from "./types";
-
-/**
- * Checks whether an error means "this homeserver does not implement the
- * (unstable) MSC4195 endpoints".
- *
- * MSC4195 documents `M_NOT_FOUND` for this, but a homeserver without support
- * answers with whatever it uses for unknown endpoints (Synapse: 404 with
- * `M_UNRECOGNIZED`), so we accept any 404 as "unsupported".
- * @param e The error to check.
- */
-function isEndpointUnsupported(e: unknown): boolean {
-  return (
-    e instanceof MatrixError &&
-    (e.httpStatus === 404 ||
-      e.errcode === "M_NOT_FOUND" ||
-      e.errcode === "M_UNRECOGNIZED")
-  );
-}
-
-/**
- * Checks whether an error means the MSC4195 CS API cannot be used from here:
- * the homeserver does not implement it, or the request never reached the
- * homeserver because in widget mode the host does not expose the endpoint
- * (MSC4533), which the widget API reports as a plain error rather than a
- * Matrix error. A connection error is neither, as the endpoint may well exist.
- * @param e The error to check.
- */
-function isCsApiUnavailable(e: unknown): boolean {
-  if (isEndpointUnsupported(e)) return true;
-  return !(e instanceof MatrixError) && !(e instanceof ConnectionError);
-}
-
-export interface GetSFUConfigParams {
-  /**
-   * The Matrix client.
-   */
-  client: csApi.ClientGetTokenParts & openID.ClientOpenIDParts;
-  /**
-   * Data identifying the local user's session membership.
-   */
-  membership: CallMembershipIdentityParts;
-  /**
-   * The transport for which we wish to get an access token.
-   */
-  transport: UnstableLivekitTransport;
-  /**
-   * The name of the homeserver to which the {@link transport} belongs.
-   */
-  serverName: string;
-  /**
-   * The ID of the Matrix room in which the session takes place.
-   */
-  roomId: string;
-  /**
-   * The ID of the MatrixRTC slot in which the session takes place.
-   */
-  slotId: string;
-  /**
-   * Whether we want to publish or only subscribe on the {@link transport}.
-   */
-  role: "publisher" | "subscriber";
-  logger: Logger;
-}
-
-/**
- * Gets an {@link SFUConfig} appropriate for connecting to a given transport.
- */
-export async function getSFUConfig({
-  client,
-  membership,
-  transport,
-  serverName,
-  roomId,
-  slotId,
-  role,
-  logger,
-}: GetSFUConfigParams): Promise<SFUConfig> {
-  const viaOpenID = async (serviceUrl: string): Promise<SFUConfig> =>
-    await openID.getSFUConfig({
-      client,
-      membership,
-      serviceUrl,
-      roomId,
-      slotId,
-      role,
-      logger,
-    });
-
-  const flow = chooseAuthFlow(transport, role);
-  if (flow.kind === "openID") return await viaOpenID(flow.serviceUrl);
-
-  try {
-    return await csApi.getSFUConfig({
-      client,
-      membership,
-      url: flow.url,
-      serverName,
-      roomId,
-      slotId,
-    });
-  } catch (e) {
-    // Publishers should never fall back. If a homeserver advertises a `url`
-    // but doesn't support MSC4195 itself, that's a misconfiguration which
-    // the admin should know about so they can prepare for the future
-    // deprecation of `livekit_service_url`.
-    const mayFallBack =
-      role === "subscriber" && "livekit_service_url" in transport;
-    if (mayFallBack && isCsApiUnavailable(e)) {
-      logger.warn(
-        `Cannot use the MSC4195 get_token endpoint (${e}), falling back to the OpenID flow with service ${transport.livekit_service_url}`,
-      );
-      return await viaOpenID(transport.livekit_service_url);
-    }
-    if (isEndpointUnsupported(e)) {
-      logger.error(
-        `Homeserver does not support the MSC4195 get_token endpoint, cannot get token for transport ${flow.url}`,
-      );
-      throw new NoMatrix2AuthorizationService(e as Error);
-    }
-    throw e;
-  }
-}
-
-export interface DelegateDelayedLeaveParams {
-  /**
-   * The Matrix client.
-   */
-  client: csApi.ClientDelegationParts & openID.ClientOpenIDParts;
-  /**
-   * Data identifying the local user's session membership.
-   */
-  membership: CallMembershipIdentityParts;
-  /**
-   * The transport to which we are publishing and wish to delegate the delayed
-   * leave event.
-   */
-  transport: UnstableLivekitTransport;
-  /**
-   * The ID of the Matrix room in which the session takes place.
-   */
-  roomId: string;
-  /**
-   * The ID of the MatrixRTC slot in which the session takes place.
-   */
-  slotId: string;
-  /**
-   * The delay ID of the leave event to be delegated.
-   */
-  delayId: string;
-  logger: Logger;
-}
-
-/**
- * Delegates a delayed leave event to a given transport, so that the event will
- * be sent on our behalf whenever we disconnect from the transport's SFU.
- */
-export async function delegateDelayedLeave({
-  client,
-  membership,
-  transport,
-  roomId,
-  slotId,
-  delayId,
-  logger,
-}: DelegateDelayedLeaveParams): Promise<void> {
-  // It's important that we use the same flow (CS API or OpenID) as whatever we
-  // would've used to get a JWT token for this transport, since the participant
-  // identity computed by the service needs to match.
-  const flow = chooseAuthFlow(transport, "publisher");
-  if (flow.kind === "csApi") {
-    try {
-      await csApi.delegateDelayedLeave({
-        client,
-        membership,
-        url: flow.url,
-        roomId,
-        slotId,
-        delayId,
-      });
-    } catch (e) {
-      if (isEndpointUnsupported(e))
-        logger.error(
-          "Server misconfigured: transport contains a 'url' field but server does not support the MSC4195 delegate_delayed_leave endpoint",
-        );
-      throw e;
-    }
-  } else {
-    // This will technically cause the service to issue a new JWT token, but
-    // it's safe to discard. We're only interested in triggering delegation.
-    await openID.getSFUConfig({
-      client,
-      membership,
-      serviceUrl: flow.serviceUrl,
-      roomId,
-      slotId,
-      role: "publisher",
-      delayEndpointBaseUrl: client.baseUrl,
-      delayId,
-      logger,
-    });
-  }
-}
-
-/**
- * The flow with which the local member authenticates against a transport.
- */
-export type AuthFlow =
-  | { kind: "csApi"; url: string }
-  | { kind: "openID"; serviceUrl: string };
-
-/**
- * Chooses between the MSC4195 CS API and the legacy OpenID flow against the
- * transport's JWT service.
- *
- * Only the JWT service's `/sfu/get` endpoint assigns the legacy participant
- * identity that clients predating MSC4195 expect from anyone advertising a
- * membership state event. So a publisher keeps using the JWT service wherever
- * the transport still offers one, even if it also has a `url`. Subscribers may
- * use the CS API regardless, as nobody matches their identity.
- * @param transport The transport to authenticate against.
- * @param role Whether we want to publish or only subscribe on the transport.
- */
-export function chooseAuthFlow(
-  transport: UnstableLivekitTransport,
-  role: "publisher" | "subscriber",
-): AuthFlow {
-  if ("url" in transport) {
-    const useCsApi =
-      !("livekit_service_url" in transport) || role === "subscriber";
-    if (useCsApi) return { kind: "csApi", url: transport.url };
-  }
-  return { kind: "openID", serviceUrl: transport.livekit_service_url };
-}

src/livekit/auth/openID.test.ts

@@ -1,230 +0,0 @@
-/*
-Copyright 2025 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 {
-  beforeEach,
-  afterEach,
-  describe,
-  expect,
-  it,
-  type MockedObject,
-  vitest,
-} from "vitest";
-import fetchMock from "fetch-mock";
-import { MatrixError } from "matrix-js-sdk";
-
-import {
-  getSFUConfig,
-  type GetSFUConfigParams,
-  type ClientOpenIDParts,
-} from "./openID";
-import { testJWTToken } from "../../utils/test-fixtures";
-import { ownMemberMock } from "../../utils/test";
-import { FailToGetOpenIdToken } from "../../utils/errors";
-import { logger } from "matrix-js-sdk/lib/logger";
-
-const serviceUrl = "https://sfu.example.org";
-
-const delayParams = {
-  delayEndpointBaseUrl: "https://matrix.homeserverserver.org",
-  delayId: "mock_delay_id",
-};
-
-describe("getSFUConfig", () => {
-  let matrixClient: MockedObject<ClientOpenIDParts>;
-  let params: GetSFUConfigParams;
-  beforeEach(() => {
-    fetchMock.catch(404);
-    matrixClient = { getOpenIdToken: vitest.fn() };
-    params = {
-      client: matrixClient,
-      membership: ownMemberMock,
-      serviceUrl: "https://sfu.example.org",
-      roomId: "!example_room_id",
-      slotId: "m.call#ROOM",
-      role: "publisher",
-      logger,
-    };
-  });
-  afterEach(async () => {
-    void (await fetchMock.flush());
-    vitest.clearAllMocks();
-    fetchMock.reset();
-  });
-
-  it("should handle fetching a token", async () => {
-    fetchMock.post("https://sfu.example.org/sfu/get", () => {
-      return {
-        status: 200,
-        body: { url: serviceUrl, jwt: testJWTToken },
-      };
-    });
-    const config = await getSFUConfig(params);
-    expect(config).toEqual({
-      jwt: testJWTToken,
-      url: serviceUrl,
-      livekitIdentity: "@me:example.org:ABCDEF",
-      livekitAlias: "!example_room_id",
-    });
-  });
-
-  it("should fail if the SFU errors", async () => {
-    fetchMock.post("https://sfu.example.org/sfu/get", () => {
-      return {
-        status: 500,
-        body: {
-          errcode: "M_LOOKUP_FAILED",
-          error: "Failed to look up user info from homeserver",
-        },
-      };
-    });
-    try {
-      await getSFUConfig(params);
-    } catch (ex: unknown) {
-      expect(ex).toBeInstanceOf(FailToGetOpenIdToken);
-      expect((ex as FailToGetOpenIdToken).cause).toBeInstanceOf(MatrixError);
-      const mxError = (ex as Error).cause as MatrixError;
-      expect(mxError.message).toEqual(
-        "MatrixError: [500] Failed to look up user info from homeserver",
-      );
-
-      return;
-    }
-    expect.fail("Expected test to throw;");
-  });
-
-  it("should retry without delay params if the JWT service legacy endpoint returns M_BAD_JSON 400", async () => {
-    let callCount = 0;
-
-    fetchMock.post(
-      "https://sfu.example.org/sfu/get",
-      (url, opts) => {
-        callCount++;
-        const body = JSON.parse(opts.body as string);
-
-        // First call: check if it has delay parts and return 400
-        if (callCount === 1) {
-          expect(body).toHaveProperty("delay_id", "mock_delay_id");
-          return {
-            status: 400,
-            body: { errcode: "M_BAD_JSON", error: "Unsupported parameters" },
-          };
-        }
-
-        // Second call: check if delay parts were stripped and return success
-        expect(body).not.toHaveProperty("delay_id");
-        expect(body).not.toHaveProperty("delay_timeout");
-        expect(body).not.toHaveProperty("delay_cs_api_url");
-
-        return {
-          status: 200,
-          body: { url: serviceUrl, jwt: testJWTToken },
-        };
-      },
-      { overwriteRoutes: true },
-    );
-
-    // Note: Assuming getSFUConfig eventually calls getLiveKitJWT
-    const config = await getSFUConfig({ ...params, ...delayParams });
-
-    expect(config.jwt).toBe(testJWTToken);
-    expect(callCount).toBe(2);
-  });
-
-  it("should successfully send delay parameters to the JWT service legacy endpoint", async () => {
-    fetchMock.post(
-      "https://sfu.example.org/sfu/get",
-      (url, opts) => {
-        const body = JSON.parse(opts.body as string);
-
-        // Verify, that the request contains the expected delay parameters
-        if (
-          body.delay_id === "mock_delay_id" &&
-          body.delay_timeout === 3600000 &&
-          body.delay_cs_api_url === "https://matrix.homeserverserver.org"
-        ) {
-          return {
-            status: 200,
-            body: { url: serviceUrl, jwt: testJWTToken },
-          };
-        }
-        return {
-          status: 400,
-          body: { error: "Missing expected delay params" },
-        };
-      },
-      { overwriteRoutes: true },
-    );
-
-    const config = await getSFUConfig({ ...params, ...delayParams });
-
-    // Prüfe das Ergebnis
-    expect(config).toMatchObject({
-      jwt: testJWTToken,
-      url: serviceUrl,
-    });
-  });
-
-  it("should use the default endpoint when subscribing", async () => {
-    fetchMock.post("https://sfu.example.org/get_token", (url, opts) => {
-      const body = JSON.parse(opts.body as string);
-      expect(body).toMatchObject({
-        room_id: "!example_room_id",
-        slot_id: "m.call#ROOM",
-        member: {
-          id: ownMemberMock.memberId,
-          claimed_user_id: ownMemberMock.userId,
-          claimed_device_id: ownMemberMock.deviceId,
-        },
-      });
-      return { status: 200, body: { url: serviceUrl, jwt: testJWTToken } };
-    });
-    const config = await getSFUConfig({ ...params, role: "subscriber" });
-    expect(config.jwt).toBe(testJWTToken);
-    expect(fetchMock.called("https://sfu.example.org/sfu/get")).toBe(false);
-  });
-
-  it("should fail when subscribing if the default endpoint is missing", async () => {
-    // Nothing but the catch-all 404 answers the default endpoint. Subscribers
-    // must not fall back to the legacy endpoint, which would hand them a
-    // legacy identity.
-    await expect(
-      getSFUConfig({ ...params, role: "subscriber" }),
-    ).rejects.toThrow(FailToGetOpenIdToken);
-    expect(fetchMock.called("https://sfu.example.org/get_token")).toBe(true);
-    expect(fetchMock.called("https://sfu.example.org/sfu/get")).toBe(false);
-  });
-
-  it("should retry fetching the openid token", async () => {
-    let count = 0;
-    matrixClient.getOpenIdToken.mockImplementation(async () => {
-      count++;
-      if (count < 2) {
-        throw Error("Test failure");
-      }
-      return Promise.resolve({
-        token_type: "Bearer",
-        access_token: "foobar",
-        matrix_server_name: "example.org",
-        expires_in: 30,
-      });
-    });
-    fetchMock.post("https://sfu.example.org/sfu/get", () => {
-      return {
-        status: 200,
-        body: { url: serviceUrl, jwt: testJWTToken },
-      };
-    });
-    const config = await getSFUConfig({ ...params, ...delayParams });
-    expect(config).toEqual({
-      jwt: testJWTToken,
-      url: serviceUrl,
-      livekitIdentity: "@me:example.org:ABCDEF",
-      livekitAlias: "!example_room_id",
-    });
-  });
-});

src/livekit/auth/openID.ts

@@ -1,262 +0,0 @@
-/*
-Copyright 2023, 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 {
-  type IOpenIDToken,
-  type MatrixClient,
-  parseErrorResponse,
-} from "matrix-js-sdk";
-import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
-import { type Logger } from "matrix-js-sdk/lib/logger";
-
-import { FailToGetOpenIdToken } from "../../utils/errors";
-import { doNetworkOperationWithRetry } from "../../utils/matrix";
-import { Config } from "../../config/Config";
-import { extractFullConfigFromToken, type SFUConfig } from "./types";
-
-// The bits we need from MatrixClient
-export type ClientOpenIDParts = Pick<MatrixClient, "getOpenIdToken">;
-
-export interface GetSFUConfigParams {
-  client: ClientOpenIDParts;
-  /**
-   * Data identifying the local user's session membership.
-   */
-  membership: CallMembershipIdentityParts;
-  /**
-   * The base URL of the LiveKit JWT service.
-   */
-  serviceUrl: string;
-  /**
-   * The ID of the Matrix room in which the session takes place.
-   */
-  roomId: string;
-  /**
-   * The ID of the MatrixRTC slot in which the session takes place.
-   */
-  slotId: string;
-  /**
-   * Whether we want to publish or only subscribe on the {@link transport}.
-   */
-  role: "publisher" | "subscriber";
-  /**
-   * The base URL of the Matrix homeserver, for delayed leave delegation.
-   */
-  delayEndpointBaseUrl?: string;
-  /**
-   * The delay ID of the leave event to be delegated to the JWT service.
-   */
-  delayId?: string;
-  logger: Logger;
-}
-
-/**
- * Gets an {@link SFUConfig} appropriate for connecting to the SFU behind a
- * given service URL, using the legacy OpenID flow.
- * @throws {@link FailToGetOpenIdToken}
- */
-export async function getSFUConfig({
-  client,
-  membership,
-  serviceUrl,
-  roomId,
-  slotId,
-  role,
-  delayEndpointBaseUrl,
-  delayId,
-  logger,
-}: GetSFUConfigParams): Promise<SFUConfig> {
-  let openIdToken: IOpenIDToken;
-  try {
-    openIdToken = await doNetworkOperationWithRetry(async () =>
-      client.getOpenIdToken(),
-    );
-  } catch (error) {
-    throw new FailToGetOpenIdToken(
-      error instanceof Error ? error : new Error("Unknown error"),
-    );
-  }
-  logger.debug("Got openID token", openIdToken);
-  let sfuConfig: { url: string; jwt: string } | undefined;
-
-  let endpoint: "default" | "legacy";
-  if (role === "publisher") {
-    // When publishing a legacy transport (one with a `livekit_service_url`),
-    // subscribers will expect our participant identity to use the legacy
-    // `@user_id:device_id` format. Only the legacy JWT service endpoint assigns
-    // identities in this format, so we must use it.
-    endpoint = "legacy";
-  } else {
-    // Use the default endpoint as it affords us slightly better metadata
-    // protection (pseudonymous participant identities).
-    endpoint = "default";
-  }
-
-  try {
-    logger.info(
-      `Trying to get JWT with ${endpoint} endpoint for focus ${serviceUrl}...`,
-    );
-    sfuConfig = await (
-      endpoint === "legacy" ? getLiveKitJWTLegacy : getLiveKitJWT
-    )(
-      membership,
-      serviceUrl,
-      roomId,
-      slotId,
-      openIdToken,
-      delayEndpointBaseUrl,
-      delayId,
-    );
-    logger.info(`Got JWT from call's active focus URL.`);
-    return extractFullConfigFromToken(sfuConfig);
-  } catch (e) {
-    logger.error(`Failed fetching jwt with ${endpoint} endpoint:`, e);
-    throw new FailToGetOpenIdToken(
-      e instanceof Error ? e : new Error(`Unknown error ${e}`),
-    );
-  }
-}
-
-/**
- * Gets a JWT token appropriate for connecting to the SFU behind a given service
- * URL, using the legacy `/sfu/get` endpoint, which assigns us a legacy
- * (`<user_id>:<device_id>`) participant identity.
- */
-async function getLiveKitJWTLegacy(
-  membership: CallMembershipIdentityParts,
-  livekitServiceURL: string,
-  matrixRoomId: string,
-  _slotId: string, // Unused - the legacy endpoint is from before slots existed.
-  openIDToken: IOpenIDToken,
-  delayEndpointBaseUrl?: string,
-  delayId?: string,
-): Promise<{ url: string; jwt: string }> {
-  interface IDelayParams {
-    delay_id?: string;
-    delay_timeout?: number;
-    delay_cs_api_url?: string;
-  }
-  let bodyDalayParts: IDelayParams = {};
-  // Also check for empty string
-  if (delayId && delayEndpointBaseUrl) {
-    bodyDalayParts = {
-      delay_id: delayId,
-      delay_timeout:
-        Config.get().matrix_rtc_session.delegated_delayed_leave.delay_ms,
-      delay_cs_api_url: delayEndpointBaseUrl,
-    };
-  }
-
-  const makeRequest = async (delayParts: IDelayParams): Promise<Response> => {
-    return await fetch(livekitServiceURL + "/sfu/get", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        // The legacy JWT endpoint uses only the matrix room id to calculate the livekit room alias.
-        // However, the livekit room alias is provided as part of the JWT payload.
-        room: matrixRoomId,
-        openid_token: openIDToken,
-        device_id: membership.deviceId,
-        ...delayParts,
-      }),
-    });
-  };
-
-  const res = await doNetworkOperationWithRetry(async () => {
-    let response = await makeRequest(bodyDalayParts);
-
-    // Old service compatibility check
-    const oldServiceDoesNotSupportDelayParts =
-      response.status === 400 && Object.keys(bodyDalayParts).length > 0;
-    // If http status 400 with M_BAD_JSON and we sent delay parts, retry without them
-    if (oldServiceDoesNotSupportDelayParts) {
-      try {
-        const errorBody = await response.json();
-        if (errorBody.errcode === "M_BAD_JSON") {
-          response = await makeRequest({});
-        }
-      } catch {
-        // If we can't parse the error, treat as real error
-      }
-    }
-
-    return response;
-  });
-
-  if (!res.ok) {
-    throw parseErrorResponse(res, await res.text());
-  }
-  return await res.json();
-}
-
-class NotSupportedError extends Error {
-  public constructor(message: string) {
-    super(message);
-    this.name = "NotSupported";
-  }
-}
-
-/**
- * Gets a JWT token appropriate for connecting to the SFU behind a given service
- * URL, using the default `/get_token` endpoint, which assigns us a hashed
- * (pseudonymised) participant identity.
- */
-async function getLiveKitJWT(
-  membership: CallMembershipIdentityParts,
-  livekitServiceURL: string,
-  matrixRoomId: string,
-  slotId: string,
-  openIDToken: IOpenIDToken,
-  delayEndpointBaseUrl?: string,
-  delayId?: string,
-): Promise<{ url: string; jwt: string }> {
-  const { userId, deviceId, memberId } = membership;
-
-  const body = {
-    room_id: matrixRoomId,
-    slot_id: slotId,
-    openid_token: openIDToken,
-    member: {
-      id: memberId,
-      claimed_user_id: userId,
-      claimed_device_id: deviceId,
-    },
-  };
-
-  let bodyDalayParts = {};
-  // Also check for empty string
-  if (delayId && delayEndpointBaseUrl) {
-    bodyDalayParts = {
-      delay_id: delayId,
-      delay_timeout:
-        Config.get().matrix_rtc_session.delegated_delayed_leave.delay_ms,
-      delay_cs_api_url: delayEndpointBaseUrl,
-    };
-  }
-
-  const res = await doNetworkOperationWithRetry(async () => {
-    return await fetch(livekitServiceURL + "/get_token", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({ ...body, ...bodyDalayParts }),
-    });
-  });
-
-  if (!res.ok) {
-    const msg = "SFU Config fetch failed with status code " + res.status;
-    if (res.status === 404) {
-      throw new NotSupportedError(msg);
-    } else {
-      throw parseErrorResponse(res, await res.text());
-    }
-  }
-  return await res.json();
-}

src/livekit/auth/types.ts

@@ -1,90 +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 UnstableLivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
-
-/**
- * Data identifying a transport and the homeserver to which it belongs, so
- * consumers know how to reach it.
- */
-export interface TransportLocator {
-  transport: UnstableLivekitTransport;
-  serverName: string;
-}
-
-/**
- * Configuration and access tokens provided by the SFU on successful authentication.
- */
-export interface SFUConfig {
-  /**
-   * The WebSocket URL of the LiveKit SFU. This is what we connect the LiveKit
-   * room to. Note that this is NOT the JWT service URL
-   * (`livekit_service_url`): the legacy JWT service returns this URL as part of
-   * its response, while the CS-Api based flow requires us to know it upfront.
-   */
-  url: string;
-  jwt: string;
-  livekitAlias: string;
-  // NOTE: Currently unused.
-  livekitIdentity: string;
-}
-
-/**
- * Decoded details from the JWT.
- */
-interface SFUJWTPayload {
-  /**
-   * Expiration time for the JWT.
-   * Note: This value is in seconds since Unix epoch.
-   */
-  exp: number;
-  /**
-   * Name of the instance which authored the JWT
-   */
-  iss: string;
-  /**
-   * Time at which the JWT can start to be used.
-   * Note: This value is in seconds since Unix epoch.
-   */
-  nbf: number;
-  /**
-   * Subject. The Livekit alias in this context.
-   */
-  sub: string;
-  /**
-   * The set of permissions for the user.
-   */
-  video: {
-    canPublish: boolean;
-    canSubscribe: boolean;
-    room: string;
-    roomJoin: boolean;
-  };
-}
-
-/**
- * Complements the SFU websocket url and the JWT with the information encoded in
- * the JWT payload itself.
- * @param sfuConfig The SFU websocket url and the JWT to connect with.
- * @returns The full SFU config, including the LiveKit alias and identity.
- */
-export function extractFullConfigFromToken(sfuConfig: {
-  url: string;
-  jwt: string;
-}): SFUConfig {
-  const [, payloadStr] = sfuConfig.jwt.split(".");
-  const payload = JSON.parse(global.atob(payloadStr)) as SFUJWTPayload;
-  return {
-    jwt: sfuConfig.jwt,
-    url: sfuConfig.url,
-    livekitAlias: payload.video.room,
-    // NOTE: Currently unused.
-    // Probably also not helpful since we now compute the backendIdentity on joining the call so we can use it for the encryption manager.
-    // The only reason for us to know it locally is to connect the right users with the lk world. (and to set our own keys)
-    livekitIdentity: payload.sub,
-  };
-}

src/livekit/openIDSFU.test.ts

@@ -0,0 +1,329 @@
+/*
+Copyright 2025 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 {
+  beforeEach,
+  afterEach,
+  describe,
+  expect,
+  it,
+  type MockedObject,
+  vitest,
+} from "vitest";
+import fetchMock from "fetch-mock";
+import { MatrixError } from "matrix-js-sdk";
+
+import { getSFUConfigWithOpenID, type OpenIDClientParts } from "./openIDSFU";
+import { testJWTToken } from "../utils/test-fixtures";
+import { ownMemberMock } from "../utils/test";
+import { FailToGetOpenIdToken } from "../utils/errors";
+
+const sfuUrl = "https://sfu.example.org";
+
+describe("getSFUConfigWithOpenID", () => {
+  let matrixClient: MockedObject<OpenIDClientParts>;
+  beforeEach(() => {
+    fetchMock.catch(404);
+    matrixClient = {
+      getOpenIdToken: vitest.fn(),
+      getDeviceId: vitest.fn(),
+    };
+  });
+  afterEach(() => {
+    vitest.clearAllMocks();
+    fetchMock.reset();
+  });
+
+  it("should handle fetching a token", async () => {
+    fetchMock.post("https://sfu.example.org/sfu/get", () => {
+      return {
+        status: 200,
+        body: { url: sfuUrl, jwt: testJWTToken },
+      };
+    });
+    const config = await getSFUConfigWithOpenID(
+      matrixClient,
+      ownMemberMock,
+      "https://sfu.example.org",
+      "!example_room_id",
+    );
+    expect(config).toEqual({
+      jwt: testJWTToken,
+      url: sfuUrl,
+      livekitIdentity: "@me:example.org:ABCDEF",
+      livekitAlias: "!example_room_id",
+    });
+    void (await fetchMock.flush());
+  });
+
+  it("should fail if the SFU errors", async () => {
+    fetchMock.post("https://sfu.example.org/sfu/get", () => {
+      return {
+        status: 500,
+        body: {
+          errcode: "M_LOOKUP_FAILED",
+          error: "Failed to look up user info from homeserver",
+        },
+      };
+    });
+    try {
+      await getSFUConfigWithOpenID(
+        matrixClient,
+        ownMemberMock,
+        "https://sfu.example.org",
+        "!example_room_id",
+      );
+    } catch (ex: unknown) {
+      expect(ex).toBeInstanceOf(FailToGetOpenIdToken);
+      expect((ex as FailToGetOpenIdToken).cause).toBeInstanceOf(MatrixError);
+      const mxError = (ex as Error).cause as MatrixError;
+      expect(mxError.message).toEqual(
+        "MatrixError: [500] Failed to look up user info from homeserver",
+      );
+
+      void (await fetchMock.flush());
+      return;
+    }
+    expect.fail("Expected test to throw;");
+  });
+
+  it("should retry without delay params if the JWT service legacy endpoint returns M_BAD_JSON 400", async () => {
+    let callCount = 0;
+
+    fetchMock.post(
+      "https://sfu.example.org/sfu/get",
+      (url, opts) => {
+        callCount++;
+        const body = JSON.parse(opts.body as string);
+
+        // First call: check if it has delay parts and return 400
+        if (callCount === 1) {
+          expect(body).toHaveProperty("delay_id", "mock_delay_id");
+          return {
+            status: 400,
+            body: { errcode: "M_BAD_JSON", error: "Unsupported parameters" },
+          };
+        }
+
+        // Second call: check if delay parts were stripped and return success
+        expect(body).not.toHaveProperty("delay_id");
+        expect(body).not.toHaveProperty("delay_timeout");
+        expect(body).not.toHaveProperty("delay_cs_api_url");
+
+        return {
+          status: 200,
+          body: { url: sfuUrl, jwt: testJWTToken },
+        };
+      },
+      { overwriteRoutes: true },
+    );
+
+    // Note: Assuming getSFUConfigWithOpenID eventually calls getLiveKitJWT
+    const config = await getSFUConfigWithOpenID(
+      matrixClient,
+      ownMemberMock,
+      "https://sfu.example.org",
+      "!example_room_id",
+      {
+        delayEndpointBaseUrl: "https://matrix.homeserverserver.org",
+        delayId: "mock_delay_id",
+      },
+    );
+
+    expect(config.jwt).toBe(testJWTToken);
+    expect(callCount).toBe(2);
+    void (await fetchMock.flush());
+  });
+
+  it("should successfully send delay parameters to the JWT service legacy endpoint", async () => {
+    fetchMock.post(
+      "https://sfu.example.org/sfu/get",
+      (url, opts) => {
+        const body = JSON.parse(opts.body as string);
+
+        // Verify, that the request contains the expected delay parameters
+        if (
+          body.delay_id === "mock_delay_id" &&
+          body.delay_timeout === 3600000 &&
+          body.delay_cs_api_url === "https://homeserverserver.org/cs_api"
+        ) {
+          return {
+            status: 200,
+            body: { url: sfuUrl, jwt: testJWTToken },
+          };
+        }
+        return {
+          status: 400,
+          body: { error: "Missing expected delay params" },
+        };
+      },
+      { overwriteRoutes: true },
+    );
+
+    const config = await getSFUConfigWithOpenID(
+      matrixClient,
+      ownMemberMock,
+      "https://sfu.example.org",
+      "!example_room_id",
+      {
+        delayEndpointBaseUrl: "https://homeserverserver.org/cs_api",
+        delayId: "mock_delay_id",
+      },
+    );
+
+    // Prüfe das Ergebnis
+    expect(config).toMatchObject({
+      jwt: testJWTToken,
+      url: sfuUrl,
+    });
+
+    void (await fetchMock.flush());
+  });
+
+  it("should try legacy and then new endpoint with delay delegation", async () => {
+    fetchMock.post("https://sfu.example.org/get_token", () => {
+      return {
+        status: 500,
+        body: {
+          errcode: "M_LOOKUP_FAILED",
+          error: "Failed to look up user info from homeserver",
+        },
+      };
+    });
+    fetchMock.post("https://sfu.example.org/sfu/get", () => {
+      return {
+        status: 500,
+        body: {
+          errcode: "M_LOOKUP_FAILED",
+          error: "Failed to look up user info from homeserver",
+        },
+      };
+    });
+    try {
+      await getSFUConfigWithOpenID(
+        matrixClient,
+        ownMemberMock,
+        "https://sfu.example.org",
+        "!example_room_id",
+        {
+          delayEndpointBaseUrl: "https://matrix.homeserverserver.org",
+          delayId: "mock_delay_id",
+        },
+      );
+    } catch (ex) {
+      expect(ex).toBeInstanceOf(FailToGetOpenIdToken);
+      expect((ex as FailToGetOpenIdToken).cause).toBeInstanceOf(MatrixError);
+      const mxError = (ex as Error).cause as MatrixError;
+      expect(mxError.message).toEqual(
+        "MatrixError: [500] Failed to look up user info from homeserver",
+      );
+      void (await fetchMock.flush());
+    }
+    const calls = fetchMock.calls();
+    expect(calls.length).toBe(2);
+
+    expect(calls[0][0]).toStrictEqual("https://sfu.example.org/get_token");
+    expect(calls[0][1]).toStrictEqual({
+      // check if it uses correct delayID!
+      body: '{"room_id":"!example_room_id","slot_id":"m.call#ROOM","member":{"id":"@alice:example.org:DEVICE","claimed_user_id":"@alice:example.org","claimed_device_id":"DEVICE"},"delay_id":"mock_delay_id","delay_timeout":3600000,"delay_cs_api_url":"https://matrix.homeserverserver.org"}',
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+
+    expect(calls[1][0]).toStrictEqual("https://sfu.example.org/sfu/get");
+
+    expect(calls[1][1]).toStrictEqual({
+      body: '{"room":"!example_room_id","device_id":"DEVICE","delay_id":"mock_delay_id","delay_timeout":3600000,"delay_cs_api_url":"https://matrix.homeserverserver.org"}',
+      headers: {
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+    });
+  });
+
+  it("dont try legacy if endpoint with delay delegation is sucessful", async () => {
+    fetchMock.post("https://sfu.example.org/get_token", () => {
+      return {
+        status: 200,
+        body: { url: sfuUrl, jwt: testJWTToken },
+      };
+    });
+    fetchMock.post("https://sfu.example.org/sfu/get", () => {
+      return {
+        status: 500,
+        body: { error: "Test failure" },
+      };
+    });
+    try {
+      await getSFUConfigWithOpenID(
+        matrixClient,
+        ownMemberMock,
+        "https://sfu.example.org",
+        "!example_room_id",
+        {
+          delayEndpointBaseUrl: "https://matrix.homeserverserver.org",
+          delayId: "mock_delay_id",
+        },
+      );
+    } catch (ex) {
+      expect(ex).toBeInstanceOf(FailToGetOpenIdToken);
+      expect((ex as FailToGetOpenIdToken).cause).toEqual(
+        new Error("SFU Config fetch failed with status code 500"),
+      );
+      void (await fetchMock.flush());
+    }
+    const calls = fetchMock.calls();
+    expect(calls.length).toBe(1);
+
+    expect(calls[0][0]).toStrictEqual("https://sfu.example.org/get_token");
+    expect(calls[0][1]).toStrictEqual({
+      // check if it uses correct delayID!
+      body: '{"room_id":"!example_room_id","slot_id":"m.call#ROOM","member":{"id":"@alice:example.org:DEVICE","claimed_user_id":"@alice:example.org","claimed_device_id":"DEVICE"},"delay_id":"mock_delay_id","delay_timeout":3600000,"delay_cs_api_url":"https://matrix.homeserverserver.org"}',
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+  });
+
+  it("should retry fetching the openid token", async () => {
+    let count = 0;
+    matrixClient.getOpenIdToken.mockImplementation(async () => {
+      count++;
+      if (count < 2) {
+        throw Error("Test failure");
+      }
+      return Promise.resolve({
+        token_type: "Bearer",
+        access_token: "foobar",
+        matrix_server_name: "example.org",
+        expires_in: 30,
+      });
+    });
+    fetchMock.post("https://sfu.example.org/sfu/get", () => {
+      return {
+        status: 200,
+        body: { url: sfuUrl, jwt: testJWTToken },
+      };
+    });
+    const config = await getSFUConfigWithOpenID(
+      matrixClient,
+      ownMemberMock,
+      "https://sfu.example.org",
+      "!example_room_id",
+    );
+    expect(config).toEqual({
+      jwt: testJWTToken,
+      url: sfuUrl,
+      livekitIdentity: "@me:example.org:ABCDEF",
+      livekitAlias: "!example_room_id",
+    });
+    void (await fetchMock.flush());
+  });
+});

src/livekit/openIDSFU.ts

@@ -0,0 +1,315 @@
+/*
+Copyright 2023, 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 {
+  type IOpenIDToken,
+  type MatrixClient,
+  parseErrorResponse,
+} from "matrix-js-sdk";
+import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
+import { type Logger } from "matrix-js-sdk/lib/logger";
+
+import {
+  FailToGetOpenIdToken,
+  NoMatrix2AuthorizationService,
+} from "../utils/errors";
+import { doNetworkOperationWithRetry } from "../utils/matrix";
+import { Config } from "../config/Config";
+import { MatrixRTCMode } from "../config/ConfigOptions";
+
+/**
+ * Configuration and access tokens provided by the SFU on successful authentication.
+ */
+export interface SFUConfig {
+  url: string;
+  jwt: string;
+  livekitAlias: string;
+  // NOTE: Currently unused.
+  livekitIdentity: string;
+}
+
+/**
+ * Decoded details from the JWT.
+ */
+interface SFUJWTPayload {
+  /**
+   * Expiration time for the JWT.
+   * Note: This value is in seconds since Unix epoch.
+   */
+  exp: number;
+  /**
+   * Name of the instance which authored the JWT
+   */
+  iss: string;
+  /**
+   * Time at which the JWT can start to be used.
+   * Note: This value is in seconds since Unix epoch.
+   */
+  nbf: number;
+  /**
+   * Subject. The Livekit alias in this context.
+   */
+  sub: string;
+  /**
+   * The set of permissions for the user.
+   */
+  video: {
+    canPublish: boolean;
+    canSubscribe: boolean;
+    room: string;
+    roomJoin: boolean;
+  };
+}
+
+// The bits we need from MatrixClient
+export type OpenIDClientParts = Pick<
+  MatrixClient,
+  "getOpenIdToken" | "getDeviceId"
+>;
+
+/**
+ * Gets a bearer token from the homeserver and then use it to authenticate
+ * to the matrix RTC backend in order to get acces to the SFU.
+ * It has built-in retry for calls to the homeserver with a backoff policy.
+ * @param client The Matrix client
+ * @param membership Our own membership identity parts used to send to jwt service.
+ * @param serviceUrl The URL of the livekit SFU service
+ * @param roomId The room id used in the jwt request. This is NOT the livekit_alias. The jwt service will provide the alias. It maps matrix room ids <-> Livekit aliases.
+ * @param opts Additional options to modify which endpoint with which data will be used to acquire the jwt token.
+ * @param opts.matrixRTCMode Determines which version of the JWT endpoint to use, which affects whether the
+ * RTC backend identity is based on string concatenation (legacy) or a hash (Matrix 2.0).
+ * This function by default uses whatever is possible with the current jwt service installed next to the SFU.
+ * For remote connections this does not matter, since we will not publish there we can rely on the newest option.
+ * @param opts.delayEndpointBaseUrl The URL of the matrix homeserver.
+ * @param opts.delayId The delay id used for the jwt service to manage.
+ * @param logger optional logger.
+ * @returns Object containing the token information
+ * @throws FailToGetOpenIdToken
+ */
+export async function getSFUConfigWithOpenID(
+  client: OpenIDClientParts,
+  membership: CallMembershipIdentityParts,
+  serviceUrl: string,
+  roomId: string,
+  opts?: {
+    matrixRTCMode?: MatrixRTCMode;
+    delayEndpointBaseUrl?: string;
+    delayId?: string;
+  },
+  logger?: Logger,
+): Promise<SFUConfig> {
+  let openIdToken: IOpenIDToken;
+  try {
+    openIdToken = await doNetworkOperationWithRetry(async () =>
+      client.getOpenIdToken(),
+    );
+  } catch (error) {
+    throw new FailToGetOpenIdToken(
+      error instanceof Error ? error : new Error("Unknown error"),
+    );
+  }
+  logger?.debug("Got openID token", openIdToken);
+  let sfuConfig: { url: string; jwt: string } | undefined;
+
+  const tryBothJwtEndpoints = opts?.matrixRTCMode === undefined; // This is for SFUs where we do not publish.
+
+  const forceMatrix2Jwt = opts?.matrixRTCMode === MatrixRTCMode.Matrix_2_0;
+
+  // We want to start using the new endpoint (with optional delay delegation)
+  // if we can use both or if we are forced to use the new one.
+  if (tryBothJwtEndpoints || forceMatrix2Jwt) {
+    try {
+      logger?.info(
+        `Trying to get JWT via default endpoint for focus ${serviceUrl}...`,
+      );
+      const sfuConfig = await getLiveKitJWT(
+        membership,
+        serviceUrl,
+        roomId,
+        openIdToken,
+        opts?.delayEndpointBaseUrl,
+        opts?.delayId,
+      );
+
+      return extractFullConfigFromToken(sfuConfig);
+    } catch (e) {
+      logger?.debug(`Failed fetching jwt with matrix 2.0 endpoint:`, e);
+      // Make this throw a hard error in case we force the matrix2.0 endpoint.
+      if (forceMatrix2Jwt) {
+        throw new NoMatrix2AuthorizationService(e as Error);
+      }
+    }
+  }
+
+  // DEPRECATED
+  // here we either have a sfuConfig or we already exited because of `if (forceMatrix2) throw ...`
+  // The only case we can get into this condition is, if `forceMatrix2` is `false`
+  try {
+    logger?.info(
+      `Trying to get JWT with legacy endpoint for focus ${serviceUrl}...`,
+    );
+    sfuConfig = await getLiveKitJWTLegacy(
+      membership.deviceId,
+      serviceUrl,
+      roomId,
+      openIdToken,
+      opts?.delayEndpointBaseUrl,
+      opts?.delayId,
+    );
+    logger?.info(`Got JWT from call's active focus URL.`);
+    return extractFullConfigFromToken(sfuConfig);
+  } catch (ex) {
+    throw new FailToGetOpenIdToken(
+      ex instanceof Error ? ex : new Error(`Unknown error ${ex}`),
+    );
+  }
+}
+
+function extractFullConfigFromToken(sfuConfig: {
+  url: string;
+  jwt: string;
+}): SFUConfig {
+  const [, payloadStr] = sfuConfig.jwt.split(".");
+  const payload = JSON.parse(global.atob(payloadStr)) as SFUJWTPayload;
+  return {
+    jwt: sfuConfig.jwt,
+    url: sfuConfig.url,
+    livekitAlias: payload.video.room,
+    // NOTE: Currently unused.
+    // Probably also not helpful since we now compute the backendIdentity on joining the call so we can use it for the encryption manager.
+    // The only reason for us to know it locally is to connect the right users with the lk world. (and to set our own keys)
+    livekitIdentity: payload.sub,
+  };
+}
+
+async function getLiveKitJWTLegacy(
+  deviceId: string,
+  livekitServiceURL: string,
+  matrixRoomId: string,
+  openIDToken: IOpenIDToken,
+  delayEndpointBaseUrl?: string,
+  delayId?: string,
+): Promise<{ url: string; jwt: string }> {
+  interface IDelayParams {
+    delay_id?: string;
+    delay_timeout?: number;
+    delay_cs_api_url?: string;
+  }
+  let bodyDalayParts: IDelayParams = {};
+  // Also check for empty string
+  if (delayId && delayEndpointBaseUrl) {
+    bodyDalayParts = {
+      delay_id: delayId,
+      delay_timeout:
+        Config.get().matrix_rtc_session.delegated_delayed_leave.delay_ms,
+      delay_cs_api_url: delayEndpointBaseUrl,
+    };
+  }
+
+  const makeRequest = async (delayParts: IDelayParams): Promise<Response> => {
+    return await fetch(livekitServiceURL + "/sfu/get", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        // The legacy JWT endpoint uses only the matrix room id to calculate the livekit room alias.
+        // However, the livekit room alias is provided as part of the JWT payload.
+        room: matrixRoomId,
+        openid_token: openIDToken,
+        device_id: deviceId,
+        ...delayParts,
+      }),
+    });
+  };
+
+  const res = await doNetworkOperationWithRetry(async () => {
+    let response = await makeRequest(bodyDalayParts);
+
+    // Old service compatibility check
+    const oldServiceDoesNotSupportDelayParts =
+      response.status === 400 && Object.keys(bodyDalayParts).length > 0;
+    // If http status 400 with M_BAD_JSON and we sent delay parts, retry without them
+    if (oldServiceDoesNotSupportDelayParts) {
+      try {
+        const errorBody = await response.json();
+        if (errorBody.errcode === "M_BAD_JSON") {
+          response = await makeRequest({});
+        }
+      } catch {
+        // If we can't parse the error, treat as real error
+      }
+    }
+
+    return response;
+  });
+
+  if (!res.ok) {
+    throw parseErrorResponse(res, await res.text());
+  }
+  return await res.json();
+}
+
+class NotSupportedError extends Error {
+  public constructor(message: string) {
+    super(message);
+    this.name = "NotSupported";
+  }
+}
+
+export async function getLiveKitJWT(
+  membership: CallMembershipIdentityParts,
+  livekitServiceURL: string,
+  matrixRoomId: string,
+  openIDToken: IOpenIDToken,
+  delayEndpointBaseUrl?: string,
+  delayId?: string,
+): Promise<{ url: string; jwt: string }> {
+  const { userId, deviceId, memberId } = membership;
+
+  const body = {
+    room_id: matrixRoomId,
+    slot_id: "m.call#ROOM",
+    openid_token: openIDToken,
+    member: {
+      id: memberId,
+      claimed_user_id: userId,
+      claimed_device_id: deviceId,
+    },
+  };
+
+  let bodyDalayParts = {};
+  // Also check for empty string
+  if (delayId && delayEndpointBaseUrl) {
+    bodyDalayParts = {
+      delay_id: delayId,
+      delay_timeout:
+        Config.get().matrix_rtc_session.delegated_delayed_leave.delay_ms,
+      delay_cs_api_url: delayEndpointBaseUrl,
+    };
+  }
+
+  const res = await doNetworkOperationWithRetry(async () => {
+    return await fetch(livekitServiceURL + "/get_token", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({ ...body, ...bodyDalayParts }),
+    });
+  });
+
+  if (!res.ok) {
+    const msg = "SFU Config fetch failed with status code " + res.status;
+    if (res.status === 404) {
+      throw new NotSupportedError(msg);
+    } else {
+      throw parseErrorResponse(res, await res.text());
+    }
+  }
+  return await res.json();
+}

src/reactions/index.ts

@@ -29,8 +29,6 @@ import waveSoundOgg from "../sound/reactions/wave.ogg?url";
 import waveSoundMp3 from "../sound/reactions/wave.mp3?url";
 import baduntssSoundOgg from "../sound/reactions/baduntss.ogg?url";
 import baduntssSoundMp3 from "../sound/reactions/baduntss.mp3?url";
-import bellSoundOgg from "../sound/reactions/bell.ogg?url";
-import bellSoundMp3 from "../sound/reactions/bell.mp3?url";
 
 export const ElementCallReactionEventType = "io.element.call.reaction";
 
@@ -204,15 +202,6 @@ export const ReactionSet: ReactionOption[] = [
       mp3: baduntssSoundMp3,
     },
   },
-  {
-    emoji: "🛎️",
-    name: "bell",
-    alias: ["ding"],
-    sound: {
-      ogg: bellSoundOgg,
-      mp3: bellSoundMp3,
-    },
-  },
 ];
 
 export interface RaisedHandInfo {

src/room/CallEventAudioRenderer.test.tsx

@@ -17,7 +17,7 @@ import {
 import { act } from "react";
 import { type RoomMember } from "matrix-js-sdk";
 import {
-  type UnstableLivekitTransport,
+  type LivekitTransport,
   type CallMembership,
 } from "matrix-js-sdk/lib/matrixrtc";
 
@@ -46,7 +46,7 @@ vitest.mock("../useAudioContext");
 vitest.mock("../soundUtils");
 vitest.mock("../rtcSessionHelpers", async (importOriginal) => ({
   ...(await importOriginal()),
-  makeTransport: (): [UnstableLivekitTransport] => [exampleTransport],
+  makeTransport: (): [LivekitTransport] => [exampleTransport],
 }));
 
 afterEach(() => {

src/room/CallView.tsx

@@ -242,7 +242,12 @@ const LoadedCallView: FC<LoadedProps> = ({
   const { displayName, avatarUrl } = useProfile(client);
   const roomName = useRoomName(room);
   const roomAvatar = useRoomAvatar(room);
-  const { returnToLobby, password: passwordFromUrl, header } = useUrlParams();
+  const {
+    perParticipantE2EE,
+    returnToLobby,
+    password: passwordFromUrl,
+    header,
+  } = useUrlParams();
   const e2eeSystem = useRoomEncryptionSystem(room.roomId);
 
   // Save the password once we start the groupCallView
@@ -360,6 +365,7 @@ const LoadedCallView: FC<LoadedProps> = ({
     rtcSession,
     preload,
     skipLobby,
+    perParticipantE2EE,
     mediaDevices,
     latestMuteStates,
     setJoined,