🐛(frontend) return real 404s for missing hashed assets

Nginx was rewriting missing `/assets/*` files to `index.html`, so requests for stale chunks got a 200 with the SPA shell served as a JS module. That is what turned a plain 404 into the confusing: "TypeError: error loading dynamically imported module" whenever a client loaded before a deployment requested an old chunk. Stop rewriting missing `/assets/*` to `index.html`: those requests now return a real 404 with `Cache-Control: no-store`. SPA route fallback for non-asset paths is unchanged.
✨(frontend) recover from stale lazy-loaded chunks after a deploy
2026-08-13 20:27:01 +00:00 · 2026-08-12 19:40:47 +02:00 · 2026-08-12 19:37:24 +02:00 · 2026-08-12 14:56:03 +02:00 · 2026-08-12 14:52:09 +02:00 · 2026-08-12 14:52:09 +02:00
436 changed files with 20887 additions and 9916 deletions
@@ -46,7 +46,7 @@ jobs:
          images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-backend'
      -
        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_HUB_USER }}
@@ -65,7 +65,7 @@ jobs:
          target: backend-production
          platforms: ${{ env.BUILD_PLATFORMS }}
          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}

@@ -92,7 +92,7 @@ jobs:
          images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-frontend'
      -
        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_HUB_USER }}
@@ -112,7 +112,7 @@ jobs:
          target: frontend-production
          platforms: ${{ env.BUILD_PLATFORMS }}
          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}

@@ -139,7 +139,7 @@ jobs:
          images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-frontend-dinum'
      -
        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_HUB_USER }}
@@ -159,7 +159,7 @@ jobs:
          target: frontend-production
          platforms: ${{ env.BUILD_PLATFORMS }}
          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}

@@ -186,7 +186,7 @@ jobs:
          images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-summary'
      -
        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_HUB_USER }}
@@ -208,7 +208,7 @@ jobs:
          target: production
          platforms: ${{ env.BUILD_PLATFORMS }}
          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}

@@ -235,7 +235,7 @@ jobs:
          images: lasuite/meet-agents
      -
        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_HUB_USER }}
@@ -257,7 +257,7 @@ jobs:
          target: production
          platforms: ${{ env.BUILD_PLATFORMS }}
          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}

@@ -82,7 +82,7 @@ jobs:
      - name: Install Node.js
        uses: actions/setup-node@v6
        with:
-          node-version: "18"
+          node-version: "22"

      - name: Restore the mail templates
        uses: actions/cache@v5
@@ -305,7 +305,6 @@ jobs:
        working-directory: src/summary

    env:
-      V1_TENANT_ID: 'test-tenant'
      AUTHORIZED_TENANTS: '[{"id": "test-tenant", "api_key": "test-api-token", "webhook_url": "https://example.com/webhook", "webhook_api_key": "test-webhook-api-key"}]'
      AWS_STORAGE_BUCKET_NAME: "http://meet-media-storage"
      AWS_S3_ENDPOINT_URL: "minio:9000"
@@ -1,29 +0,0 @@
-# /!\
-# Security Note: This action is not hardened against prompt injection attacks and should only be used
-# to review trusted PRs. Configure your repository with "Require approval for all external contributors"
-# to ensure workflows only run after a maintainer has reviewed the PR.
-name: Security Review
-
-permissions:
-  pull-requests: write  # Needed for leaving PR comments
-  contents: read
-
-on:
-  pull_request:
-    branches:
-      - 'main'
-
-jobs:
-  security:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          fetch-depth: 2
-
-      - uses: anthropics/claude-code-security-review@0c6a49f1fa56a1d472575da86a94dbc1edb78eda
-        with:
-          comment-pr: true
-          exclude-directories: docs,gitlint,LICENSES,bin
-          claude-api-key: ${{ secrets.CLAUDE_API_KEY }}
@@ -8,6 +8,206 @@ and this project adheres to

 ## [Unreleased]

+### Fixed
+
+- ✨(frontend) recover from stale lazy-loaded chunks after a deploy
+
+## [1.26.0] - 2026-08-12
+
+### Added
+
+- 📈(frontend) capture media diagnostics on media errors
+- ✨(frontend) add an audio gauge to the microphone select menu
+- ✨(frontend) add a sound tester to the output select menu
+- ✨(frontend) prompt for permissions when toggling a denied device
+- ⚗️(frontend) capture console.error in PostHog
+- 📈(frontend) snapshot media devices on the happy path
+- 🚸(frontend) guide users when the OS blocks browser media access
+- ✨(frontend) add a silent-microphone watcher on join and room screens
+
+### Changed
+
+- ♻️(frontend) encapsulate error tracking behind a telemetry module
+- ♻️(frontend) encapsulate PostHog capture calls in the telemetry module
+- 🔧(frontend) sync persisted device ids with the actual selected devices
+- 💄(frontend) hide the ProConnect button on narrow viewports
+- ♻️(frontend) prefer captureMediaEvent over reportError when no-op
+
+### Fixed
+
+- 🐛(frontend) drop exact deviceId constraint on dynamic track creation
+- 🐛(frontend) fix permission store regression
+- 🐛(frontend) handle missing device errors gracefully
+- 🐛(frontend) display the meeting id in the join screen page title
+
+## [1.25.2] - 2026-08-06
+
+### Fixed
+
+- 🐛(frontend) serve MediaPipe assets under a versioned path
+- 🐛(frontend) harmonize cache configuration for MediaPipe assets
+
+## [1.25.1] - 2026-08-06
+
+### Fixed
+
+- 🚑️(frontend) fix background crash from MediaPipe WASM version mismatch
+
+## [1.25.0] - 2026-08-05
+
+### Added
+
+- ✨(summary) report exception type in failure analytics
+- ✨(frontend) add configurable documentation menu item
+- ✨(frontend) allow promoting authenticated participants
+- ✨(frontend) introduce an "unauthenticated" participant badge
+- ✨(backend) add roomkit viewset to start a room without WebRTC join
+- ✨(frontend) let users set default configuration for generated links
+- ✨(frontend) expose media state to external gateways
+- ✨(frontend) add connection test feature
+- ✨(sdk) allow passing a background color to the calendar iframe
+- ✨(sdk) add a room configuration popup from CreateMeetingButton
+
+### Changed
+
+- ⬆️(frontend) upgrade @mediapipe/tasks-vision from 0.10.14 to 0.10.35
+- ⬆️(frontend) upgrade i18next from 26.3.1 to 26.3.6
+- ⬆️(frontend) upgrade posthog-js from 1.391.2 to 1.395.0
+- ⬆️(frontend) upgrade @tanstack/react-query from 5.101.0 to 5.101.1
+- ⬆️(frontend) upgrade livekit-client from 2.19.2 to 2.20.0
+- ⚡️(frontend) limit unnecessary re-renders #1510
+- 📝(legal) update terms of service
+- 💄(frontend) render Avatar initials in uppercase
+- 💄(frontend) improve participant name rendering in the list
+- 🚚(backend) rename TelephonyService to SIPManagement
+- ⬆️(dependencies) update python dependencies
+
+### Fixed
+
+- 🐛(transcription) fix silent bug in speaker assignment
+- 🐛(summary) extend tasks auto retry logic
+- 🐛(summary) properly detect when failure webhook should be sent
+- 🐛(backend) preserve recording metadata when updating room access
+- 🐛(backend) allow any string as sub in the API serializer
+- 🐛(frontend) fall back to user.full_name on request-entry
+- 🚸(frontend) show two initials in the Avatar when possible
+- 🩹(all) clear the SonarCloud reliability finding and the lint debt
+- 🐛(frontend) stop the installed app reopening the room it came from
+- 🐛(backend) serialize lazy title in summary payload
+- 💄(frontend) show pointer cursor on interactive switches
+- 🐛(frontend) fix icon centering in the Switch primitive
+- 🐛(frontend) keep Unicode initials intact in avatar
+- 🐛(frontend) prevent concurrent settings updates from overwriting each other
+
+## [1.24.0] - 2026-07-21
+
+### Added
+
+- ✨(backend) allow searching the recording admin table by owner email
+- ✨(frontend) add participant color gradient when camera is off #1490
+- ✨(all) allow forcing SSO display name for authenticated users
+- ➕(frontend) install vite-plugin-static-copy for MediaPipe WASM assets
+- ✨(addon) show add-in tools when creating meetings in shared calendars
+
+### Changed
+
+- 🗑️(settings) deprecate SUMMARY_SERVICE_VERSION=1
+- ⬆️(mail) update mjml to v5 and @html-to/text-cli
+- 🚸(frontend) initialize the join input name with the persisted full name
+- ♻️(frontend) refactor background processors to use the new API
+- ♻️(frontend) inline model weights to avoid loading them from remote
+- ♻️(frontend) inline MediaPipe WASM modules to avoid loading from remote
+- ⬆️(frontend) upgrade posthog-js from 1.387.0 to 1.391.2
+- ⬆️(frontend) upgrade react-stately from 3.47.0 to 3.48.0
+- ⬆️(frontend) upgrade react-aria from 3.49.0 to 3.50.0
+- ⬆️(frontend) upgrade react-aria-components from 1.18.0 to 1.19.0
+
+### Fixed
+
+- 🩹(backend) identify externally provisioned users to PostHog
+- 🐛(backend) fix info panel crash for unregistered rooms
+- ♿️(frontend) focus side panel container on open #1452
+- 🐛(summary) whisper call error handling
+
+## [1.23.0] - 2026-07-08
+
+### Added
+
+- ✨(backend) extend analytics module to support feature flags
+- ✨(backend) implement feature flags in Posthog analytics backend
+- ✨(agents) report errors to Sentry for all LiveKit agents
+
+### Changed
+
+- ⬆️(agents) upgrade to python 3.14 slim
+- ⬆️(dependencies) update python dependencies
+- 💥(summary) remove v1 related code #1362
+- ✨(meet) use compatible with summary v2 #1362
+- ♻️(backend) refactor analytics backend from Protocol to abstract class
+- 🔥(summary) remove call to summary enabled feature flag
+- ♻️(frontend) wrap MuteEveryoneButton with AdminOrOwnerOnly
+- ⬆️(frontend) upgrade livekit-client from 2.19.0 to 2.19.2
+- ⬆️(frontend) upgrade posthog-js from 1.386.5 to 1.387.0
+- ⬆️(frontend) upgrade @tanstack/react-query from 5.100.14 to 5.101.0
+- ⬆️(frontend) update the frontend build image to Node 22
+- 🔒️(frontend) update docker image to nginx-unprivileged:1.30.3-alpine3.23
+- ✨(summary) more precise analytics events
+
+### Fixed
+
+- 🚀(front) fix frontend build failure
+- 🐛(makefile) fix args in make test
+- 🩹(backend) fix case-insensitive email deduplication in merge command
+- 🐛(summary) support media files with bad streams #1478
+
+## [1.22.0] - 2026-07-03
+
+### Added
+
+- ✨(frontend) cap and paginate tiles in picture-in-picture #1383
+- 📝(docs) document rebranding the favicon via a volume mount #1443
+- ✨(backend) add command to clean pending and deleted files
+- 🧱(helm) run clean files command as cronjob
+- ✨(backend) add fallback to save recordings without S3/MinIO webhooks
+- 🩹(frontend) enable screen share button in PiP #1458
+- 🐛(backend) support unencoded S3 notification object keys #1455
+- ✨(frontend) prioritize screen share in picture-in-picture layout #1467
+
+### Changed
+
+- ✨(summary) generalized stt api call #1420
+- ♻️(env) refactor env variables handling
+- 🚸(frontend) use "Advanced" instead of "Premium" in the sidepanel
+- ♿️(frontend) make fullscreen share warning keyboard accessible #1459
+- ⬆️(summary) update docker alpine to 3.24 & ffmpeg to 8.1.2 #1471
+
+### Fixed
+
+- 🛂(backend) reject user access tokens on the API
+- 🩹(helm) fix Helm ingress rendering when passing multiple hosts
+
+## [1.21.0] - 2026-06-15
+
+### Added
+
+- ✨(frontend) allow disabling silent login via a URL parameter
+- ✨(frontend) allow hiding the login button via a URL parameter
+- ✨(summary) add optional satisfaction survey footer
+
+### Changed
+
+- ✨(frontend) enhance noise reduction with BBBA audio processing pipeline
+- 🚸(frontend) mute join notification sound in larger rooms
+- 🚸(frontend) mute participants by default when joining a large meeting
+
+### Fixed
+
+- 🐛(frontend) fix metadata agent collector enabled check
+
+### Fixed
+
+- ♿️(frontend) improve accessibilty of the Effects panel #1401
+
 ## [1.20.0] - 2026-06-12

 ### Changed
@@ -36,7 +236,7 @@ and this project adheres to

 - 🔇(summary) make ffmpeg quiet #1404
 - 🔒️(backend) prevent accessing files if they are not ready #1395
- ⬆️(backend) upgrade idna to >=3.15 to address CVE-2026-45409
+- # ⬆️(backend) upgrade idna to >=3.15 to address CVE-2026-45409

 ## [1.18.0] - 2026-06-03

@@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
  uv sync --locked --no-dev

 # ---- mails ----
-FROM node:20 AS mail-builder
+FROM node:22 AS mail-builder

 COPY ./src/mail /mail/app

@@ -44,6 +44,7 @@ COMPOSE_EXEC        = $(COMPOSE) exec
 COMPOSE_EXEC_APP    = $(COMPOSE_EXEC) app-dev
 COMPOSE_RUN         = $(COMPOSE) run --rm
 COMPOSE_RUN_APP     = $(COMPOSE_RUN) app-dev
+COMPOSE_RUN_LINT    = $(COMPOSE_RUN) --no-deps app-dev
 COMPOSE_RUN_CROWDIN = $(COMPOSE_RUN) crowdin crowdin
 WAIT_DB             = @$(COMPOSE_RUN) dockerize -wait tcp://$(DB_HOST):$(DB_PORT) -timeout 60s

@@ -51,6 +52,14 @@ WAIT_DB             = @$(COMPOSE_RUN) dockerize -wait tcp://$(DB_HOST):$(DB_PORT
 MANAGE              = $(COMPOSE_RUN_APP) python manage.py
 MAIL_NPM            = $(COMPOSE_RUN) -w /app/src/mail node npm

+# -- Linters
+LINT_RUFF_FORMAT    = ruff format .
+LINT_RUFF_CHECK     = ruff check . --fix
+LINT_PYLINT         = pylint meet demo core
+LINT_BACK           = echo 'lint:ruff-format started…' && $(LINT_RUFF_FORMAT) \
+  && echo 'lint:ruff-check started…' && $(LINT_RUFF_CHECK) \
+  && echo 'lint:pylint started…' && $(LINT_PYLINT)
+
 # -- Frontend
 PATH_FRONT          = ./src/frontend

@@ -75,7 +84,8 @@ create-env-files: \
 	env.d/development/kc_postgresql \
 	env.d/development/summary \
 	env.d/development/kube-secret \
-	env.d/development/multi_user_transcriber
+	env.d/development/multi_user_transcriber \
+	env.d/development/metadata_collector
 .PHONY: create-env-files

 bootstrap: ## Prepare Docker images for the project
@@ -123,6 +133,7 @@ logs: ## display app-dev logs (follow mode)
 run-backend: ## start only the backend application and all needed services
 	@$(COMPOSE) up --force-recreate -d celery-dev --remove-orphans
 	@$(COMPOSE) up --force-recreate -d nginx
+	@$(COMPOSE) up -d livekit
 	@echo "Wait for postgresql to be up..."
 	@$(WAIT_DB)
 .PHONY: run-backend
@@ -187,47 +198,44 @@ demo: ## flush db then create a demo for load testing purpose
 	@$(MANAGE) create_demo
 .PHONY: demo

-# Nota bene: Black should come after isort just in case they don't agree...
 lint: ## lint back-end python sources
-lint: \
-  lint-ruff-format \
-  lint-ruff-check \
-  lint-pylint
+	@$(COMPOSE_RUN_LINT) sh -c "$(LINT_BACK)"
 .PHONY: lint

 lint-ruff-format: ## format back-end python sources with ruff
 	@echo 'lint:ruff-format started…'
-	@$(COMPOSE_RUN_APP) ruff format .
+	@$(COMPOSE_RUN_LINT) $(LINT_RUFF_FORMAT)
 .PHONY: lint-ruff-format

 lint-ruff-check: ## lint back-end python sources with ruff
 	@echo 'lint:ruff-check started…'
-	@$(COMPOSE_RUN_APP) ruff check . --fix
+	@$(COMPOSE_RUN_LINT) $(LINT_RUFF_CHECK)
 .PHONY: lint-ruff-check

 lint-pylint: ## lint back-end python sources with pylint only on changed files from main
 	@echo 'lint:pylint started…'
-	@$(COMPOSE_RUN_APP) pylint meet demo core
+	@$(COMPOSE_RUN_LINT) $(LINT_PYLINT)
 .PHONY: lint-pylint

-test: ## run project tests
-	@$(MAKE) test-back-parallel
-	@$(MAKE) test-summary
+test: ## run project tests; pass extra pytest args via ARGS, e.g. `make test ARGS="-vv"`
+	@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
+	$(MAKE) test-back-parallel ARGS="$${args}" && \
+	$(MAKE) test-summary ARGS="$${args}"
 .PHONY: test

-test-back: ## run back-end tests
-	@args="$(filter-out $@,$(MAKECMDGOALS))" && \
-	bin/pytest $${args:-${1}}
+test-back: ## run back-end tests (pass extra pytest args via ARGS)
+	@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
+	bin/pytest $${args}
 .PHONY: test-back

-test-back-parallel: ## run all back-end tests in parallel
-	@args="$(filter-out $@,$(MAKECMDGOALS))" && \
-	bin/pytest -n auto $${args:-${1}}
+test-back-parallel: ## run all back-end tests in parallel (pass extra pytest args via ARGS)
+	@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
+	bin/pytest -n auto $${args}
 .PHONY: test-back-parallel

-test-summary: ## run summary tests
-	@args="$(filter-out $@,$(MAKECMDGOALS))" && \
-	bin/pytest-summary $${args:-${1}}
+test-summary: ## run summary tests (pass extra pytest args via ARGS)
+	@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
+	bin/pytest-summary $${args}
 .PHONY: test-summary

 makemigrations:  ## run django makemigrations for the Meet project.
@@ -292,6 +300,9 @@ env.d/development/kube-secret:
 env.d/development/multi_user_transcriber:
 	cp -n env.d/development/multi_user_transcriber.dist env.d/development/multi_user_transcriber

+env.d/development/metadata_collector:
+	cp -n env.d/development/metadata_collector.dist env.d/development/metadata_collector
+
 # -- Internationalization

 env.d/development/crowdin:
@@ -12,7 +12,10 @@
  <img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/suitenumerique/meet"/>
  <a href="https://github.com/suitenumerique/meet/blob/main/LICENSE">
    <img alt="GitHub closed issues" src="https://img.shields.io/github/license/suitenumerique/meet"/>
-  </a>    
+  </a>
+  <a href="https://digitalpublicgoods.net/r/la-suite-meet-simple-video-conferencing">
+    <img src="https://img.shields.io/badge/Verified-DPG-3333AB?logo=data:image/svg%2bxml;base64,PHN2ZyB3aWR0aD0iMzEiIGhlaWdodD0iMzMiIHZpZXdCb3g9IjAgMCAzMSAzMyIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE0LjIwMDggMjEuMzY3OEwxMC4xNzM2IDE4LjAxMjRMMTEuNTIxOSAxNi40MDAzTDEzLjk5MjggMTguNDU5TDE5LjYyNjkgMTIuMjExMUwyMS4xOTA5IDEzLjYxNkwxNC4yMDA4IDIxLjM2NzhaTTI0LjYyNDEgOS4zNTEyN0wyNC44MDcxIDMuMDcyOTdMMTguODgxIDUuMTg2NjJMMTUuMzMxNCAtMi4zMzA4MmUtMDVMMTEuNzgyMSA1LjE4NjYyTDUuODU2MDEgMy4wNzI5N0w2LjAzOTA2IDkuMzUxMjdMMCAxMS4xMTc3TDMuODQ1MjEgMTYuMDg5NUwwIDIxLjA2MTJMNi4wMzkwNiAyMi44Mjc3TDUuODU2MDEgMjkuMTA2TDExLjc4MjEgMjYuOTkyM0wxNS4zMzE0IDMyLjE3OUwxOC44ODEgMjYuOTkyM0wyNC44MDcxIDI5LjEwNkwyNC42MjQxIDIyLjgyNzdMMzAuNjYzMSAyMS4wNjEyTDI2LjgxNzYgMTYuMDg5NUwzMC42NjMxIDExLjExNzdMMjQuNjI0MSA5LjM1MTI3WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+Cg==" alt="DPG Badge"/>
+  </a>
 </p>

 <p align="center">
