fix typing

tweaks
i18n generation
2026-02-27 19:57:54 -05:00 · 2026-02-27 16:54:50 -06:00 · 2026-02-27 16:37:54 -06:00 · 2026-02-27 16:26:37 -06:00 · 2026-02-27 16:25:43 -06:00 · 2026-02-27 16:19:47 -06:00
272 changed files with 27635 additions and 5710 deletions
--- a/.cspell/frigate-dictionary.txt
+++ b/.cspell/frigate-dictionary.txt
@@ -229,6 +229,7 @@ Reolink
 restream
 restreamed
 restreaming
+RJSF
 rkmpp
 rknn
 rkrga
--- a/docs/docs/configuration/genai/config.md
+++ b/docs/docs/configuration/genai/config.md
@@ -5,96 +5,72 @@ title: Configuring Generative AI

 ## Configuration

-A Generative AI provider can be configured in the global config, which will make the Generative AI features available for use. There are currently 4 native providers available to integrate with Frigate. Other providers that support the OpenAI standard API can also be used. See the OpenAI-Compatible section below.
+A Generative AI provider can be configured in the global config, which will make the Generative AI features available for use. There are currently 4 native providers available to integrate with Frigate. Other providers that support the OpenAI standard API can also be used. See the OpenAI section below.

 To use Generative AI, you must define a single provider at the global level of your Frigate configuration. If the provider you choose requires an API key, you may either directly paste it in your configuration, or store it in an environment variable prefixed with `FRIGATE_`.

-## Local Providers
-
-Local providers run on your own hardware and keep all data processing private. These require a GPU or dedicated hardware for best performance.
+## Ollama

 :::warning

-Running Generative AI models on CPU is not recommended, as high inference times make using Generative AI impractical.
+Using Ollama on CPU is not recommended, high inference times make using Generative AI impractical.

 :::

