^/_matrix/client/(api/v1|r0|v3|unstable)/devices$ should also go to the workers responsible for the device_lists stream.

Fix regex in device_signing upload path in worker documentation
2025-12-15 02:00:21 +00:00 · 2025-08-01 12:11:53 +01:00 · 2025-08-01 12:09:31 +01:00
165 changed files with 1846 additions and 6854 deletions
--- a/.ci/scripts/test_synapse_port_db.sh
+++ b/.ci/scripts/test_synapse_port_db.sh
@@ -61,7 +61,7 @@ poetry run update_synapse_database --database-config .ci/postgres-config-unporte
 echo "+++ Comparing ported schema with unported schema"
 # Ignore the tables that portdb creates. (Should it tidy them up when the porting is completed?)
 psql synapse -c "DROP TABLE port_from_sqlite3;"
-pg_dump --format=plain --schema-only --no-tablespaces --no-acl --no-owner --restrict-key=TESTING synapse_unported > unported.sql
+pg_dump --format=plain --schema-only --no-tablespaces --no-acl --no-owner synapse_unported > unported.sql
-pg_dump --format=plain --schema-only --no-tablespaces --no-acl --no-owner --restrict-key=TESTING synapse          >   ported.sql
+pg_dump --format=plain --schema-only --no-tablespaces --no-acl --no-owner synapse          >   ported.sql
 # By default, `diff` returns zero if there are no changes and nonzero otherwise
-diff -u unported.sql ported.sql | tee schema_diff
+diff -u unported.sql ported.sql | tee schema_diff
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -31,7 +31,7 @@ jobs:
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Extract version from pyproject.toml
        # Note: explicitly requesting bash will mean bash is invoked with `-eo pipefail`, see
