Log when delegation succeeds

Delegate delayed events using dedicated endpoint
2026-11-04 00:42:28 +00:00 · 2026-08-27 10:29:39 +02:00 · 2026-08-26 19:51:43 +02:00
24 changed files with 168 additions and 943 deletions
@@ -13,7 +13,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:c107ec33fa349cb5c14fd03a4e13352d64ef264416dac96d273aa07b4004171f
+    image: ghcr.io/element-hq/element-web:develop@sha256:0332028836603e91689053f157847b4deef9342bd19e3195eeb81793b7e4046e
  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:c107ec33fa349cb5c14fd03a4e13352d64ef264416dac96d273aa07b4004171f
+    image: ghcr.io/element-hq/element-web:develop@sha256:0332028836603e91689053f157847b4deef9342bd19e3195eeb81793b7e4046e
@@ -116,7 +116,6 @@
    "peer_connection_timeout_description": "Connection to the media server timed out. Try switching to a different network or disabling your VPN. If the problem persists, see our <0>troubleshooting guide</0> or contact your server administrator.",
    "room_creation_restricted": "Failed to create call",
    "room_creation_restricted_description": "Call creation might be restricted to authorized users only. Try again later, or contact your server admin if the problem persists.",
-    "screen_share_failed": "Could not start screen sharing",
    "sticky_events_required": "Homeserver does not support Matrix 2.0 calls",
    "sticky_events_required_description": "This deployment is configured to use Matrix 2.0 call mode, but the homeserver does not advertise support for sticky events (MSC4354). Ask your server admin to upgrade, or switch the deployment to a compatible mode.",
    "unexpected_ec_error": "An unexpected error occurred (<0>Error Code:</0> <1>{{ errorCode }}</1>). Please contact your server admin."
@@ -66,7 +66,7 @@ importers:
        version: 10.1.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
      '@rolldown/plugin-babel':
        specifier: ^0.2.3
-        version: 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))
+        version: 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))
      '@sentry/react':
        specifier: ^8.0.0
        version: 8.55.2(react@19.2.8)
@@ -138,7 +138,7 @@ importers:
        version: 10.0.1(@fontsource/inconsolata@5.3.0)(@fontsource/inter@5.3.0)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(@vector-im/compound-design-tokens@10.2.4(@types/react@19.2.17)(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.0.5(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))
+        version: 6.0.5(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))
      '@vitest/browser-playwright':
        specifier: ^4.1.5
        version: 4.1.10(playwright@1.62.0)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))(vitest@4.1.10)
@@ -192,10 +192,10 @@ 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/24929be0e741be6a5d0a7226f1c682e245263b8a
+        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/178dc6528ebc6a15e2f6fab38410127f16b500d0
      matrix-widget-api:
        specifier: ^1.18.0
-        version: 1.19.0
+        version: 1.18.0
      node-stdlib-browser:
        specifier: ^1.3.1
        version: 1.3.1
@@ -1191,8 +1191,8 @@ packages:
      '@types/dom-mediacapture-transform': ^0.1.9
      livekit-client: ^1.12.0 || ^2.1.0

-  '@matrix-org/matrix-sdk-crypto-wasm@18.5.0':
-    resolution: {integrity: sha512-E826Hy1rG26LanPjtSsOiVRcVoHfSgPgj2r2Xsb5RPScpaKi9XJADQ0u3dNjRCitZPX4oyLNl1FDd5AfDlmIwQ==}
+  '@matrix-org/matrix-sdk-crypto-wasm@18.4.0':
+    resolution: {integrity: sha512-osxkU1DQ+05+anGHapjWyvZqdHUb94Id37gy54mCKn1Cq/D7iGT5oEUEhjp4oTnCLo4TOtI6ULJ/LHsapaIptQ==}
    engines: {node: '>= 18'}

  '@mdx-js/react@3.1.1':
@@ -3670,9 +3670,9 @@ packages:
  constants-browserify@1.0.0:
    resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}

-  content-type@3.0.0:
-    resolution: {integrity: sha512-AIi5H6p0xk5uknXcN3/rmhP8jgp69OfSe/JuKiQAFprJ7UGw7mwj7m4XcmDzlrnJDG+cGpphAINGdU3g3g7kDw==}
-    engines: {node: '>=22'}
+  content-type@2.0.0:
+    resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==}
+    engines: {node: '>=18'}

  convert-source-map@2.0.0:
    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
@@ -4685,13 +4685,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/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
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/178dc6528ebc6a15e2f6fab38410127f16b500d0:
+    resolution: {gitHosted: true, integrity: sha512-UmlkoXs9VMZvNaDeQqBb2k+gLifnIqEZc5cxrLeEwdYEDakQLbRqrFtmvIp4ipUCjdIPkCgtzb7QLlpPBLAwqA==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/178dc6528ebc6a15e2f6fab38410127f16b500d0}
+    version: 42.1.0
    engines: {node: '>=22.0.0'}

-  matrix-widget-api@1.19.0:
-    resolution: {integrity: sha512-Qe7L6G1mQJphBC47/Bzp5ljPIK1UARgLiuGgS+/KmEs/eaNHkQ3+ArD0/0kvMV+d6kCGAZ9OKRqsnuPjizI+tw==}
+  matrix-widget-api@1.18.0:
+    resolution: {integrity: sha512-4T2f2koWmx05p1BLcT/9YGGGPSXpPT+PA4Oap/5fjhXsWPxMGJiGL97YpANMYLKsnE1sScYFeuyxIgdc1Qo+Ew==}

  md5.js@1.3.5:
    resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
@@ -7102,7 +7102,7 @@ snapshots:
      '@types/dom-mediacapture-transform': 0.1.11
      livekit-client: 2.22.0(@types/dom-mediacapture-record@1.0.22)

-  '@matrix-org/matrix-sdk-crypto-wasm@18.5.0': {}
+  '@matrix-org/matrix-sdk-crypto-wasm@18.4.0': {}

  '@mdx-js/react@3.1.1(@types/react@19.2.17)(react@19.2.8)':
    dependencies:
@@ -8053,13 +8053,13 @@ snapshots:
  '@rolldown/binding-win32-x64-msvc@1.1.5':
    optional: true

-  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))':
+  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))':
    dependencies:
      '@babel/core': 7.29.7(supports-color@7.2.0)
      picomatch: 4.0.4
      rolldown: 1.1.5
    optionalDependencies:
-      '@babel/runtime': 8.0.0
+      '@babel/runtime': 7.29.7
      vite: 8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0)

  '@rolldown/pluginutils@1.0.1': {}
@@ -8744,12 +8744,12 @@ snapshots:
      - '@types/react-dom'
      - react-dom

-  '@vitejs/plugin-react@6.0.5(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))':
+  '@vitejs/plugin-react@6.0.5(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))':
    dependencies:
      '@rolldown/pluginutils': 1.0.1
      vite: 8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0)
    optionalDependencies:
-      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@8.0.0)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))
+      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))
      babel-plugin-react-compiler: 1.0.0

  '@vitest/browser-playwright@4.1.10(playwright@1.62.0)(vite@8.1.5(@types/node@24.13.3)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.102.0)(terser@5.46.1)(yaml@2.9.0))(vitest@4.1.10)':
@@ -9195,7 +9195,7 @@ snapshots:

  constants-browserify@1.0.0: {}

-  content-type@3.0.0: {}
+  content-type@2.0.0: {}

  convert-source-map@2.0.0: {}

@@ -10275,21 +10275,21 @@ snapshots:

  matrix-events-sdk@0.0.1: {}

-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/24929be0e741be6a5d0a7226f1c682e245263b8a:
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/178dc6528ebc6a15e2f6fab38410127f16b500d0:
    dependencies:
      '@babel/runtime': 8.0.0
-      '@matrix-org/matrix-sdk-crypto-wasm': 18.5.0
+      '@matrix-org/matrix-sdk-crypto-wasm': 18.4.0
      another-json: 0.2.0
      bs58: 6.0.0
-      content-type: 3.0.0
+      content-type: 2.0.0
      loglevel: 1.9.2
      matrix-events-sdk: 0.0.1
-      matrix-widget-api: 1.19.0
+      matrix-widget-api: 1.18.0
      p-retry: 8.0.0
      sdp-transform: 3.0.0
      unhomoglyph: 1.0.6

-  matrix-widget-api@1.19.0:
+  matrix-widget-api@1.18.0:
    dependencies:
      '@types/events': 3.0.3
      events: 3.3.0