-### Recommended Local Models
-
-You must use a vision-capable model with Frigate. The following models are recommended for local deployment:
-
-| Model         | Notes                                                                                                                                                                |
-| ------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `qwen3-vl`    | Strong visual and situational understanding, strong ability to identify smaller objects and interactions with object.                                                |
-| `qwen3.5`     | Strong situational understanding, but missing DeepStack from qwen3-vl leading to worse performance for identifying objects in people's hand and other small details. |
-| `Intern3.5VL` | Relatively fast with good vision comprehension                                                                                                                       |
-| `gemma3`      | Slower model with good vision and temporal understanding                                                                                                             |
-| `qwen2.5-vl`  | Fast but capable model with good vision comprehension                                                                                                                |
-
-:::info
-
-Each model is available in multiple parameter sizes (3b, 4b, 8b, etc.). Larger sizes are more capable of complex tasks and understanding of situations, but requires more memory and computational resources. It is recommended to try multiple models and experiment to see which performs best.
-
-:::
-
-:::note
-
-You should have at least 8 GB of RAM available (or VRAM if running on GPU) to run the 7B models, 16 GB to run the 13B models, and 24 GB to run the 33B models.
-
-:::
-
-### Model Types: Instruct vs Thinking
-
-Most vision-language models are available as **instruct** models, which are fine-tuned to follow instructions and respond concisely to prompts. However, some models (such as certain Qwen-VL or minigpt variants) offer both **instruct** and **thinking** versions.
-
- **Instruct models** are always recommended for use with Frigate. These models generate direct, relevant, actionable descriptions that best fit Frigate's object and event summary use case.
- **Reasoning / Thinking models** are fine-tuned for more free-form, open-ended, and speculative outputs, which are typically not concise and may not provide the practical summaries Frigate expects. For this reason, Frigate does **not** recommend or support using thinking models.
-
-Some models are labeled as **hybrid** (capable of both thinking and instruct tasks). In these cases, it is recommended to disable reasoning / thinking, which is generally model specific (see your models documentation).
-
-**Recommendation:**
-Always select the `-instruct` or documented instruct/tagged variant of any model you use in your Frigate configuration. If in doubt, refer to your model provider's documentation or model library for guidance on the correct model variant to use.
-
-### llama.cpp
-
-[llama.cpp](https://github.com/ggml-org/llama.cpp) is a C++ implementation of LLaMA that provides a high-performance inference server.
-
-It is highly recommended to host the llama.cpp server on a machine with a discrete graphics card, or on an Apple silicon Mac for best performance.
-
-#### Supported Models
-
-You must use a vision capable model with Frigate. The llama.cpp server supports various vision models in GGUF format.
-
-#### Configuration
-
-All llama.cpp native options can be passed through `provider_options`, including `temperature`, `top_k`, `top_p`, `min_p`, `repeat_penalty`, `repeat_last_n`, `seed`, `grammar`, and more. See the [llama.cpp server documentation](https://github.com/ggml-org/llama.cpp/blob/master/tools/server/README.md) for a complete list of available parameters.
-
-```yaml
-genai:
-  provider: llamacpp
-  base_url: http://localhost:8080
-  model: your-model-name
-  provider_options:
-    context_size: 16000 # Tell Frigate your context size so it can send the appropriate amount of information.
-```
-
-### Ollama
-
 [Ollama](https://ollama.com/) allows you to self-host large language models and keep everything running locally. It is highly recommended to host this server on a machine with an Nvidia graphics card, or on a Apple silicon Mac for best performance.

 Most of the 7b parameter 4-bit vision models will fit inside 8GB of VRAM. There is also a [Docker container](https://hub.docker.com/r/ollama/ollama) available.

 Parallel requests also come with some caveats. You will need to set `OLLAMA_NUM_PARALLEL=1` and choose a `OLLAMA_MAX_QUEUE` and `OLLAMA_MAX_LOADED_MODELS` values that are appropriate for your hardware and preferences. See the [Ollama documentation](https://docs.ollama.com/faq#how-does-ollama-handle-concurrent-requests).

+### Model Types: Instruct vs Thinking
+
+Most vision-language models are available as **instruct** models, which are fine-tuned to follow instructions and respond concisely to prompts. However, some models (such as certain Qwen-VL or minigpt variants) offer both **instruct** and **thinking** versions.
+
+- **Instruct models** are always recommended for use with Frigate. These models generate direct, relevant, actionable descriptions that best fit Frigate's object and event summary use case.
+- **Thinking models** are fine-tuned for more free-form, open-ended, and speculative outputs, which are typically not concise and may not provide the practical summaries Frigate expects. For this reason, Frigate does **not** recommend or support using thinking models.
+
+Some models are labeled as **hybrid** (capable of both thinking and instruct tasks). In these cases, Frigate will always use instruct-style prompts and specifically disables thinking-mode behaviors to ensure concise, useful responses.
+
+**Recommendation:**
+Always select the `-instruct` or documented instruct/tagged variant of any model you use in your Frigate configuration. If in doubt, refer to your model provider’s documentation or model library for guidance on the correct model variant to use.
+
+### Supported Models
+
+You must use a vision capable model with Frigate. Current model variants can be found [in their model library](https://ollama.com/library). Note that Frigate will not automatically download the model you specify in your config, Ollama will try to download the model but it may take longer than the timeout, it is recommended to pull the model beforehand by running `ollama pull your_model` on your Ollama server/Docker container. Note that the model specified in Frigate's config must match the downloaded model tag.
+
+:::info
+
+Each model is available in multiple parameter sizes (3b, 4b, 8b, etc.). Larger sizes are more capable of complex tasks and understanding of situations, but requires more memory and computational resources. It is recommended to try multiple models and experiment to see which performs best.
+
+:::
+
 :::tip

 If you are trying to use a single model for Frigate and HomeAssistant, it will need to support vision and tools calling. qwen3-VL supports vision and tools simultaneously in Ollama.

 :::

-Note that Frigate will not automatically download the model you specify in your config. Ollama will try to download the model but it may take longer than the timeout, so it is recommended to pull the model beforehand by running `ollama pull your_model` on your Ollama server/Docker container. The model specified in Frigate's config must match the downloaded model tag.
+The following models are recommended:

-#### Configuration
+| Model         | Notes                                                                |
+| ------------- | -------------------------------------------------------------------- |
+| `qwen3-vl`    | Strong visual and situational understanding, higher vram requirement |
+| `Intern3.5VL` | Relatively fast with good vision comprehension                       |
+| `gemma3`      | Strong frame-to-frame understanding, slower inference times          |
+| `qwen2.5-vl`  | Fast but capable model with good vision comprehension                |
+
+:::note
+
+You should have at least 8 GB of RAM available (or VRAM if running on GPU) to run the 7B models, 16 GB to run the 13B models, and 32 GB to run the 33B models.
+
+:::
+
+#### Ollama Cloud models
+
+Ollama also supports [cloud models](https://ollama.com/cloud), where your local Ollama instance handles requests from Frigate, but model inference is performed in the cloud. Set up Ollama locally, sign in with your Ollama account, and specify the cloud model name in your Frigate config. For more details, see the Ollama cloud model [docs](https://docs.ollama.com/cloud).
+
+### Configuration

 ```yaml
 genai:
@@ -107,65 +83,49 @@ genai:
      num_ctx: 8192 # make sure the context matches other services that are using ollama
 ```

-### OpenAI-Compatible
+## llama.cpp

-Frigate supports any provider that implements the OpenAI API standard. This includes self-hosted solutions like [vLLM](https://docs.vllm.ai/), [LocalAI](https://localai.io/), and other OpenAI-compatible servers.
+[llama.cpp](https://github.com/ggml-org/llama.cpp) is a C++ implementation of LLaMA that provides a high-performance inference server. Using llama.cpp directly gives you access to all native llama.cpp options and parameters.

-:::tip
+:::warning

-For OpenAI-compatible servers (such as llama.cpp) that don't expose the configured context size in the API response, you can manually specify the context size in `provider_options`:
-
-```yaml
-genai:
-  provider: openai
-  base_url: http://your-llama-server
-  model: your-model-name
-  provider_options:
-    context_size: 8192 # Specify the configured context size
-```
-
-This ensures Frigate uses the correct context window size when generating prompts.
+Using llama.cpp on CPU is not recommended, high inference times make using Generative AI impractical.

 :::

-#### Configuration
+It is highly recommended to host the llama.cpp server on a machine with a discrete graphics card, or on an Apple silicon Mac for best performance.
+
+### Supported Models
+
+You must use a vision capable model with Frigate. The llama.cpp server supports various vision models in GGUF format.
+
+### Configuration

 ```yaml
 genai:
-  provider: openai
-  base_url: http://your-server:port
-  api_key: your-api-key # May not be required for local servers
+  provider: llamacpp
+  base_url: http://localhost:8080
  model: your-model-name
+  provider_options:
+    temperature: 0.7
+    repeat_penalty: 1.05
+    top_p: 0.8
+    top_k: 40
+    min_p: 0.05
+    seed: -1
 ```

-To use a different OpenAI-compatible API endpoint, set the `OPENAI_BASE_URL` environment variable to your provider's API URL.
+All llama.cpp native options can be passed through `provider_options`, including `temperature`, `top_k`, `top_p`, `min_p`, `repeat_penalty`, `repeat_last_n`, `seed`, `grammar`, and more. See the [llama.cpp server documentation](https://github.com/ggml-org/llama.cpp/blob/master/tools/server/README.md) for a complete list of available parameters.

-## Cloud Providers
-
-Cloud providers run on remote infrastructure and require an API key for authentication. These services handle all model inference on their servers.
-
-### Ollama Cloud
-
-Ollama also supports [cloud models](https://ollama.com/cloud), where your local Ollama instance handles requests from Frigate, but model inference is performed in the cloud. Set up Ollama locally, sign in with your Ollama account, and specify the cloud model name in your Frigate config. For more details, see the Ollama cloud model [docs](https://docs.ollama.com/cloud).
-
-#### Configuration
-
-```yaml
-genai:
-  provider: ollama
-  base_url: http://localhost:11434
-  model: cloud-model-name
-```
-
-### Google Gemini
+## Google Gemini

 Google Gemini has a [free tier](https://ai.google.dev/pricing) for the API, however the limits may not be sufficient for standard Frigate usage. Choose a plan appropriate for your installation.

-#### Supported Models
+### Supported Models

 You must use a vision capable model with Frigate. Current model variants can be found [in their documentation](https://ai.google.dev/gemini-api/docs/models/gemini).

-#### Get API Key
+### Get API Key

 To start using Gemini, you must first get an API key from [Google AI Studio](https://aistudio.google.com).

@@ -174,7 +134,7 @@ To start using Gemini, you must first get an API key from [Google AI Studio](htt
 3. Click "Create API key in new project"
 4. Copy the API key for use in your config

-#### Configuration
+### Configuration

 ```yaml
 genai:
@@ -199,19 +159,19 @@ Other HTTP options are available, see the [python-genai documentation](https://g

 :::

-### OpenAI
+## OpenAI

 OpenAI does not have a free tier for their API. With the release of gpt-4o, pricing has been reduced and each generation should cost fractions of a cent if you choose to go this route.

-#### Supported Models
+### Supported Models

 You must use a vision capable model with Frigate. Current model variants can be found [in their documentation](https://platform.openai.com/docs/models).

-#### Get API Key
+### Get API Key

 To start using OpenAI, you must first [create an API key](https://platform.openai.com/api-keys) and [configure billing](https://platform.openai.com/settings/organization/billing/overview).

-#### Configuration
+### Configuration

 ```yaml
 genai:
@@ -220,19 +180,42 @@ genai:
  model: gpt-4o
 ```

-### Azure OpenAI
+:::note
+
+To use a different OpenAI-compatible API endpoint, set the `OPENAI_BASE_URL` environment variable to your provider's API URL.
+
+:::
+
+:::tip
+
+For OpenAI-compatible servers (such as llama.cpp) that don't expose the configured context size in the API response, you can manually specify the context size in `provider_options`:
+
+```yaml
+genai:
+  provider: openai
+  base_url: http://your-llama-server
+  model: your-model-name
+  provider_options:
+    context_size: 8192 # Specify the configured context size
+```
+
+This ensures Frigate uses the correct context window size when generating prompts.
+
+:::
+
+## Azure OpenAI

 Microsoft offers several vision models through Azure OpenAI. A subscription is required.

-#### Supported Models
+### Supported Models

 You must use a vision capable model with Frigate. Current model variants can be found [in their documentation](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models).

-#### Create Resource and Get API Key
+### Create Resource and Get API Key

 To start using Azure OpenAI, you must first [create a resource](https://learn.microsoft.com/azure/cognitive-services/openai/how-to/create-resource?pivots=web-portal#create-a-resource). You'll need your API key, model name, and resource URL, which must include the `api-version` parameter (see the example below).

-#### Configuration
+### Configuration

 ```yaml
 genai:
@@ -240,4 +223,4 @@ genai:
  base_url: https://instance.cognitiveservices.azure.com/openai/responses?api-version=2025-04-01-preview
  model: gpt-5-mini
  api_key: "{FRIGATE_OPENAI_API_KEY}"
-```
+```
--- a/docs/docs/configuration/hardware_acceleration_enrichments.md
+++ b/docs/docs/configuration/hardware_acceleration_enrichments.md
@@ -12,23 +12,20 @@ Some of Frigate's enrichments can use a discrete GPU or integrated GPU for accel
 Object detection and enrichments (like Semantic Search, Face Recognition, and License Plate Recognition) are independent features. To use a GPU / NPU for object detection, see the [Object Detectors](/configuration/object_detectors.md) documentation. If you want to use your GPU for any supported enrichments, you must choose the appropriate Frigate Docker image for your GPU / NPU and configure the enrichment according to its specific documentation.

 - **AMD**
-
  - ROCm support in the `-rocm` Frigate image is automatically detected for enrichments, but only some enrichment models are available due to ROCm's focus on LLMs and limited stability with certain neural network models. Frigate disables models that perform poorly or are unstable to ensure reliable operation, so only compatible enrichments may be active.

 - **Intel**
-
  - OpenVINO will automatically be detected and used for enrichments in the default Frigate image.
  - **Note:** Intel NPUs have limited model support for enrichments. GPU is recommended for enrichments when available.

 - **Nvidia**
-
  - Nvidia GPUs will automatically be detected and used for enrichments in the `-tensorrt` Frigate image.
  - Jetson devices will automatically be detected and used for enrichments in the `-tensorrt-jp6` Frigate image.

 - **RockChip**
  - RockChip NPU will automatically be detected and used for semantic search v1 and face recognition in the `-rk` Frigate image.

-Utilizing a GPU for enrichments does not require you to use the same GPU for object detection. For example, you can run the `tensorrt` Docker image for enrichments and still use other dedicated hardware like a Coral or Hailo for object detection. However, one combination that is not supported is TensorRT for object detection and OpenVINO for enrichments.
+Utilizing a GPU for enrichments does not require you to use the same GPU for object detection. For example, you can run the `tensorrt` Docker image to run enrichments on an Nvidia GPU and still use other dedicated hardware like a Coral or Hailo for object detection. However, one combination that is not supported is the `tensorrt` image for object detection on an Nvidia GPU and Intel iGPU for enrichments.

 :::note

--- a/docs/docs/configuration/index.md
+++ b/docs/docs/configuration/index.md
@@ -29,12 +29,12 @@ cameras:

 When running Frigate through the HA Add-on, the Frigate `/config` directory is mapped to `/addon_configs/<addon_directory>` in the host, where `<addon_directory>` is specific to the variant of the Frigate Add-on you are running.

-| Add-on Variant             | Configuration directory                      |
-| -------------------------- | -------------------------------------------- |
-| Frigate                    | `/addon_configs/ccab4aaf_frigate`            |
-| Frigate (Full Access)      | `/addon_configs/ccab4aaf_frigate-fa`         |
-| Frigate Beta               | `/addon_configs/ccab4aaf_frigate-beta`       |
-| Frigate Beta (Full Access) | `/addon_configs/ccab4aaf_frigate-fa-beta`    |
+| Add-on Variant             | Configuration directory                   |
+| -------------------------- | ----------------------------------------- |
+| Frigate                    | `/addon_configs/ccab4aaf_frigate`         |
+| Frigate (Full Access)      | `/addon_configs/ccab4aaf_frigate-fa`      |
+| Frigate Beta               | `/addon_configs/ccab4aaf_frigate-beta`    |
+| Frigate Beta (Full Access) | `/addon_configs/ccab4aaf_frigate-fa-beta` |

 **Whenever you see `/config` in the documentation, it refers to this directory.**

@@ -109,15 +109,16 @@ detectors:

 record:
  enabled: True
-  retain:
+  motion:
    days: 7
-    mode: motion
  alerts:
    retain:
      days: 30
+      mode: motion
  detections:
    retain:
      days: 30
+      mode: motion

 snapshots:
  enabled: True
@@ -137,7 +138,10 @@ cameras:
            - detect
    motion:
      mask:
-        - 0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400
+        timestamp:
+          friendly_name: "Camera timestamp"
+          enabled: true
+          coordinates: "0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400"
 ```

 ### Standalone Intel Mini PC with USB Coral
@@ -165,15 +169,16 @@ detectors:

 record:
  enabled: True
-  retain:
+  motion:
    days: 7
-    mode: motion
  alerts:
    retain:
      days: 30
+      mode: motion
  detections:
    retain:
      days: 30
+      mode: motion

 snapshots:
  enabled: True
@@ -193,7 +198,10 @@ cameras:
            - detect
    motion:
      mask:
-        - 0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400
+        timestamp:
+          friendly_name: "Camera timestamp"
+          enabled: true
+          coordinates: "0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400"
 ```

 ### Home Assistant integrated Intel Mini PC with OpenVino
@@ -231,15 +239,16 @@ model:

 record:
  enabled: True
-  retain:
+  motion:
    days: 7
-    mode: motion
  alerts:
    retain:
      days: 30
+      mode: motion
  detections:
    retain:
      days: 30
+      mode: motion

 snapshots:
  enabled: True
@@ -259,5 +268,8 @@ cameras:
            - detect
    motion:
      mask:
-        - 0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400
+        timestamp:
+          friendly_name: "Camera timestamp"
+          enabled: true
+          coordinates: "0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400"
 ```
--- a/docs/docs/configuration/masks.md
+++ b/docs/docs/configuration/masks.md
@@ -33,18 +33,55 @@ Your config file will be updated with the relative coordinates of the mask/zone:

 ```yaml
 motion:
-  mask: "0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400"
+  mask:
+    # Motion mask name (required)
+    mask1:
+      # Optional: A friendly name for the mask
+      friendly_name: "Timestamp area"
+      # Optional: Whether this mask is active (default: true)
+      enabled: true
+      # Required: Coordinates polygon for the mask
+      coordinates: "0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456,0.700,0.424,0.701,0.311,0.507,0.294,0.453,0.347,0.451,0.400"
 ```

-Multiple masks can be listed in your config.
+Multiple motion masks can be listed in your config:

 ```yaml
 motion:
  mask:
-    - 0.239,1.246,0.175,0.901,0.165,0.805,0.195,0.802
-    - 0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456
+    mask1:
+      friendly_name: "Timestamp area"
+      enabled: true
+      coordinates: "0.239,1.246,0.175,0.901,0.165,0.805,0.195,0.802"
+    mask2:
+      friendly_name: "Tree area"
+      enabled: true
+      coordinates: "0.000,0.427,0.002,0.000,0.999,0.000,0.999,0.781,0.885,0.456"
 ```

+Object filter masks can also be created through the UI or manually in the config. They are configured under the object filters section for each object type:
+
+```yaml
+objects:
+  filters:
+    person:
+      mask:
+        person_filter1:
+          friendly_name: "Roof area"
+          enabled: true
+          coordinates: "0.000,0.000,1.000,0.000,1.000,0.400,0.000,0.400"
+    car:
+      mask:
+        car_filter1:
+          friendly_name: "Sidewalk area"
+          enabled: true
+          coordinates: "0.000,0.700,1.000,0.700,1.000,1.000,0.000,1.000"
+```
+
+## Enabling/Disabling Masks
+
+Both motion masks and object filter masks can be toggled on or off without removing them from the configuration. Disabled masks are completely ignored at runtime - they will not affect motion detection or object filtering. This is useful for temporarily disabling a mask during certain seasons or times of day without modifying the configuration.
+
 ### Further Clarification

 This is a response to a [question posed on reddit](https://www.reddit.com/r/homeautomation/comments/ppxdve/replacing_my_doorbell_with_a_security_camera_a_6/hd876w4?utm_source=share&utm_medium=web2x&context=3):
--- a/docs/docs/configuration/object_detectors.md
+++ b/docs/docs/configuration/object_detectors.md
@@ -34,7 +34,7 @@ Frigate supports multiple different detectors that work on different types of ha

 **Nvidia GPU**

- [ONNX](#onnx): TensorRT will automatically be detected and used as a detector in the `-tensorrt` Frigate image when a supported ONNX model is configured.
+- [ONNX](#onnx): Nvidia GPUs will automatically be detected and used as a detector in the `-tensorrt` Frigate image when a supported ONNX model is configured.

 **Nvidia Jetson** <CommunityBadge />

@@ -65,7 +65,7 @@ This does not affect using hardware for accelerating other tasks such as [semant

 # Officially Supported Detectors

-Frigate provides the following builtin detector types: `cpu`, `edgetpu`, `hailo8l`, `memryx`, `onnx`, `openvino`, `rknn`, and `tensorrt`. By default, Frigate will use a single CPU detector. Other detectors may require additional configuration as described below. When using multiple detectors they will run in dedicated processes, but pull from a common queue of detection requests from across all cameras.
+Frigate provides a number of builtin detector types. By default, Frigate will use a single CPU detector. Other detectors may require additional configuration as described below. When using multiple detectors they will run in dedicated processes, but pull from a common queue of detection requests from across all cameras.

 ## Edge TPU Detector

@@ -157,7 +157,13 @@ A TensorFlow Lite model is provided in the container at `/edgetpu_model.tflite`

 #### YOLOv9

-YOLOv9 models that are compiled for TensorFlow Lite and properly quantized are supported, but not included by default. [Download the model](https://github.com/dbro/frigate-detector-edgetpu-yolo9/releases/download/v1.0/yolov9-s-relu6-best_320_int8_edgetpu.tflite), bind mount the file into the container, and provide the path with `model.path`. Note that the linked model requires a 17-label [labelmap file](https://raw.githubusercontent.com/dbro/frigate-detector-edgetpu-yolo9/refs/heads/main/labels-coco17.txt) that includes only 17 COCO classes.
+YOLOv9 models that are compiled for TensorFlow Lite and properly quantized are supported, but not included by default. [Instructions](#yolov9-for-google-coral-support) for downloading a model with support for the Google Coral.
+
+:::tip
+
+**Frigate+ Users:** Follow the [instructions](../integrations/plus#use-models) to set a model ID in your config file.
+
+:::

 <details>
  <summary>YOLOv9 Setup & Config</summary>
@@ -654,11 +660,9 @@ ONNX is an open format for building machine learning models, Frigate supports ru
 If the correct build is used for your GPU then the GPU will be detected and used automatically.

 - **AMD**
-
  - ROCm will automatically be detected and used with the ONNX detector in the `-rocm` Frigate image.

 - **Intel**
-
  - OpenVINO will automatically be detected and used with the ONNX detector in the default Frigate image.

 - **Nvidia**
@@ -1556,7 +1560,11 @@ cd tensorrt_demos/yolo
 python3 yolo_to_onnx.py -m yolov7-320
 ```

-#### YOLOv9
+#### YOLOv9 for Google Coral Support
+
+[Download the model](https://github.com/dbro/frigate-detector-edgetpu-yolo9/releases/download/v1.0/yolov9-s-relu6-best_320_int8_edgetpu.tflite), bind mount the file into the container, and provide the path with `model.path`. Note that the linked model requires a 17-label [labelmap file](https://raw.githubusercontent.com/dbro/frigate-detector-edgetpu-yolo9/refs/heads/main/labels-coco17.txt) that includes only 17 COCO classes.
+
+#### YOLOv9 for other detectors

 YOLOv9 model can be exported as ONNX using the command below. You can copy and paste the whole thing to your terminal and execute, altering `MODEL_SIZE=t` and `IMG_SIZE=320` in the first line to the [model size](https://github.com/WongKinYiu/yolov9#performance) you would like to convert (available model sizes are `t`, `s`, `m`, `c`, and `e`, common image sizes are `320` and `640`).

--- a/docs/docs/configuration/reference.md
+++ b/docs/docs/configuration/reference.md
@@ -345,7 +345,15 @@ objects:
  # Optional: mask to prevent all object types from being detected in certain areas (default: no mask)
  # Checks based on the bottom center of the bounding box of the object.
  # NOTE: This mask is COMBINED with the object type specific mask below
-  mask: 0.000,0.000,0.781,0.000,0.781,0.278,0.000,0.278
+  mask:
+    # Object filter mask name (required)
+    mask1:
+      # Optional: A friendly name for the mask
+      friendly_name: "Object filter mask area"
+      # Optional: Whether this mask is active (default: true)
+      enabled: true
+      # Required: Coordinates polygon for the mask
+      coordinates: "0.000,0.000,0.781,0.000,0.781,0.278,0.000,0.278"
  # Optional: filters to reduce false positives for specific object types
  filters:
    person:
@@ -365,7 +373,15 @@ objects:
      threshold: 0.7
      # Optional: mask to prevent this object type from being detected in certain areas (default: no mask)
      # Checks based on the bottom center of the bounding box of the object
-      mask: 0.000,0.000,0.781,0.000,0.781,0.278,0.000,0.278
+      mask:
+        # Object filter mask name (required)
+        mask1:
+          # Optional: A friendly name for the mask
+          friendly_name: "Object filter mask area"
+          # Optional: Whether this mask is active (default: true)
+          enabled: true
+          # Required: Coordinates polygon for the mask
+          coordinates: "0.000,0.000,0.781,0.000,0.781,0.278,0.000,0.278"
  # Optional: Configuration for AI generated tracked object descriptions
  genai:
    # Optional: Enable AI object description generation (default: shown below)
@@ -489,7 +505,15 @@ motion:
  frame_height: 100
  # Optional: motion mask
  # NOTE: see docs for more detailed info on creating masks
-  mask: 0.000,0.469,1.000,0.469,1.000,1.000,0.000,1.000
+  mask:
+    # Motion mask name (required)
+    mask1:
+      # Optional: A friendly name for the mask
+      friendly_name: "Motion mask area"
+      # Optional: Whether this mask is active (default: true)
+      enabled: true
+      # Required: Coordinates polygon for the mask
+      coordinates: "0.000,0.469,1.000,0.469,1.000,1.000,0.000,1.000"
  # Optional: improve contrast (default: shown below)
  # Enables dynamic contrast improvement. This should help improve night detections at the cost of making motion detection more sensitive
  # for daytime.
@@ -866,6 +890,9 @@ cameras:
      front_steps:
        # Optional: A friendly name or descriptive text for the zones
        friendly_name: ""
+        # Optional: Whether this zone is active (default: shown below)
+        # Disabled zones are completely ignored at runtime - no object tracking or debug drawing
+        enabled: True
        # Required: List of x,y coordinates to define the polygon of the zone.
        # NOTE: Presence in a zone is evaluated only based on the bottom center of the objects bounding box.
        coordinates: 0.033,0.306,0.324,0.138,0.439,0.185,0.042,0.428
--- a/docs/docs/configuration/zones.md
+++ b/docs/docs/configuration/zones.md
@@ -10,6 +10,10 @@ For example, the cat in this image is currently in Zone 1, but **not** Zone 2.

 Zones cannot have the same name as a camera. If desired, a single zone can include multiple cameras if you have multiple cameras covering the same area by configuring zones with the same name for each camera.

+## Enabling/Disabling Zones
+
+Zones can be toggled on or off without removing them from the configuration. Disabled zones are completely ignored at runtime - objects will not be tracked for zone presence, and zones will not appear in the debug view. This is useful for temporarily disabling a zone during certain seasons or times of day without modifying the configuration.
+
 During testing, enable the Zones option for the Debug view of your camera (Settings --> Debug) so you can adjust as needed. The zone line will increase in thickness when any object enters the zone.

 To create a zone, follow [the steps for a "Motion mask"](masks.md), but use the section of the web UI for creating a zone instead.
@@ -86,7 +90,6 @@ cameras:

 Only car objects can trigger the `front_yard_street` zone and only person can trigger the `entire_yard`. Objects will be tracked for any `person` that enter anywhere in the yard, and for cars only if they enter the street.

-
 ### Zone Loitering

 Sometimes objects are expected to be passing through a zone, but an object loitering in an area is unexpected. Zones can be configured to have a minimum loitering time after which the object will be considered in the zone.
@@ -94,6 +97,7 @@ Sometimes objects are expected to be passing through a zone, but an object loite
 :::note

 When using loitering zones, a review item will behave in the following way:
+
 - When a person is in a loitering zone, the review item will remain active until the person leaves the loitering zone, regardless of if they are stationary.
 - When any other object is in a loitering zone, the review item will remain active until the loitering time is met. Then if the object is stationary the review item will end.

--- a/docs/docs/frigate/hardware.md
+++ b/docs/docs/frigate/hardware.md
@@ -41,8 +41,8 @@ If the EQ13 is out of stock, the link below may take you to a suggested alternat
 | Name                                                                                                          | Capabilities                                                               | Notes                                               |
 | ------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | --------------------------------------------------- |
 | Beelink EQ13 (<a href="https://amzn.to/4jn2qVr" target="_blank" rel="nofollow noopener sponsored">Amazon</a>) | Can run object detection on several 1080p cameras with low-medium activity | Dual gigabit NICs for easy isolated camera network. |
-| Intel 1120p ([Amazon](https://www.amazon.com/Beelink-i3-1220P-Computer-Display-Gigabit/dp/B0DDCKT9YP)         | Can handle a large number of 1080p cameras with high activity              |                                                     |
-| Intel 125H ([Amazon](https://www.amazon.com/MINISFORUM-Pro-125H-Barebone-Computer-HDMI2-1/dp/B0FH21FSZM)      | Can handle a significant number of 1080p cameras with high activity        | Includes NPU for more efficient detection in 0.17+  |
+| Intel 1120p ([Amazon](https://www.amazon.com/Beelink-i3-1220P-Computer-Display-Gigabit/dp/B0DDCKT9YP))        | Can handle a large number of 1080p cameras with high activity              |                                                     |
+| Intel 125H ([Amazon](https://www.amazon.com/MINISFORUM-Pro-125H-Barebone-Computer-HDMI2-1/dp/B0FH21FSZM))     | Can handle a significant number of 1080p cameras with high activity        | Includes NPU for more efficient detection in 0.17+  |

 ## Detectors

@@ -86,7 +86,7 @@ Frigate supports multiple different detectors that work on different types of ha

 **Nvidia**

- [TensortRT](#tensorrt---nvidia-gpu): TensorRT can run on Nvidia GPUs to provide efficient object detection.
+- [Nvidia GPU](#nvidia-gpus): Nvidia GPUs can provide efficient object detection.
  - [Supports majority of model architectures via ONNX](../../configuration/object_detectors#onnx-supported-models)
  - Runs well with any size models including large

@@ -172,7 +172,7 @@ Inference speeds vary greatly depending on the CPU or GPU used, some known examp
 | Intel Arc A380 | ~ 6 ms                     |                                                   | 320: ~ 10 ms 640: ~ 22 ms | 336: 20 ms 448: 27 ms  |                                    |
 | Intel Arc A750 | ~ 4 ms                     |                                                   | 320: ~ 8 ms               |                        |                                    |

-### TensorRT - Nvidia GPU
+### Nvidia GPUs

 Frigate is able to utilize an Nvidia GPU which supports the 12.x series of CUDA libraries.

@@ -182,8 +182,6 @@ Frigate is able to utilize an Nvidia GPU which supports the 12.x series of CUDA

 Make sure your host system has the [nvidia-container-runtime](https://docs.docker.com/config/containers/resource_constraints/#access-an-nvidia-gpu) installed to pass through the GPU to the container and the host system has a compatible driver installed for your GPU.

-There are improved capabilities in newer GPU architectures that TensorRT can benefit from, such as INT8 operations and Tensor cores. The features compatible with your hardware will be optimized when the model is converted to a trt file. Currently the script provided for generating the model provides a switch to enable/disable FP16 operations. If you wish to use newer features such as INT8 optimization, more work is required.
-
 #### Compatibility References:

 [NVIDIA TensorRT Support Matrix](https://docs.nvidia.com/deeplearning/tensorrt-rtx/latest/getting-started/support-matrix.html)
@@ -192,7 +190,7 @@ There are improved capabilities in newer GPU architectures that TensorRT can ben

 [NVIDIA GPU Compute Capability](https://developer.nvidia.com/cuda-gpus)

-Inference speeds will vary greatly depending on the GPU and the model used.
+Inference is done with the `onnx` detector type. Speeds will vary greatly depending on the GPU and the model used.
 `tiny (t)` variants are faster than the equivalent non-tiny model, some known examples are below:

 ✅ - Accelerated with CUDA Graphs
--- a/docs/docs/frigate/installation.md
+++ b/docs/docs/frigate/installation.md
@@ -56,7 +56,7 @@ services:
    volumes:
      - /path/to/your/config:/config
      - /path/to/your/storage:/media/frigate
-      - type: tmpfs # Recommended: 1GB of memory
+      - type: tmpfs # 1GB In-memory filesystem for recording segment storage
        target: /tmp/cache
        tmpfs:
          size: 1000000000
@@ -123,7 +123,7 @@ On Raspberry Pi OS **Trixie**, the Hailo driver is no longer shipped with the ke
   :::note

   If you are **not** using a Raspberry Pi with **Bookworm OS**, skip this step and proceed directly to step 2.
-   
+
   If you are using Raspberry Pi with **Trixie OS**, also skip this step and proceed directly to step 2.

   :::
@@ -133,13 +133,13 @@ On Raspberry Pi OS **Trixie**, the Hailo driver is no longer shipped with the ke
   ```bash
   lsmod | grep hailo
   ```
-   
+
   If it shows `hailo_pci`, unload it:

   ```bash
   sudo modprobe -r hailo_pci
   ```
-   
+
   Then locate the built-in kernel driver and rename it so it cannot be loaded.
   Renaming allows the original driver to be restored later if needed.
   First, locate the currently installed kernel module:
@@ -149,28 +149,29 @@ On Raspberry Pi OS **Trixie**, the Hailo driver is no longer shipped with the ke
   ```

   Example output:
-   
+
   ```
   /lib/modules/6.6.31+rpt-rpi-2712/kernel/drivers/media/pci/hailo/hailo_pci.ko.xz
   ```
+
   Save the module path to a variable:
-   
+
   ```bash
   BUILTIN=$(modinfo -n hailo_pci)
   ```

   And rename the module by appending .bak:
-    
+
   ```bash
   sudo mv "$BUILTIN" "${BUILTIN}.bak"
   ```
-   
+
   Now refresh the kernel module map so the system recognizes the change:
-   
+
   ```bash
   sudo depmod -a
   ```
-   
+
   Reboot your Raspberry Pi:

   ```bash
@@ -206,7 +207,6 @@ On Raspberry Pi OS **Trixie**, the Hailo driver is no longer shipped with the ke
   ```

   The script will:
-
   - Install necessary build dependencies
   - Clone and build the Hailo driver from the official repository
   - Install the driver
@@ -236,18 +236,18 @@ On Raspberry Pi OS **Trixie**, the Hailo driver is no longer shipped with the ke
   ```

   Verify the driver version:
-   
+
   ```bash
   cat /sys/module/hailo_pci/version
   ```
-   
+
   Verify that the firmware was installed correctly:
-   
+
   ```bash
   ls -l /lib/firmware/hailo/hailo8_fw.bin
   ```

-  **Optional: Fix PCIe descriptor page size error**
+   **Optional: Fix PCIe descriptor page size error**

   If you encounter the following error:

@@ -462,7 +462,7 @@ services:
      - /etc/localtime:/etc/localtime:ro
      - /path/to/your/config:/config
      - /path/to/your/storage:/media/frigate
-      - type: tmpfs # Recommended: 1GB of memory
+      - type: tmpfs # 1GB In-memory filesystem for recording segment storage
        target: /tmp/cache
        tmpfs:
          size: 1000000000
@@ -502,12 +502,12 @@ The official docker image tags for the current stable version are:

 - `stable` - Standard Frigate build for amd64 & RPi Optimized Frigate build for arm64. This build includes support for Hailo devices as well.
 - `stable-standard-arm64` - Standard Frigate build for arm64
- `stable-tensorrt` - Frigate build specific for amd64 devices running an nvidia GPU
+- `stable-tensorrt` - Frigate build specific for amd64 devices running an Nvidia GPU
 - `stable-rocm` - Frigate build for [AMD GPUs](../configuration/object_detectors.md#amdrocm-gpu-detector)

 The community supported docker image tags for the current stable version are:

- `stable-tensorrt-jp6` - Frigate build optimized for nvidia Jetson devices running Jetpack 6
+- `stable-tensorrt-jp6` - Frigate build optimized for Nvidia Jetson devices running Jetpack 6
 - `stable-rk` - Frigate build for SBCs with Rockchip SoC

 ## Home Assistant Add-on
@@ -521,7 +521,7 @@ There are important limitations in HA OS to be aware of:
 - Separate local storage for media is not yet supported by Home Assistant
 - AMD GPUs are not supported because HA OS does not include the mesa driver.
 - Intel NPUs are not supported because HA OS does not include the NPU firmware.
- Nvidia GPUs are not supported because addons do not support the nvidia runtime.
+- Nvidia GPUs are not supported because addons do not support the Nvidia runtime.

 :::

@@ -694,17 +694,18 @@ Log into QNAP, open Container Station. Frigate docker container should be listed

 :::warning

-macOS uses port 5000 for its Airplay Receiver service.  If you want to expose port 5000 in Frigate for local app and API access the port will need to be mapped to another port on the host e.g. 5001
+macOS uses port 5000 for its Airplay Receiver service. If you want to expose port 5000 in Frigate for local app and API access the port will need to be mapped to another port on the host e.g. 5001

 Failure to remap port 5000 on the host will result in the WebUI and all API endpoints on port 5000 being unreachable, even if port 5000 is exposed correctly in Docker.

 :::

-Docker containers on macOS can be orchestrated by either [Docker Desktop](https://docs.docker.com/desktop/setup/install/mac-install/) or [OrbStack](https://orbstack.dev) (native swift app). The difference in inference speeds is negligable, however CPU, power consumption and container start times will be lower on OrbStack because it is a native Swift application. 
+Docker containers on macOS can be orchestrated by either [Docker Desktop](https://docs.docker.com/desktop/setup/install/mac-install/) or [OrbStack](https://orbstack.dev) (native swift app). The difference in inference speeds is negligable, however CPU, power consumption and container start times will be lower on OrbStack because it is a native Swift application.

 To allow Frigate to use the Apple Silicon Neural Engine / Processing Unit (NPU) the host must be running [Apple Silicon Detector](../configuration/object_detectors.md#apple-silicon-detector) on the host (outside Docker)

 #### Docker Compose example
+
 ```yaml
 services:
  frigate:
@@ -719,7 +720,7 @@ services:
    ports:
      - "8971:8971"
      # If exposing on macOS map to a diffent host port like 5001 or any orher port with no conflicts
-      # - "5001:5000" # Internal unauthenticated access. Expose carefully. 
+      # - "5001:5000" # Internal unauthenticated access. Expose carefully.
      - "8554:8554" # RTSP feeds
    extra_hosts:
      # This is very important
--- a/docs/docs/frigate/updating.md
+++ b/docs/docs/frigate/updating.md
@@ -20,7 +20,6 @@ Keeping Frigate up to date ensures you benefit from the latest features, perform
 If you’re running Frigate via Docker (recommended method), follow these steps:

 1. **Stop the Container**:
-
   - If using Docker Compose:
     ```bash
     docker compose down frigate
@@ -31,9 +30,8 @@ If you’re running Frigate via Docker (recommended method), follow these steps:
     ```

 2. **Update and Pull the Latest Image**:
-
   - If using Docker Compose:
-     - Edit your `docker-compose.yml` file to specify the desired version tag (e.g., `0.17.0` instead of `0.16.3`). For example:
+     - Edit your `docker-compose.yml` file to specify the desired version tag (e.g., `0.17.0` instead of `0.16.4`). For example:
       ```yaml
       services:
         frigate:
@@ -51,7 +49,6 @@ If you’re running Frigate via Docker (recommended method), follow these steps:
       ```

 3. **Start the Container**:
-
   - If using Docker Compose:
     ```bash
     docker compose up -d
@@ -75,18 +72,15 @@ If you’re running Frigate via Docker (recommended method), follow these steps:
 For users running Frigate as a Home Assistant Addon:

 1. **Check for Updates**:
-
   - Navigate to **Settings > Add-ons** in Home Assistant.
   - Find your installed Frigate addon (e.g., "Frigate NVR" or "Frigate NVR (Full Access)").
   - If an update is available, you’ll see an "Update" button.

 2. **Update the Addon**:
-
   - Click the "Update" button next to the Frigate addon.
   - Wait for the process to complete. Home Assistant will handle downloading and installing the new version.

 3. **Restart the Addon**:
-
   - After updating, go to the addon’s page and click "Restart" to apply the changes.

 4. **Verify the Update**:
@@ -105,8 +99,8 @@ If an update causes issues:
 1. Stop Frigate.
 2. Restore your backed-up config file and database.
 3. Revert to the previous image version:
-   - For Docker: Specify an older tag (e.g., `ghcr.io/blakeblackshear/frigate:0.16.3`) in your `docker run` command.
-   - For Docker Compose: Edit your `docker-compose.yml`, specify the older version tag (e.g., `ghcr.io/blakeblackshear/frigate:0.16.3`), and re-run `docker compose up -d`.
+   - For Docker: Specify an older tag (e.g., `ghcr.io/blakeblackshear/frigate:0.16.4`) in your `docker run` command.
+   - For Docker Compose: Edit your `docker-compose.yml`, specify the older version tag (e.g., `ghcr.io/blakeblackshear/frigate:0.16.4`), and re-run `docker compose up -d`.
   - For Home Assistant: Reinstall the previous addon version manually via the repository if needed and restart the addon.
 4. Verify the old version is running again.

--- a/docs/docs/guides/getting_started.md
+++ b/docs/docs/guides/getting_started.md
@@ -119,7 +119,7 @@ services:
    volumes:
      - ./config:/config
      - ./storage:/media/frigate
-      - type: tmpfs # Optional: 1GB of memory, reduces SSD/SD Card wear
+      - type: tmpfs # 1GB In-memory filesystem for recording segment storage
        target: /tmp/cache
        tmpfs:
          size: 1000000000
@@ -240,7 +240,10 @@ cameras:
            - detect
    motion:
      mask:
-        - 0,461,3,0,1919,0,1919,843,1699,492,1344,458,1346,336,973,317,869,375,866,432
+        motion_area:
+          friendly_name: "Motion mask"
+          enabled: true
+          coordinates: "0,461,3,0,1919,0,1919,843,1699,492,1344,458,1346,336,973,317,869,375,866,432"
 ```

 ### Step 6: Enable recordings
--- a/docs/docs/integrations/mqtt.md
+++ b/docs/docs/integrations/mqtt.md
@@ -429,6 +429,30 @@ Topic to adjust motion contour area for a camera. Expected value is an integer.

 Topic with current motion contour area for a camera. Published value is an integer.

+### `frigate/<camera_name>/motion_mask/<mask_name>/set`
+
+Topic to turn a specific motion mask for a camera on and off. Expected values are `ON` and `OFF`.
+
+### `frigate/<camera_name>/motion_mask/<mask_name>/state`
+
+Topic with current state of a specific motion mask for a camera. Published values are `ON` and `OFF`.
+
+### `frigate/<camera_name>/object_mask/<mask_name>/set`
+
+Topic to turn a specific object mask for a camera on and off. Expected values are `ON` and `OFF`.
+
+### `frigate/<camera_name>/object_mask/<mask_name>/state`
+
+Topic with current state of a specific object mask for a camera. Published values are `ON` and `OFF`.
+
+### `frigate/<camera_name>/zone/<zone_name>/set`
+
+Topic to turn a specific zone for a camera on and off. Expected values are `ON` and `OFF`.
+
+### `frigate/<camera_name>/zone/<zone_name>/state`
+
+Topic with current state of a specific zone for a camera. Published values are `ON` and `OFF`.
+
 ### `frigate/<camera_name>/review_status`

 Topic with current activity status of the camera. Possible values are `NONE`, `DETECTION`, or `ALERT`.
--- a/docs/docs/integrations/plus.md
+++ b/docs/docs/integrations/plus.md
@@ -54,6 +54,8 @@ Once you have [requested your first model](../plus/first_model.md) and gotten yo
 You can either choose the new model from the Frigate+ pane in the Settings page of the Frigate UI, or manually set the model at the root level in your config:

 ```yaml
+detectors: ...
+
 model:
  path: plus://<your_model_id>
 ```
--- a/docs/docs/plus/first_model.md
+++ b/docs/docs/plus/first_model.md
@@ -24,6 +24,8 @@ You will receive an email notification when your Frigate+ model is ready.
 Models available in Frigate+ can be used with a special model path. No other information needs to be configured because it fetches the remaining config from Frigate+ automatically.

 ```yaml
+detectors: ...
+
 model:
  path: plus://<your_model_id>
 ```
--- a/docs/docs/plus/index.md
+++ b/docs/docs/plus/index.md
@@ -15,15 +15,15 @@ There are three model types offered in Frigate+, `mobiledet`, `yolonas`, and `yo

 Not all model types are supported by all detectors, so it's important to choose a model type to match your detector as shown in the table under [supported detector types](#supported-detector-types). You can test model types for compatibility and speed on your hardware by using the base models.

-| Model Type  | Description                                                                                                                                                                                                                    |
-| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `mobiledet` | Based on the same architecture as the default model included with Frigate. Runs on Google Coral devices and CPUs.                                                                                                              |
-| `yolonas`   | A newer architecture that offers slightly higher accuracy and improved detection of small objects. Runs on Intel, NVidia GPUs, and AMD GPUs.                                                                                   |
-| `yolov9`    | A leading SOTA (state of the art) object detection model with similar performance to yolonas, but on a wider range of hardware options. Runs on Intel, NVidia GPUs, AMD GPUs, Hailo, MemryX, Apple Silicon, and Rockchip NPUs. |
+| Model Type  | Description                                                                                                                                                    |
+| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `mobiledet` | Based on the same architecture as the default model included with Frigate. Runs on Google Coral devices and CPUs.                                              |
+| `yolonas`   | A newer architecture that offers slightly higher accuracy and improved detection of small objects. Runs on Intel, NVidia GPUs, and AMD GPUs.                   |
+| `yolov9`    | A leading SOTA (state of the art) object detection model with similar performance to yolonas, but on a wider range of hardware options. Runs on most hardware. |

 ### YOLOv9 Details

-YOLOv9 models are available in `s` and `t` sizes. When requesting a `yolov9` model, you will be prompted to choose a size. If you are unsure what size to choose, you should perform some tests with the base models to find the performance level that suits you. The `s` size is most similar to the current `yolonas` models in terms of inference times and accuracy, and a good place to start is the `320x320` resolution model for `yolov9s`.
+YOLOv9 models are available in `s`, `t`, `edgetpu` variants. When requesting a `yolov9` model, you will be prompted to choose a variant. If you want the model to be compatible with a Google Coral, you will need to choose the `edgetpu` variant. If you are unsure what variant to choose, you should perform some tests with the base models to find the performance level that suits you. The `s` size is most similar to the current `yolonas` models in terms of inference times and accuracy, and a good place to start is the `320x320` resolution model for `yolov9s`.

 :::info

@@ -37,23 +37,21 @@ If you have a Hailo device, you will need to specify the hardware you have when

 #### Rockchip (RKNN) Support

-For 0.16, YOLOv9 onnx models will need to be manually converted. First, you will need to configure Frigate to use the model id for your YOLOv9 onnx model so it downloads the model to your `model_cache` directory. From there, you can follow the [documentation](/configuration/object_detectors.md#converting-your-own-onnx-model-to-rknn-format) to convert it. Automatic conversion is available in 0.17 and later.
+Rockchip models are automatically converted as of 0.17. For 0.16, YOLOv9 onnx models will need to be manually converted. First, you will need to configure Frigate to use the model id for your YOLOv9 onnx model so it downloads the model to your `model_cache` directory. From there, you can follow the [documentation](/configuration/object_detectors.md#converting-your-own-onnx-model-to-rknn-format) to convert it.

 ## Supported detector types

-Currently, Frigate+ models support CPU (`cpu`), Google Coral (`edgetpu`), OpenVino (`openvino`), ONNX (`onnx`), Hailo (`hailo8l`), and Rockchip\* (`rknn`) detectors.
+Currently, Frigate+ models support CPU (`cpu`), Google Coral (`edgetpu`), OpenVino (`openvino`), ONNX (`onnx`), Hailo (`hailo8l`), and Rockchip (`rknn`) detectors.

 | Hardware                                                                         | Recommended Detector Type | Recommended Model Type |
 | -------------------------------------------------------------------------------- | ------------------------- | ---------------------- |
 | [CPU](/configuration/object_detectors.md#cpu-detector-not-recommended)           | `cpu`                     | `mobiledet`            |
-| [Coral (all form factors)](/configuration/object_detectors.md#edge-tpu-detector) | `edgetpu`                 | `mobiledet`            |
+| [Coral (all form factors)](/configuration/object_detectors.md#edge-tpu-detector) | `edgetpu`                 | `yolov9`               |
 | [Intel](/configuration/object_detectors.md#openvino-detector)                    | `openvino`                | `yolov9`               |
 | [NVidia GPU](/configuration/object_detectors#onnx)                               | `onnx`                    | `yolov9`               |
 | [AMD ROCm GPU](/configuration/object_detectors#amdrocm-gpu-detector)             | `onnx`                    | `yolov9`               |
 | [Hailo8/Hailo8L/Hailo8R](/configuration/object_detectors#hailo-8)                | `hailo8l`                 | `yolov9`               |
-| [Rockchip NPU](/configuration/object_detectors#rockchip-platform)\*              | `rknn`                    | `yolov9`               |
-
-_\* Requires manual conversion in 0.16. Automatic conversion available in 0.17 and later._
+| [Rockchip NPU](/configuration/object_detectors#rockchip-platform)                | `rknn`                    | `yolov9`               |

 ## Improving your model

@@ -81,7 +79,7 @@ Candidate labels are also available for annotation. These labels don't have enou

 Where possible, these labels are mapped to existing labels during training. For example, any `baby` labels are mapped to `person` until support for new labels is added.

-The candidate labels are: `baby`, `bpost`, `badger`, `possum`, `rodent`, `chicken`, `groundhog`, `boar`, `hedgehog`, `tractor`, `golf cart`, `garbage truck`, `bus`, `sports ball`
+The candidate labels are: `baby`, `bpost`, `badger`, `possum`, `rodent`, `chicken`, `groundhog`, `boar`, `hedgehog`, `tractor`, `golf cart`, `garbage truck`, `bus`, `sports ball`, `la_poste`, `lawnmower`, `heron`, `rickshaw`, `wombat`, `auspost`, `aramex`, `bobcat`, `mustelid`, `transoflex`, `airplane`, `drone`, `mountain_lion`, `crocodile`, `turkey`, `baby_stroller`, `monkey`, `coyote`, `porcupine`, `parcelforce`, `sheep`, `snake`, `helicopter`, `lizard`, `duck`, `hermes`, `cargus`, `fan_courier`, `sameday`

 Candidate labels are not available for automatic suggestions.

--- a/frigate/api/app.py
+++ b/frigate/api/app.py
@@ -19,6 +19,7 @@ from fastapi import APIRouter, Body, Path, Request, Response
 from fastapi.encoders import jsonable_encoder
 from fastapi.params import Depends
 from fastapi.responses import JSONResponse, PlainTextResponse, StreamingResponse
+from filelock import FileLock, Timeout
 from markupsafe import escape
 from peewee import SQL, fn, operator
 from pydantic import ValidationError
@@ -49,10 +50,12 @@ from frigate.types import JobStatusTypesEnum
 from frigate.util.builtin import (
    clean_camera_user_pass,
    flatten_config_data,
+    load_labels,
    process_config_query_string,
    update_yaml_file_bulk,
 )
 from frigate.util.config import find_config_file
+from frigate.util.schema import get_config_schema
 from frigate.util.services import (
    get_nvidia_driver_info,
    process_logs,
@@ -77,9 +80,7 @@ def is_healthy():

@router.get("/config/schema.json", dependencies=[Depends(allow_public())])
 def config_schema(request: Request):
-    return Response(
-        content=request.app.frigate_config.schema_json(), media_type="application/json"
-    )
+    return JSONResponse(content=get_config_schema(FrigateConfig))


@router.get(
@@ -125,6 +126,10 @@ def config(request: Request):
    config: dict[str, dict[str, Any]] = config_obj.model_dump(
        mode="json", warnings="none", exclude_none=True
    )
+    config["detectors"] = {
+        name: detector.model_dump(mode="json", warnings="none", exclude_none=True)
+        for name, detector in config_obj.detectors.items()
+    }

    # remove the mqtt password
    config["mqtt"].pop("password", None)
@@ -195,6 +200,54 @@ def config(request: Request):
    return JSONResponse(content=config)


+@router.get("/ffmpeg/presets", dependencies=[Depends(allow_any_authenticated())])
+def ffmpeg_presets():
+    """Return available ffmpeg preset keys for config UI usage."""
+
+    # Whitelist based on documented presets in ffmpeg_presets.md
+    hwaccel_presets = [
+        "preset-rpi-64-h264",
+        "preset-rpi-64-h265",
+        "preset-vaapi",
+        "preset-intel-qsv-h264",
+        "preset-intel-qsv-h265",
+        "preset-nvidia",
+        "preset-jetson-h264",
+        "preset-jetson-h265",
+        "preset-rkmpp",
+    ]
+    input_presets = [
+        "preset-http-jpeg-generic",
+        "preset-http-mjpeg-generic",
+        "preset-http-reolink",
+        "preset-rtmp-generic",
+        "preset-rtsp-generic",
+        "preset-rtsp-restream",
+        "preset-rtsp-restream-low-latency",
+        "preset-rtsp-udp",
+        "preset-rtsp-blue-iris",
+    ]
+    record_output_presets = [
+        "preset-record-generic",
+        "preset-record-generic-audio-copy",
+        "preset-record-generic-audio-aac",
+        "preset-record-mjpeg",
+        "preset-record-jpeg",
+        "preset-record-ubiquiti",
+    ]
+
+    return JSONResponse(
+        content={
+            "hwaccel_args": hwaccel_presets,
+            "input_args": input_presets,
+            "output_args": {
+                "record": record_output_presets,
+                "detect": [],
+            },
+        }
+    )
+
+
@router.get("/config/raw_paths", dependencies=[Depends(require_role(["admin"]))])
 def config_raw_paths(request: Request):
    """Admin-only endpoint that returns camera paths and go2rtc streams without credential masking."""
@@ -372,101 +425,124 @@ def config_save(save_option: str, body: Any = Body(media_type="text/plain")):
@router.put("/config/set", dependencies=[Depends(require_role(["admin"]))])
 def config_set(request: Request, body: AppConfigSetBody):
    config_file = find_config_file()
-
-    with open(config_file, "r") as f:
-        old_raw_config = f.read()
+    lock = FileLock(f"{config_file}.lock", timeout=5)

    try:
-        updates = {}
+        with lock:
+            with open(config_file, "r") as f:
+                old_raw_config = f.read()

-        # process query string parameters (takes precedence over body.config_data)
-        parsed_url = urllib.parse.urlparse(str(request.url))
-        query_string = urllib.parse.parse_qs(parsed_url.query, keep_blank_values=True)
+            try:
+                updates = {}

-        # Filter out empty keys but keep blank values for non-empty keys
-        query_string = {k: v for k, v in query_string.items() if k}
+                # process query string parameters (takes precedence over body.config_data)
+                parsed_url = urllib.parse.urlparse(str(request.url))
+                query_string = urllib.parse.parse_qs(
+                    parsed_url.query, keep_blank_values=True
+                )

-        if query_string:
-            updates = process_config_query_string(query_string)
-        elif body.config_data:
-            updates = flatten_config_data(body.config_data)
+                # Filter out empty keys but keep blank values for non-empty keys
+                query_string = {k: v for k, v in query_string.items() if k}

-        if not updates:
-            return JSONResponse(
-                content=(
-                    {"success": False, "message": "No configuration data provided"}
-                ),
-                status_code=400,
-            )
+                if query_string:
+                    updates = process_config_query_string(query_string)
+                elif body.config_data:
+                    updates = flatten_config_data(body.config_data)
+                    # Convert None values to empty strings for deletion (e.g., when deleting masks)
+                    updates = {k: ("" if v is None else v) for k, v in updates.items()}

-        # apply all updates in a single operation
-        update_yaml_file_bulk(config_file, updates)
+                if not updates:
+                    return JSONResponse(
+                        content=(
+                            {
+                                "success": False,
+                                "message": "No configuration data provided",
+                            }
+                        ),
+                        status_code=400,
+                    )

-        # validate the updated config
-        with open(config_file, "r") as f:
-            new_raw_config = f.read()
+                # apply all updates in a single operation
+                update_yaml_file_bulk(config_file, updates)
+
+                # validate the updated config
+                with open(config_file, "r") as f:
+                    new_raw_config = f.read()
+
+                try:
+                    config = FrigateConfig.parse(new_raw_config)
+                except Exception:
+                    with open(config_file, "w") as f:
+                        f.write(old_raw_config)
+                        f.close()
+                    logger.error(f"\nConfig Error:\n\n{str(traceback.format_exc())}")
+                    return JSONResponse(
+                        content=(
+                            {
+                                "success": False,
+                                "message": "Error parsing config. Check logs for error message.",
+                            }
+                        ),
+                        status_code=400,
+                    )
+            except Exception as e:
+                logging.error(f"Error updating config: {e}")
+                return JSONResponse(
+                    content=({"success": False, "message": "Error updating config"}),
+                    status_code=500,
+                )
+
+            if body.requires_restart == 0 or body.update_topic:
+                old_config: FrigateConfig = request.app.frigate_config
+                request.app.frigate_config = config
+                request.app.genai_manager.update_config(config)
+
+                if body.update_topic:
+                    if body.update_topic.startswith("config/cameras/"):
+                        _, _, camera, field = body.update_topic.split("/")
+
+                        if field == "add":
+                            settings = config.cameras[camera]
+                        elif field == "remove":
+                            settings = old_config.cameras[camera]
+                        else:
+                            settings = config.get_nested_object(body.update_topic)
+
+                        request.app.config_publisher.publish_update(
+                            CameraConfigUpdateTopic(
+                                CameraConfigUpdateEnum[field], camera
+                            ),
+                            settings,
+                        )
+                    else:
+                        # Generic handling for global config updates
+                        settings = config.get_nested_object(body.update_topic)
+
+                        # Publish None for removal, actual config for add/update
+                        request.app.config_publisher.publisher.publish(
+                            body.update_topic, settings
+                        )

-        try:
-            config = FrigateConfig.parse(new_raw_config)
-        except Exception:
-            with open(config_file, "w") as f:
-                f.write(old_raw_config)
-                f.close()
-            logger.error(f"\nConfig Error:\n\n{str(traceback.format_exc())}")
            return JSONResponse(
                content=(
                    {
-                        "success": False,
-                        "message": "Error parsing config. Check logs for error message.",
+                        "success": True,
+                        "message": "Config successfully updated, restart to apply",
                    }
                ),
-                status_code=400,
+                status_code=200,
            )
-    except Exception as e:
-        logging.error(f"Error updating config: {e}")
+    except Timeout:
        return JSONResponse(
-            content=({"success": False, "message": "Error updating config"}),
-            status_code=500,
+            content=(
+                {
+                    "success": False,
+                    "message": "Another process is currently updating the config. Please try again in a few seconds.",
+                }
+            ),
+            status_code=503,
        )

-    if body.requires_restart == 0 or body.update_topic:
-        old_config: FrigateConfig = request.app.frigate_config
-        request.app.frigate_config = config
-
-        if body.update_topic:
-            if body.update_topic.startswith("config/cameras/"):
-                _, _, camera, field = body.update_topic.split("/")
-
-                if field == "add":
-                    settings = config.cameras[camera]
-                elif field == "remove":
-                    settings = old_config.cameras[camera]
-                else:
-                    settings = config.get_nested_object(body.update_topic)
-
-                request.app.config_publisher.publish_update(
-                    CameraConfigUpdateTopic(CameraConfigUpdateEnum[field], camera),
-                    settings,
-                )
-            else:
-                # Generic handling for global config updates
-                settings = config.get_nested_object(body.update_topic)
-
-                # Publish None for removal, actual config for add/update
-                request.app.config_publisher.publisher.publish(
-                    body.update_topic, settings
-                )
-
-    return JSONResponse(
-        content=(
-            {
-                "success": True,
-                "message": "Config successfully updated, restart to apply",
-            }
-        ),
-        status_code=200,
-    )
-

@router.get("/vainfo", dependencies=[Depends(allow_any_authenticated())])
 def vainfo():
@@ -754,6 +830,12 @@ def get_sub_labels(split_joined: Optional[int] = None):
    return JSONResponse(content=sub_labels)


+@router.get("/audio_labels", dependencies=[Depends(allow_any_authenticated())])
+def get_audio_labels():
+    labels = load_labels("/audio-labelmap.txt", prefill=521)
+    return JSONResponse(content=labels)
+
+
@router.get("/plus/models", dependencies=[Depends(allow_any_authenticated())])
 def plusModels(request: Request, filterByCurrentModelDetector: bool = False):
    if not request.app.frigate_config.plus_api.is_active():
--- a/frigate/api/auth.py
+++ b/frigate/api/auth.py
@@ -1037,4 +1037,4 @@ async def get_allowed_cameras_for_filter(request: Request):
    role = current_user["role"]
    all_camera_names = set(request.app.frigate_config.cameras.keys())
    roles_dict = request.app.frigate_config.auth.roles
-    return User.get_allowed_cameras(role, roles_dict, all_camera_names)
+    return User.get_allowed_cameras(role, roles_dict, all_camera_names)
--- a/frigate/api/chat.py
+++ b/frigate/api/chat.py
@@ -3,12 +3,13 @@
 import base64
 import json
 import logging
-from datetime import datetime, timezone
-from typing import Any, Dict, List, Optional
+import time
+from datetime import datetime
+from typing import Any, Dict, Generator, List, Optional

 import cv2
 from fastapi import APIRouter, Body, Depends, Request
-from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse, StreamingResponse
 from pydantic import BaseModel

 from frigate.api.auth import (
@@ -20,16 +21,60 @@ from frigate.api.defs.request.chat_body import ChatCompletionRequest
 from frigate.api.defs.response.chat_response import (
    ChatCompletionResponse,
    ChatMessageResponse,
+    ToolCall,
 )
 from frigate.api.defs.tags import Tags
 from frigate.api.event import events
-from frigate.genai import get_genai_client
+from frigate.genai.utils import build_assistant_message_for_conversation

 logger = logging.getLogger(__name__)

 router = APIRouter(tags=[Tags.chat])


+def _chunk_content(content: str, chunk_size: int = 80) -> Generator[str, None, None]:
+    """Yield content in word-aware chunks for streaming."""
+    if not content:
+        return
+    words = content.split(" ")
+    current: List[str] = []
+    current_len = 0
+    for w in words:
+        current.append(w)
+        current_len += len(w) + 1
+        if current_len >= chunk_size:
+            yield " ".join(current) + " "
+            current = []
+            current_len = 0
+    if current:
+        yield " ".join(current)
+
+
+def _format_events_with_local_time(
+    events_list: List[Dict[str, Any]],
+) -> List[Dict[str, Any]]:
+    """Add human-readable local start/end times to each event for the LLM."""
+    result = []
+    for evt in events_list:
+        if not isinstance(evt, dict):
+            result.append(evt)
+            continue
+        copy_evt = dict(evt)
+        try:
+            start_ts = evt.get("start_time")
+            end_ts = evt.get("end_time")
+            if start_ts is not None:
+                dt_start = datetime.fromtimestamp(start_ts)
+                copy_evt["start_time_local"] = dt_start.strftime("%Y-%m-%d %I:%M:%S %p")
+            if end_ts is not None:
+                dt_end = datetime.fromtimestamp(end_ts)
+                copy_evt["end_time_local"] = dt_end.strftime("%Y-%m-%d %I:%M:%S %p")
+        except (TypeError, ValueError, OSError):
+            pass
+        result.append(copy_evt)
+    return result
+
+
 class ToolExecuteRequest(BaseModel):
    """Request model for tool execution."""

@@ -53,19 +98,25 @@ def get_tool_definitions() -> List[Dict[str, Any]]:
                    "Search for detected objects in Frigate by camera, object label, time range, "
                    "zones, and other filters. Use this to answer questions about when "
                    "objects were detected, what objects appeared, or to find specific object detections. "
-                    "An 'object' in Frigate represents a tracked detection (e.g., a person, package, car)."
+                    "An 'object' in Frigate represents a tracked detection (e.g., a person, package, car). "
+                    "When the user asks about a specific name (person, delivery company, animal, etc.), "
+                    "filter by sub_label only and do not set label."
                ),
                "parameters": {
                    "type": "object",
                    "properties": {
                        "camera": {
                            "type": "string",
-                            "description": "Camera name to filter by (optional). Use 'all' for all cameras.",
+                            "description": "Camera name to filter by (optional).",
                        },
                        "label": {
                            "type": "string",
                            "description": "Object label to filter by (e.g., 'person', 'package', 'car').",
                        },
+                        "sub_label": {
+                            "type": "string",
+                            "description": "Name of a person, delivery company, animal, etc. When filtering by a specific name, use only sub_label; do not set label.",
+                        },
                        "after": {
                            "type": "string",
                            "description": "Start time in ISO 8601 format (e.g., '2024-01-01T00:00:00Z').",
@@ -81,8 +132,8 @@ def get_tool_definitions() -> List[Dict[str, Any]]:
                        },
                        "limit": {
                            "type": "integer",
-                            "description": "Maximum number of objects to return (default: 10).",
-                            "default": 10,
+                            "description": "Maximum number of objects to return (default: 25).",
+                            "default": 25,
                        },
                    },
                },
@@ -120,14 +171,13 @@ def get_tool_definitions() -> List[Dict[str, Any]]:
    summary="Get available tools",
    description="Returns OpenAI-compatible tool definitions for function calling.",
 )
-def get_tools(request: Request) -> JSONResponse:
+def get_tools() -> JSONResponse:
    """Get list of available tools for LLM function calling."""
    tools = get_tool_definitions()
    return JSONResponse(content={"tools": tools})


 async def _execute_search_objects(
-    request: Request,
    arguments: Dict[str, Any],
    allowed_cameras: List[str],
 ) -> JSONResponse:
@@ -137,23 +187,26 @@ async def _execute_search_objects(
    This searches for detected objects (events) in Frigate using the same
    logic as the events API endpoint.
    """
-    # Parse ISO 8601 timestamps to Unix timestamps if provided
+    # Parse after/before as server local time; convert to Unix timestamp
    after = arguments.get("after")
    before = arguments.get("before")

+    def _parse_as_local_timestamp(s: str):
+        s = s.replace("Z", "").strip()[:19]
+        dt = datetime.strptime(s, "%Y-%m-%dT%H:%M:%S")
+        return time.mktime(dt.timetuple())
+
    if after:
        try:
-            after_dt = datetime.fromisoformat(after.replace("Z", "+00:00"))
-            after = after_dt.timestamp()
-        except (ValueError, AttributeError):
+            after = _parse_as_local_timestamp(after)
+        except (ValueError, AttributeError, TypeError):
            logger.warning(f"Invalid 'after' timestamp format: {after}")
            after = None

    if before:
        try:
-            before_dt = datetime.fromisoformat(before.replace("Z", "+00:00"))
-            before = before_dt.timestamp()
-        except (ValueError, AttributeError):
+            before = _parse_as_local_timestamp(before)
+        except (ValueError, AttributeError, TypeError):
            logger.warning(f"Invalid 'before' timestamp format: {before}")
            before = None

@@ -166,15 +219,14 @@ async def _execute_search_objects(

    # Build query parameters compatible with EventsQueryParams
    query_params = EventsQueryParams(
-        camera=arguments.get("camera", "all"),
        cameras=arguments.get("camera", "all"),
-        label=arguments.get("label", "all"),
        labels=arguments.get("label", "all"),
+        sub_labels=arguments.get("sub_label", "all").lower(),
        zones=zones,
        zone=zones,
        after=after,
        before=before,
-        limit=arguments.get("limit", 10),
+        limit=arguments.get("limit", 25),
    )

    try:
@@ -190,7 +242,7 @@ async def _execute_search_objects(
        return JSONResponse(
            content={
                "success": False,
-                "message": f"Error searching objects: {str(e)}",
+                "message": "Error searching objects",
            },
            status_code=500,
        )
@@ -203,7 +255,6 @@ async def _execute_search_objects(
    description="Execute a tool function call from an LLM.",
 )
 async def execute_tool(
-    request: Request,
    body: ToolExecuteRequest = Body(...),
    allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter),
 ) -> JSONResponse:
@@ -219,7 +270,7 @@ async def execute_tool(
    logger.debug(f"Executing tool: {tool_name} with arguments: {arguments}")

    if tool_name == "search_objects":
-        return await _execute_search_objects(request, arguments, allowed_cameras)
+        return await _execute_search_objects(arguments, allowed_cameras)

    return JSONResponse(
        content={
@@ -279,7 +330,7 @@ async def _execute_get_live_context(
    except Exception as e:
        logger.error(f"Error executing get_live_context: {e}", exc_info=True)
        return {
-            "error": f"Error getting live context: {str(e)}",
+            "error": "Error getting live context",
        }


@@ -335,7 +386,7 @@ async def _execute_tool_internal(
    This is used by the chat completion endpoint to execute tools.
    """
    if tool_name == "search_objects":
-        response = await _execute_search_objects(request, arguments, allowed_cameras)
+        response = await _execute_search_objects(arguments, allowed_cameras)
        try:
            if hasattr(response, "body"):
                body_str = response.body.decode("utf-8")
@@ -350,15 +401,109 @@ async def _execute_tool_internal(
    elif tool_name == "get_live_context":
        camera = arguments.get("camera")
        if not camera:
+            logger.error(
+                "Tool get_live_context failed: camera parameter is required. "
+                "Arguments: %s",
+                json.dumps(arguments),
+            )
            return {"error": "Camera parameter is required"}
        return await _execute_get_live_context(request, camera, allowed_cameras)
    else:
+        logger.error(
+            "Tool call failed: unknown tool %r. Expected one of: search_objects, get_live_context. "
+            "Arguments received: %s",
+            tool_name,
+            json.dumps(arguments),
+        )
        return {"error": f"Unknown tool: {tool_name}"}


+async def _execute_pending_tools(
+    pending_tool_calls: List[Dict[str, Any]],
+    request: Request,
+    allowed_cameras: List[str],
+) -> tuple[List[ToolCall], List[Dict[str, Any]]]:
+    """
+    Execute a list of tool calls; return (ToolCall list for API response, tool result dicts for conversation).
+    """
+    tool_calls_out: List[ToolCall] = []
+    tool_results: List[Dict[str, Any]] = []
+    for tool_call in pending_tool_calls:
+        tool_name = tool_call["name"]
+        tool_args = tool_call.get("arguments") or {}
+        tool_call_id = tool_call["id"]
+        logger.debug(
+            f"Executing tool: {tool_name} (id: {tool_call_id}) with arguments: {json.dumps(tool_args, indent=2)}"
+        )
+        try:
+            tool_result = await _execute_tool_internal(
+                tool_name, tool_args, request, allowed_cameras
+            )
+            if isinstance(tool_result, dict) and tool_result.get("error"):
+                logger.error(
+                    "Tool call %s (id: %s) returned error: %s. Arguments: %s",
+                    tool_name,
+                    tool_call_id,
+                    tool_result.get("error"),
+                    json.dumps(tool_args),
+                )
+            if tool_name == "search_objects" and isinstance(tool_result, list):
+                tool_result = _format_events_with_local_time(tool_result)
+                _keys = {
+                    "id",
+                    "camera",
+                    "label",
+                    "zones",
+                    "start_time_local",
+                    "end_time_local",
+                    "sub_label",
+                    "event_count",
+                }
+                tool_result = [
+                    {k: evt[k] for k in _keys if k in evt}
+                    for evt in tool_result
+                    if isinstance(evt, dict)
+                ]
+            result_content = (
+                json.dumps(tool_result)
+                if isinstance(tool_result, (dict, list))
+                else (tool_result if isinstance(tool_result, str) else str(tool_result))
+            )
+            tool_calls_out.append(
+                ToolCall(name=tool_name, arguments=tool_args, response=result_content)
+            )
+            tool_results.append(
+                {
+                    "role": "tool",
+                    "tool_call_id": tool_call_id,
+                    "content": result_content,
+                }
+            )
+        except Exception as e:
+            logger.error(
+                "Error executing tool %s (id: %s): %s. Arguments: %s",
+                tool_name,
+                tool_call_id,
+                e,
+                json.dumps(tool_args),
+                exc_info=True,
+            )
+            error_content = json.dumps({"error": f"Tool execution failed: {str(e)}"})
+            tool_calls_out.append(
+                ToolCall(name=tool_name, arguments=tool_args, response=error_content)
+            )
+            tool_results.append(
+                {
+                    "role": "tool",
+                    "tool_call_id": tool_call_id,
+                    "content": error_content,
+                }
+            )
+    return (tool_calls_out, tool_results)
+
+
@router.post(
    "/chat/completion",
-    response_model=ChatCompletionResponse,
    dependencies=[Depends(allow_any_authenticated())],
    summary="Chat completion with tool calling",
    description=(
@@ -370,7 +515,7 @@ async def chat_completion(
    request: Request,
    body: ChatCompletionRequest = Body(...),
    allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter),
-) -> JSONResponse:
+):
    """
    Chat completion endpoint with tool calling support.

@@ -383,7 +528,7 @@ async def chat_completion(
    6. Repeats until final answer
    7. Returns response to user
    """
-    genai_client = get_genai_client(request.app.frigate_config)
+    genai_client = request.app.genai_manager.tool_client
    if not genai_client:
        return JSONResponse(
            content={
@@ -395,9 +540,9 @@ async def chat_completion(
    tools = get_tool_definitions()
    conversation = []

-    current_datetime = datetime.now(timezone.utc)
+    current_datetime = datetime.now()
    current_date_str = current_datetime.strftime("%Y-%m-%d")
-    current_time_str = current_datetime.strftime("%H:%M:%S %Z")
+    current_time_str = current_datetime.strftime("%I:%M:%S %p")

    cameras_info = []
    config = request.app.frigate_config
@@ -430,9 +575,12 @@ async def chat_completion(

    system_prompt = f"""You are a helpful assistant for Frigate, a security camera NVR system. You help users answer questions about their cameras, detected objects, and events.

-Current date and time: {current_date_str} at {current_time_str} (UTC)
+Current server local date and time: {current_date_str} at {current_time_str}

-When users ask questions about "today", "yesterday", "this week", etc., use the current date above as reference.
+Do not start your response with phrases like "I will check...", "Let me see...", or "Let me look...". Answer directly.
+
+Always present times to the user in the server's local timezone. When tool results include start_time_local and end_time_local, use those exact strings when listing or describing detection times—do not convert or invent timestamps. Do not use UTC or ISO format with Z for the user-facing answer unless the tool result only provides Unix timestamps without local time fields.
+When users ask about "today", "yesterday", "this week", etc., use the current date above as reference.
 When searching for objects or events, use ISO 8601 format for dates (e.g., {current_date_str}T00:00:00Z for the start of today).
 Always be accurate with time calculations based on the current date provided.{cameras_section}{live_image_note}"""

@@ -472,6 +620,7 @@ Always be accurate with time calculations based on the current date provided.{ca
        conversation.append(msg_dict)

    tool_iterations = 0
+    tool_calls: List[ToolCall] = []
    max_iterations = body.max_tool_iterations

    logger.debug(
@@ -479,6 +628,81 @@ Always be accurate with time calculations based on the current date provided.{ca
        f"{len(tools)} tool(s) available, max_iterations={max_iterations}"
    )

+    # True LLM streaming when client supports it and stream requested
+    if body.stream and hasattr(genai_client, "chat_with_tools_stream"):
+        stream_tool_calls: List[ToolCall] = []
+        stream_iterations = 0
+
+        async def stream_body_llm():
+            nonlocal conversation, stream_tool_calls, stream_iterations
+            while stream_iterations < max_iterations:
+                logger.debug(
+                    f"Streaming LLM (iteration {stream_iterations + 1}/{max_iterations}) "
+                    f"with {len(conversation)} message(s)"
+                )
+                async for event in genai_client.chat_with_tools_stream(
+                    messages=conversation,
+                    tools=tools if tools else None,
+                    tool_choice="auto",
+                ):
+                    kind, value = event
+                    if kind == "content_delta":
+                        yield (
+                            json.dumps({"type": "content", "delta": value}).encode(
+                                "utf-8"
+                            )
+                            + b"\n"
+                        )
+                    elif kind == "message":
+                        msg = value
+                        if msg.get("finish_reason") == "error":
+                            yield (
+                                json.dumps(
+                                    {
+                                        "type": "error",
+                                        "error": "An error occurred while processing your request.",
+                                    }
+                                ).encode("utf-8")
+                                + b"\n"
+                            )
+                            return
+                        pending = msg.get("tool_calls")
+                        if pending:
+                            stream_iterations += 1
+                            conversation.append(
+                                build_assistant_message_for_conversation(
+                                    msg.get("content"), pending
+                                )
+                            )
+                            executed_calls, tool_results = await _execute_pending_tools(
+                                pending, request, allowed_cameras
+                            )
+                            stream_tool_calls.extend(executed_calls)
+                            conversation.extend(tool_results)
+                            yield (
+                                json.dumps(
+                                    {
+                                        "type": "tool_calls",
+                                        "tool_calls": [
+                                            tc.model_dump() for tc in stream_tool_calls
+                                        ],
+                                    }
+                                ).encode("utf-8")
+                                + b"\n"
+                            )
+                            break
+                        else:
+                            yield (json.dumps({"type": "done"}).encode("utf-8") + b"\n")
+                            return
+            else:
+                yield json.dumps({"type": "done"}).encode("utf-8") + b"\n"
+
+        return StreamingResponse(
+            stream_body_llm(),
+            media_type="application/x-ndjson",
+            headers={"X-Accel-Buffering": "no"},
+        )
+
    try:
        while tool_iterations < max_iterations:
            logger.debug(
@@ -500,119 +724,71 @@ Always be accurate with time calculations based on the current date provided.{ca
                    status_code=500,
                )

-            assistant_message = {
-                "role": "assistant",
-                "content": response.get("content"),
-            }
-            if response.get("tool_calls"):
-                assistant_message["tool_calls"] = [
-                    {
-                        "id": tc["id"],
-                        "type": "function",
-                        "function": {
-                            "name": tc["name"],
-                            "arguments": json.dumps(tc["arguments"]),
-                        },
-                    }
-                    for tc in response["tool_calls"]
-                ]
-            conversation.append(assistant_message)
+            conversation.append(
+                build_assistant_message_for_conversation(
+                    response.get("content"), response.get("tool_calls")
+                )
+            )

-            tool_calls = response.get("tool_calls")
-            if not tool_calls:
+            pending_tool_calls = response.get("tool_calls")
+            if not pending_tool_calls:
                logger.debug(
                    f"Chat completion finished with final answer (iterations: {tool_iterations})"
                )
+                final_content = response.get("content") or ""
+
+                if body.stream:
+
+                    async def stream_body() -> Any:
+                        if tool_calls:
+                            yield (
+                                json.dumps(
+                                    {
+                                        "type": "tool_calls",
+                                        "tool_calls": [
+                                            tc.model_dump() for tc in tool_calls
+                                        ],
+                                    }
+                                ).encode("utf-8")
+                                + b"\n"
+                            )
+                        # Stream content in word-sized chunks for smooth UX
+                        for part in _chunk_content(final_content):
+                            yield (
+                                json.dumps({"type": "content", "delta": part}).encode(
+                                    "utf-8"
+                                )
+                                + b"\n"
+                            )
+                        yield json.dumps({"type": "done"}).encode("utf-8") + b"\n"
+
+                    return StreamingResponse(
+                        stream_body(),
+                        media_type="application/x-ndjson",
+                    )
+
                return JSONResponse(
                    content=ChatCompletionResponse(
                        message=ChatMessageResponse(
                            role="assistant",
-                            content=response.get("content"),
+                            content=final_content,
                            tool_calls=None,
                        ),
                        finish_reason=response.get("finish_reason", "stop"),
                        tool_iterations=tool_iterations,
+                        tool_calls=tool_calls,
                    ).model_dump(),
                )

-            # Execute tools
            tool_iterations += 1
            logger.debug(
                f"Tool calls detected (iteration {tool_iterations}/{max_iterations}): "
-                f"{len(tool_calls)} tool(s) to execute"
+                f"{len(pending_tool_calls)} tool(s) to execute"
            )
-            tool_results = []
-
-            for tool_call in tool_calls:
-                tool_name = tool_call["name"]
-                tool_args = tool_call["arguments"]
-                tool_call_id = tool_call["id"]
-
-                logger.debug(
-                    f"Executing tool: {tool_name} (id: {tool_call_id}) with arguments: {json.dumps(tool_args, indent=2)}"
-                )
-
-                try:
-                    tool_result = await _execute_tool_internal(
-                        tool_name, tool_args, request, allowed_cameras
-                    )
-
-                    if isinstance(tool_result, dict):
-                        result_content = json.dumps(tool_result)
-                        result_summary = tool_result
-                        if isinstance(tool_result, dict) and isinstance(
-                            tool_result.get("content"), list
-                        ):
-                            result_count = len(tool_result.get("content", []))
-                            result_summary = {
-                                "count": result_count,
-                                "sample": tool_result.get("content", [])[:2]
-                                if result_count > 0
-                                else [],
-                            }
-                        logger.debug(
-                            f"Tool {tool_name} (id: {tool_call_id}) completed successfully. "
-                            f"Result: {json.dumps(result_summary, indent=2)}"
-                        )
-                    elif isinstance(tool_result, str):
-                        result_content = tool_result
-                        logger.debug(
-                            f"Tool {tool_name} (id: {tool_call_id}) completed successfully. "
-                            f"Result length: {len(result_content)} characters"
-                        )
-                    else:
-                        result_content = str(tool_result)
-                        logger.debug(
-                            f"Tool {tool_name} (id: {tool_call_id}) completed successfully. "
-                            f"Result type: {type(tool_result).__name__}"
-                        )
-
-                    tool_results.append(
-                        {
-                            "role": "tool",
-                            "tool_call_id": tool_call_id,
-                            "content": result_content,
-                        }
-                    )
-                except Exception as e:
-                    logger.error(
-                        f"Error executing tool {tool_name} (id: {tool_call_id}): {e}",
-                        exc_info=True,
-                    )
-                    error_content = json.dumps(
-                        {"error": f"Tool execution failed: {str(e)}"}
-                    )
-                    tool_results.append(
-                        {
-                            "role": "tool",
-                            "tool_call_id": tool_call_id,
-                            "content": error_content,
-                        }
-                    )
-                    logger.debug(
-                        f"Tool {tool_name} (id: {tool_call_id}) failed. Error result added to conversation."
-                    )
-
+            executed_calls, tool_results = await _execute_pending_tools(
+                pending_tool_calls, request, allowed_cameras
+            )
+            tool_calls.extend(executed_calls)
            conversation.extend(tool_results)
            logger.debug(
                f"Added {len(tool_results)} tool result(s) to conversation. "
@@ -631,6 +807,7 @@ Always be accurate with time calculations based on the current date provided.{ca
                ),
                finish_reason="length",
                tool_iterations=tool_iterations,
+                tool_calls=tool_calls,
            ).model_dump(),
        )

--- a/frigate/api/defs/request/chat_body.py
+++ b/frigate/api/defs/request/chat_body.py
@@ -39,3 +39,7 @@ class ChatCompletionRequest(BaseModel):
            "user message as multimodal content. Use with get_live_context for detection info."
        ),
    )
+    stream: bool = Field(
+        default=False,
+        description="If true, stream the final assistant response in the body as newline-delimited JSON.",
+    )
--- a/frigate/api/defs/response/chat_response.py
+++ b/frigate/api/defs/response/chat_response.py
@@ -5,8 +5,8 @@ from typing import Any, Optional
 from pydantic import BaseModel, Field


-class ToolCall(BaseModel):
-    """A tool call from the LLM."""
+class ToolCallInvocation(BaseModel):
+    """A tool call requested by the LLM (before execution)."""

    id: str = Field(description="Unique identifier for this tool call")
    name: str = Field(description="Tool name to call")
@@ -20,11 +20,24 @@ class ChatMessageResponse(BaseModel):
    content: Optional[str] = Field(
        default=None, description="Message content (None if tool calls present)"
    )
-    tool_calls: Optional[list[ToolCall]] = Field(
+    tool_calls: Optional[list[ToolCallInvocation]] = Field(
        default=None, description="Tool calls if LLM wants to call tools"
    )


+class ToolCall(BaseModel):
+    """A tool that was executed during the completion, with its response."""
+
+    name: str = Field(description="Tool name that was called")
+    arguments: dict[str, Any] = Field(
+        default_factory=dict, description="Arguments passed to the tool"
+    )
+    response: str = Field(
+        default="",
+        description="The response or result returned from the tool execution",
+    )
+
+
 class ChatCompletionResponse(BaseModel):
    """Response from chat completion."""

@@ -35,3 +48,7 @@ class ChatCompletionResponse(BaseModel):
    tool_iterations: int = Field(
        default=0, description="Number of tool call iterations performed"
    )
+    tool_calls: list[ToolCall] = Field(
+        default_factory=list,
+        description="List of tool calls that were executed during this completion",
+    )
--- a/frigate/api/fastapi_app.py
+++ b/frigate/api/fastapi_app.py
@@ -33,6 +33,7 @@ from frigate.comms.event_metadata_updater import (
 from frigate.config import FrigateConfig
 from frigate.config.camera.updater import CameraConfigUpdatePublisher
 from frigate.embeddings import EmbeddingsContext
+from frigate.genai import GenAIClientManager
 from frigate.ptz.onvif import OnvifController
 from frigate.stats.emitter import StatsEmitter
 from frigate.storage import StorageMaintainer
@@ -134,6 +135,7 @@ def create_fastapi_app(
    app.include_router(record.router)
    # App Properties
    app.frigate_config = frigate_config
+    app.genai_manager = GenAIClientManager(frigate_config)
    app.embeddings = embeddings
    app.detected_frames_processor = detected_frames_processor
    app.storage_maintainer = storage_maintainer
--- a/frigate/api/review.py
+++ b/frigate/api/review.py
@@ -33,7 +33,6 @@ from frigate.api.defs.response.review_response import (
    ReviewSummaryResponse,
 )
 from frigate.api.defs.tags import Tags
-from frigate.config import FrigateConfig
 from frigate.embeddings import EmbeddingsContext
 from frigate.models import Recordings, ReviewSegment, UserReviewStatus
 from frigate.review.types import SeverityEnum
@@ -747,9 +746,7 @@ async def set_not_reviewed(
    description="Use GenAI to summarize review items over a period of time.",
 )
 def generate_review_summary(request: Request, start_ts: float, end_ts: float):
-    config: FrigateConfig = request.app.frigate_config
-
-    if not config.genai.provider:
+    if not request.app.genai_manager.vision_client:
        return JSONResponse(
            content=(
                {
--- a/frigate/camera/state.py
+++ b/frigate/camera/state.py
@@ -65,7 +65,7 @@ class CameraState:
        frame_copy = cv2.cvtColor(frame_copy, cv2.COLOR_YUV2BGR_I420)
        # draw on the frame
        if draw_options.get("mask"):
-            mask_overlay = np.where(self.camera_config.motion.mask == [0])
+            mask_overlay = np.where(self.camera_config.motion.rasterized_mask == [0])
            frame_copy[mask_overlay] = [0, 0, 0]

        if draw_options.get("bounding_boxes"):
@@ -197,6 +197,10 @@ class CameraState:

        if draw_options.get("zones"):
            for name, zone in self.camera_config.zones.items():
+                # skip disabled zones
+                if not zone.enabled:
+                    continue
+
                thickness = (
                    8
                    if any(
--- a/frigate/comms/dispatcher.py
+++ b/frigate/comms/dispatcher.py
@@ -15,6 +15,7 @@ from frigate.config.camera.updater import (
    CameraConfigUpdatePublisher,
    CameraConfigUpdateTopic,
 )
+from frigate.config.config import RuntimeFilterConfig, RuntimeMotionConfig
 from frigate.const import (
    CLEAR_ONGOING_REVIEW_SEGMENTS,
    EXPIRE_AUDIO_ACTIVITY,
@@ -84,6 +85,9 @@ class Dispatcher:
            "review_detections": self._on_detections_command,
            "object_descriptions": self._on_object_description_command,
            "review_descriptions": self._on_review_description_command,
+            "motion_mask": self._on_motion_mask_command,
+            "object_mask": self._on_object_mask_command,
+            "zone": self._on_zone_command,
        }
        self._global_settings_handlers: dict[str, Callable] = {
            "notifications": self._on_global_notification_command,
@@ -100,11 +104,20 @@ class Dispatcher:
        """Handle receiving of payload from communicators."""

        def handle_camera_command(
-            command_type: str, camera_name: str, command: str, payload: str
+            command_type: str,
+            camera_name: str,
+            command: str,
+            payload: str,
+            sub_command: str | None = None,
        ) -> None:
            try:
                if command_type == "set":
-                    self._camera_settings_handlers[command](camera_name, payload)
+                    if sub_command:
+                        self._camera_settings_handlers[command](
+                            camera_name, sub_command, payload
+                        )
+                    else:
+                        self._camera_settings_handlers[command](camera_name, payload)
                elif command_type == "ptz":
                    self._on_ptz_command(camera_name, payload)
            except KeyError:
@@ -314,6 +327,14 @@ class Dispatcher:
                    camera_name = parts[-3]
                    command = parts[-2]
                    handle_camera_command("set", camera_name, command, payload)
+                elif len(parts) == 4 and topic.endswith("set"):
+                    # example /cam_name/motion_mask/mask_name/set payload=ON|OFF
+                    camera_name = parts[-4]
+                    command = parts[-3]
+                    sub_command = parts[-2]
+                    handle_camera_command(
+                        "set", camera_name, command, payload, sub_command
+                    )
                elif len(parts) == 2 and topic.endswith("set"):
                    command = parts[-2]
                    self._global_settings_handlers[command](payload)
@@ -858,3 +879,149 @@ class Dispatcher:
            genai_settings,
        )
        self.publish(f"{camera_name}/review_descriptions/state", payload, retain=True)
+
+    def _on_motion_mask_command(
+        self, camera_name: str, mask_name: str, payload: str
+    ) -> None:
+        """Callback for motion mask topic."""
+        if payload not in ["ON", "OFF"]:
+            logger.error(f"Invalid payload for motion mask {mask_name}: {payload}")
+            return
+
+        motion_settings = self.config.cameras[camera_name].motion
+
+        if mask_name not in motion_settings.mask:
+            logger.error(f"Unknown motion mask: {mask_name}")
+            return
+
+        mask = motion_settings.mask[mask_name]
+
+        if not mask:
+            logger.error(f"Motion mask {mask_name} is None")
+            return
+
+        if payload == "ON":
+            if not mask.enabled_in_config:
+                logger.error(
+                    f"Motion mask {mask_name} must be enabled in the config to be turned on via MQTT."
+                )
+                return
+
+        mask.enabled = payload == "ON"
+
+        # Recreate RuntimeMotionConfig to update rasterized_mask
+        motion_settings = RuntimeMotionConfig(
+            frame_shape=self.config.cameras[camera_name].frame_shape,
+            **motion_settings.model_dump(exclude_unset=True),
+        )
+
+        # Update the dispatcher's own config
+        self.config.cameras[camera_name].motion = motion_settings
+
+        self.config_updater.publish_update(
+            CameraConfigUpdateTopic(CameraConfigUpdateEnum.motion, camera_name),
+            motion_settings,
+        )
+        self.publish(
+            f"{camera_name}/motion_mask/{mask_name}/state", payload, retain=True
+        )
+
+    def _on_object_mask_command(
+        self, camera_name: str, mask_name: str, payload: str
+    ) -> None:
+        """Callback for object mask topic."""
+        if payload not in ["ON", "OFF"]:
+            logger.error(f"Invalid payload for object mask {mask_name}: {payload}")
+            return
+
+        object_settings = self.config.cameras[camera_name].objects
+
+        # Check if this is a global mask
+        mask_found = False
+        if mask_name in object_settings.mask:
+            mask = object_settings.mask[mask_name]
+            if mask:
+                if payload == "ON":
+                    if not mask.enabled_in_config:
+                        logger.error(
+                            f"Object mask {mask_name} must be enabled in the config to be turned on via MQTT."
+                        )
+                        return
+                mask.enabled = payload == "ON"
+                mask_found = True
+
+        # Check if this is a per-object filter mask
+        for object_name, filter_config in object_settings.filters.items():
+            if mask_name in filter_config.mask:
+                mask = filter_config.mask[mask_name]
+                if mask:
+                    if payload == "ON":
+                        if not mask.enabled_in_config:
+                            logger.error(
+                                f"Object mask {mask_name} must be enabled in the config to be turned on via MQTT."
+                            )
+                            return
+                    mask.enabled = payload == "ON"
+                    mask_found = True
+
+        if not mask_found:
+            logger.error(f"Unknown object mask: {mask_name}")
+            return
+
+        # Recreate RuntimeFilterConfig for each object filter to update rasterized_mask
+        for object_name, filter_config in object_settings.filters.items():
+            # Merge global object masks with per-object filter masks
+            merged_mask = dict(filter_config.mask)  # Copy filter-specific masks
+
+            # Add global object masks if they exist
+            if object_settings.mask:
+                for global_mask_id, global_mask_config in object_settings.mask.items():
+                    # Use a global prefix to avoid key collisions
+                    global_mask_id_prefixed = f"global_{global_mask_id}"
+                    merged_mask[global_mask_id_prefixed] = global_mask_config
+
+            object_settings.filters[object_name] = RuntimeFilterConfig(
+                frame_shape=self.config.cameras[camera_name].frame_shape,
+                mask=merged_mask,
+                **filter_config.model_dump(
+                    exclude_unset=True, exclude={"mask", "raw_mask"}
+                ),
+            )
+
+        # Update the dispatcher's own config
+        self.config.cameras[camera_name].objects = object_settings
+
+        self.config_updater.publish_update(
+            CameraConfigUpdateTopic(CameraConfigUpdateEnum.objects, camera_name),
+            object_settings,
+        )
+        self.publish(
+            f"{camera_name}/object_mask/{mask_name}/state", payload, retain=True
+        )
+
+    def _on_zone_command(self, camera_name: str, zone_name: str, payload: str) -> None:
+        """Callback for zone topic."""
+        if payload not in ["ON", "OFF"]:
+            logger.error(f"Invalid payload for zone {zone_name}: {payload}")
+            return
+
+        camera_config = self.config.cameras[camera_name]
+
+        if zone_name not in camera_config.zones:
+            logger.error(f"Unknown zone: {zone_name}")
+            return
+
+        if payload == "ON":
+            if not camera_config.zones[zone_name].enabled_in_config:
+                logger.error(
+                    f"Zone {zone_name} must be enabled in the config to be turned on via MQTT."
+                )
+                return
+
+        camera_config.zones[zone_name].enabled = payload == "ON"
+
+        self.config_updater.publish_update(
+            CameraConfigUpdateTopic(CameraConfigUpdateEnum.zones, camera_name),
+            camera_config.zones,
+        )
+        self.publish(f"{camera_name}/zone/{zone_name}/state", payload, retain=True)
--- a/frigate/comms/mqtt.py
+++ b/frigate/comms/mqtt.py
@@ -133,6 +133,29 @@ class MqttClient(Communicator):
                retain=True,
            )

+            for mask_name, motion_mask in camera.motion.mask.items():
+                if motion_mask:
+                    self.publish(
+                        f"{camera_name}/motion_mask/{mask_name}/state",
+                        "ON" if motion_mask.enabled else "OFF",
+                        retain=True,
+                    )
+
+            for mask_name, object_mask in camera.objects.mask.items():
+                if object_mask:
+                    self.publish(
+                        f"{camera_name}/object_mask/{mask_name}/state",
+                        "ON" if object_mask.enabled else "OFF",
+                        retain=True,
+                    )
+
+            for zone_name, zone in camera.zones.items():
+                self.publish(
+                    f"{camera_name}/zone/{zone_name}/state",
+                    "ON" if zone.enabled else "OFF",
+                    retain=True,
+                )
+
        if self.config.notifications.enabled_in_config:
            self.publish(
                "notifications/state",
@@ -242,6 +265,24 @@ class MqttClient(Communicator):
                    self.on_mqtt_command,
                )

+            for mask_name in self.config.cameras[name].motion.mask.keys():
+                self.client.message_callback_add(
+                    f"{self.mqtt_config.topic_prefix}/{name}/motion_mask/{mask_name}/set",
+                    self.on_mqtt_command,
+                )
+
+            for mask_name in self.config.cameras[name].objects.mask.keys():
+                self.client.message_callback_add(
+                    f"{self.mqtt_config.topic_prefix}/{name}/object_mask/{mask_name}/set",
+                    self.on_mqtt_command,
+                )
+
+            for zone_name in self.config.cameras[name].zones.keys():
+                self.client.message_callback_add(
+                    f"{self.mqtt_config.topic_prefix}/{name}/zone/{zone_name}/set",
+                    self.on_mqtt_command,
+                )
+
        if self.config.notifications.enabled_in_config:
            self.client.message_callback_add(
                f"{self.mqtt_config.topic_prefix}/notifications/set",
--- a/frigate/config/auth.py
+++ b/frigate/config/auth.py
@@ -8,39 +8,63 @@ __all__ = ["AuthConfig"]


 class AuthConfig(FrigateBaseModel):
-    enabled: bool = Field(default=True, title="Enable authentication")
+    enabled: bool = Field(
+        default=True,
+        title="Enable authentication",
+        description="Enable native authentication for the Frigate UI.",
+    )
    reset_admin_password: bool = Field(
-        default=False, title="Reset the admin password on startup"
+        default=False,
+        title="Reset admin password",
+        description="If true, reset the admin user's password on startup and print the new password in logs.",
    )
    cookie_name: str = Field(
-        default="frigate_token", title="Name for jwt token cookie", pattern=r"^[a-z_]+$"
+        default="frigate_token",
+        title="JWT cookie name",
+        description="Name of the cookie used to store the JWT token for native authentication.",
+        pattern=r"^[a-z_]+$",
+    )
+    cookie_secure: bool = Field(
+        default=False,
+        title="Secure cookie flag",
+        description="Set the secure flag on the auth cookie; should be true when using TLS.",
    )
-    cookie_secure: bool = Field(default=False, title="Set secure flag on cookie")
    session_length: int = Field(
-        default=86400, title="Session length for jwt session tokens", ge=60
+        default=86400,
+        title="Session length",
+        description="Session duration in seconds for JWT-based sessions.",
+        ge=60,
    )
    refresh_time: int = Field(
        default=1800,
-        title="Refresh the session if it is going to expire in this many seconds",
+        title="Session refresh window",
+        description="When a session is within this many seconds of expiring, refresh it back to full length.",
        ge=30,
    )
    failed_login_rate_limit: Optional[str] = Field(
        default=None,
-        title="Rate limits for failed login attempts.",
+        title="Failed login limits",
+        description="Rate limiting rules for failed login attempts to reduce brute-force attacks.",
    )
    trusted_proxies: list[str] = Field(
        default=[],
-        title="Trusted proxies for determining IP address to rate limit",
+        title="Trusted proxies",
+        description="List of trusted proxy IPs used when determining client IP for rate limiting.",
    )
    # As of Feb 2023, OWASP recommends 600000 iterations for PBKDF2-SHA256
-    hash_iterations: int = Field(default=600000, title="Password hash iterations")
+    hash_iterations: int = Field(
+        default=600000,
+        title="Hash iterations",
+        description="Number of PBKDF2-SHA256 iterations to use when hashing user passwords.",
+    )
    roles: Dict[str, List[str]] = Field(
        default_factory=dict,
-        title="Role to camera mappings. Empty list grants access to all cameras.",
+        title="Role mappings",
+        description="Map roles to camera lists. An empty list grants access to all cameras for the role.",
    )
    admin_first_time_login: Optional[bool] = Field(
        default=False,
-        title="Internal field to expose first-time admin login flag to the UI",
+        title="First-time admin flag",
        description=(
            "When true the UI may show a help link on the login page informing users how to sign in after an admin password reset. "
        ),
--- a/frigate/config/camera/audio.py
+++ b/frigate/config/camera/audio.py
@@ -17,25 +17,45 @@ class AudioFilterConfig(FrigateBaseModel):
        default=0.8,
        ge=AUDIO_MIN_CONFIDENCE,
        lt=1.0,
-        title="Minimum detection confidence threshold for audio to be counted.",
+        title="Minimum audio confidence",
+        description="Minimum confidence threshold for the audio event to be counted.",
    )


 class AudioConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable audio events.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable audio detection",
+        description="Enable or disable audio event detection for all cameras; can be overridden per-camera.",
+    )
    max_not_heard: int = Field(
-        default=30, title="Seconds of not hearing the type of audio to end the event."
+        default=30,
+        title="End timeout",
+        description="Amount of seconds without the configured audio type before the audio event is ended.",
    )
    min_volume: int = Field(
-        default=500, title="Min volume required to run audio detection."
+        default=500,
+        title="Minimum volume",
+        description="Minimum RMS volume threshold required to run audio detection; lower values increase sensitivity (e.g., 200 high, 500 medium, 1000 low).",
    )
    listen: list[str] = Field(
-        default=DEFAULT_LISTEN_AUDIO, title="Audio to listen for."
+        default=DEFAULT_LISTEN_AUDIO,
+        title="Listen types",
+        description="List of audio event types to detect (for example: bark, fire_alarm, scream, speech, yell).",
    )
    filters: Optional[dict[str, AudioFilterConfig]] = Field(
-        None, title="Audio filters."
+        None,
+        title="Audio filters",
+        description="Per-audio-type filter settings such as confidence thresholds used to reduce false positives.",
    )
    enabled_in_config: Optional[bool] = Field(
-        None, title="Keep track of original state of audio detection."
+        None,
+        title="Original audio state",
+        description="Indicates whether audio detection was originally enabled in the static config file.",
+    )
+    num_threads: int = Field(
+        default=2,
+        title="Detection threads",
+        description="Number of threads to use for audio detection processing.",
+        ge=1,
    )
-    num_threads: int = Field(default=2, title="Number of detection threads", ge=1)
--- a/frigate/config/camera/birdseye.py
+++ b/frigate/config/camera/birdseye.py
@@ -29,45 +29,88 @@ class BirdseyeModeEnum(str, Enum):

 class BirdseyeLayoutConfig(FrigateBaseModel):
    scaling_factor: float = Field(
-        default=2.0, title="Birdseye Scaling Factor", ge=1.0, le=5.0
+        default=2.0,
+        title="Scaling factor",
+        description="Scaling factor used by the layout calculator (range 1.0 to 5.0).",
+        ge=1.0,
+        le=5.0,
+    )
+    max_cameras: Optional[int] = Field(
+        default=None,
+        title="Max cameras",
+        description="Maximum number of cameras to display at once in Birdseye; shows the most recent cameras.",
    )
-    max_cameras: Optional[int] = Field(default=None, title="Max cameras")


 class BirdseyeConfig(FrigateBaseModel):
-    enabled: bool = Field(default=True, title="Enable birdseye view.")
+    enabled: bool = Field(
+        default=True,
+        title="Enable Birdseye",
+        description="Enable or disable the Birdseye view feature.",
+    )
    mode: BirdseyeModeEnum = Field(
-        default=BirdseyeModeEnum.objects, title="Tracking mode."
+        default=BirdseyeModeEnum.objects,
+        title="Tracking mode",
+        description="Mode for including cameras in Birdseye: 'objects', 'motion', or 'continuous'.",
    )

-    restream: bool = Field(default=False, title="Restream birdseye via RTSP.")
-    width: int = Field(default=1280, title="Birdseye width.")
-    height: int = Field(default=720, title="Birdseye height.")
+    restream: bool = Field(
+        default=False,
+        title="Restream RTSP",
+        description="Re-stream the Birdseye output as an RTSP feed; enabling this will keep Birdseye running continuously.",
+    )
+    width: int = Field(
+        default=1280,
+        title="Width",
+        description="Output width (pixels) of the composed Birdseye frame.",
+    )
+    height: int = Field(
+        default=720,
+        title="Height",
+        description="Output height (pixels) of the composed Birdseye frame.",
+    )
    quality: int = Field(
        default=8,
-        title="Encoding quality.",
+        title="Encoding quality",
+        description="Encoding quality for the Birdseye mpeg1 feed (1 highest quality, 31 lowest).",
        ge=1,
        le=31,
    )
    inactivity_threshold: int = Field(
-        default=30, title="Birdseye Inactivity Threshold", gt=0
+        default=30,
+        title="Inactivity threshold",
+        description="Seconds of inactivity after which a camera will stop being shown in Birdseye.",
+        gt=0,
    )
    layout: BirdseyeLayoutConfig = Field(
-        default_factory=BirdseyeLayoutConfig, title="Birdseye Layout Config"
+        default_factory=BirdseyeLayoutConfig,
+        title="Layout",
+        description="Layout options for the Birdseye composition.",
    )
    idle_heartbeat_fps: float = Field(
        default=0.0,
        ge=0.0,
        le=10.0,
-        title="Idle heartbeat FPS (0 disables, max 10)",
+        title="Idle heartbeat FPS",
+        description="Frames-per-second to resend the last composed Birdseye frame when idle; set to 0 to disable.",
    )


 # uses BaseModel because some global attributes are not available at the camera level
 class BirdseyeCameraConfig(BaseModel):
-    enabled: bool = Field(default=True, title="Enable birdseye view for camera.")
+    enabled: bool = Field(
+        default=True,
+        title="Enable Birdseye",
+        description="Enable or disable the Birdseye view feature.",
+    )
    mode: BirdseyeModeEnum = Field(
-        default=BirdseyeModeEnum.objects, title="Tracking mode for camera."
+        default=BirdseyeModeEnum.objects,
+        title="Tracking mode",
+        description="Mode for including cameras in Birdseye: 'objects', 'motion', or 'continuous'.",
    )

-    order: int = Field(default=0, title="Position of the camera in the birdseye view.")
+    order: int = Field(
+        default=0,
+        title="Position",
+        description="Numeric position controlling the camera's ordering in the Birdseye layout.",
+    )
--- a/frigate/config/camera/camera.py
+++ b/frigate/config/camera/camera.py
@@ -50,10 +50,17 @@ class CameraTypeEnum(str, Enum):


 class CameraConfig(FrigateBaseModel):
-    name: Optional[str] = Field(None, title="Camera name.", pattern=REGEX_CAMERA_NAME)
+    name: Optional[str] = Field(
+        None,
+        title="Camera name",
+        description="Camera name is required",
+        pattern=REGEX_CAMERA_NAME,
+    )

    friendly_name: Optional[str] = Field(
-        None, title="Camera friendly name used in the Frigate UI."
+        None,
+        title="Friendly name",
+        description="Camera friendly name used in the Frigate UI",
    )

    @model_validator(mode="before")
@@ -63,80 +70,129 @@ class CameraConfig(FrigateBaseModel):
            pass
        return values

-    enabled: bool = Field(default=True, title="Enable camera.")
+    enabled: bool = Field(default=True, title="Enabled", description="Enabled")

    # Options with global fallback
    audio: AudioConfig = Field(
-        default_factory=AudioConfig, title="Audio events configuration."
+        default_factory=AudioConfig,
+        title="Audio events",
+        description="Settings for audio-based event detection for this camera.",
    )
    audio_transcription: CameraAudioTranscriptionConfig = Field(
        default_factory=CameraAudioTranscriptionConfig,
-        title="Audio transcription config.",
+        title="Audio transcription",
+        description="Settings for live and speech audio transcription used for events and live captions.",
    )
    birdseye: BirdseyeCameraConfig = Field(
-        default_factory=BirdseyeCameraConfig, title="Birdseye camera configuration."
+        default_factory=BirdseyeCameraConfig,
+        title="Birdseye",
+        description="Settings for the Birdseye composite view that composes multiple camera feeds into a single layout.",
    )
    detect: DetectConfig = Field(
-        default_factory=DetectConfig, title="Object detection configuration."
+        default_factory=DetectConfig,
+        title="Object Detection",
+        description="Settings for the detection/detect role used to run object detection and initialize trackers.",
    )
    face_recognition: CameraFaceRecognitionConfig = Field(
-        default_factory=CameraFaceRecognitionConfig, title="Face recognition config."
+        default_factory=CameraFaceRecognitionConfig,
+        title="Face recognition",
+        description="Settings for face detection and recognition for this camera.",
+    )
+    ffmpeg: CameraFfmpegConfig = Field(
+        title="FFmpeg",
+        description="FFmpeg settings including binary path, args, hwaccel options, and per-role output args.",
    )
-    ffmpeg: CameraFfmpegConfig = Field(title="FFmpeg configuration for the camera.")
    live: CameraLiveConfig = Field(
-        default_factory=CameraLiveConfig, title="Live playback settings."
+        default_factory=CameraLiveConfig,
+        title="Live playback",
+        description="Settings used by the Web UI to control live stream selection, resolution and quality.",
    )
    lpr: CameraLicensePlateRecognitionConfig = Field(
-        default_factory=CameraLicensePlateRecognitionConfig, title="LPR config."
+        default_factory=CameraLicensePlateRecognitionConfig,
+        title="License Plate Recognition",
+        description="License plate recognition settings including detection thresholds, formatting, and known plates.",
+    )
+    motion: MotionConfig = Field(
+        None,
+        title="Motion detection",
+        description="Default motion detection settings for this camera.",
    )
-    motion: MotionConfig = Field(None, title="Motion detection configuration.")
    objects: ObjectConfig = Field(
-        default_factory=ObjectConfig, title="Object configuration."
+        default_factory=ObjectConfig,
+        title="Objects",
+        description="Object tracking defaults including which labels to track and per-object filters.",
    )
    record: RecordConfig = Field(
-        default_factory=RecordConfig, title="Record configuration."
+        default_factory=RecordConfig,
+        title="Recording",
+        description="Recording and retention settings for this camera.",
    )
    review: ReviewConfig = Field(
-        default_factory=ReviewConfig, title="Review configuration."
+        default_factory=ReviewConfig,
+        title="Review",
+        description="Settings that control alerts, detections, and GenAI review summaries used by the UI and storage for this camera.",
    )
    semantic_search: CameraSemanticSearchConfig = Field(
        default_factory=CameraSemanticSearchConfig,
-        title="Semantic search configuration.",
+        title="Semantic Search",
+        description="Settings for semantic search which builds and queries object embeddings to find similar items.",
    )
    snapshots: SnapshotsConfig = Field(
-        default_factory=SnapshotsConfig, title="Snapshot configuration."
+        default_factory=SnapshotsConfig,
+        title="Snapshots",
+        description="Settings for saved JPEG snapshots of tracked objects for this camera.",
    )
    timestamp_style: TimestampStyleConfig = Field(
-        default_factory=TimestampStyleConfig, title="Timestamp style configuration."
+        default_factory=TimestampStyleConfig,
+        title="Timestamp style",
+        description="Styling options for in-feed timestamps applied to recordings and snapshots.",
    )

    # Options without global fallback
    best_image_timeout: int = Field(
        default=60,
-        title="How long to wait for the image with the highest confidence score.",
+        title="Best image timeout",
+        description="How long to wait for the image with the highest confidence score.",
    )
    mqtt: CameraMqttConfig = Field(
-        default_factory=CameraMqttConfig, title="MQTT configuration."
+        default_factory=CameraMqttConfig,
+        title="MQTT",
+        description="MQTT image publishing settings.",
    )
    notifications: NotificationConfig = Field(
-        default_factory=NotificationConfig, title="Notifications configuration."
+        default_factory=NotificationConfig,
+        title="Notifications",
+        description="Settings to enable and control notifications for this camera.",
    )
    onvif: OnvifConfig = Field(
-        default_factory=OnvifConfig, title="Camera Onvif Configuration."
+        default_factory=OnvifConfig,
+        title="ONVIF",
+        description="ONVIF connection and PTZ autotracking settings for this camera.",
+    )
+    type: CameraTypeEnum = Field(
+        default=CameraTypeEnum.generic,
+        title="Camera type",
+        description="Camera Type",
    )
-    type: CameraTypeEnum = Field(default=CameraTypeEnum.generic, title="Camera Type")
    ui: CameraUiConfig = Field(
-        default_factory=CameraUiConfig, title="Camera UI Modifications."
+        default_factory=CameraUiConfig,
+        title="Camera UI",
+        description="Display ordering and visibility for this camera in the UI. Ordering affects the default dashboard. For more granular control, use camera groups.",
    )
    webui_url: Optional[str] = Field(
        None,
-        title="URL to visit the camera directly from system page",
+        title="Camera URL",
+        description="URL to visit the camera directly from system page",
    )
    zones: dict[str, ZoneConfig] = Field(
-        default_factory=dict, title="Zone configuration."
+        default_factory=dict,
+        title="Zones",
+        description="Zones allow you to define a specific area of the frame so you can determine whether or not an object is within a particular area.",
    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of camera."
+        default=None,
+        title="Original camera state",
+        description="Keep track of original state of camera.",
    )

    _ffmpeg_cmds: list[dict[str, list[str]]] = PrivateAttr()
--- a/frigate/config/camera/detect.py
+++ b/frigate/config/camera/detect.py
@@ -8,56 +8,82 @@ __all__ = ["DetectConfig", "StationaryConfig", "StationaryMaxFramesConfig"]


 class StationaryMaxFramesConfig(FrigateBaseModel):
-    default: Optional[int] = Field(default=None, title="Default max frames.", ge=1)
+    default: Optional[int] = Field(
+        default=None,
+        title="Default max frames",
+        description="Default maximum frames to track a stationary object before stopping.",
+        ge=1,
+    )
    objects: dict[str, int] = Field(
-        default_factory=dict, title="Object specific max frames."
+        default_factory=dict,
+        title="Object max frames",
+        description="Per-object overrides for maximum frames to track stationary objects.",
    )


 class StationaryConfig(FrigateBaseModel):
    interval: Optional[int] = Field(
        default=None,
-        title="Frame interval for checking stationary objects.",
+        title="Stationary interval",
+        description="How often (in frames) to run a detection check to confirm a stationary object.",
        gt=0,
    )
    threshold: Optional[int] = Field(
        default=None,
-        title="Number of frames without a position change for an object to be considered stationary",
+        title="Stationary threshold",
+        description="Number of frames with no position change required to mark an object as stationary.",
        ge=1,
    )
    max_frames: StationaryMaxFramesConfig = Field(
        default_factory=StationaryMaxFramesConfig,
-        title="Max frames for stationary objects.",
+        title="Max frames",
+        description="Limits how long stationary objects are tracked before being discarded.",
    )
    classifier: bool = Field(
        default=True,
-        title="Enable visual classifier for determing if objects with jittery bounding boxes are stationary.",
+        title="Enable visual classifier",
+        description="Use a visual classifier to detect truly stationary objects even when bounding boxes jitter.",
    )


 class DetectConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Detection Enabled.")
+    enabled: bool = Field(
+        default=False,
+        title="Detection enabled",
+        description="Enable or disable object detection for all cameras; can be overridden per-camera. Detection must be enabled for object tracking to run.",
+    )
    height: Optional[int] = Field(
-        default=None, title="Height of the stream for the detect role."
+        default=None,
+        title="Detect height",
+        description="Height (pixels) of frames used for the detect stream; leave empty to use the native stream resolution.",
    )
    width: Optional[int] = Field(
-        default=None, title="Width of the stream for the detect role."
+        default=None,
+        title="Detect width",
+        description="Width (pixels) of frames used for the detect stream; leave empty to use the native stream resolution.",
    )
    fps: int = Field(
-        default=5, title="Number of frames per second to process through detection."
+        default=5,
+        title="Detect FPS",
+        description="Desired frames per second to run detection on; lower values reduce CPU usage (recommended value is 5, only set higher - at most 10 - if tracking extremely fast moving objects).",
    )
    min_initialized: Optional[int] = Field(
        default=None,
-        title="Minimum number of consecutive hits for an object to be initialized by the tracker.",
+        title="Minimum initialization frames",
+        description="Number of consecutive detection hits required before creating a tracked object. Increase to reduce false initializations. Default value is fps divided by 2.",
    )
    max_disappeared: Optional[int] = Field(
        default=None,
-        title="Maximum number of frames the object can disappear before detection ends.",
+        title="Maximum disappeared frames",
+        description="Number of frames without a detection before a tracked object is considered gone.",
    )
    stationary: StationaryConfig = Field(
        default_factory=StationaryConfig,
-        title="Stationary objects config.",
+        title="Stationary objects config",
+        description="Settings to detect and manage objects that remain stationary for a period of time.",
    )
    annotation_offset: int = Field(
-        default=0, title="Milliseconds to offset detect annotations by."
+        default=0,
+        title="Annotation offset",
+        description="Milliseconds to shift detect annotations to better align timeline bounding boxes with recordings; can be positive or negative.",
    )
--- a/frigate/config/camera/ffmpeg.py
+++ b/frigate/config/camera/ffmpeg.py
@@ -35,39 +35,58 @@ DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT = [
 class FfmpegOutputArgsConfig(FrigateBaseModel):
    detect: Union[str, list[str]] = Field(
        default=DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT,
-        title="Detect role FFmpeg output arguments.",
+        title="Detect output arguments",
+        description="Default output arguments for detect role streams.",
    )
    record: Union[str, list[str]] = Field(
        default=RECORD_FFMPEG_OUTPUT_ARGS_DEFAULT,
-        title="Record role FFmpeg output arguments.",
+        title="Record output arguments",
+        description="Default output arguments for record role streams.",
    )


 class FfmpegConfig(FrigateBaseModel):
-    path: str = Field(default="default", title="FFmpeg path")
+    path: str = Field(
+        default="default",
+        title="FFmpeg path",
+        description='Path to the FFmpeg binary to use or a version alias ("5.0" or "7.0").',
+    )
    global_args: Union[str, list[str]] = Field(
-        default=FFMPEG_GLOBAL_ARGS_DEFAULT, title="Global FFmpeg arguments."
+        default=FFMPEG_GLOBAL_ARGS_DEFAULT,
+        title="FFmpeg global arguments",
+        description="Global arguments passed to FFmpeg processes.",
    )
    hwaccel_args: Union[str, list[str]] = Field(
-        default="auto", title="FFmpeg hardware acceleration arguments."
+        default="auto",
+        title="Hardware acceleration arguments",
+        description="Hardware acceleration arguments for FFmpeg. Provider-specific presets are recommended.",
    )
    input_args: Union[str, list[str]] = Field(
-        default=FFMPEG_INPUT_ARGS_DEFAULT, title="FFmpeg input arguments."
+        default=FFMPEG_INPUT_ARGS_DEFAULT,
+        title="Input arguments",
+        description="Input arguments applied to FFmpeg input streams.",
    )
    output_args: FfmpegOutputArgsConfig = Field(
        default_factory=FfmpegOutputArgsConfig,
-        title="FFmpeg output arguments per role.",
+        title="Output arguments",
+        description="Default output arguments used for different FFmpeg roles such as detect and record.",
    )
    retry_interval: float = Field(
        default=10.0,
-        title="Time in seconds to wait before FFmpeg retries connecting to the camera.",
+        title="FFmpeg retry time",
+        description="Seconds to wait before attempting to reconnect a camera stream after failure. Default is 10.",
        gt=0.0,
    )
    apple_compatibility: bool = Field(
        default=False,
-        title="Set tag on HEVC (H.265) recording stream to improve compatibility with Apple players.",
+        title="Apple compatibility",
+        description="Enable HEVC tagging for better Apple player compatibility when recording H.265.",
+    )
+    gpu: int = Field(
+        default=0,
+        title="GPU index",
+        description="Default GPU index used for hardware acceleration if available.",
    )
-    gpu: int = Field(default=0, title="GPU index to use for hardware acceleration.")

    @property
    def ffmpeg_path(self) -> str:
@@ -95,21 +114,36 @@ class CameraRoleEnum(str, Enum):


 class CameraInput(FrigateBaseModel):
-    path: EnvString = Field(title="Camera input path.")
-    roles: list[CameraRoleEnum] = Field(title="Roles assigned to this input.")
+    path: EnvString = Field(
+        title="Input path",
+        description="Camera input stream URL or path.",
+    )
+    roles: list[CameraRoleEnum] = Field(
+        title="Input roles",
+        description="Roles for this input stream.",
+    )
    global_args: Union[str, list[str]] = Field(
-        default_factory=list, title="FFmpeg global arguments."
+        default_factory=list,
+        title="FFmpeg global arguments",
+        description="FFmpeg global arguments for this input stream.",
    )
    hwaccel_args: Union[str, list[str]] = Field(
-        default_factory=list, title="FFmpeg hardware acceleration arguments."
+        default_factory=list,
+        title="Hardware acceleration arguments",
+        description="Hardware acceleration arguments for this input stream.",
    )
    input_args: Union[str, list[str]] = Field(
-        default_factory=list, title="FFmpeg input arguments."
+        default_factory=list,
+        title="Input arguments",
+        description="Input arguments specific to this stream.",
    )


 class CameraFfmpegConfig(FfmpegConfig):
-    inputs: list[CameraInput] = Field(title="Camera inputs.")
+    inputs: list[CameraInput] = Field(
+        title="Camera inputs",
+        description="List of input stream definitions (paths and roles) for this camera.",
+    )

    @field_validator("inputs")
    @classmethod
--- a/frigate/config/camera/genai.py
+++ b/frigate/config/camera/genai.py
@@ -6,7 +6,7 @@ from pydantic import Field
 from ..base import FrigateBaseModel
 from ..env import EnvString

-__all__ = ["GenAIConfig", "GenAIProviderEnum"]
+__all__ = ["GenAIConfig", "GenAIProviderEnum", "GenAIRoleEnum"]


 class GenAIProviderEnum(str, Enum):
@@ -17,16 +17,53 @@ class GenAIProviderEnum(str, Enum):
    llamacpp = "llamacpp"


+class GenAIRoleEnum(str, Enum):
+    tools = "tools"
+    vision = "vision"
+    embeddings = "embeddings"
+
+
 class GenAIConfig(FrigateBaseModel):
    """Primary GenAI Config to define GenAI Provider."""

-    api_key: Optional[EnvString] = Field(default=None, title="Provider API key.")
-    base_url: Optional[str] = Field(default=None, title="Provider base url.")
-    model: str = Field(default="gpt-4o", title="GenAI model.")
-    provider: GenAIProviderEnum | None = Field(default=None, title="GenAI provider.")
+    api_key: Optional[EnvString] = Field(
+        default=None,
+        title="API key",
+        description="API key required by some providers (can also be set via environment variables).",
+    )
+    base_url: Optional[str] = Field(
+        default=None,
+        title="Base URL",
+        description="Base URL for self-hosted or compatible providers (for example an Ollama instance).",
+    )
+    model: str = Field(
+        default="gpt-4o",
+        title="Model",
+        description="The model to use from the provider for generating descriptions or summaries.",
+    )
+    provider: GenAIProviderEnum | None = Field(
+        default=None,
+        title="Provider",
+        description="The GenAI provider to use (for example: ollama, gemini, openai).",
+    )
+    roles: list[GenAIRoleEnum] = Field(
+        default_factory=lambda: [
+            GenAIRoleEnum.embeddings,
+            GenAIRoleEnum.vision,
+            GenAIRoleEnum.tools,
+        ],
+        title="Roles",
+        description="GenAI roles (tools, vision, embeddings); one provider per role.",
+    )
    provider_options: dict[str, Any] = Field(
-        default={}, title="GenAI Provider extra options."
+        default={},
+        title="Provider options",
+        description="Additional provider-specific options to pass to the GenAI client.",
+        json_schema_extra={"additionalProperties": {"type": "string"}},
    )
    runtime_options: dict[str, Any] = Field(
-        default={}, title="Options to pass during inference calls."
+        default={},
+        title="Runtime options",
+        description="Runtime options passed to the provider for each inference call.",
+        json_schema_extra={"additionalProperties": {"type": "string"}},
    )
--- a/frigate/config/camera/live.py
+++ b/frigate/config/camera/live.py
@@ -10,7 +10,18 @@ __all__ = ["CameraLiveConfig"]
 class CameraLiveConfig(FrigateBaseModel):
    streams: Dict[str, str] = Field(
        default_factory=list,
-        title="Friendly names and restream names to use for live view.",
+        title="Live stream names",
+        description="Mapping of configured stream names to restream/go2rtc names used for live playback.",
+    )
+    height: int = Field(
+        default=720,
+        title="Live height",
+        description="Height (pixels) to render the jsmpeg live stream in the Web UI; must be <= detect stream height.",
+    )
+    quality: int = Field(
+        default=8,
+        ge=1,
+        le=31,
+        title="Live quality",
+        description="Encoding quality for the jsmpeg stream (1 highest, 31 lowest).",
    )
-    height: int = Field(default=720, title="Live camera view height")
-    quality: int = Field(default=8, ge=1, le=31, title="Live camera view quality")
--- a/frigate/config/camera/mask.py
+++ b/frigate/config/camera/mask.py
@@ -0,0 +1,85 @@
+"""Mask configuration for motion and object masks."""
+
+from typing import Any, Optional, Union
+
+from pydantic import Field, field_serializer
+
+from ..base import FrigateBaseModel
+
+__all__ = ["MotionMaskConfig", "ObjectMaskConfig"]
+
+
+class MotionMaskConfig(FrigateBaseModel):
+    """Configuration for a single motion mask."""
+
+    friendly_name: Optional[str] = Field(
+        default=None,
+        title="Friendly name",
+        description="A friendly name for this motion mask used in the Frigate UI",
+    )
+    enabled: bool = Field(
+        default=True,
+        title="Enabled",
+        description="Enable or disable this motion mask",
+    )
+    coordinates: Union[str, list[str]] = Field(
+        default="",
+        title="Coordinates",
+        description="Ordered x,y coordinates defining the motion mask polygon used to include/exclude areas.",
+    )
+    raw_coordinates: Union[str, list[str]] = ""
+    enabled_in_config: Optional[bool] = Field(
+        default=None, title="Keep track of original state of motion mask."
+    )
+
+    def get_formatted_name(self, mask_id: str) -> str:
+        """Return the friendly name if set, otherwise return a formatted version of the mask ID."""
+        if self.friendly_name:
+            return self.friendly_name
+        return mask_id.replace("_", " ").title()
+
+    @field_serializer("coordinates", when_used="json")
+    def serialize_coordinates(self, value: Any, info):
+        return self.raw_coordinates if self.raw_coordinates else value
+
+    @field_serializer("raw_coordinates", when_used="json")
+    def serialize_raw_coordinates(self, value: Any, info):
+        return None
+
+
+class ObjectMaskConfig(FrigateBaseModel):
+    """Configuration for a single object mask."""
+
+    friendly_name: Optional[str] = Field(
+        default=None,
+        title="Friendly name",
+        description="A friendly name for this object mask used in the Frigate UI",
+    )
+    enabled: bool = Field(
+        default=True,
+        title="Enabled",
+        description="Enable or disable this object mask",
+    )
+    coordinates: Union[str, list[str]] = Field(
+        default="",
+        title="Coordinates",
+        description="Ordered x,y coordinates defining the object mask polygon used to include/exclude areas.",
+    )
+    raw_coordinates: Union[str, list[str]] = ""
+    enabled_in_config: Optional[bool] = Field(
+        default=None, title="Keep track of original state of object mask."
+    )
+
+    @field_serializer("coordinates", when_used="json")
+    def serialize_coordinates(self, value: Any, info):
+        return self.raw_coordinates if self.raw_coordinates else value
+
+    @field_serializer("raw_coordinates", when_used="json")
+    def serialize_raw_coordinates(self, value: Any, info):
+        return None
+
+    def get_formatted_name(self, mask_id: str) -> str:
+        """Return the friendly name if set, otherwise return a formatted version of the mask ID."""
+        if self.friendly_name:
+            return self.friendly_name
+        return mask_id.replace("_", " ").title()
--- a/frigate/config/camera/motion.py
+++ b/frigate/config/camera/motion.py
@@ -1,43 +1,82 @@
-from typing import Any, Optional, Union
+from typing import Any, Optional

 from pydantic import Field, field_serializer

 from ..base import FrigateBaseModel
+from .mask import MotionMaskConfig

 __all__ = ["MotionConfig"]


 class MotionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=True, title="Enable motion on all cameras.")
+    enabled: bool = Field(
+        default=True,
+        title="Enable motion detection",
+        description="Enable or disable motion detection for all cameras; can be overridden per-camera.",
+    )
    threshold: int = Field(
        default=30,
-        title="Motion detection threshold (1-255).",
+        title="Motion threshold",
+        description="Pixel difference threshold used by the motion detector; higher values reduce sensitivity (range 1-255).",
        ge=1,
        le=255,
    )
    lightning_threshold: float = Field(
-        default=0.8, title="Lightning detection threshold (0.3-1.0).", ge=0.3, le=1.0
+        default=0.8,
+        title="Lightning threshold",
+        description="Threshold to detect and ignore brief lighting spikes (lower is more sensitive, values between 0.3 and 1.0).",
+        ge=0.3,
+        le=1.0,
    )
-    improve_contrast: bool = Field(default=True, title="Improve Contrast")
-    contour_area: Optional[int] = Field(default=10, title="Contour Area")
-    delta_alpha: float = Field(default=0.2, title="Delta Alpha")
-    frame_alpha: float = Field(default=0.01, title="Frame Alpha")
-    frame_height: Optional[int] = Field(default=100, title="Frame Height")
-    mask: Union[str, list[str]] = Field(
-        default="", title="Coordinates polygon for the motion mask."
+    improve_contrast: bool = Field(
+        default=True,
+        title="Improve contrast",
+        description="Apply contrast improvement to frames before motion analysis to help detection.",
+    )
+    contour_area: Optional[int] = Field(
+        default=10,
+        title="Contour area",
+        description="Minimum contour area in pixels required for a motion contour to be counted.",
+    )
+    delta_alpha: float = Field(
+        default=0.2,
+        title="Delta alpha",
+        description="Alpha blending factor used in frame differencing for motion calculation.",
+    )
+    frame_alpha: float = Field(
+        default=0.01,
+        title="Frame alpha",
+        description="Alpha value used when blending frames for motion preprocessing.",
+    )
+    frame_height: Optional[int] = Field(
+        default=100,
+        title="Frame height",
+        description="Height in pixels to scale frames to when computing motion.",
+    )
+    mask: dict[str, Optional[MotionMaskConfig]] = Field(
+        default_factory=dict,
+        title="Mask coordinates",
+        description="Ordered x,y coordinates defining the motion mask polygon used to include/exclude areas.",
    )
    mqtt_off_delay: int = Field(
        default=30,
-        title="Delay for updating MQTT with no motion detected.",
+        title="MQTT off delay",
+        description="Seconds to wait after last motion before publishing an MQTT 'off' state.",
    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of motion detection."
+        default=None,
+        title="Original motion state",
+        description="Indicates whether motion detection was enabled in the original static configuration.",
+    )
+    raw_mask: dict[str, Optional[MotionMaskConfig]] = Field(
+        default_factory=dict, exclude=True
    )
-    raw_mask: Union[str, list[str]] = ""

    @field_serializer("mask", when_used="json")
    def serialize_mask(self, value: Any, info):
-        return self.raw_mask
+        if self.raw_mask:
+            return self.raw_mask
+        return value

    @field_serializer("raw_mask", when_used="json")
    def serialize_raw_mask(self, value: Any, info):
--- a/frigate/config/camera/mqtt.py
+++ b/frigate/config/camera/mqtt.py
@@ -6,18 +6,40 @@ __all__ = ["CameraMqttConfig"]


 class CameraMqttConfig(FrigateBaseModel):
-    enabled: bool = Field(default=True, title="Send image over MQTT.")
-    timestamp: bool = Field(default=True, title="Add timestamp to MQTT image.")
-    bounding_box: bool = Field(default=True, title="Add bounding box to MQTT image.")
-    crop: bool = Field(default=True, title="Crop MQTT image to detected object.")
-    height: int = Field(default=270, title="MQTT image height.")
+    enabled: bool = Field(
+        default=True,
+        title="Send image",
+        description="Enable publishing image snapshots for objects to MQTT topics for this camera.",
+    )
+    timestamp: bool = Field(
+        default=True,
+        title="Add timestamp",
+        description="Overlay a timestamp on images published to MQTT.",
+    )
+    bounding_box: bool = Field(
+        default=True,
+        title="Add bounding box",
+        description="Draw bounding boxes on images published over MQTT.",
+    )
+    crop: bool = Field(
+        default=True,
+        title="Crop image",
+        description="Crop images published to MQTT to the detected object's bounding box.",
+    )
+    height: int = Field(
+        default=270,
+        title="Image height",
+        description="Height (pixels) to resize images published over MQTT.",
+    )
    required_zones: list[str] = Field(
        default_factory=list,
-        title="List of required zones to be entered in order to send the image.",
+        title="Required zones",
+        description="Zones that an object must enter for an MQTT image to be published.",
    )
    quality: int = Field(
        default=70,
-        title="Quality of the encoded jpeg (0-100).",
+        title="JPEG quality",
+        description="JPEG quality for images published to MQTT (0-100).",
        ge=0,
        le=100,
    )
--- a/frigate/config/camera/notification.py
+++ b/frigate/config/camera/notification.py
@@ -8,11 +8,24 @@ __all__ = ["NotificationConfig"]


 class NotificationConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable notifications")
-    email: Optional[str] = Field(default=None, title="Email required for push.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable notifications",
+        description="Enable or disable notifications for all cameras; can be overridden per-camera.",
+    )
+    email: Optional[str] = Field(
+        default=None,
+        title="Notification email",
+        description="Email address used for push notifications or required by certain notification providers.",
+    )
    cooldown: int = Field(
-        default=0, ge=0, title="Cooldown period for notifications (time in seconds)."
+        default=0,
+        ge=0,
+        title="Cooldown period",
+        description="Cooldown (seconds) between notifications to avoid spamming recipients.",
    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of notifications."
+        default=None,
+        title="Original notifications state",
+        description="Indicates whether notifications were enabled in the original static configuration.",
    )
--- a/frigate/config/camera/objects.py
+++ b/frigate/config/camera/objects.py
@@ -3,6 +3,7 @@ from typing import Any, Optional, Union
 from pydantic import Field, PrivateAttr, field_serializer, field_validator

 from ..base import FrigateBaseModel
+from .mask import ObjectMaskConfig

 __all__ = ["ObjectConfig", "GenAIObjectConfig", "FilterConfig"]

@@ -13,36 +14,48 @@ DEFAULT_TRACKED_OBJECTS = ["person"]
 class FilterConfig(FrigateBaseModel):
    min_area: Union[int, float] = Field(
        default=0,
-        title="Minimum area of bounding box for object to be counted. Can be pixels (int) or percentage (float between 0.000001 and 0.99).",
+        title="Minimum object area",
+        description="Minimum bounding box area (pixels or percentage) required for this object type. Can be pixels (int) or percentage (float between 0.000001 and 0.99).",
    )
    max_area: Union[int, float] = Field(
        default=24000000,
-        title="Maximum area of bounding box for object to be counted. Can be pixels (int) or percentage (float between 0.000001 and 0.99).",
+        title="Maximum object area",
+        description="Maximum bounding box area (pixels or percentage) allowed for this object type. Can be pixels (int) or percentage (float between 0.000001 and 0.99).",
    )
    min_ratio: float = Field(
        default=0,
-        title="Minimum ratio of bounding box's width/height for object to be counted.",
+        title="Minimum aspect ratio",
+        description="Minimum width/height ratio required for the bounding box to qualify.",
    )
    max_ratio: float = Field(
        default=24000000,
-        title="Maximum ratio of bounding box's width/height for object to be counted.",
+        title="Maximum aspect ratio",
+        description="Maximum width/height ratio allowed for the bounding box to qualify.",
    )
    threshold: float = Field(
        default=0.7,
-        title="Average detection confidence threshold for object to be counted.",
+        title="Confidence threshold",
+        description="Average detection confidence threshold required for the object to be considered a true positive.",
    )
    min_score: float = Field(
-        default=0.5, title="Minimum detection confidence for object to be counted."
+        default=0.5,
+        title="Minimum confidence",
+        description="Minimum single-frame detection confidence required for the object to be counted.",
    )
-    mask: Optional[Union[str, list[str]]] = Field(
-        default=None,
-        title="Detection area polygon mask for this filter configuration.",
+    mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+        default_factory=dict,
+        title="Filter mask",
+        description="Polygon coordinates defining where this filter applies within the frame.",
+    )
+    raw_mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+        default_factory=dict, exclude=True
    )
-    raw_mask: Union[str, list[str]] = ""

    @field_serializer("mask", when_used="json")
    def serialize_mask(self, value: Any, info):
-        return self.raw_mask
+        if self.raw_mask:
+            return self.raw_mask
+        return value

    @field_serializer("raw_mask", when_used="json")
    def serialize_raw_mask(self, value: Any, info):
@@ -51,46 +64,64 @@ class FilterConfig(FrigateBaseModel):

 class GenAIObjectTriggerConfig(FrigateBaseModel):
    tracked_object_end: bool = Field(
-        default=True, title="Send once the object is no longer tracked."
+        default=True,
+        title="Send on end",
+        description="Send a request to GenAI when the tracked object ends.",
    )
    after_significant_updates: Optional[int] = Field(
        default=None,
-        title="Send an early request to generative AI when X frames accumulated.",
+        title="Early GenAI trigger",
+        description="Send a request to GenAI after a specified number of significant updates for the tracked object.",
        ge=1,
    )


 class GenAIObjectConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable GenAI for camera.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable GenAI",
+        description="Enable GenAI generation of descriptions for tracked objects by default.",
+    )
    use_snapshot: bool = Field(
-        default=False, title="Use snapshots for generating descriptions."
+        default=False,
+        title="Use snapshots",
+        description="Use object snapshots instead of thumbnails for GenAI description generation.",
    )
    prompt: str = Field(
        default="Analyze the sequence of images containing the {label}. Focus on the likely intent or behavior of the {label} based on its actions and movement, rather than describing its appearance or the surroundings. Consider what the {label} is doing, why, and what it might do next.",
-        title="Default caption prompt.",
+        title="Caption prompt",
+        description="Default prompt template used when generating descriptions with GenAI.",
    )
    object_prompts: dict[str, str] = Field(
-        default_factory=dict, title="Object specific prompts."
+        default_factory=dict,
+        title="Object prompts",
+        description="Per-object prompts to customize GenAI outputs for specific labels.",
    )

    objects: Union[str, list[str]] = Field(
        default_factory=list,
-        title="List of objects to run generative AI for.",
+        title="GenAI objects",
+        description="List of object labels to send to GenAI by default.",
    )
    required_zones: Union[str, list[str]] = Field(
        default_factory=list,
-        title="List of required zones to be entered in order to run generative AI.",
+        title="Required zones",
+        description="Zones that must be entered for objects to qualify for GenAI description generation.",
    )
    debug_save_thumbnails: bool = Field(
        default=False,
-        title="Save thumbnails sent to generative AI for debugging purposes.",
+        title="Save thumbnails",
+        description="Save thumbnails sent to GenAI for debugging and review.",
    )
    send_triggers: GenAIObjectTriggerConfig = Field(
        default_factory=GenAIObjectTriggerConfig,
-        title="What triggers to use to send frames to generative AI for a tracked object.",
+        title="GenAI triggers",
+        description="Defines when frames should be sent to GenAI (on end, after updates, etc.).",
    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of generative AI."
+        default=None,
+        title="Original GenAI state",
+        description="Indicates whether GenAI was enabled in the original static config.",
    )

    @field_validator("required_zones", mode="before")
@@ -103,14 +134,28 @@ class GenAIObjectConfig(FrigateBaseModel):


 class ObjectConfig(FrigateBaseModel):
-    track: list[str] = Field(default=DEFAULT_TRACKED_OBJECTS, title="Objects to track.")
-    filters: dict[str, FilterConfig] = Field(
-        default_factory=dict, title="Object filters."
+    track: list[str] = Field(
+        default=DEFAULT_TRACKED_OBJECTS,
+        title="Objects to track",
+        description="List of object labels to track for all cameras; can be overridden per-camera.",
+    )
+    filters: dict[str, FilterConfig] = Field(
+        default_factory=dict,
+        title="Object filters",
+        description="Filters applied to detected objects to reduce false positives (area, ratio, confidence).",
+    )
+    mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+        default_factory=dict,
+        title="Object mask",
+        description="Mask polygon used to prevent object detection in specified areas.",
+    )
+    raw_mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+        default_factory=dict, exclude=True
    )
-    mask: Union[str, list[str]] = Field(default="", title="Object mask.")
    genai: GenAIObjectConfig = Field(
        default_factory=GenAIObjectConfig,
-        title="Config for using genai to analyze objects.",
+        title="GenAI object config",
+        description="GenAI options for describing tracked objects and sending frames for generation.",
    )
    _all_objects: list[str] = PrivateAttr()

@@ -129,3 +174,13 @@ class ObjectConfig(FrigateBaseModel):
            enabled_labels.update(camera.objects.track)

        self._all_objects = list(enabled_labels)
+
+    @field_serializer("mask", when_used="json")
+    def serialize_mask(self, value: Any, info):
+        if self.raw_mask:
+            return self.raw_mask
+        return value
+
+    @field_serializer("raw_mask", when_used="json")
+    def serialize_raw_mask(self, value: Any, info):
+        return None
--- a/frigate/config/camera/onvif.py
+++ b/frigate/config/camera/onvif.py
@@ -17,37 +17,57 @@ class ZoomingModeEnum(str, Enum):


 class PtzAutotrackConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable PTZ object autotracking.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable Autotracking",
+        description="Enable or disable automatic PTZ camera tracking of detected objects.",
+    )
    calibrate_on_startup: bool = Field(
-        default=False, title="Perform a camera calibration when Frigate starts."
+        default=False,
+        title="Calibrate on start",
+        description="Measure PTZ motor speeds on startup to improve tracking accuracy. Frigate will update config with movement_weights after calibration.",
    )
    zooming: ZoomingModeEnum = Field(
-        default=ZoomingModeEnum.disabled, title="Autotracker zooming mode."
+        default=ZoomingModeEnum.disabled,
+        title="Zoom mode",
+        description="Control zoom behavior: disabled (pan/tilt only), absolute (most compatible), or relative (concurrent pan/tilt/zoom).",
    )
    zoom_factor: float = Field(
        default=0.3,
-        title="Zooming factor (0.1-0.75).",
+        title="Zoom factor",
+        description="Control zoom level on tracked objects. Lower values keep more scene in view; higher values zoom in closer but may lose tracking. Values between 0.1 and 0.75.",
        ge=0.1,
        le=0.75,
    )
-    track: list[str] = Field(default=DEFAULT_TRACKED_OBJECTS, title="Objects to track.")
+    track: list[str] = Field(
+        default=DEFAULT_TRACKED_OBJECTS,
+        title="Tracked objects",
+        description="List of object types that should trigger autotracking.",
+    )
    required_zones: list[str] = Field(
        default_factory=list,
-        title="List of required zones to be entered in order to begin autotracking.",
+        title="Required zones",
+        description="Objects must enter one of these zones before autotracking begins.",
    )
    return_preset: str = Field(
        default="home",
-        title="Name of camera preset to return to when object tracking is over.",
+        title="Return preset",
+        description="ONVIF preset name configured in camera firmware to return to after tracking ends.",
    )
    timeout: int = Field(
-        default=10, title="Seconds to delay before returning to preset."
+        default=10,
+        title="Return timeout",
+        description="Wait this many seconds after losing tracking before returning camera to preset position.",
    )
    movement_weights: Optional[Union[str, list[str]]] = Field(
        default_factory=list,
-        title="Internal value used for PTZ movements based on the speed of your camera's motor.",
+        title="Movement weights",
+        description="Calibration values automatically generated by camera calibration. Do not modify manually.",
    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of autotracking."
+        default=None,
+        title="Original autotrack state",
+        description="Internal field to track whether autotracking was enabled in configuration.",
    )

    @field_validator("movement_weights", mode="before")
@@ -72,16 +92,38 @@ class PtzAutotrackConfig(FrigateBaseModel):


 class OnvifConfig(FrigateBaseModel):
-    host: str = Field(default="", title="Onvif Host")
-    port: int = Field(default=8000, title="Onvif Port")
-    user: Optional[EnvString] = Field(default=None, title="Onvif Username")
-    password: Optional[EnvString] = Field(default=None, title="Onvif Password")
-    tls_insecure: bool = Field(default=False, title="Onvif Disable TLS verification")
+    host: str = Field(
+        default="",
+        title="ONVIF host",
+        description="Host (and optional scheme) for the ONVIF service for this camera.",
+    )
+    port: int = Field(
+        default=8000,
+        title="ONVIF port",
+        description="Port number for the ONVIF service.",
+    )
+    user: Optional[EnvString] = Field(
+        default=None,
+        title="ONVIF username",
+        description="Username for ONVIF authentication; some devices require admin user for ONVIF.",
+    )
+    password: Optional[EnvString] = Field(
+        default=None,
+        title="ONVIF password",
+        description="Password for ONVIF authentication.",
+    )
+    tls_insecure: bool = Field(
+        default=False,
+        title="Disable TLS verify",
+        description="Skip TLS verification and disable digest auth for ONVIF (unsafe; use in safe networks only).",
+    )
    autotracking: PtzAutotrackConfig = Field(
        default_factory=PtzAutotrackConfig,
-        title="PTZ auto tracking config.",
+        title="Autotracking",
+        description="Automatically track moving objects and keep them centered in the frame using PTZ camera movements.",
    )
    ignore_time_mismatch: bool = Field(
        default=False,
-        title="Onvif Ignore Time Synchronization Mismatch Between Camera and Server",
+        title="Ignore time mismatch",
+        description="Ignore time synchronization differences between camera and Frigate server for ONVIF communication.",
    )
--- a/frigate/config/camera/record.py
+++ b/frigate/config/camera/record.py
@@ -21,7 +21,12 @@ __all__ = [


 class RecordRetainConfig(FrigateBaseModel):
-    days: float = Field(default=0, ge=0, title="Default retention period.")
+    days: float = Field(
+        default=0,
+        ge=0,
+        title="Retention days",
+        description="Days to retain recordings.",
+    )


 class RetainModeEnum(str, Enum):
@@ -31,22 +36,37 @@ class RetainModeEnum(str, Enum):


 class ReviewRetainConfig(FrigateBaseModel):
-    days: float = Field(default=10, ge=0, title="Default retention period.")
-    mode: RetainModeEnum = Field(default=RetainModeEnum.motion, title="Retain mode.")
+    days: float = Field(
+        default=10,
+        ge=0,
+        title="Retention days",
+        description="Number of days to retain recordings of detection events.",
+    )
+    mode: RetainModeEnum = Field(
+        default=RetainModeEnum.motion,
+        title="Retention mode",
+        description="Mode for retention: all (save all segments), motion (save segments with motion), or active_objects (save segments with active objects).",
+    )


 class EventsConfig(FrigateBaseModel):
    pre_capture: int = Field(
        default=5,
-        title="Seconds to retain before event starts.",
+        title="Pre-capture seconds",
+        description="Number of seconds before the detection event to include in the recording.",
        le=MAX_PRE_CAPTURE,
        ge=0,
    )
    post_capture: int = Field(
-        default=5, ge=0, title="Seconds to retain after event ends."
+        default=5,
+        ge=0,
+        title="Post-capture seconds",
+        description="Number of seconds after the detection event to include in the recording.",
    )
    retain: ReviewRetainConfig = Field(
-        default_factory=ReviewRetainConfig, title="Event retention settings."
+        default_factory=ReviewRetainConfig,
+        title="Event retention",
+        description="Retention settings for recordings of detection events.",
    )


@@ -60,43 +80,65 @@ class RecordQualityEnum(str, Enum):

 class RecordPreviewConfig(FrigateBaseModel):
    quality: RecordQualityEnum = Field(
-        default=RecordQualityEnum.medium, title="Quality of recording preview."
+        default=RecordQualityEnum.medium,
+        title="Preview quality",
+        description="Preview quality level (very_low, low, medium, high, very_high).",
    )


 class RecordExportConfig(FrigateBaseModel):
    hwaccel_args: Union[str, list[str]] = Field(
-        default="auto", title="Export-specific FFmpeg hardware acceleration arguments."
+        default="auto",
+        title="Export hwaccel args",
+        description="Hardware acceleration args to use for export/transcode operations.",
    )


 class RecordConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable record on all cameras.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable recording",
+        description="Enable or disable recording for all cameras; can be overridden per-camera.",
+    )
    expire_interval: int = Field(
        default=60,
-        title="Number of minutes to wait between cleanup runs.",
+        title="Record cleanup interval",
+        description="Minutes between cleanup passes that remove expired recording segments.",
    )
    continuous: RecordRetainConfig = Field(
        default_factory=RecordRetainConfig,
-        title="Continuous recording retention settings.",
+        title="Continuous retention",
+        description="Number of days to retain recordings regardless of tracked objects or motion. Set to 0 if you only want to retain recordings of alerts and detections.",
    )
    motion: RecordRetainConfig = Field(
-        default_factory=RecordRetainConfig, title="Motion recording retention settings."
+        default_factory=RecordRetainConfig,
+        title="Motion retention",
+        description="Number of days to retain recordings triggered by motion regardless of tracked objects. Set to 0 if you only want to retain recordings of alerts and detections.",
    )
    detections: EventsConfig = Field(
-        default_factory=EventsConfig, title="Detection specific retention settings."
+        default_factory=EventsConfig,
+        title="Detection retention",
+        description="Recording retention settings for detection events including pre/post capture durations.",
    )
    alerts: EventsConfig = Field(
-        default_factory=EventsConfig, title="Alert specific retention settings."
+        default_factory=EventsConfig,
+        title="Alert retention",
+        description="Recording retention settings for alert events including pre/post capture durations.",
    )
    export: RecordExportConfig = Field(
-        default_factory=RecordExportConfig, title="Recording Export Config"
+        default_factory=RecordExportConfig,
+        title="Export config",
+        description="Settings used when exporting recordings such as timelapse and hardware acceleration.",
    )
    preview: RecordPreviewConfig = Field(
-        default_factory=RecordPreviewConfig, title="Recording Preview Config"
+        default_factory=RecordPreviewConfig,
+        title="Preview config",
+        description="Settings controlling the quality of recording previews shown in the UI.",
    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of recording."
+        default=None,
+        title="Original recording state",
+        description="Indicates whether recording was enabled in the original static configuration.",
    )

    @property
--- a/frigate/config/camera/review.py
+++ b/frigate/config/camera/review.py
@@ -21,22 +21,32 @@ DEFAULT_ALERT_OBJECTS = ["person", "car"]
 class AlertsConfig(FrigateBaseModel):
    """Configure alerts"""

-    enabled: bool = Field(default=True, title="Enable alerts.")
+    enabled: bool = Field(
+        default=True,
+        title="Enable alerts",
+        description="Enable or disable alert generation for all cameras; can be overridden per-camera.",
+    )

    labels: list[str] = Field(
-        default=DEFAULT_ALERT_OBJECTS, title="Labels to create alerts for."
+        default=DEFAULT_ALERT_OBJECTS,
+        title="Alert labels",
+        description="List of object labels that qualify as alerts (for example: car, person).",
    )
    required_zones: Union[str, list[str]] = Field(
        default_factory=list,
-        title="List of required zones to be entered in order to save the event as an alert.",
+        title="Required zones",
+        description="Zones that an object must enter to be considered an alert; leave empty to allow any zone.",
    )

    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of alerts."
+        default=None,
+        title="Original alerts state",
+        description="Tracks whether alerts were originally enabled in the static configuration.",
    )
    cutoff_time: int = Field(
        default=40,
-        title="Time to cutoff alerts after no alert-causing activity has occurred.",
+        title="Alerts cutoff time",
+        description="Seconds to wait after no alert-causing activity before cutting off an alert.",
    )

    @field_validator("required_zones", mode="before")
@@ -51,22 +61,32 @@ class AlertsConfig(FrigateBaseModel):
 class DetectionsConfig(FrigateBaseModel):
    """Configure detections"""

-    enabled: bool = Field(default=True, title="Enable detections.")
+    enabled: bool = Field(
+        default=True,
+        title="Enable detections",
+        description="Enable or disable detection events for all cameras; can be overridden per-camera.",
+    )

    labels: Optional[list[str]] = Field(
-        default=None, title="Labels to create detections for."
+        default=None,
+        title="Detection labels",
+        description="List of object labels that qualify as detection events.",
    )
    required_zones: Union[str, list[str]] = Field(
        default_factory=list,
-        title="List of required zones to be entered in order to save the event as a detection.",
+        title="Required zones",
+        description="Zones that an object must enter to be considered a detection; leave empty to allow any zone.",
    )
    cutoff_time: int = Field(
        default=30,
-        title="Time to cutoff detection after no detection-causing activity has occurred.",
+        title="Detections cutoff time",
+        description="Seconds to wait after no detection-causing activity before cutting off a detection.",
    )

    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of detections."
+        default=None,
+        title="Original detections state",
+        description="Tracks whether detections were originally enabled in the static configuration.",
    )

    @field_validator("required_zones", mode="before")
@@ -81,27 +101,42 @@ class DetectionsConfig(FrigateBaseModel):
 class GenAIReviewConfig(FrigateBaseModel):
    enabled: bool = Field(
        default=False,
-        title="Enable GenAI descriptions for review items.",
+        title="Enable GenAI descriptions",
+        description="Enable or disable GenAI-generated descriptions and summaries for review items.",
+    )
+    alerts: bool = Field(
+        default=True,
+        title="Enable GenAI for alerts",
+        description="Use GenAI to generate descriptions for alert items.",
+    )
+    detections: bool = Field(
+        default=False,
+        title="Enable GenAI for detections",
+        description="Use GenAI to generate descriptions for detection items.",
    )
-    alerts: bool = Field(default=True, title="Enable GenAI for alerts.")
-    detections: bool = Field(default=False, title="Enable GenAI for detections.")
    image_source: ImageSourceEnum = Field(
        default=ImageSourceEnum.preview,
-        title="Image source for review descriptions.",
+        title="Review image source",
+        description="Source of images sent to GenAI ('preview' or 'recordings'); 'recordings' uses higher quality frames but more tokens.",
    )
    additional_concerns: list[str] = Field(
        default=[],
-        title="Additional concerns that GenAI should make note of on this camera.",
+        title="Additional concerns",
+        description="A list of additional concerns or notes the GenAI should consider when evaluating activity on this camera.",
    )
    debug_save_thumbnails: bool = Field(
        default=False,
-        title="Save thumbnails sent to generative AI for debugging purposes.",
+        title="Save thumbnails",
+        description="Save thumbnails that are sent to the GenAI provider for debugging and review.",
    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of generative AI."
+        default=None,
+        title="Original GenAI state",
+        description="Tracks whether GenAI review was originally enabled in the static configuration.",
    )
    preferred_language: str | None = Field(
-        title="Preferred language for GenAI Response",
+        title="Preferred language",
+        description="Preferred language to request from the GenAI provider for generated responses.",
        default=None,
    )
    activity_context_prompt: str = Field(
@@ -139,19 +174,24 @@ Evaluate in this order:
 3. **Escalate to Level 2 if:** Weapons, break-in tools, forced entry in progress, violence, or active property damage visible (escalates from Level 0 or 1)

 The mere presence of an unidentified person in private areas during late night hours is inherently suspicious and warrants human review, regardless of what activity they appear to be doing or how brief the sequence is.""",
-        title="Custom activity context prompt defining normal and suspicious activity patterns for this property.",
+        title="Activity context prompt",
+        description="Custom prompt describing what is and is not suspicious activity to provide context for GenAI summaries.",
    )


 class ReviewConfig(FrigateBaseModel):
-    """Configure reviews"""
-
    alerts: AlertsConfig = Field(
-        default_factory=AlertsConfig, title="Review alerts config."
+        default_factory=AlertsConfig,
+        title="Alerts config",
+        description="Settings for which tracked objects generate alerts and how alerts are retained.",
    )
    detections: DetectionsConfig = Field(
-        default_factory=DetectionsConfig, title="Review detections config."
+        default_factory=DetectionsConfig,
+        title="Detections config",
+        description="Settings for creating detection events (non-alert) and how long to keep them.",
    )
    genai: GenAIReviewConfig = Field(
-        default_factory=GenAIReviewConfig, title="Review description genai config."
+        default_factory=GenAIReviewConfig,
+        title="GenAI config",
+        description="Controls use of generative AI for producing descriptions and summaries of review items.",
    )
--- a/frigate/config/camera/snapshots.py
+++ b/frigate/config/camera/snapshots.py
@@ -9,36 +9,68 @@ __all__ = ["SnapshotsConfig", "RetainConfig"]


 class RetainConfig(FrigateBaseModel):
-    default: float = Field(default=10, title="Default retention period.")
-    mode: RetainModeEnum = Field(default=RetainModeEnum.motion, title="Retain mode.")
+    default: float = Field(
+        default=10,
+        title="Default retention",
+        description="Default number of days to retain snapshots.",
+    )
+    mode: RetainModeEnum = Field(
+        default=RetainModeEnum.motion,
+        title="Retention mode",
+        description="Mode for retention: all (save all segments), motion (save segments with motion), or active_objects (save segments with active objects).",
+    )
    objects: dict[str, float] = Field(
-        default_factory=dict, title="Object retention period."
+        default_factory=dict,
+        title="Object retention",
+        description="Per-object overrides for snapshot retention days.",
    )


 class SnapshotsConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Snapshots enabled.")
+    enabled: bool = Field(
+        default=False,
+        title="Snapshots enabled",
+        description="Enable or disable saving snapshots for all cameras; can be overridden per-camera.",
+    )
    clean_copy: bool = Field(
-        default=True, title="Create a clean copy of the snapshot image."
+        default=True,
+        title="Save clean copy",
+        description="Save an unannotated clean copy of snapshots in addition to annotated ones.",
    )
    timestamp: bool = Field(
-        default=False, title="Add a timestamp overlay on the snapshot."
+        default=False,
+        title="Timestamp overlay",
+        description="Overlay a timestamp on saved snapshots.",
    )
    bounding_box: bool = Field(
-        default=True, title="Add a bounding box overlay on the snapshot."
+        default=True,
+        title="Bounding box overlay",
+        description="Draw bounding boxes for tracked objects on saved snapshots.",
+    )
+    crop: bool = Field(
+        default=False,
+        title="Crop snapshot",
+        description="Crop saved snapshots to the detected object's bounding box.",
    )
-    crop: bool = Field(default=False, title="Crop the snapshot to the detected object.")
    required_zones: list[str] = Field(
        default_factory=list,
-        title="List of required zones to be entered in order to save a snapshot.",
+        title="Required zones",
+        description="Zones an object must enter for a snapshot to be saved.",
+    )
+    height: Optional[int] = Field(
+        default=None,
+        title="Snapshot height",
+        description="Height (pixels) to resize saved snapshots to; leave empty to preserve original size.",
    )
-    height: Optional[int] = Field(default=None, title="Snapshot image height.")
    retain: RetainConfig = Field(
-        default_factory=RetainConfig, title="Snapshot retention."
+        default_factory=RetainConfig,
+        title="Snapshot retention",
+        description="Retention settings for saved snapshots including default days and per-object overrides.",
    )
    quality: int = Field(
        default=70,
-        title="Quality of the encoded jpeg (0-100).",
+        title="JPEG quality",
+        description="JPEG encode quality for saved snapshots (0-100).",
        ge=0,
        le=100,
    )
--- a/frigate/config/camera/timestamp.py
+++ b/frigate/config/camera/timestamp.py
@@ -27,9 +27,27 @@ class TimestampPositionEnum(str, Enum):


 class ColorConfig(FrigateBaseModel):
-    red: int = Field(default=255, ge=0, le=255, title="Red")
-    green: int = Field(default=255, ge=0, le=255, title="Green")
-    blue: int = Field(default=255, ge=0, le=255, title="Blue")
+    red: int = Field(
+        default=255,
+        ge=0,
+        le=255,
+        title="Red",
+        description="Red component (0-255) for timestamp color.",
+    )
+    green: int = Field(
+        default=255,
+        ge=0,
+        le=255,
+        title="Green",
+        description="Green component (0-255) for timestamp color.",
+    )
+    blue: int = Field(
+        default=255,
+        ge=0,
+        le=255,
+        title="Blue",
+        description="Blue component (0-255) for timestamp color.",
+    )


 class TimestampEffectEnum(str, Enum):
@@ -39,11 +57,27 @@ class TimestampEffectEnum(str, Enum):

 class TimestampStyleConfig(FrigateBaseModel):
    position: TimestampPositionEnum = Field(
-        default=TimestampPositionEnum.tl, title="Timestamp position."
+        default=TimestampPositionEnum.tl,
+        title="Timestamp position",
+        description="Position of the timestamp on the image (tl/tr/bl/br).",
+    )
+    format: str = Field(
+        default=DEFAULT_TIME_FORMAT,
+        title="Timestamp format",
+        description="Datetime format string used for timestamps (Python datetime format codes).",
+    )
+    color: ColorConfig = Field(
+        default_factory=ColorConfig,
+        title="Timestamp color",
+        description="RGB color values for the timestamp text (all values 0-255).",
+    )
+    thickness: int = Field(
+        default=2,
+        title="Timestamp thickness",
+        description="Line thickness of the timestamp text.",
    )
-    format: str = Field(default=DEFAULT_TIME_FORMAT, title="Timestamp format.")
-    color: ColorConfig = Field(default_factory=ColorConfig, title="Timestamp color.")
-    thickness: int = Field(default=2, title="Timestamp thickness.")
    effect: Optional[TimestampEffectEnum] = Field(
-        default=None, title="Timestamp effect."
+        default=None,
+        title="Timestamp effect",
+        description="Visual effect for the timestamp text (none, solid, shadow).",
    )
--- a/frigate/config/camera/ui.py
+++ b/frigate/config/camera/ui.py
@@ -6,7 +6,13 @@ __all__ = ["CameraUiConfig"]


 class CameraUiConfig(FrigateBaseModel):
-    order: int = Field(default=0, title="Order of camera in UI.")
-    dashboard: bool = Field(
-        default=True, title="Show this camera in Frigate dashboard UI."
+    order: int = Field(
+        default=0,
+        title="UI order",
+        description="Numeric order used to sort the camera in the UI (default dashboard and lists); larger numbers appear later.",
+    )
+    dashboard: bool = Field(
+        default=True,
+        title="Show in UI",
+        description="Toggle whether this camera is visible everywhere in the Frigate UI. Disabling this will require manually editing the config to view this camera in the UI again.",
    )
--- a/frigate/config/camera/zone.py
+++ b/frigate/config/camera/zone.py
@@ -14,36 +14,54 @@ logger = logging.getLogger(__name__)

 class ZoneConfig(BaseModel):
    friendly_name: Optional[str] = Field(
-        None, title="Zone friendly name used in the Frigate UI."
+        None,
+        title="Zone name",
+        description="A user-friendly name for the zone, displayed in the Frigate UI. If not set, a formatted version of the zone name will be used.",
+    )
+    enabled: bool = Field(
+        default=True,
+        title="Enabled",
+        description="Enable or disable this zone. Disabled zones are ignored at runtime.",
+    )
+    enabled_in_config: Optional[bool] = Field(
+        default=None, title="Keep track of original state of zone."
    )
    filters: dict[str, FilterConfig] = Field(
-        default_factory=dict, title="Zone filters."
+        default_factory=dict,
+        title="Zone filters",
+        description="Filters to apply to objects within this zone. Used to reduce false positives or restrict which objects are considered present in the zone.",
    )
    coordinates: Union[str, list[str]] = Field(
-        title="Coordinates polygon for the defined zone."
+        title="Coordinates",
+        description="Polygon coordinates that define the zone area. Can be a comma-separated string or a list of coordinate strings. Coordinates should be relative (0-1) or absolute (legacy).",
    )
    distances: Optional[Union[str, list[str]]] = Field(
        default_factory=list,
-        title="Real-world distances for the sides of quadrilateral for the defined zone.",
+        title="Real-world distances",
+        description="Optional real-world distances for each side of the zone quadrilateral, used for speed or distance calculations. Must have exactly 4 values if set.",
    )
    inertia: int = Field(
        default=3,
-        title="Number of consecutive frames required for object to be considered present in the zone.",
+        title="Inertia frames",
        gt=0,
+        description="Number of consecutive frames an object must be detected in the zone before it is considered present. Helps filter out transient detections.",
    )
    loitering_time: int = Field(
        default=0,
        ge=0,
-        title="Number of seconds that an object must loiter to be considered in the zone.",
+        title="Loitering seconds",
+        description="Number of seconds an object must remain in the zone to be considered as loitering. Set to 0 to disable loitering detection.",
    )
    speed_threshold: Optional[float] = Field(
        default=None,
        ge=0.1,
-        title="Minimum speed value for an object to be considered in the zone.",
+        title="Minimum speed",
+        description="Minimum speed (in real-world units if distances are set) required for an object to be considered present in the zone. Used for speed-based zone triggers.",
    )
    objects: Union[str, list[str]] = Field(
        default_factory=list,
-        title="List of objects that can trigger the zone.",
+        title="Trigger objects",
+        description="List of object types (from labelmap) that can trigger this zone. Can be a string or a list of strings. If empty, all objects are considered.",
    )
    _color: Optional[tuple[int, int, int]] = PrivateAttr()
    _contour: np.ndarray = PrivateAttr()
--- a/frigate/config/camera_group.py
+++ b/frigate/config/camera_group.py
@@ -8,13 +8,21 @@ __all__ = ["CameraGroupConfig"]


 class CameraGroupConfig(FrigateBaseModel):
-    """Represents a group of cameras."""
-
    cameras: Union[str, list[str]] = Field(
-        default_factory=list, title="List of cameras in this group."
+        default_factory=list,
+        title="Camera list",
+        description="Array of camera names included in this group.",
+    )
+    icon: str = Field(
+        default="generic",
+        title="Group icon",
+        description="Icon used to represent the camera group in the UI.",
+    )
+    order: int = Field(
+        default=0,
+        title="Sort order",
+        description="Numeric order used to sort camera groups in the UI; larger numbers appear later.",
    )
-    icon: str = Field(default="generic", title="Icon that represents camera group.")
-    order: int = Field(default=0, title="Sort order for group.")

    @field_validator("cameras", mode="before")
    @classmethod
--- a/frigate/config/classification.py
+++ b/frigate/config/classification.py
@@ -43,28 +43,43 @@ class ObjectClassificationType(str, Enum):


 class AudioTranscriptionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable audio transcription.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable audio transcription",
+        description="Enable or disable automatic audio transcription for all cameras; can be overridden per-camera.",
+    )
    language: str = Field(
        default="en",
-        title="Language abbreviation to use for audio event transcription/translation.",
+        title="Transcription language",
+        description="Language code used for transcription/translation (for example 'en' for English). See https://whisper-api.com/docs/languages/ for supported language codes.",
    )
    device: Optional[EnrichmentsDeviceEnum] = Field(
        default=EnrichmentsDeviceEnum.CPU,
-        title="The device used for audio transcription.",
+        title="Transcription device",
+        description="Device key (CPU/GPU) to run the transcription model on. Only NVIDIA CUDA GPUs are currently supported for transcription.",
    )
    model_size: str = Field(
-        default="small", title="The size of the embeddings model used."
+        default="small",
+        title="Model size",
+        description="Model size to use for offline audio event transcription.",
    )
    live_enabled: Optional[bool] = Field(
-        default=False, title="Enable live transcriptions."
+        default=False,
+        title="Live transcription",
+        description="Enable streaming live transcription for audio as it is received.",
    )


 class BirdClassificationConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable bird classification.")
+    enabled: bool = Field(
+        default=False,
+        title="Bird classification",
+        description="Enable or disable bird classification.",
+    )
    threshold: float = Field(
        default=0.9,
-        title="Minimum classification score required to be considered a match.",
+        title="Minimum score",
+        description="Minimum classification score required to accept a bird classification.",
        gt=0.0,
        le=1.0,
    )
@@ -72,42 +87,62 @@ class BirdClassificationConfig(FrigateBaseModel):

 class CustomClassificationStateCameraConfig(FrigateBaseModel):
    crop: list[float, float, float, float] = Field(
-        title="Crop of image frame on this camera to run classification on."
+        title="Classification crop",
+        description="Crop coordinates to use for running classification on this camera.",
    )


 class CustomClassificationStateConfig(FrigateBaseModel):
    cameras: Dict[str, CustomClassificationStateCameraConfig] = Field(
-        title="Cameras to run classification on."
+        title="Classification cameras",
+        description="Per-camera crop and settings for running state classification.",
    )
    motion: bool = Field(
        default=False,
-        title="If classification should be run when motion is detected in the crop.",
+        title="Run on motion",
+        description="If true, run classification when motion is detected within the specified crop.",
    )
    interval: int | None = Field(
        default=None,
-        title="Interval to run classification on in seconds.",
+        title="Classification interval",
+        description="Interval (seconds) between periodic classification runs for state classification.",
        gt=0,
    )


 class CustomClassificationObjectConfig(FrigateBaseModel):
-    objects: list[str] = Field(title="Object types to classify.")
+    objects: list[str] = Field(
+        default_factory=list,
+        title="Classify objects",
+        description="List of object types to run object classification on.",
+    )
    classification_type: ObjectClassificationType = Field(
        default=ObjectClassificationType.sub_label,
-        title="Type of classification that is applied.",
+        title="Classification type",
+        description="Classification type applied: 'sub_label' (adds sub_label) or other supported types.",
    )


 class CustomClassificationConfig(FrigateBaseModel):
-    enabled: bool = Field(default=True, title="Enable running the model.")
-    name: str | None = Field(default=None, title="Name of classification model.")
+    enabled: bool = Field(
+        default=True,
+        title="Enable model",
+        description="Enable or disable the custom classification model.",
+    )
+    name: str | None = Field(
+        default=None,
+        title="Model name",
+        description="Identifier for the custom classification model to use.",
+    )
    threshold: float = Field(
-        default=0.8, title="Classification score threshold to change the state."
+        default=0.8,
+        title="Score threshold",
+        description="Score threshold used to change the classification state.",
    )
    save_attempts: int | None = Field(
        default=None,
-        title="Number of classification attempts to save in the recent classifications tab. If not specified, defaults to 200 for object classification and 100 for state classification.",
+        title="Save attempts",
+        description="How many classification attempts to save for recent classifications UI.",
        ge=0,
    )
    object_config: CustomClassificationObjectConfig | None = Field(default=None)
@@ -116,47 +151,76 @@ class CustomClassificationConfig(FrigateBaseModel):

 class ClassificationConfig(FrigateBaseModel):
    bird: BirdClassificationConfig = Field(
-        default_factory=BirdClassificationConfig, title="Bird classification config."
+        default_factory=BirdClassificationConfig,
+        title="Bird classification config",
+        description="Settings specific to bird classification models.",
    )
    custom: Dict[str, CustomClassificationConfig] = Field(
-        default={}, title="Custom Classification Model Configs."
+        default={},
+        title="Custom Classification Models",
+        description="Configuration for custom classification models used for objects or state detection.",
    )


 class SemanticSearchConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable semantic search.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable semantic search",
+        description="Enable or disable the semantic search feature.",
+    )
    reindex: Optional[bool] = Field(
-        default=False, title="Reindex all tracked objects on startup."
+        default=False,
+        title="Reindex on startup",
+        description="Trigger a full reindex of historical tracked objects into the embeddings database.",
    )
    model: Optional[SemanticSearchModelEnum] = Field(
        default=SemanticSearchModelEnum.jinav1,
-        title="The CLIP model to use for semantic search.",
+        title="Semantic search model",
+        description="The embeddings model to use for semantic search (for example 'jinav1').",
    )
    model_size: str = Field(
-        default="small", title="The size of the embeddings model used."
+        default="small",
+        title="Model size",
+        description="Select model size; 'small' runs on CPU and 'large' typically requires GPU.",
    )
    device: Optional[str] = Field(
        default=None,
-        title="The device key to use for semantic search.",
+        title="Device",
        description="This is an override, to target a specific device. See https://onnxruntime.ai/docs/execution-providers/ for more information",
    )


 class TriggerConfig(FrigateBaseModel):
    friendly_name: Optional[str] = Field(
-        None, title="Trigger friendly name used in the Frigate UI."
+        None,
+        title="Friendly name",
+        description="Optional friendly name displayed in the UI for this trigger.",
+    )
+    enabled: bool = Field(
+        default=True,
+        title="Enable this trigger",
+        description="Enable or disable this semantic search trigger.",
+    )
+    type: TriggerType = Field(
+        default=TriggerType.DESCRIPTION,
+        title="Trigger type",
+        description="Type of trigger: 'thumbnail' (match against image) or 'description' (match against text).",
+    )
+    data: str = Field(
+        title="Trigger content",
+        description="Text phrase or thumbnail ID to match against tracked objects.",
    )
-    enabled: bool = Field(default=True, title="Enable this trigger")
-    type: TriggerType = Field(default=TriggerType.DESCRIPTION, title="Type of trigger")
-    data: str = Field(title="Trigger content (text phrase or image ID)")
    threshold: float = Field(
-        title="Confidence score required to run the trigger",
+        title="Trigger threshold",
+        description="Minimum similarity score (0-1) required to activate this trigger.",
        default=0.8,
        gt=0.0,
        le=1.0,
    )
    actions: List[TriggerAction] = Field(
-        default=[], title="Actions to perform when trigger is matched"
+        default=[],
+        title="Trigger actions",
+        description="List of actions to execute when trigger matches (notification, sub_label, attribute).",
    )

    model_config = ConfigDict(extra="forbid", protected_namespaces=())
@@ -165,147 +229,191 @@ class TriggerConfig(FrigateBaseModel):
 class CameraSemanticSearchConfig(FrigateBaseModel):
    triggers: Dict[str, TriggerConfig] = Field(
        default={},
-        title="Trigger actions on tracked objects that match existing thumbnails or descriptions",
+        title="Triggers",
+        description="Actions and matching criteria for camera-specific semantic search triggers.",
    )

    model_config = ConfigDict(extra="forbid", protected_namespaces=())


 class FaceRecognitionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable face recognition.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable face recognition",
+        description="Enable or disable face recognition for all cameras; can be overridden per-camera.",
+    )
    model_size: str = Field(
-        default="small", title="The size of the embeddings model used."
+        default="small",
+        title="Model size",
+        description="Model size to use for face embeddings (small/large); larger may require GPU.",
    )
    unknown_score: float = Field(
-        title="Minimum face distance score required to be marked as a potential match.",
+        title="Unknown score threshold",
+        description="Distance threshold below which a face is considered a potential match (higher = stricter).",
        default=0.8,
        gt=0.0,
        le=1.0,
    )
    detection_threshold: float = Field(
        default=0.7,
-        title="Minimum face detection score required to be considered a face.",
+        title="Detection threshold",
+        description="Minimum detection confidence required to consider a face detection valid.",
        gt=0.0,
        le=1.0,
    )
    recognition_threshold: float = Field(
        default=0.9,
-        title="Minimum face distance score required to be considered a match.",
+        title="Recognition threshold",
+        description="Face embedding distance threshold to consider two faces a match.",
        gt=0.0,
        le=1.0,
    )
    min_area: int = Field(
-        default=750, title="Min area of face box to consider running face recognition."
+        default=750,
+        title="Minimum face area",
+        description="Minimum area (pixels) of a detected face box required to attempt recognition.",
    )
    min_faces: int = Field(
        default=1,
        gt=0,
        le=6,
-        title="Min face recognitions for the sub label to be applied to the person object.",
+        title="Minimum faces",
+        description="Minimum number of face recognitions required before applying a recognized sub-label to a person.",
    )
    save_attempts: int = Field(
        default=200,
        ge=0,
-        title="Number of face attempts to save in the recent recognitions tab.",
+        title="Save attempts",
+        description="Number of face recognition attempts to retain for recent recognition UI.",
    )
    blur_confidence_filter: bool = Field(
-        default=True, title="Apply blur quality filter to face confidence."
+        default=True,
+        title="Blur confidence filter",
+        description="Adjust confidence scores based on image blur to reduce false positives for poor quality faces.",
    )
    device: Optional[str] = Field(
        default=None,
-        title="The device key to use for face recognition.",
+        title="Device",
        description="This is an override, to target a specific device. See https://onnxruntime.ai/docs/execution-providers/ for more information",
    )


 class CameraFaceRecognitionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable face recognition.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable face recognition",
+        description="Enable or disable face recognition.",
+    )
    min_area: int = Field(
-        default=750, title="Min area of face box to consider running face recognition."
+        default=750,
+        title="Minimum face area",
+        description="Minimum area (pixels) of a detected face box required to attempt recognition.",
    )

    model_config = ConfigDict(extra="forbid", protected_namespaces=())


 class ReplaceRule(FrigateBaseModel):
-    pattern: str = Field(..., title="Regex pattern to match.")
-    replacement: str = Field(
-        ..., title="Replacement string (supports backrefs like '\\1')."
-    )
+    pattern: str = Field(..., title="Regex pattern")
+    replacement: str = Field(..., title="Replacement string")


 class LicensePlateRecognitionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable license plate recognition.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable LPR",
+        description="Enable or disable license plate recognition for all cameras; can be overridden per-camera.",
+    )
    model_size: str = Field(
-        default="small", title="The size of the embeddings model used."
+        default="small",
+        title="Model size",
+        description="Model size used for text detection/recognition. Most users should use 'small'.",
    )
    detection_threshold: float = Field(
        default=0.7,
-        title="License plate object confidence score required to begin running recognition.",
+        title="Detection threshold",
+        description="Detection confidence threshold to begin running OCR on a suspected plate.",
        gt=0.0,
        le=1.0,
    )
    min_area: int = Field(
        default=1000,
-        title="Minimum area of license plate to begin running recognition.",
+        title="Minimum plate area",
+        description="Minimum plate area (pixels) required to attempt recognition.",
    )
    recognition_threshold: float = Field(
        default=0.9,
-        title="Recognition confidence score required to add the plate to the object as a sub label.",
+        title="Recognition threshold",
+        description="Confidence threshold required for recognized plate text to be attached as a sub-label.",
        gt=0.0,
        le=1.0,
    )
    min_plate_length: int = Field(
        default=4,
-        title="Minimum number of characters a license plate must have to be added to the object as a sub label.",
+        title="Min plate length",
+        description="Minimum number of characters a recognized plate must contain to be considered valid.",
    )
    format: Optional[str] = Field(
        default=None,
-        title="Regular expression for the expected format of license plate.",
+        title="Plate format regex",
+        description="Optional regex to validate recognized plate strings against an expected format.",
    )
    match_distance: int = Field(
        default=1,
-        title="Allow this number of missing/incorrect characters to still cause a detected plate to match a known plate.",
+        title="Match distance",
+        description="Number of character mismatches allowed when comparing detected plates to known plates.",
        ge=0,
    )
    known_plates: Optional[Dict[str, List[str]]] = Field(
-        default={}, title="Known plates to track (strings or regular expressions)."
+        default={},
+        title="Known plates",
+        description="List of plates or regexes to specially track or alert on.",
    )
    enhancement: int = Field(
        default=0,
-        title="Amount of contrast adjustment and denoising to apply to license plate images before recognition.",
+        title="Enhancement level",
+        description="Enhancement level (0-10) to apply to plate crops prior to OCR; higher values may not always improve results, levels above 5 may only work with night time plates and should be used with caution.",
        ge=0,
        le=10,
    )
    debug_save_plates: bool = Field(
        default=False,
-        title="Save plates captured for LPR for debugging purposes.",
+        title="Save debug plates",
+        description="Save plate crop images for debugging LPR performance.",
    )
    device: Optional[str] = Field(
        default=None,
-        title="The device key to use for LPR.",
+        title="Device",
        description="This is an override, to target a specific device. See https://onnxruntime.ai/docs/execution-providers/ for more information",
    )
    replace_rules: List[ReplaceRule] = Field(
        default_factory=list,
-        title="List of regex replacement rules for normalizing detected plates. Each rule has 'pattern' and 'replacement'.",
+        title="Replacement rules",
+        description="Regex replacement rules used to normalize detected plate strings before matching.",
    )


 class CameraLicensePlateRecognitionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable license plate recognition.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable LPR",
+        description="Enable or disable LPR on this camera.",
+    )
    expire_time: int = Field(
        default=3,
-        title="Expire plates not seen after number of seconds (for dedicated LPR cameras only).",
+        title="Expire seconds",
+        description="Time in seconds after which an unseen plate is expired from the tracker (for dedicated LPR cameras only).",
        gt=0,
    )
    min_area: int = Field(
        default=1000,
-        title="Minimum area of license plate to begin running recognition.",
+        title="Minimum plate area",
+        description="Minimum plate area (pixels) required to attempt recognition.",
    )
    enhancement: int = Field(
        default=0,
-        title="Amount of contrast adjustment and denoising to apply to license plate images before recognition.",
+        title="Enhancement level",
+        description="Enhancement level (0-10) to apply to plate crops prior to OCR; higher values may not always improve results, levels above 5 may only work with night time plates and should be used with caution.",
        ge=0,
        le=10,
    )
@@ -314,12 +422,18 @@ class CameraLicensePlateRecognitionConfig(FrigateBaseModel):


 class CameraAudioTranscriptionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable audio transcription.")
+    enabled: bool = Field(
+        default=False,
+        title="Enable transcription",
+        description="Enable or disable manually triggered audio event transcription.",
+    )
    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of audio transcription."
+        default=None, title="Original transcription state"
    )
    live_enabled: Optional[bool] = Field(
-        default=False, title="Enable live transcriptions."
+        default=False,
+        title="Live transcription",
+        description="Enable streaming live transcription for audio as it is received.",
    )

    model_config = ConfigDict(extra="forbid", protected_namespaces=())
--- a/frigate/config/config.py
+++ b/frigate/config/config.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 import logging
 import os
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, Optional

 import numpy as np
 from pydantic import (
@@ -45,7 +45,8 @@ from .camera.audio import AudioConfig
 from .camera.birdseye import BirdseyeConfig
 from .camera.detect import DetectConfig
 from .camera.ffmpeg import FfmpegConfig
-from .camera.genai import GenAIConfig
+from .camera.genai import GenAIConfig, GenAIRoleEnum
+from .camera.mask import ObjectMaskConfig
 from .camera.motion import MotionConfig
 from .camera.notification import NotificationConfig
 from .camera.objects import FilterConfig, ObjectConfig
@@ -93,54 +94,111 @@ stream_info_retriever = StreamInfoRetriever()


 class RuntimeMotionConfig(MotionConfig):
-    raw_mask: Union[str, List[str]] = ""
-    mask: np.ndarray = None
+    """Runtime version of MotionConfig with rasterized masks."""
+
+    # The rasterized numpy mask (combination of all enabled masks)
+    rasterized_mask: np.ndarray = None

    def __init__(self, **config):
        frame_shape = config.get("frame_shape", (1, 1))

-        mask = get_relative_coordinates(config.get("mask", ""), frame_shape)
-        config["raw_mask"] = mask
-
-        if mask:
-            config["mask"] = create_mask(frame_shape, mask)
-        else:
-            empty_mask = np.zeros(frame_shape, np.uint8)
-            empty_mask[:] = 255
-            config["mask"] = empty_mask
+        # Store original mask dict for serialization
+        original_mask = config.get("mask", {})
+        if isinstance(original_mask, dict):
+            # Process the new dict format - update raw_coordinates for each mask
+            processed_mask = {}
+            for mask_id, mask_config in original_mask.items():
+                if isinstance(mask_config, dict):
+                    coords = mask_config.get("coordinates", "")
+                    relative_coords = get_relative_coordinates(coords, frame_shape)
+                    mask_config_copy = mask_config.copy()
+                    mask_config_copy["raw_coordinates"] = (
+                        relative_coords if relative_coords else coords
+                    )
+                    mask_config_copy["coordinates"] = (
+                        relative_coords if relative_coords else coords
+                    )
+                    processed_mask[mask_id] = mask_config_copy
+                else:
+                    processed_mask[mask_id] = mask_config
+            config["mask"] = processed_mask
+            config["raw_mask"] = processed_mask

        super().__init__(**config)

+        # Rasterize only enabled masks
+        enabled_coords = []
+        for mask_config in self.mask.values():
+            if mask_config.enabled and mask_config.coordinates:
+                coords = mask_config.coordinates
+                if isinstance(coords, list):
+                    enabled_coords.extend(coords)
+                else:
+                    enabled_coords.append(coords)
+
+        if enabled_coords:
+            self.rasterized_mask = create_mask(frame_shape, enabled_coords)
+        else:
+            empty_mask = np.zeros(frame_shape, np.uint8)
+            empty_mask[:] = 255
+            self.rasterized_mask = empty_mask
+
    def dict(self, **kwargs):
        ret = super().model_dump(**kwargs)
-        if "mask" in ret:
-            ret["mask"] = ret["raw_mask"]
-            ret.pop("raw_mask")
+        if "rasterized_mask" in ret:
+            ret.pop("rasterized_mask")
        return ret

-    @field_serializer("mask", when_used="json")
-    def serialize_mask(self, value: Any, info):
-        return self.raw_mask
-
-    @field_serializer("raw_mask", when_used="json")
-    def serialize_raw_mask(self, value: Any, info):
+    @field_serializer("rasterized_mask", when_used="json")
+    def serialize_rasterized_mask(self, value: Any, info):
        return None

    model_config = ConfigDict(arbitrary_types_allowed=True, extra="ignore")


 class RuntimeFilterConfig(FilterConfig):
-    mask: Optional[np.ndarray] = None
-    raw_mask: Optional[Union[str, List[str]]] = None
+    """Runtime version of FilterConfig with rasterized masks."""
+
+    # The rasterized numpy mask (combination of all enabled masks)
+    rasterized_mask: Optional[np.ndarray] = None

    def __init__(self, **config):
        frame_shape = config.get("frame_shape", (1, 1))
-        mask = get_relative_coordinates(config.get("mask"), frame_shape)

-        config["raw_mask"] = mask
-
-        if mask is not None:
-            config["mask"] = create_mask(frame_shape, mask)
+        # Store original mask dict for serialization
+        original_mask = config.get("mask", {})
+        if isinstance(original_mask, dict):
+            # Process the new dict format - update raw_coordinates for each mask
+            processed_mask = {}
+            for mask_id, mask_config in original_mask.items():
+                # Handle both dict and ObjectMaskConfig formats
+                if hasattr(mask_config, "model_dump"):
+                    # It's an ObjectMaskConfig object
+                    mask_dict = mask_config.model_dump()
+                    coords = mask_dict.get("coordinates", "")
+                    relative_coords = get_relative_coordinates(coords, frame_shape)
+                    mask_dict["raw_coordinates"] = (
+                        relative_coords if relative_coords else coords
+                    )
+                    mask_dict["coordinates"] = (
+                        relative_coords if relative_coords else coords
+                    )
+                    processed_mask[mask_id] = mask_dict
+                elif isinstance(mask_config, dict):
+                    coords = mask_config.get("coordinates", "")
+                    relative_coords = get_relative_coordinates(coords, frame_shape)
+                    mask_config_copy = mask_config.copy()
+                    mask_config_copy["raw_coordinates"] = (
+                        relative_coords if relative_coords else coords
+                    )
+                    mask_config_copy["coordinates"] = (
+                        relative_coords if relative_coords else coords
+                    )
+                    processed_mask[mask_id] = mask_config_copy
+                else:
+                    processed_mask[mask_id] = mask_config
+            config["mask"] = processed_mask
+            config["raw_mask"] = processed_mask

        # Convert min_area and max_area to pixels if they're percentages
        if "min_area" in config:
@@ -151,13 +209,31 @@ class RuntimeFilterConfig(FilterConfig):

        super().__init__(**config)

+        # Rasterize only enabled masks
+        enabled_coords = []
+        for mask_config in self.mask.values():
+            if mask_config.enabled and mask_config.coordinates:
+                coords = mask_config.coordinates
+                if isinstance(coords, list):
+                    enabled_coords.extend(coords)
+                else:
+                    enabled_coords.append(coords)
+
+        if enabled_coords:
+            self.rasterized_mask = create_mask(frame_shape, enabled_coords)
+        else:
+            self.rasterized_mask = None
+
    def dict(self, **kwargs):
        ret = super().model_dump(**kwargs)
-        if "mask" in ret:
-            ret["mask"] = ret["raw_mask"]
-            ret.pop("raw_mask")
+        if "rasterized_mask" in ret:
+            ret.pop("rasterized_mask")
        return ret

+    @field_serializer("rasterized_mask", when_used="json")
+    def serialize_rasterized_mask(self, value: Any, info):
+        return None
+
    model_config = ConfigDict(arbitrary_types_allowed=True, extra="ignore")


@@ -299,116 +375,189 @@ def verify_lpr_and_face(


 class FrigateConfig(FrigateBaseModel):
-    version: Optional[str] = Field(default=None, title="Current config version.")
+    version: Optional[str] = Field(
+        default=None,
+        title="Current config version",
+        description="Numeric or string version of the active configuration to help detect migrations or format changes.",
+    )
    safe_mode: bool = Field(
-        default=False, title="If Frigate should be started in safe mode."
+        default=False,
+        title="Safe mode",
+        description="When enabled, start Frigate in safe mode with reduced features for troubleshooting.",
    )

    # Fields that install global state should be defined first, so that their validators run first.
    environment_vars: EnvVars = Field(
-        default_factory=dict, title="Frigate environment variables."
+        default_factory=dict,
+        title="Environment variables",
+        description="Key/value pairs of environment variables to set for the Frigate process in Home Assistant OS. Non-HAOS users must use Docker environment variable configuration instead.",
    )
    logger: LoggerConfig = Field(
        default_factory=LoggerConfig,
-        title="Logging configuration.",
+        title="Logging",
+        description="Controls default log verbosity and per-component log level overrides.",
        validate_default=True,
    )

    # Global config
-    auth: AuthConfig = Field(default_factory=AuthConfig, title="Auth configuration.")
+    auth: AuthConfig = Field(
+        default_factory=AuthConfig,
+        title="Authentication",
+        description="Authentication and session-related settings including cookie and rate limit options.",
+    )
    database: DatabaseConfig = Field(
-        default_factory=DatabaseConfig, title="Database configuration."
+        default_factory=DatabaseConfig,
+        title="Database",
+        description="Settings for the SQLite database used by Frigate to store tracked object and recording metadata.",
    )
    go2rtc: RestreamConfig = Field(
-        default_factory=RestreamConfig, title="Global restream configuration."
+        default_factory=RestreamConfig,
+        title="go2rtc",
+        description="Settings for the integrated go2rtc restreaming service used for live stream relaying and translation.",
+    )
+    mqtt: MqttConfig = Field(
+        title="MQTT",
+        description="Settings for connecting and publishing telemetry, snapshots, and event details to an MQTT broker.",
    )
-    mqtt: MqttConfig = Field(title="MQTT configuration.")
    notifications: NotificationConfig = Field(
-        default_factory=NotificationConfig, title="Global notification configuration."
+        default_factory=NotificationConfig,
+        title="Notifications",
+        description="Settings to enable and control notifications for all cameras; can be overridden per-camera.",
    )
    networking: NetworkingConfig = Field(
-        default_factory=NetworkingConfig, title="Networking configuration"
+        default_factory=NetworkingConfig,
+        title="Networking",
+        description="Network-related settings such as IPv6 enablement for Frigate endpoints.",
    )
    proxy: ProxyConfig = Field(
-        default_factory=ProxyConfig, title="Proxy configuration."
+        default_factory=ProxyConfig,
+        title="Proxy",
+        description="Settings for integrating Frigate behind a reverse proxy that passes authenticated user headers.",
    )
    telemetry: TelemetryConfig = Field(
-        default_factory=TelemetryConfig, title="Telemetry configuration."
+        default_factory=TelemetryConfig,
+        title="Telemetry",
+        description="System telemetry and stats options including GPU and network bandwidth monitoring.",
+    )
+    tls: TlsConfig = Field(
+        default_factory=TlsConfig,
+        title="TLS",
+        description="TLS settings for Frigate's web endpoints (port 8971).",
+    )
+    ui: UIConfig = Field(
+        default_factory=UIConfig,
+        title="UI",
+        description="User interface preferences such as timezone, time/date formatting, and units.",
    )
-    tls: TlsConfig = Field(default_factory=TlsConfig, title="TLS configuration.")
-    ui: UIConfig = Field(default_factory=UIConfig, title="UI configuration.")

    # Detector config
    detectors: Dict[str, BaseDetectorConfig] = Field(
        default=DEFAULT_DETECTORS,
-        title="Detector hardware configuration.",
+        title="Detector hardware",
+        description="Configuration for object detectors (CPU, GPU, ONNX backends) and any detector-specific model settings.",
    )
    model: ModelConfig = Field(
-        default_factory=ModelConfig, title="Detection model configuration."
+        default_factory=ModelConfig,
+        title="Detection model",
+        description="Settings to configure a custom object detection model and its input shape.",
    )

-    # GenAI config
-    genai: GenAIConfig = Field(
-        default_factory=GenAIConfig, title="Generative AI configuration."
+    # GenAI config (named provider configs: name -> GenAIConfig)
+    genai: Dict[str, GenAIConfig] = Field(
+        default_factory=dict,
+        title="Generative AI configuration (named providers).",
+        description="Settings for integrated generative AI providers used to generate object descriptions and review summaries.",
    )

    # Camera config
-    cameras: Dict[str, CameraConfig] = Field(title="Camera configuration.")
+    cameras: Dict[str, CameraConfig] = Field(title="Cameras", description="Cameras")
    audio: AudioConfig = Field(
-        default_factory=AudioConfig, title="Global Audio events configuration."
+        default_factory=AudioConfig,
+        title="Audio events",
+        description="Settings for audio-based event detection for all cameras; can be overridden per-camera.",
    )
    birdseye: BirdseyeConfig = Field(
-        default_factory=BirdseyeConfig, title="Birdseye configuration."
+        default_factory=BirdseyeConfig,
+        title="Birdseye",
+        description="Settings for the Birdseye composite view that composes multiple camera feeds into a single layout.",
    )
    detect: DetectConfig = Field(
-        default_factory=DetectConfig, title="Global object tracking configuration."
+        default_factory=DetectConfig,
+        title="Object Detection",
+        description="Settings for the detection/detect role used to run object detection and initialize trackers.",
    )
    ffmpeg: FfmpegConfig = Field(
-        default_factory=FfmpegConfig, title="Global FFmpeg configuration."
+        default_factory=FfmpegConfig,
+        title="FFmpeg",
+        description="FFmpeg settings including binary path, args, hwaccel options, and per-role output args.",
    )
    live: CameraLiveConfig = Field(
-        default_factory=CameraLiveConfig, title="Live playback settings."
+        default_factory=CameraLiveConfig,
+        title="Live playback",
+        description="Settings used by the Web UI to control live stream resolution and quality.",
    )
    motion: Optional[MotionConfig] = Field(
-        default=None, title="Global motion detection configuration."
+        default=None,
+        title="Motion detection",
+        description="Default motion detection settings applied to cameras unless overridden per-camera.",
    )
    objects: ObjectConfig = Field(
-        default_factory=ObjectConfig, title="Global object configuration."
+        default_factory=ObjectConfig,
+        title="Objects",
+        description="Object tracking defaults including which labels to track and per-object filters.",
    )
    record: RecordConfig = Field(
-        default_factory=RecordConfig, title="Global record configuration."
+        default_factory=RecordConfig,
+        title="Recording",
+        description="Recording and retention settings applied to cameras unless overridden per-camera.",
    )
    review: ReviewConfig = Field(
-        default_factory=ReviewConfig, title="Review configuration."
+        default_factory=ReviewConfig,
+        title="Review",
+        description="Settings that control alerts, detections, and GenAI review summaries used by the UI and storage.",
    )
    snapshots: SnapshotsConfig = Field(
-        default_factory=SnapshotsConfig, title="Global snapshots configuration."
+        default_factory=SnapshotsConfig,
+        title="Snapshots",
+        description="Settings for saved JPEG snapshots of tracked objects for all cameras; can be overridden per-camera.",
    )
    timestamp_style: TimestampStyleConfig = Field(
        default_factory=TimestampStyleConfig,
-        title="Global timestamp style configuration.",
+        title="Timestamp style",
+        description="Styling options for in-feed timestamps applied to debug view and snapshots.",
    )

    # Classification Config
    audio_transcription: AudioTranscriptionConfig = Field(
-        default_factory=AudioTranscriptionConfig, title="Audio transcription config."
+        default_factory=AudioTranscriptionConfig,
+        title="Audio transcription",
+        description="Settings for live and speech audio transcription used for events and live captions.",
    )
    classification: ClassificationConfig = Field(
-        default_factory=ClassificationConfig, title="Object classification config."
+        default_factory=ClassificationConfig,
+        title="Object classification",
+        description="Settings for classification models used to refine object labels or state classification.",
    )
    semantic_search: SemanticSearchConfig = Field(
-        default_factory=SemanticSearchConfig, title="Semantic search configuration."
+        default_factory=SemanticSearchConfig,
+        title="Semantic Search",
+        description="Settings for Semantic Search which builds and queries object embeddings to find similar items.",
    )
    face_recognition: FaceRecognitionConfig = Field(
-        default_factory=FaceRecognitionConfig, title="Face recognition config."
+        default_factory=FaceRecognitionConfig,
+        title="Face recognition",
+        description="Settings for face detection and recognition for all cameras; can be overridden per-camera.",
    )
    lpr: LicensePlateRecognitionConfig = Field(
        default_factory=LicensePlateRecognitionConfig,
-        title="License Plate recognition config.",
+        title="License Plate Recognition",
+        description="License plate recognition settings including detection thresholds, formatting, and known plates.",
    )

    camera_groups: Dict[str, CameraGroupConfig] = Field(
-        default_factory=dict, title="Camera group configuration"
+        default_factory=dict,
+        title="Camera groups",
+        description="Configuration for named camera groups used to organize cameras in the UI.",
    )

    _plus_api: PlusApi
@@ -431,6 +580,18 @@ class FrigateConfig(FrigateBaseModel):
        # set notifications state
        self.notifications.enabled_in_config = self.notifications.enabled

+        # validate genai: each role (tools, vision, embeddings) at most once
+        role_to_name: dict[GenAIRoleEnum, str] = {}
+        for name, genai_cfg in self.genai.items():
+            for role in genai_cfg.roles:
+                if role in role_to_name:
+                    raise ValueError(
+                        f"GenAI role '{role.value}' is assigned to both "
+                        f"'{role_to_name[role]}' and '{name}'; each role must have "
+                        "exactly one provider."
+                    )
+                role_to_name[role] = name
+
        # set default min_score for object attributes
        for attribute in self.model.all_attributes:
            if not self.objects.filters.get(attribute):
@@ -475,6 +636,9 @@ class FrigateConfig(FrigateBaseModel):

            # users should not set model themselves
            if detector_config.model:
+                logger.warning(
+                    "The model key should be specified at the root level of the config, not under detectors. The nested model key will be ignored."
+                )
                detector_config.model = None

            model_config = self.model.model_dump(exclude_unset=True, warnings="none")
@@ -625,35 +789,63 @@ class FrigateConfig(FrigateBaseModel):
            for key in object_keys:
                camera_config.objects.filters[key] = FilterConfig()

+            # Process global object masks to set raw_coordinates
+            if camera_config.objects.mask:
+                processed_global_masks = {}
+                for mask_id, mask_config in camera_config.objects.mask.items():
+                    if mask_config:
+                        coords = mask_config.coordinates
+                        relative_coords = get_relative_coordinates(
+                            coords, camera_config.frame_shape
+                        )
+                        # Create a new ObjectMaskConfig with raw_coordinates set
+                        processed_global_masks[mask_id] = ObjectMaskConfig(
+                            friendly_name=mask_config.friendly_name,
+                            enabled=mask_config.enabled,
+                            coordinates=relative_coords if relative_coords else coords,
+                            raw_coordinates=relative_coords
+                            if relative_coords
+                            else coords,
+                            enabled_in_config=mask_config.enabled,
+                        )
+                    else:
+                        processed_global_masks[mask_id] = mask_config
+                camera_config.objects.mask = processed_global_masks
+                camera_config.objects.raw_mask = processed_global_masks
+
            # Apply global object masks and convert masks to numpy array
            for object, filter in camera_config.objects.filters.items():
+                # Set enabled_in_config for per-object masks before processing
+                for mask_config in filter.mask.values():
+                    if mask_config:
+                        mask_config.enabled_in_config = mask_config.enabled
+
+                # Merge global object masks with per-object filter masks
+                merged_mask = dict(filter.mask)  # Copy filter-specific masks
+
+                # Add global object masks if they exist
                if camera_config.objects.mask:
-                    filter_mask = []
-                    if filter.mask is not None:
-                        filter_mask = (
-                            filter.mask
-                            if isinstance(filter.mask, list)
-                            else [filter.mask]
-                        )
-                    object_mask = (
-                        get_relative_coordinates(
-                            (
-                                camera_config.objects.mask
-                                if isinstance(camera_config.objects.mask, list)
-                                else [camera_config.objects.mask]
-                            ),
-                            camera_config.frame_shape,
-                        )
-                        or []
-                    )
-                    filter.mask = filter_mask + object_mask
+                    for mask_id, mask_config in camera_config.objects.mask.items():
+                        # Use a global prefix to avoid key collisions
+                        global_mask_id = f"global_{mask_id}"
+                        merged_mask[global_mask_id] = mask_config

                # Set runtime filter to create masks
                camera_config.objects.filters[object] = RuntimeFilterConfig(
                    frame_shape=camera_config.frame_shape,
-                    **filter.model_dump(exclude_unset=True),
+                    mask=merged_mask,
+                    **filter.model_dump(
+                        exclude_unset=True, exclude={"mask", "raw_mask"}
+                    ),
                )

+            # Set enabled_in_config for motion masks to match config file state BEFORE creating RuntimeMotionConfig
+            if camera_config.motion:
+                camera_config.motion.enabled_in_config = camera_config.motion.enabled
+                for mask_config in camera_config.motion.mask.values():
+                    if mask_config:
+                        mask_config.enabled_in_config = mask_config.enabled
+
            # Convert motion configuration
            if camera_config.motion is None:
                camera_config.motion = RuntimeMotionConfig(
@@ -662,10 +854,8 @@ class FrigateConfig(FrigateBaseModel):
            else:
                camera_config.motion = RuntimeMotionConfig(
                    frame_shape=camera_config.frame_shape,
-                    raw_mask=camera_config.motion.mask,
                    **camera_config.motion.model_dump(exclude_unset=True),
                )
-            camera_config.motion.enabled_in_config = camera_config.motion.enabled

            # generate zone contours
            if len(camera_config.zones) > 0:
@@ -679,6 +869,10 @@ class FrigateConfig(FrigateBaseModel):

                    zone.generate_contour(camera_config.frame_shape)

+                # Set enabled_in_config for zones to match config file state
+                for zone in camera_config.zones.values():
+                    zone.enabled_in_config = zone.enabled
+
            # Set live view stream if none is set
            if not camera_config.live.streams:
                camera_config.live.streams = {name: name}
--- a/frigate/config/database.py
+++ b/frigate/config/database.py
@@ -8,4 +8,8 @@ __all__ = ["DatabaseConfig"]


 class DatabaseConfig(FrigateBaseModel):
-    path: str = Field(default=DEFAULT_DB_PATH, title="Database path.")  # noqa: F821
+    path: str = Field(
+        default=DEFAULT_DB_PATH,
+        title="Database path",
+        description="Filesystem path where the Frigate SQLite database file will be stored.",
+    )  # noqa: F821
--- a/frigate/config/logger.py
+++ b/frigate/config/logger.py
@@ -9,9 +9,15 @@ __all__ = ["LoggerConfig"]


 class LoggerConfig(FrigateBaseModel):
-    default: LogLevel = Field(default=LogLevel.info, title="Default logging level.")
+    default: LogLevel = Field(
+        default=LogLevel.info,
+        title="Logging level",
+        description="Default global log verbosity (debug, info, warning, error).",
+    )
    logs: dict[str, LogLevel] = Field(
-        default_factory=dict, title="Log level for specified processes."
+        default_factory=dict,
+        title="Per-process log level",
+        description="Per-component log level overrides to increase or decrease verbosity for specific modules.",
    )

    @model_validator(mode="after")
--- a/frigate/config/mqtt.py
+++ b/frigate/config/mqtt.py
@@ -12,25 +12,73 @@ __all__ = ["MqttConfig"]


 class MqttConfig(FrigateBaseModel):
-    enabled: bool = Field(default=True, title="Enable MQTT Communication.")
-    host: str = Field(default="", title="MQTT Host")
-    port: int = Field(default=1883, title="MQTT Port")
-    topic_prefix: str = Field(default="frigate", title="MQTT Topic Prefix")
-    client_id: str = Field(default="frigate", title="MQTT Client ID")
+    enabled: bool = Field(
+        default=True,
+        title="Enable MQTT",
+        description="Enable or disable MQTT integration for state, events, and snapshots.",
+    )
+    host: str = Field(
+        default="",
+        title="MQTT host",
+        description="Hostname or IP address of the MQTT broker.",
+    )
+    port: int = Field(
+        default=1883,
+        title="MQTT port",
+        description="Port of the MQTT broker (usually 1883 for plain MQTT).",
+    )
+    topic_prefix: str = Field(
+        default="frigate",
+        title="Topic prefix",
+        description="MQTT topic prefix for all Frigate topics; must be unique if running multiple instances.",
+    )
+    client_id: str = Field(
+        default="frigate",
+        title="Client ID",
+        description="Client identifier used when connecting to the MQTT broker; should be unique per instance.",
+    )
    stats_interval: int = Field(
-        default=60, ge=FREQUENCY_STATS_POINTS, title="MQTT Camera Stats Interval"
+        default=60,
+        ge=FREQUENCY_STATS_POINTS,
+        title="Stats interval",
+        description="Interval in seconds for publishing system and camera stats to MQTT.",
+    )
+    user: Optional[EnvString] = Field(
+        default=None,
+        title="MQTT username",
+        description="Optional MQTT username; can be provided via environment variables or secrets.",
    )
-    user: Optional[EnvString] = Field(default=None, title="MQTT Username")
    password: Optional[EnvString] = Field(
-        default=None, title="MQTT Password", validate_default=True
+        default=None,
+        title="MQTT password",
+        description="Optional MQTT password; can be provided via environment variables or secrets.",
+        validate_default=True,
+    )
+    tls_ca_certs: Optional[str] = Field(
+        default=None,
+        title="TLS CA certs",
+        description="Path to CA certificate for TLS connections to the broker (for self-signed certs).",
    )
-    tls_ca_certs: Optional[str] = Field(default=None, title="MQTT TLS CA Certificates")
    tls_client_cert: Optional[str] = Field(
-        default=None, title="MQTT TLS Client Certificate"
+        default=None,
+        title="Client cert",
+        description="Client certificate path for TLS mutual authentication; do not set user/password when using client certs.",
+    )
+    tls_client_key: Optional[str] = Field(
+        default=None,
+        title="Client key",
+        description="Private key path for the client certificate.",
+    )
+    tls_insecure: Optional[bool] = Field(
+        default=None,
+        title="TLS insecure",
+        description="Allow insecure TLS connections by skipping hostname verification (not recommended).",
+    )
+    qos: int = Field(
+        default=0,
+        title="MQTT QoS",
+        description="Quality of Service level for MQTT publishes/subscriptions (0, 1, or 2).",
    )
-    tls_client_key: Optional[str] = Field(default=None, title="MQTT TLS Client Key")
-    tls_insecure: Optional[bool] = Field(default=None, title="MQTT TLS Insecure")
-    qos: int = Field(default=0, title="MQTT QoS")

    @model_validator(mode="after")
    def user_requires_pass(self, info: ValidationInfo) -> Self:
--- a/frigate/config/network.py
+++ b/frigate/config/network.py
@@ -8,20 +8,34 @@ __all__ = ["IPv6Config", "ListenConfig", "NetworkingConfig"]


 class IPv6Config(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable IPv6 for port 5000 and/or 8971")
+    enabled: bool = Field(
+        default=False,
+        title="Enable IPv6",
+        description="Enable IPv6 support for Frigate services (API and UI) where applicable.",
+    )


 class ListenConfig(FrigateBaseModel):
    internal: Union[int, str] = Field(
-        default=5000, title="Internal listening port for Frigate"
+        default=5000,
+        title="Internal port",
+        description="Internal listening port for Frigate (default 5000).",
    )
    external: Union[int, str] = Field(
-        default=8971, title="External listening port for Frigate"
+        default=8971,
+        title="External port",
+        description="External listening port for Frigate (default 8971).",
    )


 class NetworkingConfig(FrigateBaseModel):
-    ipv6: IPv6Config = Field(default_factory=IPv6Config, title="IPv6 configuration")
-    listen: ListenConfig = Field(
-        default_factory=ListenConfig, title="Listening ports configuration"
+    ipv6: IPv6Config = Field(
+        default_factory=IPv6Config,
+        title="IPv6 configuration",
+        description="IPv6-specific settings for Frigate network services.",
+    )
+    listen: ListenConfig = Field(
+        default_factory=ListenConfig,
+        title="Listening ports configuration",
+        description="Configuration for internal and external listening ports. This is for advanced users. For the majority of use cases it's recommended to change the ports section of your Docker compose file.",
    )
--- a/frigate/config/proxy.py
+++ b/frigate/config/proxy.py
@@ -10,36 +10,47 @@ __all__ = ["ProxyConfig", "HeaderMappingConfig"]

 class HeaderMappingConfig(FrigateBaseModel):
    user: str = Field(
-        default=None, title="Header name from upstream proxy to identify user."
+        default=None,
+        title="User header",
+        description="Header containing the authenticated username provided by the upstream proxy.",
    )
    role: str = Field(
        default=None,
-        title="Header name from upstream proxy to identify user role.",
+        title="Role header",
+        description="Header containing the authenticated user's role or groups from the upstream proxy.",
    )
    role_map: Optional[dict[str, list[str]]] = Field(
        default_factory=dict,
-        title=("Mapping of Frigate roles to upstream group values. "),
+        title=("Role mapping"),
+        description="Map upstream group values to Frigate roles (for example map admin groups to the admin role).",
    )


 class ProxyConfig(FrigateBaseModel):
    header_map: HeaderMappingConfig = Field(
        default_factory=HeaderMappingConfig,
-        title="Header mapping definitions for proxy user passing.",
+        title="Header mapping",
+        description="Map incoming proxy headers to Frigate user and role fields for proxy-based auth.",
    )
    logout_url: Optional[str] = Field(
-        default=None, title="Redirect url for logging out with proxy."
+        default=None,
+        title="Logout URL",
+        description="URL to redirect users to when logging out via the proxy.",
    )
    auth_secret: Optional[EnvString] = Field(
        default=None,
-        title="Secret value for proxy authentication.",
+        title="Proxy secret",
+        description="Optional secret checked against the X-Proxy-Secret header to verify trusted proxies.",
    )
    default_role: Optional[str] = Field(
-        default="viewer", title="Default role for proxy users."
+        default="viewer",
+        title="Default role",
+        description="Default role assigned to proxy-authenticated users when no role mapping applies (admin or viewer).",
    )
    separator: Optional[str] = Field(
        default=",",
-        title="The character used to separate values in a mapped header.",
+        title="Separator character",
+        description="Character used to split multiple values provided in proxy headers.",
    )

    @field_validator("separator", mode="before")
--- a/frigate/config/telemetry.py
+++ b/frigate/config/telemetry.py
@@ -8,22 +8,41 @@ __all__ = ["TelemetryConfig", "StatsConfig"]


 class StatsConfig(FrigateBaseModel):
-    amd_gpu_stats: bool = Field(default=True, title="Enable AMD GPU stats.")
-    intel_gpu_stats: bool = Field(default=True, title="Enable Intel GPU stats.")
+    amd_gpu_stats: bool = Field(
+        default=True,
+        title="AMD GPU stats",
+        description="Enable collection of AMD GPU statistics if an AMD GPU is present.",
+    )
+    intel_gpu_stats: bool = Field(
+        default=True,
+        title="Intel GPU stats",
+        description="Enable collection of Intel GPU statistics if an Intel GPU is present.",
+    )
    network_bandwidth: bool = Field(
-        default=False, title="Enable network bandwidth for ffmpeg processes."
+        default=False,
+        title="Network bandwidth",
+        description="Enable per-process network bandwidth monitoring for camera ffmpeg processes and detectors (requires capabilities).",
    )
    intel_gpu_device: Optional[str] = Field(
-        default=None, title="Define the device to use when gathering SR-IOV stats."
+        default=None,
+        title="SR-IOV device",
+        description="Device identifier used when treating Intel GPUs as SR-IOV to fix GPU stats.",
    )


 class TelemetryConfig(FrigateBaseModel):
    network_interfaces: list[str] = Field(
        default=[],
-        title="Enabled network interfaces for bandwidth calculation.",
+        title="Network interfaces",
+        description="List of network interface name prefixes to monitor for bandwidth statistics.",
    )
    stats: StatsConfig = Field(
-        default_factory=StatsConfig, title="System Stats Configuration"
+        default_factory=StatsConfig,
+        title="System stats",
+        description="Options to enable/disable collection of various system and GPU statistics.",
+    )
+    version_check: bool = Field(
+        default=True,
+        title="Version check",
+        description="Enable an outbound check to detect if a newer Frigate version is available.",
    )
-    version_check: bool = Field(default=True, title="Enable latest version check.")
--- a/frigate/config/tls.py
+++ b/frigate/config/tls.py
@@ -6,4 +6,8 @@ __all__ = ["TlsConfig"]


 class TlsConfig(FrigateBaseModel):
-    enabled: bool = Field(default=True, title="Enable TLS for port 8971")
+    enabled: bool = Field(
+        default=True,
+        title="Enable TLS",
+        description="Enable TLS for Frigate's web UI and API on the configured TLS port.",
+    )
--- a/frigate/config/ui.py
+++ b/frigate/config/ui.py
@@ -27,16 +27,28 @@ class UnitSystemEnum(str, Enum):


 class UIConfig(FrigateBaseModel):
-    timezone: Optional[str] = Field(default=None, title="Override UI timezone.")
+    timezone: Optional[str] = Field(
+        default=None,
+        title="Timezone",
+        description="Optional timezone to display across the UI (defaults to browser local time if unset).",
+    )
    time_format: TimeFormatEnum = Field(
-        default=TimeFormatEnum.browser, title="Override UI time format."
+        default=TimeFormatEnum.browser,
+        title="Time format",
+        description="Time format to use in the UI (browser, 12hour, or 24hour).",
    )
    date_style: DateTimeStyleEnum = Field(
-        default=DateTimeStyleEnum.short, title="Override UI dateStyle."
+        default=DateTimeStyleEnum.short,
+        title="Date style",
+        description="Date style to use in the UI (full, long, medium, short).",
    )
    time_style: DateTimeStyleEnum = Field(
-        default=DateTimeStyleEnum.medium, title="Override UI timeStyle."
+        default=DateTimeStyleEnum.medium,
+        title="Time style",
+        description="Time style to use in the UI (full, long, medium, short).",
    )
    unit_system: UnitSystemEnum = Field(
-        default=UnitSystemEnum.metric, title="The unit system to use for measurements."
+        default=UnitSystemEnum.metric,
+        title="Unit system",
+        description="Unit system for display (metric or imperial) used in the UI and MQTT.",
    )
--- a/frigate/data_processing/common/license_plate/mixin.py
+++ b/frigate/data_processing/common/license_plate/mixin.py
@@ -1220,7 +1220,7 @@ class LicensePlateProcessingMixin:
            rgb = cv2.cvtColor(frame, cv2.COLOR_YUV2BGR_I420)

            # apply motion mask
-            rgb[self.config.cameras[obj_data].motion.mask == 0] = [0, 0, 0]
+            rgb[self.config.cameras[obj_data].motion.rasterized_mask == 0] = [0, 0, 0]

            if WRITE_DEBUG_IMAGES:
                cv2.imwrite(
@@ -1324,7 +1324,7 @@ class LicensePlateProcessingMixin:
                rgb = cv2.cvtColor(frame, cv2.COLOR_YUV2BGR_I420)

                # apply motion mask
-                rgb[self.config.cameras[camera].motion.mask == 0] = [0, 0, 0]
+                rgb[self.config.cameras[camera].motion.rasterized_mask == 0] = [0, 0, 0]

                left, top, right, bottom = car_box
                car = rgb[top:bottom, left:right]
--- a/frigate/data_processing/real_time/bird.py
+++ b/frigate/data_processing/real_time/bird.py
@@ -22,7 +22,7 @@ from .api import RealTimeProcessorApi
 try:
    from tflite_runtime.interpreter import Interpreter
 except ModuleNotFoundError:
-    from tensorflow.lite.python.interpreter import Interpreter
+    from ai_edge_litert.interpreter import Interpreter

 logger = logging.getLogger(__name__)

--- a/frigate/data_processing/real_time/custom_classification.py
+++ b/frigate/data_processing/real_time/custom_classification.py
@@ -32,7 +32,7 @@ from .api import RealTimeProcessorApi
 try:
    from tflite_runtime.interpreter import Interpreter
 except ModuleNotFoundError:
-    from tensorflow.lite.python.interpreter import Interpreter
+    from ai_edge_litert.interpreter import Interpreter

 logger = logging.getLogger(__name__)

@@ -73,11 +73,6 @@ class CustomStateClassificationProcessor(RealTimeProcessorApi):
        self.__build_detector()

    def __build_detector(self) -> None:
-        try:
-            from tflite_runtime.interpreter import Interpreter
-        except ModuleNotFoundError:
-            from tensorflow.lite.python.interpreter import Interpreter
-
        model_path = os.path.join(self.model_dir, "model.tflite")
        labelmap_path = os.path.join(self.model_dir, "labelmap.txt")

--- a/frigate/detectors/detection_runners.py
+++ b/frigate/detectors/detection_runners.py
@@ -603,4 +603,4 @@ def get_optimized_runner(
            provider_options=options,
        ),
        model_type=model_type,
-    )
+    )
--- a/frigate/detectors/detector_config.py
+++ b/frigate/detectors/detector_config.py
@@ -45,30 +45,55 @@ class ModelTypeEnum(str, Enum):


 class ModelConfig(BaseModel):
-    path: Optional[str] = Field(None, title="Custom Object detection model path.")
-    labelmap_path: Optional[str] = Field(
-        None, title="Label map for custom object detector."
+    path: Optional[str] = Field(
+        None,
+        title="Custom Object detection model path",
+        description="Path to a custom detection model file (or plus://<model_id> for Frigate+ models).",
+    )
+    labelmap_path: Optional[str] = Field(
+        None,
+        title="Label map for custom object detector",
+        description="Path to a labelmap file that maps numeric classes to string labels for the detector.",
+    )
+    width: int = Field(
+        default=320,
+        title="Object detection model input width",
+        description="Width of the model input tensor in pixels.",
+    )
+    height: int = Field(
+        default=320,
+        title="Object detection model input height",
+        description="Height of the model input tensor in pixels.",
    )
-    width: int = Field(default=320, title="Object detection model input width.")
-    height: int = Field(default=320, title="Object detection model input height.")
    labelmap: Dict[int, str] = Field(
-        default_factory=dict, title="Labelmap customization."
+        default_factory=dict,
+        title="Labelmap customization",
+        description="Overrides or remapping entries to merge into the standard labelmap.",
    )
    attributes_map: Dict[str, list[str]] = Field(
        default=DEFAULT_ATTRIBUTE_LABEL_MAP,
-        title="Map of object labels to their attribute labels.",
+        title="Map of object labels to their attribute labels",
+        description="Mapping from object labels to attribute labels used to attach metadata (for example 'car' -> ['license_plate']).",
    )
    input_tensor: InputTensorEnum = Field(
-        default=InputTensorEnum.nhwc, title="Model Input Tensor Shape"
+        default=InputTensorEnum.nhwc,
+        title="Model Input Tensor Shape",
+        description="Tensor format expected by the model: 'nhwc' or 'nchw'.",
    )
    input_pixel_format: PixelFormatEnum = Field(
-        default=PixelFormatEnum.rgb, title="Model Input Pixel Color Format"
+        default=PixelFormatEnum.rgb,
+        title="Model Input Pixel Color Format",
+        description="Pixel colorspace expected by the model: 'rgb', 'bgr', or 'yuv'.",
    )
    input_dtype: InputDTypeEnum = Field(
-        default=InputDTypeEnum.int, title="Model Input D Type"
+        default=InputDTypeEnum.int,
+        title="Model Input D Type",
+        description="Data type of the model input tensor (for example 'float32').",
    )
    model_type: ModelTypeEnum = Field(
-        default=ModelTypeEnum.ssd, title="Object Detection Model Type"
+        default=ModelTypeEnum.ssd,
+        title="Object Detection Model Type",
+        description="Detector model architecture type (ssd, yolox, yolonas) used by some detectors for optimization.",
    )
    _merged_labelmap: Optional[Dict[int, str]] = PrivateAttr()
    _colormap: Dict[int, Tuple[int, int, int]] = PrivateAttr()
@@ -210,12 +235,20 @@ class ModelConfig(BaseModel):

 class BaseDetectorConfig(BaseModel):
    # the type field must be defined in all subclasses
-    type: str = Field(default="cpu", title="Detector Type")
+    type: str = Field(
+        default="cpu",
+        title="Detector Type",
+        description="Type of detector to use for object detection (for example 'cpu', 'edgetpu', 'openvino').",
+    )
    model: Optional[ModelConfig] = Field(
-        default=None, title="Detector specific model configuration."
+        default=None,
+        title="Detector specific model configuration",
+        description="Detector-specific model configuration options (path, input size, etc.).",
    )
    model_path: Optional[str] = Field(
-        default=None, title="Detector specific model path."
+        default=None,
+        title="Detector specific model path",
+        description="File path to the detector model binary if required by the chosen detector.",
    )
    model_config = ConfigDict(
        extra="allow", arbitrary_types_allowed=True, protected_namespaces=()
--- a/frigate/detectors/detector_utils.py
+++ b/frigate/detectors/detector_utils.py
@@ -6,7 +6,7 @@ import numpy as np
 try:
    from tflite_runtime.interpreter import Interpreter, load_delegate
 except ModuleNotFoundError:
-    from tensorflow.lite.python.interpreter import Interpreter, load_delegate
+    from ai_edge_litert.interpreter import Interpreter, load_delegate


 logger = logging.getLogger(__name__)
--- a/frigate/detectors/plugins/cpu_tfl.py
+++ b/frigate/detectors/plugins/cpu_tfl.py
@@ -1,6 +1,6 @@
 import logging

-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -12,7 +12,7 @@ from ..detector_utils import tflite_detect_raw, tflite_init
 try:
    from tflite_runtime.interpreter import Interpreter
 except ModuleNotFoundError:
-    from tensorflow.lite.python.interpreter import Interpreter
+    from ai_edge_litert.interpreter import Interpreter


 logger = logging.getLogger(__name__)
@@ -21,8 +21,18 @@ DETECTOR_KEY = "cpu"


 class CpuDetectorConfig(BaseDetectorConfig):
+    """CPU TFLite detector that runs TensorFlow Lite models on the host CPU without hardware acceleration. Not recommended."""
+
+    model_config = ConfigDict(
+        title="CPU",
+    )
+
    type: Literal[DETECTOR_KEY]
-    num_threads: int = Field(default=3, title="Number of detection threads")
+    num_threads: int = Field(
+        default=3,
+        title="Number of detection threads",
+        description="The number of threads used for CPU-based inference.",
+    )


 class CpuTfl(DetectionApi):
--- a/frigate/detectors/plugins/deepstack.py
+++ b/frigate/detectors/plugins/deepstack.py
@@ -4,7 +4,7 @@ import logging
 import numpy as np
 import requests
 from PIL import Image
-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -16,12 +16,28 @@ DETECTOR_KEY = "deepstack"


 class DeepstackDetectorConfig(BaseDetectorConfig):
+    """DeepStack/CodeProject.AI detector that sends images to a remote DeepStack HTTP API for inference. Not recommended."""
+
+    model_config = ConfigDict(
+        title="DeepStack",
+    )
+
    type: Literal[DETECTOR_KEY]
    api_url: str = Field(
-        default="http://localhost:80/v1/vision/detection", title="DeepStack API URL"
+        default="http://localhost:80/v1/vision/detection",
+        title="DeepStack API URL",
+        description="The URL of the DeepStack API.",
+    )
+    api_timeout: float = Field(
+        default=0.1,
+        title="DeepStack API timeout (in seconds)",
+        description="Maximum time allowed for a DeepStack API request.",
+    )
+    api_key: str = Field(
+        default="",
+        title="DeepStack API key (if required)",
+        description="Optional API key for authenticated DeepStack services.",
    )
-    api_timeout: float = Field(default=0.1, title="DeepStack API timeout (in seconds)")
-    api_key: str = Field(default="", title="DeepStack API key (if required)")


 class DeepStack(DetectionApi):
--- a/frigate/detectors/plugins/degirum.py
+++ b/frigate/detectors/plugins/degirum.py
@@ -2,7 +2,7 @@ import logging
 import queue

 import numpy as np
-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -14,10 +14,28 @@ DETECTOR_KEY = "degirum"

 ### DETECTOR CONFIG ###
 class DGDetectorConfig(BaseDetectorConfig):
+    """DeGirum detector for running models via DeGirum cloud or local inference services."""
+
+    model_config = ConfigDict(
+        title="DeGirum",
+    )
+
    type: Literal[DETECTOR_KEY]
-    location: str = Field(default=None, title="Inference Location")
-    zoo: str = Field(default=None, title="Model Zoo")
-    token: str = Field(default=None, title="DeGirum Cloud Token")
+    location: str = Field(
+        default=None,
+        title="Inference Location",
+        description="Location of the DeGirim inference engine (e.g. '@cloud', '127.0.0.1').",
+    )
+    zoo: str = Field(
+        default=None,
+        title="Model Zoo",
+        description="Path or URL to the DeGirum model zoo.",
+    )
+    token: str = Field(
+        default=None,
+        title="DeGirum Cloud Token",
+        description="Token for DeGirum Cloud access.",
+    )


 ### ACTUAL DETECTOR  ###
--- a/frigate/detectors/plugins/edgetpu_tfl.py
+++ b/frigate/detectors/plugins/edgetpu_tfl.py
@@ -4,7 +4,7 @@ import os

 import cv2
 import numpy as np
-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -13,7 +13,7 @@ from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum
 try:
    from tflite_runtime.interpreter import Interpreter, load_delegate
 except ModuleNotFoundError:
-    from tensorflow.lite.python.interpreter import Interpreter, load_delegate
+    from ai_edge_litert.interpreter import Interpreter, load_delegate

 logger = logging.getLogger(__name__)

@@ -21,8 +21,18 @@ DETECTOR_KEY = "edgetpu"


 class EdgeTpuDetectorConfig(BaseDetectorConfig):
+    """EdgeTPU detector that runs TensorFlow Lite models compiled for Coral EdgeTPU using the EdgeTPU delegate."""
+
+    model_config = ConfigDict(
+        title="EdgeTPU",
+    )
+
    type: Literal[DETECTOR_KEY]
-    device: str = Field(default=None, title="Device Type")
+    device: str = Field(
+        default=None,
+        title="Device Type",
+        description="The device to use for EdgeTPU inference (e.g. 'usb', 'pci').",
+    )


 class EdgeTpuTfl(DetectionApi):
--- a/frigate/detectors/plugins/hailo8l.py
+++ b/frigate/detectors/plugins/hailo8l.py
@@ -8,7 +8,7 @@ from typing import Dict, List, Optional, Tuple

 import cv2
 import numpy as np
-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.const import MODEL_CACHE_DIR
@@ -410,5 +410,15 @@ class HailoDetector(DetectionApi):

 # ----------------- HailoDetectorConfig Class ----------------- #
 class HailoDetectorConfig(BaseDetectorConfig):
+    """Hailo-8/Hailo-8L detector using HEF models and the HailoRT SDK for inference on Hailo hardware."""
+
+    model_config = ConfigDict(
+        title="Hailo-8/Hailo-8L",
+    )
+
    type: Literal[DETECTOR_KEY]
-    device: str = Field(default="PCIe", title="Device Type")
+    device: str = Field(
+        default="PCIe",
+        title="Device Type",
+        description="The device to use for Hailo inference (e.g. 'PCIe', 'M.2').",
+    )
--- a/frigate/detectors/plugins/memryx.py
+++ b/frigate/detectors/plugins/memryx.py
@@ -8,7 +8,7 @@ from queue import Queue

 import cv2
 import numpy as np
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -30,8 +30,18 @@ class ModelConfig(BaseModel):


 class MemryXDetectorConfig(BaseDetectorConfig):
+    """MemryX MX3 detector that runs compiled DFP models on MemryX accelerators."""
+
+    model_config = ConfigDict(
+        title="MemryX",
+    )
+
    type: Literal[DETECTOR_KEY]
-    device: str = Field(default="PCIe", title="Device Path")
+    device: str = Field(
+        default="PCIe",
+        title="Device Path",
+        description="The device to use for MemryX inference (e.g. 'PCIe').",
+    )


 class MemryXDetector(DetectionApi):
--- a/frigate/detectors/plugins/onnx.py
+++ b/frigate/detectors/plugins/onnx.py
@@ -1,7 +1,7 @@
 import logging

 import numpy as np
-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -23,8 +23,18 @@ DETECTOR_KEY = "onnx"


 class ONNXDetectorConfig(BaseDetectorConfig):
+    """ONNX detector for running ONNX models; will use available acceleration backends (CUDA/ROCm/OpenVINO) when available."""
+
+    model_config = ConfigDict(
+        title="ONNX",
+    )
+
    type: Literal[DETECTOR_KEY]
-    device: str = Field(default="AUTO", title="Device Type")
+    device: str = Field(
+        default="AUTO",
+        title="Device Type",
+        description="The device to use for ONNX inference (e.g. 'AUTO', 'CPU', 'GPU').",
+    )


 class ONNXDetector(DetectionApi):
--- a/frigate/detectors/plugins/openvino.py
+++ b/frigate/detectors/plugins/openvino.py
@@ -2,7 +2,7 @@ import logging

 import numpy as np
 import openvino as ov
-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -20,8 +20,18 @@ DETECTOR_KEY = "openvino"


 class OvDetectorConfig(BaseDetectorConfig):
+    """OpenVINO detector for AMD and Intel CPUs, Intel GPUs and Intel VPU hardware."""
+
+    model_config = ConfigDict(
+        title="OpenVINO",
+    )
+
    type: Literal[DETECTOR_KEY]
-    device: str = Field(default=None, title="Device Type")
+    device: str = Field(
+        default=None,
+        title="Device Type",
+        description="The device to use for OpenVINO inference (e.g. 'CPU', 'GPU', 'NPU').",
+    )


 class OvDetector(DetectionApi):
--- a/frigate/detectors/plugins/rknn.py
+++ b/frigate/detectors/plugins/rknn.py
@@ -6,7 +6,7 @@ from typing import Literal

 import cv2
 import numpy as np
-from pydantic import Field
+from pydantic import ConfigDict, Field

 from frigate.const import MODEL_CACHE_DIR, SUPPORTED_RK_SOCS
 from frigate.detectors.detection_api import DetectionApi
@@ -29,8 +29,20 @@ model_cache_dir = os.path.join(MODEL_CACHE_DIR, "rknn_cache/")


 class RknnDetectorConfig(BaseDetectorConfig):
+    """RKNN detector for Rockchip NPUs; runs compiled RKNN models on Rockchip hardware."""
+
+    model_config = ConfigDict(
+        title="RKNN",
+    )
+
    type: Literal[DETECTOR_KEY]
-    num_cores: int = Field(default=0, ge=0, le=3, title="Number of NPU cores to use.")
+    num_cores: int = Field(
+        default=0,
+        ge=0,
+        le=3,
+        title="Number of NPU cores to use.",
+        description="The number of NPU cores to use (0 for auto).",
+    )


 class Rknn(DetectionApi):
--- a/frigate/detectors/plugins/synaptics.py
+++ b/frigate/detectors/plugins/synaptics.py
@@ -2,6 +2,7 @@ import logging
 import os

 import numpy as np
+from pydantic import ConfigDict
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -27,6 +28,12 @@ DETECTOR_KEY = "synaptics"


 class SynapDetectorConfig(BaseDetectorConfig):
+    """Synaptics NPU detector for models in .synap format using the Synap SDK on Synaptics hardware."""
+
+    model_config = ConfigDict(
+        title="Synaptics",
+    )
+
    type: Literal[DETECTOR_KEY]


--- a/frigate/detectors/plugins/teflon_tfl.py
+++ b/frigate/detectors/plugins/teflon_tfl.py
@@ -1,5 +1,6 @@
 import logging

+from pydantic import ConfigDict
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -18,6 +19,12 @@ DETECTOR_KEY = "teflon_tfl"


 class TeflonDetectorConfig(BaseDetectorConfig):
+    """Teflon delegate detector for TFLite using Mesa Teflon delegate library to accelerate inference on supported GPUs."""
+
+    model_config = ConfigDict(
+        title="Teflon",
+    )
+
    type: Literal[DETECTOR_KEY]


--- a/frigate/detectors/plugins/tensorrt.py
+++ b/frigate/detectors/plugins/tensorrt.py
@@ -14,7 +14,7 @@ try:
 except ModuleNotFoundError:
    TRT_SUPPORT = False

-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -46,8 +46,16 @@ if TRT_SUPPORT:


 class TensorRTDetectorConfig(BaseDetectorConfig):
+    """TensorRT detector for Nvidia Jetson devices using serialized TensorRT engines for accelerated inference."""
+
+    model_config = ConfigDict(
+        title="TensorRT",
+    )
+
    type: Literal[DETECTOR_KEY]
-    device: int = Field(default=0, title="GPU Device Index")
+    device: int = Field(
+        default=0, title="GPU Device Index", description="The GPU device index to use."
+    )


 class HostDeviceMem(object):
--- a/frigate/detectors/plugins/zmq_ipc.py
+++ b/frigate/detectors/plugins/zmq_ipc.py
@@ -5,7 +5,7 @@ from typing import Any, List

 import numpy as np
 import zmq
-from pydantic import Field
+from pydantic import ConfigDict, Field
 from typing_extensions import Literal

 from frigate.detectors.detection_api import DetectionApi
@@ -17,14 +17,28 @@ DETECTOR_KEY = "zmq"


 class ZmqDetectorConfig(BaseDetectorConfig):
+    """ZMQ IPC detector that offloads inference to an external process via a ZeroMQ IPC endpoint."""
+
+    model_config = ConfigDict(
+        title="ZMQ IPC",
+    )
+
    type: Literal[DETECTOR_KEY]
    endpoint: str = Field(
-        default="ipc:///tmp/cache/zmq_detector", title="ZMQ IPC endpoint"
+        default="ipc:///tmp/cache/zmq_detector",
+        title="ZMQ IPC endpoint",
+        description="The ZMQ endpoint to connect to.",
    )
    request_timeout_ms: int = Field(
-        default=200, title="ZMQ request timeout in milliseconds"
+        default=200,
+        title="ZMQ request timeout in milliseconds",
+        description="Timeout for ZMQ requests in milliseconds.",
+    )
+    linger_ms: int = Field(
+        default=0,
+        title="ZMQ socket linger in milliseconds",
+        description="Socket linger period in milliseconds.",
    )
-    linger_ms: int = Field(default=0, title="ZMQ socket linger in milliseconds")


 class ZmqIpcDetector(DetectionApi):
--- a/frigate/embeddings/maintainer.py
+++ b/frigate/embeddings/maintainer.py
@@ -59,7 +59,7 @@ from frigate.data_processing.real_time.license_plate import (
 from frigate.data_processing.types import DataProcessorMetrics, PostProcessDataEnum
 from frigate.db.sqlitevecq import SqliteVecQueueDatabase
 from frigate.events.types import EventTypeEnum, RegenerateDescriptionEnum
-from frigate.genai import get_genai_client
+from frigate.genai import GenAIClientManager
 from frigate.models import Event, Recordings, ReviewSegment, Trigger
 from frigate.util.builtin import serialize
 from frigate.util.file import get_event_thumbnail_bytes
@@ -144,7 +144,7 @@ class EmbeddingMaintainer(threading.Thread):
        self.frame_manager = SharedMemoryFrameManager()

        self.detected_license_plates: dict[str, dict[str, Any]] = {}
-        self.genai_client = get_genai_client(config)
+        self.genai_manager = GenAIClientManager(config)

        # model runners to share between realtime and post processors
        if self.config.lpr.enabled:
@@ -203,12 +203,15 @@ class EmbeddingMaintainer(threading.Thread):
        # post processors
        self.post_processors: list[PostProcessorApi] = []

-        if self.genai_client is not None and any(
+        if self.genai_manager.vision_client is not None and any(
            c.review.genai.enabled_in_config for c in self.config.cameras.values()
        ):
            self.post_processors.append(
                ReviewDescriptionProcessor(
-                    self.config, self.requestor, self.metrics, self.genai_client
+                    self.config,
+                    self.requestor,
+                    self.metrics,
+                    self.genai_manager.vision_client,
                )
            )

@@ -246,7 +249,7 @@ class EmbeddingMaintainer(threading.Thread):
            )
            self.post_processors.append(semantic_trigger_processor)

-        if self.genai_client is not None and any(
+        if self.genai_manager.vision_client is not None and any(
            c.objects.genai.enabled_in_config for c in self.config.cameras.values()
        ):
            self.post_processors.append(
@@ -255,7 +258,7 @@ class EmbeddingMaintainer(threading.Thread):
                    self.embeddings,
                    self.requestor,
                    self.metrics,
-                    self.genai_client,
+                    self.genai_manager.vision_client,
                    semantic_trigger_processor,
                )
            )
--- a/frigate/embeddings/onnx/face_embedding.py
+++ b/frigate/embeddings/onnx/face_embedding.py
@@ -17,7 +17,7 @@ from .base_embedding import BaseEmbedding
 try:
    from tflite_runtime.interpreter import Interpreter
 except ModuleNotFoundError:
-    from tensorflow.lite.python.interpreter import Interpreter
+    from ai_edge_litert.interpreter import Interpreter

 logger = logging.getLogger(__name__)

--- a/frigate/events/audio.py
+++ b/frigate/events/audio.py
@@ -43,7 +43,7 @@ from frigate.video import start_or_restart_ffmpeg, stop_ffmpeg
 try:
    from tflite_runtime.interpreter import Interpreter
 except ModuleNotFoundError:
-    from tensorflow.lite.python.interpreter import Interpreter
+    from ai_edge_litert.interpreter import Interpreter


 logger = logging.getLogger(__name__)
--- a/frigate/genai/init.py
+++ b/frigate/genai/init.py
@@ -9,13 +9,24 @@ from typing import Any, Optional

 from playhouse.shortcuts import model_to_dict

-from frigate.config import CameraConfig, FrigateConfig, GenAIConfig, GenAIProviderEnum
+from frigate.config import CameraConfig, GenAIConfig, GenAIProviderEnum
 from frigate.const import CLIPS_DIR
 from frigate.data_processing.post.types import ReviewMetadata
+from frigate.genai.manager import GenAIClientManager
 from frigate.models import Event

 logger = logging.getLogger(__name__)

+__all__ = [
+    "GenAIClient",
+    "GenAIClientManager",
+    "GenAIConfig",
+    "GenAIProviderEnum",
+    "PROVIDERS",
+    "load_providers",
+    "register_genai_provider",
+]
+
 PROVIDERS = {}


@@ -352,19 +363,6 @@ Guidelines:
        }


-def get_genai_client(config: FrigateConfig) -> Optional[GenAIClient]:
-    """Get the GenAI client."""
-    if not config.genai.provider:
-        return None
-
-    load_providers()
-    provider = PROVIDERS.get(config.genai.provider)
-    if provider:
-        return provider(config.genai)
-
-    return None
-
-
 def load_providers():
    package_dir = os.path.dirname(__file__)
    for filename in os.listdir(package_dir):
--- a/frigate/genai/llama_cpp.py
+++ b/frigate/genai/llama_cpp.py
@@ -5,10 +5,12 @@ import json
 import logging
 from typing import Any, Optional

+import httpx
 import requests

 from frigate.config import GenAIProviderEnum
 from frigate.genai import GenAIClient, register_genai_provider
+from frigate.genai.utils import parse_tool_calls_from_message

 logger = logging.getLogger(__name__)

@@ -67,6 +69,7 @@ class LlamaCppClient(GenAIClient):

            # Build request payload with llama.cpp native options
            payload = {
+                "model": self.genai_config.model,
                "messages": [
                    {
                        "role": "user",
@@ -99,7 +102,79 @@ class LlamaCppClient(GenAIClient):

    def get_context_size(self) -> int:
        """Get the context window size for llama.cpp."""
-        return self.genai_config.provider_options.get("context_size", 4096)
+        return self.provider_options.get("context_size", 4096)
+
+    def _build_payload(
+        self,
+        messages: list[dict[str, Any]],
+        tools: Optional[list[dict[str, Any]]],
+        tool_choice: Optional[str],
+        stream: bool = False,
+    ) -> dict[str, Any]:
+        """Build request payload for chat completions (sync or stream)."""
+        openai_tool_choice = None
+        if tool_choice:
+            if tool_choice == "none":
+                openai_tool_choice = "none"
+            elif tool_choice == "auto":
+                openai_tool_choice = "auto"
+            elif tool_choice == "required":
+                openai_tool_choice = "required"
+
+        payload: dict[str, Any] = {
+            "messages": messages,
+            "model": self.genai_config.model,
+        }
+        if stream:
+            payload["stream"] = True
+        if tools:
+            payload["tools"] = tools
+            if openai_tool_choice is not None:
+                payload["tool_choice"] = openai_tool_choice
+        provider_opts = {
+            k: v for k, v in self.provider_options.items() if k != "context_size"
+        }
+        payload.update(provider_opts)
+        return payload
+
+    def _message_from_choice(self, choice: dict[str, Any]) -> dict[str, Any]:
+        """Parse OpenAI-style choice into {content, tool_calls, finish_reason}."""
+        message = choice.get("message", {})
+        content = message.get("content")
+        content = content.strip() if content else None
+        tool_calls = parse_tool_calls_from_message(message)
+        finish_reason = choice.get("finish_reason") or (
+            "tool_calls" if tool_calls else "stop" if content else "error"
+        )
+        return {
+            "content": content,
+            "tool_calls": tool_calls,
+            "finish_reason": finish_reason,
+        }
+
+    @staticmethod
+    def _streamed_tool_calls_to_list(
+        tool_calls_by_index: dict[int, dict[str, Any]],
+    ) -> Optional[list[dict[str, Any]]]:
+        """Convert streamed tool_calls index map to list of {id, name, arguments}."""
+        if not tool_calls_by_index:
+            return None
+        result = []
+        for idx in sorted(tool_calls_by_index.keys()):
+            t = tool_calls_by_index[idx]
+            args_str = t.get("arguments") or "{}"
+            try:
+                arguments = json.loads(args_str)
+            except json.JSONDecodeError:
+                arguments = {}
+            result.append(
+                {
+                    "id": t.get("id", ""),
+                    "name": t.get("name", ""),
+                    "arguments": arguments,
+                }
+            )
+        return result if result else None

    def chat_with_tools(
        self,
@@ -122,31 +197,8 @@ class LlamaCppClient(GenAIClient):
                "tool_calls": None,
                "finish_reason": "error",
            }
-
        try:
-            openai_tool_choice = None
-            if tool_choice:
-                if tool_choice == "none":
-                    openai_tool_choice = "none"
-                elif tool_choice == "auto":
-                    openai_tool_choice = "auto"
-                elif tool_choice == "required":
-                    openai_tool_choice = "required"
-
-            payload = {
-                "messages": messages,
-            }
-
-            if tools:
-                payload["tools"] = tools
-                if openai_tool_choice is not None:
-                    payload["tool_choice"] = openai_tool_choice
-
-            provider_opts = {
-                k: v for k, v in self.provider_options.items() if k != "context_size"
-            }
-            payload.update(provider_opts)
-
+            payload = self._build_payload(messages, tools, tool_choice, stream=False)
            response = requests.post(
                f"{self.provider}/v1/chat/completions",
                json=payload,
@@ -154,60 +206,13 @@ class LlamaCppClient(GenAIClient):
            )
            response.raise_for_status()
            result = response.json()
-
            if result is None or "choices" not in result or len(result["choices"]) == 0:
                return {
                    "content": None,
                    "tool_calls": None,
                    "finish_reason": "error",
                }
-
-            choice = result["choices"][0]
-            message = choice.get("message", {})
-
-            content = message.get("content")
-            if content:
-                content = content.strip()
-            else:
-                content = None
-
-            tool_calls = None
-            if "tool_calls" in message and message["tool_calls"]:
-                tool_calls = []
-                for tool_call in message["tool_calls"]:
-                    try:
-                        function_data = tool_call.get("function", {})
-                        arguments_str = function_data.get("arguments", "{}")
-                        arguments = json.loads(arguments_str)
-                    except (json.JSONDecodeError, KeyError, TypeError) as e:
-                        logger.warning(
-                            f"Failed to parse tool call arguments: {e}, "
-                            f"tool: {function_data.get('name', 'unknown')}"
-                        )
-                        arguments = {}
-
-                    tool_calls.append(
-                        {
-                            "id": tool_call.get("id", ""),
-                            "name": function_data.get("name", ""),
-                            "arguments": arguments,
-                        }
-                    )
-
-            finish_reason = "error"
-            if "finish_reason" in choice and choice["finish_reason"]:
-                finish_reason = choice["finish_reason"]
-            elif tool_calls:
-                finish_reason = "tool_calls"
-            elif content:
-                finish_reason = "stop"
-
-            return {
-                "content": content,
-                "tool_calls": tool_calls,
-                "finish_reason": finish_reason,
-            }
-
+            return self._message_from_choice(result["choices"][0])
        except requests.exceptions.Timeout as e:
            logger.warning("llama.cpp request timed out: %s", str(e))
            return {
@@ -219,8 +224,7 @@ class LlamaCppClient(GenAIClient):
            error_detail = str(e)
            if hasattr(e, "response") and e.response is not None:
                try:
-                    error_body = e.response.text
-                    error_detail = f"{str(e)} - Response: {error_body[:500]}"
+                    error_detail = f"{str(e)} - Response: {e.response.text[:500]}"
                except Exception:
                    pass
            logger.warning("llama.cpp returned an error: %s", error_detail)
@@ -236,3 +240,111 @@ class LlamaCppClient(GenAIClient):
                "tool_calls": None,
                "finish_reason": "error",
            }
+
+    async def chat_with_tools_stream(
+        self,
+        messages: list[dict[str, Any]],
+        tools: Optional[list[dict[str, Any]]] = None,
+        tool_choice: Optional[str] = "auto",
+    ):
+        """Stream chat with tools via OpenAI-compatible streaming API."""
+        if self.provider is None:
+            logger.warning(
+                "llama.cpp provider has not been initialized. Check your llama.cpp configuration."
+            )
+            yield (
+                "message",
+                {
+                    "content": None,
+                    "tool_calls": None,
+                    "finish_reason": "error",
+                },
+            )
+            return
+        try:
+            payload = self._build_payload(messages, tools, tool_choice, stream=True)
+            content_parts: list[str] = []
+            tool_calls_by_index: dict[int, dict[str, Any]] = {}
+            finish_reason = "stop"
+
+            async with httpx.AsyncClient(timeout=float(self.timeout)) as client:
+                async with client.stream(
+                    "POST",
+                    f"{self.provider}/v1/chat/completions",
+                    json=payload,
+                ) as response:
+                    response.raise_for_status()
+                    async for line in response.aiter_lines():
+                        if not line.startswith("data: "):
+                            continue
+                        data_str = line[6:].strip()
+                        if data_str == "[DONE]":
+                            break
+                        try:
+                            data = json.loads(data_str)
+                        except json.JSONDecodeError:
+                            continue
+                        choices = data.get("choices") or []
+                        if not choices:
+                            continue
+                        delta = choices[0].get("delta", {})
+                        if choices[0].get("finish_reason"):
+                            finish_reason = choices[0]["finish_reason"]
+                        if delta.get("content"):
+                            content_parts.append(delta["content"])
+                            yield ("content_delta", delta["content"])
+                        for tc in delta.get("tool_calls") or []:
+                            idx = tc.get("index", 0)
+                            fn = tc.get("function") or {}
+                            if idx not in tool_calls_by_index:
+                                tool_calls_by_index[idx] = {
+                                    "id": tc.get("id", ""),
+                                    "name": tc.get("name") or fn.get("name", ""),
+                                    "arguments": "",
+                                }
+                            t = tool_calls_by_index[idx]
+                            if tc.get("id"):
+                                t["id"] = tc["id"]
+                            name = tc.get("name") or fn.get("name")
+                            if name:
+                                t["name"] = name
+                            arg = tc.get("arguments") or fn.get("arguments")
+                            if arg is not None:
+                                t["arguments"] += (
+                                    arg if isinstance(arg, str) else json.dumps(arg)
+                                )
+
+            full_content = "".join(content_parts).strip() or None
+            tool_calls_list = self._streamed_tool_calls_to_list(tool_calls_by_index)
+            if tool_calls_list:
+                finish_reason = "tool_calls"
+            yield (
+                "message",
+                {
+                    "content": full_content,
+                    "tool_calls": tool_calls_list,
+                    "finish_reason": finish_reason,
+                },
+            )
+        except httpx.HTTPStatusError as e:
+            logger.warning("llama.cpp streaming HTTP error: %s", e)
+            yield (
+                "message",
+                {
+                    "content": None,
+                    "tool_calls": None,
+                    "finish_reason": "error",
+                },
+            )
+        except Exception as e:
+            logger.warning(
+                "Unexpected error in llama.cpp chat_with_tools_stream: %s", str(e)
+            )
+            yield (
+                "message",
+                {
+                    "content": None,
+                    "tool_calls": None,
+                    "finish_reason": "error",
+                },
+            )
--- a/frigate/genai/manager.py
+++ b/frigate/genai/manager.py
@@ -0,0 +1,89 @@
+"""GenAI client manager for Frigate.
+
+Manages GenAI provider clients from Frigate config. Configuration is read only
+in _update_config(); no other code should read config.genai. Exposes clients
+by role: tool_client, vision_client, embeddings_client.
+"""
+
+import logging
+from typing import TYPE_CHECKING, Optional
+
+from frigate.config import FrigateConfig
+from frigate.config.camera.genai import GenAIRoleEnum
+
+if TYPE_CHECKING:
+    from frigate.genai import GenAIClient
+
+logger = logging.getLogger(__name__)
+
+
+class GenAIClientManager:
+    """Manages GenAI provider clients from Frigate config."""
+
+    def __init__(self, config: FrigateConfig) -> None:
+        self._config = config
+        self._tool_client: Optional[GenAIClient] = None
+        self._vision_client: Optional[GenAIClient] = None
+        self._embeddings_client: Optional[GenAIClient] = None
+        self._update_config()
+
+    def _update_config(self) -> None:
+        """Build role clients from current Frigate config.genai.
+
+        Called from __init__ and can be called again when config is reloaded.
+        Each role (tools, vision, embeddings) gets the client for the provider
+        that has that role in its roles list.
+        """
+        from frigate.genai import PROVIDERS, load_providers
+
+        self._tool_client = None
+        self._vision_client = None
+        self._embeddings_client = None
+
+        if not self._config.genai:
+            return
+
+        load_providers()
+
+        for _name, genai_cfg in self._config.genai.items():
+            if not genai_cfg.provider:
+                continue
+            provider_cls = PROVIDERS.get(genai_cfg.provider)
+            if not provider_cls:
+                logger.warning(
+                    "Unknown GenAI provider %s in config, skipping.",
+                    genai_cfg.provider,
+                )
+                continue
+            try:
+                client = provider_cls(genai_cfg)
+            except Exception as e:
+                logger.exception(
+                    "Failed to create GenAI client for provider %s: %s",
+                    genai_cfg.provider,
+                    e,
+                )
+                continue
+
+            for role in genai_cfg.roles:
+                if role == GenAIRoleEnum.tools:
+                    self._tool_client = client
+                elif role == GenAIRoleEnum.vision:
+                    self._vision_client = client
+                elif role == GenAIRoleEnum.embeddings:
+                    self._embeddings_client = client
+
+    @property
+    def tool_client(self) -> "Optional[GenAIClient]":
+        """Client configured for the tools role (e.g. chat with function calling)."""
+        return self._tool_client
+
+    @property
+    def vision_client(self) -> "Optional[GenAIClient]":
+        """Client configured for the vision role (e.g. review descriptions, object descriptions)."""
+        return self._vision_client
+
+    @property
+    def embeddings_client(self) -> "Optional[GenAIClient]":
+        """Client configured for the embeddings role."""
+        return self._embeddings_client
--- a/frigate/genai/ollama.py
+++ b/frigate/genai/ollama.py
@@ -1,15 +1,16 @@
 """Ollama Provider for Frigate AI."""

-import json
 import logging
 from typing import Any, Optional

 from httpx import RemoteProtocolError, TimeoutException
+from ollama import AsyncClient as OllamaAsyncClient
 from ollama import Client as ApiClient
 from ollama import ResponseError

 from frigate.config import GenAIProviderEnum
 from frigate.genai import GenAIClient, register_genai_provider
+from frigate.genai.utils import parse_tool_calls_from_message

 logger = logging.getLogger(__name__)

@@ -88,6 +89,73 @@ class OllamaClient(GenAIClient):
            "num_ctx", 4096
        )

+    def _build_request_params(
+        self,
+        messages: list[dict[str, Any]],
+        tools: Optional[list[dict[str, Any]]],
+        tool_choice: Optional[str],
+        stream: bool = False,
+    ) -> dict[str, Any]:
+        """Build request_messages and params for chat (sync or stream)."""
+        request_messages = []
+        for msg in messages:
+            msg_dict = {
+                "role": msg.get("role"),
+                "content": msg.get("content", ""),
+            }
+            if msg.get("tool_call_id"):
+                msg_dict["tool_call_id"] = msg["tool_call_id"]
+            if msg.get("name"):
+                msg_dict["name"] = msg["name"]
+            if msg.get("tool_calls"):
+                msg_dict["tool_calls"] = msg["tool_calls"]
+            request_messages.append(msg_dict)
+
+        request_params: dict[str, Any] = {
+            "model": self.genai_config.model,
+            "messages": request_messages,
+            **self.provider_options,
+        }
+        if stream:
+            request_params["stream"] = True
+        if tools:
+            request_params["tools"] = tools
+            if tool_choice:
+                request_params["tool_choice"] = (
+                    "none"
+                    if tool_choice == "none"
+                    else "required"
+                    if tool_choice == "required"
+                    else "auto"
+                )
+        return request_params
+
+    def _message_from_response(self, response: dict[str, Any]) -> dict[str, Any]:
+        """Parse Ollama chat response into {content, tool_calls, finish_reason}."""
+        if not response or "message" not in response:
+            return {
+                "content": None,
+                "tool_calls": None,
+                "finish_reason": "error",
+            }
+        message = response["message"]
+        content = message.get("content", "").strip() if message.get("content") else None
+        tool_calls = parse_tool_calls_from_message(message)
+        finish_reason = "error"
+        if response.get("done"):
+            finish_reason = (
+                "tool_calls" if tool_calls else "stop" if content else "error"
+            )
+        elif tool_calls:
+            finish_reason = "tool_calls"
+        elif content:
+            finish_reason = "stop"
+        return {
+            "content": content,
+            "tool_calls": tool_calls,
+            "finish_reason": finish_reason,
+        }
+
    def chat_with_tools(
        self,
        messages: list[dict[str, Any]],
@@ -103,93 +171,12 @@ class OllamaClient(GenAIClient):
                "tool_calls": None,
                "finish_reason": "error",
            }
-
        try:
-            request_messages = []
-            for msg in messages:
-                msg_dict = {
-                    "role": msg.get("role"),
-                    "content": msg.get("content", ""),
-                }
-                if msg.get("tool_call_id"):
-                    msg_dict["tool_call_id"] = msg["tool_call_id"]
-                if msg.get("name"):
-                    msg_dict["name"] = msg["name"]
-                if msg.get("tool_calls"):
-                    msg_dict["tool_calls"] = msg["tool_calls"]
-                request_messages.append(msg_dict)
-
-            request_params = {
-                "model": self.genai_config.model,
-                "messages": request_messages,
-            }
-
-            if tools:
-                request_params["tools"] = tools
-                if tool_choice:
-                    if tool_choice == "none":
-                        request_params["tool_choice"] = "none"
-                    elif tool_choice == "required":
-                        request_params["tool_choice"] = "required"
-                    elif tool_choice == "auto":
-                        request_params["tool_choice"] = "auto"
-
-            request_params.update(self.provider_options)
-
-            response = self.provider.chat(**request_params)
-
-            if not response or "message" not in response:
-                return {
-                    "content": None,
-                    "tool_calls": None,
-                    "finish_reason": "error",
-                }
-
-            message = response["message"]
-            content = (
-                message.get("content", "").strip() if message.get("content") else None
+            request_params = self._build_request_params(
+                messages, tools, tool_choice, stream=False
            )
-
-            tool_calls = None
-            if "tool_calls" in message and message["tool_calls"]:
-                tool_calls = []
-                for tool_call in message["tool_calls"]:
-                    try:
-                        function_data = tool_call.get("function", {})
-                        arguments_str = function_data.get("arguments", "{}")
-                        arguments = json.loads(arguments_str)
-                    except (json.JSONDecodeError, KeyError, TypeError) as e:
-                        logger.warning(
-                            f"Failed to parse tool call arguments: {e}, "
-                            f"tool: {function_data.get('name', 'unknown')}"
-                        )
-                        arguments = {}
-
-                    tool_calls.append(
-                        {
-                            "id": tool_call.get("id", ""),
-                            "name": function_data.get("name", ""),
-                            "arguments": arguments,
-                        }
-                    )
-
-            finish_reason = "error"
-            if "done" in response and response["done"]:
-                if tool_calls:
-                    finish_reason = "tool_calls"
-                elif content:
-                    finish_reason = "stop"
-            elif tool_calls:
-                finish_reason = "tool_calls"
-            elif content:
-                finish_reason = "stop"
-
-            return {
-                "content": content,
-                "tool_calls": tool_calls,
-                "finish_reason": finish_reason,
-            }
-
+            response = self.provider.chat(**request_params)
+            return self._message_from_response(response)
        except (TimeoutException, ResponseError, ConnectionError) as e:
            logger.warning("Ollama returned an error: %s", str(e))
            return {
@@ -204,3 +191,89 @@ class OllamaClient(GenAIClient):
                "tool_calls": None,
                "finish_reason": "error",
            }
+
+    async def chat_with_tools_stream(
+        self,
+        messages: list[dict[str, Any]],
+        tools: Optional[list[dict[str, Any]]] = None,
+        tool_choice: Optional[str] = "auto",
+    ):
+        """Stream chat with tools; yields content deltas then final message."""
+        if self.provider is None:
+            logger.warning(
+                "Ollama provider has not been initialized. Check your Ollama configuration."
+            )
+            yield (
+                "message",
+                {
+                    "content": None,
+                    "tool_calls": None,
+                    "finish_reason": "error",
+                },
+            )
+            return
+        try:
+            request_params = self._build_request_params(
+                messages, tools, tool_choice, stream=True
+            )
+            async_client = OllamaAsyncClient(
+                host=self.genai_config.base_url,
+                timeout=self.timeout,
+            )
+            content_parts: list[str] = []
+            final_message: dict[str, Any] | None = None
+            try:
+                stream = await async_client.chat(**request_params)
+                async for chunk in stream:
+                    if not chunk or "message" not in chunk:
+                        continue
+                    msg = chunk.get("message", {})
+                    delta = msg.get("content") or ""
+                    if delta:
+                        content_parts.append(delta)
+                        yield ("content_delta", delta)
+                    if chunk.get("done"):
+                        full_content = "".join(content_parts).strip() or None
+                        tool_calls = parse_tool_calls_from_message(msg)
+                        final_message = {
+                            "content": full_content,
+                            "tool_calls": tool_calls,
+                            "finish_reason": "tool_calls" if tool_calls else "stop",
+                        }
+                        break
+            finally:
+                await async_client.close()
+
+            if final_message is not None:
+                yield ("message", final_message)
+            else:
+                yield (
+                    "message",
+                    {
+                        "content": "".join(content_parts).strip() or None,
+                        "tool_calls": None,
+                        "finish_reason": "stop",
+                    },
+                )
+        except (TimeoutException, ResponseError, ConnectionError) as e:
+            logger.warning("Ollama streaming error: %s", str(e))
+            yield (
+                "message",
+                {
+                    "content": None,
+                    "tool_calls": None,
+                    "finish_reason": "error",
+                },
+            )
+        except Exception as e:
+            logger.warning(
+                "Unexpected error in Ollama chat_with_tools_stream: %s", str(e)
+            )
+            yield (
+                "message",
+                {
+                    "content": None,
+                    "tool_calls": None,
+                    "finish_reason": "error",
+                },
+            )
--- a/frigate/genai/utils.py
+++ b/frigate/genai/utils.py
@@ -0,0 +1,70 @@
+"""Shared helpers for GenAI providers and chat (OpenAI-style messages, tool call parsing)."""
+
+import json
+import logging
+from typing import Any, List, Optional
+
+logger = logging.getLogger(__name__)
+
+
+def parse_tool_calls_from_message(
+    message: dict[str, Any],
+) -> Optional[list[dict[str, Any]]]:
+    """
+    Parse tool_calls from an OpenAI-style message dict.
+
+    Message may have "tool_calls" as a list of:
+      {"id": str, "function": {"name": str, "arguments": str}, ...}
+
+    Returns a list of {"id", "name", "arguments"} with arguments parsed as dict,
+    or None if no tool_calls. Used by Ollama and LlamaCpp (non-stream) responses.
+    """
+    raw = message.get("tool_calls")
+    if not raw or not isinstance(raw, list):
+        return None
+    result = []
+    for tool_call in raw:
+        function_data = tool_call.get("function") or {}
+        try:
+            arguments_str = function_data.get("arguments") or "{}"
+            arguments = json.loads(arguments_str)
+        except (json.JSONDecodeError, KeyError, TypeError) as e:
+            logger.warning(
+                "Failed to parse tool call arguments: %s, tool: %s",
+                e,
+                function_data.get("name", "unknown"),
+            )
+            arguments = {}
+        result.append(
+            {
+                "id": tool_call.get("id", ""),
+                "name": function_data.get("name", ""),
+                "arguments": arguments,
+            }
+        )
+    return result if result else None
+
+
+def build_assistant_message_for_conversation(
+    content: Any,
+    tool_calls_raw: Optional[List[dict[str, Any]]],
+) -> dict[str, Any]:
+    """
+    Build the assistant message dict in OpenAI format for appending to a conversation.
+
+    tool_calls_raw: list of {"id", "name", "arguments"} (arguments as dict), or None.
+    """
+    msg: dict[str, Any] = {"role": "assistant", "content": content}
+    if tool_calls_raw:
+        msg["tool_calls"] = [
+            {
+                "id": tc["id"],
+                "type": "function",
+                "function": {
+                    "name": tc["name"],
+                    "arguments": json.dumps(tc.get("arguments") or {}),
+                },
+            }
+            for tc in tool_calls_raw
+        ]
+    return msg
--- a/frigate/motion/frigate_motion.py
+++ b/frigate/motion/frigate_motion.py
@@ -28,7 +28,7 @@ class FrigateMotionDetector(MotionDetector):
        self.motion_frame_count = 0
        self.frame_counter = 0
        resized_mask = cv2.resize(
-            config.mask,
+            config.rasterized_mask,
            dsize=(self.motion_frame_size[1], self.motion_frame_size[0]),
            interpolation=cv2.INTER_LINEAR,
        )
--- a/frigate/motion/improved_motion.py
+++ b/frigate/motion/improved_motion.py
@@ -233,7 +233,7 @@ class ImprovedMotionDetector(MotionDetector):

    def update_mask(self) -> None:
        resized_mask = cv2.resize(
-            self.config.mask,
+            self.config.rasterized_mask,
            dsize=(self.motion_frame_size[1], self.motion_frame_size[0]),
            interpolation=cv2.INTER_AREA,
        )
--- a/frigate/ptz/autotrack.py
+++ b/frigate/ptz/autotrack.py
@@ -116,7 +116,9 @@ class PtzMotionEstimator:
                mask[y1:y2, x1:x2] = 0

            # merge camera config motion mask with detections. Norfair function needs 0,1 mask
-            mask = np.bitwise_and(mask, self.camera_config.motion.mask).clip(max=1)
+            mask = np.bitwise_and(mask, self.camera_config.motion.rasterized_mask).clip(
+                max=1
+            )

            # Norfair estimator function needs color so it can convert it right back to gray
            frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGRA)
--- a/frigate/test/test_config.py
+++ b/frigate/test/test_config.py
@@ -343,8 +343,24 @@ class TestConfig(unittest.TestCase):
                        "fps": 5,
                    },
                    "objects": {
-                        "mask": "0,0,1,1,0,1",
-                        "filters": {"dog": {"mask": "1,1,1,1,1,1"}},
+                        "mask": {
+                            "global_mask_1": {
+                                "friendly_name": "Global Mask 1",
+                                "enabled": True,
+                                "coordinates": "0,0,1,1,0,1",
+                            }
+                        },
+                        "filters": {
+                            "dog": {
+                                "mask": {
+                                    "dog_mask_1": {
+                                        "friendly_name": "Dog Mask 1",
+                                        "enabled": True,
+                                        "coordinates": "1,1,1,1,1,1",
+                                    }
+                                }
+                            }
+                        },
                    },
                }
            },
@@ -353,8 +369,10 @@ class TestConfig(unittest.TestCase):
        frigate_config = FrigateConfig(**config)
        back_camera = frigate_config.cameras["back"]
        assert "dog" in back_camera.objects.filters
-        assert len(back_camera.objects.filters["dog"].raw_mask) == 2
-        assert len(back_camera.objects.filters["person"].raw_mask) == 1
+        # dog filter has its own mask + global mask merged
+        assert len(back_camera.objects.filters["dog"].mask) == 2
+        # person filter only has the global mask
+        assert len(back_camera.objects.filters["person"].mask) == 1

    def test_motion_mask_relative_matches_explicit(self):
        config = {
@@ -373,9 +391,13 @@ class TestConfig(unittest.TestCase):
                        "fps": 5,
                    },
                    "motion": {
-                        "mask": [
-                            "0,0,200,100,600,300,800,400",
-                        ]
+                        "mask": {
+                            "explicit_mask": {
+                                "friendly_name": "Explicit Mask",
+                                "enabled": True,
+                                "coordinates": "0,0,200,100,600,300,800,400",
+                            }
+                        }
                    },
                },
                "relative": {
@@ -390,9 +412,13 @@ class TestConfig(unittest.TestCase):
                        "fps": 5,
                    },
                    "motion": {
-                        "mask": [
-                            "0.0,0.0,0.25,0.25,0.75,0.75,1.0,1.0",
-                        ]
+                        "mask": {
+                            "relative_mask": {
+                                "friendly_name": "Relative Mask",
+                                "enabled": True,
+                                "coordinates": "0.0,0.0,0.25,0.25,0.75,0.75,1.0,1.0",
+                            }
+                        }
                    },
                },
            },
@@ -400,8 +426,8 @@ class TestConfig(unittest.TestCase):

        frigate_config = FrigateConfig(**config)
        assert np.array_equal(
-            frigate_config.cameras["explicit"].motion.mask,
-            frigate_config.cameras["relative"].motion.mask,
+            frigate_config.cameras["explicit"].motion.rasterized_mask,
+            frigate_config.cameras["relative"].motion.rasterized_mask,
        )

    def test_default_input_args(self):
--- a/frigate/track/tracked_object.py
+++ b/frigate/track/tracked_object.py
@@ -188,6 +188,10 @@ class TrackedObject:

        # check each zone
        for name, zone in self.camera_config.zones.items():
+            # skip disabled zones
+            if not zone.enabled:
+                continue
+
            # if the zone is not for this object type, skip
            if len(zone.objects) > 0 and obj_data["label"] not in zone.objects:
                continue
--- a/frigate/util/builtin.py
+++ b/frigate/util/builtin.py
@@ -195,7 +195,8 @@ def flatten_config_data(
 ) -> Dict[str, Any]:
    items = []
    for key, value in config_data.items():
-        new_key = f"{parent_key}.{key}" if parent_key else key
+        escaped_key = escape_config_key_segment(str(key))
+        new_key = f"{parent_key}.{escaped_key}" if parent_key else escaped_key
        if isinstance(value, dict):
            items.extend(flatten_config_data(value, new_key).items())
        else:
@@ -203,6 +204,41 @@ def flatten_config_data(
    return dict(items)


+def escape_config_key_segment(segment: str) -> str:
+    """Escape dots and backslashes so they can be treated as literal key chars."""
+    return segment.replace("\\", "\\\\").replace(".", "\\.")
+
+
+def split_config_key_path(key_path_str: str) -> list[str]:
+    """Split a dotted config path, honoring \\. as a literal dot in a key."""
+    parts: list[str] = []
+    current: list[str] = []
+    escaped = False
+
+    for char in key_path_str:
+        if escaped:
+            current.append(char)
+            escaped = False
+            continue
+
+        if char == "\\":
+            escaped = True
+            continue
+
+        if char == ".":
+            parts.append("".join(current))
+            current = []
+            continue
+
+        current.append(char)
+
+    if escaped:
+        current.append("\\")
+
+    parts.append("".join(current))
+    return parts
+
+
 def update_yaml_file_bulk(file_path: str, updates: Dict[str, Any]):
    yaml = YAML()
    yaml.indent(mapping=2, sequence=4, offset=2)
@@ -218,7 +254,7 @@ def update_yaml_file_bulk(file_path: str, updates: Dict[str, Any]):

    # Apply all updates
    for key_path_str, new_value in updates.items():
-        key_path = key_path_str.split(".")
+        key_path = split_config_key_path(key_path_str)
        for i in range(len(key_path)):
            try:
                index = int(key_path[i])
--- a/frigate/util/config.py
+++ b/frigate/util/config.py
@@ -434,10 +434,66 @@ def migrate_017_0(config: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]
    return new_config


+def _convert_legacy_mask_to_dict(
+    mask: Optional[Union[str, list]], mask_type: str = "motion_mask", label: str = ""
+) -> dict[str, dict[str, Any]]:
+    """Convert legacy mask format (str or list[str]) to new dict format.
+
+    Args:
+        mask: Legacy mask format (string or list of strings)
+        mask_type: Type of mask for naming ("motion_mask" or "object_mask")
+        label: Optional label for object masks (e.g., "person")
+
+    Returns:
+        Dictionary with mask_id as key and mask config as value
+    """
+    if not mask:
+        return {}
+
+    result = {}
+
+    if isinstance(mask, str):
+        if mask:
+            mask_id = f"{mask_type}_1"
+            friendly_name = (
+                f"Object Mask 1 ({label})"
+                if label
+                else f"{mask_type.replace('_', ' ').title()} 1"
+            )
+            result[mask_id] = {
+                "friendly_name": friendly_name,
+                "enabled": True,
+                "coordinates": mask,
+            }
+    elif isinstance(mask, list):
+        for i, coords in enumerate(mask):
+            if coords:
+                mask_id = f"{mask_type}_{i + 1}"
+                friendly_name = (
+                    f"Object Mask {i + 1} ({label})"
+                    if label
+                    else f"{mask_type.replace('_', ' ').title()} {i + 1}"
+                )
+                result[mask_id] = {
+                    "friendly_name": friendly_name,
+                    "enabled": True,
+                    "coordinates": coords,
+                }
+
+    return result
+
+
 def migrate_018_0(config: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]]:
    """Handle migrating frigate config to 0.18-0"""
    new_config = config.copy()

+    # Migrate GenAI to new format
+    genai = new_config.get("genai")
+
+    if genai and genai.get("provider"):
+        genai["roles"] = ["embeddings", "vision", "tools"]
+        new_config["genai"] = {"default": genai}
+
    # Remove deprecated sync_recordings from global record config
    if new_config.get("record", {}).get("sync_recordings") is not None:
        del new_config["record"]["sync_recordings"]
@@ -452,7 +508,35 @@ def migrate_018_0(config: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]
        if not new_config.get("record"):
            del new_config["record"]

-    # Remove deprecated sync_recordings and timelapse_args from camera-specific record configs
+    # Migrate global motion masks
+    global_motion = new_config.get("motion", {})
+    if global_motion and "mask" in global_motion:
+        mask = global_motion.get("mask")
+        if mask is not None and not isinstance(mask, dict):
+            new_config["motion"]["mask"] = _convert_legacy_mask_to_dict(
+                mask, "motion_mask"
+            )
+
+    # Migrate global object masks
+    global_objects = new_config.get("objects", {})
+    if global_objects and "mask" in global_objects:
+        mask = global_objects.get("mask")
+        if mask is not None and not isinstance(mask, dict):
+            new_config["objects"]["mask"] = _convert_legacy_mask_to_dict(
+                mask, "object_mask"
+            )
+
+    # Migrate global object filters masks
+    if global_objects and "filters" in global_objects:
+        for obj_name, filter_config in global_objects.get("filters", {}).items():
+            if isinstance(filter_config, dict) and "mask" in filter_config:
+                mask = filter_config.get("mask")
+                if mask is not None and not isinstance(mask, dict):
+                    new_config["objects"]["filters"][obj_name]["mask"] = (
+                        _convert_legacy_mask_to_dict(mask, "object_mask", obj_name)
+                    )
+
+    # Remove deprecated sync_recordings and migrate masks for camera-specific configs
    for name, camera in config.get("cameras", {}).items():
        camera_config: dict[str, dict[str, Any]] = camera.copy()

@@ -471,6 +555,34 @@ def migrate_018_0(config: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]
            if not camera_config.get("record"):
                del camera_config["record"]

+        # Migrate camera motion masks
+        camera_motion = camera_config.get("motion", {})
+        if camera_motion and "mask" in camera_motion:
+            mask = camera_motion.get("mask")
+            if mask is not None and not isinstance(mask, dict):
+                camera_config["motion"]["mask"] = _convert_legacy_mask_to_dict(
+                    mask, "motion_mask"
+                )
+
+        # Migrate camera global object masks
+        camera_objects = camera_config.get("objects", {})
+        if camera_objects and "mask" in camera_objects:
+            mask = camera_objects.get("mask")
+            if mask is not None and not isinstance(mask, dict):
+                camera_config["objects"]["mask"] = _convert_legacy_mask_to_dict(
+                    mask, "object_mask"
+                )
+
+        # Migrate camera object filter masks
+        if camera_objects and "filters" in camera_objects:
+            for obj_name, filter_config in camera_objects.get("filters", {}).items():
+                if isinstance(filter_config, dict) and "mask" in filter_config:
+                    mask = filter_config.get("mask")
+                    if mask is not None and not isinstance(mask, dict):
+                        camera_config["objects"]["filters"][obj_name]["mask"] = (
+                            _convert_legacy_mask_to_dict(mask, "object_mask", obj_name)
+                        )
+
        new_config["cameras"][name] = camera_config

    new_config["version"] = "0.18-0"
--- a/frigate/util/object.py
+++ b/frigate/util/object.py
@@ -248,20 +248,20 @@ def is_object_filtered(obj, objects_to_track, object_filters):
        if obj_settings.max_ratio < object_ratio:
            return True

-        if obj_settings.mask is not None:
+        if obj_settings.rasterized_mask is not None:
            # compute the coordinates of the object and make sure
            # the location isn't outside the bounds of the image (can happen from rounding)
            object_xmin = object_box[0]
            object_xmax = object_box[2]
            object_ymax = object_box[3]
-            y_location = min(int(object_ymax), len(obj_settings.mask) - 1)
+            y_location = min(int(object_ymax), len(obj_settings.rasterized_mask) - 1)
            x_location = min(
                int((object_xmax + object_xmin) / 2.0),
-                len(obj_settings.mask[0]) - 1,
+                len(obj_settings.rasterized_mask[0]) - 1,
            )

            # if the object is in a masked location, don't add it to detected objects
-            if obj_settings.mask[y_location][x_location] == 0:
+            if obj_settings.rasterized_mask[y_location][x_location] == 0:
                return True

    return False
--- a/frigate/util/schema.py
+++ b/frigate/util/schema.py
@@ -0,0 +1,46 @@
+"""JSON schema utilities for Frigate."""
+
+from typing import Any, Dict, Type
+
+from pydantic import BaseModel, TypeAdapter
+
+
+def get_config_schema(config_class: Type[BaseModel]) -> Dict[str, Any]:
+    """
+    Returns the JSON schema for FrigateConfig with polymorphic detectors.
+
+    This utility patches the FrigateConfig schema to include the full polymorphic
+    definitions for detectors. By default, Pydantic's schema for Dict[str, BaseDetectorConfig]
+    only includes the base class fields. This function replaces it with a reference
+    to the DetectorConfig union, which includes all available detector subclasses.
+    """
+    # Import here to ensure all detector plugins are loaded through the detectors module
+    from frigate.detectors import DetectorConfig
+
+    # Get the base schema for FrigateConfig
+    schema = config_class.model_json_schema()
+
+    # Get the schema for the polymorphic DetectorConfig union
+    detector_adapter: TypeAdapter = TypeAdapter(DetectorConfig)
+    detector_schema = detector_adapter.json_schema()
+
+    # Ensure $defs exists in FrigateConfig schema
+    if "$defs" not in schema:
+        schema["$defs"] = {}
+
+    # Merge $defs from DetectorConfig into FrigateConfig schema
+    # This includes the specific schemas for each detector plugin (OvDetectorConfig, etc.)
+    if "$defs" in detector_schema:
+        schema["$defs"].update(detector_schema["$defs"])
+
+    # Extract the union schema (oneOf/discriminator) and add it as a definition
+    detector_union_schema = {k: v for k, v in detector_schema.items() if k != "$defs"}
+    schema["$defs"]["DetectorConfig"] = detector_union_schema
+
+    # Update the 'detectors' property to use the polymorphic DetectorConfig definition
+    if "detectors" in schema.get("properties", {}):
+        schema["properties"]["detectors"]["additionalProperties"] = {
+            "$ref": "#/$defs/DetectorConfig"
+        }
+
+    return schema
--- a/frigate/util/services.py
+++ b/frigate/util/services.py
@@ -121,7 +121,7 @@ def get_cpu_stats() -> dict[str, dict]:
        pid = str(process.info["pid"])
        try:
            cpu_percent = process.info["cpu_percent"]
-            cmdline = process.info["cmdline"]
+            cmdline = " ".join(process.info["cmdline"]).rstrip()

            with open(f"/proc/{pid}/stat", "r") as f:
                stats = f.readline().split()
@@ -155,7 +155,7 @@ def get_cpu_stats() -> dict[str, dict]:
                "cpu": str(cpu_percent),
                "cpu_average": str(round(cpu_average_usage, 2)),
                "mem": f"{mem_pct}",
-                "cmdline": clean_camera_user_pass(" ".join(cmdline)),
+                "cmdline": clean_camera_user_pass(cmdline),
            }
        except Exception:
            continue
--- a/generate_config_translations.py
+++ b/generate_config_translations.py
@@ -8,20 +8,18 @@ and generates JSON translation files with titles and descriptions for the web UI

 import json
 import logging
-import shutil
+import sys
 from pathlib import Path
-from typing import Any, Dict, Optional, get_args, get_origin
-
-from pydantic import BaseModel
-from pydantic.fields import FieldInfo
+from typing import Any, Dict, get_args, get_origin

 from frigate.config.config import FrigateConfig
+from frigate.util.schema import get_config_schema

 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)


-def get_field_translations(field_info: FieldInfo) -> Dict[str, str]:
+def get_field_translations(field_info) -> Dict[str, str]:
    """Extract title and description from a Pydantic field."""
    translations = {}

@@ -34,50 +32,147 @@ def get_field_translations(field_info: FieldInfo) -> Dict[str, str]:
    return translations


-def process_model_fields(model: type[BaseModel]) -> Dict[str, Any]:
+def extract_translations_from_schema(
+    schema: Dict[str, Any], defs: Dict[str, Any] = None
+) -> Dict[str, Any]:
    """
-    Recursively process a Pydantic model to extract translations.
+    Recursively extract translations (titles and descriptions) from a JSON schema.

-    Returns a nested dictionary structure matching the config schema,
-    with title and description for each field.
+    Returns a dictionary structure with label and description for each field,
+    and nested fields directly under their parent keys.
    """
+    if defs is None:
+        defs = schema.get("$defs", {})
+
    translations = {}

-    model_fields = model.model_fields
+    # Add top-level title and description if present
+    if "title" in schema:
+        translations["label"] = schema["title"]
+    if "description" in schema:
+        translations["description"] = schema["description"]

-    for field_name, field_info in model_fields.items():
-        field_translations = get_field_translations(field_info)
+    # Process nested properties
+    properties = schema.get("properties", {})
+    for field_name, field_schema in properties.items():
+        field_translations = {}

-        # Get the field's type annotation
-        field_type = field_info.annotation
+        # Handle $ref references
+        if "$ref" in field_schema:
+            ref_path = field_schema["$ref"]
+            if ref_path.startswith("#/$defs/"):
+                ref_name = ref_path.split("/")[-1]
+                if ref_name in defs:
+                    ref_schema = defs[ref_name]
+                    # Extract from the referenced schema
+                    ref_translations = extract_translations_from_schema(
+                        ref_schema, defs=defs
+                    )
+                    # Use the $ref field's own title/description if present
+                    if "title" in field_schema:
+                        field_translations["label"] = field_schema["title"]
+                    elif "label" in ref_translations:
+                        field_translations["label"] = ref_translations["label"]
+                    if "description" in field_schema:
+                        field_translations["description"] = field_schema["description"]
+                    elif "description" in ref_translations:
+                        field_translations["description"] = ref_translations[
+                            "description"
+                        ]
+                    # Add nested properties from referenced schema
+                    nested_without_root = {
+                        k: v
+                        for k, v in ref_translations.items()
+                        if k not in ("label", "description")
+                    }
+                    field_translations.update(nested_without_root)
+        # Handle additionalProperties with $ref (for dict types)
+        elif "additionalProperties" in field_schema:
+            additional_props = field_schema["additionalProperties"]
+            # Extract title and description from the field itself
+            if "title" in field_schema:
+                field_translations["label"] = field_schema["title"]
+            if "description" in field_schema:
+                field_translations["description"] = field_schema["description"]

-        # Handle Optional types
-        origin = get_origin(field_type)
+            # If additionalProperties contains a $ref, extract nested translations
+            if "$ref" in additional_props:
+                ref_path = additional_props["$ref"]
+                if ref_path.startswith("#/$defs/"):
+                    ref_name = ref_path.split("/")[-1]
+                    if ref_name in defs:
+                        ref_schema = defs[ref_name]
+                        nested = extract_translations_from_schema(ref_schema, defs=defs)
+                        nested_without_root = {
+                            k: v
+                            for k, v in nested.items()
+                            if k not in ("label", "description")
+                        }
+                        field_translations.update(nested_without_root)
+        # Handle items with $ref (for array types)
+        elif "items" in field_schema:
+            items = field_schema["items"]
+            # Extract title and description from the field itself
+            if "title" in field_schema:
+                field_translations["label"] = field_schema["title"]
+            if "description" in field_schema:
+                field_translations["description"] = field_schema["description"]

-        if origin is Optional or (
-            hasattr(origin, "__name__") and origin.__name__ == "UnionType"
-        ):
-            args = get_args(field_type)
-            field_type = next(
-                (arg for arg in args if arg is not type(None)), field_type
-            )
+            # If items contains a $ref, extract nested translations
+            if "$ref" in items:
+                ref_path = items["$ref"]
+                if ref_path.startswith("#/$defs/"):
+                    ref_name = ref_path.split("/")[-1]
+                    if ref_name in defs:
+                        ref_schema = defs[ref_name]
+                        nested = extract_translations_from_schema(ref_schema, defs=defs)
+                        nested_without_root = {
+                            k: v
+                            for k, v in nested.items()
+                            if k not in ("label", "description")
+                        }
+                        field_translations.update(nested_without_root)
+        else:
+            # Extract title and description
+            if "title" in field_schema:
+                field_translations["label"] = field_schema["title"]
+            if "description" in field_schema:
+                field_translations["description"] = field_schema["description"]

-        # Handle Dict types (like Dict[str, CameraConfig])
-        if get_origin(field_type) is dict:
-            dict_args = get_args(field_type)
-
-            if len(dict_args) >= 2:
-                value_type = dict_args[1]
-
-                if isinstance(value_type, type) and issubclass(value_type, BaseModel):
-                    nested_translations = process_model_fields(value_type)
-
-                    if nested_translations:
-                        field_translations["properties"] = nested_translations
-        elif isinstance(field_type, type) and issubclass(field_type, BaseModel):
-            nested_translations = process_model_fields(field_type)
-            if nested_translations:
-                field_translations["properties"] = nested_translations
+            # Recursively process nested properties
+            if "properties" in field_schema:
+                nested = extract_translations_from_schema(field_schema, defs=defs)
+                # Merge nested translations
+                nested_without_root = {
+                    k: v for k, v in nested.items() if k not in ("label", "description")
+                }
+                field_translations.update(nested_without_root)
+            # Handle anyOf cases
+            elif "anyOf" in field_schema:
+                for item in field_schema["anyOf"]:
+                    if "properties" in item:
+                        nested = extract_translations_from_schema(item, defs=defs)
+                        nested_without_root = {
+                            k: v
+                            for k, v in nested.items()
+                            if k not in ("label", "description")
+                        }
+                        field_translations.update(nested_without_root)
+                    elif "$ref" in item:
+                        ref_path = item["$ref"]
+                        if ref_path.startswith("#/$defs/"):
+                            ref_name = ref_path.split("/")[-1]
+                            if ref_name in defs:
+                                ref_schema = defs[ref_name]
+                                nested = extract_translations_from_schema(
+                                    ref_schema, defs=defs
+                                )
+                                nested_without_root = {
+                                    k: v
+                                    for k, v in nested.items()
+                                    if k not in ("label", "description")
+                                }
+                                field_translations.update(nested_without_root)

        if field_translations:
            translations[field_name] = field_translations
@@ -85,76 +180,350 @@ def process_model_fields(model: type[BaseModel]) -> Dict[str, Any]:
    return translations


-def generate_section_translation(
-    section_name: str, field_info: FieldInfo
-) -> Dict[str, Any]:
+def generate_section_translation(config_class: type) -> Dict[str, Any]:
    """
-    Generate translation structure for a top-level config section.
+    Generate translation structure for a config section using its JSON schema.
    """
-    section_translations = get_field_translations(field_info)
-    field_type = field_info.annotation
-    origin = get_origin(field_type)
+    schema = config_class.model_json_schema()
+    return extract_translations_from_schema(schema)

-    if origin is Optional or (
-        hasattr(origin, "__name__") and origin.__name__ == "UnionType"
-    ):
-        args = get_args(field_type)
-        field_type = next((arg for arg in args if arg is not type(None)), field_type)

-    # Handle Dict types (like detectors, cameras, camera_groups)
-    if get_origin(field_type) is dict:
-        dict_args = get_args(field_type)
-        if len(dict_args) >= 2:
-            value_type = dict_args[1]
-            if isinstance(value_type, type) and issubclass(value_type, BaseModel):
-                nested = process_model_fields(value_type)
-                if nested:
-                    section_translations["properties"] = nested
+def get_detector_translations(
+    config_schema: Dict[str, Any],
+) -> tuple[Dict[str, Any], set[str]]:
+    """Build detector type translations with nested fields based on schema definitions."""
+    defs = config_schema.get("$defs", {})
+    detector_schema = defs.get("DetectorConfig", {})
+    discriminator = detector_schema.get("discriminator", {})
+    mapping = discriminator.get("mapping", {})

-    # If the field itself is a BaseModel, process it
-    elif isinstance(field_type, type) and issubclass(field_type, BaseModel):
-        nested = process_model_fields(field_type)
-        if nested:
-            section_translations["properties"] = nested
+    type_translations: Dict[str, Any] = {}
+    nested_field_keys: set[str] = set()
+    for detector_type, ref in mapping.items():
+        if not isinstance(ref, str):
+            continue

-    return section_translations
+        if not ref.startswith("#/$defs/"):
+            continue
+
+        ref_name = ref.split("/")[-1]
+        ref_schema = defs.get(ref_name, {})
+        if not ref_schema:
+            continue
+
+        type_entry: Dict[str, str] = {}
+        title = ref_schema.get("title")
+        description = ref_schema.get("description")
+        if title:
+            type_entry["label"] = title
+        if description:
+            type_entry["description"] = description
+
+        nested = extract_translations_from_schema(ref_schema, defs=defs)
+        nested_without_root = {
+            k: v for k, v in nested.items() if k not in ("label", "description")
+        }
+        if nested_without_root:
+            type_entry.update(nested_without_root)
+            nested_field_keys.update(nested_without_root.keys())
+
+        if type_entry:
+            type_translations[detector_type] = type_entry
+
+    return type_translations, nested_field_keys


 def main():
    """Main function to generate config translations."""

    # Define output directory
-    output_dir = Path(__file__).parent / "web" / "public" / "locales" / "en" / "config"
+    if len(sys.argv) > 1:
+        output_dir = Path(sys.argv[1])
+    else:
+        output_dir = (
+            Path(__file__).parent / "web" / "public" / "locales" / "en" / "config"
+        )

    logger.info(f"Output directory: {output_dir}")

-    # Clean and recreate the output directory
-    if output_dir.exists():
-        logger.info(f"Removing existing directory: {output_dir}")
-        shutil.rmtree(output_dir)
-
-    logger.info(f"Creating directory: {output_dir}")
+    # Ensure the output directory exists; do not delete existing files.
    output_dir.mkdir(parents=True, exist_ok=True)
+    logger.info(
+        f"Using output directory (existing files will be overwritten): {output_dir}"
+    )

    config_fields = FrigateConfig.model_fields
+    config_schema = get_config_schema(FrigateConfig)
    logger.info(f"Found {len(config_fields)} top-level config sections")

+    global_translations = {}
+
    for field_name, field_info in config_fields.items():
        if field_name.startswith("_"):
            continue

        logger.info(f"Processing section: {field_name}")
-        section_data = generate_section_translation(field_name, field_info)
+
+        # Get the field's type
+        field_type = field_info.annotation
+        from typing import Optional, Union
+
+        origin = get_origin(field_type)
+        if (
+            origin is Optional
+            or origin is Union
+            or (
+                hasattr(origin, "__name__")
+                and origin.__name__ in ("UnionType", "Union")
+            )
+        ):
+            args = get_args(field_type)
+            field_type = next(
+                (arg for arg in args if arg is not type(None)), field_type
+            )
+
+        # Handle Dict[str, SomeModel] - extract the value type
+        if origin is dict:
+            args = get_args(field_type)
+            if args and len(args) > 1:
+                field_type = args[1]  # Get value type from Dict[key, value]
+
+        # Start with field's top-level metadata (label, description)
+        section_data = get_field_translations(field_info)
+
+        # Generate nested translations from the field type's schema
+        if hasattr(field_type, "model_json_schema"):
+            schema = field_type.model_json_schema()
+            # Extract nested properties from schema
+            nested = extract_translations_from_schema(schema)
+            # Remove top-level label/description from nested since we got those from field_info
+            nested_without_root = {
+                k: v for k, v in nested.items() if k not in ("label", "description")
+            }
+            section_data.update(nested_without_root)
+
+        if field_name == "detectors":
+            detector_types, detector_field_keys = get_detector_translations(
+                config_schema
+            )
+            section_data.update(detector_types)
+            for key in detector_field_keys:
+                if key == "type":
+                    continue
+                section_data.pop(key, None)

        if not section_data:
            logger.warning(f"No translations found for section: {field_name}")
            continue

-        output_file = output_dir / f"{field_name}.json"
-        with open(output_file, "w", encoding="utf-8") as f:
-            json.dump(section_data, f, indent=2, ensure_ascii=False)
+        # Add camera-level fields to global config documentation if applicable
+        CAMERA_LEVEL_FIELDS = {
+            "birdseye": (
+                "frigate.config.camera.birdseye",
+                "BirdseyeCameraConfig",
+                ["order"],
+            ),
+            "ffmpeg": (
+                "frigate.config.camera.ffmpeg",
+                "CameraFfmpegConfig",
+                ["inputs"],
+            ),
+            "lpr": (
+                "frigate.config.classification",
+                "CameraLicensePlateRecognitionConfig",
+                ["expire_time"],
+            ),
+            "semantic_search": (
+                "frigate.config.classification",
+                "CameraSemanticSearchConfig",
+                ["triggers"],
+            ),
+        }

-        logger.info(f"Generated: {output_file}")
+        if field_name in CAMERA_LEVEL_FIELDS:
+            module_path, class_name, field_names = CAMERA_LEVEL_FIELDS[field_name]
+            try:
+                import importlib
+
+                module = importlib.import_module(module_path)
+                camera_class = getattr(module, class_name)
+                schema = camera_class.model_json_schema()
+                camera_fields = schema.get("properties", {})
+                defs = schema.get("$defs", {})
+
+                for fname in field_names:
+                    if fname in camera_fields:
+                        field_schema = camera_fields[fname]
+                        field_trans = {}
+                        if "title" in field_schema:
+                            field_trans["label"] = field_schema["title"]
+                        if "description" in field_schema:
+                            field_trans["description"] = field_schema["description"]
+
+                        # Extract nested properties based on schema type
+                        nested_to_extract = None
+
+                        # Handle direct $ref
+                        if "$ref" in field_schema:
+                            ref_path = field_schema["$ref"]
+                            if ref_path.startswith("#/$defs/"):
+                                ref_name = ref_path.split("/")[-1]
+                                if ref_name in defs:
+                                    nested_to_extract = defs[ref_name]
+
+                        # Handle additionalProperties with $ref (for dict types)
+                        elif "additionalProperties" in field_schema:
+                            additional_props = field_schema["additionalProperties"]
+                            if "$ref" in additional_props:
+                                ref_path = additional_props["$ref"]
+                                if ref_path.startswith("#/$defs/"):
+                                    ref_name = ref_path.split("/")[-1]
+                                    if ref_name in defs:
+                                        nested_to_extract = defs[ref_name]
+
+                        # Handle items with $ref (for array types)
+                        elif "items" in field_schema:
+                            items = field_schema["items"]
+                            if "$ref" in items:
+                                ref_path = items["$ref"]
+                                if ref_path.startswith("#/$defs/"):
+                                    ref_name = ref_path.split("/")[-1]
+                                    if ref_name in defs:
+                                        nested_to_extract = defs[ref_name]
+
+                        # Extract nested properties if we found a schema to use
+                        if nested_to_extract:
+                            nested = extract_translations_from_schema(
+                                nested_to_extract, defs=defs
+                            )
+                            nested_without_root = {
+                                k: v
+                                for k, v in nested.items()
+                                if k not in ("label", "description")
+                            }
+                            field_trans.update(nested_without_root)
+
+                        if field_trans:
+                            section_data[fname] = field_trans
+            except Exception as e:
+                logger.warning(
+                    f"Could not add camera-level fields for {field_name}: {e}"
+                )
+
+        # Add to global translations instead of writing separate files
+        global_translations[field_name] = section_data
+
+        logger.info(f"Added section to global translations: {field_name}")
+
+    # Handle camera-level configs that aren't top-level FrigateConfig fields
+    # These are defined as fields in CameraConfig, so we extract title/description from there
+    camera_level_configs = {
+        "camera_mqtt": ("frigate.config.camera.mqtt", "CameraMqttConfig", "mqtt"),
+        "camera_ui": ("frigate.config.camera.ui", "CameraUiConfig", "ui"),
+        "onvif": ("frigate.config.camera.onvif", "OnvifConfig", "onvif"),
+    }
+
+    # Import CameraConfig to extract field metadata
+    from frigate.config.camera.camera import CameraConfig
+
+    camera_config_schema = CameraConfig.model_json_schema()
+    camera_properties = camera_config_schema.get("properties", {})
+
+    for config_name, (
+        module_path,
+        class_name,
+        camera_field_name,
+    ) in camera_level_configs.items():
+        try:
+            logger.info(f"Processing camera-level section: {config_name}")
+            import importlib
+
+            module = importlib.import_module(module_path)
+            config_class = getattr(module, class_name)
+
+            section_data = {}
+
+            # Extract top-level label and description from CameraConfig field definition
+            if camera_field_name in camera_properties:
+                field_schema = camera_properties[camera_field_name]
+                if "title" in field_schema:
+                    section_data["label"] = field_schema["title"]
+                if "description" in field_schema:
+                    section_data["description"] = field_schema["description"]
+
+            # Process model fields from schema
+            schema = config_class.model_json_schema()
+            nested = extract_translations_from_schema(schema)
+            # Remove top-level label/description since we got those from CameraConfig
+            nested_without_root = {
+                k: v for k, v in nested.items() if k not in ("label", "description")
+            }
+            section_data.update(nested_without_root)
+
+            # Add camera-level section into global translations (do not write separate file)
+            global_translations[config_name] = section_data
+            logger.info(
+                f"Added camera-level section to global translations: {config_name}"
+            )
+        except Exception as e:
+            logger.error(f"Failed to generate {config_name}: {e}")
+
+    # Remove top-level 'cameras' field if present so it remains a separate file
+    if "cameras" in global_translations:
+        logger.info(
+            "Removing top-level 'cameras' from global translations to keep it as a separate cameras.json"
+        )
+        del global_translations["cameras"]
+
+    # Write consolidated global.json with per-section keys
+    global_file = output_dir / "global.json"
+    with open(global_file, "w", encoding="utf-8") as f:
+        json.dump(global_translations, f, indent=2, ensure_ascii=False)
+        f.write("\n")
+
+    logger.info(f"Generated consolidated translations: {global_file}")
+
+    if not global_translations:
+        logger.warning("No global translations were generated!")
+    else:
+        logger.info(f"Global contains {len(global_translations)} sections")
+
+    # Generate cameras.json from CameraConfig schema
+    cameras_file = output_dir / "cameras.json"
+    logger.info(f"Generating cameras.json: {cameras_file}")
+    try:
+        if "camera_config_schema" in locals():
+            camera_schema = camera_config_schema
+        else:
+            from frigate.config.camera.camera import CameraConfig
+
+            camera_schema = CameraConfig.model_json_schema()
+
+        camera_translations = extract_translations_from_schema(camera_schema)
+
+        # Change descriptions to use 'for this camera' for fields that are global
+        def sanitize_camera_descriptions(obj):
+            if isinstance(obj, dict):
+                for k, v in list(obj.items()):
+                    if k == "description" and isinstance(v, str):
+                        obj[k] = v.replace(
+                            "for all cameras; can be overridden per-camera",
+                            "for this camera",
+                        )
+                    else:
+                        sanitize_camera_descriptions(v)
+            elif isinstance(obj, list):
+                for item in obj:
+                    sanitize_camera_descriptions(item)
+
+        sanitize_camera_descriptions(camera_translations)
+
+        with open(cameras_file, "w", encoding="utf-8") as f:
+            json.dump(camera_translations, f, indent=2, ensure_ascii=False)
+            f.write("\n")
+        logger.info(f"Generated cameras.json: {cameras_file}")
+    except Exception as e:
+        logger.error(f"Failed to generate cameras.json: {e}")

    logger.info("Translation generation complete!")

--- a/web/package-lock.json
+++ b/web/package-lock.json
--- a/web/package.json
+++ b/web/package.json
@@ -38,6 +38,10 @@
    "@radix-ui/react-toggle": "^1.1.2",
    "@radix-ui/react-toggle-group": "^1.1.2",
    "@radix-ui/react-tooltip": "^1.2.8",
+    "@rjsf/core": "^6.3.1",
+    "@rjsf/shadcn": "^6.3.1",
+    "@rjsf/utils": "^6.3.1",
+    "@rjsf/validator-ajv8": "^6.3.1",
    "apexcharts": "^3.52.0",
    "axios": "^1.7.7",
    "class-variance-authority": "^0.7.1",
@@ -71,6 +75,8 @@
    "react-icons": "^5.5.0",
    "react-konva": "^18.2.10",
    "react-router-dom": "^6.30.3",
+    "react-markdown": "^9.0.1",
+    "remark-gfm": "^4.0.0",
    "react-swipeable": "^7.0.2",
    "react-tracked": "^2.0.1",
    "react-transition-group": "^4.4.5",
--- a/web/public/locales/en/common.json
+++ b/web/public/locales/en/common.json
@@ -115,8 +115,10 @@
    "internalID": "The Internal ID Frigate uses in the configuration and database"
  },
  "button": {
+    "add": "Add",
    "apply": "Apply",
    "reset": "Reset",
+    "undo": "Undo",
    "done": "Done",
    "enabled": "Enabled",
    "enable": "Enable",
@@ -127,6 +129,7 @@
    "cancel": "Cancel",
    "close": "Close",
    "copy": "Copy",
+    "copiedToClipboard": "Copied to clipboard",
    "back": "Back",
    "history": "History",
    "fullscreen": "Fullscreen",
@@ -150,7 +153,14 @@
    "export": "Export",
    "deleteNow": "Delete Now",
    "next": "Next",
-    "continue": "Continue"
+    "continue": "Continue",
+    "modified": "Modified",
+    "overridden": "Overridden",
+    "resetToGlobal": "Reset to Global",
+    "resetToDefault": "Reset to Default",
+    "saveAll": "Save All",
+    "savingAll": "Saving All…",
+    "undoAll": "Undo All"
  },
  "menu": {
    "system": "System",
@@ -245,6 +255,7 @@
    "uiPlayground": "UI Playground",
    "faceLibrary": "Face Library",
    "classification": "Classification",
+    "chat": "Chat",
    "user": {
      "title": "User",
      "account": "Account",
--- a/web/public/locales/en/config/audio.json
+++ b/web/public/locales/en/config/audio.json
@@ -1,26 +0,0 @@
-{
-  "label": "Global Audio events configuration.",
-  "properties": {
-    "enabled": {
-      "label": "Enable audio events."
-    },
-    "max_not_heard": {
-      "label": "Seconds of not hearing the type of audio to end the event."
-    },
-    "min_volume": {
-      "label": "Min volume required to run audio detection."
-    },
-    "listen": {
-      "label": "Audio to listen for."
-    },
-    "filters": {
-      "label": "Audio filters."
-    },
-    "enabled_in_config": {
-      "label": "Keep track of original state of audio detection."
-    },
-    "num_threads": {
-      "label": "Number of detection threads"
-    }
-  }
-}
--- a/web/public/locales/en/config/audio_transcription.json
+++ b/web/public/locales/en/config/audio_transcription.json
@@ -1,23 +0,0 @@
-{
-  "label": "Audio transcription config.",
-  "properties": {
-    "enabled": {
-      "label": "Enable audio transcription."
-    },
-    "language": {
-      "label": "Language abbreviation to use for audio event transcription/translation."
-    },
-    "device": {
-      "label": "The device used for license plate recognition."
-    },
-    "model_size": {
-      "label": "The size of the embeddings model used."
-    },
-    "enabled_in_config": {
-      "label": "Keep track of original state of camera."
-    },
-    "live_enabled": {
-      "label": "Enable live transcriptions."
-    }
-  }
-}
--- a/Show More
+++ b/Show More