@@ -41,13 +41,13 @@ jobs:
          echo "SYNAPSE_VERSION=$(grep "^version" pyproject.toml | sed -E 's/version\s*=\s*["]([^"]*)["]/\1/')" >> $GITHUB_ENV
      - name: Log in to DockerHub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Log in to GHCR
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -95,21 +95,21 @@ jobs:
      - build
    steps:
      - name: Download digests
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          path: ${{ runner.temp }}/digests
          pattern: digests-*
          merge-multiple: true
      - name: Log in to DockerHub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        if: ${{ startsWith(matrix.repository, 'docker.io') }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Log in to GHCR
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        if: ${{ startsWith(matrix.repository, 'ghcr.io') }}
        with:
          registry: ghcr.io
@@ -123,7 +123,7 @@ jobs:
        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
      - name: Calculate docker image tag
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: ${{ matrix.repository }}
          flavor: |
--- a/.github/workflows/docs-pr.yaml
+++ b/.github/workflows/docs-pr.yaml
@@ -13,7 +13,7 @@ jobs:
    name: GitHub Pages
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          # Fetch all history so that the schema_versions script works.
          fetch-depth: 0
@@ -50,7 +50,7 @@ jobs:
    name: Check links in documentation
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Setup mdbook
        uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -50,7 +50,7 @@ jobs:
    needs:
      - pre
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          # Fetch all history so that the schema_versions script works.
          fetch-depth: 0
--- a/.github/workflows/fix_lint.yaml
+++ b/.github/workflows/fix_lint.yaml
@@ -18,10 +18,10 @@ jobs:
    steps:
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
          components: clippy, rustfmt
--- a/.github/workflows/latest_deps.yml
+++ b/.github/workflows/latest_deps.yml
@@ -42,9 +42,9 @@ jobs:
    if: needs.check_repo.outputs.should_run_workflow == 'true'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -77,10 +77,10 @@ jobs:
            postgres-version: "14"
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -152,10 +152,10 @@ jobs:
      BLACKLIST: ${{ matrix.workers && 'synapse-blacklist-with-workers' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -202,7 +202,7 @@ jobs:
    steps:
      - name: Check out synapse codebase
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          path: synapse
@@ -234,7 +234,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/poetry_lockfile.yaml
+++ b/.github/workflows/poetry_lockfile.yaml
@@ -16,7 +16,7 @@ jobs:
    name: "Check locked dependencies have sdists"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: '3.x'
--- a/.github/workflows/push_complement_image.yml
+++ b/.github/workflows/push_complement_image.yml
@@ -33,29 +33,29 @@ jobs:
      packages: write
    steps:
      - name: Checkout specific branch (debug build)
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        if: github.event_name == 'workflow_dispatch'
        with:
          ref: ${{ inputs.branch }}
      - name: Checkout clean copy of develop (scheduled build)
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        if: github.event_name == 'schedule'
        with:
          ref: develop
      - name: Checkout clean copy of master (on-push)
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        if: github.event_name == 'push'
        with:
          ref: master
      - name: Login to registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Work out labels for complement image
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: ghcr.io/${{ github.repository }}/complement-synapse
          tags: |
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -27,7 +27,7 @@ jobs:
    name: "Calculate list of debian distros"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.x"
@@ -55,7 +55,7 @@ jobs:
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          path: src
@@ -66,7 +66,7 @@ jobs:
          install: true
      - name: Set up docker layer caching
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
        with:
          path: /tmp/.buildx-cache
          key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -132,7 +132,7 @@ jobs:
            os: "ubuntu-24.04-arm"
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
@@ -165,7 +165,7 @@ jobs:
    if: ${{ !startsWith(github.ref, 'refs/pull/') }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.10"
@@ -191,7 +191,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Download all workflow run artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
      - name: Build a tarball for the debs
        # We need to merge all the debs uploads into one folder, then compress
        # that.
--- a/.github/workflows/schema.yaml
+++ b/.github/workflows/schema.yaml
@@ -14,7 +14,7 @@ jobs:
    name: Ensure Synapse config schema is valid
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.x"
@@ -40,7 +40,7 @@ jobs:
    name: Ensure generated documentation is up-to-date
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.x"
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -86,9 +86,9 @@ jobs:
    if: ${{ needs.changes.outputs.linting == 'true' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -106,7 +106,7 @@ jobs:
    if: ${{ needs.changes.outputs.linting == 'true' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.x"
@@ -116,7 +116,7 @@ jobs:
  check-lockfile:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.x"
@@ -129,7 +129,7 @@ jobs:
    steps:
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Setup Poetry
        uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
@@ -151,10 +151,10 @@ jobs:
    steps:
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -174,7 +174,7 @@ jobs:
      # Cribbed from
      # https://github.com/AustinScola/mypy-cache-github-action/blob/85ea4f2972abed39b33bd02c36e341b28ca59213/src/restore.ts#L10-L17
      - name: Restore/persist mypy's cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
        with:
          path: |
            .mypy_cache
@@ -187,7 +187,7 @@ jobs:
  lint-crlf:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Check line endings
        run: scripts-dev/check_line_terminators.sh
@@ -195,7 +195,7 @@ jobs:
    if: ${{ (github.base_ref == 'develop'  || contains(github.base_ref, 'release-')) && github.actor != 'dependabot[bot]' }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          fetch-depth: 0
@@ -213,11 +213,11 @@ jobs:
    if: ${{ needs.changes.outputs.linting == 'true' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          ref: ${{ github.event.pull_request.head.sha }}
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -233,10 +233,10 @@ jobs:
    if: ${{ needs.changes.outputs.rust == 'true' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
            components: clippy
            toolchain: ${{ env.RUST_VERSION }}
@@ -252,10 +252,10 @@ jobs:
    if: ${{ needs.changes.outputs.rust == 'true' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
            toolchain: nightly-2025-04-23
            components: clippy
@@ -270,10 +270,10 @@ jobs:
    steps:
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -306,10 +306,10 @@ jobs:
    if: ${{ needs.changes.outputs.rust == 'true' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          # We use nightly so that we can use some unstable options that we use in
          # `.rustfmt.toml`.
@@ -326,7 +326,7 @@ jobs:
    needs: changes
    if: ${{ needs.changes.outputs.linting_readme == 'true' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.x"
@@ -376,7 +376,7 @@ jobs:
    needs: linting-done
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.x"
@@ -397,7 +397,7 @@ jobs:
        job:  ${{ fromJson(needs.calculate-test-jobs.outputs.trial_test_matrix) }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - run: sudo apt-get -qq install xmlsec1
      - name: Set up PostgreSQL ${{ matrix.job.postgres-version }}
        if: ${{ matrix.job.postgres-version }}
@@ -412,7 +412,7 @@ jobs:
            postgres:${{ matrix.job.postgres-version }}
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -453,10 +453,10 @@ jobs:
      - changes
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -518,7 +518,7 @@ jobs:
        extras: ["all"]
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      # Install libs necessary for PyPy to build binary wheels for dependencies
      - run: sudo apt-get -qq install xmlsec1 libxml2-dev libxslt-dev
      - uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
@@ -568,12 +568,12 @@ jobs:
        job: ${{ fromJson(needs.calculate-test-jobs.outputs.sytest_test_matrix) }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Prepare test blacklist
        run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -615,7 +615,7 @@ jobs:
          --health-retries 5
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - run: sudo apt-get -qq install xmlsec1 postgresql-client
      - uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
        with:
@@ -659,7 +659,7 @@ jobs:
          --health-retries 5
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Add PostgreSQL apt repository
        # We need a version of pg_dump that can handle the version of
        # PostgreSQL being tested against. The Ubuntu package repository lags
@@ -714,12 +714,12 @@ jobs:
    steps:
      - name: Checkout synapse codebase
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          path: synapse
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -750,10 +750,10 @@ jobs:
      - changes
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -770,10 +770,10 @@ jobs:
      - changes
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
            toolchain: nightly-2022-12-01
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
--- a/.github/workflows/triage_labelled.yml
+++ b/.github/workflows/triage_labelled.yml
@@ -11,15 +11,11 @@ jobs:
    if: >
      contains(github.event.issue.labels.*.name, 'X-Needs-Info')
    steps:
-      - uses: actions/add-to-project@4515659e2b458b27365e167605ac44f219494b66 # v1.0.2
+      - uses: actions/add-to-project@5b1a254a3546aef88e0a7724a77a623fa2e47c36 # main (v1.0.2 + 10 commits)
        id: add_project
        with:
          project-url: "https://github.com/orgs/matrix-org/projects/67"
          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
        # This action will error if the issue already exists on the project. Which is
        # common as `X-Needs-Info` will often be added to issues that are already in
        # the triage queue. Prevent the whole job from failing in this case.
        continue-on-error: true
      - name: Set status
        env:
          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/twisted_trunk.yml
+++ b/.github/workflows/twisted_trunk.yml
@@ -43,10 +43,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -70,11 +70,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - run: sudo apt-get -qq install xmlsec1
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -117,10 +117,10 @@ jobs:
        - ${{ github.workspace }}:/src
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
        with:
          toolchain: ${{ env.RUST_VERSION }}
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -175,7 +175,7 @@ jobs:
    steps:
      - name: Run actions/checkout@v4 for synapse
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          path: synapse
@@ -217,7 +217,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,201 +1,3 @@
 # Synapse 1.138.0rc1 (2025-09-02)
 ### Features
 - Support for the stable endpoint and scopes of [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) & co. ([\#18549](https://github.com/element-hq/synapse/issues/18549))
 ### Bugfixes
 - Improve database performance of [MSC4293](https://github.com/matrix-org/matrix-spec-proposals/pull/4293) - Redact on Kick/Ban. ([\#18851](https://github.com/element-hq/synapse/issues/18851))
 - Do not throw an error when fetching a rejected delayed state event on startup. ([\#18858](https://github.com/element-hq/synapse/issues/18858))
 ### Improved Documentation
 - Fix worker documentation incorrectly indicating all room Admin API requests were capable of being handled by workers. ([\#18853](https://github.com/element-hq/synapse/issues/18853))
 ### Internal Changes
 - Instrument `_ByteProducer` with tracing to measure potential dead time while writing bytes to the request. ([\#18804](https://github.com/element-hq/synapse/issues/18804))
 - Switch to OpenTracing's `ContextVarsScopeManager` instead of our own custom `LogContextScopeManager`. ([\#18849](https://github.com/element-hq/synapse/issues/18849))
 - Trace how much work is being done while "recursively fetching redactions". ([\#18854](https://github.com/element-hq/synapse/issues/18854))
 - Link [upstream Twisted bug](https://github.com/twisted/twisted/issues/12498) tracking the problem that explains why we have to use a `Producer` to write bytes to the request. ([\#18855](https://github.com/element-hq/synapse/issues/18855))
 - Introduce `EventPersistencePair` type. ([\#18857](https://github.com/element-hq/synapse/issues/18857))
 ### Updates to locked dependencies
 * Bump actions/add-to-project from c0c5949b017d0d4a39f7ba888255881bdac2a823 to 4515659e2b458b27365e167605ac44f219494b66. ([\#18863](https://github.com/element-hq/synapse/issues/18863))
 * Bump actions/checkout from 4.3.0 to 5.0.0. ([\#18834](https://github.com/element-hq/synapse/issues/18834))
 * Bump anyhow from 1.0.98 to 1.0.99. ([\#18841](https://github.com/element-hq/synapse/issues/18841))
 * Bump docker/login-action from 3.4.0 to 3.5.0. ([\#18835](https://github.com/element-hq/synapse/issues/18835))
 * Bump dtolnay/rust-toolchain from b3b07ba8b418998c39fb20f53e8b695cdcc8de1b to e97e2d8cc328f1b50210efc529dca0028893a2d9. ([\#18862](https://github.com/element-hq/synapse/issues/18862))
 * Bump phonenumbers from 9.0.11 to 9.0.12. ([\#18837](https://github.com/element-hq/synapse/issues/18837))
 * Bump regex from 1.11.1 to 1.11.2. ([\#18864](https://github.com/element-hq/synapse/issues/18864))
 * Bump reqwest from 0.12.22 to 0.12.23. ([\#18842](https://github.com/element-hq/synapse/issues/18842))
 * Bump ruff from 0.12.7 to 0.12.10. ([\#18865](https://github.com/element-hq/synapse/issues/18865))
 * Bump serde_json from 1.0.142 to 1.0.143. ([\#18866](https://github.com/element-hq/synapse/issues/18866))
 * Bump types-bleach from 6.2.0.20250514 to 6.2.0.20250809. ([\#18838](https://github.com/element-hq/synapse/issues/18838))
 * Bump types-jsonschema from 4.25.0.20250720 to 4.25.1.20250822. ([\#18867](https://github.com/element-hq/synapse/issues/18867))
 * Bump types-psycopg2 from 2.9.21.20250718 to 2.9.21.20250809. ([\#18836](https://github.com/element-hq/synapse/issues/18836))
 # Synapse 1.137.0 (2025-08-26)
 No significant changes since 1.137.0rc1.
 # Synapse 1.137.0rc1 (2025-08-19)
 ### Bugfixes
 - Fix a bug which could corrupt auth chains making it impossible to perform state resolution. ([\#18746](https://github.com/element-hq/synapse/issues/18746))
 - Fix error message in `register_new_matrix_user` utility script for empty `registration_shared_secret`. ([\#18780](https://github.com/element-hq/synapse/issues/18780))
 - Allow enabling [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108) when the stable Matrix Authentication Service integration is enabled. ([\#18832](https://github.com/element-hq/synapse/issues/18832))
 ### Improved Documentation
 - Include IPv6 networks in `denied-peer-ips` of coturn setup. Contributed by @litetex. ([\#18781](https://github.com/element-hq/synapse/issues/18781))
 ### Internal Changes
 - Update tests to ensure all database tables are emptied when purging a room. ([\#18794](https://github.com/element-hq/synapse/issues/18794))
 - Instrument the `encode_response` part of Sliding Sync requests for more complete traces in Jaeger. ([\#18815](https://github.com/element-hq/synapse/issues/18815))
 - Tag Sliding Sync traces when we `wait_for_events`. ([\#18816](https://github.com/element-hq/synapse/issues/18816))
 - Fix `portdb` CI by hardcoding the new `pg_dump` restrict key that was added due to [CVE-2025-8714](https://nvd.nist.gov/vuln/detail/cve-2025-8714). ([\#18824](https://github.com/element-hq/synapse/issues/18824))
 ### Updates to locked dependencies
 * Bump actions/add-to-project from 5b1a254a3546aef88e0a7724a77a623fa2e47c36 to 0c37450c4be3b6a7582b2fb013c9ebfd9c8e9300. ([\#18557](https://github.com/element-hq/synapse/issues/18557))
 * Bump actions/cache from 4.2.3 to 4.2.4. ([\#18799](https://github.com/element-hq/synapse/issues/18799))
 * Bump actions/checkout from 4.2.2 to 4.3.0. ([\#18800](https://github.com/element-hq/synapse/issues/18800))
 * Bump actions/download-artifact from 4.3.0 to 5.0.0. ([\#18801](https://github.com/element-hq/synapse/issues/18801))
 * Bump docker/metadata-action from 5.7.0 to 5.8.0. ([\#18773](https://github.com/element-hq/synapse/issues/18773))
 * Bump mypy from 1.16.1 to 1.17.1. ([\#18775](https://github.com/element-hq/synapse/issues/18775))
 * Bump phonenumbers from 9.0.10 to 9.0.11. ([\#18797](https://github.com/element-hq/synapse/issues/18797))
 * Bump pygithub from 2.6.1 to 2.7.0. ([\#18779](https://github.com/element-hq/synapse/issues/18779))
 * Bump serde_json from 1.0.141 to 1.0.142. ([\#18776](https://github.com/element-hq/synapse/issues/18776))
 * Bump slab from 0.4.10 to 0.4.11. ([\#18809](https://github.com/element-hq/synapse/issues/18809))
 * Bump tokio from 1.47.0 to 1.47.1. ([\#18774](https://github.com/element-hq/synapse/issues/18774))
 * Bump types-pyyaml from 6.0.12.20250516 to 6.0.12.20250809. ([\#18798](https://github.com/element-hq/synapse/issues/18798))
 * Bump types-setuptools from 80.9.0.20250529 to 80.9.0.20250809. ([\#18796](https://github.com/element-hq/synapse/issues/18796))
 # Synapse 1.136.0 (2025-08-12)
 Note: This release includes the security fixes from `1.135.2` and `1.136.0rc2`, detailed below.
 ### Bugfixes
 - Fix bug introduced in 1.135.2 and 1.136.0rc2 where the [Make Room Admin API](https://element-hq.github.io/synapse/latest/admin_api/rooms.html#make-room-admin-api) would not treat a room v12's creator power level as the highest in room. ([\#18805](https://github.com/element-hq/synapse/issues/18805))
 # Synapse 1.135.2 (2025-08-11)
 This is the Synapse portion of the [Matrix coordinated security release](https://matrix.org/blog/2025/07/security-predisclosure/). This release includes support for [room version](https://spec.matrix.org/v1.15/rooms/) 12 which fixes a number of security vulnerabilities, including [CVE-2025-49090](https://www.cve.org/CVERecord?id=CVE-2025-49090).
 The default room version is not changed. Not all clients will support room version 12 immediately, and not all users will be using the latest version of their clients. Large, public rooms are advised to wait a few weeks before upgrading to room version 12 to allow users throughout the Matrix ecosystem to update their clients.
 Note: release 1.135.1 was skipped due to issues discovered during the release process.
 Two patched Synapse releases are now available:
 * `1.135.2`: stable release comprised of `1.135.0` + security patches
    * Upgrade to this release **if you are currently running 1.135.0 or below**.
 * `1.136.0rc2`: unstable release candidate comprised of `1.136.0rc1` + security patches.
    * Upgrade to this release **only if you are on 1.136.0rc1**.
 ### Bugfixes
 - Fix invalidation of storage cache that was broken in 1.135.0. ([\#18786](https://github.com/element-hq/synapse/issues/18786))
 ### Internal Changes
 - Add a parameter to `upgrade_rooms(..)` to allow auto join local users. ([\#82](https://github.com/element-hq/synapse/issues/82))
 - Speed up upgrading a room with large numbers of banned users. ([\#18574](https://github.com/element-hq/synapse/issues/18574))
 # Synapse 1.136.0rc2 (2025-08-11)
 - Update MSC4293 redaction logic for room v12. ([\#80](https://github.com/element-hq/synapse/issues/80))
 ### Internal Changes
 - Add a parameter to `upgrade_rooms(..)` to allow auto join local users. ([\#83](https://github.com/element-hq/synapse/issues/83))
 # Synapse 1.136.0rc1 (2025-08-05)
 Please check [the relevant section in the upgrade notes](https://github.com/element-hq/synapse/blob/develop/docs/upgrade.md#upgrading-to-v11360) as this release contains changes to MAS support, metrics labels and the module API which may require your attention when upgrading.
 ### Features
 - Add configurable rate limiting for the creation of rooms. ([\#18514](https://github.com/element-hq/synapse/issues/18514))
 - Add support for [MSC4293](https://github.com/matrix-org/matrix-spec-proposals/pull/4293) - Redact on Kick/Ban. ([\#18540](https://github.com/element-hq/synapse/issues/18540))
 - When admins enable themselves to see soft-failed events, they will also see if the cause is due to the policy server flagging them as spam via `unsigned`. ([\#18585](https://github.com/element-hq/synapse/issues/18585))
 - Add ability to configure forward/outbound proxy via homeserver config instead of environment variables. See `http_proxy`, `https_proxy`, `no_proxy_hosts`. ([\#18686](https://github.com/element-hq/synapse/issues/18686))
 - Advertise experimental support for [MSC4306](https://github.com/matrix-org/matrix-spec-proposals/pull/4306) (Thread Subscriptions) through `/_matrix/clients/versions` if enabled. ([\#18722](https://github.com/element-hq/synapse/issues/18722))
 - Stabilise support for delegating authentication to [Matrix Authentication Service](https://github.com/element-hq/matrix-authentication-service/). ([\#18759](https://github.com/element-hq/synapse/issues/18759))
 - Implement the push rules for experimental [MSC4306: Thread Subscriptions](https://github.com/matrix-org/matrix-doc/issues/4306). ([\#18762](https://github.com/element-hq/synapse/issues/18762))
 ### Bugfixes
 - Allow return code 403 (allowed by C2S Spec since v1.2) when fetching profiles via federation. ([\#18696](https://github.com/element-hq/synapse/issues/18696))
 - Register the MSC4306 (Thread Subscriptions) endpoints in the CS API when the experimental feature is enabled. ([\#18726](https://github.com/element-hq/synapse/issues/18726))
 - Fix a long-standing bug where suspended users could not have server notices sent to them (a 403 was returned to the admin). ([\#18750](https://github.com/element-hq/synapse/issues/18750))
 - Fix an issue that could cause logcontexts to be lost on rate-limited requests. Found by @realtyem. ([\#18763](https://github.com/element-hq/synapse/issues/18763))
 - Fix invalidation of storage cache that was broken in 1.135.0. ([\#18786](https://github.com/element-hq/synapse/issues/18786))
 ### Improved Documentation
 - Minor improvements to README. ([\#18700](https://github.com/element-hq/synapse/issues/18700))
 - Document that there can be multiple workers handling the `receipts` stream. ([\#18760](https://github.com/element-hq/synapse/issues/18760))
 - Improve worker documentation for some device paths. ([\#18761](https://github.com/element-hq/synapse/issues/18761))
 ### Deprecations and Removals
 - Deprecate `run_as_background_process` exported as part of the module API interface in favor of `ModuleApi.run_as_background_process`. See [the relevant section in the upgrade notes](https://github.com/element-hq/synapse/blob/develop/docs/upgrade.md#upgrading-to-v11360) for more information. ([\#18737](https://github.com/element-hq/synapse/issues/18737))
 ### Internal Changes
 - Add debug logging for HMAC digest verification failures when using the admin API to register users. ([\#18474](https://github.com/element-hq/synapse/issues/18474))
 - Speed up upgrading a room with large numbers of banned users. ([\#18574](https://github.com/element-hq/synapse/issues/18574))
 - Fix config documentation generation script on Windows by enforcing UTF-8. ([\#18580](https://github.com/element-hq/synapse/issues/18580))
 - Refactor cache, background process, `Counter`, `LaterGauge`, `GaugeBucketCollector`, `Histogram`, and `Gauge` metrics to be homeserver-scoped. ([\#18656](https://github.com/element-hq/synapse/issues/18656), [\#18714](https://github.com/element-hq/synapse/issues/18714), [\#18715](https://github.com/element-hq/synapse/issues/18715), [\#18724](https://github.com/element-hq/synapse/issues/18724), [\#18753](https://github.com/element-hq/synapse/issues/18753), [\#18725](https://github.com/element-hq/synapse/issues/18725), [\#18670](https://github.com/element-hq/synapse/issues/18670), [\#18748](https://github.com/element-hq/synapse/issues/18748), [\#18751](https://github.com/element-hq/synapse/issues/18751))
 - Reduce database usage in Sliding Sync by not querying for background update completion after the update is known to be complete. ([\#18718](https://github.com/element-hq/synapse/issues/18718))
 - Improve order of validation and ratelimiting in room creation. ([\#18723](https://github.com/element-hq/synapse/issues/18723))
 - Bump minimum version bound on Twisted to 21.2.0. ([\#18727](https://github.com/element-hq/synapse/issues/18727), [\#18729](https://github.com/element-hq/synapse/issues/18729))
 - Use `twisted.internet.testing` module in tests instead of deprecated `twisted.test.proto_helpers`. ([\#18728](https://github.com/element-hq/synapse/issues/18728))
 - Remove obsolete `/send_event` replication endpoint. ([\#18730](https://github.com/element-hq/synapse/issues/18730))
 - Update metrics linting to be able to handle custom metrics. ([\#18733](https://github.com/element-hq/synapse/issues/18733))
 - Work around `twisted.protocols.amp.TooLong` error by reducing logging in some tests. ([\#18736](https://github.com/element-hq/synapse/issues/18736))
 - Prevent "Move labelled issues to correct projects" GitHub Actions workflow from failing when an issue is already on the project board. ([\#18755](https://github.com/element-hq/synapse/issues/18755))
 - Bump minimum supported Rust version (MSRV) to 1.82.0. Missed in [#18553](https://github.com/element-hq/synapse/pull/18553) (released in Synapse 1.134.0). ([\#18757](https://github.com/element-hq/synapse/issues/18757))
 - Make `Clock.sleep(...)` return a coroutine, so that mypy can catch places where we don't await on it. ([\#18772](https://github.com/element-hq/synapse/issues/18772))
 - Update implementation of [MSC4306: Thread Subscriptions](https://github.com/matrix-org/matrix-doc/issues/4306) to include automatic subscription conflict prevention as introduced in later drafts. ([\#18756](https://github.com/element-hq/synapse/issues/18756))
 ### Updates to locked dependencies
 * Bump gitpython from 3.1.44 to 3.1.45. ([\#18743](https://github.com/element-hq/synapse/issues/18743))
 * Bump mypy-zope from 1.0.12 to 1.0.13. ([\#18744](https://github.com/element-hq/synapse/issues/18744))
 * Bump phonenumbers from 9.0.9 to 9.0.10. ([\#18741](https://github.com/element-hq/synapse/issues/18741))
 * Bump ruff from 0.12.4 to 0.12.5. ([\#18742](https://github.com/element-hq/synapse/issues/18742))
 * Bump sentry-sdk from 2.32.0 to 2.33.2. ([\#18745](https://github.com/element-hq/synapse/issues/18745))
 * Bump tokio from 1.46.1 to 1.47.0. ([\#18740](https://github.com/element-hq/synapse/issues/18740))
 * Bump types-jsonschema from 4.24.0.20250708 to 4.25.0.20250720. ([\#18703](https://github.com/element-hq/synapse/issues/18703))
 * Bump types-psycopg2 from 2.9.21.20250516 to 2.9.21.20250718. ([\#18706](https://github.com/element-hq/synapse/issues/18706))
 # Synapse 1.135.0 (2025-08-01)
 No significant changes since 1.135.0rc2.
 # Synapse 1.135.0rc2 (2025-07-30)
 ### Bugfixes
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/changelog.d/18474.misc
+++ b/changelog.d/18474.misc
@@ -0,0 +1 @@
 Add debug logging for HMAC digest verification failures when using the admin API to register users.
--- a/changelog.d/18514.feature
+++ b/changelog.d/18514.feature
@@ -0,0 +1 @@
 Add configurable rate limiting for the creation of rooms.
--- a/changelog.d/18540.feature
+++ b/changelog.d/18540.feature
@@ -0,0 +1 @@
 Add support for [MSC4293](https://github.com/matrix-org/matrix-spec-proposals/pull/4293) - Redact on Kick/Ban.
--- a/changelog.d/18580.misc
+++ b/changelog.d/18580.misc
@@ -0,0 +1 @@
 Fix config documentation generation script on Windows by enforcing UTF-8.
--- a/changelog.d/18585.feature
+++ b/changelog.d/18585.feature
@@ -0,0 +1 @@
 When admins enable themselves to see soft-failed events, they will also see if the cause is due to the policy server flagging them as spam via `unsigned`.
--- a/changelog.d/18656.misc
+++ b/changelog.d/18656.misc
@@ -0,0 +1 @@
 Refactor `Counter` metrics to be homeserver-scoped.
--- a/changelog.d/18670.misc
+++ b/changelog.d/18670.misc
@@ -0,0 +1 @@
 Refactor background process metrics to be homeserver-scoped.
--- a/changelog.d/18686.feature
+++ b/changelog.d/18686.feature
@@ -0,0 +1 @@
 Add ability to configure forward/outbound proxy via homeserver config instead of environment variables. See `http_proxy`, `https_proxy`, `no_proxy_hosts`.
--- a/changelog.d/18696.bugfix
+++ b/changelog.d/18696.bugfix
@@ -0,0 +1 @@
 Allow return code 403 (allowed by C2S Spec since v1.2) when fetching profiles via federation.
--- a/changelog.d/18700.doc
+++ b/changelog.d/18700.doc
@@ -0,0 +1 @@
 Minor improvements to README.
--- a/changelog.d/18714.misc
+++ b/changelog.d/18714.misc
@@ -0,0 +1 @@
 Refactor `LaterGauge` metrics to be homeserver-scoped.
--- a/changelog.d/18715.misc
+++ b/changelog.d/18715.misc
@@ -0,0 +1 @@
 Refactor `GaugeBucketCollector` metrics to be homeserver-scoped.
--- a/changelog.d/18718.misc
+++ b/changelog.d/18718.misc
@@ -0,0 +1 @@
 Reduce database usage in Sliding Sync by not querying for background update completion after the update is known to be complete.
--- a/changelog.d/18722.feature
+++ b/changelog.d/18722.feature
@@ -0,0 +1 @@
 Advertise experimental support for [MSC4306](https://github.com/matrix-org/matrix-spec-proposals/pull/4306) through `/_matrix/clients/versions` if enabled.
--- a/changelog.d/18724.misc
+++ b/changelog.d/18724.misc
@@ -0,0 +1 @@
 Refactor `Histogram` metrics to be homeserver-scoped.
--- a/changelog.d/18725.misc
+++ b/changelog.d/18725.misc
@@ -0,0 +1 @@
 Refactor `Gauge` metrics to be homeserver-scoped.
--- a/changelog.d/18726.bugfix
+++ b/changelog.d/18726.bugfix
@@ -0,0 +1 @@
 Register the MSC4306 endpoints in the CS API when the experimental feature is enabled.
--- a/changelog.d/18727.misc
+++ b/changelog.d/18727.misc
@@ -0,0 +1 @@
 Bump minimum version bound on Twisted to 21.2.0.
--- a/changelog.d/18728.misc
+++ b/changelog.d/18728.misc
@@ -0,0 +1 @@
 Use `twisted.internet.testing` module in tests instead of deprecated `twisted.test.proto_helpers`.
--- a/changelog.d/18729.misc
+++ b/changelog.d/18729.misc
@@ -0,0 +1 @@
 Bump minimum version bound on Twisted to 21.2.0.
--- a/changelog.d/18730.misc
+++ b/changelog.d/18730.misc
@@ -0,0 +1 @@
 Remove obsolete `/send_event` replication endpoint.
--- a/changelog.d/18736.misc
+++ b/changelog.d/18736.misc
@@ -0,0 +1 @@
 Work around `twisted.protocols.amp.TooLong` error by reducing logging in some tests.
--- a/changelog.d/18737.removal
+++ b/changelog.d/18737.removal
@@ -0,0 +1 @@
 Deprecate `run_as_background_process` exported as part of the module API interface in favor of `ModuleApi.run_as_background_process`. See the relevant section in the upgrade notes for more information.
--- a/changelog.d/18750.bugfix
+++ b/changelog.d/18750.bugfix
@@ -0,0 +1 @@
 Fix a long-standing bug where suspended users could not have server notices sent to them (a 403 was returned to the admin).
--- a/changelog.d/18753.misc
+++ b/changelog.d/18753.misc
@@ -0,0 +1 @@
 Refactor `Histogram` metrics to be homeserver-scoped.
--- a/changelog.d/18761.doc.md
+++ b/changelog.d/18761.doc.md
@@ -0,0 +1 @@
 Improve worker documentation for some device paths.
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,57 +1,3 @@
 matrix-synapse-py3 (1.138.0~rc1) stable; urgency=medium
  * New synapse release 1.138.0rc1.
 -- Synapse Packaging team <packages@matrix.org>  Tue, 02 Sep 2025 12:16:14 +0000
 matrix-synapse-py3 (1.137.0) stable; urgency=medium
  * New Synapse release 1.137.0.
 -- Synapse Packaging team <packages@matrix.org>  Tue, 26 Aug 2025 10:23:41 +0100
 matrix-synapse-py3 (1.137.0~rc1) stable; urgency=medium
  * New Synapse release 1.137.0rc1.
 -- Synapse Packaging team <packages@matrix.org>  Tue, 19 Aug 2025 10:55:22 +0100
 matrix-synapse-py3 (1.136.0) stable; urgency=medium
  * New Synapse release 1.136.0.
 -- Synapse Packaging team <packages@matrix.org>  Tue, 12 Aug 2025 13:18:03 +0100
 matrix-synapse-py3 (1.136.0~rc2) stable; urgency=medium
  * New Synapse release 1.136.0rc2.
 -- Synapse Packaging team <packages@matrix.org>  Mon, 11 Aug 2025 12:18:52 -0600
 matrix-synapse-py3 (1.136.0~rc1) stable; urgency=medium
  * New Synapse release 1.136.0rc1.
 -- Synapse Packaging team <packages@matrix.org>  Tue, 05 Aug 2025 08:13:30 -0600
 matrix-synapse-py3 (1.135.2) stable; urgency=medium
  * New Synapse release 1.135.2.
 -- Synapse Packaging team <packages@matrix.org>  Mon, 11 Aug 2025 11:52:01 -0600
 matrix-synapse-py3 (1.135.1) stable; urgency=medium
  * New Synapse release 1.135.1.
 -- Synapse Packaging team <packages@matrix.org>  Mon, 11 Aug 2025 11:13:15 -0600
 matrix-synapse-py3 (1.135.0) stable; urgency=medium
  * New Synapse release 1.135.0.
 -- Synapse Packaging team <packages@matrix.org>  Fri, 01 Aug 2025 13:12:28 +0100
 matrix-synapse-py3 (1.135.0~rc2) stable; urgency=medium
  * New Synapse release 1.135.0rc2.
--- a/docs/setup/turn/coturn.md
+++ b/docs/setup/turn/coturn.md
@@ -88,8 +88,7 @@ This will install and start a systemd service called `coturn`.
    denied-peer-ip=172.16.0.0-172.31.255.255
    # recommended additional local peers to block, to mitigate external access to internal services.
-    # https://www.enablesecurity.com/blog/slack-webrtc-turn-compromise-and-bug-bounty/#how-to-fix-an-open-turn-relay-to-address-this-vulnerability
+    # https://www.rtcsec.com/article/slack-webrtc-turn-compromise-and-bug-bounty/#how-to-fix-an-open-turn-relay-to-address-this-vulnerability
    # https://www.enablesecurity.com/blog/cve-2020-26262-bypass-of-coturns-access-control-protection/#further-concerns-what-else
    no-multicast-peers
    denied-peer-ip=0.0.0.0-0.255.255.255
    denied-peer-ip=100.64.0.0-100.127.255.255
@@ -102,14 +101,6 @@ This will install and start a systemd service called `coturn`.
    denied-peer-ip=198.51.100.0-198.51.100.255
    denied-peer-ip=203.0.113.0-203.0.113.255
    denied-peer-ip=240.0.0.0-255.255.255.255
    denied-peer-ip=::1
    denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
    denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
    denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
    denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
    denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
    denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
    denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
    # special case the turn server itself so that client->TURN->TURN->client flows work
    # this should be one of the turn server's listening IPs
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -164,29 +164,7 @@ The Grafana dashboard JSON in `contrib/grafana/synapse.json` has been updated to
 this change but you will need to manually update your own existing Grafana dashboards
 using these metrics.
 ## Stable integration with Matrix Authentication Service
 Support for [Matrix Authentication Service (MAS)](https://github.com/element-hq/matrix-authentication-service) is now stable, with a simplified configuration.
 This stable integration requires MAS 0.20.0 or later.
 The existing `experimental_features.msc3861` configuration option is now deprecated and will be removed in Synapse v1.137.0.
 Synapse deployments already using MAS should now use the new configuration options:
 ```yaml
 matrix_authentication_service:
  # Enable the MAS integration
  enabled: true
  # The base URL where Synapse will contact MAS
  endpoint: http://localhost:8080
  # The shared secret used to authenticate MAS requests, must be the same as `matrix.secret` in the MAS configuration
  # See https://element-hq.github.io/matrix-authentication-service/reference/configuration.html#matrix
  secret: "asecurerandomsecretstring"
 ```
 They must remove the `experimental_features.msc3861` configuration option from their configuration.
 They can also remove the client previously used by Synapse [in the MAS configuration](https://element-hq.github.io/matrix-authentication-service/reference/configuration.html#clients) as it is no longer in use.
 # Upgrading to v1.135.0
@@ -208,10 +186,10 @@ native ICU library on your system is no longer required.
 ## Documented endpoint which can be delegated to a federation worker
 The endpoint `^/_matrix/federation/v1/version$` can be delegated to a federation
-worker. This is not new behaviour, but had not been documented yet. The
+worker. This is not new behaviour, but had not been documented yet. The 
-[list of delegatable endpoints](workers.md#synapseappgeneric_worker) has
+[list of delegatable endpoints](workers.md#synapseappgeneric_worker) has 
 been updated to include it. Make sure to check your reverse proxy rules if you
-are using workers.
+are using workers. 
 # Upgrading to v1.126.0
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -643,28 +643,6 @@ no_proxy_hosts:
 - 172.30.0.0/16
 ```
 ---
 ### `matrix_authentication_service`
 *(object)* The `matrix_authentication_service` setting configures integration with [Matrix Authentication Service (MAS)](https://github.com/element-hq/matrix-authentication-service).
 This setting has the following sub-options:
 * `enabled` (boolean): Whether or not to enable the MAS integration. If this is set to `false`, Synapse will use its legacy internal authentication API. Defaults to `false`.
 * `endpoint` (string): The URL where Synapse can reach MAS. This *must* have the `discovery` and `oauth` resources mounted. Defaults to `"http://localhost:8080"`.
 * `secret` (string|null): A shared secret that will be used to authenticate requests from and to MAS.
 * `secret_path` (string|null): Alternative to `secret`, reading the shared secret from a file. The file should be a plain text file, containing only the secret. Synapse reads the secret from the given file once at startup.
 Example configuration:
 ```yaml
 matrix_authentication_service:
  enabled: true
  secret: someverysecuresecret
  endpoint: http://localhost:8080
 ```
 ---
 ### `dummy_events_threshold`
 *(integer)* Forward extremities can build up in a room due to networking delays between homeservers. Once this happens in a large room, calculation of the state of that room can become quite expensive. To mitigate this, once the number of forward extremities reaches a given threshold, Synapse will send an `org.matrix.dummy_event` event, which will reduce the forward extremities in the room.
@@ -4174,7 +4152,7 @@ The default power levels for each preset are:
 "m.room.history_visibility": 100
 "m.room.canonical_alias": 50
 "m.room.avatar": 50
-"m.room.tombstone": 100 (150 if MSC4289 is used)
+"m.room.tombstone": 100
 "m.room.server_acl": 100
 "m.room.encryption": 100
 ```
--- a/docs/workers.md
+++ b/docs/workers.md
@@ -252,7 +252,7 @@ information.
    ^/_matrix/client/(api/v1|r0|v3|unstable)/directory/room/.*$
    ^/_matrix/client/(r0|v3|unstable)/capabilities$
    ^/_matrix/client/(r0|v3|unstable)/notifications$
-    ^/_synapse/admin/v1/rooms/[^/]+$
+    ^/_synapse/admin/v1/rooms/
    # Encryption requests
    ^/_matrix/client/(r0|v3|unstable)/keys/query$
@@ -532,9 +532,8 @@ the stream writer for the `account_data` stream:
 ##### The `receipts` stream
-The `receipts` stream supports multiple writers. The following endpoints
+The following endpoints should be routed directly to the worker configured as
-can be handled by any worker, but should be routed directly to one of the workers
+the stream writer for the `receipts` stream:
 configured as stream writer for the `receipts` stream:
    ^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt
    ^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers
@@ -556,7 +555,7 @@ the stream writer for the `push_rules` stream:
 ##### The `device_lists` stream
 The `device_lists` stream supports multiple writers. The following endpoints
-can be handled by any worker, but should be routed directly to one of the workers
+can be handled by any worker, but should be routed directly one of the workers
 configured as stream writer for the `device_lists` stream:
    ^/_matrix/client/(r0|v3)/delete_devices$
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,17 +1,6 @@
 [mypy]
 namespace_packages = True
-# Our custom mypy plugin should remain first in this list.
+plugins = pydantic.mypy, mypy_zope:plugin, scripts-dev/mypy_synapse_plugin.py
 #
 # mypy has a limitation where it only chooses the first plugin that returns a non-None
 # value for each hook (known-limitation, c.f.
 # https://github.com/python/mypy/issues/19524). We workaround this by putting our custom
 # plugin first in the plugin order and then manually calling any other conflicting
 # plugin hooks in our own plugin followed by our own checks.
 #
 # If you add a new plugin, make sure to check whether the hooks being used conflict with
 # our custom plugin hooks and if so, manually call the other plugin's hooks in our
 # custom plugin. (also applies to if the plugin is updated in the future)
 plugins = scripts-dev/mypy_synapse_plugin.py, pydantic.mypy, mypy_zope:plugin
 follow_imports = normal
 show_error_codes = True
 show_traceback = True
@@ -110,6 +99,3 @@ ignore_missing_imports = True
 [mypy-multipart.*]
 ignore_missing_imports = True
 [mypy-mypy_zope.*]
 ignore_missing_imports = True
--- a/poetry.lock
+++ b/poetry.lock
@@ -441,6 +441,24 @@ files = [
    {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"},
 ]
 [[package]]
 name = "deprecated"
 version = "1.2.13"
 description = "Python @deprecated decorator to deprecate old python classes, functions or methods."
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 groups = ["dev"]
 files = [
    {file = "Deprecated-1.2.13-py2.py3-none-any.whl", hash = "sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d"},
    {file = "Deprecated-1.2.13.tar.gz", hash = "sha256:43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d"},
 ]
 [package.dependencies]
 wrapt = ">=1.10,<2"
 [package.extras]
 dev = ["PyTest (<5) ; python_version < \"3.6\"", "PyTest ; python_version >= \"3.6\"", "PyTest-Cov (<2.6) ; python_version < \"3.6\"", "PyTest-Cov ; python_version >= \"3.6\"", "bump2version (<1)", "configparser (<5) ; python_version < \"3\"", "importlib-metadata (<3) ; python_version < \"3\"", "importlib-resources (<4) ; python_version < \"3\"", "sphinx (<2)", "sphinxcontrib-websupport (<2) ; python_version < \"3\"", "tox", "zipp (<2) ; python_version < \"3\""]
 [[package]]
 name = "docutils"
 version = "0.19"
@@ -1369,50 +1387,44 @@ docs = ["sphinx (>=8,<9)", "sphinx-autobuild"]
 [[package]]
 name = "mypy"
-version = "1.17.1"
+version = "1.16.1"
 description = "Optional static typing for Python"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "mypy-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3fbe6d5555bf608c47203baa3e72dbc6ec9965b3d7c318aa9a4ca76f465bd972"},
+    {file = "mypy-1.16.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b4f0fed1022a63c6fec38f28b7fc77fca47fd490445c69d0a66266c59dd0b88a"},
-    {file = "mypy-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:80ef5c058b7bce08c83cac668158cb7edea692e458d21098c7d3bce35a5d43e7"},
+    {file = "mypy-1.16.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:86042bbf9f5a05ea000d3203cf87aa9d0ccf9a01f73f71c58979eb9249f46d72"},
-    {file = "mypy-1.17.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c4a580f8a70c69e4a75587bd925d298434057fe2a428faaf927ffe6e4b9a98df"},
+    {file = "mypy-1.16.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ea7469ee5902c95542bea7ee545f7006508c65c8c54b06dc2c92676ce526f3ea"},
-    {file = "mypy-1.17.1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dd86bb649299f09d987a2eebb4d52d10603224500792e1bee18303bbcc1ce390"},
+    {file = "mypy-1.16.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:352025753ef6a83cb9e7f2427319bb7875d1fdda8439d1e23de12ab164179574"},
-    {file = "mypy-1.17.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:a76906f26bd8d51ea9504966a9c25419f2e668f012e0bdf3da4ea1526c534d94"},
+    {file = "mypy-1.16.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ff9fa5b16e4c1364eb89a4d16bcda9987f05d39604e1e6c35378a2987c1aac2d"},
-    {file = "mypy-1.17.1-cp310-cp310-win_amd64.whl", hash = "sha256:e79311f2d904ccb59787477b7bd5d26f3347789c06fcd7656fa500875290264b"},
+    {file = "mypy-1.16.1-cp310-cp310-win_amd64.whl", hash = "sha256:1256688e284632382f8f3b9e2123df7d279f603c561f099758e66dd6ed4e8bd6"},
-    {file = "mypy-1.17.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ad37544be07c5d7fba814eb370e006df58fed8ad1ef33ed1649cb1889ba6ff58"},
+    {file = "mypy-1.16.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:472e4e4c100062488ec643f6162dd0d5208e33e2f34544e1fc931372e806c0cc"},
-    {file = "mypy-1.17.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:064e2ff508e5464b4bd807a7c1625bc5047c5022b85c70f030680e18f37273a5"},
+    {file = "mypy-1.16.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea16e2a7d2714277e349e24d19a782a663a34ed60864006e8585db08f8ad1782"},
-    {file = "mypy-1.17.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70401bbabd2fa1aa7c43bb358f54037baf0586f41e83b0ae67dd0534fc64edfd"},
+    {file = "mypy-1.16.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:08e850ea22adc4d8a4014651575567b0318ede51e8e9fe7a68f25391af699507"},
-    {file = "mypy-1.17.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e92bdc656b7757c438660f775f872a669b8ff374edc4d18277d86b63edba6b8b"},
+    {file = "mypy-1.16.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:22d76a63a42619bfb90122889b903519149879ddbf2ba4251834727944c8baca"},
-    {file = "mypy-1.17.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c1fdf4abb29ed1cb091cf432979e162c208a5ac676ce35010373ff29247bcad5"},
+    {file = "mypy-1.16.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:2c7ce0662b6b9dc8f4ed86eb7a5d505ee3298c04b40ec13b30e572c0e5ae17c4"},
-    {file = "mypy-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:ff2933428516ab63f961644bc49bc4cbe42bbffb2cd3b71cc7277c07d16b1a8b"},
+    {file = "mypy-1.16.1-cp311-cp311-win_amd64.whl", hash = "sha256:211287e98e05352a2e1d4e8759c5490925a7c784ddc84207f4714822f8cf99b6"},
-    {file = "mypy-1.17.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:69e83ea6553a3ba79c08c6e15dbd9bfa912ec1e493bf75489ef93beb65209aeb"},
+    {file = "mypy-1.16.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:af4792433f09575d9eeca5c63d7d90ca4aeceda9d8355e136f80f8967639183d"},
-    {file = "mypy-1.17.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1b16708a66d38abb1e6b5702f5c2c87e133289da36f6a1d15f6a5221085c6403"},
+    {file = "mypy-1.16.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:66df38405fd8466ce3517eda1f6640611a0b8e70895e2a9462d1d4323c5eb4b9"},
-    {file = "mypy-1.17.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:89e972c0035e9e05823907ad5398c5a73b9f47a002b22359b177d40bdaee7056"},
+    {file = "mypy-1.16.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:44e7acddb3c48bd2713994d098729494117803616e116032af192871aed80b79"},
-    {file = "mypy-1.17.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:03b6d0ed2b188e35ee6d5c36b5580cffd6da23319991c49ab5556c023ccf1341"},
+    {file = "mypy-1.16.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0ab5eca37b50188163fa7c1b73c685ac66c4e9bdee4a85c9adac0e91d8895e15"},
-    {file = "mypy-1.17.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c837b896b37cd103570d776bda106eabb8737aa6dd4f248451aecf53030cdbeb"},
+    {file = "mypy-1.16.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:dedb6229b2c9086247e21a83c309754b9058b438704ad2f6807f0d8227f6ebdd"},
-    {file = "mypy-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:665afab0963a4b39dff7c1fa563cc8b11ecff7910206db4b2e64dd1ba25aed19"},
+    {file = "mypy-1.16.1-cp312-cp312-win_amd64.whl", hash = "sha256:1f0435cf920e287ff68af3d10a118a73f212deb2ce087619eb4e648116d1fe9b"},
-    {file = "mypy-1.17.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93378d3203a5c0800c6b6d850ad2f19f7a3cdf1a3701d3416dbf128805c6a6a7"},
+    {file = "mypy-1.16.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ddc91eb318c8751c69ddb200a5937f1232ee8efb4e64e9f4bc475a33719de438"},
-    {file = "mypy-1.17.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:15d54056f7fe7a826d897789f53dd6377ec2ea8ba6f776dc83c2902b899fee81"},
+    {file = "mypy-1.16.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:87ff2c13d58bdc4bbe7dc0dedfe622c0f04e2cb2a492269f3b418df2de05c536"},
-    {file = "mypy-1.17.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:209a58fed9987eccc20f2ca94afe7257a8f46eb5df1fb69958650973230f91e6"},
+    {file = "mypy-1.16.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a7cfb0fe29fe5a9841b7c8ee6dffb52382c45acdf68f032145b75620acfbd6f"},
-    {file = "mypy-1.17.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:099b9a5da47de9e2cb5165e581f158e854d9e19d2e96b6698c0d64de911dd849"},
+    {file = "mypy-1.16.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:051e1677689c9d9578b9c7f4d206d763f9bbd95723cd1416fad50db49d52f359"},
-    {file = "mypy-1.17.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fa6ffadfbe6994d724c5a1bb6123a7d27dd68fc9c059561cd33b664a79578e14"},
+    {file = "mypy-1.16.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d5d2309511cc56c021b4b4e462907c2b12f669b2dbeb68300110ec27723971be"},
-    {file = "mypy-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:9a2b7d9180aed171f033c9f2fc6c204c1245cf60b0cb61cf2e7acc24eea78e0a"},
+    {file = "mypy-1.16.1-cp313-cp313-win_amd64.whl", hash = "sha256:4f58ac32771341e38a853c5d0ec0dfe27e18e27da9cdb8bbc882d2249c71a3ee"},
-    {file = "mypy-1.17.1-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:15a83369400454c41ed3a118e0cc58bd8123921a602f385cb6d6ea5df050c733"},
+    {file = "mypy-1.16.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7fc688329af6a287567f45cc1cefb9db662defeb14625213a5b7da6e692e2069"},
-    {file = "mypy-1.17.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:55b918670f692fc9fba55c3298d8a3beae295c5cded0a55dccdc5bbead814acd"},
+    {file = "mypy-1.16.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5e198ab3f55924c03ead626ff424cad1732d0d391478dfbf7bb97b34602395da"},
-    {file = "mypy-1.17.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:62761474061feef6f720149d7ba876122007ddc64adff5ba6f374fda35a018a0"},
+    {file = "mypy-1.16.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:09aa4f91ada245f0a45dbc47e548fd94e0dd5a8433e0114917dc3b526912a30c"},
-    {file = "mypy-1.17.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c49562d3d908fd49ed0938e5423daed8d407774a479b595b143a3d7f87cdae6a"},
+    {file = "mypy-1.16.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:13c7cd5b1cb2909aa318a90fd1b7e31f17c50b242953e7dd58345b2a814f6383"},
-    {file = "mypy-1.17.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:397fba5d7616a5bc60b45c7ed204717eaddc38f826e3645402c426057ead9a91"},
+    {file = "mypy-1.16.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:58e07fb958bc5d752a280da0e890c538f1515b79a65757bbdc54252ba82e0b40"},
-    {file = "mypy-1.17.1-cp314-cp314-win_amd64.whl", hash = "sha256:9d6b20b97d373f41617bd0708fd46aa656059af57f2ef72aa8c7d6a2b73b74ed"},
+    {file = "mypy-1.16.1-cp39-cp39-win_amd64.whl", hash = "sha256:f895078594d918f93337a505f8add9bd654d1a24962b4c6ed9390e12531eb31b"},
-    {file = "mypy-1.17.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5d1092694f166a7e56c805caaf794e0585cabdbf1df36911c414e4e9abb62ae9"},
+    {file = "mypy-1.16.1-py3-none-any.whl", hash = "sha256:5fc2ac4027d0ef28d6ba69a0343737a23c4d1b83672bf38d1fe237bdc0643b37"},
-    {file = "mypy-1.17.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:79d44f9bfb004941ebb0abe8eff6504223a9c1ac51ef967d1263c6572bbebc99"},
+    {file = "mypy-1.16.1.tar.gz", hash = "sha256:6bd00a0a2094841c5e47e7374bb42b83d64c527a502e3334e1173a0c24437bab"},
    {file = "mypy-1.17.1-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b01586eed696ec905e61bd2568f48740f7ac4a45b3a468e6423a03d3788a51a8"},
    {file = "mypy-1.17.1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43808d9476c36b927fbcd0b0255ce75efe1b68a080154a38ae68a7e62de8f0f8"},
    {file = "mypy-1.17.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:feb8cc32d319edd5859da2cc084493b3e2ce5e49a946377663cc90f6c15fb259"},
    {file = "mypy-1.17.1-cp39-cp39-win_amd64.whl", hash = "sha256:d7598cf74c3e16539d4e2f0b8d8c318e00041553d83d4861f87c7a72e95ac24d"},
    {file = "mypy-1.17.1-py3-none-any.whl", hash = "sha256:a9f52c0351c21fe24c21d8c0eb1f62967b262d6729393397b6f443c3b773c3b9"},
    {file = "mypy-1.17.1.tar.gz", hash = "sha256:25e01ec741ab5bb3eec8ba9cdb0f769230368a22c959c4937360efb89b7e9f01"},
 ]
 [package.dependencies]
@@ -1531,14 +1543,14 @@ files = [
 [[package]]
 name = "phonenumbers"
-version = "9.0.12"
+version = "9.0.10"
 description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
 optional = false
 python-versions = "*"
 groups = ["main"]
 files = [
-    {file = "phonenumbers-9.0.12-py2.py3-none-any.whl", hash = "sha256:900633afc3e12191458d710262df5efc117838bd1e2e613b64fa254a86bb20a1"},
+    {file = "phonenumbers-9.0.10-py2.py3-none-any.whl", hash = "sha256:13b12d269be1f2b363c9bc2868656a7e2e8b50f1a1cef629c75005da6c374c6b"},
-    {file = "phonenumbers-9.0.12.tar.gz", hash = "sha256:ccadff6b949494bd606836d8c9678bee5b55cb1cbad1e98bf7adae108e6fd0be"},
+    {file = "phonenumbers-9.0.10.tar.gz", hash = "sha256:c2d15a6a9d0534b14a7764f51246ada99563e263f65b80b0251d1a760ac4a1ba"},
 ]
 [[package]]
@@ -1908,21 +1920,22 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 [[package]]
 name = "pygithub"
-version = "2.7.0"
+version = "2.6.1"
 description = "Use the full Github API v3"
 optional = false
 python-versions = ">=3.8"
 groups = ["dev"]
 files = [
-    {file = "pygithub-2.7.0-py3-none-any.whl", hash = "sha256:40ecbfe26dc55cc34ab4b0ffa1d455e6f816ef9a2bc8d6f5ad18ce572f163700"},
+    {file = "PyGithub-2.6.1-py3-none-any.whl", hash = "sha256:6f2fa6d076ccae475f9fc392cc6cdbd54db985d4f69b8833a28397de75ed6ca3"},
-    {file = "pygithub-2.7.0.tar.gz", hash = "sha256:7cd6eafabb09b5369afba3586d86b1f1ad6f1326d2ff01bc47bb26615dce4cbb"},
+    {file = "pygithub-2.6.1.tar.gz", hash = "sha256:b5c035392991cca63959e9453286b41b54d83bf2de2daa7d7ff7e4312cebf3bf"},
 ]
 [package.dependencies]
 Deprecated = "*"
 pyjwt = {version = ">=2.4.0", extras = ["crypto"]}
 pynacl = ">=1.4.0"
 requests = ">=2.14.0"
-typing-extensions = ">=4.5.0"
+typing-extensions = ">=4.0.0"
 urllib3 = ">=1.26.0"
 [[package]]
@@ -2396,31 +2409,30 @@ files = [
 [[package]]
 name = "ruff"
-version = "0.12.10"
+version = "0.12.7"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 groups = ["dev"]
 files = [
-    {file = "ruff-0.12.10-py3-none-linux_armv6l.whl", hash = "sha256:8b593cb0fb55cc8692dac7b06deb29afda78c721c7ccfed22db941201b7b8f7b"},
+    {file = "ruff-0.12.7-py3-none-linux_armv6l.whl", hash = "sha256:76e4f31529899b8c434c3c1dede98c4483b89590e15fb49f2d46183801565303"},
-    {file = "ruff-0.12.10-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ebb7333a45d56efc7c110a46a69a1b32365d5c5161e7244aaf3aa20ce62399c1"},
+    {file = "ruff-0.12.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:789b7a03e72507c54fb3ba6209e4bb36517b90f1a3569ea17084e3fd295500fb"},
-    {file = "ruff-0.12.10-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d59e58586829f8e4a9920788f6efba97a13d1fa320b047814e8afede381c6839"},
+    {file = "ruff-0.12.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:2e1c2a3b8626339bb6369116e7030a4cf194ea48f49b64bb505732a7fce4f4e3"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:822d9677b560f1fdeab69b89d1f444bf5459da4aa04e06e766cf0121771ab844"},
+    {file = "ruff-0.12.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:32dec41817623d388e645612ec70d5757a6d9c035f3744a52c7b195a57e03860"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:37b4a64f4062a50c75019c61c7017ff598cb444984b638511f48539d3a1c98db"},
+    {file = "ruff-0.12.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:47ef751f722053a5df5fa48d412dbb54d41ab9b17875c6840a58ec63ff0c247c"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2c6f4064c69d2542029b2a61d39920c85240c39837599d7f2e32e80d36401d6e"},
+    {file = "ruff-0.12.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a828a5fc25a3efd3e1ff7b241fd392686c9386f20e5ac90aa9234a5faa12c423"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:059e863ea3a9ade41407ad71c1de2badfbe01539117f38f763ba42a1206f7559"},
+    {file = "ruff-0.12.7-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5726f59b171111fa6a69d82aef48f00b56598b03a22f0f4170664ff4d8298efb"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1bef6161e297c68908b7218fa6e0e93e99a286e5ed9653d4be71e687dff101cf"},
+    {file = "ruff-0.12.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:74e6f5c04c4dd4aba223f4fe6e7104f79e0eebf7d307e4f9b18c18362124bccd"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4f1345fbf8fb0531cd722285b5f15af49b2932742fc96b633e883da8d841896b"},
+    {file = "ruff-0.12.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d0bfe4e77fba61bf2ccadf8cf005d6133e3ce08793bbe870dd1c734f2699a3e"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f68433c4fbc63efbfa3ba5db31727db229fa4e61000f452c540474b03de52a9"},
+    {file = "ruff-0.12.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06bfb01e1623bf7f59ea749a841da56f8f653d641bfd046edee32ede7ff6c606"},
-    {file = "ruff-0.12.10-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:141ce3d88803c625257b8a6debf4a0473eb6eed9643a6189b68838b43e78165a"},
+    {file = "ruff-0.12.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:e41df94a957d50083fd09b916d6e89e497246698c3f3d5c681c8b3e7b9bb4ac8"},
-    {file = "ruff-0.12.10-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f3fc21178cd44c98142ae7590f42ddcb587b8e09a3b849cbc84edb62ee95de60"},
+    {file = "ruff-0.12.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:4000623300563c709458d0ce170c3d0d788c23a058912f28bbadc6f905d67afa"},
-    {file = "ruff-0.12.10-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:7d1a4e0bdfafcd2e3e235ecf50bf0176f74dd37902f241588ae1f6c827a36c56"},
+    {file = "ruff-0.12.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:69ffe0e5f9b2cf2b8e289a3f8945b402a1b19eff24ec389f45f23c42a3dd6fb5"},
-    {file = "ruff-0.12.10-py3-none-musllinux_1_2_i686.whl", hash = "sha256:e67d96827854f50b9e3e8327b031647e7bcc090dbe7bb11101a81a3a2cbf1cc9"},
+    {file = "ruff-0.12.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:a07a5c8ffa2611a52732bdc67bf88e243abd84fe2d7f6daef3826b59abbfeda4"},
-    {file = "ruff-0.12.10-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:ae479e1a18b439c59138f066ae79cc0f3ee250712a873d00dbafadaad9481e5b"},
+    {file = "ruff-0.12.7-py3-none-win32.whl", hash = "sha256:c928f1b2ec59fb77dfdf70e0419408898b63998789cc98197e15f560b9e77f77"},
-    {file = "ruff-0.12.10-py3-none-win32.whl", hash = "sha256:9de785e95dc2f09846c5e6e1d3a3d32ecd0b283a979898ad427a9be7be22b266"},
+    {file = "ruff-0.12.7-py3-none-win_amd64.whl", hash = "sha256:9c18f3d707ee9edf89da76131956aba1270c6348bfee8f6c647de841eac7194f"},
-    {file = "ruff-0.12.10-py3-none-win_amd64.whl", hash = "sha256:7837eca8787f076f67aba2ca559cefd9c5cbc3a9852fd66186f4201b87c1563e"},
+    {file = "ruff-0.12.7-py3-none-win_arm64.whl", hash = "sha256:dfce05101dbd11833a0776716d5d1578641b7fddb537fe7fa956ab85d1769b69"},
-    {file = "ruff-0.12.10-py3-none-win_arm64.whl", hash = "sha256:cc138cc06ed9d4bfa9d667a65af7172b47840e1a98b02ce7011c391e54635ffc"},
+    {file = "ruff-0.12.7.tar.gz", hash = "sha256:1fc3193f238bc2d7968772c82831a4ff69252f673be371fb49663f0068b7ec71"},
    {file = "ruff-0.12.10.tar.gz", hash = "sha256:189ab65149d11ea69a2d775343adf5f49bb2426fc4780f65ee33b423ad2e47f9"},
 ]
 [[package]]
@@ -2878,14 +2890,14 @@ twisted = "*"
 [[package]]
 name = "types-bleach"
-version = "6.2.0.20250809"
+version = "6.2.0.20250514"
 description = "Typing stubs for bleach"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "types_bleach-6.2.0.20250809-py3-none-any.whl", hash = "sha256:0b372a75117947d9ac8a31ae733fd0f8d92ec75c4772e7b37093ba3fa5b48fb9"},
+    {file = "types_bleach-6.2.0.20250514-py3-none-any.whl", hash = "sha256:380cb74f0db1e3c3b2e0cde217221108e975e07e95ef0970c9d41f7cd4e8ea3c"},
-    {file = "types_bleach-6.2.0.20250809.tar.gz", hash = "sha256:188d7a1119f6c953140b513ed57ba4213755695815472c19d0c22ac09c79b90b"},
+    {file = "types_bleach-6.2.0.20250514.tar.gz", hash = "sha256:38c2e51d9cac51dc70c1b66121a11f4dad8bbf47fbad494bb7a77d8b8f3c4323"},
 ]
 [package.dependencies]
@@ -2920,14 +2932,14 @@ files = [
 [[package]]
 name = "types-jsonschema"
-version = "4.25.1.20250822"
+version = "4.25.0.20250720"
 description = "Typing stubs for jsonschema"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "types_jsonschema-4.25.1.20250822-py3-none-any.whl", hash = "sha256:f82c2d7fa1ce1c0b84ba1de4ed6798469768188884db04e66421913a4e181294"},
+    {file = "types_jsonschema-4.25.0.20250720-py3-none-any.whl", hash = "sha256:7d7897c715310d8bf9ae27a2cedba78bbb09e4cad83ce06d2aa79b73a88941df"},
-    {file = "types_jsonschema-4.25.1.20250822.tar.gz", hash = "sha256:aac69ed4b23f49aaceb7fcb834141d61b9e4e6a7f6008cb2f0d3b831dfa8464a"},
+    {file = "types_jsonschema-4.25.0.20250720.tar.gz", hash = "sha256:765a3b6144798fe3161fd8cbe570a756ed3e8c0e5adb7c09693eb49faad39dbd"},
 ]
 [package.dependencies]
@@ -2971,14 +2983,14 @@ files = [
 [[package]]
 name = "types-psycopg2"
-version = "2.9.21.20250809"
+version = "2.9.21.20250718"
 description = "Typing stubs for psycopg2"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "types_psycopg2-2.9.21.20250809-py3-none-any.whl", hash = "sha256:59b7b0ed56dcae9efae62b8373497274fc1a0484bdc5135cdacbe5a8f44e1d7b"},
+    {file = "types_psycopg2-2.9.21.20250718-py3-none-any.whl", hash = "sha256:bcf085d4293bda48f5943a46dadf0389b2f98f7e8007722f7e1c12ee0f541858"},
-    {file = "types_psycopg2-2.9.21.20250809.tar.gz", hash = "sha256:b7c2cbdcf7c0bd16240f59ba694347329b0463e43398de69784ea4dee45f3c6d"},
+    {file = "types_psycopg2-2.9.21.20250718.tar.gz", hash = "sha256:dc09a97272ef67e739e57b9f4740b761208f4514257e311c0b05c8c7a37d04b4"},
 ]
 [[package]]
@@ -2999,14 +3011,14 @@ types-cffi = "*"
 [[package]]
 name = "types-pyyaml"
-version = "6.0.12.20250809"
+version = "6.0.12.20250516"
 description = "Typing stubs for PyYAML"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "types_pyyaml-6.0.12.20250809-py3-none-any.whl", hash = "sha256:032b6003b798e7de1a1ddfeefee32fac6486bdfe4845e0ae0e7fb3ee4512b52f"},
+    {file = "types_pyyaml-6.0.12.20250516-py3-none-any.whl", hash = "sha256:8478208feaeb53a34cb5d970c56a7cd76b72659442e733e268a94dc72b2d0530"},
-    {file = "types_pyyaml-6.0.12.20250809.tar.gz", hash = "sha256:af4a1aca028f18e75297da2ee0da465f799627370d74073e96fee876524f61b5"},
+    {file = "types_pyyaml-6.0.12.20250516.tar.gz", hash = "sha256:9f21a70216fc0fa1b216a8176db5f9e0af6eb35d2f2932acb87689d03a5bf6ba"},
 ]
 [[package]]
@@ -3026,14 +3038,14 @@ urllib3 = ">=2"
 [[package]]
 name = "types-setuptools"
-version = "80.9.0.20250809"
+version = "80.9.0.20250529"
 description = "Typing stubs for setuptools"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "types_setuptools-80.9.0.20250809-py3-none-any.whl", hash = "sha256:7c6539b4c7ac7b4ab4db2be66d8a58fb1e28affa3ee3834be48acafd94f5976a"},
+    {file = "types_setuptools-80.9.0.20250529-py3-none-any.whl", hash = "sha256:00dfcedd73e333a430e10db096e4d46af93faf9314f832f13b6bbe3d6757e95f"},
-    {file = "types_setuptools-80.9.0.20250809.tar.gz", hash = "sha256:e986ba37ffde364073d76189e1d79d9928fb6f5278c7d07589cde353d0218864"},
+    {file = "types_setuptools-80.9.0.20250529.tar.gz", hash = "sha256:79e088ba0cba2186c8d6499cbd3e143abb142d28a44b042c28d3148b1e353c91"},
 ]
 [[package]]
@@ -3105,6 +3117,91 @@ files = [
    {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"},
 ]
 [[package]]
 name = "wrapt"
 version = "1.15.0"
 description = "Module for decorators, wrappers and monkey patching."
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
 groups = ["dev"]
 files = [
    {file = "wrapt-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ca1cccf838cd28d5a0883b342474c630ac48cac5df0ee6eacc9c7290f76b11c1"},
    {file = "wrapt-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e826aadda3cae59295b95343db8f3d965fb31059da7de01ee8d1c40a60398b29"},
    {file = "wrapt-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:5fc8e02f5984a55d2c653f5fea93531e9836abbd84342c1d1e17abc4a15084c2"},
    {file = "wrapt-1.15.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:96e25c8603a155559231c19c0349245eeb4ac0096fe3c1d0be5c47e075bd4f46"},
    {file = "wrapt-1.15.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:40737a081d7497efea35ab9304b829b857f21558acfc7b3272f908d33b0d9d4c"},
    {file = "wrapt-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:f87ec75864c37c4c6cb908d282e1969e79763e0d9becdfe9fe5473b7bb1e5f09"},
    {file = "wrapt-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:1286eb30261894e4c70d124d44b7fd07825340869945c79d05bda53a40caa079"},
    {file = "wrapt-1.15.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:493d389a2b63c88ad56cdc35d0fa5752daac56ca755805b1b0c530f785767d5e"},
    {file = "wrapt-1.15.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:58d7a75d731e8c63614222bcb21dd992b4ab01a399f1f09dd82af17bbfc2368a"},
    {file = "wrapt-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:21f6d9a0d5b3a207cdf7acf8e58d7d13d463e639f0c7e01d82cdb671e6cb7923"},
    {file = "wrapt-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ce42618f67741d4697684e501ef02f29e758a123aa2d669e2d964ff734ee00ee"},
    {file = "wrapt-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41d07d029dd4157ae27beab04d22b8e261eddfc6ecd64ff7000b10dc8b3a5727"},
    {file = "wrapt-1.15.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:54accd4b8bc202966bafafd16e69da9d5640ff92389d33d28555c5fd4f25ccb7"},
    {file = "wrapt-1.15.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fbfbca668dd15b744418265a9607baa970c347eefd0db6a518aaf0cfbd153c0"},
    {file = "wrapt-1.15.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:76e9c727a874b4856d11a32fb0b389afc61ce8aaf281ada613713ddeadd1cfec"},
    {file = "wrapt-1.15.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e20076a211cd6f9b44a6be58f7eeafa7ab5720eb796975d0c03f05b47d89eb90"},
    {file = "wrapt-1.15.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a74d56552ddbde46c246b5b89199cb3fd182f9c346c784e1a93e4dc3f5ec9975"},
    {file = "wrapt-1.15.0-cp310-cp310-win32.whl", hash = "sha256:26458da5653aa5b3d8dc8b24192f574a58984c749401f98fff994d41d3f08da1"},
    {file = "wrapt-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:75760a47c06b5974aa5e01949bf7e66d2af4d08cb8c1d6516af5e39595397f5e"},
    {file = "wrapt-1.15.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ba1711cda2d30634a7e452fc79eabcadaffedf241ff206db2ee93dd2c89a60e7"},
    {file = "wrapt-1.15.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:56374914b132c702aa9aa9959c550004b8847148f95e1b824772d453ac204a72"},
    {file = "wrapt-1.15.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a89ce3fd220ff144bd9d54da333ec0de0399b52c9ac3d2ce34b569cf1a5748fb"},
    {file = "wrapt-1.15.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3bbe623731d03b186b3d6b0d6f51865bf598587c38d6f7b0be2e27414f7f214e"},
    {file = "wrapt-1.15.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3abbe948c3cbde2689370a262a8d04e32ec2dd4f27103669a45c6929bcdbfe7c"},
    {file = "wrapt-1.15.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b67b819628e3b748fd3c2192c15fb951f549d0f47c0449af0764d7647302fda3"},
    {file = "wrapt-1.15.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7eebcdbe3677e58dd4c0e03b4f2cfa346ed4049687d839adad68cc38bb559c92"},
    {file = "wrapt-1.15.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:74934ebd71950e3db69960a7da29204f89624dde411afbfb3b4858c1409b1e98"},
    {file = "wrapt-1.15.0-cp311-cp311-win32.whl", hash = "sha256:bd84395aab8e4d36263cd1b9308cd504f6cf713b7d6d3ce25ea55670baec5416"},
    {file = "wrapt-1.15.0-cp311-cp311-win_amd64.whl", hash = "sha256:a487f72a25904e2b4bbc0817ce7a8de94363bd7e79890510174da9d901c38705"},
    {file = "wrapt-1.15.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:4ff0d20f2e670800d3ed2b220d40984162089a6e2c9646fdb09b85e6f9a8fc29"},
    {file = "wrapt-1.15.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9ed6aa0726b9b60911f4aed8ec5b8dd7bf3491476015819f56473ffaef8959bd"},
    {file = "wrapt-1.15.0-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:896689fddba4f23ef7c718279e42f8834041a21342d95e56922e1c10c0cc7afb"},
    {file = "wrapt-1.15.0-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:75669d77bb2c071333417617a235324a1618dba66f82a750362eccbe5b61d248"},
    {file = "wrapt-1.15.0-cp35-cp35m-win32.whl", hash = "sha256:fbec11614dba0424ca72f4e8ba3c420dba07b4a7c206c8c8e4e73f2e98f4c559"},
    {file = "wrapt-1.15.0-cp35-cp35m-win_amd64.whl", hash = "sha256:fd69666217b62fa5d7c6aa88e507493a34dec4fa20c5bd925e4bc12fce586639"},
    {file = "wrapt-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b0724f05c396b0a4c36a3226c31648385deb6a65d8992644c12a4963c70326ba"},
    {file = "wrapt-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bbeccb1aa40ab88cd29e6c7d8585582c99548f55f9b2581dfc5ba68c59a85752"},
    {file = "wrapt-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:38adf7198f8f154502883242f9fe7333ab05a5b02de7d83aa2d88ea621f13364"},
    {file = "wrapt-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:578383d740457fa790fdf85e6d346fda1416a40549fe8db08e5e9bd281c6a475"},
    {file = "wrapt-1.15.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:a4cbb9ff5795cd66f0066bdf5947f170f5d63a9274f99bdbca02fd973adcf2a8"},
    {file = "wrapt-1.15.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:af5bd9ccb188f6a5fdda9f1f09d9f4c86cc8a539bd48a0bfdc97723970348418"},
    {file = "wrapt-1.15.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:b56d5519e470d3f2fe4aa7585f0632b060d532d0696c5bdfb5e8319e1d0f69a2"},
    {file = "wrapt-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:77d4c1b881076c3ba173484dfa53d3582c1c8ff1f914c6461ab70c8428b796c1"},
    {file = "wrapt-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:077ff0d1f9d9e4ce6476c1a924a3332452c1406e59d90a2cf24aeb29eeac9420"},
    {file = "wrapt-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5c5aa28df055697d7c37d2099a7bc09f559d5053c3349b1ad0c39000e611d317"},
    {file = "wrapt-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a8564f283394634a7a7054b7983e47dbf39c07712d7b177b37e03f2467a024e"},
    {file = "wrapt-1.15.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:780c82a41dc493b62fc5884fb1d3a3b81106642c5c5c78d6a0d4cbe96d62ba7e"},
    {file = "wrapt-1.15.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e169e957c33576f47e21864cf3fc9ff47c223a4ebca8960079b8bd36cb014fd0"},
    {file = "wrapt-1.15.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b02f21c1e2074943312d03d243ac4388319f2456576b2c6023041c4d57cd7019"},
    {file = "wrapt-1.15.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f2e69b3ed24544b0d3dbe2c5c0ba5153ce50dcebb576fdc4696d52aa22db6034"},
    {file = "wrapt-1.15.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d787272ed958a05b2c86311d3a4135d3c2aeea4fc655705f074130aa57d71653"},
    {file = "wrapt-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:02fce1852f755f44f95af51f69d22e45080102e9d00258053b79367d07af39c0"},
    {file = "wrapt-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:abd52a09d03adf9c763d706df707c343293d5d106aea53483e0ec8d9e310ad5e"},
    {file = "wrapt-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:cdb4f085756c96a3af04e6eca7f08b1345e94b53af8921b25c72f096e704e145"},
    {file = "wrapt-1.15.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:230ae493696a371f1dbffaad3dafbb742a4d27a0afd2b1aecebe52b740167e7f"},
    {file = "wrapt-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63424c681923b9f3bfbc5e3205aafe790904053d42ddcc08542181a30a7a51bd"},
    {file = "wrapt-1.15.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6bcbfc99f55655c3d93feb7ef3800bd5bbe963a755687cbf1f490a71fb7794b"},
    {file = "wrapt-1.15.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c99f4309f5145b93eca6e35ac1a988f0dc0a7ccf9ccdcd78d3c0adf57224e62f"},
    {file = "wrapt-1.15.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b130fe77361d6771ecf5a219d8e0817d61b236b7d8b37cc045172e574ed219e6"},
    {file = "wrapt-1.15.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:96177eb5645b1c6985f5c11d03fc2dbda9ad24ec0f3a46dcce91445747e15094"},
    {file = "wrapt-1.15.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d5fe3e099cf07d0fb5a1e23d399e5d4d1ca3e6dfcbe5c8570ccff3e9208274f7"},
    {file = "wrapt-1.15.0-cp38-cp38-win32.whl", hash = "sha256:abd8f36c99512755b8456047b7be10372fca271bf1467a1caa88db991e7c421b"},
    {file = "wrapt-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:b06fa97478a5f478fb05e1980980a7cdf2712015493b44d0c87606c1513ed5b1"},
    {file = "wrapt-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2e51de54d4fb8fb50d6ee8327f9828306a959ae394d3e01a1ba8b2f937747d86"},
    {file = "wrapt-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0970ddb69bba00670e58955f8019bec4a42d1785db3faa043c33d81de2bf843c"},
    {file = "wrapt-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76407ab327158c510f44ded207e2f76b657303e17cb7a572ffe2f5a8a48aa04d"},
    {file = "wrapt-1.15.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cd525e0e52a5ff16653a3fc9e3dd827981917d34996600bbc34c05d048ca35cc"},
    {file = "wrapt-1.15.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d37ac69edc5614b90516807de32d08cb8e7b12260a285ee330955604ed9dd29"},
    {file = "wrapt-1.15.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:078e2a1a86544e644a68422f881c48b84fef6d18f8c7a957ffd3f2e0a74a0d4a"},
    {file = "wrapt-1.15.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2cf56d0e237280baed46f0b5316661da892565ff58309d4d2ed7dba763d984b8"},
    {file = "wrapt-1.15.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:7dc0713bf81287a00516ef43137273b23ee414fe41a3c14be10dd95ed98a2df9"},
    {file = "wrapt-1.15.0-cp39-cp39-win32.whl", hash = "sha256:46ed616d5fb42f98630ed70c3529541408166c22cdfd4540b88d5f21006b0eff"},
    {file = "wrapt-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:eef4d64c650f33347c1f9266fa5ae001440b232ad9b98f1f43dfe7a79435c0a6"},
    {file = "wrapt-1.15.0-py3-none-any.whl", hash = "sha256:64b1df0f83706b4ef4cfb4fb0e4c2669100fd7ecacfb59e091fad300d4e04640"},
    {file = "wrapt-1.15.0.tar.gz", hash = "sha256:d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a"},
 ]
 [[package]]
 name = "xmlschema"
 version = "2.4.0"
@@ -3256,4 +3353,4 @@ url-preview = ["lxml"]
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.9.0"
-content-hash = "2e8ea085e1a0c6f0ac051d4bc457a96827d01f621b1827086de01a5ffa98cf79"
+content-hash = "600a349d08dde732df251583094a121b5385eb43ae0c6ceff10dcf9749359446"
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -101,7 +101,7 @@ module-name = "synapse.synapse_rust"
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.138.0rc1"
+version = "1.135.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -324,7 +324,7 @@ all = [
 # failing on new releases. Keeping lower bounds loose here means that dependabot
 # can bump versions without having to update the content-hash in the lockfile.
 # This helps prevents merge conflicts when running a batch of dependabot updates.
-ruff = "0.12.10"
+ruff = "0.12.7"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -7,7 +7,7 @@ name = "synapse"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.82.0"
+rust-version = "1.81.0"
 [lib]
 name = "synapse"
--- a/rust/benches/evaluator.rs
+++ b/rust/benches/evaluator.rs
@@ -61,7 +61,6 @@ fn bench_match_exact(b: &mut Bencher) {
        vec![],
        false,
        false,
        false,
    )
    .unwrap();
@@ -72,10 +71,10 @@ fn bench_match_exact(b: &mut Bencher) {
        },
    ));
-    let matched = eval.match_condition(&condition, None, None, None).unwrap();
+    let matched = eval.match_condition(&condition, None, None).unwrap();
    assert!(matched, "Didn't match");
-    b.iter(|| eval.match_condition(&condition, None, None, None).unwrap());
+    b.iter(|| eval.match_condition(&condition, None, None).unwrap());
 }
 #[bench]
@@ -108,7 +107,6 @@ fn bench_match_word(b: &mut Bencher) {
        vec![],
        false,
        false,
        false,
    )
    .unwrap();
@@ -119,10 +117,10 @@ fn bench_match_word(b: &mut Bencher) {
        },
    ));
-    let matched = eval.match_condition(&condition, None, None, None).unwrap();
+    let matched = eval.match_condition(&condition, None, None).unwrap();
    assert!(matched, "Didn't match");
-    b.iter(|| eval.match_condition(&condition, None, None, None).unwrap());
+    b.iter(|| eval.match_condition(&condition, None, None).unwrap());
 }
 #[bench]
@@ -155,7 +153,6 @@ fn bench_match_word_miss(b: &mut Bencher) {
        vec![],
        false,
        false,
        false,
    )
    .unwrap();
@@ -166,10 +163,10 @@ fn bench_match_word_miss(b: &mut Bencher) {
        },
    ));
-    let matched = eval.match_condition(&condition, None, None, None).unwrap();
+    let matched = eval.match_condition(&condition, None, None).unwrap();
    assert!(!matched, "Didn't match");
-    b.iter(|| eval.match_condition(&condition, None, None, None).unwrap());
+    b.iter(|| eval.match_condition(&condition, None, None).unwrap());
 }
 #[bench]
@@ -202,7 +199,6 @@ fn bench_eval_message(b: &mut Bencher) {
        vec![],
        false,
        false,
        false,
    )
    .unwrap();
@@ -214,8 +210,7 @@ fn bench_eval_message(b: &mut Bencher) {
        false,
        false,
        false,
        false,
    );
-    b.iter(|| eval.run(&rules, Some("bob"), Some("person"), None));
+    b.iter(|| eval.run(&rules, Some("bob"), Some("person")));
 }
--- a/rust/src/push/base_rules.rs
+++ b/rust/src/push/base_rules.rs
@@ -290,26 +290,6 @@ pub const BASE_APPEND_CONTENT_RULES: &[PushRule] = &[PushRule {
 }];
 pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
    PushRule {
        rule_id: Cow::Borrowed("global/content/.io.element.msc4306.rule.unsubscribed_thread"),
        priority_class: 1,
        conditions: Cow::Borrowed(&[Condition::Known(
            KnownCondition::Msc4306ThreadSubscription { subscribed: false },
        )]),
        actions: Cow::Borrowed(&[]),
        default: true,
        default_enabled: true,
    },
    PushRule {
        rule_id: Cow::Borrowed("global/content/.io.element.msc4306.rule.subscribed_thread"),
        priority_class: 1,
        conditions: Cow::Borrowed(&[Condition::Known(
            KnownCondition::Msc4306ThreadSubscription { subscribed: true },
        )]),
        actions: Cow::Borrowed(&[Action::Notify, SOUND_ACTION]),
        default: true,
        default_enabled: true,
    },
    PushRule {
        rule_id: Cow::Borrowed("global/underride/.m.rule.call"),
        priority_class: 1,
--- a/rust/src/push/evaluator.rs
+++ b/rust/src/push/evaluator.rs
@@ -106,11 +106,8 @@ pub struct PushRuleEvaluator {
    /// flag as MSC1767 (extensible events core).
    msc3931_enabled: bool,
-    /// If MSC4210 (remove legacy mentions) is enabled.
+    // If MSC4210 (remove legacy mentions) is enabled.
    msc4210_enabled: bool,
    /// If MSC4306 (thread subscriptions) is enabled.
    msc4306_enabled: bool,
 }
 #[pymethods]
@@ -129,7 +126,6 @@ impl PushRuleEvaluator {
        room_version_feature_flags,
        msc3931_enabled,
        msc4210_enabled,
        msc4306_enabled,
    ))]
    pub fn py_new(
        flattened_keys: BTreeMap<String, JsonValue>,
@@ -142,7 +138,6 @@ impl PushRuleEvaluator {
        room_version_feature_flags: Vec<String>,
        msc3931_enabled: bool,
        msc4210_enabled: bool,
        msc4306_enabled: bool,
    ) -> Result<Self, Error> {
        let body = match flattened_keys.get("content.body") {
            Some(JsonValue::Value(SimpleJsonValue::Str(s))) => s.clone().into_owned(),
@@ -161,7 +156,6 @@ impl PushRuleEvaluator {
            room_version_feature_flags,
            msc3931_enabled,
            msc4210_enabled,
            msc4306_enabled,
        })
    }
@@ -173,19 +167,12 @@ impl PushRuleEvaluator {
    ///
    /// Returns the set of actions, if any, that match (filtering out any
    /// `dont_notify` and `coalesce` actions).
-    ///
+    #[pyo3(signature = (push_rules, user_id=None, display_name=None))]
    /// msc4306_thread_subscription_state: (Only populated if MSC4306 is enabled)
    /// The thread subscription state corresponding to the thread containing this event.
    /// - `None` if the event is not in a thread, or if MSC4306 is disabled.
    /// - `Some(true)` if the event is in a thread and the user has a subscription for that thread
    /// - `Some(false)` if the event is in a thread and the user does NOT have a subscription for that thread
    #[pyo3(signature = (push_rules, user_id=None, display_name=None, msc4306_thread_subscription_state=None))]
    pub fn run(
        &self,
        push_rules: &FilteredPushRules,
        user_id: Option<&str>,
        display_name: Option<&str>,
        msc4306_thread_subscription_state: Option<bool>,
    ) -> Vec<Action> {
        'outer: for (push_rule, enabled) in push_rules.iter() {
            if !enabled {
@@ -217,12 +204,7 @@ impl PushRuleEvaluator {
                    Condition::Known(KnownCondition::RoomVersionSupports { feature: _ }),
                );
-                match self.match_condition(
+                match self.match_condition(condition, user_id, display_name) {
                    condition,
                    user_id,
                    display_name,
                    msc4306_thread_subscription_state,
                ) {
                    Ok(true) => {}
                    Ok(false) => continue 'outer,
                    Err(err) => {
@@ -255,20 +237,14 @@ impl PushRuleEvaluator {
    }
    /// Check if the given condition matches.
-    #[pyo3(signature = (condition, user_id=None, display_name=None, msc4306_thread_subscription_state=None))]
+    #[pyo3(signature = (condition, user_id=None, display_name=None))]
    fn matches(
        &self,
        condition: Condition,
        user_id: Option<&str>,
        display_name: Option<&str>,
        msc4306_thread_subscription_state: Option<bool>,
    ) -> bool {
-        match self.match_condition(
+        match self.match_condition(&condition, user_id, display_name) {
            &condition,
            user_id,
            display_name,
            msc4306_thread_subscription_state,
        ) {
            Ok(true) => true,
            Ok(false) => false,
            Err(err) => {
@@ -286,7 +262,6 @@ impl PushRuleEvaluator {
        condition: &Condition,
        user_id: Option<&str>,
        display_name: Option<&str>,
        msc4306_thread_subscription_state: Option<bool>,
    ) -> Result<bool, Error> {
        let known_condition = match condition {
            Condition::Known(known) => known,
@@ -418,13 +393,6 @@ impl PushRuleEvaluator {
                        && self.room_version_feature_flags.contains(&flag)
                }
            }
            KnownCondition::Msc4306ThreadSubscription { subscribed } => {
                if !self.msc4306_enabled {
                    false
                } else {
                    msc4306_thread_subscription_state == Some(*subscribed)
                }
            }
        };
        Ok(result)
@@ -568,11 +536,10 @@ fn push_rule_evaluator() {
        vec![],
        true,
        false,
        false,
    )
    .unwrap();
-    let result = evaluator.run(&FilteredPushRules::default(), None, Some("bob"), None);
+    let result = evaluator.run(&FilteredPushRules::default(), None, Some("bob"));
    assert_eq!(result.len(), 3);
 }
@@ -599,7 +566,6 @@ fn test_requires_room_version_supports_condition() {
        flags,
        true,
        false,
        false,
    )
    .unwrap();
@@ -609,7 +575,6 @@ fn test_requires_room_version_supports_condition() {
        &FilteredPushRules::default(),
        Some("@bob:example.org"),
        None,
        None,
    );
    assert_eq!(result.len(), 3);
@@ -628,17 +593,7 @@ fn test_requires_room_version_supports_condition() {
    };
    let rules = PushRules::new(vec![custom_rule]);
    result = evaluator.run(
-        &FilteredPushRules::py_new(
+        &FilteredPushRules::py_new(rules, BTreeMap::new(), true, false, true, false, false),
            rules,
            BTreeMap::new(),
            true,
            false,
            true,
            false,
            false,
            false,
        ),
        None,
        None,
        None,
    );
--- a/rust/src/push/mod.rs
+++ b/rust/src/push/mod.rs
@@ -369,10 +369,6 @@ pub enum KnownCondition {
    RoomVersionSupports {
        feature: Cow<'static, str>,
    },
    #[serde(rename = "io.element.msc4306.thread_subscription")]
    Msc4306ThreadSubscription {
        subscribed: bool,
    },
 }
 impl<'source> IntoPyObject<'source> for Condition {
@@ -551,13 +547,11 @@ pub struct FilteredPushRules {
    msc3664_enabled: bool,
    msc4028_push_encrypted_events: bool,
    msc4210_enabled: bool,
    msc4306_enabled: bool,
 }
 #[pymethods]
 impl FilteredPushRules {
    #[new]
    #[allow(clippy::too_many_arguments)]
    pub fn py_new(
        push_rules: PushRules,
        enabled_map: BTreeMap<String, bool>,
@@ -566,7 +560,6 @@ impl FilteredPushRules {
        msc3664_enabled: bool,
        msc4028_push_encrypted_events: bool,
        msc4210_enabled: bool,
        msc4306_enabled: bool,
    ) -> Self {
        Self {
            push_rules,
@@ -576,7 +569,6 @@ impl FilteredPushRules {
            msc3664_enabled,
            msc4028_push_encrypted_events,
            msc4210_enabled,
            msc4306_enabled,
        }
    }
@@ -627,10 +619,6 @@ impl FilteredPushRules {
                    return false;
                }
                if !self.msc4306_enabled && rule.rule_id.contains("/.io.element.msc4306.rule.") {
                    return false;
                }
                true
            })
            .map(|r| {
--- a/schema/synapse-config.schema.yaml
+++ b/schema/synapse-config.schema.yaml
@@ -1,5 +1,5 @@
 $schema: https://element-hq.github.io/synapse/latest/schema/v1/meta.schema.json
-$id: https://element-hq.github.io/synapse/schema/synapse/v1.138/synapse-config.schema.json
+$id: https://element-hq.github.io/synapse/schema/synapse/v1.135/synapse-config.schema.json
 type: object
 properties:
  modules:
@@ -656,43 +656,6 @@ properties:
      - - master.hostname.example.com
        - 10.1.0.0/16
        - 172.30.0.0/16
  matrix_authentication_service:
    type: object
    description: >-
      The `matrix_authentication_service` setting configures integration with
      [Matrix Authentication Service (MAS)](https://github.com/element-hq/matrix-authentication-service).
    properties:
      enabled:
        type: boolean
        description: >-
          Whether or not to enable the MAS integration. If this is set to
          `false`, Synapse will use its legacy internal authentication API.
        default: false
      endpoint:
        type: string
        format: uri
        description: >-
          The URL where Synapse can reach MAS. This *must* have the `discovery`
          and `oauth` resources mounted.
        default: http://localhost:8080
      secret:
        type: ["string", "null"]
        description: >-
          A shared secret that will be used to authenticate requests from and to MAS.
      secret_path:
        type: ["string", "null"]
        description: >-
          Alternative to `secret`, reading the shared secret from a file.
          The file should be a plain text file, containing only the secret.
          Synapse reads the secret from the given file once at startup.
    examples:
      - enabled: true
        secret: someverysecuresecret
        endpoint: http://localhost:8080
  dummy_events_threshold:
    type: integer
    description: >-
@@ -5184,7 +5147,7 @@ properties:
      "m.room.avatar": 50
-      "m.room.tombstone": 100 (150 if MSC4289 is used)
+      "m.room.tombstone": 100
      "m.room.server_acl": 100
--- a/scripts-dev/mypy_synapse_plugin.py
+++ b/scripts-dev/mypy_synapse_plugin.py
@@ -23,21 +23,16 @@
 can crop up, e.g the cache descriptors.
 """
-import enum
+from typing import Callable, Optional, Tuple, Type, Union
 from typing import Callable, Mapping, Optional, Tuple, Type, Union
 import attr
 import mypy.types
 from mypy.erasetype import remove_instance_last_known_values
 from mypy.errorcodes import ErrorCode
 from mypy.nodes import ARG_NAMED_OPT, ListExpr, NameExpr, TempNode, TupleExpr, Var
 from mypy.plugin import (
    ClassDefContext,
    Context,
    FunctionLike,
    FunctionSigContext,
    MethodSigContext,
    MypyFile,
    Plugin,
 )
 from mypy.typeops import bind_self
@@ -46,15 +41,12 @@ from mypy.types import (
    CallableType,
    Instance,
    NoneType,
    Options,
    TupleType,
    TypeAliasType,
    TypeVarType,
    UninhabitedType,
    UnionType,
 )
 from mypy_zope import plugin as mypy_zope_plugin
 from pydantic.mypy import plugin as mypy_pydantic_plugin
 PROMETHEUS_METRIC_MISSING_SERVER_NAME_LABEL = ErrorCode(
    "missing-server-name-label",
@@ -62,153 +54,19 @@ PROMETHEUS_METRIC_MISSING_SERVER_NAME_LABEL = ErrorCode(
    category="per-homeserver-tenant-metrics",
 )
 PROMETHEUS_METRIC_MISSING_FROM_LIST_TO_CHECK = ErrorCode(
    "metric-type-missing-from-list",
    "Every Prometheus metric type must be included in the `prometheus_metric_fullname_to_label_arg_map`.",
    category="per-homeserver-tenant-metrics",
 )
 class Sentinel(enum.Enum):
    # defining a sentinel in this way allows mypy to correctly handle the
    # type of a dictionary lookup and subsequent type narrowing.
    UNSET_SENTINEL = object()
@attr.s(auto_attribs=True)
 class ArgLocation:
    keyword_name: str
    """
    The keyword argument name for this argument
    """
    position: int
    """
    The 0-based positional index of this argument
    """
 prometheus_metric_fullname_to_label_arg_map: Mapping[str, Optional[ArgLocation]] = {
    # `Collector` subclasses:
    "prometheus_client.metrics.MetricWrapperBase": ArgLocation("labelnames", 2),
    "prometheus_client.metrics.Counter": ArgLocation("labelnames", 2),
    "prometheus_client.metrics.Histogram": ArgLocation("labelnames", 2),
    "prometheus_client.metrics.Gauge": ArgLocation("labelnames", 2),
    "prometheus_client.metrics.Summary": ArgLocation("labelnames", 2),
    "prometheus_client.metrics.Info": ArgLocation("labelnames", 2),
    "prometheus_client.metrics.Enum": ArgLocation("labelnames", 2),
    "synapse.metrics.LaterGauge": ArgLocation("labelnames", 2),
    "synapse.metrics.InFlightGauge": ArgLocation("labels", 2),
    "synapse.metrics.GaugeBucketCollector": ArgLocation("labelnames", 2),
    "prometheus_client.registry.Collector": None,
    "prometheus_client.registry._EmptyCollector": None,
    "prometheus_client.registry.CollectorRegistry": None,
    "prometheus_client.process_collector.ProcessCollector": None,
    "prometheus_client.platform_collector.PlatformCollector": None,
    "prometheus_client.gc_collector.GCCollector": None,
    "synapse.metrics._gc.GCCounts": None,
    "synapse.metrics._gc.PyPyGCStats": None,
    "synapse.metrics._reactor_metrics.ReactorLastSeenMetric": None,
    "synapse.metrics.CPUMetrics": None,
    "synapse.metrics.jemalloc.JemallocCollector": None,
    "synapse.util.metrics.DynamicCollectorRegistry": None,
    "synapse.metrics.background_process_metrics._Collector": None,
    #
    # `Metric` subclasses:
    "prometheus_client.metrics_core.Metric": None,
    "prometheus_client.metrics_core.UnknownMetricFamily": ArgLocation("labels", 3),
    "prometheus_client.metrics_core.CounterMetricFamily": ArgLocation("labels", 3),
    "prometheus_client.metrics_core.GaugeMetricFamily": ArgLocation("labels", 3),
    "prometheus_client.metrics_core.SummaryMetricFamily": ArgLocation("labels", 3),
    "prometheus_client.metrics_core.InfoMetricFamily": ArgLocation("labels", 3),
    "prometheus_client.metrics_core.HistogramMetricFamily": ArgLocation("labels", 3),
    "prometheus_client.metrics_core.GaugeHistogramMetricFamily": ArgLocation(
        "labels", 4
    ),
    "prometheus_client.metrics_core.StateSetMetricFamily": ArgLocation("labels", 3),
    "synapse.metrics.GaugeHistogramMetricFamilyWithLabels": ArgLocation(
        "labelnames", 4
    ),
 }
 """
 Map from the fullname of the Prometheus `Metric`/`Collector` classes to the keyword
 argument name and positional index of the label names. This map is useful because
 different metrics have different signatures for passing in label names and we just need
 to know where to look.
 This map should include any metrics that we collect with Prometheus. Which corresponds
 to anything that inherits from `prometheus_client.registry.Collector`
 (`synapse.metrics._types.Collector`) or `prometheus_client.metrics_core.Metric`. The
 exhaustiveness of this list is enforced by `analyze_prometheus_metric_classes`.
 The entries with `None` always fail the lint because they don't have a `labelnames`
 argument (therefore, no `SERVER_NAME_LABEL`), but we include them here so that people
 can notice and manually allow via a type ignore comment as the source of truth
 should be in the source code.
 """
 # Unbound at this point because we don't know the mypy version yet.
 # This is set in the `plugin(...)` function below.
 MypyPydanticPluginClass: Type[Plugin]
 MypyZopePluginClass: Type[Plugin]
 class SynapsePlugin(Plugin):
    def __init__(self, options: Options):
        super().__init__(options)
        self.mypy_pydantic_plugin = MypyPydanticPluginClass(options)
        self.mypy_zope_plugin = MypyZopePluginClass(options)
    def set_modules(self, modules: dict[str, MypyFile]) -> None:
        """
        This is called by mypy internals. We have to override this to ensure it's also
        called for any other plugins that we're manually handling.
        Here is how mypy describes it:
        > [`self._modules`] can't be set in `__init__` because it is executed too soon
        > in `build.py`. Therefore, `build.py` *must* set it later before graph processing
        > starts by calling `set_modules()`.
        """
        super().set_modules(modules)
        self.mypy_pydantic_plugin.set_modules(modules)
        self.mypy_zope_plugin.set_modules(modules)
    def get_base_class_hook(
        self, fullname: str
    ) -> Optional[Callable[[ClassDefContext], None]]:
        def _get_base_class_hook(ctx: ClassDefContext) -> None:
            # Run any `get_base_class_hook` checks from other plugins first.
            #
            # Unfortunately, because mypy only chooses the first plugin that returns a
            # non-None value (known-limitation, c.f.
            # https://github.com/python/mypy/issues/19524), we workaround this by
            # putting our custom plugin first in the plugin order and then calling the
            # other plugin's hook manually followed by our own checks.
            if callback := self.mypy_pydantic_plugin.get_base_class_hook(fullname):
                callback(ctx)
            if callback := self.mypy_zope_plugin.get_base_class_hook(fullname):
                callback(ctx)
            # Now run our own checks
            analyze_prometheus_metric_classes(ctx)
        return _get_base_class_hook
    def get_function_signature_hook(
        self, fullname: str
    ) -> Optional[Callable[[FunctionSigContext], FunctionLike]]:
-        # Strip off the unique identifier for classes that are dynamically created inside
+        if fullname in (
-        # functions. ex. `synapse.metrics.jemalloc.JemallocCollector@185` (this is the line
+            "prometheus_client.metrics.Counter",
-        # number)
+            "prometheus_client.metrics.Histogram",
-        if "@" in fullname:
+            "prometheus_client.metrics.Gauge",
-            fullname = fullname.split("@", 1)[0]
+            # TODO: Add other prometheus_client metrics that need checking as we
-
+            # refactor, see https://github.com/element-hq/synapse/issues/18592
-        # Look for any Prometheus metrics to make sure they have the `SERVER_NAME_LABEL`
+        ):
-        # label.
+            return check_prometheus_metric_instantiation
        if fullname in prometheus_metric_fullname_to_label_arg_map.keys():
            # Because it's difficult to determine the `fullname` of the function in the
            # callback, let's just pass it in while we have it.
            return lambda ctx: check_prometheus_metric_instantiation(ctx, fullname)
        return None
@@ -232,44 +90,7 @@ class SynapsePlugin(Plugin):
        return None
-def analyze_prometheus_metric_classes(ctx: ClassDefContext) -> None:
+def check_prometheus_metric_instantiation(ctx: FunctionSigContext) -> CallableType:
    """
    Cross-check the list of Prometheus metric classes against the
    `prometheus_metric_fullname_to_label_arg_map` to ensure the list is exhaustive and
    up-to-date.
    """
    fullname = ctx.cls.fullname
    # Strip off the unique identifier for classes that are dynamically created inside
    # functions. ex. `synapse.metrics.jemalloc.JemallocCollector@185` (this is the line
    # number)
    if "@" in fullname:
        fullname = fullname.split("@", 1)[0]
    if any(
        ancestor_type.fullname
        in (
            # All of the Prometheus metric classes inherit from the `Collector`.
            "prometheus_client.registry.Collector",
            "synapse.metrics._types.Collector",
            # And custom metrics that inherit from `Metric`.
            "prometheus_client.metrics_core.Metric",
        )
        for ancestor_type in ctx.cls.info.mro
    ):
        if fullname not in prometheus_metric_fullname_to_label_arg_map:
            ctx.api.fail(
                f"Expected {fullname} to be in `prometheus_metric_fullname_to_label_arg_map`, "
                f"but it was not found. This is a problem with our custom mypy plugin. "
                f"Please add it to the map.",
                Context(),
                code=PROMETHEUS_METRIC_MISSING_FROM_LIST_TO_CHECK,
            )
 def check_prometheus_metric_instantiation(
    ctx: FunctionSigContext, fullname: str
 ) -> CallableType:
    """
    Ensure that the `prometheus_client` metrics include the `SERVER_NAME_LABEL` label
    when instantiated.
@@ -282,49 +103,18 @@ def check_prometheus_metric_instantiation(
    Python garbage collection, and Twisted reactor tick time, which shouldn't have the
    `SERVER_NAME_LABEL`. In those cases, use a type ignore comment to disable the
    check, e.g. `# type: ignore[missing-server-name-label]`.
    Args:
        ctx: The `FunctionSigContext` from mypy.
        fullname: The fully qualified name of the function being called,
            e.g. `"prometheus_client.metrics.Counter"`
    """
    # The true signature, this isn't being modified so this is what will be returned.
-    signature = ctx.default_signature
+    signature: CallableType = ctx.default_signature
    # Find where the label names argument is in the function signature.
    arg_location = prometheus_metric_fullname_to_label_arg_map.get(
        fullname, Sentinel.UNSET_SENTINEL
    )
    assert arg_location is not Sentinel.UNSET_SENTINEL, (
        f"Expected to find {fullname} in `prometheus_metric_fullname_to_label_arg_map`, "
        f"but it was not found. This is a problem with our custom mypy plugin. "
        f"Please add it to the map. Context: {ctx.context}"
    )
    # People should be using `# type: ignore[missing-server-name-label]` for
    # process-level metrics that should not have the `SERVER_NAME_LABEL`.
    if arg_location is None:
        ctx.api.fail(
            f"{signature.name} does not have a `labelnames`/`labels` argument "
            "(if this is untrue, update `prometheus_metric_fullname_to_label_arg_map` "
            "in our custom mypy plugin) and should probably have a type ignore comment, "
            "e.g. `# type: ignore[missing-server-name-label]`. The reason we don't "
            "automatically ignore this is the source of truth should be in the source code.",
            ctx.context,
            code=PROMETHEUS_METRIC_MISSING_SERVER_NAME_LABEL,
        )
        return signature
    # Sanity check the arguments are still as expected in this version of
    # `prometheus_client`. ex. `Counter(name, documentation, labelnames, ...)`
    #
    # `signature.arg_names` should be: ["name", "documentation", "labelnames", ...]
-    if (
+    if len(signature.arg_names) < 3 or signature.arg_names[2] != "labelnames":
        len(signature.arg_names) < (arg_location.position + 1)
        or signature.arg_names[arg_location.position] != arg_location.keyword_name
    ):
        ctx.api.fail(
-            f"Expected argument number {arg_location.position + 1} of {signature.name} to be `labelnames`/`labels`, "
+            f"Expected the 3rd argument of {signature.name} to be 'labelnames', but got "
-            f"but got {signature.arg_names[arg_location.position]}",
+            f"{signature.arg_names[2]}",
            ctx.context,
        )
        return signature
@@ -347,11 +137,7 @@ def check_prometheus_metric_instantiation(
    #     ...
    # ]
    # ```
-    labelnames_arg_expression = (
+    labelnames_arg_expression = ctx.args[2][0] if len(ctx.args[2]) > 0 else None
        ctx.args[arg_location.position][0]
        if len(ctx.args[arg_location.position]) > 0
        else None
    )
    if isinstance(labelnames_arg_expression, (ListExpr, TupleExpr)):
        # Check if the `labelnames` argument includes the `server_name` label (`SERVER_NAME_LABEL`).
        for labelname_expression in labelnames_arg_expression.items:
@@ -690,13 +476,10 @@ def is_cacheable(
 def plugin(version: str) -> Type[SynapsePlugin]:
    global MypyPydanticPluginClass, MypyZopePluginClass
    # This is the entry point of the plugin, and lets us deal with the fact
    # that the mypy plugin interface is *not* stable by looking at the version
    # string.
    #
    # However, since we pin the version of mypy Synapse uses in CI, we don't
    # really care.
    MypyPydanticPluginClass = mypy_pydantic_plugin(version)
    MypyZopePluginClass = mypy_zope_plugin(version)
    return SynapsePlugin
--- a/synapse/_pydantic_compat.py
+++ b/synapse/_pydantic_compat.py
@@ -34,11 +34,9 @@ HAS_PYDANTIC_V2: bool = Version(pydantic_version).major == 2
 if TYPE_CHECKING or HAS_PYDANTIC_V2:
    from pydantic.v1 import (
        AnyHttpUrl,
        BaseModel,
        Extra,
        Field,
        FilePath,
        MissingError,
        PydanticValueError,
        StrictBool,
@@ -57,11 +55,9 @@ if TYPE_CHECKING or HAS_PYDANTIC_V2:
    from pydantic.v1.typing import get_args
 else:
    from pydantic import (
        AnyHttpUrl,
        BaseModel,
        Extra,
        Field,
        FilePath,
        MissingError,
        PydanticValueError,
        StrictBool,
@@ -81,7 +77,6 @@ else:
 __all__ = (
    "HAS_PYDANTIC_V2",
    "AnyHttpUrl",
    "BaseModel",
    "constr",
    "conbytes",
@@ -90,7 +85,6 @@ __all__ = (
    "ErrorWrapper",
    "Extra",
    "Field",
    "FilePath",
    "get_args",
    "MissingError",
    "parse_obj_as",
--- a/synapse/_scripts/register_new_matrix_user.py
+++ b/synapse/_scripts/register_new_matrix_user.py
@@ -30,7 +30,6 @@ from typing import Any, Callable, Dict, Optional
 import requests
 import yaml
 from typing_extensions import Never
 _CONFLICTING_SHARED_SECRET_OPTS_ERROR = """\
 Conflicting options 'registration_shared_secret' and 'registration_shared_secret_path'
@@ -41,10 +40,6 @@ _NO_SHARED_SECRET_OPTS_ERROR = """\
 No 'registration_shared_secret' or 'registration_shared_secret_path' defined in config.
 """
 _EMPTY_SHARED_SECRET_PATH_OPTS_ERROR = """\
 The secret given via `registration_shared_secret_path` must not be empty.
 """
 _DEFAULT_SERVER_URL = "http://localhost:8008"
@@ -175,12 +170,6 @@ def register_new_user(
    )
 def bail(err_msg: str) -> Never:
    """Prints the given message to stderr and exits."""
    print(err_msg, file=sys.stderr)
    sys.exit(1)
 def main() -> None:
    logging.captureWarnings(True)
@@ -273,20 +262,15 @@ def main() -> None:
        assert config is not None
        secret = config.get("registration_shared_secret")
        if not isinstance(secret, (str, type(None))):
            bail("registration_shared_secret is not a string.")
        secret_file = config.get("registration_shared_secret_path")
-        if not isinstance(secret_file, (str, type(None))):
+        if secret_file:
-            bail("registration_shared_secret_path is not a string.")
+            if secret:
-
+                print(_CONFLICTING_SHARED_SECRET_OPTS_ERROR, file=sys.stderr)
-        if not secret and not secret_file:
+                sys.exit(1)
            bail(_NO_SHARED_SECRET_OPTS_ERROR)
        elif secret and secret_file:
            bail(_CONFLICTING_SHARED_SECRET_OPTS_ERROR)
        elif not secret and secret_file:
            secret = _read_file(secret_file, "registration_shared_secret_path").strip()
-            if not secret:
+        if not secret:
-                bail(_EMPTY_SHARED_SECRET_PATH_OPTS_ERROR)
+            print(_NO_SHARED_SECRET_OPTS_ERROR, file=sys.stderr)
            sys.exit(1)
    if args.password_file:
        password = _read_file(args.password_file, "password-file").strip()
--- a/synapse/api/auth/init.py
+++ b/synapse/api/auth/init.py
@@ -20,13 +20,10 @@
 #
 from typing import TYPE_CHECKING, Optional, Protocol, Tuple
 from prometheus_client import Histogram
 from twisted.web.server import Request
 from synapse.appservice import ApplicationService
 from synapse.http.site import SynapseRequest
 from synapse.metrics import SERVER_NAME_LABEL
 from synapse.types import Requester
 if TYPE_CHECKING:
@@ -36,13 +33,6 @@ if TYPE_CHECKING:
 GUEST_DEVICE_ID = "guest_device"
 introspection_response_timer = Histogram(
    "synapse_api_auth_delegated_introspection_response",
    "Time taken to get a response for an introspection request",
    labelnames=["code", SERVER_NAME_LABEL],
 )
 class Auth(Protocol):
    """The interface that an auth provider must implement."""
--- a/synapse/api/auth/internal.py
+++ b/synapse/api/auth/internal.py
@@ -296,4 +296,4 @@ class InternalAuth(BaseAuth):
        Returns:
            True if the user is an admin
        """
-        return await self.store.is_server_admin(requester.user.to_string())
+        return await self.store.is_server_admin(requester.user)
--- a/synapse/api/auth/mas.py
+++ b/synapse/api/auth/mas.py
@@ -1,438 +0,0 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
 # Copyright (C) 2025 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # See the GNU Affero General Public License for more details:
 # <https://www.gnu.org/licenses/agpl-3.0.html>.
 #
 #
 import logging
 from typing import TYPE_CHECKING, Optional, Set
 from urllib.parse import urlencode
 from synapse._pydantic_compat import (
    BaseModel,
    Extra,
    StrictBool,
    StrictInt,
    StrictStr,
    ValidationError,
 )
 from synapse.api.auth.base import BaseAuth
 from synapse.api.errors import (
    AuthError,
    HttpResponseException,
    InvalidClientTokenError,
    SynapseError,
    UnrecognizedRequestError,
 )
 from synapse.http.site import SynapseRequest
 from synapse.logging.context import PreserveLoggingContext
 from synapse.logging.opentracing import (
    active_span,
    force_tracing,
    inject_request_headers,
    start_active_span,
 )
 from synapse.metrics import SERVER_NAME_LABEL
 from synapse.synapse_rust.http_client import HttpClient
 from synapse.types import JsonDict, Requester, UserID, create_requester
 from synapse.util import json_decoder
 from synapse.util.caches.cached_call import RetryOnExceptionCachedCall
 from synapse.util.caches.response_cache import ResponseCache, ResponseCacheContext
 from . import introspection_response_timer
 if TYPE_CHECKING:
    from synapse.rest.admin.experimental_features import ExperimentalFeature
    from synapse.server import HomeServer
 logger = logging.getLogger(__name__)
 # Scope as defined by MSC2967
 # https://github.com/matrix-org/matrix-spec-proposals/pull/2967
 UNSTABLE_SCOPE_MATRIX_API = "urn:matrix:org.matrix.msc2967.client:api:*"
 UNSTABLE_SCOPE_MATRIX_DEVICE_PREFIX = "urn:matrix:org.matrix.msc2967.client:device:"
 STABLE_SCOPE_MATRIX_API = "urn:matrix:client:api:*"
 STABLE_SCOPE_MATRIX_DEVICE_PREFIX = "urn:matrix:client:device:"
 class ServerMetadata(BaseModel):
    class Config:
        extra = Extra.allow
    issuer: StrictStr
    account_management_uri: StrictStr
 class IntrospectionResponse(BaseModel):
    retrieved_at_ms: StrictInt
    active: StrictBool
    scope: Optional[StrictStr]
    username: Optional[StrictStr]
    sub: Optional[StrictStr]
    device_id: Optional[StrictStr]
    expires_in: Optional[StrictInt]
    class Config:
        extra = Extra.allow
    def get_scope_set(self) -> set[str]:
        if not self.scope:
            return set()
        return {token for token in self.scope.split(" ") if token}
    def is_active(self, now_ms: int) -> bool:
        if not self.active:
            return False
        # Compatibility tokens don't expire and don't have an 'expires_in' field
        if self.expires_in is None:
            return True
        absolute_expiry_ms = self.expires_in * 1000 + self.retrieved_at_ms
        return now_ms < absolute_expiry_ms
 class MasDelegatedAuth(BaseAuth):
    def __init__(self, hs: "HomeServer"):
        super().__init__(hs)
        self.server_name = hs.hostname
        self._clock = hs.get_clock()
        self._config = hs.config.mas
        self._http_client = hs.get_proxied_http_client()
        self._rust_http_client = HttpClient(
            reactor=hs.get_reactor(),
            user_agent=self._http_client.user_agent.decode("utf8"),
        )
        self._server_metadata = RetryOnExceptionCachedCall[ServerMetadata](
            self._load_metadata
        )
        self._force_tracing_for_users = hs.config.tracing.force_tracing_for_users
        # # Token Introspection Cache
        # This remembers what users/devices are represented by which access tokens,
        # in order to reduce overall system load:
        # - on Synapse (as requests are relatively expensive)
        # - on the network
        # - on MAS
        #
        # Since there is no invalidation mechanism currently,
        # the entries expire after 2 minutes.
        # This does mean tokens can be treated as valid by Synapse
        # for longer than reality.
        #
        # Ideally, tokens should logically be invalidated in the following circumstances:
        # - If a session logout happens.
        #   In this case, MAS will delete the device within Synapse
        #   anyway and this is good enough as an invalidation.
        # - If the client refreshes their token in MAS.
        #   In this case, the device still exists and it's not the end of the world for
        #   the old access token to continue working for a short time.
        self._introspection_cache: ResponseCache[str] = ResponseCache(
            clock=self._clock,
            name="mas_token_introspection",
            server_name=self.server_name,
            timeout_ms=120_000,
            # don't log because the keys are access tokens
            enable_logging=False,
        )
    @property
    def _metadata_url(self) -> str:
        return f"{self._config.endpoint.rstrip('/')}/.well-known/openid-configuration"
    @property
    def _introspection_endpoint(self) -> str:
        return f"{self._config.endpoint.rstrip('/')}/oauth2/introspect"
    async def _load_metadata(self) -> ServerMetadata:
        response = await self._http_client.get_json(self._metadata_url)
        metadata = ServerMetadata(**response)
        return metadata
    async def issuer(self) -> str:
        metadata = await self._server_metadata.get()
        return metadata.issuer
    async def account_management_url(self) -> str:
        metadata = await self._server_metadata.get()
        return metadata.account_management_uri
    async def auth_metadata(self) -> JsonDict:
        metadata = await self._server_metadata.get()
        return metadata.dict()
    def is_request_using_the_shared_secret(self, request: SynapseRequest) -> bool:
        """
        Check if the request is using the shared secret.
        Args:
            request: The request to check.
        Returns:
            True if the request is using the shared secret, False otherwise.
        """
        access_token = self.get_access_token_from_request(request)
        shared_secret = self._config.secret()
        if not shared_secret:
            return False
        return access_token == shared_secret
    async def _introspect_token(
        self, token: str, cache_context: ResponseCacheContext[str]
    ) -> IntrospectionResponse:
        """
        Send a token to the introspection endpoint and returns the introspection response
        Parameters:
            token: The token to introspect
        Raises:
            HttpResponseException: If the introspection endpoint returns a non-2xx response
            ValueError: If the introspection endpoint returns an invalid JSON response
            JSONDecodeError: If the introspection endpoint returns a non-JSON response
            Exception: If the HTTP request fails
        Returns:
            The introspection response
        """
        # By default, we shouldn't cache the result unless we know it's valid
        cache_context.should_cache = False
        raw_headers: dict[str, str] = {
            "Content-Type": "application/x-www-form-urlencoded",
            "Accept": "application/json",
            "Authorization": f"Bearer {self._config.secret()}",
            # Tell MAS that we support reading the device ID as an explicit
            # value, not encoded in the scope. This is supported by MAS 0.15+
            "X-MAS-Supports-Device-Id": "1",
        }
        args = {"token": token, "token_type_hint": "access_token"}
        body = urlencode(args, True)
        # Do the actual request
        logger.debug("Fetching token from MAS")
        start_time = self._clock.time()
        try:
            with start_active_span("mas-introspect-token"):
                inject_request_headers(raw_headers)
                with PreserveLoggingContext():
                    resp_body = await self._rust_http_client.post(
                        url=self._introspection_endpoint,
                        response_limit=1 * 1024 * 1024,
                        headers=raw_headers,
                        request_body=body,
                    )
        except HttpResponseException as e:
            end_time = self._clock.time()
            introspection_response_timer.labels(
                code=e.code, **{SERVER_NAME_LABEL: self.server_name}
            ).observe(end_time - start_time)
            raise
        except Exception:
            end_time = self._clock.time()
            introspection_response_timer.labels(
                code="ERR", **{SERVER_NAME_LABEL: self.server_name}
            ).observe(end_time - start_time)
            raise
        logger.debug("Fetched token from MAS")
        end_time = self._clock.time()
        introspection_response_timer.labels(
            code=200, **{SERVER_NAME_LABEL: self.server_name}
        ).observe(end_time - start_time)
        raw_response = json_decoder.decode(resp_body.decode("utf-8"))
        try:
            response = IntrospectionResponse(
                retrieved_at_ms=self._clock.time_msec(),
                **raw_response,
            )
        except ValidationError as e:
            raise ValueError(
                "The introspection endpoint returned an invalid JSON response"
            ) from e
        # We had a valid response, so we can cache it
        cache_context.should_cache = True
        return response
    async def is_server_admin(self, requester: Requester) -> bool:
        return "urn:synapse:admin:*" in requester.scope
    async def get_user_by_req(
        self,
        request: SynapseRequest,
        allow_guest: bool = False,
        allow_expired: bool = False,
        allow_locked: bool = False,
    ) -> Requester:
        parent_span = active_span()
        with start_active_span("get_user_by_req"):
            access_token = self.get_access_token_from_request(request)
            requester = await self.get_appservice_user(request, access_token)
            if not requester:
                requester = await self.get_user_by_access_token(
                    token=access_token,
                    allow_expired=allow_expired,
                )
            await self._record_request(request, requester)
            request.requester = requester
            if parent_span:
                if requester.authenticated_entity in self._force_tracing_for_users:
                    # request tracing is enabled for this user, so we need to force it
                    # tracing on for the parent span (which will be the servlet span).
                    #
                    # It's too late for the get_user_by_req span to inherit the setting,
                    # so we also force it on for that.
                    force_tracing()
                    force_tracing(parent_span)
                parent_span.set_tag(
                    "authenticated_entity", requester.authenticated_entity
                )
                parent_span.set_tag("user_id", requester.user.to_string())
                if requester.device_id is not None:
                    parent_span.set_tag("device_id", requester.device_id)
                if requester.app_service is not None:
                    parent_span.set_tag("appservice_id", requester.app_service.id)
            return requester
    async def get_user_by_access_token(
        self,
        token: str,
        allow_expired: bool = False,
    ) -> Requester:
        try:
            introspection_result = await self._introspection_cache.wrap(
                token, self._introspect_token, token, cache_context=True
            )
        except Exception:
            logger.exception("Failed to introspect token")
            raise SynapseError(503, "Unable to introspect the access token")
        logger.debug("Introspection result: %r", introspection_result)
        if not introspection_result.is_active(self._clock.time_msec()):
            raise InvalidClientTokenError("Token is not active")
        # Let's look at the scope
        scope = introspection_result.get_scope_set()
        # Determine type of user based on presence of particular scopes
        if (
            UNSTABLE_SCOPE_MATRIX_API not in scope
            and STABLE_SCOPE_MATRIX_API not in scope
        ):
            raise InvalidClientTokenError(
                "Token doesn't grant access to the Matrix C-S API"
            )
        if introspection_result.username is None:
            raise AuthError(
                500,
                "Invalid username claim in the introspection result",
            )
        user_id = UserID(
            localpart=introspection_result.username,
            domain=self.server_name,
        )
        # Try to find a user from the username claim
        user_info = await self.store.get_user_by_id(user_id=user_id.to_string())
        if user_info is None:
            raise AuthError(
                500,
                "User not found",
            )
        # MAS will give us the device ID as an explicit value for *compatibility* sessions
        # If present, we get it from here, if not we get it in the scope for next-gen sessions
        device_id = introspection_result.device_id
        if device_id is None:
            # Find device_ids in scope
            # We only allow a single device_id in the scope, so we find them all in the
            # scope list, and raise if there are more than one. The OIDC server should be
            # the one enforcing valid scopes, so we raise a 500 if we find an invalid scope.
            device_ids: Set[str] = set()
            for tok in scope:
                if tok.startswith(UNSTABLE_SCOPE_MATRIX_DEVICE_PREFIX):
                    device_ids.add(tok[len(UNSTABLE_SCOPE_MATRIX_DEVICE_PREFIX) :])
                elif tok.startswith(STABLE_SCOPE_MATRIX_DEVICE_PREFIX):
                    device_ids.add(tok[len(STABLE_SCOPE_MATRIX_DEVICE_PREFIX) :])
            if len(device_ids) > 1:
                raise AuthError(
                    500,
                    "Multiple device IDs in scope",
                )
            device_id = next(iter(device_ids), None)
        if device_id is not None:
            # Sanity check the device_id
            if len(device_id) > 255 or len(device_id) < 1:
                raise AuthError(
                    500,
                    "Invalid device ID in introspection result",
                )
            # Make sure the device exists. This helps with introspection cache
            # invalidation: if we log out, the device gets deleted by MAS
            device = await self.store.get_device(
                user_id=user_id.to_string(),
                device_id=device_id,
            )
            if device is None:
                # Invalidate the introspection cache, the device was deleted
                self._introspection_cache.unset(token)
                raise InvalidClientTokenError("Token is not active")
        return create_requester(
            user_id=user_id,
            device_id=device_id,
            scope=scope,
        )
    async def get_user_by_req_experimental_feature(
        self,
        request: SynapseRequest,
        feature: "ExperimentalFeature",
        allow_guest: bool = False,
        allow_expired: bool = False,
        allow_locked: bool = False,
    ) -> Requester:
        try:
            requester = await self.get_user_by_req(
                request,
                allow_guest=allow_guest,
                allow_expired=allow_expired,
                allow_locked=allow_locked,
            )
            if await self.store.is_feature_enabled(requester.user.to_string(), feature):
                return requester
            raise UnrecognizedRequestError(code=404)
        except (AuthError, InvalidClientTokenError):
            if feature.is_globally_enabled(self.hs.config):
                # If its globally enabled then return the auth error
                raise
            raise UnrecognizedRequestError(code=404)
--- a/synapse/api/auth/msc3861_delegated.py
+++ b/synapse/api/auth/msc3861_delegated.py
@@ -20,7 +20,7 @@
 #
 import logging
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Set
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional
 from urllib.parse import urlencode
 from authlib.oauth2 import ClientAuth
@@ -28,12 +28,14 @@ from authlib.oauth2.auth import encode_client_secret_basic, encode_client_secret
 from authlib.oauth2.rfc7523 import ClientSecretJWT, PrivateKeyJWT, private_key_jwt_sign
 from authlib.oauth2.rfc7662 import IntrospectionToken
 from authlib.oidc.discovery import OpenIDProviderMetadata, get_well_known_url
 from prometheus_client import Histogram
 from synapse.api.auth.base import BaseAuth
 from synapse.api.errors import (
    AuthError,
    HttpResponseException,
    InvalidClientTokenError,
    OAuthInsufficientScopeError,
    SynapseError,
    UnrecognizedRequestError,
 )
@@ -52,20 +54,24 @@ from synapse.util import json_decoder
 from synapse.util.caches.cached_call import RetryOnExceptionCachedCall
 from synapse.util.caches.response_cache import ResponseCache, ResponseCacheContext
 from . import introspection_response_timer
 if TYPE_CHECKING:
    from synapse.rest.admin.experimental_features import ExperimentalFeature
    from synapse.server import HomeServer
 logger = logging.getLogger(__name__)
 introspection_response_timer = Histogram(
    "synapse_api_auth_delegated_introspection_response",
    "Time taken to get a response for an introspection request",
    labelnames=["code", SERVER_NAME_LABEL],
 )
 # Scope as defined by MSC2967
 # https://github.com/matrix-org/matrix-spec-proposals/pull/2967
-UNSTABLE_SCOPE_MATRIX_API = "urn:matrix:org.matrix.msc2967.client:api:*"
+SCOPE_MATRIX_API = "urn:matrix:org.matrix.msc2967.client:api:*"
-UNSTABLE_SCOPE_MATRIX_DEVICE_PREFIX = "urn:matrix:org.matrix.msc2967.client:device:"
+SCOPE_MATRIX_GUEST = "urn:matrix:org.matrix.msc2967.client:api:guest"
-STABLE_SCOPE_MATRIX_API = "urn:matrix:client:api:*"
+SCOPE_MATRIX_DEVICE_PREFIX = "urn:matrix:org.matrix.msc2967.client:device:"
 STABLE_SCOPE_MATRIX_DEVICE_PREFIX = "urn:matrix:client:device:"
 # Scope which allows access to the Synapse admin API
 SCOPE_SYNAPSE_ADMIN = "urn:synapse:admin:*"
@@ -444,6 +450,9 @@ class MSC3861DelegatedAuth(BaseAuth):
        if not self._is_access_token_the_admin_token(access_token):
            await self._record_request(request, requester)
        if not allow_guest and requester.is_guest:
            raise OAuthInsufficientScopeError([SCOPE_MATRIX_API])
        request.requester = requester
        return requester
@@ -525,11 +534,10 @@ class MSC3861DelegatedAuth(BaseAuth):
        scope: List[str] = introspection_result.get_scope_list()
        # Determine type of user based on presence of particular scopes
-        has_user_scope = (
+        has_user_scope = SCOPE_MATRIX_API in scope
-            UNSTABLE_SCOPE_MATRIX_API in scope or STABLE_SCOPE_MATRIX_API in scope
+        has_guest_scope = SCOPE_MATRIX_GUEST in scope
        )
-        if not has_user_scope:
+        if not has_user_scope and not has_guest_scope:
            raise InvalidClientTokenError("No scope in token granting user rights")
        # Match via the sub claim
@@ -577,12 +585,11 @@ class MSC3861DelegatedAuth(BaseAuth):
            # We only allow a single device_id in the scope, so we find them all in the
            # scope list, and raise if there are more than one. The OIDC server should be
            # the one enforcing valid scopes, so we raise a 500 if we find an invalid scope.
-            device_ids: Set[str] = set()
+            device_ids = [
-            for tok in scope:
+                tok[len(SCOPE_MATRIX_DEVICE_PREFIX) :]
-                if tok.startswith(UNSTABLE_SCOPE_MATRIX_DEVICE_PREFIX):
+                for tok in scope
-                    device_ids.add(tok[len(UNSTABLE_SCOPE_MATRIX_DEVICE_PREFIX) :])
+                if tok.startswith(SCOPE_MATRIX_DEVICE_PREFIX)
-                elif tok.startswith(STABLE_SCOPE_MATRIX_DEVICE_PREFIX):
+            ]
                    device_ids.add(tok[len(STABLE_SCOPE_MATRIX_DEVICE_PREFIX) :])
            if len(device_ids) > 1:
                raise AuthError(
@@ -590,7 +597,7 @@ class MSC3861DelegatedAuth(BaseAuth):
                    "Multiple device IDs in scope",
                )
-            device_id = next(iter(device_ids), None)
+            device_id = device_ids[0] if device_ids else None
        if device_id is not None:
            # Sanity check the device_id
@@ -616,4 +623,5 @@ class MSC3861DelegatedAuth(BaseAuth):
            user_id=user_id,
            device_id=device_id,
            scope=scope,
            is_guest=(has_guest_scope and not has_user_scope),
        )
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -46,9 +46,6 @@ MAX_USERID_LENGTH = 255
 # Constant value used for the pseudo-thread which is the main timeline.
 MAIN_TIMELINE: Final = "main"
 # MAX_INT + 1, so it always trumps any PL in canonical JSON.
 CREATOR_POWER_LEVEL = 2**53
 class Membership:
    """Represents the membership states of a user in a room."""
@@ -238,8 +235,6 @@ class EventContentFields:
    #
    # This is deprecated in MSC2175.
    ROOM_CREATOR: Final = "creator"
    # MSC4289
    ADDITIONAL_CREATORS: Final = "additional_creators"
    # The version of the room for `m.room.create` events.
    ROOM_VERSION: Final = "room_version"
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -140,12 +140,6 @@ class Codes(str, Enum):
    # Part of MSC4155
    INVITE_BLOCKED = "ORG.MATRIX.MSC4155.M_INVITE_BLOCKED"
    # Part of MSC4306: Thread Subscriptions
    MSC4306_CONFLICTING_UNSUBSCRIPTION = (
        "IO.ELEMENT.MSC4306.M_CONFLICTING_UNSUBSCRIPTION"
    )
    MSC4306_NOT_IN_THREAD = "IO.ELEMENT.MSC4306.M_NOT_IN_THREAD"
 class CodeMessageException(RuntimeError):
    """An exception with integer code, a message string attributes and optional headers.
--- a/synapse/api/room_versions.py
+++ b/synapse/api/room_versions.py
@@ -36,14 +36,12 @@ class EventFormatVersions:
    ROOM_V1_V2 = 1  # $id:server event id format: used for room v1 and v2
    ROOM_V3 = 2  # MSC1659-style $hash event id format: used for room v3
    ROOM_V4_PLUS = 3  # MSC1884-style $hash format: introduced for room v4
    ROOM_V11_HYDRA_PLUS = 4  # MSC4291 room IDs as hashes: introduced for room HydraV11
 KNOWN_EVENT_FORMAT_VERSIONS = {
    EventFormatVersions.ROOM_V1_V2,
    EventFormatVersions.ROOM_V3,
    EventFormatVersions.ROOM_V4_PLUS,
    EventFormatVersions.ROOM_V11_HYDRA_PLUS,
 }
@@ -52,7 +50,6 @@ class StateResolutionVersions:
    V1 = 1  # room v1 state res
    V2 = 2  # MSC1442 state res: room v2 and later
    V2_1 = 3  # MSC4297 state res
 class RoomDisposition:
@@ -112,10 +109,6 @@ class RoomVersion:
    msc3931_push_features: Tuple[str, ...]  # values from PushRuleRoomFlag
    # MSC3757: Restricting who can overwrite a state event
    msc3757_enabled: bool
    # MSC4289: Creator power enabled
    msc4289_creator_power_enabled: bool
    # MSC4291: Room IDs as hashes of the create event
    msc4291_room_ids_as_hashes: bool
 class RoomVersions:
@@ -138,8 +131,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V2 = RoomVersion(
        "2",
@@ -160,8 +151,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V3 = RoomVersion(
        "3",
@@ -182,8 +171,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V4 = RoomVersion(
        "4",
@@ -204,8 +191,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V5 = RoomVersion(
        "5",
@@ -226,8 +211,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V6 = RoomVersion(
        "6",
@@ -248,8 +231,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V7 = RoomVersion(
        "7",
@@ -270,8 +251,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V8 = RoomVersion(
        "8",
@@ -292,8 +271,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V9 = RoomVersion(
        "9",
@@ -314,8 +291,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V10 = RoomVersion(
        "10",
@@ -336,8 +311,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    MSC1767v10 = RoomVersion(
        # MSC1767 (Extensible Events) based on room version "10"
@@ -359,8 +332,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(PushRuleRoomFlag.EXTENSIBLE_EVENTS,),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    MSC3757v10 = RoomVersion(
        # MSC3757 (Restricting who can overwrite a state event) based on room version "10"
@@ -382,8 +353,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=True,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    V11 = RoomVersion(
        "11",
@@ -404,8 +373,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    MSC3757v11 = RoomVersion(
        # MSC3757 (Restricting who can overwrite a state event) based on room version "11"
@@ -427,52 +394,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=True,
        msc4289_creator_power_enabled=False,
        msc4291_room_ids_as_hashes=False,
    )
    HydraV11 = RoomVersion(
        "org.matrix.hydra.11",
        RoomDisposition.UNSTABLE,
        EventFormatVersions.ROOM_V11_HYDRA_PLUS,
        StateResolutionVersions.V2_1,  # Changed from v11
        enforce_key_validity=True,
        special_case_aliases_auth=False,
        strict_canonicaljson=True,
        limit_notifications_power_levels=True,
        implicit_room_creator=True,  # Used by MSC3820
        updated_redaction_rules=True,  # Used by MSC3820
        restricted_join_rule=True,
        restricted_join_rule_fix=True,
        knock_join_rule=True,
        msc3389_relation_redactions=False,
        knock_restricted_join_rule=True,
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=True,  # Changed from v11
        msc4291_room_ids_as_hashes=True,  # Changed from v11
    )
    V12 = RoomVersion(
        "12",
        RoomDisposition.STABLE,
        EventFormatVersions.ROOM_V11_HYDRA_PLUS,
        StateResolutionVersions.V2_1,  # Changed from v11
        enforce_key_validity=True,
        special_case_aliases_auth=False,
        strict_canonicaljson=True,
        limit_notifications_power_levels=True,
        implicit_room_creator=True,  # Used by MSC3820
        updated_redaction_rules=True,  # Used by MSC3820
        restricted_join_rule=True,
        restricted_join_rule_fix=True,
        knock_join_rule=True,
        msc3389_relation_redactions=False,
        knock_restricted_join_rule=True,
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=False,
        msc4289_creator_power_enabled=True,  # Changed from v11
        msc4291_room_ids_as_hashes=True,  # Changed from v11
    )
@@ -490,10 +411,8 @@ KNOWN_ROOM_VERSIONS: Dict[str, RoomVersion] = {
        RoomVersions.V9,
        RoomVersions.V10,
        RoomVersions.V11,
        RoomVersions.V12,
        RoomVersions.MSC3757v10,
        RoomVersions.MSC3757v11,
        RoomVersions.HydraV11,
    )
 }
--- a/synapse/config/_base.pyi
+++ b/synapse/config/_base.pyi
@@ -36,7 +36,6 @@ from synapse.config import (  # noqa: F401
    jwt,
    key,
    logger,
    mas,
    metrics,
    modules,
    oembed,
@@ -125,7 +124,6 @@ class RootConfig:
    background_updates: background_updates.BackgroundUpdateConfig
    auto_accept_invites: auto_accept_invites.AutoAcceptInvitesConfig
    user_types: user_types.UserTypesConfig
    mas: mas.MasConfig
    config_classes: List[Type["Config"]] = ...
    config_files: List[str]
--- a/synapse/config/auth.py
+++ b/synapse/config/auth.py
@@ -36,14 +36,13 @@ class AuthConfig(Config):
        if password_config is None:
            password_config = {}
-        auth_delegated = (config.get("experimental_features") or {}).get(
+        # The default value of password_config.enabled is True, unless msc3861 is enabled.
-            "msc3861", {}
+        msc3861_enabled = (
-        ).get("enabled", False) or (
+            (config.get("experimental_features") or {})
-            config.get("matrix_authentication_service") or {}
+            .get("msc3861", {})
-        ).get("enabled", False)
+            .get("enabled", False)
-
+        )
-        # The default value of password_config.enabled is True, unless auth is delegated
+        passwords_enabled = password_config.get("enabled", not msc3861_enabled)
        passwords_enabled = password_config.get("enabled", not auth_delegated)
        # 'only_for_reauth' allows users who have previously set a password to use it,
        # even though passwords would otherwise be disabled.
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -535,15 +535,11 @@ class ExperimentalConfig(Config):
            "msc4108_delegation_endpoint", None
        )
        auth_delegated = self.msc3861.enabled or (
            config.get("matrix_authentication_service") or {}
        ).get("enabled", False)
        if (
            self.msc4108_enabled or self.msc4108_delegation_endpoint is not None
-        ) and not auth_delegated:
+        ) and not self.msc3861.enabled:
            raise ConfigError(
-                "MSC4108 requires MSC3861 or matrix_authentication_service to be enabled",
+                "MSC4108 requires MSC3861 to be enabled",
                ("experimental", "msc4108_delegation_endpoint"),
            )
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -36,7 +36,6 @@ from .federation import FederationConfig
 from .jwt import JWTConfig
 from .key import KeyConfig
 from .logger import LoggingConfig
 from .mas import MasConfig
 from .metrics import MetricsConfig
 from .modules import ModulesConfig
 from .oembed import OembedConfig
@@ -110,6 +109,4 @@ class HomeServerConfig(RootConfig):
        BackgroundUpdateConfig,
        AutoAcceptInvitesConfig,
        UserTypesConfig,
        # This must be last, as it checks for conflicts with other config options.
        MasConfig,
    ]
--- a/synapse/config/mas.py
+++ b/synapse/config/mas.py
@@ -1,192 +0,0 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
 # Copyright (C) 2025 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # See the GNU Affero General Public License for more details:
 # <https://www.gnu.org/licenses/agpl-3.0.html>.
 #
 #
 from typing import Any, Optional
 from synapse._pydantic_compat import (
    AnyHttpUrl,
    Field,
    FilePath,
    StrictBool,
    StrictStr,
    ValidationError,
    validator,
 )
 from synapse.config.experimental import read_secret_from_file_once
 from synapse.types import JsonDict
 from synapse.util.pydantic_models import ParseModel
 from ._base import Config, ConfigError, RootConfig
 class MasConfigModel(ParseModel):
    enabled: StrictBool = False
    endpoint: AnyHttpUrl = Field(default="http://localhost:8080")
    secret: Optional[StrictStr] = Field(default=None)
    secret_path: Optional[FilePath] = Field(default=None)
    @validator("secret")
    def validate_secret_is_set_if_enabled(cls, v: Any, values: dict) -> Any:
        if values.get("enabled", False) and not values.get("secret_path") and not v:
            raise ValueError(
                "You must set a `secret` or `secret_path` when enabling Matrix Authentication Service integration."
            )
        return v
    @validator("secret_path")
    def validate_secret_path_is_set_if_enabled(cls, v: Any, values: dict) -> Any:
        if values.get("secret"):
            raise ValueError(
                "`secret` and `secret_path` cannot be set at the same time."
            )
        return v
 class MasConfig(Config):
    section = "mas"
    def read_config(
        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
    ) -> None:
        mas_config = config.get("matrix_authentication_service", {})
        if mas_config is None:
            mas_config = {}
        try:
            parsed = MasConfigModel(**mas_config)
        except ValidationError as e:
            raise ConfigError(
                "Could not validate Matrix Authentication Service configuration",
                path=("matrix_authentication_service",),
            ) from e
        if parsed.secret and not allow_secrets_in_config:
            raise ConfigError(
                "Config options that expect an in-line secret as value are disabled",
                ("matrix_authentication_service", "secret"),
            )
        self.enabled = parsed.enabled
        self.endpoint = parsed.endpoint
        self._secret = parsed.secret
        self._secret_path = parsed.secret_path
        self.check_config_conflicts(self.root)
    def check_config_conflicts(
        self,
        root: RootConfig,
    ) -> None:
        """Checks for any configuration conflicts with other parts of Synapse.
        Raises:
            ConfigError: If there are any configuration conflicts.
        """
        if not self.enabled:
            return
        if root.experimental.msc3861.enabled:
            raise ConfigError(
                "Experimental MSC3861 was replaced by Matrix Authentication Service."
                "Please disable MSC3861 or disable Matrix Authentication Service.",
                ("experimental", "msc3861"),
            )
        if (
            root.auth.password_enabled_for_reauth
            or root.auth.password_enabled_for_login
        ):
            raise ConfigError(
                "Password auth cannot be enabled when OAuth delegation is enabled",
                ("password_config", "enabled"),
            )
        if root.registration.enable_registration:
            raise ConfigError(
                "Registration cannot be enabled when OAuth delegation is enabled",
                ("enable_registration",),
            )
        # We only need to test the user consent version, as if it must be set if the user_consent section was present in the config
        if root.consent.user_consent_version is not None:
            raise ConfigError(
                "User consent cannot be enabled when OAuth delegation is enabled",
                ("user_consent",),
            )
        if (
            root.oidc.oidc_enabled
            or root.saml2.saml2_enabled
            or root.cas.cas_enabled
            or root.jwt.jwt_enabled
        ):
            raise ConfigError("SSO cannot be enabled when OAuth delegation is enabled")
        if bool(root.authproviders.password_providers):
            raise ConfigError(
                "Password auth providers cannot be enabled when OAuth delegation is enabled"
            )
        if root.captcha.enable_registration_captcha:
            raise ConfigError(
                "CAPTCHA cannot be enabled when OAuth delegation is enabled",
                ("captcha", "enable_registration_captcha"),
            )
        if root.auth.login_via_existing_enabled:
            raise ConfigError(
                "Login via existing session cannot be enabled when OAuth delegation is enabled",
                ("login_via_existing_session", "enabled"),
            )
        if root.registration.refresh_token_lifetime:
            raise ConfigError(
                "refresh_token_lifetime cannot be set when OAuth delegation is enabled",
                ("refresh_token_lifetime",),
            )
        if root.registration.nonrefreshable_access_token_lifetime:
            raise ConfigError(
                "nonrefreshable_access_token_lifetime cannot be set when OAuth delegation is enabled",
                ("nonrefreshable_access_token_lifetime",),
            )
        if root.registration.session_lifetime:
            raise ConfigError(
                "session_lifetime cannot be set when OAuth delegation is enabled",
                ("session_lifetime",),
            )
        if root.registration.enable_3pid_changes:
            raise ConfigError(
                "enable_3pid_changes cannot be enabled when OAuth delegation is enabled",
                ("enable_3pid_changes",),
            )
    def secret(self) -> str:
        if self._secret is not None:
            return self._secret
        elif self._secret_path is not None:
            return read_secret_from_file_once(
                str(self._secret_path),
                ("matrix_authentication_service", "secret_path"),
            )
        else:
            raise RuntimeError(
                "Neither `secret` nor `secret_path` are set, this is a bug.",
            )
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -148,14 +148,15 @@ class RegistrationConfig(Config):
        self.enable_set_displayname = config.get("enable_set_displayname", True)
        self.enable_set_avatar_url = config.get("enable_set_avatar_url", True)
        auth_delegated = (config.get("experimental_features") or {}).get(
            "msc3861", {}
        ).get("enabled", False) or (
            config.get("matrix_authentication_service") or {}
        ).get("enabled", False)
        # The default value of enable_3pid_changes is True, unless msc3861 is enabled.
-        self.enable_3pid_changes = config.get("enable_3pid_changes", not auth_delegated)
+        msc3861_enabled = (
            (config.get("experimental_features") or {})
            .get("msc3861", {})
            .get("enabled", False)
        )
        self.enable_3pid_changes = config.get(
            "enable_3pid_changes", not msc3861_enabled
        )
        self.disable_msisdn_registration = config.get(
            "disable_msisdn_registration", False
--- a/synapse/crypto/event_signing.py
+++ b/synapse/crypto/event_signing.py
@@ -101,9 +101,6 @@ def compute_content_hash(
    event_dict.pop("outlier", None)
    event_dict.pop("destinations", None)
    # N.B. no need to pop the room_id from create events in MSC4291 rooms
    # as they shouldn't have one.
    event_json_bytes = encode_canonical_json(event_dict)
    hashed = hash_algorithm(event_json_bytes)
--- a/synapse/event_auth.py
+++ b/synapse/event_auth.py
@@ -45,7 +45,6 @@ from signedjson.sign import SignatureVerifyException, verify_signed_json
 from unpaddedbase64 import decode_base64
 from synapse.api.constants import (
    CREATOR_POWER_LEVEL,
    MAX_PDU_SIZE,
    EventContentFields,
    EventTypes,
@@ -65,7 +64,6 @@ from synapse.api.room_versions import (
    RoomVersion,
    RoomVersions,
 )
 from synapse.events import is_creator
 from synapse.state import CREATE_KEY
 from synapse.storage.databases.main.events_worker import EventRedactBehaviour
 from synapse.types import (
@@ -263,8 +261,7 @@ async def check_state_independent_auth_rules(
                f"Event {event.event_id} has unexpected auth_event for {k}: {auth_event_id}",
            )
-        # 2.3 ... If there are entries which were themselves rejected under the checks performed on receipt
+        # We also need to check that the auth event itself is not rejected.
        # of a PDU, reject.
        if auth_event.rejected_reason:
            raise AuthError(
                403,
@@ -274,7 +271,7 @@ async def check_state_independent_auth_rules(
        auth_dict[k] = auth_event_id
-    # 2.4. If event does not have a m.room.create in its auth_events, reject.
+    # 3. If event does not have a m.room.create in its auth_events, reject.
    creation_event = auth_dict.get((EventTypes.Create, ""), None)
    if not creation_event:
        raise AuthError(403, "No create event in auth events")
@@ -314,14 +311,13 @@ def check_state_dependent_auth_rules(
    # Later code relies on there being a create event e.g _can_federate, _is_membership_change_allowed
    # so produce a more intelligible error if we don't have one.
-    create_event = auth_dict.get(CREATE_KEY)
+    if auth_dict.get(CREATE_KEY) is None:
    if create_event is None:
        raise AuthError(
            403, f"Event {event.event_id} is missing a create event in auth_events."
        )
    # additional check for m.federate
-    creating_domain = get_domain_from_id(create_event.sender)
+    creating_domain = get_domain_from_id(event.room_id)
    originating_domain = get_domain_from_id(event.sender)
    if creating_domain != originating_domain:
        if not _can_federate(event, auth_dict):
@@ -474,20 +470,12 @@ def _check_create(event: "EventBase") -> None:
    if event.prev_event_ids():
        raise AuthError(403, "Create event has prev events")
-    if event.room_version.msc4291_room_ids_as_hashes:
+    # 1.2 If the domain of the room_id does not match the domain of the sender,
-        # 1.2 If the create event has a room_id, reject
+    # reject.
-        if "room_id" in event:
+    sender_domain = get_domain_from_id(event.sender)
-            raise AuthError(403, "Create event has a room_id")
+    room_id_domain = get_domain_from_id(event.room_id)
-    else:
+    if room_id_domain != sender_domain:
-        # 1.2 If the domain of the room_id does not match the domain of the sender,
+        raise AuthError(403, "Creation event's room_id domain does not match sender's")
        # reject.
        if not event.room_version.msc4291_room_ids_as_hashes:
            sender_domain = get_domain_from_id(event.sender)
            room_id_domain = get_domain_from_id(event.room_id)
            if room_id_domain != sender_domain:
                raise AuthError(
                    403, "Creation event's room_id domain does not match sender's"
                )
    # 1.3 If content.room_version is present and is not a recognised version, reject
    room_version_prop = event.content.get("room_version", "1")
@@ -504,16 +492,6 @@ def _check_create(event: "EventBase") -> None:
    ):
        raise AuthError(403, "Create event lacks a 'creator' property")
    # 1.5 If the additional_creators field is present and is not an array of strings where each
    # string is a valid user ID, reject.
    if (
        event.room_version.msc4289_creator_power_enabled
        and EventContentFields.ADDITIONAL_CREATORS in event.content
    ):
        check_valid_additional_creators(
            event.content[EventContentFields.ADDITIONAL_CREATORS]
        )
 def _can_federate(event: "EventBase", auth_events: StateMap["EventBase"]) -> bool:
    creation_event = auth_events.get((EventTypes.Create, ""))
@@ -555,13 +533,7 @@ def _is_membership_change_allowed(
    target_user_id = event.state_key
-    # We need the create event in order to check if we can federate or not.
+    creating_domain = get_domain_from_id(event.room_id)
    # If it's missing, yell loudly. Previously we only did this inside the
    # _can_federate check.
    create_event = auth_events.get((EventTypes.Create, ""))
    if not create_event:
        raise AuthError(403, "Create event missing from auth_events")
    creating_domain = get_domain_from_id(create_event.sender)
    target_domain = get_domain_from_id(target_user_id)
    if creating_domain != target_domain:
        if not _can_federate(event, auth_events):
@@ -931,32 +903,6 @@ def _check_power_levels(
        except Exception:
            raise SynapseError(400, "Not a valid power level: %s" % (v,))
    if room_version_obj.msc4289_creator_power_enabled:
        # Enforce the creator does not appear in the users map
        create_event = auth_events.get((EventTypes.Create, ""))
        if not create_event:
            raise SynapseError(
                400, "Cannot check power levels without a create event in auth_events"
            )
        if create_event.sender in user_list:
            raise SynapseError(
                400,
                "Creator user %s must not appear in content.users"
                % (create_event.sender,),
            )
        additional_creators = create_event.content.get(
            EventContentFields.ADDITIONAL_CREATORS, []
        )
        if additional_creators:
            creators_in_user_list = set(additional_creators).intersection(
                set(user_list)
            )
            if len(creators_in_user_list) > 0:
                raise SynapseError(
                    400,
                    "Additional creators users must not appear in content.users",
                )
    # Reject events with stringy power levels if required by room version
    if (
        event.type == EventTypes.PowerLevels
@@ -1082,9 +1028,6 @@ def get_user_power_level(user_id: str, auth_events: StateMap["EventBase"]) -> in
        "A create event in the auth events chain is required to calculate user power level correctly,"
        " but was not found. This indicates a bug"
    )
    if create_event.room_version.msc4289_creator_power_enabled:
        if is_creator(create_event, user_id):
            return CREATOR_POWER_LEVEL
    power_level_event = get_power_level_event(auth_events)
    if power_level_event:
        level = power_level_event.content.get("users", {}).get(user_id)
@@ -1245,26 +1188,3 @@ def auth_types_for_event(
                auth_types.add(key)
    return auth_types
 def check_valid_additional_creators(additional_creators: Any) -> None:
    """Check if the additional_creators provided is valid according to MSC4289.
    The additional_creators can be supplied from an m.room.create event or from an /upgrade request.
    Raises:
        AuthError if the additional_creators is invalid for some reason.
    """
    if type(additional_creators) is not list:
        raise AuthError(400, "additional_creators must be an array")
    for entry in additional_creators:
        if type(entry) is not str:
            raise AuthError(400, "entry in additional_creators is not a string")
        if not UserID.is_valid(entry):
            raise AuthError(400, "entry in additional_creators is not a valid user ID")
        # UserID.is_valid doesn't actually validate everything, so check the rest manually.
        if len(entry) > 255 or len(entry.encode("utf-8")) > 255:
            raise AuthError(
                400,
                "entry in additional_creators too long",
            )
--- a/synapse/events/init.py
+++ b/synapse/events/init.py
@@ -41,13 +41,10 @@ from typing import (
 import attr
 from unpaddedbase64 import encode_base64
-from synapse.api.constants import EventContentFields, EventTypes, RelationTypes
+from synapse.api.constants import EventTypes, RelationTypes
 from synapse.api.room_versions import EventFormatVersions, RoomVersion, RoomVersions
 from synapse.synapse_rust.events import EventInternalMetadata
-from synapse.types import (
+from synapse.types import JsonDict, StrCollection
    JsonDict,
    StrCollection,
 )
 from synapse.util.caches import intern_dict
 from synapse.util.frozenutils import freeze
@@ -212,6 +209,7 @@ class EventBase(metaclass=abc.ABCMeta):
    content: DictProperty[JsonDict] = DictProperty("content")
    hashes: DictProperty[Dict[str, str]] = DictProperty("hashes")
    origin_server_ts: DictProperty[int] = DictProperty("origin_server_ts")
    room_id: DictProperty[str] = DictProperty("room_id")
    sender: DictProperty[str] = DictProperty("sender")
    # TODO state_key should be Optional[str]. This is generally asserted in Synapse
    # by calling is_state() first (which ensures it is not None), but it is hard (not possible?)
@@ -226,10 +224,6 @@ class EventBase(metaclass=abc.ABCMeta):
    def event_id(self) -> str:
        raise NotImplementedError()
    @property
    def room_id(self) -> str:
        raise NotImplementedError()
    @property
    def membership(self) -> str:
        return self.content["membership"]
@@ -392,10 +386,6 @@ class FrozenEvent(EventBase):
    def event_id(self) -> str:
        return self._event_id
    @property
    def room_id(self) -> str:
        return self._dict["room_id"]
 class FrozenEventV2(EventBase):
    format_version = EventFormatVersions.ROOM_V3  # All events of this type are V2
@@ -453,10 +443,6 @@ class FrozenEventV2(EventBase):
        self._event_id = "$" + encode_base64(compute_event_reference_hash(self)[1])
        return self._event_id
    @property
    def room_id(self) -> str:
        return self._dict["room_id"]
    def prev_event_ids(self) -> List[str]:
        """Returns the list of prev event IDs. The order matches the order
        specified in the event, though there is no meaning to it.
@@ -495,67 +481,6 @@ class FrozenEventV3(FrozenEventV2):
        return self._event_id
 class FrozenEventV4(FrozenEventV3):
    """FrozenEventV4 for MSC4291 room IDs are hashes"""
    format_version = EventFormatVersions.ROOM_V11_HYDRA_PLUS
    """Override the room_id for m.room.create events"""
    def __init__(
        self,
        event_dict: JsonDict,
        room_version: RoomVersion,
        internal_metadata_dict: Optional[JsonDict] = None,
        rejected_reason: Optional[str] = None,
    ):
        super().__init__(
            event_dict=event_dict,
            room_version=room_version,
            internal_metadata_dict=internal_metadata_dict,
            rejected_reason=rejected_reason,
        )
        self._room_id: Optional[str] = None
    @property
    def room_id(self) -> str:
        # if we have calculated the room ID already, don't do it again.
        if self._room_id:
            return self._room_id
        is_create_event = self.type == EventTypes.Create and self.get_state_key() == ""
        # for non-create events: use the supplied value from the JSON, as per FrozenEventV3
        if not is_create_event:
            self._room_id = self._dict["room_id"]
            assert self._room_id is not None
            return self._room_id
        # for create events: calculate the room ID
        from synapse.crypto.event_signing import compute_event_reference_hash
        self._room_id = "!" + encode_base64(
            compute_event_reference_hash(self)[1], urlsafe=True
        )
        return self._room_id
    def auth_event_ids(self) -> StrCollection:
        """Returns the list of auth event IDs. The order matches the order
        specified in the event, though there is no meaning to it.
        Returns:
            The list of event IDs of this event's auth_events
            Includes the creation event ID for convenience of all the codepaths
            which expects the auth chain to include the creator ID, even though
            it's explicitly not included on the wire. Excludes the create event
            for the create event itself.
        """
        create_event_id = "$" + self.room_id[1:]
        assert create_event_id not in self._dict["auth_events"]
        if self.type == EventTypes.Create and self.get_state_key() == "":
            return self._dict["auth_events"]  # should be []
        return self._dict["auth_events"] + [create_event_id]
 def _event_type_from_format_version(
    format_version: int,
 ) -> Type[Union[FrozenEvent, FrozenEventV2, FrozenEventV3]]:
@@ -575,8 +500,6 @@ def _event_type_from_format_version(
        return FrozenEventV2
    elif format_version == EventFormatVersions.ROOM_V4_PLUS:
        return FrozenEventV3
    elif format_version == EventFormatVersions.ROOM_V11_HYDRA_PLUS:
        return FrozenEventV4
    else:
        raise Exception("No event format %r" % (format_version,))
@@ -636,23 +559,6 @@ def relation_from_event(event: EventBase) -> Optional[_EventRelation]:
    return _EventRelation(parent_id, rel_type, aggregation_key)
 def is_creator(create: EventBase, user_id: str) -> bool:
    """
    Return true if the provided user ID is the room creator.
    This includes additional creators in MSC4289.
    """
    assert create.type == EventTypes.Create
    if create.sender == user_id:
        return True
    if create.room_version.msc4289_creator_power_enabled:
        additional_creators = set(
            create.content.get(EventContentFields.ADDITIONAL_CREATORS, [])
        )
        return user_id in additional_creators
    return False
@attr.s(slots=True, frozen=True, auto_attribs=True)
 class StrippedStateEvent:
    """
--- a/synapse/events/builder.py
+++ b/synapse/events/builder.py
@@ -82,8 +82,7 @@ class EventBuilder:
    room_version: RoomVersion
-    # MSC4291 makes the room ID == the create event ID. This means the create event has no room_id.
+    room_id: str
    room_id: Optional[str]
    type: str
    sender: str
@@ -143,14 +142,7 @@ class EventBuilder:
        Returns:
            The signed and hashed event.
        """
        # Create events always have empty auth_events.
        if self.type == EventTypes.Create and self.is_state() and self.state_key == "":
            auth_event_ids = []
        # Calculate auth_events for non-create events
        if auth_event_ids is None:
            # Every non-create event must have a room ID
            assert self.room_id is not None
            state_ids = await self._state.compute_state_after_events(
                self.room_id,
                prev_event_ids,
@@ -232,31 +224,12 @@ class EventBuilder:
            "auth_events": auth_events,
            "prev_events": prev_events,
            "type": self.type,
            "room_id": self.room_id,
            "sender": self.sender,
            "content": self.content,
            "unsigned": self.unsigned,
            "depth": depth,
        }
        if self.room_id is not None:
            event_dict["room_id"] = self.room_id
        if self.room_version.msc4291_room_ids_as_hashes:
            # In MSC4291: the create event has no room ID as the create event ID /is/ the room ID.
            if (
                self.type == EventTypes.Create
                and self.is_state()
                and self._state_key == ""
            ):
                assert self.room_id is None
            else:
                # All other events do not reference the create event in auth_events, as the room ID
                # /is/ the create event. However, the rest of the code (for consistency between room
                # versions) assume that the create event remains part of the auth events. c.f. event
                # class which automatically adds the create event when `.auth_event_ids()` is called
                assert self.room_id is not None
                create_event_id = "$" + self.room_id[1:]
                auth_event_ids.remove(create_event_id)
                event_dict["auth_events"] = auth_event_ids
        if self.is_state():
            event_dict["state_key"] = self._state_key
@@ -312,7 +285,7 @@ class EventBuilderFactory:
            room_version=room_version,
            type=key_values["type"],
            state_key=key_values.get("state_key"),
-            room_id=key_values.get("room_id"),
+            room_id=key_values["room_id"],
            sender=key_values["sender"],
            content=key_values.get("content", {}),
            unsigned=key_values.get("unsigned", {}),
--- a/synapse/events/snapshot.py
+++ b/synapse/events/snapshot.py
@@ -306,12 +306,6 @@ class EventContext(UnpersistedEventContextBase):
        )
 EventPersistencePair = Tuple[EventBase, EventContext]
 """
 The combination of an event to be persisted and its context.
 """
@attr.s(slots=True, auto_attribs=True)
 class UnpersistedEventContext(UnpersistedEventContextBase):
    """
@@ -369,7 +363,7 @@ class UnpersistedEventContext(UnpersistedEventContextBase):
        room_id: str,
        last_known_state_group: int,
        datastore: "StateGroupDataStore",
-    ) -> List[EventPersistencePair]:
+    ) -> List[Tuple[EventBase, EventContext]]:
        """
        Takes a list of events and their associated unpersisted contexts and persists
        the unpersisted contexts, returning a list of events and persisted contexts.
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -26,8 +26,8 @@ from typing import (
    Any,
    Awaitable,
    Callable,
    Collection,
    Dict,
    Iterable,
    List,
    Mapping,
    Match,
@@ -49,7 +49,6 @@ from synapse.api.constants import (
 )
 from synapse.api.errors import Codes, SynapseError
 from synapse.api.room_versions import RoomVersion
 from synapse.logging.opentracing import SynapseTags, set_tag, trace
 from synapse.types import JsonDict, Requester
 from . import EventBase, StrippedStateEvent, make_event_from_dict
@@ -177,12 +176,9 @@ def prune_event_dict(room_version: RoomVersion, event_dict: JsonDict) -> JsonDic
        if room_version.updated_redaction_rules:
            # MSC2176 rules state that create events cannot have their `content` redacted.
            new_content = event_dict["content"]
-        if not room_version.implicit_room_creator:
+        elif not room_version.implicit_room_creator:
            # Some room versions give meaning to `creator`
            add_fields("creator")
        if room_version.msc4291_room_ids_as_hashes:
            # room_id is not allowed on the create event as it's derived from the event ID
            allowed_keys.remove("room_id")
    elif event_type == EventTypes.JoinRules:
        add_fields("join_rule")
@@ -531,10 +527,6 @@ def serialize_event(
    if config.as_client_event:
        d = config.event_format(d)
    # Ensure the room_id field is set for create events in MSC4291 rooms
    if e.type == EventTypes.Create and e.room_version.msc4291_room_ids_as_hashes:
        d["room_id"] = e.room_id
    # If the event is a redaction, the field with the redacted event ID appears
    # in a different location depending on the room version. e.redacts handles
    # fetching from the proper location; copy it to the other location for forwards-
@@ -711,10 +703,9 @@ class EventClientSerializer:
                "m.relations", {}
            ).update(serialized_aggregations)
    @trace
    async def serialize_events(
        self,
-        events: Collection[Union[JsonDict, EventBase]],
+        events: Iterable[Union[JsonDict, EventBase]],
        time_now: int,
        *,
        config: SerializeEventConfig = _DEFAULT_SERIALIZE_EVENT_CONFIG,
@@ -733,11 +724,6 @@ class EventClientSerializer:
        Returns:
            The list of serialized events
        """
        set_tag(
            SynapseTags.FUNC_ARG_PREFIX + "events.length",
            str(len(events)),
        )
        return [
            await self.serialize_event(
                event,
@@ -886,14 +872,6 @@ def strip_event(event: EventBase) -> JsonDict:
    Stripped state events can only have the `sender`, `type`, `state_key` and `content`
    properties present.
    """
    # MSC4311: Ensure the create event is available on invites and knocks.
    # TODO: Implement the rest of MSC4311
    if (
        event.room_version.msc4291_room_ids_as_hashes
        and event.type == EventTypes.Create
        and event.get_state_key() == ""
    ):
        return event.get_pdu_json()
    return {
        "type": event.type,
--- a/synapse/events/validator.py
+++ b/synapse/events/validator.py
@@ -183,18 +183,8 @@ class EventValidator:
        fields an event would have
        """
        create_event_as_room_id = (
            event.room_version.msc4291_room_ids_as_hashes
            and event.type == EventTypes.Create
            and hasattr(event, "state_key")
            and event.state_key == ""
        )
        strings = ["room_id", "sender", "type"]
        if create_event_as_room_id:
            strings.remove("room_id")
        if hasattr(event, "state_key"):
            strings.append("state_key")
@@ -202,14 +192,7 @@ class EventValidator:
            if not isinstance(getattr(event, s), str):
                raise SynapseError(400, "Not '%s' a string type" % (s,))
-        if not create_event_as_room_id:
+        RoomID.from_string(event.room_id)
            assert event.room_id is not None
            RoomID.from_string(event.room_id)
            if event.room_version.msc4291_room_ids_as_hashes and not RoomID.is_valid(
                event.room_id
            ):
                raise SynapseError(400, f"Invalid room ID '{event.room_id}'")
        UserID.from_string(event.sender)
        if event.type == EventTypes.Message:
--- a/synapse/federation/federation_base.py
+++ b/synapse/federation/federation_base.py
@@ -343,21 +343,6 @@ def event_from_pdu_json(pdu_json: JsonDict, room_version: RoomVersion) -> EventB
    if room_version.strict_canonicaljson:
        validate_canonicaljson(pdu_json)
    # enforce that MSC4291 auth events don't include the create event.
    # N.B. if they DO include a spurious create event, it'll fail auth checks elsewhere, so we don't
    # need to do expensive DB lookups to find which event ID is the create event here.
    if room_version.msc4291_room_ids_as_hashes:
        room_id = pdu_json.get("room_id")
        if room_id:
            create_event_id = "$" + room_id[1:]
            auth_events = pdu_json.get("auth_events")
            if auth_events:
                if create_event_id in auth_events:
                    raise SynapseError(
                        400,
                        "auth_events must not contain the create event",
                        Codes.BAD_JSON,
                    )
    event = make_event_from_dict(pdu_json, room_version)
    return event
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -59,7 +59,7 @@ from synapse.api.errors import (
 from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersion
 from synapse.crypto.event_signing import compute_event_signature
 from synapse.events import EventBase
-from synapse.events.snapshot import EventPersistencePair
+from synapse.events.snapshot import EventContext
 from synapse.federation.federation_base import (
    FederationBase,
    InvalidEventSignatureError,
@@ -914,7 +914,7 @@ class FederationServer(FederationBase):
    async def _on_send_membership_event(
        self, origin: str, content: JsonDict, membership_type: str, room_id: str
-    ) -> EventPersistencePair:
+    ) -> Tuple[EventBase, EventContext]:
        """Handle an on_send_{join,leave,knock} request
        Does some preliminary validation before passing the request on to the
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -282,9 +282,7 @@ class AuthHandler:
        # response.
        self._extra_attributes: Dict[str, SsoLoginExtraAttributes] = {}
-        self._auth_delegation_enabled = (
+        self.msc3861_oauth_delegation_enabled = hs.config.experimental.msc3861.enabled
            hs.config.mas.enabled or hs.config.experimental.msc3861.enabled
        )
    async def validate_user_via_ui_auth(
        self,
@@ -335,7 +333,7 @@ class AuthHandler:
            LimitExceededError if the ratelimiter's failed request count for this
                user is too high to proceed
        """
-        if self._auth_delegation_enabled:
+        if self.msc3861_oauth_delegation_enabled:
            raise SynapseError(
                HTTPStatus.INTERNAL_SERVER_ERROR, "UIA shouldn't be used with MSC3861"
            )
--- a/synapse/handlers/delayed_events.py
+++ b/synapse/handlers/delayed_events.py
@@ -215,9 +215,9 @@ class DelayedEventsHandler:
                "Handling: %r %r, %s", delta.event_type, delta.state_key, delta.event_id
            )
-            event = await self._store.get_event(delta.event_id, allow_none=True)
+            event = await self._store.get_event(
-            if not event:
+                delta.event_id, check_room_id=delta.room_id
-                continue
+            )
            sender = UserID.from_string(event.sender)
            next_send_ts = await self._store.cancel_delayed_state_events(
--- a/synapse/handlers/event_auth.py
+++ b/synapse/handlers/event_auth.py
@@ -23,8 +23,6 @@ from typing import TYPE_CHECKING, List, Mapping, Optional, Union
 from synapse import event_auth
 from synapse.api.constants import (
    CREATOR_POWER_LEVEL,
    EventContentFields,
    EventTypes,
    JoinRules,
    Membership,
@@ -143,8 +141,6 @@ class EventAuthHandler:
        Raises:
            SynapseError if no appropriate user is found.
        """
        create_event_id = current_state_ids[(EventTypes.Create, "")]
        create_event = await self._store.get_event(create_event_id)
        power_level_event_id = current_state_ids.get((EventTypes.PowerLevels, ""))
        invite_level = 0
        users_default_level = 0
@@ -160,28 +156,15 @@ class EventAuthHandler:
        # Find the user with the highest power level (only interested in local
        # users).
        user_power_level = 0
        chosen_user = None
        local_users_in_room = await self._store.get_local_users_in_room(room_id)
-        if create_event.room_version.msc4289_creator_power_enabled:
+        chosen_user = max(
-            creators = set(
+            local_users_in_room,
-                create_event.content.get(EventContentFields.ADDITIONAL_CREATORS, [])
+            key=lambda user: users.get(user, users_default_level),
-            )
+            default=None,
-            creators.add(create_event.sender)
+        )
            local_creators = creators.intersection(set(local_users_in_room))
            if len(local_creators) > 0:
                chosen_user = local_creators.pop()  # random creator
                user_power_level = CREATOR_POWER_LEVEL
        else:
            chosen_user = max(
                local_users_in_room,
                key=lambda user: users.get(user, users_default_level),
                default=None,
            )
            # Return the chosen if they can issue invites.
            if chosen_user:
                user_power_level = users.get(chosen_user, users_default_level)
        # Return the chosen if they can issue invites.
        user_power_level = users.get(chosen_user, users_default_level)
        if chosen_user and user_power_level >= invite_level:
            logger.debug(
                "Found a user who can issue invites  %s with power level %d >= invite level %d",
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -66,11 +66,7 @@ from synapse.event_auth import (
    validate_event_for_room_version,
 )
 from synapse.events import EventBase
-from synapse.events.snapshot import (
+from synapse.events.snapshot import EventContext, UnpersistedEventContextBase
    EventContext,
    EventPersistencePair,
    UnpersistedEventContextBase,
 )
 from synapse.federation.federation_client import InvalidResponseError, PulledPduInfo
 from synapse.logging.context import nested_logging_context
 from synapse.logging.opentracing import (
@@ -345,7 +341,7 @@ class FederationEventHandler:
    async def on_send_membership_event(
        self, origin: str, event: EventBase
-    ) -> EventPersistencePair:
+    ) -> Tuple[EventBase, EventContext]:
        """
        We have received a join/leave/knock event for a room via send_join/leave/knock.
@@ -1716,7 +1712,7 @@ class FederationEventHandler:
            )
            auth_map.update(persisted_events)
-        events_and_contexts_to_persist: List[EventPersistencePair] = []
+        events_and_contexts_to_persist: List[Tuple[EventBase, EventContext]] = []
        async def prep(event: EventBase) -> None:
            with nested_logging_context(suffix=event.event_id):
@@ -1732,9 +1728,6 @@ class FederationEventHandler:
                            event,
                            auth_event_id,
                        )
                        # Drop the event from the auth_map too, else we may incorrectly persist
                        # events which depend on this dropped event.
                        auth_map.pop(event.event_id, None)
                        return
                    auth.append(ae)
@@ -2229,7 +2222,7 @@ class FederationEventHandler:
    async def persist_events_and_notify(
        self,
        room_id: str,
-        event_and_contexts: Sequence[EventPersistencePair],
+        event_and_contexts: Sequence[Tuple[EventBase, EventContext]],
        backfilled: bool = False,
    ) -> int:
        """Persists events and tells the notifier/pushers about them, if
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -22,7 +22,7 @@
 import logging
 import random
 from http import HTTPStatus
-from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Sequence, Tuple
+from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Tuple
 from canonicaljson import encode_canonical_json
@@ -55,12 +55,7 @@ from synapse.api.urls import ConsentURIBuilder
 from synapse.event_auth import validate_event_for_room_version
 from synapse.events import EventBase, relation_from_event
 from synapse.events.builder import EventBuilder
-from synapse.events.snapshot import (
+from synapse.events.snapshot import EventContext, UnpersistedEventContextBase
    EventContext,
    EventPersistencePair,
    UnpersistedEventContext,
    UnpersistedEventContextBase,
 )
 from synapse.events.utils import SerializeEventConfig, maybe_upsert_event_field
 from synapse.events.validator import EventValidator
 from synapse.handlers.directory import DirectoryHandler
@@ -71,7 +66,6 @@ from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.replication.http.send_events import ReplicationSendEventsRestServlet
 from synapse.storage.databases.main.events_worker import EventRedactBehaviour
 from synapse.types import (
    JsonDict,
    PersistedEventPosition,
    Requester,
    RoomAlias,
@@ -689,10 +683,7 @@ class EventCreationHandler:
                        Codes.USER_ACCOUNT_SUSPENDED,
                    )
-        is_create_event = (
+        if event_dict["type"] == EventTypes.Create and event_dict["state_key"] == "":
            event_dict["type"] == EventTypes.Create and event_dict["state_key"] == ""
        )
        if is_create_event:
            room_version_id = event_dict["content"]["room_version"]
            maybe_room_version_obj = KNOWN_ROOM_VERSIONS.get(room_version_id)
            if not maybe_room_version_obj:
@@ -798,7 +789,6 @@ class EventCreationHandler:
        """
        # the only thing the user can do is join the server notices room.
        if builder.type == EventTypes.Member:
            assert builder.room_id is not None
            membership = builder.content.get("membership", None)
            if membership == Membership.JOIN:
                return await self.store.is_server_notice_room(builder.room_id)
@@ -1264,40 +1254,13 @@ class EventCreationHandler:
                for_verification=False,
            )
        if (
            builder.room_version.msc4291_room_ids_as_hashes
            and builder.type == EventTypes.Create
            and builder.is_state()
        ):
            if builder.room_id is not None:
                raise SynapseError(
                    400,
                    "Cannot resend m.room.create event",
                    Codes.INVALID_PARAM,
                )
        else:
            assert builder.room_id is not None
        if prev_event_ids is not None:
            assert len(prev_event_ids) <= 10, (
                "Attempting to create an event with %i prev_events"
                % (len(prev_event_ids),)
            )
        else:
-            if builder.room_id:
+            prev_event_ids = await self.store.get_prev_events_for_room(builder.room_id)
                prev_event_ids = await self.store.get_prev_events_for_room(
                    builder.room_id
                )
            else:
                prev_event_ids = []  # can only happen for the create event in MSC4291 rooms
        if builder.type == EventTypes.Create and builder.is_state():
            if len(prev_event_ids) != 0:
                raise SynapseError(
                    400,
                    "Cannot resend m.room.create event",
                    Codes.INVALID_PARAM,
                )
        # We now ought to have some `prev_events` (unless it's a create event).
        #
@@ -1440,7 +1403,7 @@ class EventCreationHandler:
    async def handle_new_client_event(
        self,
        requester: Requester,
-        events_and_context: List[EventPersistencePair],
+        events_and_context: List[Tuple[EventBase, EventContext]],
        ratelimit: bool = True,
        extra_users: Optional[List[UserID]] = None,
        ignore_shadow_ban: bool = False,
@@ -1557,102 +1520,10 @@ class EventCreationHandler:
        return result
    async def create_and_send_new_client_events(
        self,
        requester: Requester,
        room_id: str,
        prev_event_id: Optional[str],
        event_dicts: Sequence[JsonDict],
        ratelimit: bool = True,
        ignore_shadow_ban: bool = False,
    ) -> None:
        """Helper to create and send a batch of new client events.
        This supports sending membership events in very limited circumstances
        (namely that the event is valid as is and doesn't need federation
        requests or anything). Callers should prefer to use `update_membership`,
        which correctly handles membership events in all cases. We allow
        sending membership events here as its useful when copying e.g. bans
        between rooms.
        All other events and state events are supported.
        Args:
            requester: The requester sending the events.
            room_id: The room ID to send the events in.
            prev_event_id: The event ID to use as the previous event for the first
                of the events, must have already been persisted.
            event_dicts: A sequence of event dictionaries to create and send.
            ratelimit: Whether to rate limit this send.
            ignore_shadow_ban: True if shadow-banned users should be allowed to
                send these events.
        """
        if not event_dicts:
            # Nothing to do.
            return
        if prev_event_id is None:
            # Pick the latest forward extremity as the previous event ID.
            prev_event_ids = await self.store.get_forward_extremities_for_room(room_id)
            prev_event_ids.sort(key=lambda x: x[2])  # Sort by depth.
            prev_event_id = prev_event_ids[-1][0]
        state_groups = await self._storage_controllers.state.get_state_group_for_events(
            [prev_event_id]
        )
        if prev_event_id not in state_groups:
            # This should only happen if we got passed a prev event ID that
            # hasn't been persisted yet.
            raise Exception("Previous event ID not found ")
        current_state_group = state_groups[prev_event_id]
        state_map = await self._storage_controllers.state.get_state_ids_for_group(
            current_state_group
        )
        events_and_contexts_to_send = []
        state_map = dict(state_map)
        depth = None
        for event_dict in event_dicts:
            event, context = await self.create_event(
                requester=requester,
                event_dict=event_dict,
                prev_event_ids=[prev_event_id],
                depth=depth,
                # Take a copy to ensure each event gets a unique copy of
                # state_map since it is modified below.
                state_map=dict(state_map),
                for_batch=True,
            )
            events_and_contexts_to_send.append((event, context))
            prev_event_id = event.event_id
            depth = event.depth + 1
            if event.is_state():
                # If this is a state event, we need to update the state map
                # so that it can be used for the next event.
                state_map[(event.type, event.state_key)] = event.event_id
        datastore = self.hs.get_datastores().state
        events_and_context = (
            await UnpersistedEventContext.batch_persist_unpersisted_contexts(
                events_and_contexts_to_send, room_id, current_state_group, datastore
            )
        )
        await self.handle_new_client_event(
            requester,
            events_and_context,
            ignore_shadow_ban=ignore_shadow_ban,
            ratelimit=ratelimit,
        )
    async def _persist_events(
        self,
        requester: Requester,
-        events_and_context: List[EventPersistencePair],
+        events_and_context: List[Tuple[EventBase, EventContext]],
        ratelimit: bool = True,
        extra_users: Optional[List[UserID]] = None,
    ) -> EventBase:
@@ -1738,7 +1609,7 @@ class EventCreationHandler:
            raise
    async def cache_joined_hosts_for_events(
-        self, events_and_context: List[EventPersistencePair]
+        self, events_and_context: List[Tuple[EventBase, EventContext]]
    ) -> None:
        """Precalculate the joined hosts at each of the given events, when using Redis, so that
        external federation senders don't have to recalculate it themselves.
@@ -1844,7 +1715,7 @@ class EventCreationHandler:
    async def persist_and_notify_client_events(
        self,
        requester: Requester,
-        events_and_context: List[EventPersistencePair],
+        events_and_context: List[Tuple[EventBase, EventContext]],
        ratelimit: bool = True,
        extra_users: Optional[List[UserID]] = None,
    ) -> EventBase:
@@ -2266,7 +2137,6 @@ class EventCreationHandler:
                original_event.room_version, third_party_result
            )
            self.validator.validate_builder(builder)
            assert builder.room_id is not None
        except SynapseError as e:
            raise Exception(
                "Third party rules module created an invalid event: " + e.msg,
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -82,7 +82,6 @@ from synapse.types import (
    Requester,
    RoomAlias,
    RoomID,
    RoomIdWithDomain,
    RoomStreamToken,
    StateMap,
    StrCollection,
@@ -94,9 +93,7 @@ from synapse.types import (
 from synapse.types.handlers import ShutdownRoomParams, ShutdownRoomResponse
 from synapse.types.state import StateFilter
 from synapse.util import stringutils
 from synapse.util.async_helpers import concurrently_execute
 from synapse.util.caches.response_cache import ResponseCache
 from synapse.util.iterutils import batch_iter
 from synapse.util.stringutils import parse_and_validate_server_name
 from synapse.visibility import filter_events_for_client
@@ -197,13 +194,7 @@ class RoomCreationHandler:
        )
    async def upgrade_room(
-        self,
+        self, requester: Requester, old_room_id: str, new_version: RoomVersion
        requester: Requester,
        old_room_id: str,
        new_version: RoomVersion,
        additional_creators: Optional[List[str]],
        auto_member: bool = False,
        ratelimit: bool = True,
    ) -> str:
        """Replace a room with a new room with a different version
@@ -211,9 +202,6 @@ class RoomCreationHandler:
            requester: the user requesting the upgrade
            old_room_id: the id of the room to be replaced
            new_version: the new room version to use
            additional_creators: additional room creators, for MSC4289.
            auto_member: Whether to automatically join local users to the new
                room and send out invites to remote users.
        Returns:
            the new room id
@@ -221,12 +209,11 @@ class RoomCreationHandler:
        Raises:
            ShadowBanError if the requester is shadow-banned.
        """
-        if ratelimit:
+        await self.creation_ratelimiter.ratelimit(requester, update=False)
            await self.creation_ratelimiter.ratelimit(requester, update=False)
-            # then apply the ratelimits
+        # then apply the ratelimits
-            await self.common_request_ratelimiter.ratelimit(requester)
+        await self.common_request_ratelimiter.ratelimit(requester)
-            await self.creation_ratelimiter.ratelimit(requester)
+        await self.creation_ratelimiter.ratelimit(requester)
        user_id = requester.user.to_string()
@@ -247,29 +234,8 @@ class RoomCreationHandler:
        old_room = await self.store.get_room(old_room_id)
        if old_room is None:
            raise NotFoundError("Unknown room id %s" % (old_room_id,))
        old_room_is_public, _ = old_room
-        creation_event_with_context = None
+        new_room_id = self._generate_room_id()
        if new_version.msc4291_room_ids_as_hashes:
            old_room_create_event = await self.store.get_create_event_for_room(
                old_room_id
            )
            creation_content = self._calculate_upgraded_room_creation_content(
                old_room_create_event,
                tombstone_event_id=None,
                new_room_version=new_version,
                additional_creators=additional_creators,
            )
            creation_event_with_context = await self._generate_create_event_for_room_id(
                requester,
                creation_content,
                old_room_is_public,
                new_version,
            )
            (create_event, _) = creation_event_with_context
            new_room_id = create_event.room_id
        else:
            new_room_id = self._generate_room_id()
        # Try several times, it could fail with PartialStateConflictError
        # in _upgrade_room, cf comment in except block.
@@ -318,9 +284,6 @@ class RoomCreationHandler:
                    new_version,
                    tombstone_event,
                    tombstone_context,
                    additional_creators,
                    creation_event_with_context,
                    auto_member=auto_member,
                )
                return ret
@@ -344,11 +307,6 @@ class RoomCreationHandler:
        new_version: RoomVersion,
        tombstone_event: EventBase,
        tombstone_context: synapse.events.snapshot.EventContext,
        additional_creators: Optional[List[str]],
        creation_event_with_context: Optional[
            Tuple[EventBase, synapse.events.snapshot.EventContext]
        ] = None,
        auto_member: bool = False,
    ) -> str:
        """
        Args:
@@ -360,10 +318,6 @@ class RoomCreationHandler:
            new_version: the version to upgrade the room to
            tombstone_event: the tombstone event to send to the old room
            tombstone_context: the context for the tombstone event
            additional_creators: additional room creators, for MSC4289.
            creation_event_with_context: The new room's create event, for room IDs as create event IDs.
            auto_member: Whether to automatically join local users to the new
                room and send out invites to remote users.
        Raises:
            ShadowBanError if the requester is shadow-banned.
@@ -373,16 +327,14 @@ class RoomCreationHandler:
        logger.info("Creating new room %s to replace %s", new_room_id, old_room_id)
-        # We've already stored the room if we have the create event
+        # create the new room. may raise a `StoreError` in the exceedingly unlikely
-        if not creation_event_with_context:
+        # event of a room ID collision.
-            # create the new room. may raise a `StoreError` in the exceedingly unlikely
+        await self.store.store_room(
-            # event of a room ID collision.
+            room_id=new_room_id,
-            await self.store.store_room(
+            room_creator_user_id=user_id,
-                room_id=new_room_id,
+            is_public=old_room[0],
-                room_creator_user_id=user_id,
+            room_version=new_version,
-                is_public=old_room[0],
+        )
                room_version=new_version,
            )
        await self.clone_existing_room(
            requester,
@@ -390,9 +342,6 @@ class RoomCreationHandler:
            new_room_id=new_room_id,
            new_room_version=new_version,
            tombstone_event_id=tombstone_event.event_id,
            additional_creators=additional_creators,
            creation_event_with_context=creation_event_with_context,
            auto_member=auto_member,
        )
        # now send the tombstone
@@ -426,7 +375,6 @@ class RoomCreationHandler:
            old_room_id,
            new_room_id,
            old_room_state,
            additional_creators,
        )
        return new_room_id
@@ -437,7 +385,6 @@ class RoomCreationHandler:
        old_room_id: str,
        new_room_id: str,
        old_room_state: StateMap[str],
        additional_creators: Optional[List[str]],
    ) -> None:
        """Send updated power levels in both rooms after an upgrade
@@ -446,7 +393,7 @@ class RoomCreationHandler:
            old_room_id: the id of the room to be replaced
            new_room_id: the id of the replacement room
            old_room_state: the state map for the old room
-            additional_creators: Additional creators in the new room.
+
        Raises:
            ShadowBanError if the requester is shadow-banned.
        """
@@ -502,14 +449,6 @@ class RoomCreationHandler:
            except AuthError as e:
                logger.warning("Unable to update PLs in old room: %s", e)
        new_room_version = await self.store.get_room_version(new_room_id)
        if new_room_version.msc4289_creator_power_enabled:
            self._remove_creators_from_pl_users_map(
                old_room_pl_state.content.get("users", {}),
                requester.user.to_string(),
                additional_creators,
            )
        await self.event_creation_handler.create_and_send_nonmember_event(
            requester,
            {
@@ -524,36 +463,6 @@ class RoomCreationHandler:
            ratelimit=False,
        )
    def _calculate_upgraded_room_creation_content(
        self,
        old_room_create_event: EventBase,
        tombstone_event_id: Optional[str],
        new_room_version: RoomVersion,
        additional_creators: Optional[List[str]],
    ) -> JsonDict:
        creation_content: JsonDict = {
            "room_version": new_room_version.identifier,
            "predecessor": {
                "room_id": old_room_create_event.room_id,
            },
        }
        if tombstone_event_id is not None:
            creation_content["predecessor"]["event_id"] = tombstone_event_id
        if (
            additional_creators is not None
            and new_room_version.msc4289_creator_power_enabled
        ):
            creation_content["additional_creators"] = additional_creators
        # Check if old room was non-federatable
        if not old_room_create_event.content.get(EventContentFields.FEDERATE, True):
            # If so, mark the new room as non-federatable as well
            creation_content[EventContentFields.FEDERATE] = False
        # Copy the room type as per MSC3818.
        room_type = old_room_create_event.content.get(EventContentFields.ROOM_TYPE)
        if room_type is not None:
            creation_content[EventContentFields.ROOM_TYPE] = room_type
        return creation_content
    async def clone_existing_room(
        self,
        requester: Requester,
@@ -561,11 +470,6 @@ class RoomCreationHandler:
        new_room_id: str,
        new_room_version: RoomVersion,
        tombstone_event_id: str,
        additional_creators: Optional[List[str]],
        creation_event_with_context: Optional[
            Tuple[EventBase, synapse.events.snapshot.EventContext]
        ] = None,
        auto_member: bool = False,
    ) -> None:
        """Populate a new room based on an old room
@@ -576,27 +480,24 @@ class RoomCreationHandler:
                created with _generate_room_id())
            new_room_version: the new room version to use
            tombstone_event_id: the ID of the tombstone event in the old room.
            additional_creators: additional room creators, for MSC4289.
            creation_event_with_context: The create event of the new room, if the new room supports
            room ID as create event ID hash.
            auto_member: Whether to automatically join local users to the new
                room and send out invites to remote users.
        """
        user_id = requester.user.to_string()
        creation_content: JsonDict = {
            "room_version": new_room_version.identifier,
            "predecessor": {"room_id": old_room_id, "event_id": tombstone_event_id},
        }
        # Check if old room was non-federatable
        # Get old room's create event
        old_room_create_event = await self.store.get_create_event_for_room(old_room_id)
-        if creation_event_with_context:
+        # Check if the create event specified a non-federatable room
-            create_event, _ = creation_event_with_context
+        if not old_room_create_event.content.get(EventContentFields.FEDERATE, True):
-            creation_content = create_event.content
+            # If so, mark the new room as non-federatable as well
-        else:
+            creation_content[EventContentFields.FEDERATE] = False
-            creation_content = self._calculate_upgraded_room_creation_content(
+
                old_room_create_event,
                tombstone_event_id,
                new_room_version,
                additional_creators=additional_creators,
            )
        initial_state = {}
        # Replicate relevant room events
@@ -612,8 +513,11 @@ class RoomCreationHandler:
            (EventTypes.PowerLevels, ""),
        ]
        # Copy the room type as per MSC3818.
        room_type = old_room_create_event.content.get(EventContentFields.ROOM_TYPE)
        if room_type is not None:
            creation_content[EventContentFields.ROOM_TYPE] = room_type
            # If the old room was a space, copy over the rooms in the space.
            if room_type == RoomTypes.SPACE:
                types_to_copy.append((EventTypes.SpaceChild, None))
@@ -685,14 +589,6 @@ class RoomCreationHandler:
        if current_power_level_int < needed_power_level:
            user_power_levels[user_id] = needed_power_level
        if new_room_version.msc4289_creator_power_enabled:
            # the creator(s) cannot be in the users map
            self._remove_creators_from_pl_users_map(
                user_power_levels,
                user_id,
                additional_creators,
            )
        # We construct what the body of a call to /createRoom would look like for passing
        # to the spam checker. We don't include a preset here, as we expect the
        # initial state to contain everything we need.
@@ -711,7 +607,7 @@ class RoomCreationHandler:
                additional_fields=spam_check[1],
            )
-        _, last_event_id, _ = await self._send_events_for_new_room(
+        await self._send_events_for_new_room(
            requester,
            new_room_id,
            new_room_version,
@@ -721,228 +617,36 @@ class RoomCreationHandler:
            invite_list=[],
            initial_state=initial_state,
            creation_content=creation_content,
            creation_event_with_context=creation_event_with_context,
        )
        # Transfer membership events
-        ban_event_ids = await self.store.get_ban_event_ids_in_room(old_room_id)
+        old_room_member_state_ids = (
-        if ban_event_ids:
+            await self._storage_controllers.state.get_current_state_ids(
-            ban_events = await self.store.get_events_as_list(ban_event_ids)
+                old_room_id, StateFilter.from_types([(EventTypes.Member, None)])
            # Add any banned users to the new room.
            #
            # Note generally we should send membership events via
            # `update_membership`, however in this case its fine to bypass as
            # these bans don't need any special treatment, i.e. the sender is in
            # the room and they don't need any extra signatures, etc.
            for batched_ban_events in batch_iter(ban_events, 1000):
                await self.event_creation_handler.create_and_send_new_client_events(
                    requester=requester,
                    room_id=new_room_id,
                    prev_event_id=last_event_id,
                    event_dicts=[
                        {
                            "type": EventTypes.Member,
                            "state_key": ban_event.state_key,
                            "room_id": new_room_id,
                            "sender": requester.user.to_string(),
                            "content": ban_event.content,
                        }
                        for ban_event in batched_ban_events
                    ],
                    ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
                )
        if auto_member:
            logger.info("Joining local users to %s", new_room_id)
            # 1. Copy over all joins for local
            joined_profiles = await self.store.get_users_in_room_with_profiles(
                old_room_id
            )
        )
-            local_user_ids = [
+        # map from event_id to BaseEvent
-                user_id for user_id in joined_profiles if self.hs.is_mine_id(user_id)
+        old_room_member_state_events = await self.store.get_events(
-            ]
+            old_room_member_state_ids.values()
-
+        )
-            logger.info("Local user IDs %s", local_user_ids)
+        for old_event in old_room_member_state_events.values():
-
+            # Only transfer ban events
-            for batched_local_user_ids in batch_iter(local_user_ids, 1000):
+            if (
-                invites_to_send = []
+                "membership" in old_event.content
-
+                and old_event.content["membership"] == "ban"
-                # For each local user we create an invite event (from the
+            ):
-                # upgrading user) plus a join event.
+                await self.room_member_handler.update_membership(
-                for local_user_id in batched_local_user_ids:
+                    requester,
-                    if local_user_id == user_id:
+                    UserID.from_string(old_event.state_key),
                        # Ignore the upgrading user, as they are already in the
                        # new room.
                        continue
                    invites_to_send.append(
                        {
                            "type": EventTypes.Member,
                            "state_key": local_user_id,
                            "room_id": new_room_id,
                            "sender": requester.user.to_string(),
                            "content": {
                                "membership": Membership.INVITE,
                            },
                        }
                    )
                    # If the user has profile information in the previous join,
                    # add it to the content.
                    #
                    # We could instead copy over the contents from the old join
                    # event, however a) that would require us to fetch all the
                    # old join events (which is slow), and b) generally the join
                    # events have no extra information in them. (We also believe
                    # that most clients don't copy this information over either,
                    # but we could be wrong.)
                    content_profile = {}
                    user_profile = joined_profiles[local_user_id]
                    if user_profile.display_name:
                        content_profile["displayname"] = user_profile.display_name
                    if user_profile.avatar_url:
                        content_profile["avatar_url"] = user_profile.avatar_url
                    invites_to_send.append(
                        {
                            "type": EventTypes.Member,
                            "state_key": local_user_id,
                            "room_id": new_room_id,
                            "sender": local_user_id,
                            "content": {
                                "membership": Membership.JOIN,
                                **content_profile,
                            },
                        }
                    )
                await self.event_creation_handler.create_and_send_new_client_events(
                    requester=requester,
                    room_id=new_room_id,
                    prev_event_id=None,
                    event_dicts=invites_to_send,
                    ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
                )
            # Invite other users if the room is not public. If the room *is*
            # public then users can simply directly join, and inviting them as
            # well may lead to confusion.
            join_rule_content = initial_state.get((EventTypes.JoinRules, ""), None)
            is_public = False
            if join_rule_content:
                is_public = join_rule_content["join_rule"] == JoinRules.PUBLIC
            if not is_public:
                # Copy invites
                # TODO: Copy over 3pid invites as well.
                invited_users = await self.store.get_invited_users_in_room(
                    room_id=old_room_id
                )
                # For local users we can just batch send the invites.
                local_invited_users = [
                    user_id for user_id in invited_users if self.hs.is_mine_id(user_id)
                ]
                logger.info(
                    "Joining local user IDs %s to new room %s",
                    local_invited_users,
                    new_room_id,
                    "ban",
                    ratelimit=False,
                    content=old_event.content,
                )
-                for batched_local_invited_users in batch_iter(
+        # XXX invites/joins
-                    local_invited_users, 1000
+        # XXX 3pid invites
                ):
                    invites_to_send = []
                    leaves_to_send = []
                    # For each local user we create an invite event (from the
                    # upgrading user), and reject the invite event in the old
                    # room.
                    #
                    # This ensures that the user ends up with a single invite to
                    # the new room (rather than multiple invites which may be
                    # noisy and confusing).
                    for local_user_id in batched_local_invited_users:
                        leaves_to_send.append(
                            {
                                "type": EventTypes.Member,
                                "state_key": local_user_id,
                                "room_id": old_room_id,
                                "sender": local_user_id,
                                "content": {
                                    "membership": Membership.LEAVE,
                                },
                            }
                        )
                        invites_to_send.append(
                            {
                                "type": EventTypes.Member,
                                "state_key": local_user_id,
                                "room_id": new_room_id,
                                "sender": requester.user.to_string(),
                                "content": {
                                    "membership": Membership.INVITE,
                                },
                            }
                        )
                    await self.event_creation_handler.create_and_send_new_client_events(
                        requester=requester,
                        room_id=old_room_id,
                        prev_event_id=None,
                        event_dicts=leaves_to_send,
                        ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
                    )
                    await self.event_creation_handler.create_and_send_new_client_events(
                        requester=requester,
                        room_id=new_room_id,
                        prev_event_id=None,
                        event_dicts=invites_to_send,
                        ratelimit=False,
                    )
                # For remote users we send invites one by one, as we need to
                # send each one to the remote server.
                #
                # We also invite joined remote users who were in the old room.
                remote_user_ids = [
                    user_id
                    for user_id in itertools.chain(invited_users, joined_profiles)
                    if not self.hs.is_mine_id(user_id)
                ]
                logger.debug("Inviting remote user IDs %s", remote_user_ids)
                async def remote_invite(remote_user: str) -> None:
                    try:
                        await self.room_member_handler.update_membership(
                            requester,
                            UserID.from_string(remote_user),
                            new_room_id,
                            Membership.INVITE,
                            ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
                        )
                    except SynapseError as e:
                        # If we fail to invite a remote user, we log it but continue
                        # on with the upgrade.
                        logger.warning(
                            "Failed to invite remote user %s to new room %s: %s",
                            remote_user,
                            new_room_id,
                            e,
                        )
                # We do this concurrently, as it can take a while to invite
                await concurrently_execute(
                    remote_invite,
                    remote_user_ids,
                    10,
                )
    async def _move_aliases_to_new_room(
        self,
@@ -1071,25 +775,6 @@ class RoomCreationHandler:
        await self.auth_blocking.check_auth_blocking(requester=requester)
        if ratelimit:
            # Limit the rate of room creations,
            # using both the limiter specific to room creations as well
            # as the general request ratelimiter.
            #
            # Note that we don't rate limit the individual
            # events in the room — room creation isn't atomic and
            # historically it was very janky if half the events in the
            # initial state don't make it because of rate limiting.
            # First check the room creation ratelimiter without updating it
            # (this is so we don't consume a token if the other ratelimiter doesn't
            # allow us to proceed)
            await self.creation_ratelimiter.ratelimit(requester, update=False)
            # then apply the ratelimits
            await self.common_request_ratelimiter.ratelimit(requester)
            await self.creation_ratelimiter.ratelimit(requester)
        if (
            self._server_notices_mxid is not None
            and user_id == self._server_notices_mxid
@@ -1121,6 +806,37 @@ class RoomCreationHandler:
                    Codes.MISSING_PARAM,
                )
        if not is_requester_admin:
            spam_check = await self._spam_checker_module_callbacks.user_may_create_room(
                user_id, config
            )
            if spam_check != self._spam_checker_module_callbacks.NOT_SPAM:
                raise SynapseError(
                    403,
                    "You are not permitted to create rooms",
                    errcode=spam_check[0],
                    additional_fields=spam_check[1],
                )
        if ratelimit:
            # Limit the rate of room creations,
            # using both the limiter specific to room creations as well
            # as the general request ratelimiter.
            #
            # Note that we don't rate limit the individual
            # events in the room — room creation isn't atomic and
            # historically it was very janky if half the events in the
            # initial state don't make it because of rate limiting.
            # First check the room creation ratelimiter without updating it
            # (this is so we don't consume a token if the other ratelimiter doesn't
            # allow us to proceed)
            await self.creation_ratelimiter.ratelimit(requester, update=False)
            # then apply the ratelimits
            await self.common_request_ratelimiter.ratelimit(requester)
            await self.creation_ratelimiter.ratelimit(requester)
        room_version_id = config.get(
            "room_version", self.config.server.default_room_version.identifier
        )
@@ -1196,7 +912,6 @@ class RoomCreationHandler:
        power_level_content_override = config.get("power_level_content_override")
        if (
            power_level_content_override
            and not room_version.msc4289_creator_power_enabled  # this validation doesn't apply in MSC4289 rooms
            and "users" in power_level_content_override
            and user_id not in power_level_content_override["users"]
        ):
@@ -1213,54 +928,11 @@ class RoomCreationHandler:
        self._validate_room_config(config, visibility)
-        # Run the spam checker after other validation
+        room_id = await self._generate_and_create_room_id(
-        if not is_requester_admin:
+            creator_id=user_id,
-            spam_check = await self._spam_checker_module_callbacks.user_may_create_room(
+            is_public=is_public,
-                user_id, config
+            room_version=room_version,
-            )
+        )
            if spam_check != self._spam_checker_module_callbacks.NOT_SPAM:
                raise SynapseError(
                    403,
                    "You are not permitted to create rooms",
                    errcode=spam_check[0],
                    additional_fields=spam_check[1],
                )
        creation_content = config.get("creation_content", {})
        # override any attempt to set room versions via the creation_content
        creation_content["room_version"] = room_version.identifier
        # trusted private chats have the invited users marked as additional creators
        if (
            room_version.msc4289_creator_power_enabled
            and config.get("preset", None) == RoomCreationPreset.TRUSTED_PRIVATE_CHAT
            and len(config.get("invite", [])) > 0
        ):
            # the other user(s) are additional creators
            invitees = config.get("invite", [])
            # we don't want to replace any additional_creators additionally specified, and we want
            # to remove duplicates.
            creation_content[EventContentFields.ADDITIONAL_CREATORS] = list(
                set(creation_content.get(EventContentFields.ADDITIONAL_CREATORS, []))
                | set(invitees)
            )
        creation_event_with_context = None
        if room_version.msc4291_room_ids_as_hashes:
            creation_event_with_context = await self._generate_create_event_for_room_id(
                requester,
                creation_content,
                is_public,
                room_version,
            )
            (create_event, _) = creation_event_with_context
            room_id = create_event.room_id
        else:
            room_id = await self._generate_and_create_room_id(
                creator_id=user_id,
                is_public=is_public,
                room_version=room_version,
            )
        # Check whether this visibility value is blocked by a third party module
        allowed_by_third_party_rules = await (
@@ -1297,6 +969,11 @@ class RoomCreationHandler:
        for val in raw_initial_state:
            initial_state[(val["type"], val.get("state_key", ""))] = val["content"]
        creation_content = config.get("creation_content", {})
        # override any attempt to set room versions via the creation_content
        creation_content["room_version"] = room_version.identifier
        (
            last_stream_id,
            last_sent_event_id,
@@ -1313,7 +990,6 @@ class RoomCreationHandler:
            power_level_content_override=power_level_content_override,
            creator_join_profile=creator_join_profile,
            ignore_forced_encryption=ignore_forced_encryption,
            creation_event_with_context=creation_event_with_context,
        )
        # we avoid dropping the lock between invites, as otherwise joins can
@@ -1379,38 +1055,6 @@ class RoomCreationHandler:
        return room_id, room_alias, last_stream_id
    async def _generate_create_event_for_room_id(
        self,
        creator: Requester,
        creation_content: JsonDict,
        is_public: bool,
        room_version: RoomVersion,
    ) -> Tuple[EventBase, synapse.events.snapshot.EventContext]:
        (
            creation_event,
            new_unpersisted_context,
        ) = await self.event_creation_handler.create_event(
            creator,
            {
                "content": creation_content,
                "sender": creator.user.to_string(),
                "type": EventTypes.Create,
                "state_key": "",
            },
            prev_event_ids=[],
            depth=1,
            state_map={},
            for_batch=False,
        )
        await self.store.store_room(
            room_id=creation_event.room_id,
            room_creator_user_id=creator.user.to_string(),
            is_public=is_public,
            room_version=room_version,
        )
        creation_context = await new_unpersisted_context.persist(creation_event)
        return (creation_event, creation_context)
    async def _send_events_for_new_room(
        self,
        creator: Requester,
@@ -1424,9 +1068,6 @@ class RoomCreationHandler:
        power_level_content_override: Optional[JsonDict] = None,
        creator_join_profile: Optional[JsonDict] = None,
        ignore_forced_encryption: bool = False,
        creation_event_with_context: Optional[
            Tuple[EventBase, synapse.events.snapshot.EventContext]
        ] = None,
    ) -> Tuple[int, str, int]:
        """Sends the initial events into a new room. Sends the room creation, membership,
        and power level events into the room sequentially, then creates and batches up the
@@ -1463,10 +1104,7 @@ class RoomCreationHandler:
                user in this room.
            ignore_forced_encryption:
                Ignore encryption forced by `encryption_enabled_by_default_for_room_type` setting.
-            creation_event_with_context:
+
                Set in MSC4291 rooms where the create event determines the room ID. If provided,
                does not create an additional create event but instead appends the remaining new
                events onto the provided create event.
        Returns:
            A tuple containing the stream ID, event ID and depth of the last
            event sent to the room.
@@ -1531,26 +1169,13 @@ class RoomCreationHandler:
        preset_config, config = self._room_preset_config(room_config)
-        if creation_event_with_context is None:
+        # MSC2175 removes the creator field from the create event.
-            # MSC2175 removes the creator field from the create event.
+        if not room_version.implicit_room_creator:
-            if not room_version.implicit_room_creator:
+            creation_content["creator"] = creator_id
-                creation_content["creator"] = creator_id
+        creation_event, unpersisted_creation_context = await create_event(
-            creation_event, unpersisted_creation_context = await create_event(
+            EventTypes.Create, creation_content, False
-                EventTypes.Create, creation_content, False
+        )
-            )
+        creation_context = await unpersisted_creation_context.persist(creation_event)
            creation_context = await unpersisted_creation_context.persist(
                creation_event
            )
        else:
            (creation_event, creation_context) = creation_event_with_context
            # we had to do the above already in order to have a room ID, so just updates local vars
            # and continue.
            depth = 2
            prev_event = [creation_event.event_id]
            state_map[(creation_event.type, creation_event.state_key)] = (
                creation_event.event_id
            )
        logger.debug("Sending %s in new room", EventTypes.Member)
        ev = await self.event_creation_handler.handle_new_client_event(
            requester=creator,
@@ -1599,9 +1224,7 @@ class RoomCreationHandler:
            # Please update the docs for `default_power_level_content_override` when
            # updating the `events` dict below
            power_level_content: JsonDict = {
-                "users": {creator_id: 100}
+                "users": {creator_id: 100},
                if not room_version.msc4289_creator_power_enabled
                else {},
                "users_default": 0,
                "events": {
                    EventTypes.Name: 50,
@@ -1609,9 +1232,7 @@ class RoomCreationHandler:
                    EventTypes.RoomHistoryVisibility: 100,
                    EventTypes.CanonicalAlias: 50,
                    EventTypes.RoomAvatar: 50,
-                    EventTypes.Tombstone: 150
+                    EventTypes.Tombstone: 100,
                    if room_version.msc4289_creator_power_enabled
                    else 100,
                    EventTypes.ServerACL: 100,
                    EventTypes.RoomEncryption: 100,
                },
@@ -1624,13 +1245,7 @@ class RoomCreationHandler:
                "historical": 100,
            }
-            # original_invitees_have_ops is set on preset:trusted_private_chat which will already
+            if config["original_invitees_have_ops"]:
            # have set these users as additional_creators, hence don't set the PL for creators as
            # that is invalid.
            if (
                config["original_invitees_have_ops"]
                and not room_version.msc4289_creator_power_enabled
            ):
                for invitee in invite_list:
                    power_level_content["users"][invitee] = 100
@@ -1803,19 +1418,6 @@ class RoomCreationHandler:
            )
        return preset_name, preset_config
    def _remove_creators_from_pl_users_map(
        self,
        users_map: Dict[str, int],
        creator: str,
        additional_creators: Optional[List[str]],
    ) -> None:
        creators = [creator]
        if additional_creators:
            creators.extend(additional_creators)
        for creator in creators:
            # the creator(s) cannot be in the users map
            users_map.pop(creator, None)
    def _generate_room_id(self) -> str:
        """Generates a random room ID.
@@ -1833,7 +1435,7 @@ class RoomCreationHandler:
            A random room ID of the form "!opaque_id:domain".
        """
        random_string = stringutils.random_string(18)
-        return RoomIdWithDomain(random_string, self.hs.hostname).to_string()
+        return RoomID(random_string, self.hs.hostname).to_string()
    async def _generate_and_create_room_id(
        self,
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -42,7 +42,7 @@ from synapse.api.errors import (
 )
 from synapse.api.ratelimiting import Ratelimiter
 from synapse.event_auth import get_named_level, get_power_level_event
-from synapse.events import EventBase, is_creator
+from synapse.events import EventBase
 from synapse.events.snapshot import EventContext
 from synapse.handlers.pagination import PURGE_ROOM_ACTION_NAME
 from synapse.handlers.profile import MAX_AVATAR_URL_LEN, MAX_DISPLAYNAME_LEN
@@ -1160,8 +1160,9 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
        elif effective_membership_state == Membership.KNOCK:
            if not is_host_in_room:
-                # we used to add the domain of the room ID to remote_room_hosts.
+                # The knock needs to be sent over federation instead
-                # This is not safe in MSC4291 rooms which do not have a domain.
+                remote_room_hosts.append(get_domain_from_id(room_id))
                content["membership"] = Membership.KNOCK
                try:
@@ -1920,7 +1921,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
            check_complexity
            and self.hs.config.server.limit_remote_rooms.admins_can_join
        ):
-            check_complexity = not await self.store.is_server_admin(user.to_string())
+            check_complexity = not await self.store.is_server_admin(user)
        if check_complexity:
            # Fetch the room complexity
@@ -2323,7 +2324,6 @@ def get_users_which_can_issue_invite(auth_events: StateMap[EventBase]) -> List[s
    # Check which members are able to invite by ensuring they're joined and have
    # the necessary power level.
    create_event = auth_events[(EventTypes.Create, "")]
    for (event_type, state_key), event in auth_events.items():
        if event_type != EventTypes.Member:
            continue
@@ -2331,12 +2331,8 @@ def get_users_which_can_issue_invite(auth_events: StateMap[EventBase]) -> List[s
        if event.membership != Membership.JOIN:
            continue
        if create_event.room_version.msc4289_creator_power_enabled and is_creator(
            create_event, state_key
        ):
            result.append(state_key)
        # Check if the user has a custom power level.
-        elif users.get(state_key, users_default_level) >= invite_level:
+        if users.get(state_key, users_default_level) >= invite_level:
            result.append(state_key)
    return result
--- a/synapse/handlers/sliding_sync/init.py
+++ b/synapse/handlers/sliding_sync/init.py
@@ -116,7 +116,7 @@ class SlidingSyncHandler:
        sync_config: SlidingSyncConfig,
        from_token: Optional[SlidingSyncStreamToken] = None,
        timeout_ms: int = 0,
-    ) -> Tuple[SlidingSyncResult, bool]:
+    ) -> SlidingSyncResult:
        """
        Get the sync for a client if we have new data for it now. Otherwise
        wait for new data to arrive on the server. If the timeout expires, then
@@ -128,16 +128,9 @@ class SlidingSyncHandler:
            from_token: The point in the stream to sync from. Token of the end of the
                previous batch. May be `None` if this is the initial sync request.
            timeout_ms: The time in milliseconds to wait for new data to arrive. If 0,
-                we will respond immediately but there might not be any new data so we just
+                we will immediately but there might not be any new data so we just return an
-                return an empty response.
+                empty response.
        Returns:
            A tuple containing the `SlidingSyncResult` and whether we waited for new
            activity before responding. Knowing whether we waited is useful in traces
            to filter out long-running requests where we were just waiting.
        """
        did_wait = False
        # If the user is not part of the mau group, then check that limits have
        # not been exceeded (if not part of the group by this point, almost certain
        # auth_blocking will occur)
@@ -156,7 +149,7 @@ class SlidingSyncHandler:
                logger.warning(
                    "Timed out waiting for worker to catch up. Returning empty response"
                )
-                return SlidingSyncResult.empty(from_token), did_wait
+                return SlidingSyncResult.empty(from_token)
            # If we've spent significant time waiting to catch up, take it off
            # the timeout.
@@ -192,9 +185,8 @@ class SlidingSyncHandler:
                current_sync_callback,
                from_token=from_token.stream_token,
            )
            did_wait = True
-        return result, did_wait
+        return result
    @trace
    async def current_sync_for_user(
--- a/synapse/handlers/thread_subscriptions.py
+++ b/synapse/handlers/thread_subscriptions.py
@@ -1,15 +1,9 @@
 import logging
 from http import HTTPStatus
 from typing import TYPE_CHECKING, Optional
-from synapse.api.constants import RelationTypes
+from synapse.api.errors import AuthError, NotFoundError
-from synapse.api.errors import AuthError, Codes, NotFoundError, SynapseError
+from synapse.storage.databases.main.thread_subscriptions import ThreadSubscription
-from synapse.events import relation_from_event
+from synapse.types import UserID
 from synapse.storage.databases.main.thread_subscriptions import (
    AutomaticSubscriptionConflicted,
    ThreadSubscription,
 )
 from synapse.types import EventOrderings, UserID
 if TYPE_CHECKING:
    from synapse.server import HomeServer
@@ -61,79 +55,42 @@ class ThreadSubscriptionsHandler:
        room_id: str,
        thread_root_event_id: str,
        *,
-        automatic_event_id: Optional[str],
+        automatic: bool,
    ) -> Optional[int]:
        """Sets or updates a user's subscription settings for a specific thread root.
        Args:
            requester_user_id: The ID of the user whose settings are being updated.
            thread_root_event_id: The event ID of the thread root.
-            automatic_event_id: if the user was subscribed by an automatic decision by
+            automatic: whether the user was subscribed by an automatic decision by
-                their client, the event ID that caused this.
+                their client.
        Returns:
            The stream ID for this update, if the update isn't no-opped.
        Raises:
            NotFoundError if the user cannot access the thread root event, or it isn't
-            known to this homeserver. Ditto for the automatic cause event if supplied.
+            known to this homeserver.
            SynapseError(400, M_NOT_IN_THREAD): if client supplied an automatic cause event
            but user cannot access the event.
            SynapseError(409, M_SKIPPED): if client requested an automatic subscription
            but it was skipped because the cause event is logically later than an unsubscription.
        """
        # First check that the user can access the thread root event
        # and that it exists
        try:
-            thread_root_event = await self.event_handler.get_event(
+            event = await self.event_handler.get_event(
                user_id, room_id, thread_root_event_id
            )
-            if thread_root_event is None:
+            if event is None:
                raise NotFoundError("No such thread root")
        except AuthError:
            logger.info("rejecting thread subscriptions change (thread not accessible)")
            raise NotFoundError("No such thread root")
-        if automatic_event_id:
+        return await self.store.subscribe_user_to_thread(
            autosub_cause_event = await self.event_handler.get_event(
                user_id, room_id, automatic_event_id
            )
            if autosub_cause_event is None:
                raise NotFoundError("Automatic subscription event not found")
            relation = relation_from_event(autosub_cause_event)
            if (
                relation is None
                or relation.rel_type != RelationTypes.THREAD
                or relation.parent_id != thread_root_event_id
            ):
                raise SynapseError(
                    HTTPStatus.BAD_REQUEST,
                    "Automatic subscription must use an event in the thread",
                    errcode=Codes.MSC4306_NOT_IN_THREAD,
                )
            automatic_event_orderings = EventOrderings.from_event(autosub_cause_event)
        else:
            automatic_event_orderings = None
        outcome = await self.store.subscribe_user_to_thread(
            user_id.to_string(),
-            room_id,
+            event.room_id,
            thread_root_event_id,
-            automatic_event_orderings=automatic_event_orderings,
+            automatic=automatic,
        )
        if isinstance(outcome, AutomaticSubscriptionConflicted):
            raise SynapseError(
                HTTPStatus.CONFLICT,
                "Automatic subscription obsoleted by an unsubscription request.",
                errcode=Codes.MSC4306_CONFLICTING_UNSUBSCRIPTION,
            )
        return outcome
    async def unsubscribe_user_from_thread(
        self, user_id: UserID, room_id: str, thread_root_event_id: str
    ) -> Optional[int]:
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -337,7 +337,7 @@ class _AsyncResource(resource.Resource, metaclass=abc.ABCMeta):
                    callback_return = await self._async_render(request)
                except LimitExceededError as e:
                    if e.pause:
-                        await self._clock.sleep(e.pause)
+                        self._clock.sleep(e.pause)
                    raise
                if callback_return is not None:
@@ -702,10 +702,6 @@ class _ByteProducer:
        self._request: Optional[Request] = request
        self._iterator = iterator
        self._paused = False
        self.tracing_scope = start_active_span(
            "write_bytes_to_request",
        )
        self.tracing_scope.__enter__()
        try:
            self._request.registerProducer(self, True)
@@ -716,8 +712,8 @@ class _ByteProducer:
            logger.info("Connection disconnected before response was written: %r", e)
            # We drop our references to data we'll not use.
            self._request = None
            self._iterator = iter(())
            self.tracing_scope.__exit__(type(e), None, e.__traceback__)
        else:
            # Start producing if `registerProducer` was successful
            self.resumeProducing()
@@ -731,9 +727,6 @@ class _ByteProducer:
        self._request.write(b"".join(data))
    def pauseProducing(self) -> None:
        opentracing_span = active_span()
        if opentracing_span is not None:
            opentracing_span.log_kv({"event": "producer_paused"})
        self._paused = True
    def resumeProducing(self) -> None:
@@ -744,10 +737,6 @@ class _ByteProducer:
        self._paused = False
        opentracing_span = active_span()
        if opentracing_span is not None:
            opentracing_span.log_kv({"event": "producer_resumed"})
        # Write until there's backpressure telling us to stop.
        while not self._paused:
            # Get the next chunk and write it to the request.
@@ -782,7 +771,6 @@ class _ByteProducer:
    def stopProducing(self) -> None:
        # Clear a circular reference.
        self._request = None
        self.tracing_scope.__exit__(None, None, None)
 def _encode_json_bytes(json_object: object) -> bytes:
@@ -925,9 +913,8 @@ def _write_bytes_to_request(request: Request, bytes_to_write: bytes) -> None:
    # once (via `Request.write`) is that doing so starts the timeout for the
    # next request to be received: so if it takes longer than 60s to stream back
    # the response to the client, the client never gets it.
    # c.f https://github.com/twisted/twisted/issues/12498
    #
-    # One workaround is to use a `Producer`; then the timeout is only
+    # The correct solution is to use a Producer; then the timeout is only
    # started once all of the content is sent over the TCP connection.
    # To make sure we don't write all of the bytes at once we split it up into
--- a/synapse/logging/context.py
+++ b/synapse/logging/context.py
@@ -56,6 +56,7 @@ from twisted.internet import defer, threads
 from twisted.python.threadpool import ThreadPool
 if TYPE_CHECKING:
    from synapse.logging.scopecontextmanager import _LogContextScope
    from synapse.types import ISynapseReactor
 logger = logging.getLogger(__name__)
@@ -229,13 +230,14 @@ LoggingContextOrSentinel = Union["LoggingContext", "_Sentinel"]
 class _Sentinel:
    """Sentinel to represent the root context"""
-    __slots__ = ["previous_context", "finished", "request", "tag"]
+    __slots__ = ["previous_context", "finished", "request", "scope", "tag"]
    def __init__(self) -> None:
        # Minimal set for compatibility with LoggingContext
        self.previous_context = None
        self.finished = False
        self.request = None
        self.scope = None
        self.tag = None
    def __str__(self) -> str:
@@ -288,6 +290,7 @@ class LoggingContext:
        "finished",
        "request",
        "tag",
        "scope",
    ]
    def __init__(
@@ -308,6 +311,7 @@ class LoggingContext:
        self.main_thread = get_thread_id()
        self.request = None
        self.tag = ""
        self.scope: Optional["_LogContextScope"] = None
        # keep track of whether we have hit the __exit__ block for this context
        # (suggesting that the the thing that created the context thinks it should
@@ -320,6 +324,9 @@ class LoggingContext:
            # we track the current request_id
            self.request = self.parent_context.request
            # we also track the current scope:
            self.scope = self.parent_context.scope
        if request is not None:
            # the request param overrides the request from the parent context
            self.request = request
--- a/synapse/logging/opentracing.py
+++ b/synapse/logging/opentracing.py
@@ -251,17 +251,18 @@ class _DummyTagNames:
 try:
    import opentracing
    import opentracing.tags
    from opentracing.scope_managers.contextvars import ContextVarsScopeManager
    tags = opentracing.tags
 except ImportError:
    opentracing = None  # type: ignore[assignment]
    tags = _DummyTagNames  # type: ignore[assignment]
    ContextVarsScopeManager = None  # type: ignore
 try:
    from jaeger_client import Config as JaegerConfig
    from synapse.logging.scopecontextmanager import LogContextScopeManager
 except ImportError:
    JaegerConfig = None  # type: ignore
    LogContextScopeManager = None  # type: ignore
 try:
@@ -483,7 +484,7 @@ def init_tracer(hs: "HomeServer") -> None:
    config = JaegerConfig(
        config=jaeger_config,
        service_name=f"{hs.config.server.server_name} {instance_name_by_type}",
-        scope_manager=ContextVarsScopeManager(),
+        scope_manager=LogContextScopeManager(),
        metrics_factory=PrometheusMetricsFactory(),
    )
--- a/synapse/logging/scopecontextmanager.py
+++ b/synapse/logging/scopecontextmanager.py
@@ -0,0 +1,161 @@
 #
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 # Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # See the GNU Affero General Public License for more details:
 # <https://www.gnu.org/licenses/agpl-3.0.html>.
 #
 # Originally licensed under the Apache License, Version 2.0:
 # <http://www.apache.org/licenses/LICENSE-2.0>.
 #
 # [This file includes modifications made by New Vector Limited]
 #
 #
 import logging
 from typing import Optional
 from opentracing import Scope, ScopeManager, Span
 from synapse.logging.context import (
    LoggingContext,
    current_context,
    nested_logging_context,
 )
 logger = logging.getLogger(__name__)
 class LogContextScopeManager(ScopeManager):
    """
    The LogContextScopeManager tracks the active scope in opentracing
    by using the log contexts which are native to synapse. This is so
    that the basic opentracing api can be used across twisted defereds.
    It would be nice just to use opentracing's ContextVarsScopeManager,
    but currently that doesn't work due to https://twistedmatrix.com/trac/ticket/10301.
    """
    def __init__(self) -> None:
        pass
    @property
    def active(self) -> Optional[Scope]:
        """
        Returns the currently active Scope which can be used to access the
        currently active Scope.span.
        If there is a non-null Scope, its wrapped Span
        becomes an implicit parent of any newly-created Span at
        Tracer.start_active_span() time.
        Return:
            The Scope that is active, or None if not available.
        """
        ctx = current_context()
        return ctx.scope
    def activate(self, span: Span, finish_on_close: bool) -> Scope:
        """
        Makes a Span active.
        Args
            span: the span that should become active.
            finish_on_close: whether Span should be automatically finished when
                Scope.close() is called.
        Returns:
            Scope to control the end of the active period for
            *span*. It is a programming error to neglect to call
            Scope.close() on the returned instance.
        """
        ctx = current_context()
        if not ctx:
            logger.error("Tried to activate scope outside of loggingcontext")
            return Scope(None, span)  # type: ignore[arg-type]
        if ctx.scope is not None:
            # start a new logging context as a child of the existing one.
            # Doing so -- rather than updating the existing logcontext -- means that
            # creating several concurrent spans under the same logcontext works
            # correctly.
            ctx = nested_logging_context("")
            enter_logcontext = True
        else:
            # if there is no span currently associated with the current logcontext, we
            # just store the scope in it.
            #
            # This feels a bit dubious, but it does hack around a problem where a
            # span outlasts its parent logcontext (which would otherwise lead to
            # "Re-starting finished log context" errors).
            enter_logcontext = False
        scope = _LogContextScope(self, span, ctx, enter_logcontext, finish_on_close)
        ctx.scope = scope
        if enter_logcontext:
            ctx.__enter__()
        return scope
 class _LogContextScope(Scope):
    """
    A custom opentracing scope, associated with a LogContext
      * When the scope is closed, the logcontext's active scope is reset to None.
        and - if enter_logcontext was set - the logcontext is finished too.
    """
    def __init__(
        self,
        manager: LogContextScopeManager,
        span: Span,
        logcontext: LoggingContext,
        enter_logcontext: bool,
        finish_on_close: bool,
    ):
        """
        Args:
            manager:
                the manager that is responsible for this scope.
            span:
                the opentracing span which this scope represents the local
                lifetime for.
            logcontext:
                the log context to which this scope is attached.
            enter_logcontext:
                if True the log context will be exited when the scope is finished
            finish_on_close:
                if True finish the span when the scope is closed
        """
        super().__init__(manager, span)
        self.logcontext = logcontext
        self._finish_on_close = finish_on_close
        self._enter_logcontext = enter_logcontext
    def __str__(self) -> str:
        return f"Scope<{self.span}>"
    def close(self) -> None:
        active_scope = self.manager.active
        if active_scope is not self:
            logger.error(
                "Closing scope %s which is not the currently-active one %s",
                self,
                active_scope,
            )
        if self._finish_on_close:
            self.span.finish()
        self.logcontext.scope = None
        if self._enter_logcontext:
            self.logcontext.__exit__(None, None, None)
--- a/synapse/metrics/init.py
+++ b/synapse/metrics/init.py
@@ -170,9 +170,7 @@ class LaterGauge(Collector):
    ]
    def collect(self) -> Iterable[Metric]:
-        # The decision to add `SERVER_NAME_LABEL` is from the `LaterGauge` usage itself
+        g = GaugeMetricFamily(self.name, self.desc, labels=self.labelnames)
        # (we don't enforce it here, one level up).
        g = GaugeMetricFamily(self.name, self.desc, labels=self.labelnames)  # type: ignore[missing-server-name-label]
        try:
            calls = self.caller()
@@ -306,9 +304,7 @@ class InFlightGauge(Generic[MetricsEntry], Collector):
        Note: may be called by a separate thread.
        """
-        # The decision to add `SERVER_NAME_LABEL` is from the `GaugeBucketCollector`
+        in_flight = GaugeMetricFamily(
        # usage itself (we don't enforce it here, one level up).
        in_flight = GaugeMetricFamily(  # type: ignore[missing-server-name-label]
            self.name + "_total", self.desc, labels=self.labels
        )
@@ -332,9 +328,7 @@ class InFlightGauge(Generic[MetricsEntry], Collector):
        yield in_flight
        for name in self.sub_metrics:
-            # The decision to add `SERVER_NAME_LABEL` is from the `InFlightGauge` usage
+            gauge = GaugeMetricFamily(
            # itself (we don't enforce it here, one level up).
            gauge = GaugeMetricFamily(  # type: ignore[missing-server-name-label]
                "_".join([self.name, name]), "", labels=self.labels
            )
            for key, metrics in metrics_by_key.items():
@@ -489,9 +483,7 @@ class GaugeBucketCollector(Collector):
        # that bucket or below.
        accumulated_values = itertools.accumulate(bucket_values)
-        # The decision to add `SERVER_NAME_LABEL` is from the `GaugeBucketCollector`
+        return GaugeHistogramMetricFamilyWithLabels(
        # usage itself (we don't enforce it here, one level up).
        return GaugeHistogramMetricFamilyWithLabels(  # type: ignore[missing-server-name-label]
            name=self._name,
            documentation=self._documentation,
            labelnames=self._labelnames,
@@ -527,19 +519,16 @@ class CPUMetrics(Collector):
            line = s.read()
            raw_stats = line.split(") ", 1)[1].split(" ")
-            # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+            user = GaugeMetricFamily("process_cpu_user_seconds_total", "")
            user = GaugeMetricFamily("process_cpu_user_seconds_total", "")  # type: ignore[missing-server-name-label]
            user.add_metric([], float(raw_stats[11]) / self.ticks_per_sec)
            yield user
-            # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+            sys = GaugeMetricFamily("process_cpu_system_seconds_total", "")
            sys = GaugeMetricFamily("process_cpu_system_seconds_total", "")  # type: ignore[missing-server-name-label]
            sys.add_metric([], float(raw_stats[12]) / self.ticks_per_sec)
            yield sys
-# This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+REGISTRY.register(CPUMetrics())
 REGISTRY.register(CPUMetrics())  # type: ignore[missing-server-name-label]
 #
--- a/synapse/metrics/_gc.py
+++ b/synapse/metrics/_gc.py
@@ -83,8 +83,7 @@ gc_time = Histogram(  # type: ignore[missing-server-name-label]
 class GCCounts(Collector):
    def collect(self) -> Iterable[Metric]:
-        # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+        cm = GaugeMetricFamily("python_gc_counts", "GC object counts", labels=["gen"])
        cm = GaugeMetricFamily("python_gc_counts", "GC object counts", labels=["gen"])  # type: ignore[missing-server-name-label]
        for n, m in enumerate(gc.get_count()):
            cm.add_metric([str(n)], m)
@@ -103,8 +102,7 @@ def install_gc_manager() -> None:
    if running_on_pypy:
        return
-    # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+    REGISTRY.register(GCCounts())
    REGISTRY.register(GCCounts())  # type: ignore[missing-server-name-label]
    gc.disable()
@@ -179,8 +177,7 @@ class PyPyGCStats(Collector):
        #
        #     Total time spent in GC:  0.073                  # s.total_gc_time
-        # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+        pypy_gc_time = CounterMetricFamily(
        pypy_gc_time = CounterMetricFamily(  # type: ignore[missing-server-name-label]
            "pypy_gc_time_seconds_total",
            "Total time spent in PyPy GC",
            labels=[],
@@ -188,8 +185,7 @@ class PyPyGCStats(Collector):
        pypy_gc_time.add_metric([], s.total_gc_time / 1000)
        yield pypy_gc_time
-        # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+        pypy_mem = GaugeMetricFamily(
        pypy_mem = GaugeMetricFamily(  # type: ignore[missing-server-name-label]
            "pypy_memory_bytes",
            "Memory tracked by PyPy allocator",
            labels=["state", "class", "kind"],
@@ -213,5 +209,4 @@ class PyPyGCStats(Collector):
 if running_on_pypy:
-    # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+    REGISTRY.register(PyPyGCStats())
    REGISTRY.register(PyPyGCStats())  # type: ignore[missing-server-name-label]
--- a/synapse/metrics/_reactor_metrics.py
+++ b/synapse/metrics/_reactor_metrics.py
@@ -115,8 +115,7 @@ class ReactorLastSeenMetric(Collector):
        self._call_wrapper = call_wrapper
    def collect(self) -> Iterable[Metric]:
-        # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+        cm = GaugeMetricFamily(
        cm = GaugeMetricFamily(  # type: ignore[missing-server-name-label]
            "python_twisted_reactor_last_seen",
            "Seconds since the Twisted reactor was last seen",
        )
@@ -167,5 +166,4 @@ except Exception as e:
 if wrapper:
-    # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+    REGISTRY.register(ReactorLastSeenMetric(wrapper))
    REGISTRY.register(ReactorLastSeenMetric(wrapper))  # type: ignore[missing-server-name-label]
--- a/synapse/metrics/background_process_metrics.py
+++ b/synapse/metrics/background_process_metrics.py
@@ -167,9 +167,7 @@ class _Collector(Collector):
            yield from m.collect()
-# The `SERVER_NAME_LABEL` is included in the individual metrics added to this registry,
+REGISTRY.register(_Collector())
 # so we don't need to worry about it on the collector itself.
 REGISTRY.register(_Collector())  # type: ignore[missing-server-name-label]
 class _BackgroundProcess:
--- a/synapse/metrics/jemalloc.py
+++ b/synapse/metrics/jemalloc.py
@@ -188,8 +188,7 @@ def _setup_jemalloc_stats() -> None:
        def collect(self) -> Iterable[Metric]:
            stats.refresh_stats()
-            # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+            g = GaugeMetricFamily(
            g = GaugeMetricFamily(  # type: ignore[missing-server-name-label]
                "jemalloc_stats_app_memory_bytes",
                "The stats reported by jemalloc",
                labels=["type"],
@@ -231,8 +230,7 @@ def _setup_jemalloc_stats() -> None:
            yield g
-    # This is a process-level metric, so it does not have the `SERVER_NAME_LABEL`.
+    REGISTRY.register(JemallocCollector())
    REGISTRY.register(JemallocCollector())  # type: ignore[missing-server-name-label]
    logger.debug("Added jemalloc stats")
--- a/synapse/module_api/init.py
+++ b/synapse/module_api/init.py
@@ -342,9 +342,7 @@ class ModuleApi:
        self._device_handler = hs.get_device_handler()
        self.custom_template_dir = hs.config.server.custom_template_directory
        self._callbacks = hs.get_module_api_callbacks()
-        self._auth_delegation_enabled = (
+        self.msc3861_oauth_delegation_enabled = hs.config.experimental.msc3861.enabled
            hs.config.mas.enabled or hs.config.experimental.msc3861.enabled
        )
        self._event_serializer = hs.get_event_client_serializer()
        try:
@@ -551,7 +549,7 @@ class ModuleApi:
        Added in Synapse v1.46.0.
        """
-        if self._auth_delegation_enabled:
+        if self.msc3861_oauth_delegation_enabled:
            raise ConfigError(
                "Cannot use password auth provider callbacks when OAuth delegation is enabled"
            )
@@ -761,7 +759,7 @@ class ModuleApi:
        Returns:
            True if the user is a server admin, False otherwise.
        """
-        return await self._store.is_server_admin(user_id)
+        return await self._store.is_server_admin(UserID.from_string(user_id))
    async def set_user_admin(self, user_id: str, admin: bool) -> None:
        """Sets if a user is a server admin.
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -25,7 +25,6 @@ from typing import (
    Any,
    Collection,
    Dict,
    FrozenSet,
    List,
    Mapping,
    Optional,
@@ -49,7 +48,7 @@ from synapse.api.constants import (
 from synapse.api.room_versions import PushRuleRoomFlag
 from synapse.event_auth import auth_types_for_event, get_user_power_level
 from synapse.events import EventBase, relation_from_event
-from synapse.events.snapshot import EventContext, EventPersistencePair
+from synapse.events.snapshot import EventContext
 from synapse.logging.context import make_deferred_yieldable, run_in_background
 from synapse.metrics import SERVER_NAME_LABEL
 from synapse.state import CREATE_KEY, POWER_KEY
@@ -352,7 +351,7 @@ class BulkPushRuleEvaluator:
        return related_events
    async def action_for_events_by_user(
-        self, events_and_context: List[EventPersistencePair]
+        self, events_and_context: List[Tuple[EventBase, EventContext]]
    ) -> None:
        """Given a list of events and their associated contexts, evaluate the push rules
        for each event, check if the message should increment the unread count, and
@@ -478,18 +477,8 @@ class BulkPushRuleEvaluator:
            event.room_version.msc3931_push_features,
            self.hs.config.experimental.msc1767_enabled,  # MSC3931 flag
            self.hs.config.experimental.msc4210_enabled,
            self.hs.config.experimental.msc4306_enabled,
        )
        msc4306_thread_subscribers: Optional[FrozenSet[str]] = None
        if self.hs.config.experimental.msc4306_enabled and thread_id != MAIN_TIMELINE:
            # pull out, in batch, all local subscribers to this thread
            # (in the common case, they will all be getting processed for push
            # rules right now)
            msc4306_thread_subscribers = await self.store.get_subscribers_to_thread(
                event.room_id, thread_id
            )
        for uid, rules in rules_by_user.items():
            if event.sender == uid:
                continue
@@ -514,13 +503,7 @@ class BulkPushRuleEvaluator:
                # current user, it'll be added to the dict later.
                actions_by_user[uid] = []
-            msc4306_thread_subscription_state: Optional[bool] = None
+            actions = evaluator.run(rules, uid, display_name)
            if msc4306_thread_subscribers is not None:
                msc4306_thread_subscription_state = uid in msc4306_thread_subscribers
            actions = evaluator.run(
                rules, uid, display_name, msc4306_thread_subscription_state
            )
            if "notify" in actions:
                # Push rules say we should notify the user of this event
                actions_by_user[uid] = actions
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Banfield-Zanin	08db3aec0b	^/_matrix/client/(api/v1\|r0\|v3\|unstable)/devices$ should also go to the workers responsible for the `device_lists` stream.	2025-08-01 12:11:53 +01:00
Ben Banfield-Zanin	b23ffab70e	Fix regex in device_signing upload path in worker documentation	2025-08-01 12:09:31 +01:00
		`@@ -0,0 +1 @@`
							`Add debug logging for HMAC digest verification failures when using the admin API to register users.`
		`@@ -0,0 +1 @@`
							`Add configurable rate limiting for the creation of rooms.`
		`@@ -0,0 +1 @@`
							`Add support for [MSC4293](https://github.com/matrix-org/matrix-spec-proposals/pull/4293) - Redact on Kick/Ban.`
		`@@ -0,0 +1 @@`
							`Fix config documentation generation script on Windows by enforcing UTF-8.`
		`@@ -0,0 +1 @@`
							When admins enable themselves to see soft-failed events, they will also see if the cause is due to the policy server flagging them as spam via `unsigned`.
		`@@ -0,0 +1 @@`
							Refactor `Counter` metrics to be homeserver-scoped.
		`@@ -0,0 +1 @@`
							`Refactor background process metrics to be homeserver-scoped.`
		`@@ -0,0 +1 @@`
							Add ability to configure forward/outbound proxy via homeserver config instead of environment variables. See `http_proxy`, `https_proxy`, `no_proxy_hosts`.
		`@@ -0,0 +1 @@`
							`Allow return code 403 (allowed by C2S Spec since v1.2) when fetching profiles via federation.`