@@ -219,18 +219,6 @@ export interface ConfigOptions {
     * This is what goes into the m.rtc.member event expiry field and is typically set to a number of hours.
     */
    membership_event_expiry_ms?: number;
-
-    /**
-     * The number of participants in the session at which the media encryption key will no longer
-     * be rotated.
-     *
-     * Rotating a key requires sending it to every participant device, so in large sessions the
-     * cost of rotating on every join/leave becomes prohibitive. At this limit the current key is
-     * kept and distributed to new joiners; no new keys are generated for joiners/leavers.
-     *
-     * Defaults to the js-sdk default (undefined). Which means that rotation will always happen.
-     */
-    key_rotation_participant_limit?: number;
  };
 }

@@ -264,7 +252,6 @@ export interface ResolvedConfigOptions extends ConfigOptions {
    delayed_leave_event_restart_ms?: number;
    network_error_retry_ms: number;
    membership_event_expiry_ms?: number;
-    key_rotation_participant_limit?: number;
  };
 }

@@ -18,7 +18,6 @@ import {
  NoMatrix2AuthorizationService,
 } from "../utils/errors";
 import { doNetworkOperationWithRetry } from "../utils/matrix";
-import { Config } from "../config/Config";
 import { JwtEndpointVersion } from "../state/CallViewModel/localMember/LocalTransport";

 /**
@@ -85,8 +84,6 @@ export type OpenIDClientParts = Pick<
 * 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.
 * For our own connection we can only use the hashed version if we also send the new matrix2.0 sticky events.
- * @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
@@ -98,8 +95,6 @@ export async function getSFUConfigWithOpenID(
  roomId: string,
  opts?: {
    forceJwtEndpoint?: JwtEndpointVersion;
-    delayEndpointBaseUrl?: string;
-    delayId?: string;
  },
  logger?: Logger,
 ): Promise<SFUConfig> {
@@ -121,20 +116,18 @@ export async function getSFUConfigWithOpenID(
  const forceMatrix2Jwt =
    opts?.forceJwtEndpoint === JwtEndpointVersion.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.
+  // We want to start using the new endpoint 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 with delegation for focus ${serviceUrl}...`,
      );
-      const sfuConfig = await getLiveKitJWTWithDelayDelegation(
+      const sfuConfig = await getLiveKitJWT(
        membership,
        serviceUrl,
        roomId,
        openIdToken,
-        opts?.delayEndpointBaseUrl,
-        opts?.delayId,
      );

      return extractFullConfigFromToken(sfuConfig);
@@ -154,13 +147,11 @@ export async function getSFUConfigWithOpenID(
    logger?.info(
      `Trying to get JWT with legacy endpoint for focus ${serviceUrl}...`,
    );
-    sfuConfig = await getLiveKitJWT(
+    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);
@@ -188,33 +179,14 @@ function extractFullConfigFromToken(sfuConfig: {
  };
 }

-async function getLiveKitJWT(
+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) {
-    const delayTimeoutMs =
-      Config.get().matrix_rtc_session?.delayed_leave_event_delay_ms;
-    bodyDalayParts = {
-      delay_id: delayId,
-      delay_timeout: delayTimeoutMs,
-      delay_cs_api_url: delayEndpointBaseUrl,
-    };
-  }
-
-  const makeRequest = async (delayParts: IDelayParams): Promise<Response> => {
-    return await fetch(livekitServiceURL + "/sfu/get", {
+  const res = await doNetworkOperationWithRetry(async () =>
+    fetch(livekitServiceURL + "/sfu/get", {
      method: "POST",
      headers: {
        "Content-Type": "application/json",
@@ -225,31 +197,9 @@ async function getLiveKitJWT(
        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());
@@ -264,17 +214,15 @@ class NotSupportedError extends Error {
  }
 }

-export async function getLiveKitJWTWithDelayDelegation(
+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 = {
+  const body = JSON.stringify({
    room_id: matrixRoomId,
    slot_id: "m.call#ROOM",
    openid_token: openIDToken,
@@ -283,27 +231,13 @@ export async function getLiveKitJWTWithDelayDelegation(
      claimed_user_id: userId,
      claimed_device_id: deviceId,
    },
-  };
-
-  let bodyDalayParts = {};
-  // Also check for empty string
-  if (delayId && delayEndpointBaseUrl) {
-    const delayTimeoutMs =
-      Config.get().matrix_rtc_session?.delayed_leave_event_delay_ms;
-    bodyDalayParts = {
-      delay_id: delayId,
-      delay_timeout: delayTimeoutMs,
-      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 }),
+      headers: { "Content-Type": "application/json" },
+      body,
    });
  });

@@ -22,7 +22,7 @@ import { TooltipProvider } from "@vector-im/compound-web";
 import { RoomContext, useLocalParticipant } from "@livekit/components-react";
 import userEvent from "@testing-library/user-event";

-import { ActiveCall, InCallView } from "./InCallView";
+import { InCallView } from "./InCallView";
 import {
  mockLivekitRoom,
  mockLocalParticipant,
@@ -33,10 +33,7 @@ import {
  type MockRTCSession,
 } from "../utils/test";
 import { E2eeType } from "../e2ee/e2eeType";
-import {
-  getBasicCallViewModelEnvironment,
-  getBasicRTCSession,
-} from "../utils/test-viewmodel";
+import { getBasicCallViewModelEnvironment } from "../utils/test-viewmodel";
 import {
  type CallViewModel,
  type CallViewModelOptions,
@@ -48,8 +45,6 @@ import { LivekitRoomAudioRenderer } from "../livekit/MatrixAudioRenderer";
 import { MediaDevicesContext } from "../MediaDevicesContext";
 import { type MediaDevices as ECMediaDevices } from "../state/MediaDevices";
 import { AppBar } from "../AppBar";
-import { type MatrixInfo } from "./VideoPreview";
-import { ProcessorProvider } from "../livekit/TrackProcessorContext";
 import { initializeWidget } from "../widget";

 initializeWidget();
@@ -83,17 +78,6 @@ const remoteParticipant = mockRemoteParticipant({
  identity: "@alice:example.org:AAAAAA",
 });

-const matrixInfo = {
-  userId: "",
-  displayName: "",
-  avatarUrl: "",
-  roomId: "",
-  roomName: "",
-  roomAlias: null,
-  roomAvatar: null,
-  e2eeSystem: { kind: E2eeType.NONE },
-} satisfies MatrixInfo;
-
 let useRoomEncryptionSystemMock: MockedFunction<typeof useRoomEncryptionSystem>;

 beforeEach(() => {
@@ -138,13 +122,12 @@ function createInCallView(args: CreateInCallViewArgs = {}): RenderResult & {
      remoteParticipants$: of([remoteParticipant]),
    },
  );
-  const { vm, footerVm, developerSettingsVm, rtcSession } =
-    getBasicCallViewModelEnvironment(
-      [local, alice],
-      undefined,
-      mediaDevices,
-      args.callViewModelOptions,
-    );
+  const { vm, footerVm, rtcSession } = getBasicCallViewModelEnvironment(
+    [local, alice],
+    undefined,
+    mediaDevices,
+    args.callViewModelOptions,
+  );

  rtcSession.joined = true;
  const room = rtcSession.room;
@@ -157,8 +140,18 @@ function createInCallView(args: CreateInCallViewArgs = {}): RenderResult & {
      muteStates={muteState}
      vm={vm}
      footerVm={footerVm}
-      developerSettingsVm={developerSettingsVm}
-      matrixInfo={matrixInfo}
+      matrixInfo={{
+        userId: "",
+        displayName: "",
+        avatarUrl: "",
+        roomId: "",
+        roomName: "",
+        roomAlias: null,
+        roomAvatar: null,
+        e2eeSystem: {
+          kind: E2eeType.NONE,
+        },
+      }}
      matrixRoom={room}
      onShareClick={null}
    />
@@ -233,34 +226,3 @@ describe("InCallView", () => {
    });
  });
 });
-
-describe("ActiveCall", () => {
-  it("creates the view models and renders the call", async () => {
-    const mediaDevices = mockMediaDevices({});
-    const { rtcSession, matrixRoom } = getBasicRTCSession([local, alice]);
-    const { findByTestId } = render(
-      <BrowserRouter>
-        <MediaDevicesContext value={mediaDevices}>
-          <ProcessorProvider>
-            <TooltipProvider>
-              <RoomContext value={mockLivekitRoom({ localParticipant })}>
-                <ActiveCall
-                  client={matrixRoom.client}
-                  rtcSession={rtcSession.asMockedSession()}
-                  matrixRoom={matrixRoom}
-                  muteStates={mockMuteStates()}
-                  matrixInfo={matrixInfo}
-                  onShareClick={null}
-                  e2eeSystem={{ kind: E2eeType.NONE }}
-                  onLeft={(): void => {}}
-                />
-              </RoomContext>
-            </TooltipProvider>
-          </ProcessorProvider>
-        </MediaDevicesContext>
-      </BrowserRouter>,
-    );
-    // Rendering at all proves ActiveCall created all of its view models
-    expect(await findByTestId("incall_leave")).toBeVisible();
-  });
-});
@@ -83,8 +83,6 @@ import { ObservableScope } from "../state/ObservableScope.ts";
 import { CallFooter, type FooterSnapshot } from "../components/CallFooter.tsx";
 import { SettingsIconButton } from "../button/Button.tsx";
 import { createCallFooterViewModel } from "../components/CallFooterViewModel.tsx";
-import { createDeveloperSettingsTabViewModel } from "../settings/DeveloperSettingsTabViewModel.ts";
-import { type DeveloperSettingsSnapshot } from "../settings/DeveloperSettingsTab.tsx";
 import { type ViewModel } from "../state/ViewModel.ts";
 import { RingingStatus } from "../tile/RingingStatus.tsx";
 import { RingingAudioRenderer } from "./RingingAudioRenderer.tsx";
@@ -98,7 +96,7 @@ declare module "react" {

 export interface ActiveCallProps extends Omit<
  InCallViewProps,
-  "vm" | "livekitRoom" | "connState" | "footerVm" | "developerSettingsVm"
+  "vm" | "livekitRoom" | "connState" | "footerVm"
 > {
  e2eeSystem: EncryptionSystem;
  // TODO refactor those reasons into an enum
@@ -112,9 +110,6 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
  const [footerVm, setFooterVm] = useState<ViewModel<FooterSnapshot> | null>(
    null,
  );
-  const [developerSettingsVm, setDeveloperSettingsVm] =
-    useState<ViewModel<DeveloperSettingsSnapshot> | null>(null);
-
  const urlParams = useUrlParams();
  const mediaDevices = useMediaDevices();
  const trackProcessorState$ = useTrackProcessorObservable$();
@@ -174,7 +169,6 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
      `${props.client.getUserId()}:${props.client.getDeviceId()}`,
    );
    setFooterVm(footerVm);
-    setDeveloperSettingsVm(createDeveloperSettingsTabViewModel(scope, vm));

    return (): void => {
      scope.end();
@@ -194,16 +188,10 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {

  if (vm === null) return null;
  if (footerVm === null) return null;
-  if (developerSettingsVm === null) return null;

  return (
    <ReactionsSenderProvider vm={vm} rtcSession={props.rtcSession}>
-      <InCallView
-        {...props}
-        vm={vm}
-        footerVm={footerVm}
-        developerSettingsVm={developerSettingsVm}
-      />
+      <InCallView {...props} vm={vm} footerVm={footerVm} />
    </ReactionsSenderProvider>
  );
 };
@@ -212,7 +200,6 @@ export interface InCallViewProps {
  client: MatrixClient;
  vm: CallViewModel;
  footerVm: ViewModel<FooterSnapshot>;
-  developerSettingsVm: ViewModel<DeveloperSettingsSnapshot>;
  matrixInfo: MatrixInfo;
  rtcSession: MatrixRTCSession;
  matrixRoom: MatrixRoom;
@@ -224,7 +211,6 @@ export const InCallView: FC<InCallViewProps> = ({
  client,
  vm,
  footerVm,
-  developerSettingsVm,
  matrixInfo,
  matrixRoom,
  muteStates,
@@ -270,7 +256,6 @@ export const InCallView: FC<InCallViewProps> = ({
  const audioParticipants = useBehavior(vm.livekitRoomItems$);
  const participantCount = useBehavior(vm.participantCount$);
  const reconnecting = useBehavior(vm.reconnecting$);
-  const screenShareError = useBehavior(vm.screenShareError$);
  const layout = useBehavior(vm.layout$);
  const edgeToEdge = useBehavior(vm.edgeToEdge$);
  const overflowing = useBehavior(vm.overflowing$);
@@ -400,21 +385,6 @@ export const InCallView: FC<InCallViewProps> = ({
      );
  }

-  const onDismissScreenShareToast = useCallback(
-    () => vm.dismissScreenShareError(),
-    [vm],
-  );
-  const screenShareToast = (
-    <Toast
-      onDismiss={onDismissScreenShareToast}
-      open={screenShareError !== null}
-      autoDismiss={5000}
-      modal={false}
-    >
-      {t("error.screen_share_failed")}
-    </Toast>
-  );
-
  // The reconnecting toast cannot be dismissed
  const onDismissReconnectingToast = useCallback(() => {}, []);
  // We need to use a non-modal toast to avoid trapping focus within the toast.
@@ -650,7 +620,6 @@ export const InCallView: FC<InCallViewProps> = ({
      <ReactionsAudioRenderer vm={vm} muted={muteAllAudio} />
      <RingingAudioRenderer vm={ringingVm} muted={muteAllAudio} />
      {reconnectingToast}
-      {screenShareToast}
      {earpieceOverlay}
      <ReactionsOverlay vm={vm} />
      {footer}
@@ -664,7 +633,6 @@ export const InCallView: FC<InCallViewProps> = ({
            onDismiss={(): void => setSettingsOpen(false)}
            tab={settingsTab}
            onTabChange={setSettingsTab}
-            developerSettingsVm={developerSettingsVm}
            livekitRooms={allConnections
              .getConnections()
              .map((connectionItem) => ({
@@ -171,7 +171,7 @@ exports[`InCallView > rendering > renders 1`] = `
        class="_settingsLogoContainer_20b7b4"
      >
        <button
-          aria-labelledby="_r_b_"
+          aria-labelledby="_r_8_"
          class="_icon-button_1215g_8 _settingsOnlyShowWide_20b7b4"
          data-kind="secondary"
          data-testid="settings-bottom-left"
@@ -306,7 +306,7 @@ exports[`InCallView > rendering > renders 1`] = `
        class="_buttons_20b7b4"
      >
        <button
-          aria-labelledby="_r_g_"
+          aria-labelledby="_r_d_"
          class="_button_1nw83_8 _settingsOnlyShowNarrow_20b7b4 _has-icon_1nw83_60 _icon-only_1nw83_53"
          data-kind="secondary"
          data-size="lg"
@@ -331,7 +331,7 @@ exports[`InCallView > rendering > renders 1`] = `
          aria-busy="false"
          aria-checked="false"
          aria-disabled="true"
-          aria-labelledby="_r_l_"
+          aria-labelledby="_r_i_"
          class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53"
          data-kind="primary"
          data-size="lg"
@@ -356,7 +356,7 @@ exports[`InCallView > rendering > renders 1`] = `
          aria-busy="false"
          aria-checked="false"
          aria-disabled="true"
-          aria-labelledby="_r_q_"
+          aria-labelledby="_r_n_"
          class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53"
          data-kind="primary"
          data-size="lg"
@@ -381,7 +381,7 @@ exports[`InCallView > rendering > renders 1`] = `
          aria-disabled="false"
          aria-expanded="false"
          aria-haspopup="true"
-          aria-labelledby="_r_v_"
+          aria-labelledby="_r_s_"
          class="_button_1nw83_8 _raiseHand_20b7b4 _has-icon_1nw83_60 _icon-only_1nw83_53"
          data-kind="secondary"
          data-size="lg"
@@ -404,7 +404,7 @@ exports[`InCallView > rendering > renders 1`] = `
          </svg>
        </button>
        <button
-          aria-labelledby="_r_17_"
+          aria-labelledby="_r_14_"
          class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
          data-kind="primary"
          data-size="lg"
@@ -432,8 +432,8 @@ exports[`InCallView > rendering > renders 1`] = `
        data-size="lg"
      >
        <input
-          aria-labelledby="_r_1d_"
-          name="_r_1c_"
+          aria-labelledby="_r_1a_"
+          name="_r_19_"
          type="radio"
          value="spotlight"
        />
@@ -452,9 +452,9 @@ exports[`InCallView > rendering > renders 1`] = `
          />
        </svg>
        <input
-          aria-labelledby="_r_1i_"
+          aria-labelledby="_r_1f_"
          checked=""
-          name="_r_1c_"
+          name="_r_19_"
          type="radio"
          value="grid"
        />
@@ -12,12 +12,7 @@ import { TooltipProvider } from "@vector-im/compound-web";

 import type { MatrixClient } from "matrix-js-sdk";
 import type { Room as LivekitRoom } from "livekit-client";
-import {
-  DeveloperSettingsTab,
-  type DeveloperSettingsSnapshot,
-} from "./DeveloperSettingsTab";
-import { outOfCallDeveloperSettingsTabViewModel } from "./DeveloperSettingsTabViewModel";
-import { createStaticViewModel } from "../state/ViewModel";
+import { DeveloperSettingsTab } from "./DeveloperSettingsTab";
 import { getSFUConfigWithOpenID } from "../livekit/openIDSFU";
 import {
  customLivekitUrl as customLivekitUrlSetting,
@@ -112,7 +107,6 @@ describe("DeveloperSettingsTab", () => {
        roomId={"#room:example.org"}
        livekitRooms={livekitRooms}
        env={{ MY_MOCK_ENV: 10, ENV: "test" } as unknown as ImportMetaEnv}
-        vm={outOfCallDeveloperSettingsTabViewModel}
      />,
    );

@@ -142,7 +136,6 @@ describe("DeveloperSettingsTab", () => {
          <DeveloperSettingsTab
            client={client}
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -166,7 +159,6 @@ describe("DeveloperSettingsTab", () => {
            client={client}
            roomId="#testRoom"
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -189,7 +181,6 @@ describe("DeveloperSettingsTab", () => {
            client={client}
            roomId="#testRoom"
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -215,7 +206,6 @@ describe("DeveloperSettingsTab", () => {
            client={client}
            roomId="#testRoom"
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -246,7 +236,6 @@ describe("DeveloperSettingsTab", () => {
            client={client}
            roomId="#testRoom"
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -284,7 +273,6 @@ describe("DeveloperSettingsTab", () => {
          <DeveloperSettingsTab
            client={client}
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -317,7 +305,6 @@ describe("DeveloperSettingsTab", () => {
          <DeveloperSettingsTab
            client={client}
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -358,7 +345,6 @@ describe("DeveloperSettingsTab", () => {
          <DeveloperSettingsTab
            client={client}
            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
          />
        </TooltipProvider>,
      );
@@ -392,7 +378,6 @@ describe("DeveloperSettingsTab", () => {
            <DeveloperSettingsTab
              client={client}
              env={{} as unknown as ImportMetaEnv}
-              vm={outOfCallDeveloperSettingsTabViewModel}
            />
          </TooltipProvider>,
        );
@@ -415,74 +400,4 @@ describe("DeveloperSettingsTab", () => {
      },
    );
  });
-
-  describe("KeyRotationStatus", () => {
-    it("displays active status when key rotation is not suppressed", async () => {
-      const client = createMockMatrixClient();
-      const vm = createStaticViewModel<DeveloperSettingsSnapshot>({
-        keyRotation: { suppressed: false, participantCount: 5 },
-      });
-
-      render(
-        <TooltipProvider>
-          <DeveloperSettingsTab
-            client={client}
-            env={{} as unknown as ImportMetaEnv}
-            vm={vm}
-          />
-        </TooltipProvider>,
-      );
-
-      await waitFor(() =>
-        expect(
-          screen.getByText(/Media key rotation: active \(5 participants\)/),
-        ).toBeInTheDocument(),
-      );
-    });
-
-    it("displays suppressed status when key rotation is suppressed", async () => {
-      const client = createMockMatrixClient();
-      const vm = createStaticViewModel<DeveloperSettingsSnapshot>({
-        keyRotation: { suppressed: true, participantCount: 50 },
-      });
-
-      render(
-        <TooltipProvider>
-          <DeveloperSettingsTab
-            client={client}
-            env={{} as unknown as ImportMetaEnv}
-            vm={vm}
-          />
-        </TooltipProvider>,
-      );
-
-      await waitFor(() =>
-        expect(
-          screen.getByText(
-            /Media key rotation: suppressed, participant limit reached \(50 participants\)/,
-          ),
-        ).toBeInTheDocument(),
-      );
-    });
-
-    it("does not render KeyRotationStatus when not in a call", async () => {
-      const client = createMockMatrixClient();
-
-      render(
-        <TooltipProvider>
-          <DeveloperSettingsTab
-            client={client}
-            env={{} as unknown as ImportMetaEnv}
-            vm={outOfCallDeveloperSettingsTabViewModel}
-          />
-        </TooltipProvider>,
-      );
-
-      await waitFor(() =>
-        expect(
-          screen.queryByText(/Media key rotation:/),
-        ).not.toBeInTheDocument(),
-      );
-    });
-  });
 });
@@ -68,39 +68,6 @@ import settingsStyles from "./SettingsModal.module.css";
 import { Slider } from "../Slider";
 import { useUrlParams } from "../UrlParams";
 import { getSFUConfigWithOpenID } from "../livekit/openIDSFU";
-import { useBehavior } from "../useBehavior";
-import { type ViewModel } from "../state/ViewModel.ts";
-
-/**
- * The state of MatrixRTC's media key rotation.
- */
-export interface KeyRotationInfo {
-  /** Whether the call is large enough that MatrixRTC has stopped rotating the media key. */
-  suppressed: boolean;
-  participantCount: number;
-}
-
-/**
- * The Snapshot combines all fields the developer settings tab needs from the
- * surrounding call. Everything else in this tab is read from the settings store
- * or the environment directly.
- */
-export interface DeveloperSettingsSnapshot {
-  /** The media key rotation state, or `null` when we are not in a call. */
-  keyRotation: KeyRotationInfo | null;
-}
-
-/**
- * Shows whether the call is large enough that MatrixRTC has stopped rotating the media key.
- */
-const KeyRotationStatus: FC<{ info: KeyRotationInfo }> = ({ info }) => (
-  <p>
-    Media key rotation:{" "}
-    {info.suppressed
-      ? `suppressed, participant limit reached (${info.participantCount} participants)`
-      : `active (${info.participantCount} participants)`}
-  </p>
-);

 interface Props {
  client: MatrixClient;
@@ -112,7 +79,6 @@ interface Props {
    livekitAlias?: string;
  }[];
  env: ImportMetaEnv;
-  vm: ViewModel<DeveloperSettingsSnapshot>;
 }

 export const DeveloperSettingsTab: FC<Props> = ({
@@ -120,10 +86,8 @@ export const DeveloperSettingsTab: FC<Props> = ({
  livekitRooms,
  roomId,
  env,
-  vm,
 }) => {
  const { t } = useTranslation();
-  const keyRotation = useBehavior(vm.keyRotation$);
  const [duplicateTiles, setDuplicateTiles] = useSetting(duplicateTilesSetting);
  const [debugTileLayout, setDebugTileLayout] = useSetting(
    debugTileLayoutSetting,
@@ -400,7 +364,6 @@ export const DeveloperSettingsTab: FC<Props> = ({
          id: client.getDeviceId() || "unknown",
        })}
      </p>
-      {keyRotation !== null && <KeyRotationStatus info={keyRotation} />}
      <Separator />
      <FieldRow>
        <InputField
@@ -1,48 +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 { describe, expect, it } from "vitest";
-import { BehaviorSubject } from "rxjs";
-
-import { testScope } from "../utils/test";
-import { type CallViewModel } from "../state/CallViewModel/CallViewModel";
-import {
-  createDeveloperSettingsTabViewModel,
-  outOfCallDeveloperSettingsTabViewModel,
-} from "./DeveloperSettingsTabViewModel";
-
-describe("createDeveloperSettingsTabViewModel", () => {
-  it("projects the key rotation state of the call", () => {
-    const keyRotationSuppressed$ = new BehaviorSubject(false);
-    const participantCount$ = new BehaviorSubject(5);
-    const vm = createDeveloperSettingsTabViewModel(testScope(), {
-      keyRotationSuppressed$,
-      participantCount$,
-    } as unknown as CallViewModel);
-
-    expect(vm.keyRotation$.value).toEqual({
-      suppressed: false,
-      participantCount: 5,
-    });
-
-    participantCount$.next(50);
-    keyRotationSuppressed$.next(true);
-
-    expect(vm.keyRotation$.value).toEqual({
-      suppressed: true,
-      participantCount: 50,
-    });
-  });
-});
-
-describe("outOfCallDeveloperSettingsTabViewModel", () => {
-  it("has no key rotation state", () => {
-    expect(outOfCallDeveloperSettingsTabViewModel.keyRotation$.value).toBe(
-      null,
-    );
-  });
-});
@@ -1,43 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { combineLatest } from "rxjs";
-
-import { type CallViewModel } from "../state/CallViewModel/CallViewModel.ts";
-import { type ObservableScope } from "../state/ObservableScope.ts";
-import { createStaticViewModel, type ViewModel } from "../state/ViewModel.ts";
-import { type DeveloperSettingsSnapshot } from "./DeveloperSettingsTab.tsx";
-
-/**
- * Creates the ViewModel for the developer settings tab while in a call.
- *
- * Only the call state the tab actually renders is projected here, so that the
- * tab does not need to know about the CallViewModel.
- *
- * @param scope - ObservableScope that bounds the lifetime of derived behaviors.
- * @param callModel - The root CallViewModel; provides the key rotation state.
- */
-export function createDeveloperSettingsTabViewModel(
-  scope: ObservableScope,
-  callModel: CallViewModel,
-): ViewModel<DeveloperSettingsSnapshot> {
-  return {
-    keyRotation$: scope.behavior(
-      combineLatest(
-        [callModel.keyRotationSuppressed$, callModel.participantCount$],
-        (suppressed, participantCount) => ({ suppressed, participantCount }),
-      ),
-    ),
-  };
-}
-
-/**
- * The ViewModel for the developer settings tab outside of a call (lobby, user
- * menu), where no call state exists. All call specific fields are `null`.
- */
-export const outOfCallDeveloperSettingsTabViewModel: ViewModel<DeveloperSettingsSnapshot> =
-  createStaticViewModel<DeveloperSettingsSnapshot>({ keyRotation: null });
@@ -29,16 +29,11 @@ import { PreferencesSettingsTab } from "./PreferencesSettingsTab";
 import { Slider } from "../Slider";
 import { DeviceSelection } from "./DeviceSelection";
 import { useTrackProcessor } from "../livekit/TrackProcessorContext";
-import {
-  DeveloperSettingsTab,
-  type DeveloperSettingsSnapshot,
-} from "./DeveloperSettingsTab";
+import { DeveloperSettingsTab } from "./DeveloperSettingsTab";
 import { FieldRow, InputField } from "../input/Input";
 import { useSubmitRageshake } from "./submit-rageshake";
 import { useUrlParams } from "../UrlParams";
 import { useBehavior } from "../useBehavior";
-import { type ViewModel } from "../state/ViewModel.ts";
-import { outOfCallDeveloperSettingsTabViewModel } from "./DeveloperSettingsTabViewModel";

 type SettingsTab =
  | "audio"
@@ -61,8 +56,6 @@ interface Props {
    url: string;
    isLocal?: boolean;
  }[];
-  /** Only available while in a call. Used by the developer tab. */
-  developerSettingsVm?: ViewModel<DeveloperSettingsSnapshot>;
 }

 export const defaultSettingsTab: SettingsTab = "audio";
@@ -75,7 +68,6 @@ export const SettingsModal: FC<Props> = ({
  client,
  roomId,
  livekitRooms,
-  developerSettingsVm,
 }) => {
  const { t } = useTranslation();

@@ -228,7 +220,6 @@ export const SettingsModal: FC<Props> = ({
        client={client}
        livekitRooms={livekitRooms}
        roomId={roomId}
-        vm={developerSettingsVm ?? outOfCallDeveloperSettingsTabViewModel}
      />
    ),
  };
@@ -1,52 +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, it, vi } from "vitest";
-
-import { init as initRageshake } from "./rageshake";
-
-afterEach(() => {
-  vi.useRealTimers();
-  vi.unstubAllGlobals();
-});
-
-it("flushes logs to IndexedDB periodically without an explicit flush", async () => {
-  vi.useFakeTimers();
-  const add = vi.fn();
-  const txn = {
-    oncomplete: undefined as (() => void) | undefined,
-    onerror: undefined,
-    objectStore: (name: string) =>
-      name === "logs"
-        ? {
-            add: (entry: unknown): void => {
-              add(entry);
-              queueMicrotask(() => txn.oncomplete?.());
-            },
-          }
-        : { put: vi.fn() },
-  };
-  const open = (): unknown => {
-    const req = {
-      result: { transaction: () => txn },
-      onsuccess: undefined as (() => void) | undefined,
-    };
-    queueMicrotask(() => req.onsuccess?.());
-    return req;
-  };
-  vi.stubGlobal("indexedDB", { open });
-
-  await initRageshake();
-  global.mx_rage_logger.log(1, "test", "hello from the buffer");
-  expect(add).not.toHaveBeenCalled();
-
-  await vi.advanceTimersByTimeAsync(2000);
-  expect(add).toHaveBeenCalledOnce();
-  expect(add.mock.calls[0][0]).toMatchObject({
-    lines: expect.stringContaining("hello from the buffer"),
-  });
-});
@@ -204,13 +204,10 @@ class IndexedDBLogStore {
  // Throttled function to flush logs. We use throttle rather
  // than debounce as we want logs to be written regularly, otherwise
  // if there's a constant stream of logging, we'd never write anything.
-  private throttledFlush = throttle(
-    () => {
-      this.flush().catch((e) => logger.error("Failed to flush logs", e));
-    },
-    MAX_FLUSH_INTERVAL_MS,
-    { leading: false, trailing: true },
-  );
+  private throttledFlush = throttle(() => this.flush, MAX_FLUSH_INTERVAL_MS, {
+    leading: false,
+    trailing: true,
+  });

  /**
   * Flush logs to disk.
@@ -49,7 +49,6 @@ import {
 import { type IWidgetApiRequest } from "matrix-widget-api";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
 import { v4 as uuidv4 } from "uuid";
-import { type IMembershipManager } from "matrix-js-sdk/lib/matrixrtc/IMembershipManager";

 import {
  createToggle$,
@@ -114,7 +113,6 @@ import {
  type LocalTransport,
 } from "./localMember/LocalTransport.ts";
 import {
-  createKeyRotationSuppressed$,
  createMemberships$,
  membershipsAndTransports$,
 } from "../SessionBehaviors.ts";
@@ -267,11 +265,6 @@ export interface CallViewModel {
   * Whether we are sharing our screen.
   */
  sharingScreen$: Behavior<boolean>;
-  /**
-   * The last error from toggling screen sharing, until dismissed.
-   */
-  screenShareError$: Behavior<Error | null>;
-  dismissScreenShareError: () => void;

  // UI interactions
  /**
@@ -308,12 +301,6 @@ export interface CallViewModel {
   *    multiple devices.
   */
  participantCount$: Behavior<number>;
-  /**
-   * Whether the call has grown large enough that MatrixRTC has stopped rotating the media
-   * encryption key. While this is true the key in use is still shared with new joiners, but no new
-   * key is generated when someone joins or leaves.
-   */
-  keyRotationSuppressed$: Behavior<boolean>;
  allConnections$: Behavior<ConnectionManagerData>;
  /** Participants sorted by livekit room so they can be used in the audio rendering */
  livekitRoomItems$: Behavior<LivekitRoomItem[]>;
@@ -500,16 +487,6 @@ export function createCallViewModel$(
            memberships$: memberships$,
            ownMembershipIdentity,
            client,
-            delayId$: scope.behavior(
-              (
-                fromEvent(
-                  matrixRTCSession,
-                  MembershipManagerEvent.DelayIdChanged,
-                  // The type of reemitted event includes the original emitted as the second arg.
-                ) as Observable<[string | undefined, IMembershipManager]>
-              ).pipe(map(([delayId]) => delayId ?? null)),
-              matrixRTCSession.delayId ?? null,
-            ),
            roomId: matrixRoom.roomId,
            forceJwtEndpoint:
              mode === MatrixRTCMode.Matrix_2_0
@@ -600,9 +577,20 @@ export function createCallViewModel$(
      );
    },
    connectionManager,
+    client,
    matrixRTCSession,
    localTransport$,
    roomId: matrixRoom.roomId,
+    ownMembershipIdentity,
+    delayId$: scope.behavior(
+      (
+        fromEvent(
+          matrixRTCSession,
+          MembershipManagerEvent.DelayIdChanged,
+        ) as Observable<[string | undefined]>
+      ).pipe(map(([delayId]) => delayId ?? null)),
+      matrixRTCSession.delayId ?? null,
+    ),
    logger: logger.getChild(`[${Date.now()}]`),
  });

@@ -873,11 +861,6 @@ export function createCallViewModel$(
    matrixLivekitMembers$.pipe(map((ms) => ms.length)),
  );

-  const keyRotationSuppressed$ = createKeyRotationSuppressed$(
-    scope,
-    matrixRTCSession,
-  );
-
  const leaveSoundEffect$ = userMedia$.pipe(
    pairwise(),
    filter(
@@ -1814,7 +1797,6 @@ export function createCallViewModel$(
    ),
    allConnections$,
    participantCount$: participantCount$,
-    keyRotationSuppressed$: keyRotationSuppressed$,
    handsRaised$: handsRaised$,
    reactions$: reactions$,
    joinSoundEffect$: joinSoundEffect$,
@@ -1863,8 +1845,6 @@ export function createCallViewModel$(
    reconnecting$: localMembership.reconnecting$,
    livekitRoomItems$,
    connected$: localMembership.connected$,
-    screenShareError$: localMembership.screenShareError$,
-    dismissScreenShareError: localMembership.dismissScreenShareError,
  };
 }

@@ -31,7 +31,6 @@ import {
  flushPromises,
  mockConfig,
  mockLivekitRoom,
-  mockLocalParticipant,
  mockMuteStates,
  withTestScheduler,
  ownMemberMock,
@@ -42,7 +41,6 @@ import {
  enterRTCSession,
  PublishState,
  TrackState,
-  watchScreenShareToggle,
 } from "./LocalMember";
 import {
  FailToGetOpenIdToken,
@@ -70,31 +68,6 @@ vi.mock("@livekit/components-core", () => ({
    .mockReturnValue(of({ isScreenShareEnabled: false })),
 }));

-describe("watchScreenShareToggle", () => {
-  it("reports nothing when the toggle completes", async () => {
-    const onError = vi.fn();
-    watchScreenShareToggle(Promise.resolve(), true, logger, onError);
-    await flushPromises();
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("reports failures other than the user cancelling", async () => {
-    const onError = vi.fn();
-    const e = new Error("NotReadableError");
-    watchScreenShareToggle(Promise.reject(e), true, logger, onError);
-    await flushPromises();
-    expect(onError).toHaveBeenCalledWith(e);
-  });
-
-  it("does not report the user cancelling the picker", async () => {
-    const onError = vi.fn();
-    const cancelled = new DOMException("Permission denied", "NotAllowedError");
-    watchScreenShareToggle(Promise.reject(cancelled), true, logger, onError);
-    await flushPromises();
-    expect(onError).not.toHaveBeenCalled();
-  });
-});
-
 describe("LocalMembership", () => {
  describe("enterRTCSession", () => {
    it("It joins the correct Session", () => {
@@ -148,57 +121,6 @@ describe("LocalMembership", () => {
        expect.objectContaining({ manageMediaKeys: true }),
      );
    });
-
-    it("passes keyRotationParticipantLimit from config to joinRTCSession", () => {
-      mockConfig({
-        livekit: { livekit_service_url: "http://my-default-service-url.com" },
-        matrix_rtc_session: {
-          delayed_leave_event_delay_ms: 0,
-          network_error_retry_ms: 0,
-          key_rotation_participant_limit: 50,
-        },
-      });
-
-      const mockedSession = vi.mocked({
-        room: {
-          roomId: "roomId",
-          client: {
-            getDomain: vi.fn().mockReturnValue("example.org"),
-            getOpenIdToken: vi.fn().mockResolvedValue({
-              access_token: "ACCCESS_TOKEN",
-              token_type: "Bearer",
-              matrix_server_name: "localhost",
-              expires_in: 10000,
-            }),
-          },
-        },
-        memberships: [],
-        joinRTCSession: vi.fn(),
-      }) as unknown as MatrixRTCSession;
-
-      enterRTCSession(
-        mockedSession,
-        ownMemberMock,
-        {
-          livekit_alias: "roomId",
-          livekit_service_url: "http://my-livekit-service-url.com",
-          type: "livekit",
-        },
-        {
-          encryptMedia: true,
-          matrixRTCMode: MATRIX_RTC_MODE,
-        },
-      );
-
-      expect(mockedSession.joinRTCSession).toHaveBeenLastCalledWith(
-        expect.any(Object),
-        [],
-        expect.any(Object),
-        expect.objectContaining({
-          keyRotationParticipantLimit: 50,
-        }),
-      );
-    });
  });

  const defaultCreateLocalMemberValues = {
@@ -881,98 +803,4 @@ describe("LocalMembership", () => {
      scope.end();
    });
  });
-
-  describe("toggleScreenSharing", () => {
-    let originalMediaDevices: MediaDevices | undefined;
-
-    beforeAll(() => {
-      mockConfig();
-      // Screen sharing is only offered when getDisplayMedia is available.
-      originalMediaDevices = navigator.mediaDevices;
-      Object.defineProperty(navigator, "mediaDevices", {
-        configurable: true,
-        value: { getDisplayMedia: vi.fn() },
-      });
-    });
-
-    afterAll(() => {
-      Object.defineProperty(navigator, "mediaDevices", {
-        configurable: true,
-        value: originalMediaDevices,
-      });
-    });
-
-    const createMembershipWithConnection = (
-      connection: Connection | null,
-    ): {
-      scope: ObservableScope;
-      localMembership: ReturnType<typeof createLocalMembership$>;
-    } => {
-      const scope = new ObservableScope();
-      const connectionManagerData = new ConnectionManagerData();
-      if (connection) connectionManagerData.add(connection, []);
-      const localMembership = createLocalMembership$({
-        scope,
-        ...defaultCreateLocalMemberValues,
-        connectionManager: {
-          connectionManagerData$: constant(new Epoch(connectionManagerData)),
-        },
-        localTransport$: new BehaviorSubject({
-          advertised$: new BehaviorSubject(aTransport),
-          active$: new BehaviorSubject(aTransportWithSFUConfig),
-        }),
-      });
-      return { scope, localMembership };
-    };
-
-    it("surfaces a failure and clears it on dismiss", async () => {
-      const error = new Error("NotReadableError");
-      const setScreenShareEnabled = vi.fn().mockRejectedValue(error);
-      const connection = {
-        state$: constant(ConnectionState.LivekitConnected),
-        transport: aTransport,
-        livekitRoom: mockLivekitRoom({
-          localParticipant: mockLocalParticipant({
-            isScreenShareEnabled: false,
-            setScreenShareEnabled,
-          }),
-        }),
-      } as unknown as Connection;
-      const { scope, localMembership } =
-        createMembershipWithConnection(connection);
-      await flushPromises();
-
-      expect(localMembership.toggleScreenSharing).not.toBeNull();
-      expect(localMembership.screenShareError$.value).toBeNull();
-
-      localMembership.toggleScreenSharing!();
-      await flushPromises();
-
-      expect(setScreenShareEnabled).toHaveBeenCalledWith(
-        true,
-        expect.any(Object),
-        undefined,
-      );
-      expect(localMembership.screenShareError$.value).toBe(error);
-
-      localMembership.dismissScreenShareError();
-      expect(localMembership.screenShareError$.value).toBeNull();
-
-      scope.end();
-    });
-
-    it("does nothing when there is no local participant", async () => {
-      // No connection means participant$ never resolves to a participant.
-      const { scope, localMembership } = createMembershipWithConnection(null);
-      await flushPromises();
-
-      expect(localMembership.toggleScreenSharing).not.toBeNull();
-      localMembership.toggleScreenSharing!();
-      await flushPromises();
-
-      expect(localMembership.screenShareError$.value).toBeNull();
-
-      scope.end();
-    });
-  });
 });
@@ -15,6 +15,11 @@ import {
  MediaDeviceFailure,
 } from "livekit-client";
 import { observeParticipantEvents } from "@livekit/components-core";
+import {
+  type IOpenIDToken,
+  parseErrorResponse,
+  type MatrixClient,
+} from "matrix-js-sdk";
 import {
  Status as RTCSessionStatus,
  type LivekitTransport,
@@ -72,6 +77,7 @@ import {
 import { type HomeserverConnected } from "./HomeserverConnected.ts";
 import { type LocalTransport } from "./LocalTransport.ts";
 import { areLivekitTransportsEqual } from "../remoteMembers/MatrixLivekitMembers.ts";
+import { doNetworkOperationWithRetry } from "../../../utils/matrix.ts";

 export enum TransportState {
  /** Not even a transport is available to the LocalMembership */
@@ -136,11 +142,14 @@ interface Props {
  joinMatrixRTC: (transport: LivekitTransportConfig) => void;
  homeserverConnected: HomeserverConnected;
  roomId: string;
+  ownMembershipIdentity: CallMembershipIdentityParts;
  localTransport$: Behavior<LocalTransport>;
+  client: Pick<MatrixClient, "getOpenIdToken" | "baseUrl">;
  matrixRTCSession: Pick<
    MatrixRTCSession,
-    "updateCallIntent" | "leaveRoomSession"
+    "slotId" | "updateCallIntent" | "leaveRoomSession"
  >;
+  delayId$: Behavior<string | null>;
  logger: Logger;
 }

@@ -176,8 +185,11 @@ export const createLocalMembership$ = ({
  joinMatrixRTC,
  logger: parentLogger,
  muteStates,
+  client,
  matrixRTCSession,
  roomId,
+  ownMembershipIdentity,
+  delayId$,
 }: Props): {
  /**
   * This request to start audio and video tracks.
@@ -196,11 +208,6 @@ export const createLocalMembership$ = ({
   * Callback to toggle screen sharing. If null, screen sharing is not possible.
   */
  toggleScreenSharing: (() => void) | null;
-  /**
-   * The last error from toggling screen sharing, until dismissed.
-   */
-  screenShareError$: Behavior<Error | null>;
-  dismissScreenShareError: () => void;
  // tracks$: Behavior<LocalTrack[]>;
  participant$: Behavior<LocalParticipant | null>;
  connection$: Behavior<Connection | null>;
@@ -644,6 +651,60 @@ export const createLocalMembership$ = ({
    },
  );

+  scope.reconcile(
+    scope.behavior(combineLatest([delayId$, activeTransport$])),
+    async ([delayId, transport]) => {
+      if (delayId !== null && transport !== null) {
+        logger.info(
+          `Delegating delayed leave ${delayId} to ${transport.livekit_service_url}…`,
+        );
+        let openIdToken: IOpenIDToken;
+        try {
+          openIdToken = await doNetworkOperationWithRetry(async () =>
+            client.getOpenIdToken(),
+          );
+        } catch (e) {
+          logger.error("Failed to get OpenID token for delegation", e);
+          return;
+        }
+        const body = JSON.stringify({
+          room_id: roomId,
+          slot_id: matrixRTCSession.slotId,
+          member: {
+            id: ownMembershipIdentity.memberId,
+            claimed_user_id: ownMembershipIdentity.userId,
+            claimed_device_id: ownMembershipIdentity.deviceId,
+          },
+          delay_id: delayId,
+          delay_timeout:
+            Config.get().matrix_rtc_session?.delayed_leave_event_delay_ms,
+          delay_cs_api_url: client.baseUrl,
+          openid_token: openIdToken,
+        });
+        try {
+          const res = await doNetworkOperationWithRetry(async () =>
+            fetch(transport.livekit_service_url + "/delegate_delayed_leave", {
+              method: "POST",
+              headers: { "Content-Type": "application/json" },
+              body,
+            }),
+          );
+          if (res.ok) logger.info(`Delayed leave delegation successful`);
+          else if (res.status === 404)
+            logger.warn(
+              `Delayed event delegation not available on ${transport.livekit_service_url}`,
+            );
+          else throw parseErrorResponse(res, await res.text());
+        } catch (e) {
+          logger.error(
+            `Failed to delegate ${delayId} to ${transport.livekit_service_url}`,
+            e,
+          );
+        }
+      }
+    },
+  );
+
  const participant$ = scope.behavior(
    localConnection$.pipe(
      map((c) => c?.livekitRoom?.localParticipant ?? null),
@@ -711,7 +772,6 @@ export const createLocalMembership$ = ({
    ),
  );

-  const screenShareError$ = new BehaviorSubject<Error | null>(null);
  let toggleScreenSharing: (() => void) | null = null;
  if (
    "getDisplayMedia" in (navigator.mediaDevices ?? {}) &&
@@ -783,18 +843,13 @@ export const createLocalMembership$ = ({
      // We also allow screen sharing to be toggled even if the connection
      // is still initializing or publishing tracks, because there's no
      // technical reason to disallow this. LiveKit will publish if it can.
-      const participant = participant$.value;
-      if (!participant) return;
-      watchScreenShareToggle(
-        participant.setScreenShareEnabled(
+      participant$.value
+        ?.setScreenShareEnabled(
          targetScreenshareState,
          screenshareSettings,
          publishOptions,
-        ),
-        targetScreenshareState,
-        logger,
-        (e) => screenShareError$.next(e),
-      );
+        )
+        .catch(logger.error);
    };
  }

@@ -813,44 +868,11 @@ export const createLocalMembership$ = ({
    ),
    sharingScreen$,
    toggleScreenSharing,
-    screenShareError$,
-    dismissScreenShareError: () => screenShareError$.next(null),
    connection$: localConnection$,
    internalLoggerRef: logger,
  };
 };

-/**
- * Logs the outcome of a screen share toggle and reports failures.
- *
- * getDisplayMedia may legitimately take a long time (the user is choosing
- * what to share) or never settle at all, so nothing is inferred from silence:
- * the request and its completion are logged with the elapsed time so that a
- * hang is visible in the logs, and only an explicit rejection is reported.
- *
- * The user cancelling the picker rejects with a NotAllowedError; that is
- * logged but not reported.
- */
-export function watchScreenShareToggle(
-  toggle: Promise<unknown>,
-  enable: boolean,
-  logger: Logger,
-  onError: (e: Error) => void,
-): void {
-  const what = `Screen share ${enable ? "start" : "stop"}`;
-  const started = Date.now();
-  const elapsed = (): string => `${Date.now() - started} ms`;
-  logger.info(`${what} requested`);
-  toggle.then(
-    () => logger.info(`${what} completed in ${elapsed()}`),
-    (e: unknown) => {
-      logger.error(`${what} failed after ${elapsed()}:`, e);
-      if (e instanceof DOMException && e.name === "NotAllowedError") return;
-      onError(e instanceof Error ? e : new Error(String(e)));
-    },
-  );
-}
-
 export function observeSharingScreen$(p: Participant): Observable<boolean> {
  return observeParticipantEvents(
    p,
@@ -946,8 +968,6 @@ export function enterRTCSession(
      makeKeyDelay: matrixRtcSessionConfig?.wait_for_key_rotation_ms,
      membershipEventExpiryMs:
        matrixRtcSessionConfig?.membership_event_expiry_ms,
-      keyRotationParticipantLimit:
-        matrixRtcSessionConfig?.key_rotation_participant_limit,
      unstableSendStickyEvents: matrixRTCMode === MatrixRTCMode.Matrix_2_0,
      maximumNetworkErrorRetryCount: maximumNetworkErrorRetryCount,
    },
@@ -14,11 +14,8 @@ import {
  type MockedObject,
  vi,
 } from "vitest";
-import {
-  type CallMembership,
-  type LivekitTransportConfig,
-} from "matrix-js-sdk/lib/matrixrtc";
-import { BehaviorSubject, filter, lastValueFrom } from "rxjs";
+import { type CallMembership } from "matrix-js-sdk/lib/matrixrtc";
+import { lastValueFrom } from "rxjs";
 import fetchMock from "fetch-mock";

 import {
@@ -27,11 +24,7 @@ import {
  ownMemberMock,
  testScope,
 } from "../../../utils/test";
-import {
-  createLocalTransport$,
-  JwtEndpointVersion,
-  type LocalTransportWithSFUConfig,
-} from "./LocalTransport";
+import { createLocalTransport$, JwtEndpointVersion } from "./LocalTransport";
 import { constant } from "../../Behavior";
 import { Epoch, ObservableScope } from "../../ObservableScope";
 import {
@@ -68,7 +61,6 @@ describe("LocalTransport", () => {
      },
      ownMembershipIdentity: ownMemberMock,
      forceJwtEndpoint: JwtEndpointVersion.Legacy,
-      delayId$: constant("delay_id_mock"),
    });
    await flushPromises();

@@ -109,7 +101,6 @@ describe("LocalTransport", () => {
      },
      ownMembershipIdentity: ownMemberMock,
      forceJwtEndpoint: JwtEndpointVersion.Legacy,
-      delayId$: constant("delay_id_mock"),
    });
    active$.subscribe(
      (o) => observations.push(o),
@@ -151,7 +142,6 @@ describe("LocalTransport", () => {
      },
      ownMembershipIdentity: ownMemberMock,
      forceJwtEndpoint: JwtEndpointVersion.Legacy,
-      delayId$: constant("delay_id_mock"),
    });

    openIdResolver.resolve?.({
@@ -195,7 +185,6 @@ describe("LocalTransport", () => {
        scope: testScope(),
        roomId: "!example_room_id",
        forceJwtEndpoint: JwtEndpointVersion.Legacy,
-        delayId$: constant(null),
        memberships$: constant(new Epoch<CallMembership[]>([])),
        client: {
          baseUrl: "https://example.org",
@@ -307,7 +296,6 @@ describe("LocalTransport", () => {
        ownMembershipIdentity: ownMemberMock,
        roomId: "!example_room_id",
        forceJwtEndpoint: JwtEndpointVersion.Legacy,
-        delayId$: constant(null),
        memberships$: constant(new Epoch<CallMembership[]>([])),
        client: {
          getDomain: () => "example.org",
@@ -329,84 +317,4 @@ describe("LocalTransport", () => {
      );
    });
  });
-
-  it("should not update advertised/active transport on delayID changes, but delay Id delegation should be called", async () => {
-    // For simplicity, we'll just use the config livekit
-    customLivekitUrl.setValue("https://lk.example.org");
-
-    const authCallSpy = vi
-      .spyOn(openIDSFU, "getSFUConfigWithOpenID")
-      .mockResolvedValue(openIdResponse);
-
-    const delayId$ = new BehaviorSubject<string | null>(null);
-
-    const { advertised$, active$ } = createLocalTransport$({
-      scope: testScope(),
-      ownMembershipIdentity: ownMemberMock,
-      roomId: "!example_room_id",
-      // We want multi-sdu
-      forceJwtEndpoint: JwtEndpointVersion.Legacy,
-      delayId$: delayId$,
-      memberships$: constant(new Epoch<CallMembership[]>([])),
-      client: {
-        getDomain: () => "example.org",
-        baseUrl: "https://example.org",
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        _unstable_getRTCTransports: async () => Promise.resolve([]),
-        // These won't be called in this error path but satisfy the type
-        getOpenIdToken: vi.fn(),
-        getDeviceId: vi.fn(),
-      },
-    });
-
-    const advertisedValues: LivekitTransportConfig[] = [];
-    const activeValues: LocalTransportWithSFUConfig[] = [];
-    advertised$
-      .pipe(filter((v) => v !== null))
-      .subscribe((t) => advertisedValues.push(t));
-    active$
-      .pipe(filter((v) => v !== null))
-      .subscribe((t) => activeValues.push(t));
-
-    await flushPromises();
-
-    // we have now an active and an advertised
-    expect(advertisedValues.length).toEqual(1);
-    expect(activeValues.length).toEqual(1);
-    expect(advertisedValues[0]!.livekit_service_url).toEqual(
-      "https://lk.example.org",
-    );
-    expect(activeValues[0]!.transport.livekit_service_url).toEqual(
-      "https://lk.example.org",
-    );
-
-    expect(authCallSpy).toHaveBeenCalledTimes(2);
-    // Now emits 3 new delays id
-    delayId$.next("delay_id_1");
-    await flushPromises();
-    delayId$.next("delay_id_2");
-    await flushPromises();
-    delayId$.next("delay_id_3");
-    await flushPromises();
-
-    // No new emissions should've happened, it is the same transport.
-    expect(advertisedValues.length).toEqual(1);
-    expect(activeValues.length).toEqual(1);
-
-    // Still we should have updated the delayID to auth
-    expect(authCallSpy).toHaveBeenCalledTimes(
-      4 * 2 /* 2 calls for each delayId ?? why */,
-    );
-
-    expect(authCallSpy).toHaveBeenLastCalledWith(
-      expect.anything(),
-      expect.anything(),
-      expect.anything(),
-      expect.anything(),
-      expect.objectContaining({
-        delayId: "delay_id_3",
-      }),
-      expect.anything(),
-    );
-  });
 });
@@ -10,14 +10,7 @@ import {
  type LivekitTransportConfig,
 } from "matrix-js-sdk/lib/matrixrtc";
 import { type MatrixClient } from "matrix-js-sdk";
-import {
-  combineLatest,
-  distinctUntilChanged,
-  from,
-  map,
-  of,
-  switchMap,
-} from "rxjs";
+import { distinctUntilChanged, from, map, of, switchMap } from "rxjs";
 import { logger as rootLogger, type Logger } from "matrix-js-sdk/lib/logger";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";

@@ -54,7 +47,6 @@ interface Props {
  // Used by the jwt service to create the livekit room and compute the livekit alias.
  roomId: string;
  forceJwtEndpoint: JwtEndpointVersion;
-  delayId$: Behavior<string | null>;
 }

 export enum JwtEndpointVersion {
@@ -123,7 +115,6 @@ export const createLocalTransport$ = ({
  client,
  roomId,
  forceJwtEndpoint,
-  delayId$,
 }: Props): LocalTransport => {
  const logger = rootLogger.getChild("[LocalTransport]");

@@ -162,8 +153,8 @@ export const createLocalTransport$ = ({
      distinctUntilChanged(areLivekitTransportsEqual),
    );

-  const preferredTransport$ = combineLatest([preferredConfig$, delayId$]).pipe(
-    switchMap(async ([transport, delayId]) => {
+  const preferredTransport$ = preferredConfig$.pipe(
+    switchMap(async (transport) => {
      try {
        return await doOpenIdAndJWTFromUrl(
          transport,
@@ -171,7 +162,6 @@ export const createLocalTransport$ = ({
          ownMembershipIdentity,
          roomId,
          client,
-          delayId ?? undefined,
          logger,
        );
      } catch (e) {
@@ -223,7 +213,6 @@ export const createLocalTransport$ = ({
 *  @param membership The identity of the local member.
 *  @param roomId The room ID to use for the JWT.
 *  @param client The client to use for the OpenID token.
- *  @param delayId The delayId to use for the JWT.
 *
 *  @throws FailToGetOpenIdToken, NoMatrix2AuthorizationService
 */
@@ -232,12 +221,7 @@ async function doOpenIdAndJWTFromUrl(
  forceJwtEndpoint: JwtEndpointVersion,
  membership: CallMembershipIdentityParts,
  roomId: string,
-  client: Pick<
-    MatrixClient,
-    "getDomain" | "baseUrl" | "_unstable_getRTCTransports"
-  > &
-    OpenIDClientParts,
-  delayId?: string,
+  client: Pick<MatrixClient, "_unstable_getRTCTransports"> & OpenIDClientParts,
  logger?: Logger,
 ): Promise<LocalTransportWithSFUConfig> {
  const sfuConfig = await getSFUConfigWithOpenID(
@@ -247,8 +231,6 @@ async function doOpenIdAndJWTFromUrl(
    roomId,
    {
      forceJwtEndpoint: forceJwtEndpoint,
-      delayEndpointBaseUrl: client.baseUrl,
-      delayId,
    },
    logger,
  );
@@ -1,41 +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 { describe, expect, it, vi } from "vitest";
-import { MatrixRTCSessionEvent } from "matrix-js-sdk/lib/matrixrtc";
-import { EventEmitter } from "events";
-
-import { createKeyRotationSuppressed$ } from "./SessionBehaviors";
-import { testScope } from "../utils/test";
-
-describe("SessionBehaviors", () => {
-  describe("createKeyRotationSuppressed$", () => {
-    it("emits initial value from isKeyRotationSuppressed and updates when KeyRotationSuppressedChanged event is emitted", () => {
-      const scope = testScope();
-      const emitter = new EventEmitter();
-      const mockSession = Object.assign(emitter, {
-        on: vi.fn(),
-        off: vi.fn(),
-        isKeyRotationSuppressed: false,
-      });
-
-      const keyRotationSuppressed$ = createKeyRotationSuppressed$(
-        scope,
-        mockSession as any,
-      );
-
-      expect(keyRotationSuppressed$.value).toBe(false);
-      emitter.emit(MatrixRTCSessionEvent.KeyRotationSuppressedChanged, true);
-
-      expect(keyRotationSuppressed$.value).toBe(true);
-
-      emitter.emit(MatrixRTCSessionEvent.KeyRotationSuppressedChanged, false);
-
-      expect(keyRotationSuppressed$.value).toBe(false);
-    });
-  });
-});
@@ -88,22 +88,3 @@ export const createMemberships$ = (
    new Epoch(matrixRTCSession.memberships),
  );
 };
-
-/**
- * Whether the session has grown large enough that MatrixRTC has stopped rotating the media
- * encryption key. While this is true the key in use is still shared with new joiners, but no new
- * key is generated when someone joins or leaves.
- */
-export const createKeyRotationSuppressed$ = (
-  scope: ObservableScope,
-  matrixRTCSession: MatrixRTCSession,
-): Behavior<boolean> => {
-  return scope.behavior(
-    fromEvent(
-      matrixRTCSession,
-      MatrixRTCSessionEvent.KeyRotationSuppressedChanged,
-      (suppressed: boolean) => suppressed,
-    ),
-    matrixRTCSession.isKeyRotationSuppressed,
-  );
-};
@@ -42,8 +42,6 @@ import { MatrixRTCMode } from "../config/ConfigOptions";
 import { createCallFooterViewModel } from "../components/CallFooterViewModel";
 import { type FooterSnapshot } from "../components/CallFooter";
 import { type ViewModel } from "../state/ViewModel";
-import { createDeveloperSettingsTabViewModel } from "../settings/DeveloperSettingsTabViewModel";
-import { type DeveloperSettingsSnapshot } from "../settings/DeveloperSettingsTab";

 mockConfig({ livekit: { livekit_service_url: "https://example.com" } });

@@ -142,7 +140,6 @@ export function getBasicCallViewModelEnvironment(
 ): {
  vm: CallViewModel;
  footerVm: ViewModel<FooterSnapshot>;
-  developerSettingsVm: ViewModel<DeveloperSettingsSnapshot>;
  rtcMemberships$: BehaviorSubject<CallMembership[]>;
  rtcSession: MockRTCSession;
  handRaisedSubject$: BehaviorSubject<Record<string, RaisedHandInfo>>;
@@ -191,7 +188,6 @@ export function getBasicCallViewModelEnvironment(
  return {
    vm,
    footerVm,
-    developerSettingsVm: createDeveloperSettingsTabViewModel(testScope(), vm),
    rtcMemberships$,
    rtcSession,
    handRaisedSubject$: handRaisedSubject$,
@@ -487,8 +487,6 @@ export class MockRTCSession extends TypedEventEmitter<
    return this.joined;
  }

-  public isKeyRotationSuppressed = false;
-
  public withMemberships(
    rtcMembers$: Behavior<Partial<CallMembership>[]>,
  ): MockRTCSession {
Author	SHA1	Message	Date
Robin	3c4379ce9f	Log when delegation succeeds	2026-08-27 10:29:39 +02:00
Robin	5399d2bec1	Delegate delayed events using dedicated endpoint	2026-08-26 19:51:43 +02:00