@@ -28,6 +31,14 @@
 ## La Suite Meet: Simple Video Conferencing

 Powered by [LiveKit](https://livekit.io/), La Suite Meet offers Zoom-level performance with high-quality video and audio. No installation required—simply join calls directly from your browser. Check out LiveKit's impressive optimizations in their [blog post](https://blog.livekit.io/livekit-one-dot-zero/).
+
+> [!TIP]
+> New here? Start by introducing yourself in our Matrix channel:
+> **https://matrix.to/#/#meet-official:matrix.org**
+>
+> We’re happy to discuss ideas, answer questions, and help to deploy LaSuite Meet.
+
+
 ### Features
 - Optimized for stability in large meetings (+100 p.)
 - Support for multiple screen sharing streams
@@ -52,7 +63,7 @@ We’re continuously adding new features to enhance your experience, with the la

 ### 🚀 Major roll out to all French public servants

-On the 25th of January 2026, David Amiel, France’s Minister for Civil Service and State Reform, announced the full deployment of Visio—the French government’s dedicated Meet platform—to all public servants. ([Source in French](https://www.latribune.fr/article/la-tribune-dimanche/politique/73157688099661/david-amiel-ministre-delegue-de-la-fonction-publique-nous-allons-sortir-de-la-dependance-aux-outils-americains))
+On the 29th of January 2026, Prime Minister Sébastien Lecornu, announced the full deployment of Visio—the French government’s dedicated Meet platform—to all public servants. ([Source in English](https://www.nytimes.com/2026/01/29/world/europe/france-zoom-alternative-visio.html))

 ## Table of Contents

@@ -84,22 +95,57 @@ We use Kubernetes for our [production instance](https://visio.numerique.gouv.fr/
 #### Known instances
 We hope to see many more, here is an incomplete list of public La Suite Meet instances. Feel free to make a PR to add ones that are not listed below🙏

-| Url                                                           | Org | Access |
-|---------------------------------------------------------------| --- | ------- |
-| [visio.numerique.gouv.fr](https://visio.numerique.gouv.fr/)   | DINUM    | French public agents working for the central administration and the extended public sphere. ProConnect is required to login in or sign up|
-| [visio.suite.anct.gouv.fr](https://visio.suite.anct.gouv.fr/) | ANCT    | French public agents working for the territorial administration and the extended public sphere. ProConnect is required to login in or sign up|
-| [visio.lasuite.coop](https://visio.lasuite.coop/)             | lasuite.coop    | Free and open demo to all. Content and accounts are reset after one month |
-| [mosacloud.cloud](https://mosa.cloud/)                        | mosa.cloud    | Demo instance of mosa.cloud, a dutch company providing services around La Suite apps. |
+| Url                                                           | Org          | Access                                                                                                                                        |
+|---------------------------------------------------------------|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| [visio.numerique.gouv.fr](https://visio.numerique.gouv.fr/)   | DINUM        | French public agents working for the central administration and the extended public sphere. ProConnect is required to login in or sign up     |
+| [visio.suite.anct.gouv.fr](https://visio.suite.anct.gouv.fr/) | ANCT         | French public agents working for the territorial administration and the extended public sphere. ProConnect is required to login in or sign up |
+| [visio.lasuite.coop](https://visio.lasuite.coop/)             | lasuite.coop | Free and open demo to all. Content and accounts are reset after one month                                                                     |
+| [mosacloud.cloud](https://mosa.cloud/)                        | mosa.cloud   | Demo instance of mosa.cloud, a dutch company providing services around La Suite apps.                                                         |
+| [Clever Cloud](https://www.clever.cloud/product/visio/)       | clever cloud | Openvisio is a sovereign video conferencing solution based on LaSuite Meet offered by [Clever Cloud](https://www.clever.cloud/).              |
+| [Email.eu](https://email.eu/)                                 | Email.eu     | Sovereign business workspace.                                                                                                                 |


-## Contributing
+# Contributing

-We <3 contributions of any kind, big and small:
+We <3 contributions of all kinds **big or small** and we’re genuinely glad you’re here. 🌱

- Vote on features or get early access to beta functionality in our [roadmap](https://github.com/orgs/suitenumerique/projects/11/views/4)
- Open a PR (see our instructions on [developing La Suite Meet locally](https://github.com/suitenumerique/meet/blob/main/docs/developping_locally.md))
- Submit a [feature request](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=enhancement&template=Feature_request.md) or [bug report](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=bug&template=Bug_report.md)
+### Start by saying hi

+**The best first contribution is simply to come say hi.**
+
+Before opening a PR, especially a larger one, or one written with the help of AI, we encourage you to reach out to a maintainer on our [Matrix channel](https://matrix.to/#/#meet-official:matrix.org) (@antoine.lebaud:matrix.org).
+
+Getting in touch early helps us align on goals, avoid duplicated or wasted effort, and build a community that stays active, welcoming, and fun to be part of. There are no silly questions here: whether you’ve shipped hundreds of PRs or you’re just getting started, you’re welcome.
+
+### AI contributions
+
+AI-assisted contributions are welcome. But code is never the end goal. What matters most is building relationships, sharing knowledge, and growing a sustainable community over time.
+
+If your contribution has been heavily generated with AI, please be transparent about it. This helps maintainers review it with the right context and respects the time they invest in the project.
+
+Using AI does not transfer ownership of the contribution: you should still fully understand the code, the problem it solves, and the reasoning behind the approach you propose. In short, even if AI helped write it, the why should still be yours.
+
+### Contributions beyond code
+
+**Not technical? We need you too.**
+Open source is much more than code. Writing documentation, improving onboarding, translating content, answering questions, reporting bugs, or simply helping others feel welcome all make a huge difference.
+
+### Ways to contribute
+
+When you’re ready, here are a few ways to get involved:
+
+* 👋 **Say hello** and share your ideas with the community and maintainers on our [Matrix channel](https://matrix.to/#/#meet-official:matrix.org)
+* 🛠️ **Open a PR** by following our guide to [develop La Suite Meet locally](https://github.com/suitenumerique/meet/blob/main/docs/developping_locally.md)
+* 💡 **Suggest an idea** by opening a [feature request](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=enhancement&template=Feature_request.md)
+* 🐛 **Report a bug** by opening a [bug report](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=bug&template=Bug_report.md)
+
+Thank you for helping build something open, useful, and human. 💙
+
+### Community call
+
+We host a community call on the first Friday of every month to share updates, discuss ideas, and connect with contributors.
+
+Whether you’re actively contributing or just curious about the project, you’re welcome to join. More details are shared on the [Matrix channel](https://matrix.to/#/#meet-official:matrix.org).

 ## Philosophy

@@ -15,3 +15,15 @@ the following command inside your docker container:
 (Note : in your development environment, you can `make migrate`.)

 ## [Unreleased]
+
+## v1.23.0
+
+As part of the 1.23.0 release, the legacy `api/v1` implementation has been removed from the _experimental_ Summary service and Meet has been migrated to the new `api/v2`.
+
+**To avoid a breaking change, the Meet backend continues to use the Summary service's v1-compatible API format by default (`SUMMARY_SERVICE_VERSION` setting defaults to `1`).**
+
+If you are deploying both Meet and Summary from this repository, you must configure the Meet backend to use the v2 API by setting the following environment variable `SUMMARY_SERVICE_VERSION=2`.
+
+If you are upgrading only the Meet deployment while keeping an older Summary v1 compatible deployment, no action is required, as the v1-compatible API remains the default.
+
+Note that we plan on removing the legacy `v1` summary compatibility in a future major version. If you have your own implementation for the summary service, we recommend updating its API contract and setting `SUMMARY_SERVICE_VERSION=2`.
@@ -113,6 +113,12 @@ update_python_version "summary"
 # Update agents pyproject.toml
 update_python_version "agents"

+# Run uv lock in agents
+print_info "Running uv lock in agents..."
+cd "src/agents"
+uv lock
+cd -
+
 # Update CHANGELOG
 print_info "Updating CHANGELOG..."

@@ -158,6 +164,7 @@ echo "      - src/backend/pyproject.toml"
 echo "      - src/backend/uv.lock"
 echo "      - src/summary/pyproject.toml"
 echo "      - src/agents/pyproject.toml"
+echo "      - src/agents/uv.lock"
 echo "      - CHANGELOG.md"
 echo ""
 print_warning "Next steps:"
@@ -85,7 +85,6 @@ services:
        - postgresql
        - mailcatcher
        - redis
-        - livekit
        - createbuckets
        - createwebhook
    extra_hosts:
@@ -93,11 +92,11 @@ services:
    networks:
      - resource-server
      - default
-  
+
  celery-dev:
    user: ${DOCKER_USER:-1000}
    image: meet:backend-development
-    command: ["celery", "-A", "meet.celery_app", "worker", "-l", "DEBUG"]
+    command: ["celery", "-A", "meet.celery_app", "worker", "-l", "DEBUG", "--pool=solo"]
    environment:
      - DJANGO_CONFIGURATION=Development
    env_file:
@@ -132,7 +131,7 @@ services:
  celery:
    user: ${DOCKER_USER:-1000}
    image: meet:backend-production
-    command: ["celery", "-A", "meet.celery_app", "worker", "-l", "INFO"]
+    command: ["celery", "-A", "meet.celery_app", "worker", "-l", "INFO", "--pool=solo"]
    environment:
      - DJANGO_CONFIGURATION=Demo
    env_file:
@@ -237,29 +236,22 @@ services:
      - livekit-egress

  livekit-egress:
-      image: livekit/egress:v1.11.0
-      environment:
-        EGRESS_CONFIG_FILE: ./livekit-egress.yaml
-      volumes:
-        - ./docker/livekit/config/livekit-egress.yaml:/livekit-egress.yaml
-        - ./docker/livekit/out:/out
-      depends_on:
-        - redis
+    image: livekit/egress:v1.11.0
+    environment:
+      EGRESS_CONFIG_FILE: ./livekit-egress.yaml
+    volumes:
+      - ./docker/livekit/config/livekit-egress.yaml:/livekit-egress.yaml
+      - ./docker/livekit/out:/out
+    depends_on:
+      - redis

  metadata-collector-dev:
    build:
      context: ./src/agents
      target: development
    command: ["python", "metadata_collector.py", "dev"]
-    environment:
-      - LIVEKIT_URL=ws://livekit:7880
-      - LIVEKIT_API_KEY=devkey
-      - LIVEKIT_API_SECRET=secret
-      - AWS_S3_ENDPOINT_URL=minio:9000
-      - AWS_S3_ACCESS_KEY_ID=meet
-      - AWS_S3_SECRET_ACCESS_KEY=password
-      - AWS_STORAGE_BUCKET_NAME=meet-media-storage
-      - AWS_S3_SECURE_ACCESS=False
+    env_file:
+      - env.d/development/metadata_collector
    volumes:
      - ./src/agents:/app
      - /app/.venv
@@ -308,7 +300,7 @@ services:
      context: ./src/summary
      dockerfile: Dockerfile
      target: production
-    command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q transcribe-queue
+    command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q transcribe-queue-v2
    env_file:
      - env.d/development/summary
    volumes:
@@ -328,7 +320,7 @@ services:
      context: ./src/summary
      dockerfile: Dockerfile
      target: production
-    command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q summarize-queue
+    command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q summarize-queue-v2
    env_file:
      - env.d/development/summary
    volumes:
@@ -1,5 +1,5 @@
 # ---- Front-end image ----
-FROM node:20-alpine AS frontend-deps
+FROM node:22-alpine AS frontend-deps

 WORKDIR /home/frontend/

@@ -54,7 +54,7 @@ RUN npx webpack --mode production


 # ---- Front-end image ----
-FROM nginxinc/nginx-unprivileged:alpine3.23 AS frontend-production
+FROM nginxinc/nginx-unprivileged:1.30.3-alpine3.23 AS frontend-production

 USER root

@@ -65,10 +65,22 @@ server {
      sub_filter_once off;
  }

+  location ^~ /assets/mediapipe/wasm/ {
+      expires 30d;
+      add_header Cache-Control "public, max-age=2592000";
+  }
+
  # Serve static files with caching
  location ~* ^/assets/.*\.(css|js|json|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
      expires 30d;
      add_header Cache-Control "public, max-age=2592000";
+      try_files $uri =404;
+      error_page 404 = @asset_missing;
+  }
+
+  location @asset_missing {
+      add_header Cache-Control "no-store" always;
+      return 404;
  }

  # Serve static files
@@ -96,7 +96,7 @@ sequenceDiagram
 | **RECORDING_WORKER_CLASSES**            | Dict        | `{ "screen_recording": "core.recording.worker.services.VideoCompositeEgressService", "transcript": "core.recording.worker.services.AudioCompositeEgressService" }` | Maps recording types to their worker service classes.                                                                                                                                                                                                                                              |
 | **RECORDING_EVENT_PARSER_CLASS**        | String      | `"core.recording.event.parsers.MinioParser"`                                                                                                                       | Class responsible for parsing storage events and updating the backend.                                                                                                                                                                                                                             |
 | **RECORDING_ENABLE_STORAGE_EVENT_AUTH** | Boolean     | `True`                                                                                                                                                             | Enable authentication for storage event webhook requests.                                                                                                                                                                                                                                          |
-| **RECORDING_STORAGE_EVENT_ENABLE**      | Boolean     | `False`                                                                                                                                                            | Enable handling of storage events (must configure webhook in storage).                                                                                                                                                                                                                             |
+| **RECORDING_STORAGE_EVENT_ENABLE**      | Boolean     | `False`                                                                                                                                                            | Enable handling of storage events (must configure webhook in storage). If `False`, fallback to LiveKit egress complete webhook.                                                    |
 | **RECORDING_STORAGE_EVENT_TOKEN**       | Secret/File | `None`                                                                                                                                                             | Token used to authenticate storage webhook requests, if `RECORDING_ENABLE_STORAGE_EVENT_AUTH` is enabled.                                                                                                                                                                                          |
 | **RECORDING_EXPIRATION_DAYS**           | Integer     | `None`                                                                                                                                                             | Number of days before recordings expire. Should match bucket lifecycle policy. Set to `None` for no expiration.                                                                                                                                                                                    |
 | **RECORDING_MAX_DURATION**              | Integer     | `None`                                                                                                                                                             | Maximum duration of a recording in milliseconds. Must be synced with the LiveKit Egress configuration. Set to None for unlimited duration. When the maximum duration is reached, the recording is automatically stopped and saved, and the user is prompted in the frontend with an alert message. |
@@ -80,7 +80,6 @@ sequenceDiagram
 | whisperx_api_key         | Secret    | —                                                                     | API key for accessing WhisperX.                                                                                                                                         |
 | whisperx_base_url        | String    | `"https://api.whisperx.com/v1"`                                       | Base URL for the WhisperX API.                                                                                                                                          |
 | whisperx_asr_model       | String    | `"whisper-1"`                                                         | ASR model used for transcription.                                                                                                                                       |
-| whisperx_max_retries     | Integer   | `0`                                                                   | Maximum number of retries for WhisperX API requests.                                                                                                                    |
 | webhook_max_retries      | Integer   | `2`                                                                   | Maximum retries for webhook requests.                                                                                                                                   |
 | webhook_status_forcelist | List[Int] | `[502, 503, 504]`                                                     | HTTP status codes triggering webhook retry.                                                                                                                             |
 | webhook_backoff_factor   | Float     | `0.1`                                                                 | Exponential backoff factor for webhook retries.                                                                                                                         |
@@ -244,6 +244,69 @@ meet-admin               <none>   meet.127.0.0.1.nip.io       localhost   80, 44

 You can use LaSuite Meet on https://meet.127.0.0.1.nip.io from the local device. The provisioning user in keycloak is meet/meet.

+## Rebranding the favicon
+
+The favicon is bundled into the frontend image and served as a set of static
+files from `/usr/share/nginx/html` (`favicon.ico`, `favicon-16x16.png`,
+`favicon-32x32.png`, `apple-touch-icon.png`, `android-chrome-192x192.png`,
+`android-chrome-512x512.png`, `icon.png`). To rebrand without forking and
+rebuilding the image, overlay your own icons onto those paths with a volume —
+this serves the right icon from the first byte (no rebuild, no flash) and
+covers every variant, including the iOS home-screen and Android/PWA icons.
+
+Put your icons in a `ConfigMap` (`binaryData` keeps the PNGs intact)…
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: meet-favicon
+binaryData:
+  # base64 of each replacement icon
+  favicon.ico: <base64…>
+  favicon-16x16.png: <base64…>
+  favicon-32x32.png: <base64…>
+  apple-touch-icon.png: <base64…>
+  android-chrome-192x192.png: <base64…>
+  android-chrome-512x512.png: <base64…>
+```
+
+```bash
+# e.g. build the ConfigMap straight from a directory of icons
+$ kubectl create configmap meet-favicon --from-file=./my-icons/
+```
+
+…then mount each file over the bundled one via the chart's
+`frontend.extraVolumes` / `frontend.extraVolumeMounts` (the `subPath` mounts
+the single file without hiding the rest of `html/`):
+
+```yaml
+frontend:
+  extraVolumes:
+    - name: favicon
+      configMap:
+        name: meet-favicon
+  extraVolumeMounts:
+    - name: favicon
+      mountPath: /usr/share/nginx/html/favicon.ico
+      subPath: favicon.ico
+    - name: favicon
+      mountPath: /usr/share/nginx/html/favicon-16x16.png
+      subPath: favicon-16x16.png
+    - name: favicon
+      mountPath: /usr/share/nginx/html/favicon-32x32.png
+      subPath: favicon-32x32.png
+    - name: favicon
+      mountPath: /usr/share/nginx/html/apple-touch-icon.png
+      subPath: apple-touch-icon.png
+    - name: favicon
+      mountPath: /usr/share/nginx/html/android-chrome-192x192.png
+      subPath: android-chrome-192x192.png
+    - name: favicon
+      mountPath: /usr/share/nginx/html/android-chrome-512x512.png
+      subPath: android-chrome-512x512.png
+```
+
 ## All options

 These are the environmental options available on meet backend.
@@ -281,6 +344,7 @@ These are the environmental options available on meet backend.
 | FRONTEND_SILENCE_LIVEKIT_DEBUG                  | Silence LiveKit debug logs                                                                                                                                   | false                                                                                                                                                         |
 | FRONTEND_IS_SILENT_LOGIN_ENABLED                | Enable silent login feature                                                                                                                                  | true                                                                                                                                                          |
 | FRONTEND_FEEDBACK                               | Frontend feedback configuration                                                                                                                              | {}                                                                                                                                                            |
+| FRONTEND_DOCUMENTATION_URL                      | URL of the documentation opened from the room options menu. If unset, the documentation menu item is hidden                                                  |                                                                                                                                                               |
 | FRONTEND_USE_FRENCH_GOV_FOOTER                  | Show the French government footer in the homepage                                                                                                            | false                                                                                                                                                         |
 | FRONTEND_USE_PROCONNECT_BUTTON                  | Show a "Login with ProConnect" button in the homepage instead of a "Login" button                                                                            | false                                                                                                                                                         |
 | DJANGO_EMAIL_BACKEND                            | Email backend library                                                                                                                                        | django.core.mail.backends.smtp.EmailBackend                                                                                                                   |
@@ -344,7 +408,7 @@ These are the environmental options available on meet backend.
 | RECORDING_WORKER_CLASSES                        | Worker classes for recording                                                                                                                                 | {"screen_recording": "core.recording.worker.services.VideoCompositeEgressService","transcript": "core.recording.worker.services.AudioCompositeEgressService"} |
 | RECORDING_EVENT_PARSER_CLASS                    | Storage event engine for recording                                                                                                                           | core.recording.event.parsers.MinioParser                                                                                                                      |
 | RECORDING_ENABLE_STORAGE_EVENT_AUTH             | Enable storage event authorization                                                                                                                           | true                                                                                                                                                          |
-| RECORDING_STORAGE_EVENT_ENABLE                  | Enable recording storage events                                                                                                                              | false                                                                                                                                                         |
+| RECORDING_STORAGE_EVENT_ENABLE                  | Enable recording storage events. If false, fallback to egress webhook.                                                                                                                           | false                                                                                                                                                         |
 | RECORDING_STORAGE_EVENT_TOKEN                   | Recording storage event token                                                                                                                                |                                                                                                                                                               |
 | RECORDING_EXPIRATION_DAYS                       | Recording expiration in days                                                                                                                                 |                                                                                                                                                               |
 | RECORDING_MAX_DURATION                          | Maximum recording duration in milliseconds. Must match LiveKit Egress configuration exactly.                                                                 |                                                                                                                                                               |
@@ -11,14 +11,14 @@ There are two ways to customize LaSuite Meet:

 ### How to Use

-To use this feature, simply set the `FRONTEND_CSS_URL` environment variable to the URL of your custom CSS file. For example:
+To use this feature, simply set the `FRONTEND_CUSTOM_CSS_URL` environment variable (of the **backend** service) to the URL of your custom CSS file. For example:

 ```javascript
-FRONTEND_CSS_URL=https://example.com/custom-style.css
+FRONTEND_CUSTOM_CSS_URL=https://example.com/custom-style.css
 ```

 > [!TIP]
-> If you serve your CSS file on the same domain as LaSuite Meet, paths are supported, i.e. `FRONTEND_CSS_URL=/custom/style.css` will load `https://your-domain.com/custom/style.css`.
+> If you serve your CSS file on the same domain as LaSuite Meet, paths are supported, i.e. `FRONTEND_CUSTOM_CSS_URL=/custom/style.css` will load `https://your-domain.com/custom/style.css`.

 Setting this variable makes the app load your CSS at runtime, adding a `<link>` to `<head>` so you can override CSS variables and customize the frontend without rebuilding.

@@ -37,7 +37,7 @@ Let's say you want to change the font of our application to a custom font. You c
 }
 ```

-Then, set the `FRONTEND_CSS_URL` environment variable to the URL of your custom CSS file. Once you've done this, our application will load your custom CSS file and apply the styles, changing the default font to the one you specified.
+Then, set the `FRONTEND_CUSTOM_CSS_URL` environment variable to the URL of your custom CSS file. Once you've done this, our application will load your custom CSS file and apply the styles, changing the default font to the one you specified.

 > [!IMPORTANT]
 > You can override any CSS token—semantic or palette. See [panda.config.ts](../src/frontend/panda.config.ts) for all defined semantic tokens.
@@ -57,15 +57,17 @@ OIDC_RS_CLIENT_SECRET=ThisIsAnExampleKeyForDevPurposeOnly
 LIVEKIT_API_SECRET=secret
 LIVEKIT_API_KEY=devkey
 LIVEKIT_API_URL=http://127.0.0.1.nip.io:7880
+LIVEKIT_INTERNAL_URL=http://livekit:7880
 LIVEKIT_VERIFY_SSL=False
 ALLOW_UNREGISTERED_ROOMS=False

 # Recording
 RECORDING_ENABLE=True
-RECORDING_STORAGE_EVENT_ENABLE=True
+RECORDING_STORAGE_EVENT_ENABLE=False
 RECORDING_STORAGE_EVENT_TOKEN=password
-SUMMARY_SERVICE_ENDPOINT=http://app-summary-dev:8000/api/v1/tasks/
+SUMMARY_SERVICE_ENDPOINT=http://app-summary-dev:8000/api/v2/async-jobs/transcribe/
 SUMMARY_SERVICE_API_TOKEN=password
+SUMMARY_SERVICE_WEBHOOK_API_TOKEN=webhook-password
 RECORDING_DOWNLOAD_BASE_URL=http://localhost:3000/recording

 # Recording encoding (LiveKit Egress advanced options).
@@ -83,9 +85,16 @@ RECORDING_DOWNLOAD_BASE_URL=http://localhost:3000/recording
 # Telephony
 ROOM_TELEPHONY_ENABLED=True

+# RoomKit
+# ROOMKIT_ENABLED = True
+# ROOMKIT_SERVER_TO_SERVER_API_TOKEN = ThisIsAnExampleKeyForDevPurposeOnly
+
 # Metadata
 METADATA_COLLECTOR_ENABLED=True

+# Subtitle
+ROOM_SUBTITLE_ENABLED=False
+
 FRONTEND_USE_FRENCH_GOV_FOOTER=False
 FRONTEND_USE_PROCONNECT_BUTTON=False

@@ -94,3 +103,7 @@ EXTERNAL_API_ENABLED=True
 APPLICATION_JWT_AUDIENCE=http://localhost:8071/external-api/v1.0/
 APPLICATION_JWT_SECRET_KEY=devKey
 APPLICATION_BASE_URL=http://localhost:3000
+
+# Diagnostics
+CONNECTION_TEST_ENABLED = True
+
@@ -0,0 +1,9 @@
+LIVEKIT_URL=ws://livekit:7880
+LIVEKIT_API_KEY=devkey
+LIVEKIT_API_SECRET=secret
+
+AWS_S3_ENDPOINT_URL=minio:9000
+AWS_S3_ACCESS_KEY_ID=meet
+AWS_S3_SECRET_ACCESS_KEY=password
+AWS_STORAGE_BUCKET_NAME=meet-media-storage
+AWS_S3_SECURE_ACCESS=False
@@ -2,8 +2,13 @@ LIVEKIT_URL=ws://livekit:7880
 LIVEKIT_API_KEY=devkey
 LIVEKIT_API_SECRET=secret

-STT_PROVIDER=kyutai
+STT_PROVIDER=kyutai # kyutai, deepgram
 ENABLE_SILERO_VAD=False

+DEEPGRAM_API_KEY=
+
 KYUTAI_STT_BASE_URL=
 KYUTAI_API_KEY=
+
+SENTRY_DSN=
+SENTRY_ENVIRONMENT=
@@ -1,7 +1,7 @@
 APP_NAME="meet-app-summary-dev"
 APP_API_TOKEN="password"

-AWS_STORAGE_BUCKET_NAME="http://meet-media-storage"
+AWS_STORAGE_BUCKET_NAME="meet-media-storage"
 AWS_S3_ENDPOINT_URL="minio:9000"
 AWS_S3_SECURE_ACCESS=false

@@ -20,5 +20,14 @@ LLM_MODEL="albert-large"
 WEBHOOK_API_TOKEN="secret"
 WEBHOOK_URL="https://configure-your-url.com"

+IS_RESOLVE_SPEAKER_IDENTITIES_ENABLED=true
+RESOLVE_SPEAKER_IDENTITIES_DEFAULT_OVERLAP=0.5
+RESOLVE_SPEAKER_ENABLE_SPLIT_ON_WORDS=true
+RESOLVE_SPEAKER_MAX_WORD_DURATION=1
+
 POSTHOG_API_KEY="your-posthog-key"
 POSTHOG_ENABLED="False"
+
+# Transcription
+TRANSCRIPTION_SATISFACTION_FORM_BASE_URL=
+AUTHORIZED_TENANTS='[{"id": "meet","api_key": "password","webhook_url": "https://configure-your-url.com/api/v1.0/recordings/external-process-hook/","webhook_api_key": "webhook-password","allowed_push_to_docs": true}]'
@@ -0,0 +1,52 @@
+publiccodeYmlVersion: 0.5.0
+name: LaSuite Meet
+applicationSuite: LaSuite
+url: https://github.com/suitenumerique/meet
+releaseDate: 2026-07-22
+platforms:
+  - web
+organisation:
+  name: DINUM
+  uri: https://numerique.gouv.fr
+fundedBy:
+  - name: Direction interministérielle du numérique (DINUM)
+    uri: https://www.numerique.gouv.fr
+developmentStatus: stable
+softwareType: standalone/web
+intendedAudience:
+  countries:
+    - FR
+description:
+  en:
+    localisedName: LaSuite Meet
+    shortDescription: "Open Source video conference solution, based on LiveKit"
+    longDescription: "Open Source video conference application, based on LiveKit,
+      Django and React. It is the official web video conference application of
+      French Ministries."
+    features:
+      - Optimized for stability in large meetings (+100 p.)
+      - Support for multiple screen sharing streams
+      - Non-persistent, secure chat
+      - Meeting recording
+      - Meeting transcription & Summary
+      - Telephony integration
+      - Secure participation with robust authentication and access control
+      - Customizable frontend style
+legal:
+  license: MIT
+maintenance:
+  type: internal
+  contacts:
+    - name: "Samuel Paccoud"
+      email: samuel.paccoud@numerique.gouv.fr
+      affiliation: DINUM
+    - name: "Antoine Lebaud"
+      email: antoine.lebaud.ext@numerique.gouv.fr
+      affiliation: DINUM
+localisation:
+  localisationReady: true
+  availableLanguages:
+    - fr
+    - de
+    - en
+    - nl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:mailappor="http://schemas.microsoft.com/office/mailappversionoverrides/1.0" xsi:type="MailApp">
  <Id>a025f0f6-757a-4790-97f3-99c66c4a5795</Id>
-  <Version>0.0.2.0</Version>
+  <Version>1.0.0.0</Version>
  <ProviderName>__APP_NAME__</ProviderName>
  <DefaultLocale>fr-FR</DefaultLocale>
  <DisplayName DefaultValue="__APP_NAME__"/>
@@ -205,5 +205,174 @@
        </bt:String>
      </bt:LongStrings>
    </Resources>
+
+    <!-- ─── V1.1 override: required for shared folder / delegate support ─── -->
+    <VersionOverrides xmlns="http://schemas.microsoft.com/office/mailappversionoverrides/1.1" xsi:type="VersionOverridesV1_1">
+      <Requirements>
+        <bt:Sets DefaultMinVersion="1.8">
+          <bt:Set Name="Mailbox"/>
+        </bt:Sets>
+      </Requirements>
+      <Hosts>
+        <Host xsi:type="MailHost">
+          <DesktopFormFactor>
+            <FunctionFile resid="Commands.Url"/>
+            <SupportsSharedFolders>true</SupportsSharedFolders>
+
+            <!-- ─── Mail: Read ─────────────────────────────────────────── -->
+            <ExtensionPoint xsi:type="MessageReadCommandSurface">
+              <OfficeTab id="TabDefault">
+                <Group id="msgReadGroup">
+                  <Label resid="GroupLabel"/>
+                  <Control xsi:type="Button" id="msgReadOpenPaneButton">
+                    <Label resid="TaskpaneButton.Label"/>
+                    <Supertip>
+                      <Title resid="TaskpaneButton.Label"/>
+                      <Description resid="TaskpaneButton.Tooltip"/>
+                    </Supertip>
+                    <Icon>
+                      <bt:Image size="16" resid="Icon.16x16"/>
+                      <bt:Image size="32" resid="Icon.32x32"/>
+                      <bt:Image size="80" resid="Icon.80x80"/>
+                    </Icon>
+                    <Action xsi:type="ShowTaskpane">
+                      <SourceLocation resid="Taskpane.Url"/>
+                    </Action>
+                  </Control>
+                </Group>
+              </OfficeTab>
+            </ExtensionPoint>
+
+            <!-- ─── Mail: Compose ─────────────────────────────────────── -->
+            <ExtensionPoint xsi:type="MessageComposeCommandSurface">
+              <OfficeTab id="TabDefault">
+                <Group id="msgComposeGroup">
+                  <Label resid="GroupLabel"/>
+                  <Control xsi:type="Button" id="msgComposeGenerateLinkButton">
+                    <Label resid="GenerateLink.Label"/>
+                    <Supertip>
+                      <Title resid="GenerateLink.Label"/>
+                      <Description resid="GenerateLink.Tooltip"/>
+                    </Supertip>
+                    <Icon>
+                      <bt:Image size="16" resid="Icon.16x16"/>
+                      <bt:Image size="32" resid="Icon.32x32"/>
+                      <bt:Image size="80" resid="Icon.80x80"/>
+                    </Icon>
+                    <Action xsi:type="ExecuteFunction">
+                      <FunctionName>generateMeetingLinkFromMail</FunctionName>
+                    </Action>
+                  </Control>
+                  <Control xsi:type="Button" id="msgComposeOpenPaneButton">
+                    <Label resid="TaskpaneButton.Label"/>
+                    <Supertip>
+                      <Title resid="TaskpaneButton.Label"/>
+                      <Description resid="TaskpaneButton.Tooltip"/>
+                    </Supertip>
+                    <Icon>
+                      <bt:Image size="16" resid="Settings.16x16"/>
+                      <bt:Image size="32" resid="Settings.32x32"/>
+                      <bt:Image size="80" resid="Settings.80x80"/>
+                    </Icon>
+                    <Action xsi:type="ShowTaskpane">
+                      <SourceLocation resid="Taskpane.Url"/>
+                    </Action>
+                  </Control>
+                </Group>
+              </OfficeTab>
+            </ExtensionPoint>
+
+            <!-- ─── Calendar: Compose (New/Edit appointment) ──────────── -->
+            <ExtensionPoint xsi:type="AppointmentOrganizerCommandSurface">
+              <OfficeTab id="TabDefault">
+                <Group id="apptComposeGroup">
+                  <Label resid="GroupLabel"/>
+                  <Control xsi:type="Button" id="apptGenerateLinkButton">
+                    <Label resid="GenerateLink.Label"/>
+                    <Supertip>
+                      <Title resid="GenerateLink.Label"/>
+                      <Description resid="GenerateLink.Tooltip"/>
+                    </Supertip>
+                    <Icon>
+                      <bt:Image size="16" resid="Icon.16x16"/>
+                      <bt:Image size="32" resid="Icon.32x32"/>
+                      <bt:Image size="80" resid="Icon.80x80"/>
+                    </Icon>
+                    <Action xsi:type="ExecuteFunction">
+                      <FunctionName>generateMeetingLinkFromCalendar</FunctionName>
+                    </Action>
+                  </Control>
+
+                  <Control xsi:type="Button" id="apptOpenSettingsButton">
+                    <Label resid="OpenSettings.Label"/>
+                    <Supertip>
+                      <Title resid="OpenSettings.Label"/>
+                      <Description resid="OpenSettings.Tooltip"/>
+                    </Supertip>
+                    <Icon>
+                      <bt:Image size="16" resid="Settings.16x16"/>
+                      <bt:Image size="32" resid="Settings.32x32"/>
+                      <bt:Image size="80" resid="Settings.80x80"/>
+                    </Icon>
+                    <Action xsi:type="ShowTaskpane">
+                      <SourceLocation resid="Taskpane.Url"/>
+                    </Action>
+                  </Control>
+
+                </Group>
+              </OfficeTab>
+            </ExtensionPoint>
+
+          </DesktopFormFactor>
+        </Host>
+      </Hosts>
+      <Resources>
+        <bt:Images>
+          <bt:Image id="Settings.16x16" DefaultValue="https://localhost:3000/addons/outlook/assets/settings-16.png"/>
+          <bt:Image id="Settings.32x32" DefaultValue="https://localhost:3000/addons/outlook/assets/settings-32.png"/>
+          <bt:Image id="Settings.80x80" DefaultValue="https://localhost:3000/addons/outlook/assets/settings-80.png"/>
+          <bt:Image id="Add.16x16" DefaultValue="https://localhost:3000/addons/outlook/assets/add-16.png"/>
+          <bt:Image id="Add.32x32" DefaultValue="https://localhost:3000/addons/outlook/assets/add-32.png"/>
+          <bt:Image id="Add.80x80" DefaultValue="https://localhost:3000/addons/outlook/assets/add-80.png"/>
+          <bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/addons/outlook/assets/icon-16.png"/>
+          <bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/addons/outlook/assets/icon-32.png"/>
+          <bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/addons/outlook/assets/icon-80.png"/>
+        </bt:Images>
+        <bt:Urls>
+          <bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/addons/outlook/commands.html"/>
+          <bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/addons/outlook/taskpane.html"/>
+        </bt:Urls>
+        <bt:ShortStrings>
+          <!-- Default (French) -->
+          <bt:String id="GroupLabel" DefaultValue="__APP_NAME__"/>
+          <bt:String id="GenerateLink.Label" DefaultValue="Ajouter un lien __APP_NAME__">
+            <bt:Override Locale="en-US" Value="Add a __APP_NAME__ link"/>
+            <bt:Override Locale="de-DE" Value="__APP_NAME__-Link hinzufügen"/>
+          </bt:String>
+          <bt:String id="TaskpaneButton.Label" DefaultValue="Ouvrir les paramètres">
+            <bt:Override Locale="en-US" Value="Open settings"/>
+            <bt:Override Locale="de-DE" Value="Einstellungen öffnen"/>
+          </bt:String>
+          <bt:String id="OpenSettings.Label" DefaultValue="Paramètres">
+            <bt:Override Locale="en-US" Value="Settings"/>
+            <bt:Override Locale="de-DE" Value="Einstellungen"/>
+          </bt:String>
+        </bt:ShortStrings>
+        <bt:LongStrings>
+          <bt:String id="GenerateLink.Tooltip" DefaultValue="Génère un lien de réunion __APP_NAME__ et l'insère dans l'événement.">
+            <bt:Override Locale="de-DE" Value="Generiert einen __APP_NAME__-Besprechungslink und fügt ihn in den Termin ein."/>
+            <bt:Override Locale="en-US" Value="Generates a __APP_NAME__ meeting link and inserts it into the item."/>
+          </bt:String>
+          <bt:String id="TaskpaneButton.Tooltip" DefaultValue="Ouvre les paramètres de connexion __APP_NAME__.">
+            <bt:Override Locale="de-DE" Value="Öffnet die __APP_NAME__-Verbindungseinstellungen."/>
+            <bt:Override Locale="en-US" Value="Opens the __APP_NAME__ connection settings."/>
+          </bt:String>
+          <bt:String id="OpenSettings.Tooltip" DefaultValue="Ouvre les paramètres de connexion __APP_NAME__.">
+            <bt:Override Locale="de-DE" Value="Öffnet die __APP_NAME__-Verbindungseinstellungen."/>
+            <bt:Override Locale="en-US" Value="Opens the __APP_NAME__ connection settings."/>
+          </bt:String>
+        </bt:LongStrings>
+      </Resources>
+    </VersionOverrides>
  </VersionOverrides>
 </OfficeApp>
@@ -10,7 +10,7 @@
      "license": "MIT",
      "dependencies": {
        "core-js": "3.49.0",
-        "i18next": "26.3.1",
+        "i18next": "^26.3.6",
        "i18next-browser-languagedetector": "8.2.1",
        "regenerator-runtime": "0.14.1"
      },
@@ -9364,9 +9364,9 @@
      }
    },
    "node_modules/i18next": {
-      "version": "26.3.1",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.1.tgz",
-      "integrity": "sha512-txQqd5EULsqEh9OJqRH15aCaOuy/nLJyhw5EHCSKLKJE1aBbb3Zve2+uQIxgWhPm1QqUQoWyQBm2kfmmIrzkcQ==",
+      "version": "26.3.6",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.6.tgz",
+      "integrity": "sha512-Bu5Z2nAXgfVyM8xvW3jk9EKRIuX37PudsrBViThNFx7CR7aaYTpP01cxNB/E4c4UUzTDiAZRstEhsRfPOL/8xA==",
      "funding": [
        {
          "type": "individual",
@@ -9383,7 +9383,7 @@
      ],
      "license": "MIT",
      "peerDependencies": {
-        "typescript": "^5 || ^6"
+        "typescript": "^5 || ^6 || ^7"
      },
      "peerDependenciesMeta": {
        "typescript": {
@@ -27,7 +27,7 @@
  },
  "dependencies": {
    "core-js": "3.49.0",
-    "i18next": "26.3.1",
+    "i18next": "26.3.6",
    "i18next-browser-languagedetector": "8.2.1",
    "regenerator-runtime": "0.14.1"
  },
@@ -57,8 +57,7 @@
       data-i18n="footer.feedback"
    ></a>
    <div id="footer-right">
-        <span class="version-badge">beta</span>
-        <span class="version-number">0.0.2</span>
+        <span class="version-number">1.0.0</span>
    </div>
 </footer>
 </body>
@@ -1,4 +1,4 @@
-FROM python:3.13.13-slim AS base
+FROM python:3.14.6-slim AS base

 # Install system dependencies required by LiveKit
 RUN apt-get update && apt-get install -y \
@@ -32,6 +32,8 @@ from minio import Minio
 from minio.error import S3Error

 from exceptions import MissingConfigError
+from observability import configure_sentry, set_job_context
+from tasks import done_callback

 load_dotenv()

@@ -42,6 +44,7 @@ AGENT_NAME = os.getenv("METADATA_COLLECTOR_AGENT_NAME", "metadata-collector")

 def prewarm(proc: JobProcess):
    """Preload voice activity detection model."""
+    configure_sentry(AGENT_NAME)
    proc.userdata["vad"] = silero.VAD.load()


@@ -174,7 +177,13 @@ class MetadataCollector:
            self.on_chat_message_received(reader, participant_identity)
        )
        self._tasks.add(task)
-        task.add_done_callback(lambda _: self._tasks.remove(task))
+        task.add_done_callback(
+            done_callback(
+                logger,
+                self._tasks,
+                f"process chat stream from {participant_identity}",
+            )
+        )

    def save(self):
        """Serialize collected events and upload as JSON to S3."""
@@ -270,16 +279,18 @@ class MetadataCollector:
        logger.info("Participant disconnected: %s", participant.identity)
        task = asyncio.create_task(self._close_session(session))
        self._tasks.add(task)
-
-        def on_close_done(_):
-            self._tasks.discard(task)
-            logger.info(
-                "VAD session closed for %s (remaining sessions: %d)",
-                participant.identity,
-                len(self._sessions),
+        task.add_done_callback(
+            done_callback(
+                logger,
+                self._tasks,
+                f"close VAD session for {participant.identity}",
+                on_success=lambda _: logger.info(
+                    "VAD session closed for %s (remaining sessions: %d)",
+                    participant.identity,
+                    len(self._sessions),
+                ),
            )
-
-        task.add_done_callback(on_close_done)
+        )

    def on_participant_name_changed(self, participant: rtc.RemoteParticipant):
        """Update stored participant name when it changes."""
@@ -360,6 +371,8 @@ async def handle_job_request(job_req: JobRequest) -> None:
@server.rtc_session(agent_name=AGENT_NAME, on_request=handle_job_request)
 async def entrypoint(ctx: JobContext):
    """Initialize and run the metadata collector."""
+    set_job_context(room=ctx.room.name, job_id=ctx.job.id)
+
    logger.info("Starting metadata agent in room: %s", ctx.room.name)
    recording_id = ctx.job.metadata
    metadata_collector = MetadataCollector(ctx, recording_id)
@@ -377,4 +390,7 @@ async def entrypoint(ctx: JobContext):


 if __name__ == "__main__":
+    # Initialize Sentry for the worker process. Each job runs in its own
+    # (forked) process and re-initializes Sentry via prewarm().
+    configure_sentry(AGENT_NAME)
    cli.run_app(server)
@@ -25,6 +25,9 @@ from livekit.agents import (
 )
 from livekit.plugins import deepgram, silero

+from observability import configure_sentry, set_job_context
+from tasks import done_callback
+
 load_dotenv()

 logger = logging.getLogger("transcriber")
@@ -99,24 +102,29 @@ class MultiUserTranscriber:
        logger.info(f"starting session for {participant.identity}")
        task = asyncio.create_task(self._start_session(participant))
        self._tasks.add(task)
-
-        def on_task_done(task: asyncio.Task):
-            try:
-                self._sessions[participant.identity] = task.result()
-            finally:
-                self._tasks.discard(task)
-
-        task.add_done_callback(on_task_done)
+        task.add_done_callback(
+            done_callback(
+                logger,
+                self._tasks,
+                f"start transcription session for {participant.identity}",
+            )
+        )

    def on_participant_disconnected(self, participant: rtc.RemoteParticipant):
        """Handle participant disconnection by closing transcription session."""
-        if (session := self._sessions.pop(participant.identity)) is None:
+        if (session := self._sessions.pop(participant.identity, None)) is None:
            return

        logger.info(f"closing session for {participant.identity}")
        task = asyncio.create_task(self._close_session(session))
        self._tasks.add(task)
-        task.add_done_callback(lambda _: self._tasks.discard(task))
+        task.add_done_callback(
+            done_callback(
+                logger,
+                self._tasks,
+                f"close transcription session for {participant.identity}",
+            )
+        )

    async def _start_session(self, participant: rtc.RemoteParticipant) -> AgentSession:
        """Create and start transcription session for participant."""
@@ -139,6 +147,7 @@ class MultiUserTranscriber:
                participant_identity=participant.identity,
            )
        )
+        self._sessions[participant.identity] = session
        return session

    async def _close_session(self, sess: AgentSession) -> None:
@@ -149,6 +158,8 @@ class MultiUserTranscriber:

 async def entrypoint(ctx: JobContext):
    """Initialize and run the multi-user transcriber."""
+    set_job_context(room=ctx.room.name, job_id=ctx.job.id)
+
    transcriber = MultiUserTranscriber(ctx)
    transcriber.start()

@@ -193,11 +204,15 @@ async def handle_transcriber_job_request(job_req: JobRequest) -> None:

 def prewarm(proc: JobProcess):
    """Preload voice activity detection model."""
+    configure_sentry(TRANSCRIBER_AGENT_NAME)
    if ENABLE_SILERO_VAD:
        proc.userdata["vad"] = silero.VAD.load()


 if __name__ == "__main__":
+    # Initialize Sentry for the worker process. Each job runs in its own
+    # (forked) process and re-initializes Sentry via prewarm().
+    configure_sentry(TRANSCRIBER_AGENT_NAME)
    cli.run_app(
        WorkerOptions(
            entrypoint_fnc=entrypoint,
@@ -0,0 +1,83 @@
+"""Sentry helpers for the LiveKit agents."""
+
+import logging
+import os
+import tomllib
+from os import path
+
+import sentry_sdk
+from sentry_sdk.integrations.logging import LoggingIntegration
+
+logger = logging.getLogger("observability")
+
+BASE_DIR = path.dirname(path.abspath(__file__))
+
+
+def get_release():
+    """Get the current release of the application.
+
+    By release, we mean the ``version`` declared in ``pyproject.toml``.
+    If the file cannot be read or declares no version, it defaults to "NA".
+    """
+    try:
+        with open(path.join(BASE_DIR, "pyproject.toml"), "rb") as pyproject:
+            return tomllib.load(pyproject)["project"]["version"]
+    except (FileNotFoundError, KeyError, tomllib.TOMLDecodeError):
+        return "NA"  # Default: not available
+
+
+def configure_sentry(agent_name: str) -> None:
+    """Initialize Sentry for the current agent process.
+
+    No-op if ``SENTRY_DSN`` is not configured. Otherwise (re)initializes Sentry
+    unconditionally so the calling process gets its own live transport.
+
+    Must be called once per process: in the worker entrypoint and again in the
+    per-job ``prewarm``/``setup_fnc`` hook, because LiveKit runs each job in a
+    forked process. A forked child inherits the parent's initialized Sentry
+    client but not its background transport thread (threads do not survive
+    ``fork()``), so it must re-init to get a working transport. For that reason,
+    do NOT guard this with ``sentry_sdk.is_initialized()``: the child inherits it
+    as ``True`` and would skip init, silently dropping every event.
+
+    Args:
+        agent_name: Identifier of the agent, attached as a tag to Sentry issues
+    """
+    # Read the DSN at call time so it picks up variables that load_dotenv()
+    # populated after this module was first imported.
+    sentry_dsn = os.getenv("SENTRY_DSN")
+    if not sentry_dsn:
+        logger.debug("SENTRY_DSN not defined for agent '%s'", agent_name)
+        return
+
+    sentry_sdk.init(
+        dsn=sentry_dsn,
+        environment=os.getenv("SENTRY_ENVIRONMENT"),
+        release=get_release(),
+        debug=False,
+        integrations=[
+            # Capture log records emitted at ERROR and above as Sentry events.
+            # This covers the agents' explicit logger.exception(...) calls as
+            # well as asyncio's "Exception in callback" / "Task exception was
+            # never retrieved" records, so unhandled task failures surface too.
+            LoggingIntegration(level=logging.INFO, event_level=logging.ERROR),
+        ],
+    )
+    sentry_sdk.set_tag("application", "agents")
+    sentry_sdk.set_tag("agent", agent_name)
+
+    logger.info("Sentry initialized for agent '%s' (pid %d)", agent_name, os.getpid())
+
+
+def set_job_context(*, room: str | None = None, job_id: str | None = None) -> None:
+    """Tag the current Sentry scope with the LiveKit job being handled.
+
+    Args:
+        room: Name of the room the job is serving.
+        job_id: LiveKit job identifier.
+    """
+    scope = sentry_sdk.get_current_scope()
+    if room is not None:
+        scope.set_tag("room", room)
+    if job_id is not None:
+        scope.set_tag("job_id", job_id)
@@ -1,21 +1,22 @@

 [project]
 name = "agents"
-version = "1.20.0"
+version = "1.26.0"
 requires-python = ">=3.12"
 dependencies = [
-    "livekit-agents==1.5.13",
-    "livekit-plugins-deepgram==1.5.13",
-    "livekit-plugins-silero==1.5.13",
+    "livekit-agents==1.6.7",
+    "livekit-plugins-deepgram==1.6.7",
+    "livekit-plugins-silero==1.6.7",
    "livekit-plugins-kyutai-lasuite==0.0.6",
    "python-dotenv==1.2.2",
    "protobuf==6.33.6",
-    "minio==7.2.20"
+    "minio==7.2.20",
+    "sentry-sdk==2.66.1",
 ]

 [project.optional-dependencies]
 dev = [
-    "ruff==0.15.14",
+    "ruff==0.16.0",
 ]

 [tool.uv]
@@ -0,0 +1,42 @@
+"""Helpers for managing asyncio tasks."""
+
+import asyncio
+import logging
+from collections.abc import Callable
+from typing import Any
+
+
+def done_callback(
+    logger: logging.Logger,
+    tasks: set[asyncio.Task],
+    description: str,
+    *,
+    on_success: Callable[[Any], None] | None = None,
+) -> Callable[[asyncio.Task], None]:
+    """Build a done-callback for a background task.
+
+    Meant to be passed to `asyncio.Task.add_done_callback`.
+
+    Args:
+        logger: Logger used to report failures, so records keep the caller's
+            logger name.
+        tasks: Set the task was registered in; the task is discarded from it.
+        description: Human-readable intended action
+        on_success: Optional callback invoked with the task's result when it
+            completes without error.
+
+    Returns:
+        A callback suitable for ``task.add_done_callback(...)``.
+    """
+
+    def _finalize(task: asyncio.Task) -> None:
+        tasks.discard(task)
+        if task.cancelled():
+            return
+        if (exc := task.exception()) is not None:
+            logger.exception("failed to %s", description, exc_info=exc)
+            return
+        if on_success is not None:
+            on_success(task.result())
+
+    return _finalize
@@ -11,7 +11,7 @@ from core.recording.event import notification

 from . import models
 from .tasks.file import process_file_deletion
-from .utils import generate_download_file_url
+from .utils import generate_download_s3_url


 def hard_delete_file(file):
@@ -242,7 +242,7 @@ class FileAdmin(admin.ModelAdmin):
        """Return a clickable preview URL for the file."""
        if not obj.is_ready:
            return "-"
-        url = generate_download_file_url(obj, expires_in=60 * 60)
+        url = generate_download_s3_url(obj.key, expires_in=60 * 60)

        return format_html(
            '<a href="{}" target="_blank" rel="noopener noreferrer">Open File</a>', url
@@ -402,7 +402,14 @@ class RecordingAdmin(admin.ModelAdmin):
    """Recording admin interface declaration."""

    inlines = (RecordingAccessInline,)
-    search_fields = ["status", "=id", "worker_id", "room__slug", "=room__id"]
+    search_fields = [
+        "status",
+        "=id",
+        "worker_id",
+        "room__slug",
+        "=room__id",
+        "accesses__user__email",
+    ]
    list_display = (
        "id",
        "status",
@@ -0,0 +1,67 @@
+"""
+Pluggable analytics.
+
+Usage anywhere in the codebase:
+
+    from core import analytics
+
+    analytics.capture(request.user, "room_created", {"room_id": str(room.pk)})
+
+The concrete backend is resolved lazily from Django settings, so swapping
+PostHog for anything else is a configuration change, not a code change.
+"""
+
+from functools import lru_cache
+from typing import Any
+
+from django.conf import settings
+from django.utils.module_loading import import_string
+
+from .base import AnalyticsBackend, NoOpAnalytics
+from .events import AnalyticsEvent
+from .user_feature_flags import UserFeatureFlag
+
+__all__ = [
+    "get_analytics",
+    "identify",
+    "capture",
+    "AnalyticsBackend",
+    "AnalyticsEvent",
+    "is_user_feature_flag_enabled",
+    "UserFeatureFlag",
+]
+
+
+@lru_cache(maxsize=1)
+def get_analytics() -> AnalyticsBackend:
+    """Instantiate the configured backend once per process."""
+    dotted_path = getattr(settings, "ANALYTICS_BACKEND", None)
+    options = getattr(settings, "ANALYTICS_BACKEND_SETTINGS", {}) or {}
+
+    if not dotted_path:
+        return NoOpAnalytics()
+
+    backend_class = import_string(dotted_path)
+    return backend_class(**options)
+
+
+# Convenience module-level shortcuts
+
+analytics_instance = get_analytics()
+
+
+def identify(user, properties: dict[str, Any] | None = None) -> None:
+    """Associate traits with an identified user."""
+    analytics_instance.identify(user, properties)
+
+
+def capture(
+    user, event: AnalyticsEvent, properties: dict[str, Any] | None = None
+) -> None:
+    """Record an event performed by an identified user."""
+    analytics_instance.capture(user, event, properties)
+
+
+def is_user_feature_flag_enabled(user, feature_name: UserFeatureFlag) -> bool:
+    """Check if a feature is enabled at the user level."""
+    return analytics_instance.is_user_feature_enabled(user, feature_name)
@@ -0,0 +1,65 @@
+"""Analytics backend protocol and default no-op implementation."""
+
+from abc import ABC, abstractmethod
+from typing import Any, Mapping
+
+from ..models import User
+from .events import AnalyticsEvent
+from .user_feature_flags import UserFeatureFlag
+
+
+class AnalyticsBackend(ABC):
+    """
+    Interface every analytics backend must implement.
+
+    Backends are instantiated once (singleton) with the kwargs declared in
+    settings.ANALYTICS_BACKEND_SETTINGS, e.g.:
+
+        ANALYTICS_BACKEND = "core.analytics.posthog.PostHogAnalytics"
+        ANALYTICS_BACKEND_SETTINGS = {"api_key": "...", "host": "..."}
+    """
+
+    @abstractmethod
+    def identify(self, user: User, properties: dict[str, Any] | None = None) -> None:
+        """Associate traits (email, name, ...) with an identified user."""
+
+    @abstractmethod
+    def capture(
+        self,
+        user: User,
+        event: AnalyticsEvent,
+        properties: dict[str, Any] | None = None,
+    ) -> None:
+        """Record an event performed by an identified user."""
+
+    @abstractmethod
+    def shutdown(self) -> None:
+        """Flush pending events. Called on process exit."""
+
+    def get_user_feature_flags(
+        self,
+        user: User,  # pylint: disable=unused-argument
+    ) -> Mapping[UserFeatureFlag, bool | str | None]:
+        """Return a dict of feature flags for the given user."""
+        # We return an empty dict here by default to avoid a breaking change
+        # By making this method abstract.
+        return {}
+
+    def is_user_feature_enabled(
+        self, user: User, feature_name: UserFeatureFlag
+    ) -> bool:
+        """Check if a feature is enabled at the user level."""
+        return self.get_user_feature_flags(user).get(feature_name, False) is True
+
+
+class NoOpAnalytics(AnalyticsBackend):
+    """Default backend: silently discards everything."""
+
+    def identify(self, user: User, properties=None) -> None:
+        """No-op: discards identify calls."""
+
+    def capture(self, user, event, properties=None) -> None:
+        """No-op: discards captured events."""
+
+    def shutdown(self) -> None:
+        """No-op: nothing to flush."""
@@ -0,0 +1,13 @@
+"""Catalog of all analytics events emitted by the backend."""
+
+from enum import StrEnum
+
+
+class AnalyticsEvent(StrEnum):
+    """All trackable events. Values are the wire names sent to the provider."""
+
+    # Rooms
+    ROOM_CREATED = "room_created"
+
+    # Roomkit (meeting-room SIP devices)
+    ROOMKIT_JOINED = "roomkit_joined"
@@ -0,0 +1,116 @@
+"""PostHog implementation of the analytics backend protocol."""
+
+import logging
+from typing import Any, Mapping
+
+from django.core.cache import cache
+
+from posthog import Posthog
+
+from ..models import User
+from .base import AnalyticsBackend
+from .events import AnalyticsEvent
+from .user_feature_flags import UserFeatureFlag
+
+logger = logging.getLogger(__name__)
+
+
+class PostHogAnalytics(AnalyticsBackend):
+    """Send events to PostHog, keyed on the user's primary key (UUID)."""
+
+    def __init__(
+        self,
+        *,
+        api_key: str,
+        host: str = "https://eu.i.posthog.com",
+        feature_flags_cache_ttl: int = 60,
+        feature_flags_cache_prefix: str = "user_feature_flags:",
+        **kwargs: Any,
+    ) -> None:
+
+        # The SDK batches and sends in a background thread by default,
+        # so calls below never block the request/response cycle.
+        self._client = Posthog(
+            project_api_key=api_key,
+            host=host,
+            **kwargs,
+        )
+        self._feature_flags_cache_ttl = feature_flags_cache_ttl
+        self._feature_flags_cache_prefix = feature_flags_cache_prefix
+
+    @staticmethod
+    def _distinct_id(user: User) -> str | None:
+        """Return the PostHog distinct_id for a user, or None if anonymous."""
+        if user is None or not getattr(user, "is_authenticated", False):
+            return None
+        return str(user.pk)
+
+    def identify(self, user: User, properties: dict[str, Any] | None = None) -> None:
+        """Associate traits (email, name, ...) with an identified user."""
+        distinct_id = self._distinct_id(user)
+        if distinct_id is None:
+            return
+        try:
+            self._client.set(
+                distinct_id=distinct_id,
+                properties=properties or {},
+            )
+        except Exception:  # pylint: disable=broad-exception-caught
+            logger.exception("PostHog identify failed")
+
+    def capture(
+        self,
+        user: User,
+        event: AnalyticsEvent,
+        properties: dict[str, Any] | None = None,
+    ) -> None:
+        """Record an event performed by an identified user."""
+        distinct_id = self._distinct_id(user)
+        if distinct_id is None:
+            return
+        try:
+            self._client.capture(
+                distinct_id=distinct_id,
+                event=str(event),
+                properties=properties or {},
+            )
+        except Exception:  # pylint: disable=broad-exception-caught
+            logger.exception("PostHog capture failed for event %s", event)
+
+    def shutdown(self) -> None:
+        """Flush pending events. Called on process exit."""
+        self._client.shutdown()
+
+    def _fetch_user_feature_flags(
+        self, user: User
+    ) -> Mapping[UserFeatureFlag, bool | str | None]:
+        """Compute feature flags for a user."""
+
+        distinct_id = self._distinct_id(user)
+        if distinct_id is None:
+            return {}
+
+        flags = self._client.evaluate_flags(distinct_id)
+        out: dict[UserFeatureFlag, bool | str | None] = {}
+        for flag_key in UserFeatureFlag:
+            out[flag_key] = flags.get_flag(flag_key.value)
+
+        return out
+
+    def get_user_feature_flags(
+        self, user: User
+    ) -> Mapping[UserFeatureFlag, bool | str | None]:
+        """Get feature flags for a user. Caches the result for a short time."""
+        distinct_id = self._distinct_id(user)
+        if distinct_id is None:
+            return {}
+
+        try:
+            return cache.get_or_set(
+                f"{self._feature_flags_cache_prefix}{distinct_id}",
+                default=lambda: self._fetch_user_feature_flags(user),
+                timeout=self._feature_flags_cache_ttl,
+            )
+        except Exception:  # pylint: disable=broad-exception-caught
+            logger.exception("Failed to get feature flags for user %s", user.pk)
+            return {}
@@ -0,0 +1,9 @@
+"""Catalog of all analytics feature flags used by the backend."""
+
+from enum import StrEnum
+
+
+class UserFeatureFlag(StrEnum):
+    """All feature flags configured in the app."""
+
+    TRANSCRIPT_SUMMARY_ENABLED = "summary-enabled"
@@ -61,13 +61,20 @@ def get_frontend_configuration(request):
            ],
        },
        "telephony": build_telephony_config(),
+        "resource": {
+            "default_access_level": settings.RESOURCE_DEFAULT_ACCESS_LEVEL,
+        },
        "subtitle": {"enabled": settings.ROOM_SUBTITLE_ENABLED},
+        "diagnostics": {"connection_test_enabled": settings.CONNECTION_TEST_ENABLED},
        "livekit": {
            "url": settings.LIVEKIT_CONFIGURATION["url"],
            "force_wss_protocol": settings.LIVEKIT_FORCE_WSS_PROTOCOL,
            "enable_firefox_proxy_workaround": settings.LIVEKIT_ENABLE_FIREFOX_PROXY_WORKAROUND,
            "default_sources": settings.LIVEKIT_DEFAULT_SOURCES,
        },
+        "authenticated_users_can_edit_display_name": (
+            settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME
+        ),
    }
    frontend_configuration.update(settings.FRONTEND_CONFIGURATION)
    return Response(frontend_configuration)
@@ -16,6 +16,8 @@ class FeatureFlag:
        "file_upload": "FILE_UPLOAD_ENABLED",
        "addons": "ADDONS_ENABLED",
        "application": "APPLICATION_ENABLED",
+        "roomkit": "ROOMKIT_ENABLED",
+        "connection_test": "CONNECTION_TEST_ENABLED",
    }

    @classmethod
@@ -6,6 +6,11 @@ from django.http import Http404
 from rest_framework import permissions

 from ..models import RoleChoices
+from ..services.participants_management import (
+    ParticipantNotFoundException,
+    ParticipantsManagement,
+    ParticipantsManagementException,
+)

 ACTION_FOR_METHOD_TO_PERMISSION = {
    "versions_detail": {"DELETE": "versions_destroy", "GET": "versions_retrieve"}
@@ -166,3 +171,30 @@ class CanMuteParticipant(permissions.BasePermission):

        # LiveKit token scoped to this room
        return request.auth.video.room == str(obj.id)
+
+
+class IsPresentInMeeting(permissions.BasePermission):
+    """Check that the requesting user is currently connected to the meeting.
+
+    The requester must be session-authenticated (their DB identity is needed
+    to check privileges); presence is verified against LiveKit using their
+    `sub` as participant identity. Fails closed on LiveKit errors.
+    """
+
+    message = "You must be connected to the meeting to perform this action."
+
+    def has_object_permission(self, request, view, obj):
+        """Verify the requester's identity is a participant of the room."""
+        user = request.user
+
+        if not user or not user.is_authenticated:
+            return False
+
+        try:
+            return ParticipantsManagement().check_if_in_meeting(
+                room_name=str(obj.pk), identity=str(user.sub)
+            )
+        except ParticipantNotFoundException:
+            return False
+        except ParticipantsManagementException:
+            return False
@@ -31,9 +31,28 @@ class UserSerializer(serializers.ModelSerializer):

    class Meta:
        model = models.User
-        fields = ["id", "email", "full_name", "short_name", "timezone", "language"]
+        fields = [
+            "id",
+            "email",
+            "full_name",
+            "short_name",
+            "timezone",
+            "language",
+            "default_room_access_level",
+            "default_room_configuration",
+        ]
        read_only_fields = ["id", "email", "full_name", "short_name"]

+    def validate_default_room_configuration(self, value):
+        """Validate the default room configuration against the RoomConfiguration schema."""
+        if value is None or value == {}:
+            return value
+        try:
+            RoomConfiguration.model_validate(value)
+        except PydanticValidationError as e:
+            raise serializers.ValidationError(e.errors()) from e
+        return value
+

 class UserLightSerializer(serializers.ModelSerializer):
    """Serialize users with limited fields."""
@@ -183,13 +202,11 @@ class RoomSerializer(serializers.ModelSerializer):
                user=request.user,
                username=username,
                configuration=output["configuration"],
-                is_admin_or_owner=is_admin_or_owner,
+                role=role,
            )
        else:
            del output["pin_code"]

-        output["is_administrable"] = is_admin_or_owner
-
        return output


@@ -299,8 +316,8 @@ class RoomInviteSerializer(serializers.Serializer):
 class BaseParticipantsManagementSerializer(BaseValidationOnlySerializer):
    """Base serializer for participant management operations."""

-    participant_identity = serializers.UUIDField(
-        help_text="LiveKit participant identity (UUID format)"
+    participant_identity = serializers.CharField(
+        help_text="LiveKit participant identity (matching the user's sub format)"
    )


@@ -312,6 +329,15 @@ class MuteParticipantSerializer(BaseParticipantsManagementSerializer):
    )


+class ParticipantRoleSerializer(BaseParticipantsManagementSerializer):
+    """Validate an in-meeting role change (promotion/demotion) request."""
+
+    role = serializers.ChoiceField(
+        choices=[models.RoleChoices.MEMBER, models.RoleChoices.ADMIN],
+        help_text="Target role. Ownership cannot be granted this way.",
+    )
+
+
 TrackSource = Literal["camera", "microphone", "screen_share", "screen_share_audio"]


@@ -563,3 +589,13 @@ class RenameParticipantSerializer(BaseValidationOnlySerializer):
    """Serializer for renaming a participant in a room."""

    name = serializers.CharField(min_length=1, max_length=255, allow_blank=False)
+
+
+class ExternalProcessEventSerializer(BaseValidationOnlySerializer):
+    """Validate external process event data."""
+
+    job_id = serializers.CharField(required=True)
+    # We are not strict on purpose on those fields to avoid
+    # useless bad requests
+    type = serializers.CharField(required=False, allow_null=True, allow_blank=True)
+    status = serializers.CharField(required=False, allow_null=True, allow_blank=True)
@@ -73,3 +73,27 @@ class CreationCallbackAnonRateThrottle(MonitoredAnonRateThrottle):
    """Throttle Anonymous user requesting room generation callback"""

    scope = "creation_callback"
+
+
+class RoomKitJoinRateThrottle(MonitoredUserRateThrottle):
+    """Throttle the LiveKit SIP module requesting roomkit joins.
+
+    The roomkit endpoints are authenticated as a machine user, so all requests
+    share a single throttle bucket. This is not a security measure against
+    brute-force attacks but a guard against accidental hammering from a buggy
+    SIP module.
+    """
+
+    scope = "roomkit_join"
+
+
+class ConnectionTestUserRateThrottle(MonitoredUserRateThrottle):
+    """Throttle authenticated users requesting connection test tokens."""
+
+    scope = "connection_test"
+
+
+class ConnectionTestAnonRateThrottle(MonitoredAnonRateThrottle):
+    """Throttle anonymous users requesting connection test tokens."""
+
+    scope = "connection_test"
@@ -2,8 +2,10 @@
 # pylint: disable=too-many-lines

 import uuid
+from datetime import timedelta
 from logging import getLogger
 from urllib.parse import unquote, urlparse
+from uuid import uuid4

 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
@@ -27,6 +29,9 @@ from rest_framework import (
 from rest_framework import (
    exceptions as drf_exceptions,
 )
+from rest_framework import (
+    permissions as drf_permissions,
+)
 from rest_framework import (
    response as drf_response,
 )
@@ -35,23 +40,30 @@ from rest_framework import (
 )
 from rest_framework.settings import api_settings

-from core import enums, models, utils
+from core import analytics, enums, models, utils
+from core.api import throttling
 from core.api.filters import ListFileFilter
 from core.enums import MEDIA_STORAGE_URL_PATTERN
 from core.recording.enums import FileExtension
-from core.recording.event.authentication import StorageEventAuthentication
+from core.recording.event.authentication import (
+    RecordingProcessWebhookAuthentication,
+    StorageEventAuthentication,
+)
 from core.recording.event.exceptions import (
    InvalidBucketError,
    InvalidFilepathError,
    InvalidFileTypeError,
    ParsingEventDataError,
 )
-from core.recording.event.notification import notification_service
 from core.recording.event.parsers import get_parser
 from core.recording.services.metadata_collector import (
    MetadataCollectorException,
    MetadataCollectorService,
 )
+from core.recording.services.recording_events import (
+    RecordingEventsService,
+    RecordingNotSavableError,
+)
 from core.recording.worker.exceptions import (
    RecordingStartError,
    RecordingStopError,
@@ -82,10 +94,17 @@ from core.services.room_management import (
    RoomManagementException,
    RoomNotFoundException,
 )
+from core.services.room_roles import (
+    RoomRoleError,
+    RoomRoleService,
+)
 from core.services.subtitle import SubtitleException, SubtitleService
+from core.tasks.connection_test import delete_connection_test_room
 from core.tasks.file import process_file_deletion
+from core.utils import generate_token

 from ..authentication.livekit import LiveKitTokenAuthentication
+from ..models import RoomAccessLevel
 from . import permissions, serializers, throttling
 from .feature_flag import FeatureFlag

@@ -261,6 +280,9 @@ class RoomViewSet(
            username = request.query_params.get("username", None)
            data = {
                "id": None,
+                "slug": slug,
+                "is_administrable": False,
+                "access_level": RoomAccessLevel.PUBLIC,
                "livekit": {
                    "url": settings.LIVEKIT_CONFIGURATION["url"],
                    "room": slug,
@@ -294,8 +316,27 @@ class RoomViewSet(
        return drf_response.Response(serializer.data)

    def perform_create(self, serializer):
-        """Set the current user as owner of the newly created room."""
-        room = serializer.save()
+        """Set the current user as owner of the newly created room.
+
+        Apply the user's default room preferences (access level and configuration)
+        unless the request explicitly provides its own values.
+        """
+        user = self.request.user
+        save_kwargs = {}
+
+        if (
+            "access_level" not in serializer.validated_data
+            and user.default_room_access_level not in (None, "")
+        ):
+            save_kwargs["access_level"] = user.default_room_access_level
+
+        user_default_configuration = user.default_room_configuration
+        if not serializer.validated_data.get(
+            "configuration"
+        ) and user_default_configuration not in (None, {}):
+            save_kwargs["configuration"] = user.default_room_configuration
+
+        room = serializer.save(**save_kwargs)
        models.ResourceAccess.objects.create(
            resource=room,
            user=self.request.user,
@@ -305,6 +346,16 @@ class RoomViewSet(
        if callback_id := self.request.data.get("callback_id"):
            RoomCreation().persist_callback_state(callback_id, room)

+        analytics.capture(
+            self.request.user,
+            analytics.AnalyticsEvent.ROOM_CREATED,
+            {
+                "room_id": str(room.pk),
+                "access_level": room.access_level,
+                "from_callback": bool(self.request.data.get("callback_id")),
+            },
+        )
+
    def perform_update(self, serializer):
        """Persist the room update, then sync metadata to LiveKit."""

@@ -619,6 +670,53 @@ class RoomViewSet(
            status=drf_status.HTTP_200_OK,
        )

+    @decorators.action(
+        detail=True,
+        methods=["post"],
+        url_path="update-participant-role",
+        permission_classes=[
+            permissions.HasPrivilegesOnRoom,
+            permissions.IsPresentInMeeting,
+        ],
+    )
+    def update_participant_role(self, request, pk=None):  # pylint: disable=unused-argument
+        """Promote or demote a participant currently connected to the meeting.
+
+        Requires the requester to be session-authenticated, have privileges
+        (admin/owner) on the room, and be connected to the meeting.
+
+        If the target participant has a user account, the role is persisted
+        (`ResourceAccess`) then mirrored to their LiveKit attributes.
+
+        If the participant is anonymous, the promotion will fail.
+        """
+
+        room = self.get_object()
+
+        serializer = serializers.ParticipantRoleSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        participant_identity = serializer.validated_data["participant_identity"]
+        role = serializer.validated_data["role"]
+
+        if str(request.user.sub) == str(participant_identity):
+            return drf_response.Response(
+                {"error": "You cannot change your own role."},
+                status=drf_status.HTTP_403_FORBIDDEN,
+            )
+
+        try:
+            result = RoomRoleService().set_participant_role(
+                room=room,
+                participant_identity=participant_identity,
+                role=role,
+                actor=request.user,
+            )
+        except RoomRoleError as e:
+            return drf_response.Response({"error": str(e)}, status=e.status_code)
+
+        return drf_response.Response(result, status=drf_status.HTTP_200_OK)
+
    @decorators.action(
        detail=True,
        methods=["post"],
@@ -972,29 +1070,74 @@ class RecordingViewSet(
        except models.Recording.DoesNotExist as e:
            raise drf_exceptions.NotFound("No recording found for this event.") from e

-        if not recording.is_savable():
+        # Save recording
+        recording_events_service = RecordingEventsService()
+        try:
+            recording_events_service.handle_complete(recording)
+        except RecordingNotSavableError:
            raise drf_exceptions.PermissionDenied(
                f"Recording with ID {recording_id} cannot be saved because it is either,"
                " in an error state or has already been saved."
-            )
-
-        # Attempt to notify external services about the recording
-        # This is a non-blocking operation - failures are logged but don't interrupt the flow
-        notification_succeeded = notification_service.notify_external_services(
-            recording
-        )
-
-        recording.status = (
-            models.RecordingStatusChoices.NOTIFICATION_SUCCEEDED
-            if notification_succeeded
-            else models.RecordingStatusChoices.SAVED
-        )
-        recording.save()
+            ) from None

        return drf_response.Response(
            {"message": "Event processed."},
        )

+    @decorators.action(
+        detail=False,
+        methods=["post"],
+        url_path="external-process-hook",
+        authentication_classes=[RecordingProcessWebhookAuthentication],
+        serializer_class=serializers.ExternalProcessEventSerializer,
+    )
+    def on_external_process_event_received(self, request, pk=None):  # pylint: disable=unused-argument
+        """Handle incoming external process events for recordings."""
+        logger.debug("Processing external process event %s", request.data)
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        ok_response = drf_response.Response(
+            {"message": "Event processed."},
+        )
+
+        validated_data = serializer.validated_data
+        job_id = validated_data["job_id"]
+        try:
+            recording = models.Recording.objects.get(external_process_id=job_id)
+        except models.Recording.DoesNotExist as e:
+            logger.warning("No recording found for job_id %s: %s", job_id, e)
+            return ok_response
+
+        if validated_data.get("type") == "transcript":
+            if validated_data.get("status") == "success":
+                logger.info(
+                    "External process transcript success received for recording %s",
+                    job_id,
+                )
+                recording.status = (
+                    models.RecordingStatusChoices.EXTERNAL_PROCESS_SUCCESSFUL
+                )
+                recording.save()
+                return ok_response
+
+            if validated_data.get("status") == "failure":
+                logger.info(
+                    "External process transcript failure received for recording %s",
+                    job_id,
+                )
+                recording.status = models.RecordingStatusChoices.EXTERNAL_PROCESS_FAILED
+                recording.save()
+                return ok_response
+
+        logger.info(
+            "No changes to save for external process id %s and payload %s",
+            job_id,
+            validated_data,
+        )
+
+        return ok_response
+
    def _auth_get_original_url(self, request):
        """
        Extracts and parses the original URL from the "HTTP_X_ORIGINAL_URL" header.
@@ -1187,7 +1330,10 @@ class FileViewSet(
        serializer.save(creator=self.request.user)

    def perform_destroy(self, instance):
-        """Override to implement a soft delete instead of dumping the record in database."""
+        """Override to implement a soft delete instead of dumping the record in database.
+
+        Files are actually purged by commands that should run periodically.
+        """
        instance.soft_delete()

    @decorators.action(detail=True, methods=["post"], url_path="upload-ended")
@@ -1425,3 +1571,68 @@ class FileViewSet(
        request = utils.generate_s3_authorization_headers(f"{url_params.get('key'):s}")

        return drf_response.Response("authorized", headers=request.headers, status=200)
+
+
+class DiagnosticsViewSet(viewsets.ViewSet):
+    """Endpoints helping users and support diagnose connectivity issues.
+
+    Diagnostics are grouped behind a single prefix so upcoming checks
+    (rtcstats collection, ICE candidate reports, etc.) can be added as new
+    actions rather than new top-level routes.
+
+    They are open to anonymous users: someone who cannot join a room is
+    exactly who needs to run a test, and they may well not be logged in.
+    Each action therefore carries its own throttle scope.
+    """
+
+    permission_classes = [drf_permissions.AllowAny]
+
+    @decorators.action(
+        detail=False,
+        methods=["POST"],
+        url_path="connection",
+        url_name="connection",
+        throttle_classes=[
+            throttling.ConnectionTestUserRateThrottle,
+            throttling.ConnectionTestAnonRateThrottle,
+        ],
+    )
+    @FeatureFlag.require("connection_test")
+    def connection(self, request):
+        """Return a short-lived LiveKit token for an ephemeral test room.
+
+        Going through the room API is not an option here: it is tied to
+        registered meetings, lobby rules and longer-lived tokens. Each call
+        gets its own room so two people testing at the same time never meet.
+        """
+        room = f"{settings.CONNECTION_TEST_ROOM_PREFIX}-{uuid4()}"
+        expires_in = settings.CONNECTION_TEST_TOKEN_TTL_SECONDS
+
+        # LiveKit refreshes tokens for connected clients, so JWT TTL alone does not
+        # eject someone who stays connected. Schedule a hard DeleteRoom when Celery
+        # is available.
+        if settings.CELERY_ENABLED:
+            max_age = (
+                settings.CONNECTION_TEST_TOKEN_TTL_SECONDS
+                + settings.CONNECTION_TEST_ROOM_EXTRA_AGE_SECONDS
+            )
+            delete_connection_test_room.apply_async(
+                args=[room],
+                countdown=max_age,
+            )
+
+        return drf_response.Response(
+            {
+                "livekit": {
+                    "url": settings.LIVEKIT_CONFIGURATION["url"],
+                    "room": room,
+                    "token": generate_token(
+                        room=room,
+                        user=request.user,
+                        username="Connection Test",
+                        ttl=timedelta(seconds=expires_in),
+                    ),
+                    "expires_in": expires_in,
+                },
+            }
+        )
@@ -9,6 +9,7 @@ from django.utils.translation import gettext_lazy as _
 from lasuite.oidc_login.backends import (
    OIDCAuthenticationBackend as LaSuiteOIDCAuthenticationBackend,
 )
+from rest_framework.authentication import SessionAuthentication

 from core.models import User
 from core.services.marketing import (
@@ -96,3 +97,17 @@ class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):
                        "Multiple user accounts share a common email."
                    ) from e
        return None
+
+
+class SessionAuthenticationWith401(SessionAuthentication):
+    """
+    Identical to DRF's SessionAuthentication, but returns a WWW-Authenticate
+    header so unauthenticated requests get a 401 instead of a 403.
+
+    The scheme is deliberately NOT 'Basic' — that would trigger the browser's
+    native login popup. 'Session' is ignored by the browser's auth UI but is
+    still truthy, so DRF keeps the status at 401.
+    """
+
+    def authenticate_header(self, request):
+        return "Session"
@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
 class BaseJWTAuthentication(authentication.BaseAuthentication):
    """Base JWT authentication class."""

-    def __init__(
+    def __init__(  # noqa: PLR0917
        self,
        secret_key,
        algorithm,
@@ -19,7 +19,7 @@ from rest_framework import (
    status as drf_status,
 )

-from core import api, models
+from core import analytics, api, models
 from core.api.feature_flag import FeatureFlag
 from core.services.jwt_token import JwtTokenService

@@ -194,10 +194,27 @@ class RoomViewSet(
            role=models.RoleChoices.OWNER,
        )

+        auth_method = type(self.request.successful_authenticator).__name__
+        client_id = (self.request.auth or {}).get("client_id", "unknown")
+
        # Log for auditing
        logger.info(
-            "Room created via application: room_id=%s, user_id=%s, client_id=%s",
+            "Room created via application: room_id=%s, user_id=%s, client_id=%s, auth_method=%s",
            room.id,
            self.request.user.id,
-            getattr(self.request.auth, "client_id", "unknown"),
+            client_id,
+            auth_method,
+        )
+
+        analytics.capture(
+            self.request.user,
+            analytics.AnalyticsEvent.ROOM_CREATED,
+            {
+                "room_id": str(room.pk),
+                "access_level": room.access_level,
+                "client_id": client_id,
+                "external_api": True,
+                "auth_method": auth_method,
+                "$set": {"email": self.request.user.email},
+            },
        )
@@ -0,0 +1,47 @@
+"""Clean stale pending files that were never fully uploaded."""
+
+from datetime import timedelta
+
+from django.core.management.base import BaseCommand, CommandError
+from django.utils import timezone
+
+from core.models import File, FileUploadStateChoices
+from core.tasks.file import process_file_deletion
+
+
+class Command(BaseCommand):
+    """Remove pending files older than a given threshold."""
+
+    help = "Delete pending files that have been stuck for too long"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--hours",
+            type=int,
+            default=24,
+            help="Age threshold in hours (default: 24)",
+        )
+
+    def handle(self, *args, **options):
+        hours = options["hours"]
+        if hours < 0:
+            raise CommandError("Hours must be greater than 0")
+
+        threshold = timezone.now() - timedelta(hours=hours)
+
+        files = File.objects.filter(
+            upload_state=FileUploadStateChoices.PENDING,
+            created_at__lt=threshold,
+            hard_deleted_at__isnull=True,
+        )
+
+        count = 0
+        for file in files.iterator():
+            # This check shouldn't happen, but just in case we do it to avoid an error
+            if not file.deleted_at:
+                file.soft_delete()
+            file.hard_delete()
+            process_file_deletion(file.id)
+            count += 1
+
+        self.stdout.write(f"Cleaned {count} stale pending file(s).")
@@ -6,6 +6,7 @@ from django.contrib.auth import get_user_model
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
 from django.db.models import Count
+from django.db.models.functions import Lower

 from core.models import File, RecordingAccess, ResourceAccess, RoleChoices

@@ -20,11 +21,14 @@ ROLE_PRIORITY = {

 class Command(BaseCommand):
    """
-    Merge duplicate users sharing the same email into the most recently created one.
+    Merge duplicate users sharing the same email (case-insensitive) into the
+    most recently created one.

-    The KEPT user is the most recently created. All room memberships, recording
-    accesses and files are transferred to it. When a conflict exists, the
-    higher-privilege role wins. Stale users are then deleted.
+    Emails are compared case-insensitively, so 'John@Example.com' and
+    'john@example.com' are treated as duplicates. The KEPT user is the most
+    recently created. All room memberships, recording accesses and files are
+    transferred to it. When a conflict exists, the higher-privilege role wins.
+    Stale users are then deleted.
    Each email group is processed inside a single database transaction.
    """

@@ -56,13 +60,16 @@ class Command(BaseCommand):
            users_qs = users_qs.filter(email__icontains=email_filter)
            self.stdout.write(f"[INFO] Filtering emails containing '{email_filter}'.\n")

+        # Group emails case-insensitively so 'John@X.com' and 'john@x.com'
+        # are detected as duplicates of each other.
        duplicate_emails = (
            users_qs.exclude(email__isnull=True)
            .exclude(email="")
-            .values("email")
+            .annotate(email_lower=Lower("email"))
+            .values("email_lower")
            .annotate(cnt=Count("id"))
            .filter(cnt__gt=1)
-            .values_list("email", flat=True)
+            .values_list("email_lower", flat=True)
        )

        if not duplicate_emails:
@@ -78,9 +85,12 @@ class Command(BaseCommand):
        failed_emails = []

        for email in duplicate_emails:
+            # Case-insensitive lookup to fetch every casing variant of the email.
            # Secondary sort by id ensures a stable, deterministic order when
            # created_at timestamps are equal (common in tests and bulk imports).
-            users = list(User.objects.filter(email=email).order_by("created_at", "id"))
+            users = list(
+                User.objects.filter(email__iexact=email).order_by("created_at", "id")
+            )
            kept_user = users[-1]
            stale_users = users[:-1]

@@ -120,6 +130,10 @@ class Command(BaseCommand):
                failed_emails.append(email)
                self.stderr.write(f"[ERROR] Failed to merge '{email}': {exc}")

+            if not kept_user.email.islower():
+                kept_user.email = kept_user.email.lower()
+                kept_user.save(update_fields=["email"])
+
        if failed_emails:
            raise CommandError(
                f"Failed to merge {len(failed_emails)} email group(s): {', '.join(failed_emails)}"
@@ -0,0 +1,40 @@
+"""Purge deleted files."""
+
+from datetime import timedelta
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+from django.db.models import Q
+from django.utils import timezone
+
+from core.models import File
+from core.tasks.file import process_file_deletion
+
+
+class Command(BaseCommand):
+    """
+    Purge deleted files (object storage and database object):
+    - files marked as hard deleted in database
+    - files marked as soft deleted and for which the trashbin retention period has expired
+    """
+
+    help = "Purge deleted files"
+
+    def handle(self, *args, **options):
+        """Browse purgeable files and queue them through the file deletion task."""
+
+        is_hard_deleted = Q(hard_deleted_at__isnull=False)
+        is_purgeable = Q(
+            deleted_at__lte=timezone.now()
+            - timedelta(days=settings.FILE_PURGE_GRACE_DAYS)
+        )
+
+        count = 0
+        for file in File.objects.filter(is_hard_deleted | is_purgeable).iterator():
+            if file.hard_deleted_at is None:
+                file.hard_delete()
+
+            process_file_deletion.delay(file.id)
+            count += 1
+
+        self.stdout.write(f"Purged {count} deleted file(s).")
@@ -0,0 +1,23 @@
+# Generated by Django 5.2.14 on 2026-06-22 08:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0020_alter_file_upload_state'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recording',
+            name='external_process_id',
+            field=models.CharField(blank=True, help_text='ID of the external process associated with the recording.', max_length=255, null=True, unique=True, verbose_name='External Process ID'),
+        ),
+        migrations.AlterField(
+            model_name='recording',
+            name='status',
+            field=models.CharField(choices=[('initiated', 'Initiated'), ('active', 'Active'), ('stopped', 'Stopped'), ('saved', 'Saved'), ('aborted', 'Aborted'), ('failed_to_start', 'Failed to Start'), ('failed_to_stop', 'Failed to Stop'), ('notification_succeeded', 'Notification succeeded'), ('external_process_successful', 'External process successful'), ('external_process_failed', 'External process failed')], default='initiated', max_length=50),
+        ),
+    ]
@@ -0,0 +1,23 @@
+# Generated by Django 5.2.14 on 2026-08-03 13:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0021_recording_external_process_id_alter_recording_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='default_room_access_level',
+            field=models.CharField(blank=True, choices=[('public', 'Public Access'), ('trusted', 'Trusted Access'), ('restricted', 'Restricted Access')], help_text='Access level applied by default to new rooms created by this user. When empty, the instance default is used.', max_length=50, null=True, verbose_name='default room access level'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='default_room_configuration',
+            field=models.JSONField(blank=True, default=dict, help_text='Configurations applied by default to new rooms created by this user.', verbose_name='default room configuration'),
+        ),
+    ]
@@ -60,6 +60,11 @@ class RecordingStatusChoices(models.TextChoices):
    FAILED_TO_START = "failed_to_start", _("Failed to Start")
    FAILED_TO_STOP = "failed_to_stop", _("Failed to Stop")
    NOTIFICATION_SUCCEEDED = "notification_succeeded", _("Notification succeeded")
+    EXTERNAL_PROCESS_SUCCESSFUL = (
+        "external_process_successful",
+        _("External process successful"),
+    )
+    EXTERNAL_PROCESS_FAILED = "external_process_failed", _("External process failed")

    @classmethod
    def is_final(cls, status):
@@ -73,6 +78,8 @@ class RecordingStatusChoices(models.TextChoices):
            cls.STOPPED,
            cls.SAVED,
            cls.ABORTED,
+            cls.EXTERNAL_PROCESS_SUCCESSFUL,
+            cls.EXTERNAL_PROCESS_FAILED,
            cls.FAILED_TO_START,
            cls.FAILED_TO_STOP,
        }
@@ -182,6 +189,25 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
        default=settings.TIME_ZONE,
        help_text=_("The timezone in which the user wants to see times."),
    )
+    default_room_access_level = models.CharField(
+        max_length=50,
+        choices=RoomAccessLevel.choices,
+        blank=True,
+        null=True,
+        verbose_name=_("default room access level"),
+        help_text=_(
+            "Access level applied by default to new rooms created by this user. "
+            "When empty, the instance default is used."
+        ),
+    )
+    default_room_configuration = models.JSONField(
+        blank=True,
+        default=dict,
+        verbose_name=_("default room configuration"),
+        help_text=_(
+            "Configurations applied by default to new rooms created by this user."
+        ),
+    )
    is_device = models.BooleanField(
        _("device"),
        default=False,
@@ -422,7 +448,14 @@ class Room(Resource):

    def save(self, *args, **kwargs):
        """Generate a unique n-digit pin code for new rooms."""
-        if settings.ROOM_TELEPHONY_ENABLED and not self.pk and not self.pin_code:
+
+        # Roomkit devices also join by PIN, so a PIN is needed as soon as
+        # either integration is enabled.
+        if (
+            (settings.ROOM_TELEPHONY_ENABLED or settings.ROOMKIT_ENABLED)
+            and not self.pk
+            and not self.pin_code
+        ):
            self.pin_code = self.generate_unique_pin_code(
                length=settings.ROOM_TELEPHONY_PIN_LENGTH
            )
@@ -598,6 +631,14 @@ class Recording(BaseModel):
        verbose_name=_("Recording options"),
        help_text=_("Recording options"),
    )
+    external_process_id = models.CharField(
+        max_length=255,
+        null=True,
+        blank=True,
+        unique=True,
+        verbose_name=_("External Process ID"),
+        help_text=_("ID of the external process associated with the recording."),
+    )

    class Meta:
        db_table = "meet_recording"
@@ -653,6 +694,8 @@ class Recording(BaseModel):
        return self.status in {
            RecordingStatusChoices.NOTIFICATION_SUCCEEDED,
            RecordingStatusChoices.SAVED,
+            RecordingStatusChoices.EXTERNAL_PROCESS_SUCCESSFUL,
+            RecordingStatusChoices.EXTERNAL_PROCESS_FAILED,
        }

    @property
@@ -14,9 +14,9 @@ logger = logging.getLogger(__name__)
 class MachineUser:
    """Represent a non-interactive system user for automated storage operations."""

-    def __init__(self) -> None:
+    def __init__(self, username: str = "storage_event_user") -> None:
        self.pk = None
-        self.username = "storage_event_user"
+        self.username = username
        self.is_active = True

    @property
@@ -34,33 +34,33 @@ class MachineUser:
        return self.username


-class StorageEventAuthentication(BaseAuthentication):
-    """Authenticate requests using a Bearer token for storage event integration.
-    This class validates Bearer tokens for storage events that don't map to database users.
-    It's designed for S3-compatible storage integrations and similar use cases.
-    Events are submitted when a webhook is configured on some bucket's events.
-    """
+class HeaderBasedAuthentication(BaseAuthentication):
+    """Authenticate requests using a header with a secret key."""

    AUTH_HEADER = "Authorization"
    TOKEN_TYPE = "Bearer"  # noqa S105
+    REALM = ""
+
+    IS_ENFORCED_SETTINGS_KEY = None
+    EXPECTED_TOKEN_SETTINGS_KEY = None

    def authenticate(self, request):
        """Validate the Bearer token from the Authorization header."""

-        if not settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
-            return MachineUser(), None
+        if self.IS_ENFORCED_SETTINGS_KEY is not None:
+            if not getattr(settings, self.IS_ENFORCED_SETTINGS_KEY):
+                return MachineUser(), None

-        required_token = settings.RECORDING_STORAGE_EVENT_TOKEN
-        if not required_token:
-            if settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
-                raise AuthenticationFailed(
-                    "Authentication is enabled but token is not configured."
-                )
-
-            return MachineUser(), None
+        if (
+            self.EXPECTED_TOKEN_SETTINGS_KEY is None
+            or (required_token := getattr(settings, self.EXPECTED_TOKEN_SETTINGS_KEY))
+            is None
+        ):
+            raise AuthenticationFailed(
+                "Authentication is enabled but token is not configured."
+            )

        auth_header = request.headers.get(self.AUTH_HEADER)
-
        if not auth_header:
            logger.warning(
                "Authentication failed: Missing Authorization header (ip: %s)",
@@ -68,15 +68,10 @@ class StorageEventAuthentication(BaseAuthentication):
            )
            raise AuthenticationFailed("Authorization header is required")

-        auth_parts = auth_header.split(" ")
-        if len(auth_parts) != 2 or auth_parts[0] != self.TOKEN_TYPE:
-            logger.warning(
-                "Authentication failed: Invalid authorization header (ip: %s)",
-                request.META.get("REMOTE_ADDR"),
-            )
-            raise AuthenticationFailed("Invalid authorization header.")
-
-        token = auth_parts[1]
+        scheme, _, token = auth_header.partition(" ")
+        if scheme.lower() != self.TOKEN_TYPE.lower() or not token.strip():
+            raise AuthenticationFailed("Invalid authorization header format.")
+        token = token.strip()

        # Use constant-time comparison to prevent timing attacks
        if not secrets.compare_digest(token.encode(), required_token.encode()):
@@ -90,4 +85,26 @@ class StorageEventAuthentication(BaseAuthentication):

    def authenticate_header(self, request):
        """Return the WWW-Authenticate header value."""
-        return f"{self.TOKEN_TYPE} realm='Storage event API'"
+        return f"{self.TOKEN_TYPE} realm='{self.REALM}'"
+
+
+class StorageEventAuthentication(HeaderBasedAuthentication):
+    """Authenticate requests using a Bearer token for storage event integration.
+    This class validates Bearer tokens for storage events that don't map to database users.
+    It's designed for S3-compatible storage integrations and similar use cases.
+    Events are submitted when a webhook is configured on some bucket's events.
+    """
+
+    REALM = "Storage event API"
+    IS_ENFORCED_SETTINGS_KEY = "RECORDING_ENABLE_STORAGE_EVENT_AUTH"
+    EXPECTED_TOKEN_SETTINGS_KEY = "RECORDING_STORAGE_EVENT_TOKEN"  # noqa S105
+
+
+class RecordingProcessWebhookAuthentication(HeaderBasedAuthentication):
+    """
+    Custom authentication class for recording process webhook requests.
+    Validates the API key in the Authorization header.
+    """
+
+    REALM = "External process webhook API"
+    EXPECTED_TOKEN_SETTINGS_KEY = "SUMMARY_SERVICE_WEBHOOK_API_TOKEN"  # noqa S105
@@ -4,11 +4,12 @@ import asyncio
 import logging
 import smtplib
 from datetime import datetime, timezone
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError

 from django.conf import settings
 from django.core.mail import send_mail
 from django.template.loader import render_to_string
-from django.utils.translation import get_language, override
+from django.utils.translation import get_language, gettext, override
 from django.utils.translation import gettext_lazy as _

 import aiohttp
@@ -17,6 +18,8 @@ from asgiref.sync import async_to_sync
 from livekit import api as livekit_api

 from core import models, utils
+from core.analytics import UserFeatureFlag, is_user_feature_flag_enabled
+from core.utils import generate_download_s3_url

 logger = logging.getLogger(__name__)

@@ -118,7 +121,7 @@ class NotificationService:
                msg_plain = render_to_string(
                    "mail/text/screen_recording.txt", personalized_context
                )
-                subject = str(_("Your recording is ready"))  # Force translation
+                subject = gettext("Your recording is ready")  # Force translation

                try:
                    send_mail(
@@ -178,8 +181,49 @@ class NotificationService:

        return _ns_to_utc(file_result.started_at), _ns_to_utc(file_result.ended_at)

+    @staticmethod
+    def _generate_title(
+        *,
+        locale: str,
+        room: str,
+        recording_datetime: datetime | None,
+        owner_timezone: str | None,
+    ) -> str:
+        """Generate title from context or return default."""
+        if recording_datetime is None:
+            with override(locale):
+                return gettext("Transcription")
+
+        dt = recording_datetime
+        if owner_timezone:
+            try:
+                dt = recording_datetime.astimezone(ZoneInfo(owner_timezone))
+            except (KeyError, ZoneInfoNotFoundError):
+                pass  # Keep the original UTC datetime
+
+        with override(locale):
+            translated_template = _(
+                'Meeting "{room}" on {room_recording_date} at {room_recording_time}'
+            )
+            return translated_template.format(
+                room=room,
+                room_recording_date=dt.strftime("%Y-%m-%d"),
+                room_recording_time=dt.strftime("%H:%M"),
+            )
+
    @staticmethod
    def _notify_summary_service(recording: models.Recording):
+        if settings.SUMMARY_SERVICE_VERSION == 1:
+            return NotificationService._notify_summary_service_v1(recording)
+        if settings.SUMMARY_SERVICE_VERSION == 2:
+            return NotificationService._notify_summary_service_v2(recording)
+
+        raise NotImplementedError(
+            f"Unknown summary service version: {settings.SUMMARY_SERVICE_VERSION}"
+        )
+
+    @staticmethod
+    def _notify_summary_service_v1(recording: models.Recording):
        """Notify summary service about a new recording."""

        if (
@@ -253,5 +297,120 @@ class NotificationService:

        return True

+    @staticmethod
+    def _notify_summary_service_v2(recording: models.Recording):
+        """Notify summary service about a new recording."""
+
+        if (
+            not settings.SUMMARY_SERVICE_ENDPOINT
+            or not settings.SUMMARY_SERVICE_API_TOKEN
+        ):
+            logger.error("Summary service not configured")
+            return False
+
+        owner_access = (
+            models.RecordingAccess.objects.select_related("user")
+            .filter(
+                role=models.RoleChoices.OWNER,
+                recording_id=recording.id,
+            )
+            .first()
+        )
+        metadata_filename: None | str = None
+        if settings.METADATA_COLLECTOR_ENABLED and recording.options.get(
+            "collect_metadata", False
+        ):
+            output_folder = settings.METADATA_COLLECTOR_OUTPUT_FOLDER
+            metadata_filename = f"{output_folder}/{recording.id}-metadata.json"
+
+        if not owner_access:
+            logger.error("No owner found for recording %s", recording.id)
+            return False
+
+        started_at, ended_at = async_to_sync(
+            NotificationService._get_recording_timestamps
+        )(recording.worker_id)
+
+        form_base_url = settings.TRANSCRIPTION_SATISFACTION_FORM_BASE_URL
+        form_link = (
+            f"{form_base_url}?room_id={recording.room.id}"
+            if (form_base_url and metadata_filename is not None)
+            else None
+        )
+        metadata_payload = None
+        if started_at and ended_at and metadata_filename:
+            metadata_payload = {
+                "cloud_storage_url": generate_download_s3_url(
+                    metadata_filename,
+                    expires_in=settings.SUMMARY_SERVICE_CLOUD_STORAGE_SIGNED_URL_EXPIRY_SECONDS,
+                    override_domain=False,
+                ),
+                "started_at": started_at.isoformat(),
+                "ended_at": ended_at.isoformat(),
+            }
+
+        payload = {
+            "user_sub": owner_access.user.sub,
+            "user_email": owner_access.user.email,
+            "cloud_storage_url": generate_download_s3_url(
+                recording.key,
+                expires_in=settings.SUMMARY_SERVICE_CLOUD_STORAGE_SIGNED_URL_EXPIRY_SECONDS,
+                override_domain=False,
+            ),
+            "language": recording.options.get(
+                "language", get_language().split("-")[0].lower()
+            ),
+            "context_language": owner_access.user.language,
+            "push_to_docs_config": {
+                "user_email": owner_access.user.email,
+                "title": NotificationService._generate_title(
+                    locale=owner_access.user.language
+                    or recording.options.get("language", get_language()),
+                    room=recording.room.name,
+                    recording_datetime=started_at,
+                    owner_timezone=str(owner_access.user.timezone),
+                ),
+                "download_link": f"{get_recording_download_base_url()}/{recording.id}",
+                "form_link": form_link,
+                "auto_create_summary": is_user_feature_flag_enabled(
+                    owner_access.user, UserFeatureFlag.TRANSCRIPT_SUMMARY_ENABLED
+                ),
+            },
+            "metadata": metadata_payload,
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {settings.SUMMARY_SERVICE_API_TOKEN}",
+        }
+
+        try:
+            response = requests.post(
+                settings.SUMMARY_SERVICE_ENDPOINT,
+                json=payload,
+                headers=headers,
+                timeout=30,
+            )
+            response.raise_for_status()
+            response_json = response.json()
+            # We do not require a job_id to avoid a breaking change
+            job_id = response_json.get("job_id")
+            if not isinstance(job_id, str):
+                raise ValueError("job_id is not a string")
+
+            recording.external_process_id = job_id
+            recording.save()
+
+        except requests.RequestException as exc:
+            logger.exception(
+                "Summary service error for recording %s. URL: %s. Exception: %s",
+                recording.id,
+                settings.SUMMARY_SERVICE_ENDPOINT,
+                exc,
+            )
+            return False
+
+        return True
+

 notification_service = NotificationService()
@@ -6,6 +6,7 @@ import re
 from dataclasses import dataclass
 from functools import lru_cache
 from typing import Any, Dict, Optional, Protocol
+from urllib.parse import quote

 from django.conf import settings
 from django.utils.module_loading import import_string
@@ -58,7 +59,7 @@ class EventParser(Protocol):
    def parse(self, data: Dict) -> StorageEvent:
        """Extract storage event data from raw dictionary input."""

-    def validate(self, data: StorageEvent) -> None:
+    def validate(self, data: StorageEvent) -> str:
        """Verify storage event data meets all requirements."""

    def get_recording_id(self, data: Dict) -> str:
@@ -164,6 +165,9 @@ class S3Parser(BaseS3Parser):
            if not filepath:
                raise ParsingEventDataError("Missing object key name")
            filetype, _ = mimetypes.guess_type(filepath)
+            # Normalize raw S3-compatible object keys without re-encoding
+            # already encoded AWS S3 notification keys.
+            filepath = quote(filepath, safe="%+")
            return StorageEvent(
                filepath=filepath,
                filetype=filetype,
@@ -8,6 +8,12 @@ from livekit import api

 from core import models, utils
 from core.models import Recording
+from core.recording.event.notification import notification_service
+from core.services.room_management import (
+    RoomManagement,
+    RoomManagementException,
+    RoomNotFoundException,
+)

 logger = getLogger(__name__)

@@ -16,6 +22,10 @@ class RecordingEventsError(Exception):
    """Recording event handling fails."""


+class RecordingNotSavableError(Exception):
+    """Recording cannot be saved because it is either in an error state or has already been saved"""
+
+
 class RecordingEventsService:
    """Handles recording-related LiveKit webhook events."""

@@ -34,10 +44,15 @@ class RecordingEventsService:
        recording_status = status_mapping.get(egress_status)
        if recording_status:
            try:
-                utils.update_room_metadata(
+                RoomManagement().update_metadata(
                    room_name, {"recording_status": recording_status}
                )
-            except utils.MetadataUpdateException as e:
+            except RoomNotFoundException:
+                logger.info(
+                    "LiveKit room %s no longer exists, skipping metadata update",
+                    room_name,
+                )
+            except RoomManagementException as e:
                logger.exception("Failed to update room's metadata: %s", e)

    @staticmethod
@@ -73,3 +88,23 @@ class RecordingEventsService:
                f"Failed to notify participants in room '{recording.room.id}' about "
                f"recording limit reached (recording_id={recording.id})"
            ) from e
+
+    @staticmethod
+    def handle_complete(recording: Recording):
+        """Notify external services and save recording."""
+
+        if not recording.is_savable():
+            raise RecordingNotSavableError
+
+        # Attempt to notify external services about the recording
+        # This is a non-blocking operation - failures are logged but don't interrupt the flow
+        notification_succeeded = notification_service.notify_external_services(
+            recording
+        )
+
+        recording.status = (
+            models.RecordingStatusChoices.NOTIFICATION_SUCCEEDED
+            if notification_succeeded
+            else models.RecordingStatusChoices.SAVED
+        )
+        recording.save()
@@ -2,8 +2,12 @@

 import logging

-from core import utils
 from core.models import Recording, RecordingStatusChoices
+from core.services.room_management import (
+    RoomManagement,
+    RoomManagementException,
+    RoomNotFoundException,
+)

 from .exceptions import (
    RecordingStartError,
@@ -64,10 +68,15 @@ class WorkerServiceMediator:
        mode = recording.options.get("original_mode", None) or recording.mode

        try:
-            utils.update_room_metadata(
+            RoomManagement().update_metadata(
                room_name, {"recording_mode": mode, "recording_status": "starting"}
            )
-        except utils.MetadataUpdateException as e:
+        except RoomNotFoundException:
+            logger.info(
+                "LiveKit room %s no longer exists, skipping metadata update",
+                room_name,
+            )
+        except RoomManagementException as e:
            logger.exception("Failed to update room's metadata: %s", e)

        logger.info(
@@ -0,0 +1 @@
+"""Meet core roomkit API endpoints for meeting-room (SIP) device integration."""
@@ -0,0 +1,65 @@
+"""Authentication for the roomkit API of the Meet core app."""
+
+import logging
+import secrets
+
+from django.conf import settings
+
+from rest_framework.authentication import BaseAuthentication
+from rest_framework.exceptions import AuthenticationFailed
+
+from core.recording.event.authentication import MachineUser
+
+logger = logging.getLogger(__name__)
+
+
+class ServerToServerAuthentication(BaseAuthentication):
+    """Custom authentication class for roomkit server-to-server requests.
+
+    Validates the Authorization header against the roomkit server-to-server
+    token. A valid PIN code is intentionally not enough to authenticate: the
+    endpoints are restricted to the LiveKit SIP module's credentials.
+    """
+
+    AUTH_HEADER = "Authorization"
+    TOKEN_TYPE = "Bearer"  # noqa S105
+
+    def authenticate(self, request):
+        """Validate the Bearer token from the Authorization header.
+
+        Returns a (MachineUser, token) pair on success, and raises
+        AuthenticationFailed if the header is missing, malformed, or contains
+        an invalid token.
+        """
+        required_token = settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN
+        if not required_token:
+            raise AuthenticationFailed("Server-to-server token is not configured.")
+
+        auth_header = request.headers.get(self.AUTH_HEADER)
+        if not auth_header:
+            logger.warning(
+                "Roomkit authentication failed: missing Authorization header (ip: %s)",
+                request.META.get("REMOTE_ADDR"),
+            )
+            raise AuthenticationFailed("Authorization header is missing.")
+
+        # Validate token format and existence
+        auth_parts = auth_header.split(" ")
+        if len(auth_parts) != 2 or auth_parts[0] != self.TOKEN_TYPE:
+            raise AuthenticationFailed("Invalid authorization header.")
+
+        token = auth_parts[1]
+
+        # Use constant-time comparison to prevent timing attacks
+        if not secrets.compare_digest(token.encode(), required_token.encode()):
+            logger.warning(
+                "Roomkit authentication failed: invalid token (ip: %s)",
+                request.META.get("REMOTE_ADDR"),
+            )
+            raise AuthenticationFailed("Invalid server-to-server token.")
+
+        return MachineUser(username="roomkit"), token
+
+    def authenticate_header(self, request):
+        """Return the WWW-Authenticate header value."""
+        return f"{self.TOKEN_TYPE} realm='Roomkit server to server'"
@@ -0,0 +1,21 @@
+"""Serializers for the roomkit API of the Meet core app."""
+
+# pylint: disable=abstract-method
+
+from django.conf import settings
+
+from rest_framework import serializers
+
+from core.api.serializers import BaseValidationOnlySerializer
+
+
+class RoomKitJoinSerializer(BaseValidationOnlySerializer):
+    """Validate roomkit join requests from the LiveKit SIP module."""
+
+    pin_code = serializers.CharField(required=True)
+
+    def validate_pin_code(self, value):
+        """Ensure the PIN code matches the configured length."""
+        if len(value) != settings.ROOM_TELEPHONY_PIN_LENGTH:
+            raise serializers.ValidationError("PIN code length is invalid.")
+        return value
@@ -0,0 +1,89 @@
+"""Roomkit API endpoints for meeting-room (SIP) device integration."""
+
+from logging import getLogger
+
+from rest_framework import decorators, viewsets
+from rest_framework import (
+    exceptions as drf_exceptions,
+)
+from rest_framework import (
+    response as drf_response,
+)
+from rest_framework import (
+    status as drf_status,
+)
+
+from core import analytics, models
+from core.api import permissions, throttling
+from core.api.feature_flag import FeatureFlag
+from core.services.sip_management import SIPException, SIPManagement
+
+from . import authentication, serializers
+
+logger = getLogger(__name__)
+
+
+class RoomKitViewSet(viewsets.ViewSet):
+    """Server-to-server API endpoints for the roomkit integration.
+
+    Groups all interactions between roomkit (SIP) devices and the backend,
+    brokered by the LiveKit SIP module. All endpoints are authenticated
+    with the roomkit server-to-server tokens.
+    """
+
+    authentication_classes = [authentication.ServerToServerAuthentication]
+    permission_classes = [permissions.IsAuthenticated]
+
+    @decorators.action(
+        detail=False,
+        methods=["post"],
+        url_path="join",
+        throttle_classes=[throttling.RoomKitJoinRateThrottle],
+    )
+    @FeatureFlag.require("roomkit")
+    def join(self, request):
+        """Prepare a room for a meeting-room (SIP) device joining by PIN code.
+
+        Called by the LiveKit SIP module when a meeting-room device dials in
+        with a PIN code before any WebRTC participant has joined. Resolves the
+        room by PIN and creates its SIP dispatch rule, so the device can enter
+        without waiting for a WebRTC user.
+
+        The webhook-based creation path is kept: both converge on the same rule
+        through the shared SIPManagement.
+        """
+
+        serializer = serializers.RoomKitJoinSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        try:
+            room = models.Room.objects.get(
+                pin_code=serializer.validated_data["pin_code"]
+            )
+        except models.Room.DoesNotExist as e:
+            raise drf_exceptions.NotFound("No room found for this PIN code.") from e
+
+        try:
+            created = SIPManagement().ensure_dispatch_rule(room)
+        except SIPException as e:
+            raise drf_exceptions.APIException("Could not create dispatch rule.") from e
+
+        analytics.capture(
+            request.user,
+            analytics.AnalyticsEvent.ROOMKIT_JOINED,
+            {
+                "room_id": str(room.pk),
+                "dispatch_rule_created": created,
+            },
+        )
+
+        logger.info(
+            "Roomkit join requested: room_id=%s, dispatch_rule_created=%s",
+            room.id,
+            created,
+        )
+
+        return drf_response.Response(
+            {"status": "success"},
+            status=drf_status.HTTP_200_OK,
+        )
@@ -30,7 +30,7 @@ class TokenDecodeError(JWTError):
 class JwtTokenService:
    """Generic JWT token service with configurable settings."""

-    def __init__(
+    def __init__(  # noqa: PLR0917
        self,
        secret_key: str,
        algorithm: str,
@@ -11,7 +11,7 @@ from django.conf import settings

 from livekit import api

-from core import models, utils
+from core import models
 from core.recording.services.metadata_collector import (
    MetadataCollectorException,
    MetadataCollectorService,
@@ -19,10 +19,16 @@ from core.recording.services.metadata_collector import (
 from core.recording.services.recording_events import (
    RecordingEventsError,
    RecordingEventsService,
+    RecordingNotSavableError,
 )

 from .lobby import LobbyService
-from .telephony import TelephonyException, TelephonyService
+from .room_management import (
+    RoomManagement,
+    RoomManagementException,
+    RoomNotFoundException,
+)
+from .sip_management import SIPException, SIPManagement

 logger = getLogger(__name__)

@@ -88,13 +94,20 @@ class LiveKitEventsService:
    def __init__(self):
        """Initialize with required services."""

+        self._webhook_handlers = {
+            "egress_updated": self._handle_egress_updated,
+            "egress_ended": self._handle_egress_ended,
+            "room_started": self._handle_room_started,
+            "room_finished": self._handle_room_finished,
+        }
+
        token_verifier = api.TokenVerifier(
            settings.LIVEKIT_CONFIGURATION["api_key"],
            settings.LIVEKIT_CONFIGURATION["api_secret"],
        )
        self.webhook_receiver = api.WebhookReceiver(token_verifier)
        self.lobby_service = LobbyService()
-        self.telephony_service = TelephonyService()
+        self.sip_management = SIPManagement()
        self.recording_events = RecordingEventsService()

        self._filter_regex = None
@@ -124,6 +137,13 @@ class LiveKitEventsService:

        room_name = data.room.name or data.egress_info.room_name

+        if self._is_connection_test_room(room_name):
+            logger.info(
+                "Ignoring webhook event for connection test room '%s'.",
+                room_name,
+            )
+            return
+
        if self._filter_regex and not self._filter_regex.search(room_name):
            logger.info("Filtered webhook event for room '%s'", room_name)
            return
@@ -135,14 +155,11 @@ class LiveKitEventsService:
                f"Unknown webhook type: {data.event}"
            ) from e

-        handler_name = f"_handle_{webhook_type.value}"
-        handler = getattr(self, handler_name, None)
+        # Handle according to received webhook type
+        handler = self._webhook_handlers.get(webhook_type.value)

-        if not handler or not callable(handler):
-            return
-
-        # pylint: disable=not-callable
-        handler(data)
+        if handler is not None:
+            handler(data)

    def _handle_egress_updated(self, data):
        """Handle 'egress_updated' event."""
@@ -172,10 +189,15 @@ class LiveKitEventsService:

        try:
            room_name = str(recording.room.id)
-            utils.update_room_metadata(
-                room_name, {}, ["recording_mode", "recording_status"]
+            RoomManagement().update_metadata(
+                room_name, remove_keys=["recording_mode", "recording_status"]
            )
-        except utils.MetadataUpdateException as e:
+        except RoomNotFoundException:
+            logger.info(
+                "LiveKit room %s no longer exists, skipping metadata update",
+                room_name,
+            )
+        except RoomManagementException as e:
            logger.exception("Failed to update room's metadata: %s", e)

        if recording.options.get("metadata_collector_dispatch_id", None) is not None:
@@ -195,6 +217,29 @@ class LiveKitEventsService:
                    f"Failed to process limit reached event for recording {recording}"
                ) from e

+        # Fallback for completion when no MinIO/S3 webhooks are configured
+        if (
+            not settings.RECORDING_STORAGE_EVENT_ENABLE
+        ) and data.egress_info.status in [
+            api.EgressStatus.EGRESS_COMPLETE,
+            api.EgressStatus.EGRESS_LIMIT_REACHED,
+        ]:
+            try:
+                self.recording_events.handle_complete(recording)
+            except RecordingNotSavableError:
+                logger.warning(
+                    "Recording %s is not savable on egress complete "
+                    "(already saved or in an error state); ignoring.",
+                    recording.id,
+                )
+
+        # Silently ignoring EGRESS_ABORTED, EGRESS_FAILED
+
+    @staticmethod
+    def _is_connection_test_room(room_name: str) -> bool:
+        """Return True for ephemeral rooms created by the connection test endpoint."""
+        return room_name.startswith(settings.CONNECTION_TEST_ROOM_PREFIX)
+
    def _handle_room_started(self, data):
        """Handle 'room_started' event."""

@@ -212,12 +257,12 @@ class LiveKitEventsService:
        except models.Room.DoesNotExist as err:
            raise ActionFailedError(f"Room with ID {room_id} does not exist") from err

-        if settings.ROOM_TELEPHONY_ENABLED:
+        if settings.ROOM_TELEPHONY_ENABLED or settings.ROOMKIT_ENABLED:
            try:
-                self.telephony_service.create_dispatch_rule(room)
-            except TelephonyException as e:
+                self.sip_management.ensure_dispatch_rule(room)
+            except SIPException as e:
                raise ActionFailedError(
-                    f"Failed to create telephony dispatch rule for room {room_id}"
+                    f"Failed to create sip dispatch rule for room {room_id}"
                ) from e

    def _handle_room_finished(self, data):
@@ -232,12 +277,12 @@ class LiveKitEventsService:
            )
            raise ActionFailedError("Failed to process room finished event") from e

-        if settings.ROOM_TELEPHONY_ENABLED:
+        if settings.ROOM_TELEPHONY_ENABLED or settings.ROOMKIT_ENABLED:
            try:
-                self.telephony_service.delete_dispatch_rule(room_id)
-            except TelephonyException as e:
+                self.sip_management.delete_dispatch_rule(room_id)
+            except SIPException as e:
                raise ActionFailedError(
-                    f"Failed to delete telephony dispatch rule for room {room_id}"
+                    f"Failed to delete sip dispatch rule for room {room_id}"
                ) from e

        try:
@@ -104,21 +104,30 @@ class LobbyService:
            )

    @staticmethod
-    def can_bypass_lobby(room, user) -> bool:
+    def can_bypass_lobby(room, user, role) -> bool:
        """Determines if a user can bypass the waiting lobby and join a room directly.

        A user can bypass the lobby if:
        1. The room is public (open to everyone)
        2. The room has TRUSTED access level and the user is authenticated
+        2. The room has RESTRICTED access level and the user has any role

        Note: Room access levels can change while participants are waiting in the lobby.
        This function only checks the current state and should be called each time
        a participant requests entry to ensure consistent access control, even for
        participants who have already begun waiting.
        """
-        return room.is_public or (
-            room.access_level == models.RoomAccessLevel.TRUSTED
-            and user.is_authenticated
+        return (
+            room.is_public
+            or (
+                room.access_level == models.RoomAccessLevel.TRUSTED
+                and user.is_authenticated
+            )
+            or (
+                room.access_level == models.RoomAccessLevel.RESTRICTED
+                and user.is_authenticated
+                and role is not None
+            )
        )

    def request_entry(
@@ -144,8 +153,9 @@ class LobbyService:
        participant = self._get_participant(room.id, participant_id)

        room_id = str(room.id)
+        user_role = room.get_role(request.user)

-        if self.can_bypass_lobby(room=room, user=request.user):
+        if self.can_bypass_lobby(room=room, user=request.user, role=user_role):
            if participant is None:
                participant = LobbyParticipant(
                    status=LobbyParticipantStatus.ACCEPTED,
@@ -162,8 +172,8 @@ class LobbyService:
                username=username,
                color=participant.color,
                configuration=room.configuration,
-                is_admin_or_owner=False,
                participant_id=participant_id,
+                role=user_role,
            )
            return participant, livekit_config

@@ -183,8 +193,8 @@ class LobbyService:
                username=username,
                color=participant.color,
                configuration=room.configuration,
-                is_admin_or_owner=False,
                participant_id=participant_id,
+                role=user_role,
            )

        return participant, livekit_config
@@ -112,7 +112,7 @@ class ParticipantsManagement:
            await lkapi.aclose()

    @async_to_sync
-    async def update(
+    async def update(  # noqa: PLR0917
        self,
        room_name: str,
        identity: str,
@@ -8,6 +8,8 @@ from typing import Dict, Optional

 from asgiref.sync import async_to_sync
 from livekit.api import (
+    DeleteRoomRequest,
+    ListRoomsRequest,
    TwirpError,
    UpdateRoomMetadataRequest,
 )
@@ -29,20 +31,45 @@ class RoomManagement:
    """Service for managing LiveKit rooms."""

    @async_to_sync
-    async def update_metadata(self, room_name: str, metadata: Optional[Dict] = None):
-        """Update a LiveKit room's metadata.
+    async def update_metadata(
+        self,
+        room_name: str,
+        metadata: Optional[Dict] = None,
+        remove_keys: Optional[list[str]] = None,
+    ):
+        """Merge values into a LiveKit room's metadata.

        The `room_name` corresponds to the LiveKit room identifier
        (i.e. the Room model's UUID as a string).
+
+        Raises:
+            RoomNotFoundException: the room does not exist in LiveKit.
+            RoomManagementException: the metadata update otherwise fails.
        """

        lkapi = utils.create_livekit_client()

        try:
+            response = await lkapi.room.list_rooms(ListRoomsRequest(names=[room_name]))
+
+            if not response.rooms:
+                logger.warning(
+                    "Room %s not found in LiveKit, skipping metadata update",
+                    room_name,
+                )
+                raise RoomNotFoundException("Room does not exist")
+
+            existing_metadata = json.loads(response.rooms[0].metadata or "{}")
+
+            for key in remove_keys or []:
+                existing_metadata.pop(key, None)
+
+            updated_metadata = {**existing_metadata, **(metadata or {})}
+
            await lkapi.room.update_room_metadata(
                UpdateRoomMetadataRequest(
                    room=room_name,
-                    metadata=json.dumps(metadata) if metadata is not None else "",
+                    metadata=json.dumps(updated_metadata),
                )
            )

@@ -62,3 +89,30 @@ class RoomManagement:

        finally:
            await lkapi.aclose()
+
+    @async_to_sync
+    async def delete_room(self, room_name: str):
+        """Delete a LiveKit room and disconnect all participants.
+
+        Raises:
+            RoomNotFoundException: the room does not exist in LiveKit.
+            RoomManagementException: the deletion otherwise fails.
+        """
+
+        lkapi = utils.create_livekit_client()
+
+        try:
+            await lkapi.room.delete_room(DeleteRoomRequest(room=room_name))
+            logger.info("Deleted LiveKit room %s", room_name)
+        except TwirpError as e:
+            if e.code == "not_found":
+                logger.warning(
+                    "Room %s not found in LiveKit, skipping deletion",
+                    room_name,
+                )
+                raise RoomNotFoundException("Room does not exist") from e
+
+            logger.exception("Unexpected error deleting room %s", room_name)
+            raise RoomManagementException("Could not delete room") from e
+        finally:
+            await lkapi.aclose()
@@ -0,0 +1,178 @@
+"""Room role management service.
+
+Single entry point for changing a user's role on a room, used by:
+- the in-meeting endpoint (promote/demote a connected participant)
+- (more to come soon)
+
+`ResourceAccess` is the source of truth. The LiveKit `room_role`
+participant attribute is only a projection of it, synced best-effort.
+"""
+
+from logging import getLogger
+from uuid import UUID
+
+from core import models
+from core.services.participants_management import (
+    ParticipantNotFoundException,
+    ParticipantsManagement,
+    ParticipantsManagementException,
+)
+
+logger = getLogger(__name__)
+
+
+class RoomRoleError(Exception):
+    """Base exception for room role management errors."""
+
+    status_code = 400
+
+
+class SelfActionError(RoomRoleError):
+    """Raised when a user tries to change their own role."""
+
+    status_code = 403
+
+
+class OwnerRoleError(RoomRoleError):
+    """Raised when trying to demote an owner or grant ownership."""
+
+    status_code = 403
+
+
+class ParticipantNotInMeetingError(RoomRoleError):
+    """Raised when the target participant is not connected to the meeting."""
+
+    status_code = 404
+
+
+class UserNotFoundError(RoomRoleError):
+    """Raised when the target participant has no user account in database."""
+
+    status_code = 404
+
+
+ASSIGNABLE_ROLES = (models.RoleChoices.MEMBER, models.RoleChoices.ADMIN)
+
+
+class RoomRoleService:
+    """Manage promotion and demotion of room co-hosts."""
+
+    def set_role(
+        self, room: models.Room, user: models.User, role: str, actor: models.User
+    ):
+        """Persist `role` for `user` on `room`, idempotently and atomically.
+
+        Returns the up-to-date `ResourceAccess`. Never grants or removes
+        ownership: granting OWNER is refused, and an existing OWNER access
+        is never modified.
+        """
+
+        if role not in ASSIGNABLE_ROLES:
+            raise OwnerRoleError("Ownership cannot be granted through this action.")
+
+        if actor is not None and user == actor:
+            raise SelfActionError("You cannot change your own role.")
+
+        access, created = models.ResourceAccess.objects.get_or_create(
+            resource=room,
+            user=user,
+            defaults={"role": role},
+        )
+
+        if created:
+            return access
+
+        if access.role == models.RoleChoices.OWNER:
+            raise OwnerRoleError("Room owners cannot be demoted.")
+
+        if access.role != role:
+            access.role = role
+            access.save(update_fields=["role", "updated_at"])
+
+        return access
+
+    def set_participant_role(
+        self,
+        room: models.Room,
+        participant_identity: UUID,
+        role: str,
+        actor: models.User,
+    ):
+        """Change the role of a participant currently connected to the meeting.
+
+        - The participant must be connected (checked against LiveKit).
+        - The participant must map to a user account.
+        - The role is persisted in DB then mirrored to LiveKit.
+
+        Returns a dict: {"role", "livekit_synced"}.
+        """
+
+        room_name = str(room.pk)
+        participants_management = ParticipantsManagement()
+
+        try:
+            is_in_meeting = participants_management.check_if_in_meeting(
+                room_name=room_name, identity=str(participant_identity)
+            )
+        except ParticipantNotFoundException as e:
+            raise ParticipantNotInMeetingError(
+                "Participant is not connected to this meeting."
+            ) from e
+
+        if not is_in_meeting:
+            raise ParticipantNotInMeetingError(
+                "Participant is not connected to this meeting."
+            )
+
+        user = models.User.objects.filter(sub=participant_identity).first()
+
+        if user is None:
+            raise UserNotFoundError(
+                "This participant has no user account and cannot be assigned a role."
+            )
+
+        # Source of truth first: even if the LiveKit sync below fails,
+        # the role is real and any fresh token will carry it.
+        self.set_role(room=room, user=user, role=role, actor=actor)
+
+        livekit_synced = self._sync_livekit_role(
+            room_name=room_name,
+            participant_identity=str(participant_identity),
+            role=str(role),
+        )
+
+        return {
+            "role": role,
+            "livekit_synced": livekit_synced,
+        }
+
+    @staticmethod
+    def _sync_livekit_role(room_name: str, participant_identity: str, role: str):
+        """Mirror the role to the participant's LiveKit attributes.
+
+        Best-effort: returns False on failure instead of raising, so callers
+        can report a partial success. Re-running the action re-syncs.
+        """
+        try:
+            ParticipantsManagement().update(
+                room_name=room_name,
+                identity=participant_identity,
+                attributes={"room_role": role},
+            )
+        except ParticipantNotFoundException:
+            # The participant left between the presence check and the update:
+            # harmless, the DB state (if any) remains authoritative.
+            logger.info(
+                "Participant %s left room %s before role sync",
+                participant_identity,
+                room_name,
+            )
+            return False
+        except ParticipantsManagementException:
+            logger.exception(
+                "Could not sync role to LiveKit for participant %s in room %s",
+                participant_identity,
+                room_name,
+            )
+            return False
+        return True
@@ -1,9 +1,9 @@
-"""Telephony service for managing SIP dispatch rules for room access."""
+"""SIP management service for managing SIP dispatch rules for room access."""

 from logging import getLogger

 from asgiref.sync import async_to_sync
-from livekit.api import TwirpError
+from livekit.api import TwirpError, TwirpErrorCode
 from livekit.protocol.sip import (
    CreateSIPDispatchRuleRequest,
    DeleteSIPDispatchRuleRequest,
@@ -17,12 +17,16 @@ from core import utils
 logger = getLogger(__name__)


-class TelephonyException(Exception):
-    """Exception raised when telephony operations fail."""
+class SIPException(Exception):
+    """Exception raised when SIP operations fail."""


-class TelephonyService:
-    """Service for managing participant access through the telephony system (SIP)."""
+class DispatchRuleConflictError(SIPException):
+    """Raised when a dispatch rule already exists for the same routing criteria."""
+
+
+class SIPManagement:
+    """Service for managing SIP access through the telephony or roomkit system (SIP)."""

    def _rule_name(self, room_id):
        """Generate the rule name for a room based on its ID."""
@@ -32,7 +36,7 @@ class TelephonyService:
    async def create_dispatch_rule(self, room):
        """Create a SIP inbound dispatch rule for direct room routing.

-        Configures telephony to route incoming SIP calls directly to the specified room
+        Configures livekit-sip to route incoming SIP calls directly to the specified room
        using the room's ID and PIN code for authentication.
        """

@@ -51,10 +55,12 @@ class TelephonyService:
        try:
            await lkapi.sip.create_sip_dispatch_rule(create=request)
        except TwirpError as e:
+            if e.code == TwirpErrorCode.ALREADY_EXISTS:
+                raise DispatchRuleConflictError("Dispatch rule already exists") from e
            logger.exception(
                "Unexpected error creating dispatch rule for room %s", room.id
            )
-            raise TelephonyException("Could not create dispatch rule") from e
+            raise SIPException("Could not create dispatch rule") from e

        finally:
            await lkapi.aclose()
@@ -79,7 +85,7 @@ class TelephonyService:
            )
        except TwirpError as e:
            logger.exception("Failed to list dispatch rules for room %s", room_id)
-            raise TelephonyException("Could not list dispatch rules") from e
+            raise SIPException("Could not list dispatch rules") from e
        finally:
            await lkapi.aclose()

@@ -94,6 +100,28 @@ class TelephonyService:
            if existing_rule.name == rule_name
        ]

+    @async_to_sync
+    async def has_dispatch_rule(self, room_id):
+        """Check whether at least one dispatch rule exists for a specific room."""
+        return bool(await self._list_dispatch_rules_ids(room_id))
+
+    def ensure_dispatch_rule(self, room):
+        """Create the SIP dispatch rule for a room if it does not already exist.
+
+        Returns:
+            bool: True if a rule was created, False if it already existed.
+        """
+
+        if self.has_dispatch_rule(room.pk):
+            return False
+
+        try:
+            self.create_dispatch_rule(room)
+        except DispatchRuleConflictError:
+            return False
+
+        return True
+
    @async_to_sync
    async def delete_dispatch_rule(self, room_id):
        """Delete all SIP inbound dispatch rules associated with a specific room."""
@@ -118,7 +146,7 @@ class TelephonyService:

        except TwirpError as e:
            logger.exception("Failed to delete dispatch rules for room %s", room_id)
-            raise TelephonyException("Could not delete dispatch rules") from e
+            raise SIPException("Could not delete dispatch rules") from e

        finally:
            await lkapi.aclose()
@@ -0,0 +1,9 @@
+"""Celery tasks for the core app."""
+
+from core.tasks.connection_test import delete_connection_test_room
+from core.tasks.file import process_file_deletion
+
+__all__ = (
+    "delete_connection_test_room",
+    "process_file_deletion",
+)
@@ -1,4 +1,11 @@
+"""
+Celery task decorator that degrades to a synchronous call when Celery is off.
+"""
+
+# The Celery app is imported lazily so that importing this module does not pull
+# in Celery when CELERY_ENABLED is false.
 # ruff: noqa: PLC0415
+# pylint: disable=import-outside-toplevel

 from django.conf import settings

@@ -0,0 +1,39 @@
+"""Tasks related to connection test rooms."""
+
+import logging
+
+from django.conf import settings
+
+from core.services.room_management import (
+    RoomManagement,
+    RoomManagementException,
+    RoomNotFoundException,
+)
+from core.tasks._task import task
+
+logger = logging.getLogger(__name__)
+
+
+@task
+def delete_connection_test_room(room_name: str):
+    """Force-delete an ephemeral connection-test room.
+
+    Used as a hard cap so a participant cannot keep an auto-refreshed
+    LiveKit session open indefinitely after requesting a test token.
+    """
+    prefix = settings.CONNECTION_TEST_ROOM_PREFIX
+    if not room_name.startswith(prefix):
+        logger.error(
+            "Refusing to delete room '%s': expected prefix '%s'.",
+            room_name,
+            prefix,
+        )
+        return
+
+    try:
+        RoomManagement().delete_room(room_name)
+    except RoomNotFoundException:
+        # Room may already be gone after empty/departure timeout.
+        logger.info("Connection test room '%s' already gone.", room_name)
+    except RoomManagementException:
+        logger.exception("Failed to delete connection test room '%s'.", room_name)
@@ -0,0 +1,318 @@
+"""
+Unit tests for PostHogAnalytics.
+"""
+
+# pylint: disable=redefined-outer-name,unused-argument,protected-access
+
+from unittest.mock import patch
+
+from django.contrib.auth.models import AnonymousUser
+
+import pytest
+
+from core.analytics.events import AnalyticsEvent
+from core.analytics.posthog import PostHogAnalytics
+from core.analytics.user_feature_flags import UserFeatureFlag
+from core.factories import UserFactory
+
+pytestmark = pytest.mark.django_db
+
+
+# ==============================
+# __init__
+# ==============================
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_init_constructs_posthog_client_with_api_key_and_host(mock_posthog_cls):
+    """Should forward api_key and host to the Posthog SDK constructor."""
+    PostHogAnalytics(api_key="my-key", host="https://custom.i.posthog.com")
+
+    mock_posthog_cls.assert_called_once_with(
+        project_api_key="my-key",
+        host="https://custom.i.posthog.com",
+    )
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_init_defaults_to_eu_host(mock_posthog_cls):
+    """Should default host to the EU PostHog cloud when not specified."""
+    PostHogAnalytics(api_key="my-key")
+
+    _, kwargs = mock_posthog_cls.call_args
+    assert kwargs["host"] == "https://eu.i.posthog.com"
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_init_forwards_extra_kwargs_to_client(mock_posthog_cls):
+    """Should pass through arbitrary extra kwargs (e.g. debug, disabled) to the SDK."""
+    PostHogAnalytics(api_key="my-key", debug=True, disabled=False)
+
+    _, kwargs = mock_posthog_cls.call_args
+    assert kwargs["debug"] is True
+    assert kwargs["disabled"] is False
+
+
+# ==============================
+# _distinct_id
+# ==============================
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_distinct_id_returns_none_for_none_user(mock_posthog_cls):
+    """Should return None when user is None."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    assert backend._distinct_id(None) is None
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_distinct_id_returns_none_for_anonymous_user(mock_posthog_cls):
+    """Should return None when user.is_authenticated is falsy."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    assert backend._distinct_id(AnonymousUser()) is None
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_distinct_id_returns_none_when_attribute_missing(mock_posthog_cls):
+    """Should return None when the user object has no is_authenticated attribute at all."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    assert backend._distinct_id(object()) is None
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_distinct_id_returns_stringified_pk_for_authenticated_user(mock_posthog_cls):
+    """Should return str(user.pk) for an authenticated user."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    assert backend._distinct_id(user) == str(user.pk)
+
+
+# ==============================
+# identify
+# ==============================
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_identify_noop_for_anonymous_user(mock_posthog_cls):
+    """Should not call the SDK when the user is anonymous."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    backend.identify(AnonymousUser(), {"email": "a@example.com"})
+
+    mock_posthog_cls.return_value.set.assert_not_called()
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_identify_noop_for_none_user(mock_posthog_cls):
+    """Should not call the SDK when user is None."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    backend.identify(None, {"email": "a@example.com"})
+
+    mock_posthog_cls.return_value.set.assert_not_called()
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_identify_sends_set_properties_for_authenticated_user(mock_posthog_cls):
+    """Should call capture with event=$identify and properties wrapped in $set."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    backend.identify(user, {"email": "a@example.com", "name": "A"})
+
+    mock_posthog_cls.return_value.set.assert_called_once_with(
+        distinct_id=str(user.pk),
+        properties={"email": "a@example.com", "name": "A"},
+    )
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_identify_defaults_properties_to_empty_dict(mock_posthog_cls):
+    """Should send an empty $set payload when properties is None."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    backend.identify(user, None)
+
+    mock_posthog_cls.return_value.set.assert_called_once_with(
+        distinct_id=str(user.pk),
+        properties={},
+    )
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_identify_swallows_sdk_exceptions(mock_posthog_cls):
+    """Should log and not raise when the SDK call fails."""
+    mock_posthog_cls.return_value.set.side_effect = RuntimeError("network down")
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    # Must not propagate.
+    backend.identify(user, {"email": "a@example.com"})
+
+
+# ==============================
+# capture
+# ==============================
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_capture_noop_for_anonymous_user(mock_posthog_cls):
+    """Should not call the SDK when the user is anonymous."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    backend.capture(AnonymousUser(), AnalyticsEvent.ROOM_CREATED, {"room_id": "1"})
+
+    mock_posthog_cls.return_value.capture.assert_not_called()
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_capture_noop_for_none_user(mock_posthog_cls):
+    """Should not call the SDK when user is None."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    backend.capture(None, AnalyticsEvent.ROOM_CREATED, {"room_id": "1"})
+
+    mock_posthog_cls.return_value.capture.assert_not_called()
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_capture_sends_event_and_properties_for_authenticated_user(mock_posthog_cls):
+    """Should call capture with the distinct_id, event name, and properties."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    backend.capture(user, AnalyticsEvent.ROOM_CREATED, {"room_id": "room-1"})
+
+    mock_posthog_cls.return_value.capture.assert_called_once_with(
+        distinct_id=str(user.pk),
+        event="room_created",
+        properties={"room_id": "room-1"},
+    )
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_capture_serializes_event_enum_to_plain_string(mock_posthog_cls):
+    """Should send the wire string, not the AnalyticsEvent enum member, to the SDK."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    backend.capture(user, AnalyticsEvent.ROOM_CREATED)
+
+    _, kwargs = mock_posthog_cls.return_value.capture.call_args
+    assert kwargs["event"] == "room_created"
+    assert isinstance(
+        kwargs["event"], str
+    )  # not AnalyticsEvent, not StrEnum subclass leaking through
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_capture_defaults_properties_to_empty_dict(mock_posthog_cls):
+    """Should send an empty properties dict when properties is None."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    backend.capture(user, AnalyticsEvent.ROOM_CREATED, None)
+
+    mock_posthog_cls.return_value.capture.assert_called_once_with(
+        distinct_id=str(user.pk),
+        event="room_created",
+        properties={},
+    )
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_capture_swallows_sdk_exceptions(mock_posthog_cls):
+    """Should log and not raise when the SDK call fails."""
+    mock_posthog_cls.return_value.capture.side_effect = RuntimeError("network down")
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    # Must not propagate.
+    backend.capture(user, AnalyticsEvent.ROOM_CREATED, {"room_id": "1"})
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_capture_logs_the_failing_event_name_on_exception(mock_posthog_cls, caplog):
+    """Should log which event failed, to aid debugging without crashing the caller."""
+    mock_posthog_cls.return_value.capture.side_effect = RuntimeError("network down")
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    with caplog.at_level("ERROR"):
+        backend.capture(user, AnalyticsEvent.ROOM_CREATED)
+
+    assert any("PostHog capture failed" in record.message for record in caplog.records)
+
+
+# ==============================
+# feature flags
+# ==============================
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_compute_feature_flags_returns_all_catalog_entries(mock_posthog_cls):
+    """Should map every declared feature flag key to the SDK evaluated value."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+
+    mock_posthog_cls.return_value.evaluate_flags.return_value.get_flag.return_value = (
+        True
+    )
+
+    flags = backend._fetch_user_feature_flags(user)
+
+    assert flags == {UserFeatureFlag.TRANSCRIPT_SUMMARY_ENABLED: True}
+    mock_posthog_cls.return_value.evaluate_flags.assert_called_once_with(str(user.pk))
+    mock_posthog_cls.return_value.evaluate_flags.return_value.get_flag.assert_called_once_with(
+        UserFeatureFlag.TRANSCRIPT_SUMMARY_ENABLED.value
+    )
+
+
+@patch("core.analytics.posthog.cache.get_or_set")
+@patch("core.analytics.posthog.Posthog")
+def test_get_feature_flags_uses_cache_get_or_set(
+    mock_posthog_cls, mock_cache_get_or_set
+):
+    """Should cache feature flags by user distinct id with configured TTL."""
+    cached_flags = {UserFeatureFlag.TRANSCRIPT_SUMMARY_ENABLED: False}
+    mock_cache_get_or_set.return_value = cached_flags
+    backend = PostHogAnalytics(api_key="test-api-key", feature_flags_cache_ttl=120)
+    user = UserFactory()
+
+    flags = backend.get_user_feature_flags(user)
+
+    assert flags == cached_flags
+    mock_cache_get_or_set.assert_called_once()
+    args, kwargs = mock_cache_get_or_set.call_args
+    assert kwargs["timeout"] == 120
+    assert args[0] == f"user_feature_flags:{user.pk}"
+    assert callable(kwargs["default"])
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_get_feature_flags_returns_empty_dict_on_exception(mock_posthog_cls):
+    """Should swallow failures and return an empty mapping."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+    user = UserFactory()
+    with patch("core.analytics.posthog.cache.get_or_set", side_effect=RuntimeError):
+        assert backend.get_user_feature_flags(user) == {}
+
+
+# ==============================
+# shutdown
+# ==============================
+
+
+@patch("core.analytics.posthog.Posthog")
+def test_shutdown_flushes_the_client(mock_posthog_cls):
+    """Should delegate to the SDK's shutdown to flush pending events."""
+    backend = PostHogAnalytics(api_key="test-api-key")
+
+    backend.shutdown()
+
+    mock_posthog_cls.return_value.shutdown.assert_called_once()
@@ -0,0 +1,90 @@
+"""Tests for the clean_pending_files management command."""
+
+from datetime import timedelta
+
+from django.core.files.storage import default_storage
+from django.core.management import call_command
+from django.utils import timezone
+
+import pytest
+
+from core import factories, models
+
+pytestmark = pytest.mark.django_db
+
+
+def test_clean_pending_files_no_stale_files():
+    """Nothing happens when there are no stale pending files."""
+    call_command("clean_pending_files")
+
+
+def test_clean_pending_files_recent_pending_not_deleted():
+    """Recent pending files (within threshold) should not be deleted."""
+    file = factories.FileFactory(
+        type=models.FileTypeChoices.BACKGROUND_IMAGE,
+        update_upload_state=models.FileUploadStateChoices.PENDING,
+        upload_bytes=b"hello",
+    )
+
+    call_command("clean_pending_files")
+
+    file.refresh_from_db()
+    assert file.deleted_at is None
+    assert default_storage.exists(file.file_key)
+
+
+def test_clean_pending_files_old_pending_deleted():
+    """Pending files older than the threshold should be deleted."""
+    old_date = timezone.now() - timedelta(hours=49)
+    file = factories.FileFactory(
+        type=models.FileTypeChoices.BACKGROUND_IMAGE,
+        update_upload_state=models.FileUploadStateChoices.PENDING,
+        upload_bytes=b"hello",
+    )
+    assert default_storage.exists(file.file_key)
+    models.File.objects.filter(pk=file.pk).update(created_at=old_date)
+
+    call_command("clean_pending_files")
+
+    assert not models.File.objects.filter(pk=file.pk).exists()
+    assert not default_storage.exists(file.file_key)
+
+
+def test_clean_pending_files_old_non_pending_not_deleted():
+    """Old files that are not pending should not be deleted."""
+    old_date = timezone.now() - timedelta(hours=49)
+    file = factories.FileFactory(
+        type=models.FileTypeChoices.BACKGROUND_IMAGE,
+        update_upload_state=models.FileUploadStateChoices.READY,
+    )
+    models.File.objects.filter(pk=file.pk).update(created_at=old_date)
+
+    call_command("clean_pending_files")
+
+    file.refresh_from_db()
+    assert file.deleted_at is None
+    assert file.hard_deleted_at is None
+
+
+def test_clean_pending_files_custom_hours():
+    """The --hours argument controls the age threshold."""
+    old_date = timezone.now() - timedelta(hours=10)
+    file = factories.FileFactory(
+        type=models.FileTypeChoices.BACKGROUND_IMAGE,
+        update_upload_state=models.FileUploadStateChoices.PENDING,
+        upload_bytes=b"hello",
+    )
+    models.File.objects.filter(pk=file.pk).update(created_at=old_date)
+
+    # Default 24h threshold -> file not deleted
+    call_command("clean_pending_files")
+
+    file.refresh_from_db()
+    assert file.deleted_at is None
+    assert default_storage.exists(file.file_key)
+
+    # 8h threshold -> file deleted
+    call_command("clean_pending_files", "--hours=8")
+
+    assert not models.File.objects.filter(pk=file.pk).exists()
+    assert not default_storage.exists(file.file_key)
@@ -0,0 +1,85 @@
+"""Tests for the purge_deleted_files management command."""
+
+from datetime import timedelta
+from io import StringIO
+from random import randint
+from unittest.mock import patch
+
+from django.core.files.storage import default_storage
+from django.core.management import call_command
+from django.utils import timezone
+
+import pytest
+
+from core import factories, models
+from core.tasks.file import process_file_deletion
+
+pytestmark = pytest.mark.django_db
+
+
+def test_purge_deleted_files_no_deleted_files(django_assert_num_queries):
+    """Nothing happens when there are no purgeable files."""
+    with django_assert_num_queries(1):
+        call_command("purge_deleted_files")
+
+
+@pytest.mark.django_db(transaction=True)
+def test_purge_deleted_files_success(settings):
+    """
+    Queue deletion for:
+    - hard-deleted files
+    - soft-deleted files past retention period + grace period.
+    """
+    out = StringIO()
+
+    settings.FILE_PURGE_GRACE_DAYS = grace = randint(1, 20)
+
+    now = timezone.now()
+    purge_now = now - timedelta(days=grace)
+
+    not_deleted_file = factories.FileFactory(
+        type=models.FileTypeChoices.BACKGROUND_IMAGE,
+        upload_bytes=b"hello",
+    )
+
+    with patch("django.utils.timezone.now", return_value=now):
+        not_purgeable_file = factories.FileFactory(
+            type=models.FileTypeChoices.BACKGROUND_IMAGE,
+            upload_bytes=b"hello",
+        )
+        not_purgeable_file.soft_delete()
+
+    with patch("django.utils.timezone.now", return_value=purge_now):
+        purgeable_file = factories.FileFactory(
+            type=models.FileTypeChoices.BACKGROUND_IMAGE,
+            upload_bytes=b"hello",
+        )
+        purgeable_file.soft_delete()
+
+    hard_deleted_file = factories.FileFactory(
+        type=models.FileTypeChoices.BACKGROUND_IMAGE,
+        upload_bytes=b"hello",
+    )
+    hard_deleted_file.soft_delete()
+    hard_deleted_file.hard_delete()
+
+    with patch(
+        "core.management.commands.purge_deleted_files.process_file_deletion.delay",
+        side_effect=process_file_deletion,
+    ) as mock_delay:
+        call_command("purge_deleted_files", stdout=out)
+
+    assert "Purged 2 deleted file(s)." in out.getvalue()
+    assert mock_delay.call_count == 2
+    called_ids = {call.args[0] for call in mock_delay.call_args_list}
+    assert called_ids == {purgeable_file.id, hard_deleted_file.id}
+
+    assert models.File.objects.filter(id=not_deleted_file.id).exists()
+    assert models.File.objects.filter(id=not_purgeable_file.id).exists()
+    assert not models.File.objects.filter(id=purgeable_file.id).exists()
+    assert not models.File.objects.filter(id=hard_deleted_file.id).exists()
+
+    assert default_storage.exists(not_deleted_file.file_key)
+    assert default_storage.exists(not_purgeable_file.file_key)
+    assert not default_storage.exists(purgeable_file.file_key)
+    assert not default_storage.exists(hard_deleted_file.file_key)
@@ -36,6 +36,26 @@ def test_merge_keeps_most_recently_created_user():
    assert User.objects.filter(id=user2.id).exists()


+def test_merge_user_case_insensitive():
+    """Emails differing only by case should be treated as duplicates and merged,
+    keeping the most recently created user."""
+    user1 = UserFactory(email="Dup@example.com")
+    user2 = UserFactory(email="dup@example.com")
+    call_command("merge_duplicate_users")
+
+    assert not User.objects.filter(id=user1.id).exists()
+    assert User.objects.filter(id=user2.id).exists()
+
+    user3 = UserFactory(email="joe@example.com")
+    user4 = UserFactory(email="Joe@example.com")
+    call_command("merge_duplicate_users")
+    assert not User.objects.filter(id=user3.id).exists()
+    assert User.objects.filter(id=user4.id).exists()
+
+    user4.refresh_from_db()
+    assert user4.email.islower()
+
+
 def test_merge_deletes_all_stale_users():
    """Command should delete all stale users and keep only the most recently created one."""
    email = "many@example.com"
@@ -457,4 +477,4 @@ def test_merge_email_filter_is_case_insensitive():
    UserFactory(email="user1@Example.com")
    UserFactory(email="user1@Example.com")
    call_command("merge_duplicate_users", email_filter="@example.com")
-    assert User.objects.filter(email="user1@Example.com").count() == 1
+    assert User.objects.filter(email="user1@example.com").count() == 1
@@ -136,10 +136,10 @@ def test_authenticate_header():


 def test_multiple_spaces_in_auth_header(settings):
-    """Test failure when Authorization header contains multiple spaces."""
+    """Test success when Authorization header contains multiple spaces."""
    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
    request = RequestFactory().get("/")
    request.headers = {"Authorization": "Bearer   extra-spaces-token"}

-    with pytest.raises(AuthenticationFailed, match="Invalid authorization header"):
-        StorageEventAuthentication().authenticate(request)
+    header = StorageEventAuthentication().authenticate_header(request)
+    assert header == "Bearer realm='Storage event API'"
@@ -5,6 +5,7 @@ Test event notification.
 # pylint: disable=assignment-from-no-return,redefined-outer-name,unused-argument,protected-access

 import datetime
+import json
 import smtplib
 from unittest import mock

@@ -13,6 +14,7 @@ from django.contrib.sites.models import Site
 import pytest

 from core import factories, models
+from core.analytics import UserFeatureFlag
 from core.recording.event.notification import NotificationService, notification_service

 pytestmark = pytest.mark.django_db
@@ -243,3 +245,237 @@ def test_notify_user_by_email_smtp_exception(mocked_current_site, caplog):
        assert result is False
        assert mock_send_mail.call_count == 2
        assert "notification could not be sent:" in caplog.text
+
+
+@mock.patch("core.recording.event.notification.requests.post")
+@mock.patch("core.recording.event.notification.generate_download_s3_url")
+@mock.patch.object(
+    NotificationService, "_get_recording_timestamps", new_callable=mock.AsyncMock
+)
+def test_notify_summary_service_post_args_with_metadata(
+    mock_get_recording_timestamps,
+    mock_generate_download_s3_url,
+    mock_post,
+    settings,
+):
+    """Test summary notification computed request args when metadata is enabled."""
+    settings.SUMMARY_SERVICE_VERSION = 2
+    settings.SUMMARY_SERVICE_ENDPOINT = "https://summary.test/api/v2/tasks"
+    settings.SUMMARY_SERVICE_API_TOKEN = "summary-token"
+    settings.RECORDING_DOWNLOAD_BASE_URL = "https://app.test/recordings"
+    settings.SCREEN_RECORDING_BASE_URL = None
+    settings.METADATA_COLLECTOR_ENABLED = True
+    settings.METADATA_COLLECTOR_OUTPUT_FOLDER = "recordings-metadata"
+
+    recording = factories.RecordingFactory(
+        room__name="Engineering Sync",
+        worker_id="egress-1",
+        options={"collect_metadata": True, "language": "en-us"},
+    )
+    owner = factories.UserFactory(
+        email="owner@test.com",
+        sub="owner-sub",
+        language="fr-fr",
+        timezone="Europe/Paris",
+    )
+    factories.UserRecordingAccessFactory(
+        recording=recording, role=models.RoleChoices.OWNER, user=owner
+    )
+
+    started_at = datetime.datetime(2026, 1, 2, 10, 30, tzinfo=datetime.timezone.utc)
+    ended_at = datetime.datetime(2026, 1, 2, 11, 45, tzinfo=datetime.timezone.utc)
+    mock_get_recording_timestamps.return_value = (started_at, ended_at)
+    mock_generate_download_s3_url.side_effect = [
+        "https://storage.test/metadata.json",
+        "https://storage.test/recording.ogg",
+    ]
+
+    mock_response = mock.Mock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"job_id": "job-42"}
+    mock_post.return_value = mock_response
+
+    result = NotificationService._notify_summary_service(recording)
+    recording.refresh_from_db()
+
+    assert result is True
+    assert recording.external_process_id == "job-42"
+
+    metadata_filename = (
+        f"{settings.METADATA_COLLECTOR_OUTPUT_FOLDER}/{recording.id}-metadata.json"
+    )
+    expected_payload = {
+        "user_sub": owner.sub,
+        "user_email": owner.email,
+        "cloud_storage_url": "https://storage.test/recording.ogg",
+        "language": "en-us",
+        "context_language": owner.language,
+        "push_to_docs_config": {
+            "user_email": owner.email,
+            "title": 'Réunion "Engineering Sync" du 2026-01-02 à 11:30',
+            "download_link": f"{settings.RECORDING_DOWNLOAD_BASE_URL}/{recording.id}",
+            "auto_create_summary": False,
+            "form_link": None,
+        },
+        "metadata": {
+            "cloud_storage_url": "https://storage.test/metadata.json",
+            "started_at": started_at.isoformat(),
+            "ended_at": ended_at.isoformat(),
+        },
+    }
+    expected_headers = {
+        "Content-Type": "application/json",
+        "Authorization": "Bearer summary-token",
+    }
+    mock_post.assert_called_once_with(
+        "https://summary.test/api/v2/tasks",
+        json=expected_payload,
+        headers=expected_headers,
+        timeout=30,
+    )
+    assert mock_generate_download_s3_url.call_args_list == [
+        mock.call(metadata_filename, expires_in=60 * 60 * 24, override_domain=False),
+        mock.call(recording.key, expires_in=60 * 60 * 24, override_domain=False),
+    ]
+    mock_get_recording_timestamps.assert_awaited_once_with("egress-1")
+
+
+@mock.patch("core.recording.event.notification.requests.post")
+@mock.patch("core.recording.event.notification.generate_download_s3_url")
+@mock.patch.object(
+    NotificationService, "_get_recording_timestamps", new_callable=mock.AsyncMock
+)
+@pytest.mark.parametrize("auto_create_summary_enabled", [False, True])
+def test_notify_summary_service_post_args_without_metadata(
+    mock_get_recording_timestamps,
+    mock_generate_download_s3_url,
+    mock_post,
+    auto_create_summary_enabled,
+    settings,
+):
+    """Test summary notification computed request args when metadata is not available."""
+    settings.SUMMARY_SERVICE_VERSION = 2
+    settings.SUMMARY_SERVICE_ENDPOINT = "https://summary.test/api/v2/tasks"
+    settings.SUMMARY_SERVICE_API_TOKEN = "summary-token"
+    settings.RECORDING_DOWNLOAD_BASE_URL = "https://app.test/recordings"
+    settings.SCREEN_RECORDING_BASE_URL = None
+    settings.METADATA_COLLECTOR_ENABLED = False
+
+    recording = factories.RecordingFactory(room__name="Daily")
+    owner = factories.UserFactory(
+        email="owner@test.com",
+        sub="owner-sub",
+        language="en-us",
+        timezone="UTC",
+    )
+    factories.UserRecordingAccessFactory(
+        recording=recording, role=models.RoleChoices.OWNER, user=owner
+    )
+
+    mock_get_recording_timestamps.return_value = (None, None)
+    mock_generate_download_s3_url.return_value = "https://storage.test/recording.mp4"
+
+    mock_response = mock.Mock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"job_id": "job-51"}
+    mock_post.return_value = mock_response
+
+    with mock.patch(
+        "core.recording.event.notification.is_user_feature_flag_enabled",
+        return_value=auto_create_summary_enabled,
+    ) as mock_is_feature_flag_enabled:
+        result = NotificationService._notify_summary_service(recording)
+
+    assert result is True
+    expected_payload = {
+        "user_sub": owner.sub,
+        "user_email": owner.email,
+        "cloud_storage_url": "https://storage.test/recording.mp4",
+        "language": "en",
+        "context_language": owner.language,
+        "push_to_docs_config": {
+            "user_email": owner.email,
+            "title": "Transcription",
+            "download_link": f"{settings.RECORDING_DOWNLOAD_BASE_URL}/{recording.id}",
+            "auto_create_summary": auto_create_summary_enabled,
+            "form_link": None,
+        },
+        "metadata": None,
+    }
+    expected_headers = {
+        "Content-Type": "application/json",
+        "Authorization": "Bearer summary-token",
+    }
+    mock_post.assert_called_once_with(
+        "https://summary.test/api/v2/tasks",
+        json=expected_payload,
+        headers=expected_headers,
+        timeout=30,
+    )
+    mock_generate_download_s3_url.assert_called_once_with(
+        recording.key, expires_in=60 * 60 * 24, override_domain=False
+    )
+    mock_get_recording_timestamps.assert_awaited_once_with(recording.worker_id)
+    mock_is_feature_flag_enabled.assert_called_once_with(
+        owner, UserFeatureFlag.TRANSCRIPT_SUMMARY_ENABLED
+    )
+
+
+@mock.patch("core.recording.event.notification.requests.post")
+@mock.patch("core.recording.event.notification.generate_download_s3_url")
+@mock.patch.object(
+    NotificationService, "_get_recording_timestamps", new_callable=mock.AsyncMock
+)
+def test_notify_summary_service_v2_payload_json_serializable_without_timestamps(
+    mock_get_recording_timestamps,
+    mock_generate_download_s3_url,
+    mock_post,
+    settings,
+):
+    """Regression test for a non-JSON-serializable payload when timestamps are missing.
+
+    When the LiveKit egress can no longer be found, ``_get_recording_timestamps``
+    returns ``(None, None)`` and ``_generate_title`` falls back to its default
+    title. That default must be a real ``str``: it used to return a lazy
+    ``gettext_lazy`` proxy, which ``json.dumps`` cannot serialize, so the real
+    ``requests.post(json=payload)`` call crashed in production with
+    ``TypeError: Object of type __proxy__ is not JSON serializable``.
+    """
+    settings.SUMMARY_SERVICE_VERSION = 2
+    settings.SUMMARY_SERVICE_ENDPOINT = "https://summary.test/api/v2/tasks"
+    settings.SUMMARY_SERVICE_API_TOKEN = "summary-token"
+    settings.RECORDING_DOWNLOAD_BASE_URL = "https://app.test/recordings"
+    settings.SCREEN_RECORDING_BASE_URL = None
+    settings.METADATA_COLLECTOR_ENABLED = False
+
+    recording = factories.RecordingFactory(room__name="Daily")
+    owner = factories.UserFactory(
+        email="owner@test.com",
+        sub="owner-sub",
+        language="fr-fr",
+        timezone="Europe/Paris",
+    )
+    factories.UserRecordingAccessFactory(
+        recording=recording, role=models.RoleChoices.OWNER, user=owner
+    )
+
+    # Egress timestamps unavailable -> default-title branch in _generate_title.
+    mock_get_recording_timestamps.return_value = (None, None)
+    mock_generate_download_s3_url.return_value = "https://storage.test/recording.mp4"
+
+    mock_response = mock.Mock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"job_id": "job-77"}
+    mock_post.return_value = mock_response
+
+    result = NotificationService._notify_summary_service(recording)
+
+    assert result is True
+
+    payload = mock_post.call_args.kwargs["json"]
+    title = payload["push_to_docs_config"]["title"]
+
+    # The title must be a plain ``str``, not a lazy translation proxy...
+    assert isinstance(title, str)
+    # ...so the payload serializes exactly the way ``requests`` serializes it.
+    json.dumps(payload)
@@ -360,6 +360,75 @@ def test_s3_parse_unrecognized_extension(s3_parser):
        s3_parser.parse(event_with_unknown_ext)


+def test_s3_parser_keeps_encoded_filepath_compatible(settings):
+    """Test S3 parser keeps already encoded object keys compatible."""
+    settings.RECORDING_OUTPUT_FOLDER = "recordings"
+
+    recording_id = "80ae9fe5-639a-438b-b86e-9e3dd2d55f4d"
+    parser = S3Parser(bucket_name="recordings-bucket")
+
+    data = {
+        "Records": [
+            {
+                "s3": {
+                    "bucket": {"name": "recordings-bucket"},
+                    "object": {
+                        "key": f"recordings%2F{recording_id}.mp4",
+                    },
+                }
+            }
+        ]
+    }
+
+    assert parser.get_recording_id(data) == recording_id
+
+
+def test_s3_parser_accepts_unencoded_filepath(settings):
+    """Test S3 parser accepts raw object keys with slash separators."""
+    settings.RECORDING_OUTPUT_FOLDER = "recordings"
+
+    recording_id = "80ae9fe5-639a-438b-b86e-9e3dd2d55f4d"
+    parser = S3Parser(bucket_name="recordings-bucket")
+
+    data = {
+        "Records": [
+            {
+                "s3": {
+                    "bucket": {"name": "recordings-bucket"},
+                    "object": {
+                        "key": f"recordings/{recording_id}.mp4",
+                    },
+                }
+            }
+        ]
+    }
+
+    assert parser.get_recording_id(data) == recording_id
+
+
+def test_s3_parser_preserves_plus_signs_in_encoded_filepath(settings):
+    """Test S3 parser preserves plus signs in already encoded object keys."""
+    settings.RECORDING_OUTPUT_FOLDER = "recordings"
+
+    recording_id = "80ae9fe5-639a-438b-b86e-9e3dd2d55f4d"
+    parser = S3Parser(bucket_name="recordings-bucket")
+
+    data = {
+        "Records": [
+            {
+                "s3": {
+                    "bucket": {"name": "recordings-bucket"},
+                    "object": {
+                        "key": f"folder+name%2Frecordings%2F{recording_id}.mp4",
+                    },
+                }
+            }
+        ]
+    }
+
+    assert parser.get_recording_id(data) == recording_id
+
+
 def test_s3_get_recording_id_success(s3_parser, valid_s3_event):
    """Test successful extraction of recording ID from S3 event."""
    recording_id = s3_parser.get_recording_id(valid_s3_event)
@@ -0,0 +1,134 @@
+"""
+Test recordings API endpoints: external process hook.
+"""
+
+# pylint: disable=redefined-outer-name,unused-argument
+
+import pytest
+
+from ...factories import RecordingFactory
+from ...models import RecordingStatusChoices
+
+pytestmark = pytest.mark.django_db
+
+
+@pytest.fixture
+def external_process_settings(settings):
+    """Configure authentication token for the external process webhook."""
+    settings.SUMMARY_SERVICE_WEBHOOK_API_TOKEN = "testWebhookToken"
+    return settings
+
+
+def test_external_process_event_missing_authorization_header(
+    external_process_settings, client
+):
+    """Requests without authorization must be rejected."""
+    response = client.post(
+        "/api/v1.0/recordings/external-process-hook/",
+        {"job_id": "job-1", "type": "transcript", "status": "success"},
+    )
+
+    assert response.status_code == 401
+
+
+def test_external_process_event_wrong_bearer_token(external_process_settings, client):
+    """Requests with invalid bearer token must be rejected."""
+    response = client.post(
+        "/api/v1.0/recordings/external-process-hook/",
+        {"job_id": "job-1", "type": "transcript", "status": "success"},
+        HTTP_AUTHORIZATION="Bearer wrongToken",
+    )
+
+    assert response.status_code == 401
+
+
+def test_external_process_event_missing_job_id(external_process_settings, client):
+    """Payload without job_id must fail validation."""
+    response = client.post(
+        "/api/v1.0/recordings/external-process-hook/",
+        {"type": "transcript", "status": "success"},
+        HTTP_AUTHORIZATION="Bearer testWebhookToken",
+    )
+
+    assert response.status_code == 400
+    assert response.json() == {"job_id": ["This field is required."]}
+
+
+def test_external_process_event_success_updates_recording_status(
+    external_process_settings, client
+):
+    """A successful transcript process should update recording status."""
+    recording = RecordingFactory(
+        status=RecordingStatusChoices.SAVED,
+        external_process_id="job-123",
+    )
+
+    response = client.post(
+        "/api/v1.0/recordings/external-process-hook/",
+        {"job_id": "job-123", "type": "transcript", "status": "success"},
+        HTTP_AUTHORIZATION="Bearer testWebhookToken",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"message": "Event processed."}
+
+    recording.refresh_from_db()
+    assert recording.status == RecordingStatusChoices.EXTERNAL_PROCESS_SUCCESSFUL
+
+
+def test_external_process_event_failure_updates_recording_status(
+    external_process_settings, client
+):
+    """A failing transcript process should update recording status."""
+    recording = RecordingFactory(
+        status=RecordingStatusChoices.SAVED,
+        external_process_id="job-456",
+    )
+
+    response = client.post(
+        "/api/v1.0/recordings/external-process-hook/",
+        {"job_id": "job-456", "type": "transcript", "status": "failure"},
+        HTTP_AUTHORIZATION="Bearer testWebhookToken",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"message": "Event processed."}
+
+    recording.refresh_from_db()
+    assert recording.status == RecordingStatusChoices.EXTERNAL_PROCESS_FAILED
+
+
+def test_external_process_event_unknown_recording_is_ignored(
+    external_process_settings, client
+):
+    """Unknown job_id should not fail the webhook processing."""
+    response = client.post(
+        "/api/v1.0/recordings/external-process-hook/",
+        {"job_id": "missing-job", "type": "transcript", "status": "success"},
+        HTTP_AUTHORIZATION="Bearer testWebhookToken",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"message": "Event processed."}
+
+
+def test_external_process_event_non_transcript_event_does_not_change_status(
+    external_process_settings, client
+):
+    """Only transcript events should update recording status."""
+    recording = RecordingFactory(
+        status=RecordingStatusChoices.SAVED,
+        external_process_id="job-789",
+    )
+
+    response = client.post(
+        "/api/v1.0/recordings/external-process-hook/",
+        {"job_id": "job-789", "type": "thumbnail", "status": "success"},
+        HTTP_AUTHORIZATION="Bearer testWebhookToken",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"message": "Event processed."}
+
+    recording.refresh_from_db()
+    assert recording.status == RecordingStatusChoices.SAVED
@@ -224,3 +224,44 @@ def test_save_recording_success(recording_settings, mock_get_parser, client, sta

    recording.refresh_from_db()
    assert recording.status == RecordingStatusChoices.SAVED
+
+
+@mock.patch(
+    "core.recording.services.recording_events.notification_service."
+    "notify_external_services"
+)
+@pytest.mark.parametrize("notification_succeeded", [True, False])
+def test_save_recording_notifies_external_services(
+    mock_notify_external_services,
+    recording_settings,
+    mock_get_parser,
+    client,
+    notification_succeeded,
+):
+    """External services should be notified when a recording is saved."""
+
+    recording = RecordingFactory(status="active")
+
+    mock_parser = mock.Mock()
+    mock_parser.get_recording_id.return_value = recording.id
+    mock_get_parser.return_value = mock_parser
+
+    mock_notify_external_services.return_value = notification_succeeded
+
+    response = client.post(
+        "/api/v1.0/recordings/storage-hook/",
+        {"recording_data": "valid-data"},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"message": "Event processed."}
+
+    mock_notify_external_services.assert_called_once_with(recording)
+
+    recording.refresh_from_db()
+    assert recording.status == (
+        RecordingStatusChoices.NOTIFICATION_SUCCEEDED
+        if notification_succeeded
+        else RecordingStatusChoices.SAVED
+    )
@@ -34,10 +34,8 @@ def mediator(mock_worker_service):
    return WorkerServiceMediator(mock_worker_service)


-@mock.patch("core.utils.update_room_metadata")
-def test_start_recording_success(
-    mock_update_room_metadata, mediator, mock_worker_service
-):
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
+def test_start_recording_success(mock_update_metadata, mediator, mock_worker_service):
    """Test successful recording start"""
    # Setup
    worker_id = "test-worker-123"
@@ -60,7 +58,7 @@ def test_start_recording_success(
    assert mock_recording.worker_id == worker_id
    assert mock_recording.status == RecordingStatusChoices.ACTIVE

-    mock_update_room_metadata.assert_called_once_with(
+    mock_update_metadata.assert_called_once_with(
        str(mock_recording.room.id),
        {"recording_mode": mock_recording.mode, "recording_status": "starting"},
    )
@@ -69,9 +67,9 @@ def test_start_recording_success(
@pytest.mark.parametrize(
    "error_class", [WorkerRequestError, WorkerConnectionError, WorkerResponseError]
 )
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_mediator_start_recording_worker_errors(
-    mock_update_room_metadata, mediator, mock_worker_service, error_class
+    mock_update_metadata, mediator, mock_worker_service, error_class
 ):
    """Test handling of various worker errors during start"""
    # Setup
@@ -89,7 +87,7 @@ def test_mediator_start_recording_worker_errors(
    assert mock_recording.status == RecordingStatusChoices.FAILED_TO_START
    assert mock_recording.worker_id is None

-    mock_update_room_metadata.assert_not_called()
+    mock_update_metadata.assert_not_called()


@pytest.mark.parametrize(
@@ -103,9 +101,9 @@ def test_mediator_start_recording_worker_errors(
        RecordingStatusChoices.ABORTED,
    ],
 )
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_mediator_start_recording_from_forbidden_status(
-    mock_update_room_metadata, mediator, mock_worker_service, status
+    mock_update_metadata, mediator, mock_worker_service, status
 ):
    """Test handling of various worker errors during start"""
    # Setup
@@ -119,7 +117,7 @@ def test_mediator_start_recording_from_forbidden_status(
    mock_recording.refresh_from_db()
    assert mock_recording.status == status

-    mock_update_room_metadata.assert_not_called()
+    mock_update_metadata.assert_not_called()


 def test_mediator_stop_recording_success(mediator, mock_worker_service):
@@ -0,0 +1 @@
+"""Tests for the roomkit API of the Meet core app."""
@@ -0,0 +1,305 @@
+"""
+Test the roomkit join server-to-server API endpoint.
+"""
+
+# pylint: disable=redefined-outer-name,unused-argument
+
+from unittest import mock
+
+import pytest
+
+from ...factories import RoomFactory
+from ...services.sip_management import SIPException
+
+pytestmark = pytest.mark.django_db
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_anonymous(mock_sip_management, settings, client):
+    """Requests without an Authorization header should be rejected."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+
+    response = client.post("/api/v1.0/roomkit/join/", {"pin_code": room.pin_code})
+
+    assert response.status_code == 401
+    assert response.json() == {"detail": "Authorization header is missing."}
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_malformed_authorization_header(mock_sip_management, settings, client):
+    """Requests with a malformed Authorization header should be rejected."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="testAuthToken",
+    )
+
+    assert response.status_code == 401
+    assert response.json() == {"detail": "Invalid authorization header."}
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_wrong_bearer(mock_sip_management, settings, client):
+    """Requests with an incorrect bearer token should be rejected."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="Bearer wrongAuthToken",
+    )
+
+    assert response.status_code == 401
+    assert response.json() == {"detail": "Invalid server-to-server token."}
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_token_not_configured(mock_sip_management, settings, client):
+    """Requests should be rejected when no server-to-server token is configured."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = None
+
+    room = RoomFactory(pin_code="1234567890")
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 401
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_roomkit_disabled(mock_sip_management, settings, client):
+    """The endpoint should not be exposed when the roomkit integration is disabled."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = False
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 404
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_missing_pin(mock_sip_management, settings, client):
+    """Requests without a PIN code should be rejected."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 400
+    assert response.json() == {"pin_code": ["This field is required."]}
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_blank_pin(mock_sip_management, settings, client):
+    """Requests with a blank PIN code should be rejected."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": ""},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 400
+    assert response.json() == {"pin_code": ["This field may not be blank."]}
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_wrong_pin_length(mock_sip_management, settings, client):
+    """Requests with a PIN code of unexpected length should be rejected."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+    settings.ROOM_TELEPHONY_PIN_LENGTH = 10
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": "123"},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 400
+    assert response.json() == {"pin_code": ["PIN code length is invalid."]}
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_unknown_pin(mock_sip_management, settings, client):
+    """Requests with a PIN matching no room should return 404 and create no rule."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    RoomFactory(pin_code="1234567890")
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": "0987654321"},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 404
+    assert response.json() == {"detail": "No room found for this PIN code."}
+    mock_sip_instance.ensure_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_success(mock_sip_management, settings, client):
+    """Requests with a valid PIN should create the dispatch rule."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+    mock_sip_instance.ensure_dispatch_rule.return_value = True
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"status": "success"}
+    mock_sip_instance.ensure_dispatch_rule.assert_called_once_with(room)
+
+
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_dispatch_rule_already_exists(mock_sip_management, settings, client):
+    """Requests should succeed when the dispatch rule already exists (idempotency)."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+    mock_sip_instance.ensure_dispatch_rule.return_value = False
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"status": "success"}
+    mock_sip_instance.ensure_dispatch_rule.assert_called_once_with(room)
+
+
+@mock.patch("core.roomkit.viewsets.analytics.capture")
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_tracks_analytics_event(
+    mock_sip_management, mock_capture, settings, client
+):
+    """Successful joins should be tracked with an analytics event."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+    mock_sip_instance.ensure_dispatch_rule.return_value = True
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+    )
+
+    assert response.status_code == 200
+    mock_capture.assert_called_once()
+    _user, event, properties = mock_capture.call_args[0]
+    assert str(event) == "roomkit_joined"
+    assert properties == {
+        "room_id": str(room.pk),
+        "dispatch_rule_created": True,
+    }
+
+
+@mock.patch("core.roomkit.viewsets.analytics.capture")
+@mock.patch("core.roomkit.viewsets.SIPManagement")
+def test_join_sip_failure(mock_sip_management, mock_capture, settings, client):
+    """Requests should fail with a server error when the sip management service fails."""
+
+    mock_sip_instance = mock_sip_management.return_value
+
+    settings.ROOMKIT_ENABLED = True
+    settings.ROOMKIT_SERVER_TO_SERVER_API_TOKEN = "testAuthToken"
+
+    room = RoomFactory(pin_code="1234567890")
+    mock_sip_instance.ensure_dispatch_rule.side_effect = SIPException(
+        "Could not create dispatch rule"
+    )
+
+    response = client.post(
+        "/api/v1.0/roomkit/join/",
+        {"pin_code": room.pin_code},
+        HTTP_AUTHORIZATION="Bearer testAuthToken",
+        raise_request_exception=False,
+    )
+
+    assert response.status_code == 500
+    mock_sip_instance.ensure_dispatch_rule.assert_called_once_with(room)
+    mock_capture.assert_not_called()
@@ -3,13 +3,14 @@ Test rooms API endpoints in the Meet core app: create.
 """

 # pylint: disable=redefined-outer-name,unused-argument
+from django.conf import settings
 from django.core.cache import cache

 import pytest
 from rest_framework.test import APIClient

 from ...factories import RoomFactory, UserFactory
-from ...models import Room
+from ...models import Room, RoomAccessLevel

 pytestmark = pytest.mark.django_db

@@ -109,3 +110,205 @@ def test_api_rooms_create_authenticated_existing_slug():

    assert response.status_code == 400
    assert response.json() == {"slug": ["Room with this Slug already exists."]}
+
+
+def test_api_rooms_create_authenticated_user_default_access_level():
+    """
+    The user's default room access level should be applied to the new room
+    when the request does not provide one.
+    """
+    user = UserFactory(default_room_access_level=RoomAccessLevel.RESTRICTED)
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+        },
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.access_level == RoomAccessLevel.RESTRICTED
+
+
+def test_api_rooms_create_authenticated_explicit_access_level_overrides_default():
+    """
+    An access level explicitly provided in the request should take precedence
+    over the user's default room access level.
+    """
+    user = UserFactory(default_room_access_level=RoomAccessLevel.RESTRICTED)
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+            "access_level": RoomAccessLevel.TRUSTED,
+        },
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.access_level == RoomAccessLevel.TRUSTED
+
+
+def test_api_rooms_create_authenticated_no_user_default_access_level():
+    """
+    When the user has no default room access level, the instance default
+    should be applied to the new room.
+    """
+    user = UserFactory(default_room_access_level=None)
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+        },
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.access_level == settings.RESOURCE_DEFAULT_ACCESS_LEVEL
+
+
+def test_api_rooms_create_authenticated_user_default_configuration():
+    """
+    The user's default room configuration should be applied to the new room
+    when the request does not provide one.
+    """
+    user = UserFactory(default_room_configuration={"everyone_can_mute": False})
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+        },
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.configuration == {"everyone_can_mute": False}
+
+
+def test_api_rooms_create_authenticated_explicit_configuration_overrides_default():
+    """
+    A configuration explicitly provided in the request should take precedence
+    over the user's default room configuration.
+    """
+    user = UserFactory(default_room_configuration={"everyone_can_mute": False})
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+            "configuration": {"can_publish_sources": ["camera", "microphone"]},
+        },
+        format="json",
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.configuration == {"can_publish_sources": ["camera", "microphone"]}
+
+
+def test_api_rooms_create_authenticated_empty_configuration_falls_back_to_default():
+    """
+    An empty configuration in the request should not be considered an explicit
+    value: the user's default room configuration should still be applied.
+    """
+    user = UserFactory(default_room_configuration={"everyone_can_mute": True})
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+            "configuration": {},
+        },
+        format="json",
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.configuration == {"everyone_can_mute": True}
+
+
+def test_api_rooms_create_authenticated_empty_user_default_configuration():
+    """
+    When the user's default room configuration is empty, the new room should
+    keep its default empty configuration.
+    """
+    user = UserFactory(default_room_configuration={})
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+        },
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.configuration == {}
+
+
+def test_api_rooms_create_authenticated_request_precedence_over_user_empty():
+    """
+    When the user's default room configuration is empty, the request should take precedence.
+    """
+    user = UserFactory(default_room_configuration={})
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {"name": "my room", "configuration": {"everyone_can_mute": True}},
+        format="json",
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.configuration == {"everyone_can_mute": True}
+
+
+def test_api_rooms_create_authenticated_blank_user_default_access_level():
+    """
+    A blank default room access level (stored as an empty string) should be
+    treated as unset: the instance default should be applied to the new room
+    instead of persisting an invalid empty access level.
+    """
+    user = UserFactory(default_room_access_level="")
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/rooms/",
+        {
+            "name": "my room",
+        },
+    )
+
+    assert response.status_code == 201
+    room = Room.objects.get()
+    assert room.access_level == settings.RESOURCE_DEFAULT_ACCESS_LEVEL
@@ -80,7 +80,7 @@ def test_mute_participant_with_livekit_token_for_this_room(mock_livekit_client):
    room = RoomFactory()

    user = AnonymousUser()
-    token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
+    token = utils.generate_token(str(room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -106,7 +106,7 @@ def test_mute_participant_with_livekit_token_for_another_room_forbidden(
    other_room = RoomFactory()

    user = AnonymousUser()
-    token = utils.generate_token(str(other_room.id), user, is_admin_or_owner=False)
+    token = utils.generate_token(str(other_room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": target_room.id})
    response = client.post(
@@ -146,7 +146,7 @@ def test_mute_participant_everyone_can_mute_disabled_blocks_non_admin(
    room = RoomFactory(configuration={"everyone_can_mute": False})

    user = AnonymousUser()
-    token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
+    token = utils.generate_token(str(room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -293,7 +293,7 @@ def test_mute_participant_admin_with_token_for_this_room(mock_livekit_client):
    )
    # Token identity matches the admin user so LiveKitTokenAuthentication
    # resolves request.user back to the admin.
-    token = utils.generate_token(str(room.id), user, is_admin_or_owner=True)
+    token = utils.generate_token(str(room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -323,7 +323,7 @@ def test_mute_participant_admin_with_token_for_another_room(mock_livekit_client)
    # Token is scoped to a DIFFERENT room, and admin status must only be
    # honored when established via session, never via a LiveKit
    # token, which can be replayed off-host.
-    token = utils.generate_token(str(other_room.id), user, is_admin_or_owner=True)
+    token = utils.generate_token(str(other_room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": target_room.id})
    response = client.post(
@@ -354,7 +354,7 @@ def test_mute_participant_admin_token_replayed_does_not_grant_admin(
        role=random.choice(["administrator", "owner"]),
    )
    # The token is the only credential.
-    token = utils.generate_token(str(room.id), admin_user, is_admin_or_owner=True)
+    token = utils.generate_token(str(room.id), admin_user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -374,7 +374,7 @@ def test_mute_participant_livekit_token_triggers_presence_check(mock_livekit_cli
    room = RoomFactory()

    user = AnonymousUser()
-    token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
+    token = utils.generate_token(str(room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -405,7 +405,7 @@ def test_mute_participant_livekit_token_presence_check_returns_participant(
    )

    user = AnonymousUser()
-    token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
+    token = utils.generate_token(str(room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -433,7 +433,7 @@ def test_mute_participant_livekit_token_presence_check_participant_not_found(
    )

    user = AnonymousUser()
-    token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
+    token = utils.generate_token(str(room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -462,7 +462,7 @@ def test_mute_participant_livekit_token_presence_check_twirp_error_forbidden(
    )

    user = AnonymousUser()
-    token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
+    token = utils.generate_token(str(room.id), user)

    url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
    response = client.post(
@@ -719,13 +719,13 @@ def test_update_participant_invalid_payload():
    )
    client.force_authenticate(user=user)

-    payload = {"participant_identity": "invalid-uuid"}
+    payload = {"participant_identity": ["test"]}

    url = reverse("rooms-update-participant", kwargs={"pk": room.id})
    response = client.post(url, payload, format="json")

    assert response.status_code == status.HTTP_400_BAD_REQUEST
-    assert "Must be a valid UUID." in str(response.data)
+    assert "Not a valid string." in str(response.data)


 def test_update_participant_no_update_fields():
@@ -918,7 +918,7 @@ def test_remove_participant_invalid_payload():
    )
    client.force_authenticate(user=user)

-    payload = {"participant_identity": "invalid-uuid"}
+    payload = {"participant_identity": ["invalid-uuid"]}

    url = reverse("rooms-remove-participant", kwargs={"pk": room.id})
    response = client.post(url, payload, format="json")
@@ -12,7 +12,7 @@ import pytest
 from rest_framework.test import APIClient

 from ...factories import RoomFactory, UserFactory, UserResourceAccessFactory
-from ...models import RoomAccessLevel
+from ...models import RoleChoices, RoomAccessLevel

 pytestmark = pytest.mark.django_db

@@ -31,7 +31,6 @@ def test_api_rooms_retrieve_anonymous_private_pk():
        "configuration": {},
        "access_level": "restricted",
        "id": str(room.id),
-        "is_administrable": False,
        "name": room.name,
        "slug": room.slug,
    }
@@ -51,7 +50,6 @@ def test_api_rooms_retrieve_anonymous_trusted_pk():
        "configuration": {},
        "access_level": "trusted",
        "id": str(room.id),
-        "is_administrable": False,
        "name": room.name,
        "slug": room.slug,
    }
@@ -70,7 +68,6 @@ def test_api_rooms_retrieve_anonymous_private_pk_no_dashes():
        "configuration": {},
        "access_level": "restricted",
        "id": str(room.id),
-        "is_administrable": False,
        "name": room.name,
        "slug": room.slug,
    }
@@ -87,7 +84,6 @@ def test_api_rooms_retrieve_anonymous_private_slug():
        "configuration": {},
        "access_level": "restricted",
        "id": str(room.id),
-        "is_administrable": False,
        "name": room.name,
        "slug": room.slug,
    }
@@ -104,7 +100,6 @@ def test_api_rooms_retrieve_anonymous_private_slug_not_normalized():
        "configuration": {},
        "access_level": "restricted",
        "id": str(room.id),
-        "is_administrable": False,
        "name": room.name,
        "slug": room.slug,
    }
@@ -130,6 +125,9 @@ def test_api_rooms_retrieve_anonymous_unregistered_allowed(mock_token):
    assert response.status_code == 200
    assert response.json() == {
        "id": None,
+        "slug": "unregistered-room",
+        "access_level": "public",
+        "is_administrable": False,
        "livekit": {
            "url": "test_url_value",
            "room": "unregistered-room",
@@ -162,6 +160,9 @@ def test_api_rooms_retrieve_anonymous_unregistered_allowed_not_normalized(mock_t
    assert response.status_code == 200
    assert response.json() == {
        "id": None,
+        "slug": "reunion",
+        "access_level": "public",
+        "is_administrable": False,
        "livekit": {
            "url": "test_url_value",
            "room": "reunion",
@@ -208,7 +209,6 @@ def test_api_rooms_retrieve_anonymous_public(mock_token):
        "configuration": {},
        "access_level": str(room.access_level),
        "id": str(room.id),
-        "is_administrable": False,
        "livekit": {
            "url": "test_url_value",
            "room": expected_name,
@@ -255,7 +255,6 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
        "configuration": {"can_publish_sources": ["camera"]},
        "access_level": str(room.access_level),
        "id": str(room.id),
-        "is_administrable": False,
        "livekit": {
            "url": "test_url_value",
            "room": expected_name,
@@ -272,7 +271,7 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
        username=None,
        color=None,
        sources=["camera"],
-        is_admin_or_owner=False,
+        role=None,
        participant_id=None,
    )

@@ -307,7 +306,6 @@ def test_api_rooms_retrieve_authenticated_trusted(mock_token):
        "configuration": {},
        "access_level": str(room.access_level),
        "id": str(room.id),
-        "is_administrable": False,
        "livekit": {
            "url": "test_url_value",
            "room": expected_name,
@@ -324,7 +322,7 @@ def test_api_rooms_retrieve_authenticated_trusted(mock_token):
        username=None,
        color=None,
        sources=None,
-        is_admin_or_owner=False,
+        role=None,
        participant_id=None,
    )

@@ -349,7 +347,6 @@ def test_api_rooms_retrieve_authenticated():
        "configuration": {},
        "access_level": "restricted",
        "id": str(room.id),
-        "is_administrable": False,
        "name": room.name,
        "slug": room.slug,
    }
@@ -395,7 +392,6 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
        "configuration": {"can_publish_sources": ["camera"]},
        "access_level": str(room.access_level),
        "id": str(room.id),
-        "is_administrable": False,
        "livekit": {
            "url": "test_url_value",
            "room": expected_name,
@@ -412,7 +408,7 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
        username=None,
        color=None,
        sources=["camera"],
-        is_admin_or_owner=False,
+        role=str(RoleChoices.MEMBER),
        participant_id=None,
    )

@@ -457,6 +453,8 @@ def test_api_rooms_retrieve_administrators(
            {
                "id": str(other_user_access.id),
                "user": {
+                    "default_room_access_level": None,
+                    "default_room_configuration": {},
                    "id": str(other_user_access.user.id),
                    "email": other_user_access.user.email,
                    "full_name": other_user_access.user.full_name,
@@ -470,6 +468,8 @@ def test_api_rooms_retrieve_administrators(
            {
                "id": str(user_access.id),
                "user": {
+                    "default_room_access_level": None,
+                    "default_room_configuration": {},
                    "id": str(user_access.user.id),
                    "email": user_access.user.email,
                    "full_name": user_access.user.full_name,
@@ -487,7 +487,6 @@ def test_api_rooms_retrieve_administrators(
    assert content_dict == {
        "access_level": str(room.access_level),
        "id": str(room.id),
-        "is_administrable": True,
        "configuration": {},
        "livekit": {
            "url": "test_url_value",
@@ -505,6 +504,6 @@ def test_api_rooms_retrieve_administrators(
        username=None,
        color=None,
        sources=None,
-        is_admin_or_owner=True,
+        role=str(user_access.role),
        participant_id=None,
    )
@@ -0,0 +1,319 @@
+"""
+Test rooms API endpoints in the Meet core app: update-participant-role.
+"""
+
+# pylint: disable=redefined-outer-name,unused-argument
+
+import uuid
+from unittest import mock
+
+import pytest
+from rest_framework.test import APIClient
+
+from ...factories import RoomFactory, UserFactory
+from ...models import ResourceAccess, RoleChoices
+from ...services.participants_management import ParticipantNotFoundException
+
+pytestmark = pytest.mark.django_db
+
+
+def test_update_participant_role_anonymous():
+    """Anonymous requesters are rejected."""
+    client = APIClient()
+    room = RoomFactory()
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": "some-identity", "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 401
+
+
+def test_update_participant_role_requires_privileges():
+    """A simple member cannot promote other participants."""
+    client = APIClient()
+    user = UserFactory()
+    room = RoomFactory(users=[(user, RoleChoices.MEMBER)])
+    client.force_login(user)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": "some-identity", "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 403
+
+
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_requester_not_in_meeting(mock_perm_pm):
+    """An admin who is not connected to the meeting is rejected."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = False
+    client = APIClient()
+    user = UserFactory()
+    room = RoomFactory(users=[(user, RoleChoices.ADMIN)])
+    client.force_login(user)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": "some-identity", "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    mock_perm_pm.return_value.check_if_in_meeting.assert_called_once_with(
+        room_name=str(room.pk), identity=str(user.sub)
+    )
+
+
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_cannot_target_self(mock_perm_pm):
+    """Requesters cannot change their own role."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    client = APIClient()
+    user = UserFactory(sub=uuid.uuid4())
+    room = RoomFactory(users=[(user, RoleChoices.ADMIN)])
+    client.force_login(user)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": user.sub, "role": "member"},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {"error": "You cannot change your own role."}
+
+
+@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
+@mock.patch("core.services.room_roles.ParticipantsManagement")
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_promotes_authenticated_target(
+    mock_perm_pm, mock_svc_pm, mock_sync
+):
+    """Promoting a connected, authenticated participant persists the role."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    mock_svc_pm.return_value.check_if_in_meeting.return_value = True
+    mock_sync.return_value = True
+
+    client = APIClient()
+    admin = UserFactory()
+    target = UserFactory(sub=uuid.uuid4())
+    room = RoomFactory(users=[(admin, RoleChoices.OWNER)])
+    client.force_login(admin)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": str(target.sub), "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {
+        "role": "administrator",
+        "livekit_synced": True,
+    }
+    access = ResourceAccess.objects.get(resource=room, user=target)
+    assert access.role == RoleChoices.ADMIN
+    mock_sync.assert_called_once_with(
+        room_name=str(room.pk),
+        participant_identity=str(target.sub),
+        role="administrator",
+    )
+
+
+@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
+@mock.patch("core.services.room_roles.ParticipantsManagement")
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_demotes_authenticated_target(
+    mock_perm_pm, mock_svc_pm, mock_sync
+):
+    """Demoting a connected admin back to member updates the access row."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    mock_svc_pm.return_value.check_if_in_meeting.return_value = True
+    mock_sync.return_value = True
+
+    client = APIClient()
+    admin = UserFactory()
+    target = UserFactory(sub=uuid.uuid4())
+    room = RoomFactory(users=[(admin, RoleChoices.OWNER), (target, RoleChoices.ADMIN)])
+    client.force_login(admin)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": str(target.sub), "role": "member"},
+        format="json",
+    )
+
+    assert response.status_code == 200
+    access = ResourceAccess.objects.get(resource=room, user=target)
+    assert access.role == RoleChoices.MEMBER
+
+
+@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
+@mock.patch("core.services.room_roles.ParticipantsManagement")
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_cannot_demote_owner(
+    mock_perm_pm, mock_svc_pm, mock_sync
+):
+    """Room owners can never be demoted."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    mock_svc_pm.return_value.check_if_in_meeting.return_value = True
+
+    client = APIClient()
+    admin = UserFactory()
+    owner = UserFactory(sub=uuid.uuid4())
+    room = RoomFactory(users=[(admin, RoleChoices.ADMIN), (owner, RoleChoices.OWNER)])
+    client.force_login(admin)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": str(owner.sub), "role": "member"},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {"error": "Room owners cannot be demoted."}
+    assert (
+        ResourceAccess.objects.get(resource=room, user=owner).role == RoleChoices.OWNER
+    )
+    mock_sync.assert_not_called()
+
+
+@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
+@mock.patch("core.services.room_roles.ParticipantsManagement")
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_anonymous_target_is_ephemeral(
+    mock_perm_pm, mock_svc_pm, mock_sync
+):
+    """Promoting an anonymous participant should not be possible."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    mock_svc_pm.return_value.check_if_in_meeting.return_value = True
+    mock_sync.return_value = True
+
+    client = APIClient()
+    admin = UserFactory()
+    room = RoomFactory(users=[(admin, RoleChoices.ADMIN)])
+    client.force_login(admin)
+
+    anonymous_identity = uuid.uuid4()
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": anonymous_identity, "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 404
+    assert response.json() == {
+        "error": "This participant has no user account and cannot be assigned a role."
+    }
+    assert not ResourceAccess.objects.filter(resource=room).exclude(user=admin).exists()
+
+
+@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
+@mock.patch("core.services.room_roles.ParticipantsManagement")
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_target_not_in_meeting(
+    mock_perm_pm, mock_svc_pm, mock_sync
+):
+    """Only connected participants can be promoted or demoted."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    mock_svc_pm.return_value.check_if_in_meeting.side_effect = (
+        ParticipantNotFoundException("Participant does not exist")
+    )
+
+    client = APIClient()
+    admin = UserFactory()
+    target = UserFactory(sub=uuid.uuid4())
+    room = RoomFactory(users=[(admin, RoleChoices.ADMIN)])
+    client.force_login(admin)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": str(target.sub), "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 404
+    assert not ResourceAccess.objects.filter(resource=room, user=target).exists()
+    mock_sync.assert_not_called()
+
+
+@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
+@mock.patch("core.services.room_roles.ParticipantsManagement")
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_is_idempotent_and_resyncs(
+    mock_perm_pm, mock_svc_pm, mock_sync
+):
+    """Promoting an existing admin succeeds and still re-syncs LiveKit."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    mock_svc_pm.return_value.check_if_in_meeting.return_value = True
+    mock_sync.return_value = True
+
+    client = APIClient()
+    admin = UserFactory()
+    target = UserFactory(sub=uuid.uuid4())
+    room = RoomFactory(users=[(admin, RoleChoices.OWNER), (target, RoleChoices.ADMIN)])
+    client.force_login(admin)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": str(target.sub), "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 200
+    mock_sync.assert_called_once()
+
+
+@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
+@mock.patch("core.services.room_roles.ParticipantsManagement")
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_livekit_failure_reports_partial_success(
+    mock_perm_pm, mock_svc_pm, mock_sync
+):
+    """A LiveKit sync failure does not lose the persisted role."""
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    mock_svc_pm.return_value.check_if_in_meeting.return_value = True
+    mock_sync.return_value = False
+
+    client = APIClient()
+    admin = UserFactory()
+    target = UserFactory(sub=uuid.uuid4())
+    room = RoomFactory(users=[(admin, RoleChoices.OWNER)])
+    client.force_login(admin)
+
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": str(target.sub), "role": "administrator"},
+        format="json",
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {
+        "role": "administrator",
+        "livekit_synced": False,
+    }
+    assert (
+        ResourceAccess.objects.get(resource=room, user=target).role == RoleChoices.ADMIN
+    )
+
+
+@mock.patch("core.api.permissions.ParticipantsManagement")
+def test_update_participant_role_rejects_owner_role(mock_perm_pm):
+    """The owner role can never be granted through this endpoint."""
+    client = APIClient()
+    admin = UserFactory()
+    room = RoomFactory(users=[(admin, RoleChoices.ADMIN)])
+    client.force_login(admin)
+
+    mock_perm_pm.return_value.check_if_in_meeting.return_value = True
+    response = client.post(
+        f"/api/v1.0/rooms/{room.id}/update-participant-role/",
+        {"participant_identity": "some-identity", "role": "owner"},
+        format="json",
+    )
+
+    assert response.status_code == 400
@@ -20,8 +20,12 @@ from core.services.livekit_events import (
    api,
 )
 from core.services.lobby import LobbyService
-from core.services.telephony import TelephonyException, TelephonyService
-from core.utils import MetadataUpdateException, NotificationError
+from core.services.room_management import RoomManagementException
+from core.services.sip_management import (
+    SIPException,
+    SIPManagement,
+)
+from core.utils import NotificationError

 pytestmark = pytest.mark.django_db

@@ -58,7 +62,7 @@ def test_initialization(
    mock_token_verifier.assert_called_once_with(api_key, api_secret)
    mock_webhook_receiver.assert_called_once_with(mock_token_verifier.return_value)
    assert isinstance(service.lobby_service, LobbyService)
-    assert isinstance(service.telephony_service, TelephonyService)
+    assert isinstance(service.sip_management, SIPManagement)
    assert isinstance(service.recording_events, RecordingEventsService)


@@ -70,12 +74,13 @@ def test_initialization(
    ),
 )
@mock.patch("core.utils.notify_participants")
-@mock.patch("core.utils.update_room_metadata")
-def test_handle_egress_ended_success(
-    mock_update_room_metadata, mock_notify, mode, notification_type, service
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
+def test_handle_egress_ended_success(  # noqa: PLR0913, PLR0917 # pylint: disable=too-many-arguments, too-many-positional-arguments
+    mock_update_metadata, mock_notify, mode, notification_type, service, settings
 ):
    """Should successfully stop recording and notifies all participant."""

+    settings.RECORDING_STORAGE_EVENT_ENABLE = False
    recording = RecordingFactory(worker_id="worker-1", mode=mode, status="active")
    mock_data = mock.MagicMock()
    mock_data.egress_info.egress_id = recording.worker_id
@@ -86,12 +91,14 @@ def test_handle_egress_ended_success(
    mock_notify.assert_called_once_with(
        room_name=str(recording.room.id), notification_data={"type": notification_type}
    )
-    mock_update_room_metadata.assert_called_once_with(
-        str(recording.room.id), {}, ["recording_mode", "recording_status"]
+    mock_update_metadata.assert_called_once_with(
+        str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
    )

    recording.refresh_from_db()
-    assert recording.status == "stopped"
+
+    # NB: notify_external_services will return False, so status is "saved"
+    assert recording.status == "saved"


@pytest.mark.parametrize(
@@ -102,9 +109,9 @@ def test_handle_egress_ended_success(
        (EgressStatus.EGRESS_ABORTED, "aborted"),
    ),
 )
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_updated_success(
-    mock_update_room_metadata, egress_status, status, service
+    mock_update_metadata, egress_status, status, service
 ):
    """Should successfully update room's metadata."""

@@ -115,7 +122,7 @@ def test_handle_egress_updated_success(

    service._handle_egress_updated(mock_data)

-    mock_update_room_metadata.assert_called_once_with(
+    mock_update_metadata.assert_called_once_with(
        str(recording.room.id), {"recording_status": status}
    )

@@ -127,9 +134,9 @@ def test_handle_egress_updated_success(
        EgressStatus.EGRESS_LIMIT_REACHED,
    ),
 )
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_updated_non_handled(
-    mock_update_room_metadata, egress_status, service
+    mock_update_metadata, egress_status, service
 ):
    """Should ignore certain egress status and don't trigger metadata updates."""

@@ -140,7 +147,7 @@ def test_handle_egress_updated_non_handled(

    service._handle_egress_updated(mock_data)

-    mock_update_room_metadata.assert_not_called()
+    mock_update_metadata.assert_not_called()


@pytest.mark.parametrize(
@@ -151,18 +158,19 @@ def test_handle_egress_updated_non_handled(
    ),
 )
@mock.patch("core.utils.notify_participants")
-@mock.patch("core.utils.update_room_metadata")
-def test_handle_egress_ended_metadata_update_fails(
-    mock_update_room_metadata, mock_notify, mode, notification_type, service
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
+def test_handle_egress_ended_metadata_update_fails(  # noqa: PLR0913, PLR0917 # pylint: disable=too-many-arguments, too-many-positional-arguments
+    mock_update_metadata, mock_notify, mode, notification_type, service, settings
 ):
-    """Should successfully stop recording when metadata's update fails."""
+    """Should successfully stop and save recording when metadata's update fails."""

+    settings.RECORDING_STORAGE_EVENT_ENABLE = False
    recording = RecordingFactory(worker_id="worker-1", mode=mode, status="active")
    mock_data = mock.MagicMock()
    mock_data.egress_info.egress_id = recording.worker_id
    mock_data.egress_info.status = EgressStatus.EGRESS_LIMIT_REACHED

-    mock_update_room_metadata.side_effect = MetadataUpdateException("Error notifying")
+    mock_update_metadata.side_effect = RoomManagementException("Error notifying")

    service._handle_egress_ended(mock_data)

@@ -170,13 +178,15 @@ def test_handle_egress_ended_metadata_update_fails(
        room_name=str(recording.room.id), notification_data={"type": notification_type}
    )
    recording.refresh_from_db()
-    assert recording.status == "stopped"
+
+    # NB: notify_external_services will return False, so status is "saved"
+    assert recording.status == "saved"


@mock.patch("core.utils.notify_participants")
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_ended_notification_fails(
-    mock_update_room_metadata, mock_notify, service
+    mock_update_metadata, mock_notify, service
 ):
    """Should raise ActionFailedError when notification fails but still stop recording."""

@@ -196,15 +206,15 @@ def test_handle_egress_ended_notification_fails(
    recording.refresh_from_db()
    assert recording.status == "stopped"

-    mock_update_room_metadata.assert_called_once_with(
-        str(recording.room.id), {}, ["recording_mode", "recording_status"]
+    mock_update_metadata.assert_called_once_with(
+        str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
    )


@mock.patch("core.utils.notify_participants")
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_ended_recording_not_found(
-    mock_update_room_metadata, mock_notify, service
+    mock_update_metadata, mock_notify, service
 ):
    """Should raise ActionFailedError when recording doesn't exist."""

@@ -219,16 +229,16 @@ def test_handle_egress_ended_recording_not_found(
        service._handle_egress_ended(mock_data)

    mock_notify.assert_not_called()
-    mock_update_room_metadata.assert_not_called()
+    mock_update_metadata.assert_not_called()

    recording.refresh_from_db()
    assert recording.status == "active"


@mock.patch("core.utils.notify_participants")
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_ended_recording_not_active(
-    mock_update_room_metadata, mock_notify, service
+    mock_update_metadata, mock_notify, service
 ):
    """Should ignore non-active recordings."""

@@ -240,8 +250,8 @@ def test_handle_egress_ended_recording_not_active(
    service._handle_egress_ended(mock_data)

    mock_notify.assert_not_called()
-    mock_update_room_metadata.assert_called_once_with(
-        str(recording.room.id), {}, ["recording_mode", "recording_status"]
+    mock_update_metadata.assert_called_once_with(
+        str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
    )

    recording.refresh_from_db()
@@ -249,9 +259,9 @@ def test_handle_egress_ended_recording_not_active(


@mock.patch("core.utils.notify_participants")
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_ended_recording_not_limit_reached(
-    mock_update_room_metadata, mock_notify, service
+    mock_update_metadata, mock_notify, service
 ):
    """Should ignore egress non-limit-reached statuses."""

@@ -263,16 +273,16 @@ def test_handle_egress_ended_recording_not_limit_reached(
    service._handle_egress_ended(mock_data)

    mock_notify.assert_not_called()
-    mock_update_room_metadata.assert_called_once_with(
-        str(recording.room.id), {}, ["recording_mode", "recording_status"]
+    mock_update_metadata.assert_called_once_with(
+        str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
    )
    assert recording.status == "stopped"


@mock.patch("core.services.livekit_events.MetadataCollectorService")
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_ended_calls_metadata_collector_stop_when_conditions_are_met(
-    mock_update_room_metadata, mock_collector_class, service, settings
+    mock_update_metadata, mock_collector_class, service, settings
 ):
    """Should call MetadataCollectorService.stop when it exists."""
    settings.METADATA_COLLECTOR_ENABLED = True
@@ -302,7 +312,7 @@ def test_handle_egress_ended_calls_metadata_collector_stop_when_conditions_are_m
    ],
 )
@mock.patch("core.services.livekit_events.MetadataCollectorService")
-@mock.patch("core.utils.update_room_metadata")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
 def test_handle_egress_ended_does_not_call_metadata_collector_stop_when_conditions_not_met(
    _, mock_collector_class, metadata_enabled, options, service, settings
 ):  # pylint: disable=too-many-arguments,too-many-positional-arguments
@@ -326,12 +336,149 @@ def test_handle_egress_ended_does_not_call_metadata_collector_stop_when_conditio
    mock_collector.stop.assert_not_called()


+@mock.patch(
+    "core.recording.services.recording_events.notification_service."
+    "notify_external_services"
+)
+@mock.patch("core.utils.notify_participants")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
+@pytest.mark.parametrize(
+    "egress_status",
+    [EgressStatus.EGRESS_COMPLETE, EgressStatus.EGRESS_LIMIT_REACHED],
+)
+@pytest.mark.parametrize(
+    "notify_return_value, recording_status",
+    [(True, "notification_succeeded"), (False, "saved")],
+)
+def test_handle_egress_ended_finalizes_recording(  # noqa: PLR0913, PLR0917
+    mock_update_metadata,
+    mock_notify,
+    mock_notify_external_services,
+    notify_return_value,
+    recording_status,
+    egress_status,
+    service,
+    settings,
+):  # pylint: disable=too-many-arguments,too-many-positional-arguments
+    """Should notify external services and save the recording on egress completion
+    (EGRESS_COMPLETE or EGRESS_LIMIT_REACHED) when RECORDING_STORAGE_EVENT_ENABLE is False.
+    """
+    settings.RECORDING_STORAGE_EVENT_ENABLE = False
+    mock_notify_external_services.return_value = notify_return_value
+
+    recording = RecordingFactory(worker_id="worker-1", status="active")
+    mock_data = mock.MagicMock()
+    mock_data.egress_info.egress_id = recording.worker_id
+    mock_data.egress_info.status = egress_status
+
+    service._handle_egress_ended(mock_data)
+
+    mock_notify_external_services.assert_called_once_with(recording)
+
+    recording.refresh_from_db()
+    assert recording.status == recording_status
+
+
+@mock.patch(
+    "core.recording.services.recording_events.notification_service."
+    "notify_external_services"
+)
+@mock.patch("core.utils.notify_participants")
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
+@pytest.mark.parametrize(
+    "egress_status, expected_status",
+    [
+        (EgressStatus.EGRESS_COMPLETE, "active"),
+        (EgressStatus.EGRESS_LIMIT_REACHED, "stopped"),
+    ],
+)
+def test_handle_egress_ended_does_not_finalize_when_webhooks_enabled(  # noqa: PLR0913, PLR0917
+    mock_update_metadata,
+    mock_notify,
+    mock_notify_external_services,
+    egress_status,
+    expected_status,
+    service,
+    settings,
+):  # pylint: disable=too-many-arguments,too-many-positional-arguments
+    """When storage event webhooks are enabled, egress_ended must not finalize the
+    recording: external services are never notified. EGRESS_LIMIT_REACHED still stops
+    the recording, EGRESS_COMPLETE leaves it active.
+    """
+    settings.RECORDING_STORAGE_EVENT_ENABLE = True
+
+    recording = RecordingFactory(worker_id="worker-1", status="active")
+    mock_data = mock.MagicMock()
+    mock_data.egress_info.egress_id = recording.worker_id
+    mock_data.egress_info.status = egress_status
+
+    service._handle_egress_ended(mock_data)
+
+    mock_notify_external_services.assert_not_called()
+
+    recording.refresh_from_db()
+    assert recording.status == expected_status
+
+
+@pytest.mark.parametrize(
+    "egress_status",
+    [
+        EgressStatus.EGRESS_STARTING,
+        EgressStatus.EGRESS_ACTIVE,
+        EgressStatus.EGRESS_ENDING,
+        EgressStatus.EGRESS_FAILED,
+        EgressStatus.EGRESS_ABORTED,
+    ],
+)
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
+def test_handle_egress_ended_does_not_save_on_wrong_status(
+    mock_update_metadata, egress_status, service, settings
+):
+    """Shouldn't save on invalid status."""
+    settings.RECORDING_STORAGE_EVENT_ENABLE = False
+
+    recording = RecordingFactory(worker_id="worker-1", status="active")
+    mock_data = mock.MagicMock()
+    mock_data.egress_info.egress_id = recording.worker_id
+    mock_data.egress_info.status = egress_status
+
+    service._handle_egress_ended(mock_data)
+
+    recording.refresh_from_db()
+    assert recording.status == "active"
+
+
+@pytest.mark.parametrize(
+    "status", ["failed_to_start", "aborted", "failed_to_stop", "saved", "initiated"]
+)
+@mock.patch("core.services.room_management.RoomManagement.update_metadata")
+def test_handle_egress_ended_ignores_non_savable_recording(
+    mock_update_metadata, status, service, settings
+):
+    """Should handle non-savable recordings idempotently without raising.
+
+    'egress_ended' may be redelivered (e.g. for an already-saved recording);
+    this must not raise, otherwise the webhook would 500 and LiveKit would retry.
+    """
+    settings.RECORDING_STORAGE_EVENT_ENABLE = False
+
+    recording = RecordingFactory(worker_id="worker-1", status=status)
+    mock_data = mock.MagicMock()
+    mock_data.egress_info.egress_id = recording.worker_id
+    mock_data.egress_info.status = EgressStatus.EGRESS_COMPLETE
+
+    service._handle_egress_ended(mock_data)
+
+    recording.refresh_from_db()
+    assert recording.status == status
+
+
@mock.patch.object(LobbyService, "clear_room_cache")
-@mock.patch.object(TelephonyService, "delete_dispatch_rule")
+@mock.patch.object(SIPManagement, "delete_dispatch_rule")
 def test_handle_room_finished_clears_cache_and_deletes_dispatch_rule(
    mock_delete_dispatch_rule, mock_clear_cache, service, settings
 ):
-    """Should clear lobby cache and delete telephony dispatch rule when room finishes."""
+    """Should clear lobby cache and delete SIP dispatch rule when room finishes."""
    settings.ROOM_TELEPHONY_ENABLED = True
    mock_room_name = uuid.uuid4()
    mock_data = mock.MagicMock()
@@ -344,12 +491,31 @@ def test_handle_room_finished_clears_cache_and_deletes_dispatch_rule(


@mock.patch.object(LobbyService, "clear_room_cache")
-@mock.patch.object(TelephonyService, "delete_dispatch_rule")
+@mock.patch.object(SIPManagement, "delete_dispatch_rule")
+def test_handle_room_finished_deletes_dispatch_rule_when_only_roomkit_enabled(
+    mock_delete_dispatch_rule, mock_clear_cache, service, settings
+):
+    """Should delete dispatch rule when only roomkit is enabled when room finishes."""
+    settings.ROOM_TELEPHONY_ENABLED = False
+    settings.ROOMKIT_ENABLED = True
+    mock_room_name = uuid.uuid4()
+    mock_data = mock.MagicMock()
+    mock_data.room.name = str(mock_room_name)
+
+    service._handle_room_finished(mock_data)
+
+    mock_delete_dispatch_rule.assert_called_once_with(mock_room_name)
+    mock_clear_cache.assert_called_once_with(mock_room_name)
+
+
+@mock.patch.object(LobbyService, "clear_room_cache")
+@mock.patch.object(SIPManagement, "delete_dispatch_rule")
 def test_handle_room_finished_skips_telephony_when_disabled(
    mock_delete_dispatch_rule, mock_clear_cache, service, settings
 ):
    """Should clear lobby cache but skip dispatch rule deletion when telephony is disabled."""
    settings.ROOM_TELEPHONY_ENABLED = False
+    settings.ROOMKIT_ENABLED = False
    mock_room_name = uuid.uuid4()
    mock_data = mock.MagicMock()
    mock_data.room.name = str(mock_room_name)
@@ -363,7 +529,7 @@ def test_handle_room_finished_skips_telephony_when_disabled(
@mock.patch.object(
    LobbyService, "clear_room_cache", side_effect=Exception("Test error")
 )
-@mock.patch.object(TelephonyService, "delete_dispatch_rule")
+@mock.patch.object(SIPManagement, "delete_dispatch_rule")
 def test_handle_room_finished_raises_error_when_cache_clearing_fails(
    mock_delete_dispatch_rule, mock_clear_cache, service, settings
 ):
@@ -386,9 +552,9 @@ def test_handle_room_finished_raises_error_when_cache_clearing_fails(

@mock.patch.object(LobbyService, "clear_room_cache")
@mock.patch.object(
-    TelephonyService,
+    SIPManagement,
    "delete_dispatch_rule",
-    side_effect=TelephonyException("Test error"),
+    side_effect=SIPException("Test error"),
 )
 def test_handle_room_finished_raises_error_when_telephony_deletion_fails(
    mock_delete_dispatch_rule, mock_clear_cache, service, settings
@@ -399,7 +565,7 @@ def test_handle_room_finished_raises_error_when_telephony_deletion_fails(
    mock_data.room.name = "00000000-0000-0000-0000-000000000000"

    expected_error = (
-        "Failed to delete telephony dispatch rule for room "
+        "Failed to delete sip dispatch rule for room "
        "00000000-0000-0000-0000-000000000000"
    )

@@ -420,11 +586,11 @@ def test_handle_room_finished_raises_error_for_invalid_room_name(service):
        service._handle_room_finished(mock_data)


-@mock.patch.object(TelephonyService, "create_dispatch_rule")
+@mock.patch.object(SIPManagement, "ensure_dispatch_rule")
 def test_handle_room_started_creates_dispatch_rule_successfully(
-    mock_create_dispatch_rule, service, settings
+    mock_ensure_dispatch_rule, service, settings
 ):
-    """Should create telephony dispatch rule when room starts successfully."""
+    """Should ensure the SIP dispatch rule exists when room starts successfully."""
    settings.ROOM_TELEPHONY_ENABLED = True
    room = RoomFactory()
    mock_data = mock.MagicMock()
@@ -432,22 +598,75 @@ def test_handle_room_started_creates_dispatch_rule_successfully(

    service._handle_room_started(mock_data)

-    mock_create_dispatch_rule.assert_called_once_with(room)
+    mock_ensure_dispatch_rule.assert_called_once_with(room)


-@mock.patch.object(TelephonyService, "create_dispatch_rule")
-def test_handle_room_started_skips_dispatch_rule_when_telephony_disabled(
-    mock_create_dispatch_rule, service, settings
+@mock.patch.object(SIPManagement, "ensure_dispatch_rule")
+def test_handle_room_started_creates_dispatch_rule_when_only_roomkit_enabled(
+    mock_ensure_dispatch_rule, service, settings
 ):
-    """Should skip creating telephony dispatch rule when telephony is disabled during room start."""
+    """Should ensure the dispatch rule exists when only roomkit is enabled during room start."""
    settings.ROOM_TELEPHONY_ENABLED = False
+    settings.ROOMKIT_ENABLED = True
    room = RoomFactory()
    mock_data = mock.MagicMock()
    mock_data.room.name = str(room.id)

    service._handle_room_started(mock_data)

-    mock_create_dispatch_rule.assert_not_called()
+    mock_ensure_dispatch_rule.assert_called_once_with(room)
+
+
+@mock.patch.object(SIPManagement, "ensure_dispatch_rule", return_value=False)
+def test_handle_room_started_ignores_existing_dispatch_rule(
+    mock_ensure_dispatch_rule, service, settings
+):
+    """Should proceed silently when the dispatch rule already exists when room starts."""
+    settings.ROOM_TELEPHONY_ENABLED = True
+    room = RoomFactory()
+    mock_data = mock.MagicMock()
+    mock_data.room.name = str(room.id)
+
+    # ensure_dispatch_rule reports the rule as pre-existing: nothing to raise
+    service._handle_room_started(mock_data)
+
+    mock_ensure_dispatch_rule.assert_called_once_with(room)
+
+
+@mock.patch.object(
+    SIPManagement,
+    "ensure_dispatch_rule",
+    side_effect=SIPException("Test error"),
+)
+def test_handle_room_started_raises_error_when_dispatch_rule_creation_fails(
+    mock_ensure_dispatch_rule, service, settings
+):
+    """Should raise ActionFailedError when ensuring the dispatch rule fails when room starts."""
+    settings.ROOM_TELEPHONY_ENABLED = True
+    room = RoomFactory()
+    mock_data = mock.MagicMock()
+    mock_data.room.name = str(room.id)
+
+    expected_error = f"Failed to create sip dispatch rule for room {room.id}"
+
+    with pytest.raises(ActionFailedError, match=expected_error):
+        service._handle_room_started(mock_data)
+
+
+@mock.patch.object(SIPManagement, "ensure_dispatch_rule")
+def test_handle_room_started_skips_dispatch_rule_when_telephony_disabled(
+    mock_ensure_dispatch_rule, service, settings
+):
+    """Should skip ensuring the SIP dispatch rule when telephony is disabled during room start."""
+    settings.ROOM_TELEPHONY_ENABLED = False
+    settings.ROOMKIT_ENABLED = False
+    room = RoomFactory()
+    mock_data = mock.MagicMock()
+    mock_data.room.name = str(room.id)
+
+    service._handle_room_started(mock_data)
+
+    mock_ensure_dispatch_rule.assert_not_called()


 def test_handle_room_started_raises_error_for_invalid_room_name(service):
@@ -501,6 +720,7 @@ def test_receive_unsupported_event(mock_receive, service):

    # Mock returned data with unsupported event type
    mock_data = mock.MagicMock()
+    mock_data.room.name = str(uuid.uuid4())
    mock_data.event = "unsupported_event"
    mock_receive.return_value = mock_data

@@ -604,3 +824,33 @@ def test_receive_filter_processes_matching_events(
    service.receive(mock_request)

    mock_handle_room_started.assert_called_once()
+
+
+@mock.patch.object(api.WebhookReceiver, "receive")
+@mock.patch.object(LiveKitEventsService, "_handle_room_finished")
+@mock.patch.object(LiveKitEventsService, "_handle_room_started")
+def test_receive_ignores_connection_test_room(
+    mock_handle_room_started,
+    mock_handle_room_finished,
+    mock_receive,
+    mock_livekit_config,
+    settings,
+):
+    """Should ignore all webhook events for connection test rooms in receive()."""
+
+    settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
+
+    mock_request = mock.MagicMock()
+    mock_request.headers = {"Authorization": "test_token"}
+    mock_request.body = b"{}"
+
+    mock_data = mock.MagicMock()
+    mock_data.room.name = f"{settings.CONNECTION_TEST_ROOM_PREFIX}-{uuid.uuid4()}"
+    mock_data.event = "room_started"
+    mock_receive.return_value = mock_data
+
+    service = LiveKitEventsService()
+    service.receive(mock_request)
+
+    mock_handle_room_started.assert_not_called()
+    mock_handle_room_finished.assert_not_called()
@@ -3,19 +3,20 @@ Test lobby service.
 """

 # pylint: disable=W0621,W0613, W0212, R0913
-# ruff: noqa: PLR0913
+# ruff: noqa: PLR0913, PLR0917

 import uuid
 from unittest import mock

 from django.conf import settings
+from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
 from django.http import HttpResponse

 import pytest

-from core.factories import RoomFactory
-from core.models import RoomAccessLevel
+from core.factories import RoomFactory, UserFactory, UserResourceAccessFactory
+from core.models import RoleChoices, RoomAccessLevel
 from core.services.lobby import (
    LobbyParticipant,
    LobbyParticipantNotFound,
@@ -188,17 +189,17 @@ def test_prepare_response_new_cookie(lobby_service, participant_id):


 def test_can_bypass_lobby_public_room(lobby_service):
-    """Should return True for public rooms regardless of user auth."""
+    """Should return True for public rooms regardless of user auth and role."""
    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)

    # Anonymous user
    user = mock.Mock()
    user.is_authenticated = False
-    assert lobby_service.can_bypass_lobby(room, user) is True
+    assert lobby_service.can_bypass_lobby(room, user, role=None) is True

    # Authenticated user
    user.is_authenticated = True
-    assert lobby_service.can_bypass_lobby(room, user) is True
+    assert lobby_service.can_bypass_lobby(room, user, role=None) is True


 def test_can_bypass_lobby_trusted_room_authenticated(lobby_service):
@@ -208,7 +209,7 @@ def test_can_bypass_lobby_trusted_room_authenticated(lobby_service):
    # Authenticated user
    user = mock.Mock()
    user.is_authenticated = True
-    assert lobby_service.can_bypass_lobby(room, user) is True
+    assert lobby_service.can_bypass_lobby(room, user, role=None) is True


 def test_can_bypass_lobby_trusted_room_anonymous(lobby_service):
@@ -218,21 +219,34 @@ def test_can_bypass_lobby_trusted_room_anonymous(lobby_service):
    # Anonymous user
    user = mock.Mock()
    user.is_authenticated = False
-    assert lobby_service.can_bypass_lobby(room, user) is False
+    assert lobby_service.can_bypass_lobby(room, user, role=None) is False


 def test_can_bypass_lobby_private_room(lobby_service):
-    """Should return False for private rooms regardless of user auth."""
+    """Should return False for private rooms regardless of user auth if role is not."""
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)

    # Anonymous user
    user = mock.Mock()
    user.is_authenticated = False
-    assert lobby_service.can_bypass_lobby(room, user) is False
+    assert lobby_service.can_bypass_lobby(room, user, role=None) is False

    # Authenticated user
    user.is_authenticated = True
-    assert lobby_service.can_bypass_lobby(room, user) is False
+    assert lobby_service.can_bypass_lobby(room, user, role=None) is False
+
+
+@pytest.mark.parametrize(
+    "role",
+    [RoleChoices.MEMBER, RoleChoices.ADMIN, RoleChoices.OWNER],
+)
+def test_can_bypass_lobby_private_room_with_any_role(role, lobby_service):
+    """Should return True for private rooms if the user is authenticated and has any role."""
+    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+
+    user = mock.Mock()
+    user.is_authenticated = True
+    assert lobby_service.can_bypass_lobby(room, user, role=role) is True


@mock.patch("core.utils.generate_livekit_config")
@@ -241,7 +255,7 @@ def test_request_entry_public_room(
 ):
    """Test requesting entry to a public room."""
    request = mock.Mock()
-    request.user = mock.Mock()
+    request.user = AnonymousUser()

    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)

@@ -266,8 +280,8 @@ def test_request_entry_public_room(
        username=username,
        color=participant.color,
        configuration=room.configuration,
-        is_admin_or_owner=False,
        participant_id="test-participant-id",
+        role=None,
    )

    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
@@ -279,8 +293,7 @@ def test_request_entry_trusted_room(
 ):
    """Test requesting entry to a trusted room when the user is authenticated."""
    request = mock.Mock()
-    request.user = mock.Mock()
-    request.user.is_authenticated = True
+    request.user = UserFactory()

    room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)

@@ -305,8 +318,8 @@ def test_request_entry_trusted_room(
        username=username,
        color=participant.color,
        configuration=room.configuration,
-        is_admin_or_owner=False,
        participant_id="test-participant-id",
+        role=None,
    )

    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
@@ -319,6 +332,7 @@ def test_request_entry_new_participant(
    """Test requesting entry for a new participant."""
    request = mock.Mock()
    request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
+    request.user = AnonymousUser()

    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)

@@ -348,6 +362,7 @@ def test_request_entry_waiting_participant(
    """Test requesting entry for a waiting participant."""
    request = mock.Mock()
    request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
+    request.user = AnonymousUser()

    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)

@@ -374,7 +389,7 @@ def test_request_entry_accepted_participant(
 ):
    """Test requesting entry for an accepted participant."""
    request = mock.Mock()
-    request.user = mock.Mock()
+    request.user = AnonymousUser()
    request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}

    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
@@ -400,8 +415,48 @@ def test_request_entry_accepted_participant(
        username=username,
        color="#123456",
        configuration=room.configuration,
-        is_admin_or_owner=False,
        participant_id="test-participant-id",
+        role=None,
+    )
+    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
+
+
+@mock.patch("core.utils.generate_livekit_config")
+def test_request_entry_participant_with_role(
+    mock_generate_config, lobby_service, participant_id, username
+):
+    """Test requesting entry for a participant with a role on the room."""
+    request = mock.Mock()
+    request.user = UserFactory()
+    request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
+
+    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+
+    UserResourceAccessFactory(resource=room, user=request.user, role="administrator")
+
+    mocked_participant = LobbyParticipant(
+        status=LobbyParticipantStatus.ACCEPTED,
+        username=username,
+        id=participant_id,
+        color="#123456",
+    )
+    lobby_service._get_or_create_participant_id = mock.Mock(return_value=participant_id)
+    lobby_service._get_participant = mock.Mock(return_value=mocked_participant)
+
+    mock_generate_config.return_value = {"token": "test-token"}
+
+    participant, livekit_config = lobby_service.request_entry(room, request, username)
+
+    assert participant.status == LobbyParticipantStatus.ACCEPTED
+    assert livekit_config == {"token": "test-token"}
+    mock_generate_config.assert_called_once_with(
+        room_id=str(room.id),
+        user=request.user,
+        username=username,
+        color="#123456",
+        configuration=room.configuration,
+        participant_id="test-participant-id",
+        role="administrator",
    )
    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)

@@ -0,0 +1,60 @@
+"""Tests for the RoomManagement service."""
+
+from unittest import mock
+
+import pytest
+from livekit.api import TwirpError
+
+from core.services.room_management import (
+    RoomManagement,
+    RoomManagementException,
+    RoomNotFoundException,
+)
+
+
+@mock.patch("core.services.room_management.utils.create_livekit_client")
+def test_delete_room_calls_livekit(mock_create_livekit_client):
+    """DeleteRoom is forwarded to the LiveKit API."""
+    mock_api = mock.MagicMock()
+    mock_api.room.delete_room = mock.AsyncMock()
+    mock_api.aclose = mock.AsyncMock()
+    mock_create_livekit_client.return_value = mock_api
+
+    RoomManagement().delete_room("room-abc")
+
+    mock_api.room.delete_room.assert_awaited_once()
+    request = mock_api.room.delete_room.await_args.args[0]
+    assert request.room == "room-abc"
+    mock_api.aclose.assert_awaited_once()
+
+
+@mock.patch("core.services.room_management.utils.create_livekit_client")
+def test_delete_room_raises_not_found(mock_create_livekit_client):
+    """Missing rooms raise RoomNotFoundException."""
+    mock_api = mock.MagicMock()
+    mock_api.room.delete_room = mock.AsyncMock(
+        side_effect=TwirpError("not_found", "room not found", status=404)
+    )
+    mock_api.aclose = mock.AsyncMock()
+    mock_create_livekit_client.return_value = mock_api
+
+    with pytest.raises(RoomNotFoundException):
+        RoomManagement().delete_room("missing-room")
+
+    mock_api.aclose.assert_awaited_once()
+
+
+@mock.patch("core.services.room_management.utils.create_livekit_client")
+def test_delete_room_raises_management_exception(mock_create_livekit_client):
+    """Unexpected Twirp errors raise RoomManagementException."""
+    mock_api = mock.MagicMock()
+    mock_api.room.delete_room = mock.AsyncMock(
+        side_effect=TwirpError("internal", "boom", status=500)
+    )
+    mock_api.aclose = mock.AsyncMock()
+    mock_create_livekit_client.return_value = mock_api
+
+    with pytest.raises(RoomManagementException):
+        RoomManagement().delete_room("room-abc")
+
+    mock_api.aclose.assert_awaited_once()
@@ -1,5 +1,5 @@
 """
-Test telephony service.
+Test SIP mamagement service.
 """

 # pylint: disable=W0212
@@ -20,7 +20,11 @@ from livekit.protocol.sip import (

 from core.factories import RoomFactory
 from core.models import RoomAccessLevel
-from core.services.telephony import TelephonyException, TelephonyService
+from core.services.sip_management import (
+    DispatchRuleConflictError,
+    SIPException,
+    SIPManagement,
+)

 pytestmark = pytest.mark.django_db

@@ -35,9 +39,9 @@ def create_mock_livekit_client():

 def test_rule_name():
    """Test rule name generation."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")
-    rule_name = telephony_service._rule_name(room.id)
+    rule_name = sip_management._rule_name(room.id)

    assert rule_name == f"SIP_{str(room.id)}"

@@ -45,14 +49,14 @@ def test_rule_name():
@mock.patch("core.utils.create_livekit_client")
 def test_create_dispatch_rule_success(mock_client_factory):
    """Test successful dispatch rule creation."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_api = create_mock_livekit_client()
    mock_api.sip.create_sip_dispatch_rule = mock.AsyncMock()
    mock_client_factory.return_value = mock_api

-    telephony_service.create_dispatch_rule(room)
+    sip_management.create_dispatch_rule(room)

    mock_api.sip.create_sip_dispatch_rule.assert_called_once()
    create_request = mock_api.sip.create_sip_dispatch_rule.call_args[1]["create"]
@@ -67,7 +71,7 @@ def test_create_dispatch_rule_success(mock_client_factory):
@mock.patch("core.utils.create_livekit_client")
 def test_create_dispatch_rule_api_failure(mock_client_factory):
    """Test dispatch rule creation when API fails."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_api = create_mock_livekit_client()
@@ -76,8 +80,8 @@ def test_create_dispatch_rule_api_failure(mock_client_factory):
    )
    mock_client_factory.return_value = mock_api

-    with pytest.raises(TelephonyException, match="Could not create dispatch rule"):
-        telephony_service.create_dispatch_rule(room)
+    with pytest.raises(SIPException, match="Could not create dispatch rule"):
+        sip_management.create_dispatch_rule(room)

    mock_api.sip.create_sip_dispatch_rule.assert_called_once()
    mock_api.aclose.assert_called_once()
@@ -86,7 +90,7 @@ def test_create_dispatch_rule_api_failure(mock_client_factory):
@mock.patch("core.utils.create_livekit_client")
 def test_list_dispatch_rules_ids_success(mock_client_factory):
    """Test successful listing of dispatch rule IDs."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_rules = [
@@ -111,7 +115,7 @@ def test_list_dispatch_rules_ids_success(mock_client_factory):
    )
    mock_client_factory.return_value = mock_api

-    result = async_to_sync(telephony_service._list_dispatch_rules_ids)(room.id)
+    result = async_to_sync(sip_management._list_dispatch_rules_ids)(room.id)

    assert len(result) == 2
    assert "rule-1" in result
@@ -127,7 +131,7 @@ def test_list_dispatch_rules_ids_success(mock_client_factory):
@mock.patch("core.utils.create_livekit_client")
 def test_list_dispatch_rules_ids_empty_response(mock_client_factory):
    """Test listing dispatch rule IDs when no rules exist."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_api = create_mock_livekit_client()
@@ -136,7 +140,7 @@ def test_list_dispatch_rules_ids_empty_response(mock_client_factory):
    )
    mock_client_factory.return_value = mock_api

-    result = async_to_sync(telephony_service._list_dispatch_rules_ids)(room.id)
+    result = async_to_sync(sip_management._list_dispatch_rules_ids)(room.id)

    assert result == []
    mock_api.aclose.assert_called_once()
@@ -145,7 +149,7 @@ def test_list_dispatch_rules_ids_empty_response(mock_client_factory):
@mock.patch("core.utils.create_livekit_client")
 def test_list_dispatch_rules_ids_no_matching_rules(mock_client_factory):
    """Test listing dispatch rule IDs when no rules match the room."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_rules = [
@@ -163,7 +167,7 @@ def test_list_dispatch_rules_ids_no_matching_rules(mock_client_factory):
    )
    mock_client_factory.return_value = mock_api

-    result = async_to_sync(telephony_service._list_dispatch_rules_ids)(room.id)
+    result = async_to_sync(sip_management._list_dispatch_rules_ids)(room.id)

    assert result == []
    mock_api.aclose.assert_called_once()
@@ -172,7 +176,7 @@ def test_list_dispatch_rules_ids_no_matching_rules(mock_client_factory):
@mock.patch("core.utils.create_livekit_client")
 def test_list_dispatch_rules_ids_api_failure(mock_client_factory):
    """Test listing dispatch rule IDs when API fails."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_api = create_mock_livekit_client()
@@ -181,34 +185,34 @@ def test_list_dispatch_rules_ids_api_failure(mock_client_factory):
    )
    mock_client_factory.return_value = mock_api

-    with pytest.raises(TelephonyException, match="Could not list dispatch rules"):
-        async_to_sync(telephony_service._list_dispatch_rules_ids)(room.id)
+    with pytest.raises(SIPException, match="Could not list dispatch rules"):
+        async_to_sync(sip_management._list_dispatch_rules_ids)(room.id)

    mock_api.sip.list_sip_dispatch_rule.assert_called_once()
    mock_api.aclose.assert_called_once()


-@mock.patch("core.services.telephony.TelephonyService._list_dispatch_rules_ids")
+@mock.patch("core.services.sip_management.SIPManagement._list_dispatch_rules_ids")
@mock.patch("core.utils.create_livekit_client")
 def test_delete_dispatch_rule_no_rules(mock_client_factory, mock_list_rules):
    """Test deleting dispatch rules when no rules exist."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_list_rules.return_value = []

-    result = telephony_service.delete_dispatch_rule(room.id)
+    result = sip_management.delete_dispatch_rule(room.id)

    assert result is False
    mock_list_rules.assert_called_once_with(room.id)
    mock_client_factory.assert_not_called()


-@mock.patch("core.services.telephony.TelephonyService._list_dispatch_rules_ids")
+@mock.patch("core.services.sip_management.SIPManagement._list_dispatch_rules_ids")
@mock.patch("core.utils.create_livekit_client")
 def test_delete_dispatch_rule_single_rule(mock_client_factory, mock_list_rules):
    """Test deleting a single dispatch rule."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_list_rules.return_value = ["rule-1"]
@@ -216,7 +220,7 @@ def test_delete_dispatch_rule_single_rule(mock_client_factory, mock_list_rules):
    mock_api.sip.delete_sip_dispatch_rule = mock.AsyncMock()
    mock_client_factory.return_value = mock_api

-    result = telephony_service.delete_dispatch_rule(room.id)
+    result = sip_management.delete_dispatch_rule(room.id)

    assert result is True
    mock_api.sip.delete_sip_dispatch_rule.assert_called_once()
@@ -226,11 +230,11 @@ def test_delete_dispatch_rule_single_rule(mock_client_factory, mock_list_rules):
    mock_api.aclose.assert_called_once()


-@mock.patch("core.services.telephony.TelephonyService._list_dispatch_rules_ids")
+@mock.patch("core.services.sip_management.SIPManagement._list_dispatch_rules_ids")
@mock.patch("core.utils.create_livekit_client")
 def test_delete_dispatch_rule_multiple_rules(mock_client_factory, mock_list_rules):
    """Test deleting multiple dispatch rules."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_list_rules.return_value = ["rule-1", "rule-2", "rule-3"]
@@ -238,7 +242,7 @@ def test_delete_dispatch_rule_multiple_rules(mock_client_factory, mock_list_rule
    mock_api.sip.delete_sip_dispatch_rule = mock.AsyncMock()
    mock_client_factory.return_value = mock_api

-    result = telephony_service.delete_dispatch_rule(room.id)
+    result = sip_management.delete_dispatch_rule(room.id)

    assert result is True
    assert mock_api.sip.delete_sip_dispatch_rule.call_count == 3
@@ -253,11 +257,11 @@ def test_delete_dispatch_rule_multiple_rules(mock_client_factory, mock_list_rule
    mock_api.aclose.assert_called_once()


-@mock.patch("core.services.telephony.TelephonyService._list_dispatch_rules_ids")
+@mock.patch("core.services.sip_management.SIPManagement._list_dispatch_rules_ids")
@mock.patch("core.utils.create_livekit_client")
 def test_delete_dispatch_rule_partial_failure(mock_client_factory, mock_list_rules):
    """Test deleting multiple dispatch rules when one deletion fails."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_list_rules.return_value = ["rule-1", "rule-2", "rule-3"]
@@ -277,18 +281,18 @@ def test_delete_dispatch_rule_partial_failure(mock_client_factory, mock_list_rul
    )
    mock_client_factory.return_value = mock_api

-    with pytest.raises(TelephonyException, match="Could not delete dispatch rules"):
-        telephony_service.delete_dispatch_rule(room.id)
+    with pytest.raises(SIPException, match="Could not delete dispatch rules"):
+        sip_management.delete_dispatch_rule(room.id)

    assert mock_api.sip.delete_sip_dispatch_rule.call_count == 2
    mock_api.aclose.assert_called_once()


-@mock.patch("core.services.telephony.TelephonyService._list_dispatch_rules_ids")
+@mock.patch("core.services.sip_management.SIPManagement._list_dispatch_rules_ids")
@mock.patch("core.utils.create_livekit_client")
 def test_delete_dispatch_rule_api_failure(mock_client_factory, mock_list_rules):
    """Test deleting dispatch rules when API fails immediately."""
-    telephony_service = TelephonyService()
+    sip_management = SIPManagement()
    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")

    mock_list_rules.return_value = ["rule-1"]
@@ -298,8 +302,131 @@ def test_delete_dispatch_rule_api_failure(mock_client_factory, mock_list_rules):
    )
    mock_client_factory.return_value = mock_api

-    with pytest.raises(TelephonyException, match="Could not delete dispatch rules"):
-        telephony_service.delete_dispatch_rule(room.id)
+    with pytest.raises(SIPException, match="Could not delete dispatch rules"):
+        sip_management.delete_dispatch_rule(room.id)

    mock_api.sip.delete_sip_dispatch_rule.assert_called_once()
    mock_api.aclose.assert_called_once()
+
+
+@mock.patch("core.utils.create_livekit_client")
+def test_create_dispatch_rule_conflict_raises_dedicated_error(mock_client_factory):
+    """Test that a LiveKit conflict error raises DispatchRuleConflictError."""
+    sip_management = SIPManagement()
+    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")
+
+    mock_api = create_mock_livekit_client()
+    mock_api.sip.create_sip_dispatch_rule = mock.AsyncMock(
+        side_effect=TwirpError(
+            msg=(
+                "Dispatch rule for the same trunk, inbound number, number, and "
+                "PIN combination already exists in dispatch rule"
+            ),
+            code="already_exists",
+            status=409,
+        )
+    )
+    mock_client_factory.return_value = mock_api
+
+    with pytest.raises(DispatchRuleConflictError):
+        sip_management.create_dispatch_rule(room)
+
+    mock_api.aclose.assert_called_once()
+
+
+@mock.patch("core.utils.create_livekit_client")
+def test_ensure_dispatch_rule_creates_when_missing(mock_client_factory):
+    """Test that ensure_dispatch_rule creates the rule when none exists."""
+    sip_management = SIPManagement()
+    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")
+
+    mock_api = create_mock_livekit_client()
+    mock_api.sip.list_sip_dispatch_rule = mock.AsyncMock(
+        return_value=ListSIPDispatchRuleResponse(items=[])
+    )
+    mock_api.sip.create_sip_dispatch_rule = mock.AsyncMock()
+    mock_client_factory.return_value = mock_api
+
+    created = sip_management.ensure_dispatch_rule(room)
+
+    assert created is True
+    mock_api.sip.create_sip_dispatch_rule.assert_called_once()
+    create_request = mock_api.sip.create_sip_dispatch_rule.call_args[1]["create"]
+
+    assert isinstance(create_request, CreateSIPDispatchRuleRequest)
+    assert create_request.name == f"SIP_{str(room.id)}"
+    assert create_request.rule.dispatch_rule_direct.room_name == str(room.id)
+    assert create_request.rule.dispatch_rule_direct.pin == str(room.pin_code)
+
+
+@mock.patch("core.utils.create_livekit_client")
+def test_ensure_dispatch_rule_skips_when_existing(mock_client_factory):
+    """Test that ensure_dispatch_rule is idempotent when the rule already exists."""
+    sip_management = SIPManagement()
+    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")
+
+    existing_rule = SIPDispatchRuleInfo(
+        sip_dispatch_rule_id="rule-1", name=f"SIP_{str(room.id)}"
+    )
+    mock_api = create_mock_livekit_client()
+    mock_api.sip.list_sip_dispatch_rule = mock.AsyncMock(
+        return_value=ListSIPDispatchRuleResponse(items=[existing_rule])
+    )
+    mock_api.sip.create_sip_dispatch_rule = mock.AsyncMock()
+    mock_client_factory.return_value = mock_api
+
+    created = sip_management.ensure_dispatch_rule(room)
+
+    assert created is False
+    mock_api.sip.create_sip_dispatch_rule.assert_not_called()
+
+
+@mock.patch("core.utils.create_livekit_client")
+def test_ensure_dispatch_rule_returns_false_on_conflict(mock_client_factory):
+    """Test that ensure_dispatch_rule tolerates a concurrent rule creation.
+
+    If the rule is created by a concurrent caller (e.g. the LiveKit webhook)
+    between the existence check and the creation, LiveKit rejects the
+    duplicate and ensure_dispatch_rule reports the rule as already existing.
+    """
+    sip_management = SIPManagement()
+    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")
+
+    mock_api = create_mock_livekit_client()
+    mock_api.sip.list_sip_dispatch_rule = mock.AsyncMock(
+        return_value=ListSIPDispatchRuleResponse(items=[])
+    )
+    mock_api.sip.create_sip_dispatch_rule = mock.AsyncMock(
+        side_effect=TwirpError(
+            msg=(
+                "Dispatch rule for the same trunk, inbound number, number, and "
+                "PIN combination already exists in dispatch rule"
+            ),
+            code="already_exists",
+            status=409,
+        )
+    )
+    mock_client_factory.return_value = mock_api
+
+    created = sip_management.ensure_dispatch_rule(room)
+
+    assert created is False
+
+
+@mock.patch("core.utils.create_livekit_client")
+def test_ensure_dispatch_rule_raises_on_other_failures(mock_client_factory):
+    """Test that ensure_dispatch_rule propagates unexpected LiveKit failures."""
+    sip_management = SIPManagement()
+    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED, pin_code="1234")
+
+    mock_api = create_mock_livekit_client()
+    mock_api.sip.list_sip_dispatch_rule = mock.AsyncMock(
+        return_value=ListSIPDispatchRuleResponse(items=[])
+    )
+    mock_api.sip.create_sip_dispatch_rule = mock.AsyncMock(
+        side_effect=TwirpError(msg="Internal server error", code="unknown", status=500)
+    )
+    mock_client_factory.return_value = mock_api
+
+    with pytest.raises(SIPException, match="Could not create dispatch rule"):
+        sip_management.ensure_dispatch_rule(room)
@@ -0,0 +1,51 @@
+"""Tests for connection test Celery tasks."""
+
+from unittest import mock
+
+from django.test.utils import override_settings
+
+from core.services.room_management import (
+    RoomManagementException,
+    RoomNotFoundException,
+)
+from core.tasks.connection_test import delete_connection_test_room
+
+
+@mock.patch("core.tasks.connection_test.RoomManagement.delete_room")
+def test_delete_connection_test_room_calls_room_management(mock_delete_room, settings):
+    """RoomManagement.delete_room is called for connection-test rooms."""
+    settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
+    delete_connection_test_room("connection-test-abc")
+
+    mock_delete_room.assert_called_once_with("connection-test-abc")
+
+
+@mock.patch("core.tasks.connection_test.RoomManagement.delete_room")
+def test_delete_connection_test_room_refuses_other_rooms(mock_delete_room, settings):
+    """Refuse to delete rooms outside the connection-test namespace."""
+    settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
+    delete_connection_test_room("production-room")
+
+    mock_delete_room.assert_not_called()
+
+
+@mock.patch("core.tasks.connection_test.RoomManagement.delete_room")
+def test_delete_connection_test_room_ignores_missing_room(mock_delete_room, settings):
+    """Missing rooms are treated as already cleaned up."""
+    settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
+    mock_delete_room.side_effect = RoomNotFoundException("Room does not exist")
+
+    delete_connection_test_room("connection-test-gone")
+
+    mock_delete_room.assert_called_once_with("connection-test-gone")
+
+
+@mock.patch("core.tasks.connection_test.RoomManagement.delete_room")
+def test_delete_connection_test_room_logs_other_failures(mock_delete_room, settings):
+    """Unexpected LiveKit failures are swallowed after logging."""
+    settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
+    mock_delete_room.side_effect = RoomManagementException("Could not delete room")
+
+    delete_connection_test_room("connection-test-fail")
+
+    mock_delete_room.assert_called_once_with("connection-test-fail")
@@ -0,0 +1,166 @@
+"""Test diagnostics API endpoints."""
+
+import uuid
+from unittest import mock
+
+from django.test.utils import override_settings
+from django.urls import reverse
+
+import jwt
+import pytest
+from rest_framework.test import APIClient
+
+from core.api.throttling import (
+    ConnectionTestAnonRateThrottle,
+    ConnectionTestUserRateThrottle,
+)
+from core.factories import UserFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def test_api_diagnostics_connection_url():
+    """The connection check is exposed under the diagnostics namespace."""
+    assert reverse("diagnostics-connection") == "/api/v1.0/diagnostics/connection/"
+
+
+def test_api_diagnostics_connection_rejects_get():
+    """Only POST is exposed, the endpoint has no side effect to trigger."""
+    client = APIClient()
+    response = client.get("/api/v1.0/diagnostics/connection/")
+
+    assert response.status_code == 405
+
+
+def test_api_diagnostics_connection_returns_ephemeral_livekit_config(settings, client):
+    """Each request gets a dedicated room and a short-lived token."""
+
+    settings.CONNECTION_TEST_TOKEN_TTL_SECONDS = 600
+    settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
+
+    response_a = client.post("/api/v1.0/diagnostics/connection/")
+    response_b = client.post("/api/v1.0/diagnostics/connection/")
+
+    assert response_a.status_code == 200
+    assert response_b.status_code == 200
+
+    data_a = response_a.json()
+    data_b = response_b.json()
+
+    room_a = data_a["livekit"]["room"]
+    room_b = data_b["livekit"]["room"]
+
+    assert room_a.startswith("connection-test-")
+    assert room_b.startswith("connection-test-")
+    uuid.UUID(room_a.removeprefix("connection-test-"))
+    uuid.UUID(room_b.removeprefix("connection-test-"))
+    assert room_a != room_b
+    assert data_a["livekit"]["url"]
+    assert data_a["livekit"]["token"]
+    assert data_a["livekit"]["expires_in"] == 600
+    assert data_a["livekit"]["token"] != data_b["livekit"]["token"]
+
+
+def test_api_diagnostics_connection_token_is_short_lived_for_user(settings, client):
+    """Connection test tokens expire quickly for users."""
+
+    settings.CONNECTION_TEST_TOKEN_TTL_SECONDS = 300
+
+    client = APIClient()
+    response = client.post("/api/v1.0/diagnostics/connection/")
+
+    assert response.status_code == 200
+
+    config = response.json()["livekit"]
+    payload = jwt.decode(
+        config["token"],
+        settings.LIVEKIT_CONFIGURATION["api_secret"],
+        algorithms=["HS256"],
+        options={"verify_exp": False},
+    )
+
+    assert config["expires_in"] == 300
+    assert payload["video"]["room"] == config["room"]
+    assert payload["name"] == "Connection Test"
+    assert payload["video"]["roomAdmin"] is False
+    assert payload["exp"] - payload["nbf"] == 300
+
+
+@override_settings()
+def test_api_diagnostics_connection_token_for_authenticated_user(settings, client):
+    """Logged-in users get a token bound to their own identity."""
+
+    settings.CONNECTION_TEST_TOKEN_TTL_SECONDS = 300
+
+    user = UserFactory()
+    client.force_login(user)
+
+    response = client.post("/api/v1.0/diagnostics/connection/")
+
+    assert response.status_code == 200
+
+    payload = jwt.decode(
+        response.json()["livekit"]["token"],
+        settings.LIVEKIT_CONFIGURATION["api_secret"],
+        algorithms=["HS256"],
+        options={"verify_exp": False},
+    )
+
+    assert payload["sub"] == str(user.sub)
+    assert payload["video"]["roomAdmin"] is False
+    assert payload["exp"] - payload["nbf"] == 300
+
+
+@mock.patch("core.api.viewsets.delete_connection_test_room.apply_async")
+def test_api_diagnostics_connection_schedules_room_deletion(
+    mock_apply_async, settings, client
+):
+    """When Celery is enabled, schedule a hard room delete after max age."""
+
+    settings.CELERY_ENABLED = True
+    settings.CONNECTION_TEST_TOKEN_TTL_SECONDS = 300
+    settings.CONNECTION_TEST_ROOM_EXTRA_AGE_SECONDS = 10
+    settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
+
+    response = client.post("/api/v1.0/diagnostics/connection/")
+
+    assert response.status_code == 200
+    room = response.json()["livekit"]["room"]
+    mock_apply_async.assert_called_once_with(args=[room], countdown=310)
+
+
+@mock.patch("core.api.viewsets.delete_connection_test_room.apply_async")
+def test_api_diagnostics_connection_skips_room_deletion_without_celery(
+    mock_apply_async, settings, client
+):
+    """Without Celery, do not schedule deletion (apply_async would run immediately)."""
+
+    settings.CELERY_ENABLED = False
+    response = client.post("/api/v1.0/diagnostics/connection/")
+
+    assert response.status_code == 200
+    mock_apply_async.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    "throttle_class",
+    [ConnectionTestAnonRateThrottle, ConnectionTestUserRateThrottle],
+)
+def test_api_diagnostics_connection_is_throttled(throttle_class, client):
+    """Both throttles stay wired to the action once routed through the viewset."""
+    with (
+        mock.patch.object(throttle_class, "allow_request", return_value=False),
+        mock.patch.object(throttle_class, "wait", return_value=42),
+    ):
+        response = client.post("/api/v1.0/diagnostics/connection/")
+
+    assert response.status_code == 429
+
+
+def test_api_diagnostics_connection_feature_flag(client, settings):
+    """Should return a not found error when the connection diagnostics feature is disabled."""
+
+    settings.CONNECTION_TEST_ENABLED = False
+
+    response = client.post("/api/v1.0/diagnostics/connection/")
+    assert response.status_code == 404
@@ -119,6 +119,8 @@ def test_api_users_retrieve_me_authenticated(settings):

    assert response.status_code == 200
    assert response.json() == {
+        "default_room_access_level": None,
+        "default_room_configuration": {},
        "id": str(user.id),
        "email": user.email,
        "full_name": user.full_name,
@@ -0,0 +1,111 @@
+"""
+Test the default room preferences exposed on the users API.
+"""
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories
+
+pytestmark = pytest.mark.django_db
+
+
+def test_api_users_me_includes_default_room_preferences():
+    """The "me" endpoint should expose the user's default room preferences."""
+    user = factories.UserFactory(
+        default_room_access_level="restricted",
+        default_room_configuration={"everyone_can_mute": False},
+    )
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.get("/api/v1.0/users/me/")
+
+    assert response.status_code == 200
+    content = response.json()
+    assert content["default_room_access_level"] == "restricted"
+    assert content["default_room_configuration"] == {"everyone_can_mute": False}
+
+
+def test_api_users_update_default_room_preferences():
+    """Users should be able to update their own default room preferences."""
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.patch(
+        f"/api/v1.0/users/{user.id!s}/",
+        {
+            "default_room_access_level": "trusted",
+            "default_room_configuration": {
+                "can_publish_sources": ["microphone", "camera"],
+                "everyone_can_mute": False,
+            },
+        },
+        format="json",
+    )
+
+    assert response.status_code == 200
+    user.refresh_from_db()
+    assert user.default_room_access_level == "trusted"
+    assert user.default_room_configuration == {
+        "can_publish_sources": ["microphone", "camera"],
+        "everyone_can_mute": False,
+    }
+
+
+def test_api_users_update_default_room_access_level_invalid():
+    """An invalid access level should be rejected."""
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.patch(
+        f"/api/v1.0/users/{user.id!s}/",
+        {"default_room_access_level": "invalid"},
+        format="json",
+    )
+
+    assert response.status_code == 400
+    user.refresh_from_db()
+    assert user.default_room_access_level is None
+
+
+def test_api_users_update_default_room_configuration_invalid():
+    """An invalid room configuration should be rejected."""
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.patch(
+        f"/api/v1.0/users/{user.id!s}/",
+        {"default_room_configuration": {"unknown_field": True}},
+        format="json",
+    )
+
+    assert response.status_code == 400
+    user.refresh_from_db()
+    assert user.default_room_configuration == {}
+
+
+def test_api_users_update_other_user_default_room_preferences_forbidden():
+    """Users should not be able to update someone else's preferences."""
+    user = factories.UserFactory()
+    other_user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.patch(
+        f"/api/v1.0/users/{other_user.id!s}/",
+        {"default_room_access_level": "restricted"},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    other_user.refresh_from_db()
+    assert other_user.default_room_access_level is None
@@ -184,12 +184,13 @@ def test_models_rooms_is_public_property():


@mock.patch.object(Room, "generate_unique_pin_code")
-def test_telephony_disabled_skips_pin_generation(
+def test_telephony_and_roomkit_disabled_skips_pin_generation(
    mock_generate_unique_pin_code, settings
 ):
-    """Telephony disabled should not generate pin codes."""
+    """Telephony and roomkit both disabled should not generate pin codes."""

    settings.ROOM_TELEPHONY_ENABLED = False
+    settings.ROOMKIT_ENABLED = False

    room = RoomFactory()

@@ -197,6 +198,18 @@ def test_telephony_disabled_skips_pin_generation(
    assert room.pin_code is None


+def test_roomkit_enabled_generates_pin_code(settings):
+    """Roomkit enabled alone should generate pin codes, even without telephony."""
+
+    settings.ROOM_TELEPHONY_ENABLED = False
+    settings.ROOMKIT_ENABLED = True
+
+    room = RoomFactory()
+
+    assert room.pin_code is not None
+    assert len(room.pin_code) == settings.ROOM_TELEPHONY_PIN_LENGTH
+
+
 def test_default_and_custom_pin_length(settings):
    """Pin codes should be created with correct configured length."""

@@ -2,13 +2,109 @@
 Test utils functions
 """

+# pylint: disable=W0621
 import json
 from unittest import mock

+from django.conf import settings
+from django.contrib.auth.models import AnonymousUser
+
+import jwt
 import pytest
 from livekit.api import TwirpError

-from core.utils import NotificationError, create_livekit_client, notify_participants
+from core.factories import UserFactory
+from core.utils import (
+    NotificationError,
+    create_livekit_client,
+    generate_token,
+    notify_participants,
+)
+
+pytestmark = pytest.mark.django_db
+
+
+def decode_token(token: str) -> dict:
+    """Decode a LiveKit JWT access token for inspection."""
+    return jwt.decode(
+        token,
+        settings.LIVEKIT_CONFIGURATION["api_secret"],
+        algorithms=["HS256"],
+    )
+
+
+def test_generate_token_authenticated_uses_full_name():
+    """The token's display name should default to the user's full name."""
+    user = UserFactory(full_name="Jane Doe")
+
+    token = generate_token(room="my-room", user=user)
+
+    claims = decode_token(token)
+    assert claims["name"] == "Jane Doe"
+    assert claims["sub"] == str(user.sub)
+
+
+def test_generate_token_authenticated_fallback_user_representation():
+    """
+    When the user has no full name, the token's display name should fall back
+    to the user's string representation.
+    """
+    user = UserFactory(full_name=None)
+
+    token = generate_token(room="my-room", user=user)
+
+    claims = decode_token(token)
+    assert claims["name"] == str(user)
+
+
+def test_generate_token_explicit_username_overrides_default():
+    """An explicitly provided username should take precedence over the full name."""
+    user = UserFactory(full_name="Jane Doe")
+
+    token = generate_token(room="my-room", user=user, username="Custom Name")
+
+    claims = decode_token(token)
+    assert claims["name"] == "Custom Name"
+
+
+def test_authenticated_username_ignored_when_editing_disabled(settings):
+    """With editing disabled, an authenticated user's username is ignored."""
+    settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME = False
+    user = UserFactory(full_name="Jane Doe")
+    token = generate_token(room="my-room", user=user, username="Custom Name")
+    claims = decode_token(token)
+    assert claims["name"] == "Jane Doe"
+
+
+def test_authenticated_default_name_unaffected_when_editing_disabled(settings):
+    """Disabling editing doesn't disturb the default full-name path."""
+    settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME = False
+    user = UserFactory(full_name="Jane Doe")
+    token = generate_token(room="my-room", user=user)
+    claims = decode_token(token)
+    assert claims["name"] == "Jane Doe"
+
+
+def test_anonymous_uses_username_when_provided():
+    """An anonymous user's provided username is used as the display name."""
+    token = generate_token(room="my-room", user=AnonymousUser(), username="Guest42")
+    claims = decode_token(token)
+    assert claims["name"] == "Guest42"
+
+
+def test_anonymous_username_used_even_when_editing_disabled(settings):
+    """The setting governs authenticated users only; anonymous can still set a name."""
+    settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME = False
+    token = generate_token(room="my-room", user=AnonymousUser(), username="Guest42")
+    claims = decode_token(token)
+    assert claims["name"] == "Guest42"
+
+
+def test_anonymous_falls_back_to_anonymous_label():
+    """With no username, an anonymous user is labelled 'Anonymous'."""
+    token = generate_token(room="my-room", user=AnonymousUser())
+    claims = decode_token(token)
+    assert claims["name"] == "Anonymous"


@mock.patch("asyncio.get_running_loop")
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`"""Meet core roomkit API endpoints for meeting-room (SIP) device integration."""`
				`@@ -0,0 +1 @@`
				`"""Tests for the roomkit API of the Meet core app."""`