Fix log download race; stream live log file (v0.0.10)

Replace ReadAllTextAsync with FileStream + FileShare.ReadWrite so concurrent dnsmasq writes cannot trigger StringBuilder capacity errors. Release as 0.0.10.
Stop log background loops cleanly during shutdown.
2026-10-03 22:12:00 +10:00 · 2026-05-07 01:59:28 +10:00 · 2026-04-11 21:53:45 +10:00 · 2026-04-11 21:35:52 +10:00 · 2026-04-11 20:25:28 +10:00 · 2026-04-07 18:15:23 +10:00
472 changed files with 30855 additions and 1924 deletions
@@ -2,7 +2,15 @@
 # Both run as root; file permissions work because config dirs are in the container.
 # For dnsmasq on the host, use the self-contained publish (scripts/publish-self-contained.sh)
 # or run the app on the host; see DnsmasqOptions XML doc for permissions and ReloadCommand scope.
+#
+# Dnsmasq install mode for the test harness:
+# - DNSMASQ_VERSION=latest (default): build the latest stable upstream dnsmasq release.
+# - DNSMASQ_VERSION=<version>       : build that exact upstream release (e.g. 2.91).
+# - DNSMASQ_VERSION=distro          : use the distro package from apt.
+#
+# This keeps day-to-day harness use close to upstream while still allowing pinned-version testing.

+ARG DNSMASQ_VERSION=
 FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
 WORKDIR /app
 EXPOSE 8080
@@ -20,13 +28,36 @@ FROM build AS publish
 RUN dotnet publish "DnsmasqWebUI.csproj" -c Release -o /app/publish /p:UseAppHost=false

 FROM base AS final
+ARG DNSMASQ_VERSION=latest
 WORKDIR /app
 ENV ASPNETCORE_URLS=http://+:8080
-# Slow, rarely-changing steps first (stay cached when only .NET code changes)
-RUN apt-get update && apt-get install -y --no-install-recommends dnsmasq procps \
-    && rm -rf /var/lib/apt/lists/*
-COPY scripts/entrypoint.sh scripts/dnsmasq-status.sh .
+# Install dnsmasq either from the distro package or by building an upstream release.
+RUN if [ "$DNSMASQ_VERSION" = "distro" ]; then \
+    apt-get update && apt-get install -y --no-install-recommends dnsmasq procps \
+    && rm -rf /var/lib/apt/lists/*; \
+    else \
+    apt-get update && apt-get install -y --no-install-recommends procps curl build-essential xz-utils ca-certificates \
+    && rm -rf /var/lib/apt/lists/* \
+    && if [ "$DNSMASQ_VERSION" = "latest" ]; then \
+         DNSMASQ_VERSION="$(curl -fsSL https://thekelleys.org.uk/dnsmasq/ | grep -o 'dnsmasq-[0-9][0-9.]*\.tar\.xz' | sed 's/^dnsmasq-//; s/\.tar\.xz$//' | sort -V | tail -n1)"; \
+       fi \
+    && test -n "$DNSMASQ_VERSION" \
+    && echo "Building dnsmasq $DNSMASQ_VERSION from upstream source" \
+    && curl -fsSL "https://thekelleys.org.uk/dnsmasq/dnsmasq-${DNSMASQ_VERSION}.tar.xz" -o /tmp/dnsmasq.tar.xz \
+    && tar -C /tmp -xJf /tmp/dnsmasq.tar.xz \
+    && make -C /tmp/dnsmasq-${DNSMASQ_VERSION} -j"$(nproc)" \
+    && make -C /tmp/dnsmasq-${DNSMASQ_VERSION} install PREFIX=/usr \
+    && rm -rf /tmp/dnsmasq-${DNSMASQ_VERSION} /tmp/dnsmasq.tar.xz \
+    && apt-get purge -y build-essential curl xz-utils \
+    && apt-get autoremove -y --purge \
+    && rm -rf /var/lib/apt/lists/*; \
+    fi
+COPY scripts/entrypoint.sh scripts/dnsmasq-status.sh ./
 RUN chmod +x entrypoint.sh dnsmasq-status.sh
+# curl for HEALTHCHECK (aspnet image has no curl/wget)
+RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
 # .NET publish last - only this layer invalidates when code changes
 COPY --from=publish /app/publish .
 ENTRYPOINT ["./entrypoint.sh"]
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
+  CMD curl -f -s http://localhost:8080/healthz/ready || exit 1
@@ -19,6 +19,8 @@ A self-hosted web UI for managing [dnsmasq](https://thekelleys.org.uk/dnsmasq/do
 - **DHCP host entries** (reservations) if you use DHCP; edit in the UI, written into the managed config.
 - **Reload dnsmasq** after config changes (configurable command, e.g. `systemctl reload dnsmasq` or `pkill -HUP -x dnsmasq`).
 - Optional **status** and **recent logs** commands (e.g. systemctl/journalctl or custom scripts) shown on the Dnsmasq page.
+- **Minimum dnsmasq version** check (configurable; e.g. 2.91). The UI can refuse to start or block config save if the detected version is too old. Version is shown on the Dnsmasq page with a link to release notes.
+- **Readiness endpoint** `GET /healthz/ready` for orchestration (Kubernetes, Docker, load balancers). Returns healthy when dnsmasq version meets the minimum and, if configured, dnsmasq is running. The Docker image includes a HEALTHCHECK that uses this endpoint.
 - **Self-contained Linux binaries** per OS/arch (RID); no .NET install required. Can run in Docker or directly on the host.

 <!-- SUGGESTED SCREENSHOT: MAIN CONFIG OR CONFIG EDITOR PAGE IN THE BROWSER -->
@@ -163,7 +165,7 @@ COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 ```

-Set `Dnsmasq__MainConfigPath`, `Dnsmasq__ReloadCommand`, and other options via environment variables or an `appsettings.json` in `/app`. Mount your config dir and expose 8080.
+Set `Dnsmasq__MainConfigPath`, `Dnsmasq__ReloadCommand`, and other options via environment variables or an `appsettings.json` in `/app`. Mount your config dir and expose 8080. The image includes a **HEALTHCHECK** that calls `GET /healthz/ready`; orchestration (e.g. Kubernetes readiness probe, or Compose `depends_on: condition: service_healthy`) can use the same endpoint.

 **Config summary for containers:**

@@ -173,8 +175,11 @@ Set `Dnsmasq__MainConfigPath`, `Dnsmasq__ReloadCommand`, and other options via e
 | `Dnsmasq__MainConfigPath` | `/data/dnsmasq.conf` | Main dnsmasq config path (required) |
 | `Dnsmasq__ReloadCommand` | `pkill -HUP -x dnsmasq` | Run after config changes |
 | `Dnsmasq__StatusShowCommand` | `/app/dnsmasq-status.sh` | Optional status output (e.g. our script in test harness) |
+| `Dnsmasq__MinimumVersion` | `2.91` | Minimum dnsmasq version (optional; default 2.91). Set `Dnsmasq__EnforceMinimumVersion=false` to allow older versions. |
 | `ASPNETCORE_URLS` | `http://+:8080` | Port the app listens on |

+**Readiness:** `GET http://localhost:8080/healthz/ready` returns JSON `{"status":"ok"}` when dnsmasq version meets the minimum and (if `StatusCommand` is set) dnsmasq is running. Use this for Kubernetes readiness probes, Docker HEALTHCHECK, or load balancer health checks.
+
 See [Configuration](#configuration) for all options.

 <!-- SUGGESTED SCREENSHOT: EXAMPLE DOCKERFILE SNIPPET OR DOCKER RUN COMMAND SHOWING DNSMASQ + APP IN ONE CONTAINER -->
@@ -205,6 +210,9 @@ The app is configured via **appsettings.json**, **environment variables**, and *
 | `StatusCommand` | Optional: check if dnsmasq is running | `pgrep -x dnsmasq` |
 | `StatusShowCommand` | Optional: full status output (e.g. systemctl status) | `systemctl status dnsmasq --no-pager` |
 | `LogsCommand` | Optional: recent logs (e.g. journalctl) | `journalctl -u dnsmasq -n 100 --no-pager` |
+| `VersionCommand` | Command to probe dnsmasq version (used for minimum-version check and UI display) | `dnsmasq --version` |
+| `MinimumVersion` | Minimum dnsmasq version required (e.g. 2.91). Some options need newer dnsmasq. | `2.91` |
+| `EnforceMinimumVersion` | If true, app fails to start when version probe fails or version is below minimum. If false, only save and readiness checks enforce. | `true` |

 **Application options** (use `Application__` prefix for env, `Application` section in JSON):

@@ -391,7 +399,7 @@ sudo ./scripts/install.sh --uninstall --purge --system

 ### scripts/prepare-test-mount.sh

-**Purpose:** Prepare the testdata mount and optionally start or stop the Docker test harness (app + dnsmasq + DHCP clients). Syncs a source dir (default: `testdata`) into a mount dir (default: `testdata-mount`), cleans up previous test data, then runs `docker compose -f docker-compose.test.yml up -d` (or only prepares the mount with `--prepare-only`).
+**Purpose:** Prepare the testdata mount and optionally start or stop the Docker test harness (app + dnsmasq + DHCP clients). Syncs a source dir (default: `testdata`) into a mount dir (default: `testdata-mount`), then runs `docker compose -f docker-compose.test.yml up -d` (or only prepares the mount with `--prepare-only`). Fixture sync skips `leases` and app-managed filenames (`zz-dnsmasq-webui.conf`, `zz-dnsmasq-webui.hosts`) so rebuilds keep DHCP state and UI-written files unless you pass `--clear` or `--reset-managed`. By default the script resolves and uses the **latest stable upstream dnsmasq version** when building images; you can pin a specific version (or use the distro package) for compatibility testing.

 **Usage:** `./scripts/prepare-test-mount.sh [OPTIONS] [--]`

@@ -401,9 +409,12 @@ sudo ./scripts/install.sh --uninstall --purge --system
 |--------|-------------|
 | `--source DIR` | Source to copy from (default: `testdata`). |
 | `--mount DIR` | Target mount directory (default: `testdata-mount`). Compose uses `TESTDATA_MOUNT`; script exports it when you use `--mount`. |
-| `--no-clear` | Do not clear mount dir; only sync over existing contents (e.g. preserve leases between runs). |
+| `--dnsmasq-version V` | Dnsmasq version for the harness image: `latest` (default), `distro`, or an exact upstream version like `2.91`. |
+| `--clear` | Clear the mount dir completely before sync for a clean run. Default: preserve existing contents and sync over them. |
+| `--reset-managed` | After sync, remove `*dnsmasq-webui*.conf` and `*dnsmasq-webui*.hosts` under the mount so the app recreates them; leaves leases and other files. |
 | `--prepare-only` | Only prepare the mount; do not run docker compose. |
 | `--build` | Pass `--build` to docker compose (rebuild images). Default: use existing images. |
+| `--no-cache-build` | Run `docker compose build --pull --no-cache` before start. Use to force a fresh image build and refresh the resolved latest dnsmasq version. |
 | `--no-build` | Do not rebuild (default). |
 | `--recreate` | Pass `--force-recreate` to docker compose. |
 | `--stop` | Stop the harness: `docker compose down` (no prepare, no start). |
@@ -413,18 +424,28 @@ sudo ./scripts/install.sh --uninstall --purge --system
 **Examples:**

 ```bash
-# Full run: clear mount, sync testdata, start containers (no rebuild)
+# Default: preserve mount (fixtures sync over; managed conf/hosts and leases kept), start (no image rebuild)
 ./scripts/prepare-test-mount.sh

-# Rebuild images then start
+# Rebuild images then start (mount state preserved unless you pass --clear or --reset-managed)
 ./scripts/prepare-test-mount.sh --build

+# Force a fresh image build with no Docker build cache
+./scripts/prepare-test-mount.sh --no-cache-build
+
+# Rebuild with a specific dnsmasq version
+./scripts/prepare-test-mount.sh --dnsmasq-version 2.91 --build
+
+# Use the distro package instead of an upstream build
+./scripts/prepare-test-mount.sh --dnsmasq-version distro --build
+
 # Only prepare the mount; start manually later
 ./scripts/prepare-test-mount.sh --prepare-only
-# Then: TESTDATA_MOUNT=./testdata-mount docker compose -f docker-compose.test.yml up -d
+# Then use the version printed by the script, e.g.:
+# TESTDATA_MOUNT=./testdata-mount DNSMASQ_VERSION=<resolved-version> docker compose -f docker-compose.test.yml up -d

-# Preserve mount contents, sync over it, start
-./scripts/prepare-test-mount.sh --no-clear
+# Fresh managed config/hosts after a rebuild (fixtures still synced; leases kept)
+./scripts/prepare-test-mount.sh --reset-managed --build

 # Stop the harness
 ./scripts/prepare-test-mount.sh --stop
@@ -449,6 +470,21 @@ sudo ./scripts/install.sh --uninstall --purge --system

 **Usage:** Set `DNSMASQ_CONF` to the path of the dnsmasq config file inside the container (e.g. `/data/dnsmasq-test.conf`). No CLI arguments.

+---
+
+### scripts/extract-option-help.sh
+
+**Purpose:** Fetch the dnsmasq man page HTML and extract per-option help fragments into `src/DnsmasqWebUI/wwwroot/option-help/*.html`. The Effective Config UI loads these when the user clicks an option label (tooltip is from code; full help is from these files). Requires Docker (uses a temporary `python:3-slim` container). When adding new options to the UI, add the option key to the script’s `OPTION_KEYS` list (keep in sync with `EffectiveConfigSections` / `DnsmasqOptionTooltips`), then run this script so help is available for the new option (if it exists in the man page).
+
+**Usage:** `./scripts/extract-option-help.sh [--url URL] [--output-dir DIR]`
+
+| Option | Description |
+|--------|-------------|
+| `--url URL` | Man page URL (default: https://thekelleys.org.uk/dnsmasq/docs/dnsmasq-man.html). |
+| `--output-dir DIR` | Output directory (default: `src/DnsmasqWebUI/wwwroot/option-help`). |
+
+Run from the repo root. Writes one `.html` file per option that appears in the man page OPTIONS section; options in `OPTION_KEYS` but not in the man page are skipped.
+
 <!-- SUGGESTED SCREENSHOT: TERMINAL WITH PREPARE-TEST-MOUNT.SH USAGE OR DOCKER COMPOSE UP OUTPUT -->

 ---
@@ -471,10 +507,10 @@ sudo ./scripts/install.sh --uninstall --purge --system
 **Codebase overview:**

 - **Entry and config:** `Program.cs` wires the host; configuration (e.g. `Dnsmasq__*`) lives in `Models/Config/` (`DnsmasqOptions`, `ApplicationOptions`, `DnsmasqOptionsValidator`). Options are validated at startup.
- **Infrastructure:** Under `Infrastructure/`: **Client/** (HTTP API clients and `Abstractions/`), **Services/** and **Services/Abstractions/** (caches, config/hosts/leases services, reload, hosted services), **Parsers/** (dnsmasq config and hosts line parsers), **Helpers/Config/** and **Helpers/Http/** (option keys, encoding, tooltips, JSON options). A **managed** config file and optional managed hosts file are written by the app; the main config must include the managed file (e.g. via a final `conf-file=` line). Caches (`ConfigSetCache`, `HostsCache`) keep in-memory snapshots and refresh on file changes or staleness.
+- **Infrastructure:** Under `Infrastructure/`: **Client/** (HTTP API clients and `Abstractions/`), **Serialization/Parsers/** (Dnsmasq version/compile, DnsmasqConfig conf-line and include parsers, EffectiveConfig syntax helpers), **Services/** (caches, config/hosts/leases services, reload, hosted services; EffectiveConfig has Metadata, Rendering, Editing, Validation, Readonly), **Helpers/Config/** (file encoding for config/hosts), **Helpers/Http/** (HTTP helpers). A **managed** config file and optional managed hosts file are written by the app; the main config must include the managed file (e.g. via a final `conf-file=` line). Caches (`ConfigSetCache`, `HostsCache`) keep in-memory snapshots and refresh on file changes or staleness.
 - **Models:** `Models/Config/` (options, validators, `DnsmasqConfLine`); `Models/Contracts/` (snapshots and DTOs such as `ConfigSetSnapshot`, `HostsSnapshot`, `ManagedConfigContent`, `ProcessRunResult`, `ReloadResult`); `Models/Dnsmasq/` (status, `SaveWithReloadResult`, and `EffectiveConfig/` for effective config and sources); `Models/Client/`, `Models/Dhcp/`, `Models/Hosts/` (UI and API DTOs).
 - **API and UI:** `Controllers/` expose API endpoints; `Components/` contains Blazor Server components for config editor, hosts, DHCP, Dnsmasq status, and app settings. Static assets in `wwwroot/`.
- **Tests:** `DnsmasqWebUI.Tests` contains unit tests for parsers, config set service, config, and related logic. Run with `dotnet test`.
+- **Tests:** `DnsmasqWebUI.Tests` contains unit tests organised to mirror the main project: `Serialization/Parsers/` (Dnsmasq, DnsmasqConfig), `Services/Dnsmasq/Config/`, `Services/EffectiveConfig/`, `Models/`, and `Helpers/` (TestDataHelper). Run with `dotnet test`.

 <!-- SUGGESTED SCREENSHOT: SOLUTION EXPLORER OR FOLDER TREE OF SRC/ -->

@@ -499,7 +535,7 @@ Use `appsettings.json` or launch settings to set `Dnsmasq__MainConfigPath` and o
   ```bash
   ./scripts/prepare-test-mount.sh
   ```
-   This clears the mount dir (by default `testdata-mount`), syncs `testdata/` into it, and starts the stack with `docker-compose.test.yml`. Use `--prepare-only` to only prepare the mount, then start compose manually; use `--build` after changing the app or Dockerfile.
+   This syncs `testdata/` into the mount (preserving existing managed config, hosts, and `leases` unless you use `--clear` or `--reset-managed`), then starts the stack with `docker-compose.test.yml`. Use `--prepare-only` to only prepare the mount, then start compose manually; use `--build` after changing the app or Dockerfile.

 2. Open the UI (e.g. http://localhost:8080). The app and dnsmasq use the mounted config; you can edit config/hosts in the UI and trigger reload.

@@ -17,17 +17,21 @@ From the repo root:

 This will:

-1. Clear `testdata-mount/` (unless you pass `--no-clear`)
-2. Sync `testdata/` → `testdata-mount/`
-3. Remove any `*dnsmasq-webui*.conf` in the mount so dnsmasq starts clean
-4. Run `docker compose -f docker-compose.test.yml up -d --build`
+1. Run `docker compose down`, then sync `testdata/` → `testdata-mount/` (preserving mount contents unless you pass `--clear`). Sync skips `leases` and `zz-dnsmasq-webui.conf` / `zz-dnsmasq-webui.hosts` so rebuilds keep DHCP leases and UI-written managed files.
+2. Optionally remove managed `*dnsmasq-webui*.conf` / `*dnsmasq-webui*.hosts` in the mount **only** if you pass `--reset-managed`.
+3. Resolve the requested dnsmasq version (`latest` by default) to a concrete value when building images.
+4. Run `docker compose -f docker-compose.test.yml up -d` (add `--build` / `--no-cache-build` when you need a rebuild).

 - **Quick restart (no image rebuild):** `./scripts/prepare-test-mount.sh --no-build`
+- **Force a fresh image build:** `./scripts/prepare-test-mount.sh --no-cache-build`
+- **Pin dnsmasq version:** `./scripts/prepare-test-mount.sh --dnsmasq-version 2.91 --build`
+- **Use distro package:** `./scripts/prepare-test-mount.sh --dnsmasq-version distro --build`
 - **Prepare mount only (no start):** `./scripts/prepare-test-mount.sh --prepare-only`  
-  Then start manually: `TESTDATA_MOUNT=./testdata-mount docker compose -f docker-compose.test.yml up -d [--build]`
- **Preserve mount (e.g. keep leases):** `./scripts/prepare-test-mount.sh --no-clear --no-build`
+  Then start manually with the version printed by the script: `TESTDATA_MOUNT=./testdata-mount DNSMASQ_VERSION=<resolved-version> docker compose -f docker-compose.test.yml up -d [--build]`
+- **Preserve mount (e.g. keep leases and managed config):** default; also use `./scripts/prepare-test-mount.sh --no-build` for a quick up without rebuilding images.
+- **Drop managed conf/hosts only (keep leases):** `./scripts/prepare-test-mount.sh --reset-managed` (often combined with `--build`).

-App is at **http://localhost:8080**. Main config path in the container is `/data/dnsmasq-test.conf`; managed file is `zz-dnsmasq-webui.conf` in the same directory.
+App is at **http://localhost:8080**. Main config path in the container is `/data/dnsmasq-test.conf`; managed file is `zz-dnsmasq-webui.conf` in the same directory. The app service has a healthcheck (`GET /healthz/ready`); DHCP client services use `depends_on: app: condition: service_healthy` so they start only after the app (and dnsmasq) is ready.

 ### Stop the harness

@@ -49,6 +53,9 @@ Stops the harness and deletes the contents of `testdata-mount/` so the next run

 - `--source DIR` — Source to sync from (default: `testdata`)
 - `--mount DIR` — Mount directory (default: `testdata-mount`). The script exports `TESTDATA_MOUNT=./DIR` when you use `--mount`, so compose uses it.
+- `--dnsmasq-version V` — Dnsmasq version for the harness image: `latest` (default), `distro`, or an exact upstream version like `2.91`.
+- `--reset-managed` — After sync, delete `*dnsmasq-webui*.conf` and `*dnsmasq-webui*.hosts` under the mount so the app recreates them.
+- `--no-cache-build` — Force a fresh image build with `docker compose build --pull --no-cache` before start.

 Example: sync from a custom dir and start:

@@ -76,5 +83,12 @@ Build only: `dotnet build`

 - **testdata/** — Source for the harness mount. Synced to `testdata-mount/` by `prepare-test-mount.sh`. Unit tests read from the copy in the test output dir. See **testdata/README** for the full layout.
 - **testdata/dnsmasq-test.conf** — Harness main config (`/data/dnsmasq-test.conf`). Richer config: multiple `server=`, `addn-hosts=`, `address=`, `listen-address=`, `conf-dir=/data/dnsmasq.d`.
- **testdata/dnsmasq.d/** — Included configs (01-other.conf, 02-servers.conf, dhcp.conf). App creates `zz-dnsmasq-webui.conf` here when running.
+- **testdata/dnsmasq.d/** — Included configs (01-other.conf, 02-servers.conf, 03-more.conf, dhcp.conf). App creates `zz-dnsmasq-webui.conf` here when running.
 - **testdata/hosts**, **testdata/hosts.extra** — Addn-hosts files so effective config has multiple addn-hosts; UI can show source per path.
+
+## When adding new effective-config options
+
+When adding a new dnsmasq option to the Effective Config UI (new key in `DnsmasqConfKeys`, section, kind map, parser/write behavior, tooltip, etc.):
+
+1. **Option help:** Add the option key (lowercase, e.g. `no-round-robin`) to the `OPTION_KEYS` list in `scripts/extract-option-help.sh` (keep in sync with `EffectiveConfigSections`). Then run `./scripts/extract-option-help.sh` so `wwwroot/option-help/<key>.html` is generated if the option exists in the dnsmasq man page.
+2. **Testdata (optional):** To show the option in the UI when using the harness or testdata, add a line to e.g. `testdata/dnsmasq.d/03-more.conf` and update `testdata/README` if needed.
@@ -1,6 +1,6 @@
 # Run the app with real dnsmasq and several DHCP clients so hosts/leases are real.
 # Some clients also make periodic DNS requests so the DNS cache and logs show activity.
-# Prepare mount: ./scripts/prepare-test-mount.sh [--minimal-conf | --prepare-only | ...]
+# Prepare mount: ./scripts/prepare-test-mount.sh [--clear | --reset-managed | --minimal-conf | --prepare-only | ...]
 # Or set TESTDATA_MOUNT to override the data volume (default: ./testdata-mount).
 # Set TEST_DNSMASQ_CONF to override main config path (default: /data/dnsmasq-test.conf; use /data/dnsmasq-test-minimal.conf for minimal).
 #
@@ -14,8 +14,16 @@ services:
  app:
    build:
      context: .
+      args:
+        DNSMASQ_VERSION: ${DNSMASQ_VERSION:-latest}
    ports:
      - "8080:8080"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "-s", "http://localhost:8080/healthz/ready"]
+      interval: 30s
+      timeout: 5s
+      start_period: 5s
+      retries: 3
    cap_add:
      - NET_ADMIN
    environment:
@@ -44,7 +52,8 @@ services:
    networks:
      testnet: {}
    depends_on:
-      - app
+      app:
+        condition: service_healthy

  # DHCP + periodic DNS lookups (every 20s) so DNS cache/logs show activity.
  dhcp-client-dns-a:
@@ -63,7 +72,8 @@ services:
    networks:
      testnet: {}
    depends_on:
-      - app
+      app:
+        condition: service_healthy

  # DHCP + periodic DNS lookups (every 45s); different interval for variety.
  dhcp-client-dns-b:
@@ -82,7 +92,8 @@ services:
    networks:
      testnet: {}
    depends_on:
-      - app
+      app:
+        condition: service_healthy

  # Third DHCP-only client so the leases table has more entries.
  dhcp-client-2:
@@ -91,7 +102,8 @@ services:
    networks:
      testnet: {}
    depends_on:
-      - app
+      app:
+        condition: service_healthy

 networks:
  testnet:
@@ -122,6 +122,7 @@ OPTION_KEYS = [
    "dhcp-hostsfile",
    "dhcp-optsfile",
    "dhcp-hostsdir",
+    "dhcp-optsdir",
    "dhcp-boot",
    "dhcp-ignore",
    "dhcp-vendorclass",
@@ -171,6 +172,59 @@ OPTION_KEYS = [
    "keep-in-foreground",
    "no-daemon",
    "conntrack",
+    "connmark-allowlist-enable",
+    "no-round-robin",
+    "dns-forward-max",
+    "connmark-allowlist",
+    "do-0x20-encode",
+    "caa-record",
+    "dns-rr",
+    "synth-domain",
+    "auth-zone",
+    "auth-soa",
+    "auth-sec-servers",
+    "auth-peer",
+    "leasequery",
+    "dhcp-generate-names",
+    "dhcp-broadcast",
+    "dhcp-sequential-ip",
+    "dhcp-ignore-clid",
+    "bootp-dynamic",
+    "no-ping",
+    "script-arp",
+    "script-on-renewal",
+    "dhcp-no-override",
+    "dhcp-alternate-port",
+    "dhcp-duid",
+    "dhcp-luascript",
+    "dhcp-scriptuser",
+    "dhcp-relay",
+    "dhcp-circuitid",
+    "dhcp-remoteid",
+    "dhcp-subscrid",
+    "dhcp-proxy",
+    "tag-if",
+    "bridge-interface",
+    "shared-network",
+    "dhcp-pxe-vendor",
+    "dhcp-option-pxe",
+    "dnssec-no-timecheck",
+    "dnssec-debug",
+    "add-cpe-id",
+    "dnssec-timestamp",
+    "dnssec-limits",
+    "dumpfile",
+    "dumpmask",
+    "use-stale-cache",
+    "add-mac",
+    "strip-mac",
+    "add-subnet",
+    "strip-subnet",
+    "umbrella",
+    "quiet-dhcp",
+    "quiet-dhcp6",
+    "quiet-ra",
+    "quiet-tftp",
 ]

 long_opt_re = re.compile(r"--([a-z][a-z0-9-]*)(?:=[^,\s]*)?", re.IGNORECASE)
@@ -3,8 +3,8 @@
 # (app + dnsmasq + DHCP client). See testdata/README.md and docker-compose.test.yml.
 #
 # What this script does:
-#   Start (default): sync source -> mount (preserving existing unless --clear), clean up previous test data,
-#     then docker compose up -d [--build] [--force-recreate].
+#   Start (default): sync source -> mount (preserving existing unless --clear); optional --reset-managed
+#     removes app-written files in the mount. Then docker compose up -d [--build] [--force-recreate].
 #   --stop: docker compose down (stop and remove containers/networks).
 #   --tidy: docker compose down, then clear the mount directory for a clean next run.
 set -e
@@ -15,10 +15,13 @@ COMPOSE_FILE="docker-compose.test.yml"

 SOURCE_DIR=""
 MOUNT_DIR=""
+DNSMASQ_VERSION=""
 PREPARE_ONLY=false
 BUILD=false
+NO_CACHE_BUILD=false
 RECREATE=false
 CLEAR=false
+RESET_MANAGED=false
 STOP=false
 TIDY=false
 MINIMAL_CONF=false
@@ -31,17 +34,23 @@ usage() {
  echo ""
  echo "Steps (when starting):"
  echo "  1. Optionally clear mount dir (only with --clear), then sync source -> mount."
-  echo "  2. Clean up previous test data (e.g. managed config) so the harness starts clean."
+  echo "      Sync skips app-managed filenames (zz-dnsmasq-webui.conf / .hosts) so rebuilds keep UI state."
+  echo "  2. Optionally remove managed *dnsmasq-webui*.conf / *dnsmasq-webui*.hosts (only with --reset-managed)."
  echo "  3. If not --prepare-only: docker compose -f $COMPOSE_FILE up -d [options]."
  echo ""
  echo "Path options:"
  echo "  --source DIR        Source to copy from (default: testdata)"
  echo "  --mount DIR         Target mount directory (default: testdata-mount)"
  echo "                      Compose uses TESTDATA_MOUNT; script exports it if you use --mount."
+  echo "  --dnsmasq-version V Dnsmasq version for the harness image:"
+  echo "                      latest (default), distro, or an exact upstream version like 2.91."
+  echo "                      Non-default values require --build or --no-cache-build; script fails with --no-build."
  echo ""
  echo "Mount behaviour:"
  echo "  (default)           Preserve mount dir; sync source over existing contents."
  echo "  --clear             Clear mount dir completely before sync. Use for a clean run."
+  echo "  --reset-managed     After sync, delete *dnsmasq-webui*.conf and *dnsmasq-webui*.hosts under the"
+  echo "                      mount so the app recreates managed config/hosts (leases and other files stay)."
  echo ""
  echo "Compose behaviour:"
  echo "  --minimal-conf     Use minimal dnsmasq config (dnsmasq-test-minimal.conf) so effective"
@@ -50,7 +59,10 @@ usage() {
  echo "                      Use to inspect or edit the mount before starting containers."
  echo "  --build             Pass --build to docker compose (rebuild images before starting)."
  echo "                      Use after changing the app or Dockerfile. Default: use existing images."
+  echo "  --no-cache-build    Rebuild images with --pull --no-cache before starting."
+  echo "                      Use to force a fresh image build and refresh 'latest' dnsmasq."
  echo "  --no-build          Do not rebuild (default). Use existing images for a quick restart."
+  echo "                      With --no-build, 'latest' is not resolved (no network)."
  echo "  --recreate          Pass --force-recreate to docker compose (recreate containers)."
  echo "                      Use to ensure fresh container state and mounts."
  echo ""
@@ -72,9 +84,15 @@ usage() {
  echo "  $0 --recreate"
  echo "                      Sync, then up -d --force-recreate (fresh containers)."
  echo ""
+  echo "  $0 --no-cache-build"
+  echo "                      Force a fresh image build (no Docker build cache), then start containers."
+  echo ""
  echo "  $0 --clear"
  echo "                      Clear mount, sync testdata, start (clean run, no rebuild)."
  echo ""
+  echo "  $0 --reset-managed --build"
+  echo "                      Rebuild images; sync fixtures; drop managed conf/hosts so app writes fresh."
+  echo ""
  echo "  $0 --prepare-only"
  echo "                      Only sync testdata -> testdata-mount; no containers."
  echo "                      Then run: docker compose -f $COMPOSE_FILE up -d [--build]"
@@ -91,6 +109,35 @@ usage() {
  echo ""
  echo "  $0 --minimal-conf"
  echo "                      Use dnsmasq-test-minimal.conf (single file, few options) and start."
+  echo ""
+  echo "  $0 --dnsmasq-version 2.91 --build"
+  echo "                      Rebuild the harness image with dnsmasq 2.91."
+}
+
+fetch_url() {
+  if command -v curl >/dev/null 2>&1; then
+    curl -fsSL "$1"
+    return $?
+  fi
+  if command -v wget >/dev/null 2>&1; then
+    wget -qO- "$1"
+    return $?
+  fi
+  echo "Error: need curl or wget to resolve the latest upstream dnsmasq version." >&2
+  return 1
+}
+
+resolve_dnsmasq_version() {
+  if [ "$DNSMASQ_VERSION" != "latest" ]; then
+    return 0
+  fi
+
+  RESOLVED_VERSION="$(fetch_url "https://thekelleys.org.uk/dnsmasq/" | sed -n 's/.*LATEST_IS_\([0-9][0-9.]*\).*/\1/p' | head -n1)"
+  if [ -z "$RESOLVED_VERSION" ]; then
+    echo "Error: could not resolve the latest upstream dnsmasq version." >&2
+    exit 1
+  fi
+  DNSMASQ_VERSION="$RESOLVED_VERSION"
 }

 while [ $# -gt 0 ]; do
@@ -111,10 +158,20 @@ while [ $# -gt 0 ]; do
      MOUNT_DIR="$1"
      shift
      ;;
+    --dnsmasq-version)
+      shift
+      [ $# -gt 0 ] || { echo "Error: --dnsmasq-version requires VERSION" >&2; exit 1; }
+      DNSMASQ_VERSION="$1"
+      shift
+      ;;
    --clear)
      CLEAR=true
      shift
      ;;
+    --reset-managed)
+      RESET_MANAGED=true
+      shift
+      ;;
    --prepare-only)
      PREPARE_ONLY=true
      shift
@@ -123,8 +180,14 @@ while [ $# -gt 0 ]; do
      BUILD=true
      shift
      ;;
+    --no-cache-build)
+      NO_CACHE_BUILD=true
+      BUILD=true
+      shift
+      ;;
    --no-build)
      BUILD=false
+      NO_CACHE_BUILD=false
      shift
      ;;
    --recreate)
@@ -170,6 +233,7 @@ cd "$REPO_ROOT"

 : "${SOURCE_DIR:=testdata}"
 : "${MOUNT_DIR:=testdata-mount}"
+: "${DNSMASQ_VERSION:=latest}"

 # Stop and/or tidy: no prepare, no start
 if [ "$STOP" = true ] || [ "$TIDY" = true ]; then
@@ -192,6 +256,17 @@ if [ ! -d "$SOURCE_DIR" ]; then
  exit 1
 fi

+# Resolve "latest" only when we will build; avoid network when doing a no-build run.
+WILL_BUILD=false
+[ "$BUILD" = true ] || [ "$NO_CACHE_BUILD" = true ] && WILL_BUILD=true
+if [ "$WILL_BUILD" = false ] && [ "$DNSMASQ_VERSION" != "latest" ] && [ "$DNSMASQ_VERSION" != "distro" ]; then
+  echo "Error: --dnsmasq-version $DNSMASQ_VERSION has no effect without --build or --no-cache-build. Add --build or omit --dnsmasq-version for a no-build run." >&2
+  exit 1
+fi
+if [ "$WILL_BUILD" = true ]; then
+  resolve_dnsmasq_version
+fi
+
 # Take the harness down so all containers (including one-shot DHCP clients) are recreated on up.
 echo "Stopping test harness: docker compose -f $COMPOSE_FILE down"
 docker compose -f "$COMPOSE_FILE" down
@@ -203,15 +278,22 @@ if [ "$CLEAR" = true ]; then
  find "$MOUNT_DIR" -mindepth 1 -delete 2>/dev/null || true
 fi

+# Exclude sample leases (harness creates real lease file) and app-managed filenames so rebuilds preserve
+# UI-written config/hosts; use --reset-managed or --clear when you want those removed.
 if command -v rsync >/dev/null 2>&1; then
-  rsync -a --exclude='leases' "$SOURCE_DIR/" "$MOUNT_DIR/"
+  rsync -a \
+    --exclude='leases' \
+    --exclude='zz-dnsmasq-webui.conf' \
+    --exclude='zz-dnsmasq-webui.hosts' \
+    "$SOURCE_DIR/" "$MOUNT_DIR/"
 else
-  cp -r "$SOURCE_DIR/." "$MOUNT_DIR/"
-  rm -f "$MOUNT_DIR/leases"
+  (cd "$SOURCE_DIR" && tar cf - --exclude=leases --exclude=zz-dnsmasq-webui.conf --exclude=zz-dnsmasq-webui.hosts .) | (cd "$MOUNT_DIR" && tar xf -)
 fi

-# Clean up previous test data (e.g. managed config) so the harness starts clean (app will create zz-dnsmasq-webui.conf on startup).
-find "$MOUNT_DIR" -name '*dnsmasq-webui*.conf' -type f -delete 2>/dev/null || true
+if [ "$RESET_MANAGED" = true ]; then
+  echo "Removing app-managed files (*dnsmasq-webui*.conf / *dnsmasq-webui*.hosts) under $MOUNT_DIR"
+  find "$MOUNT_DIR" \( -name '*dnsmasq-webui*.conf' -o -name '*dnsmasq-webui*.hosts' \) -type f -delete 2>/dev/null || true
+fi

 echo "Mount directory ready: $MOUNT_DIR (source: $SOURCE_DIR)."

@@ -220,9 +302,14 @@ if [ "$PREPARE_ONLY" = true ]; then
    /*) MOUNT_EXPORT="$MOUNT_DIR" ;;
    *)  MOUNT_EXPORT="./$MOUNT_DIR" ;;
  esac
-  START_CMD="TESTDATA_MOUNT=$MOUNT_EXPORT docker compose -f $COMPOSE_FILE up -d [--build]"
+  START_PREFIX="TESTDATA_MOUNT=$MOUNT_EXPORT DNSMASQ_VERSION=$DNSMASQ_VERSION"
  if [ "$MINIMAL_CONF" = true ]; then
-    START_CMD="TESTDATA_MOUNT=$MOUNT_EXPORT TEST_DNSMASQ_CONF=/data/dnsmasq-test-minimal.conf docker compose -f $COMPOSE_FILE up -d [--build]"
+    START_PREFIX="$START_PREFIX TEST_DNSMASQ_CONF=/data/dnsmasq-test-minimal.conf"
+  fi
+  if [ "$NO_CACHE_BUILD" = true ]; then
+    START_CMD="$START_PREFIX docker compose -f $COMPOSE_FILE build --pull --no-cache && $START_PREFIX docker compose -f $COMPOSE_FILE up -d"
+  else
+    START_CMD="$START_PREFIX docker compose -f $COMPOSE_FILE up -d [--build]"
  fi
  echo "To start the harness: $START_CMD"
  exit 0
@@ -234,13 +321,30 @@ case "$MOUNT_DIR" in
  *)  export TESTDATA_MOUNT="./$MOUNT_DIR" ;;
 esac

+export DNSMASQ_VERSION
+
+case "$DNSMASQ_VERSION" in
+  distro)
+    echo "Using distro-packaged dnsmasq for the harness image."
+    ;;
+  *)
+    echo "Using dnsmasq $DNSMASQ_VERSION for the harness image."
+    ;;
+esac
+
 if [ "$MINIMAL_CONF" = true ]; then
  export TEST_DNSMASQ_CONF="/data/dnsmasq-test-minimal.conf"
  echo "Using minimal config: $TEST_DNSMASQ_CONF"
 fi

+if [ "$NO_CACHE_BUILD" = true ]; then
+  BUILD_CMD="docker compose -f $COMPOSE_FILE build --pull --no-cache"
+  echo "Running: $BUILD_CMD"
+  $BUILD_CMD
+fi
+
 COMPOSE_CMD="docker compose -f $COMPOSE_FILE up -d"
-if [ "$BUILD" = true ]; then
+if [ "$BUILD" = true ] && [ "$NO_CACHE_BUILD" != true ]; then
  COMPOSE_CMD="$COMPOSE_CMD --build"
 fi
 if [ "$RECREATE" = true ]; then
@@ -0,0 +1,71 @@
+using DnsmasqWebUI.Components.DnsRecords.Editors;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.DnsRecords;
+
+namespace DnsmasqWebUI.Tests.Components.DnsRecords;
+
+public class DnsRecordEditorSyncGuardTests
+{
+    [Fact]
+    public void AddMode_SameEmptyKey_ReseedsOnce()
+    {
+        string? k = null;
+        Assert.True(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, null));
+        Assert.False(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, null));
+    }
+
+    [Fact]
+    public void AddMode_DifferentAddOption_ReseedsAgain()
+    {
+        string? k = null;
+        Assert.True(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, null, "add:naptr-record"));
+        Assert.False(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, null, "add:naptr-record"));
+        Assert.True(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, null, "add:caa-record"));
+    }
+
+    [Fact]
+    public void EditMode_UsesRowId()
+    {
+        var row = new DnsRecordRow(
+            "cname:0",
+            "cname:0",
+            DnsmasqConfKeys.Cname,
+            DnsRecordFamily.Cname,
+            0,
+            "a,b",
+            null,
+            null,
+            null,
+            false,
+            true,
+            new CnamePayload(["a"], "b", null),
+            [],
+            "s");
+        string? k = null;
+        Assert.True(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, row));
+        Assert.False(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, row));
+    }
+
+    [Fact]
+    public void TransitionFromAddToEdit_Reseeds()
+    {
+        string? k = null;
+        DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, null);
+        var row = new DnsRecordRow(
+            "txt:1",
+            "txt:1",
+            DnsmasqConfKeys.TxtRecord,
+            DnsRecordFamily.Txt,
+            1,
+            "x,y",
+            null,
+            null,
+            null,
+            false,
+            true,
+            new TxtPayload("x", "y"),
+            [],
+            "s");
+        Assert.True(DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref k, row));
+    }
+}
@@ -1,59 +0,0 @@
-using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
-
-namespace DnsmasqWebUI.Tests;
-
-/// <summary>
-/// Tests for <see cref="ConfigValueSource"/> and <see cref="ConfigValueSource.GetReadOnlyTooltip"/>.
-/// </summary>
-public class ConfigValueSourceTests
-{
-    [Fact]
-    public void GetReadOnlyTooltip_WhenManaged_ReturnsNull()
-    {
-        var source = new ConfigValueSource("/data/zz-managed.conf", "zz-managed.conf", IsManaged: true, LineNumber: 5);
-        Assert.Null(source.GetReadOnlyTooltip());
-    }
-
-    [Fact]
-    public void GetReadOnlyTooltip_WhenReadOnlyWithoutLineNumber_ReturnsFileNameOnly()
-    {
-        var fileName = "02.conf";
-        var fullPath = $"/etc/dnsmasq.d/{fileName}";
-        var source = new ConfigValueSource(fullPath, fileName, IsManaged: false, LineNumber: null);
-        var tooltip = source.GetReadOnlyTooltip();
-        Assert.NotNull(tooltip);
-        Assert.Contains(fileName, tooltip);
-        Assert.Contains("readonly", tooltip);
-        Assert.Contains(fullPath, tooltip);
-        Assert.DoesNotContain("line", tooltip);
-    }
-
-    [Fact]
-    public void GetReadOnlyTooltip_WhenReadOnlyWithLineNumber_IncludesLineNumber()
-    {
-        var fileName = "02.conf";
-        var fullPath = $"/etc/dnsmasq.d/{fileName}";
-        int? lineNumber = 3;
-        var source = new ConfigValueSource(fullPath, fileName, IsManaged: false, LineNumber: lineNumber);
-        var tooltip = source.GetReadOnlyTooltip();
-        Assert.NotNull(tooltip);
-        Assert.Contains(fileName, tooltip);
-        Assert.Contains($"line {lineNumber}", tooltip);
-        Assert.Contains("readonly", tooltip);
-        Assert.Contains(fullPath, tooltip);
-    }
-
-    [Fact]
-    public void IsReadOnly_WhenManaged_IsFalse()
-    {
-        var source = new ConfigValueSource("/data/zz.conf", "zz.conf", IsManaged: true);
-        Assert.False(source.IsReadOnly);
-    }
-
-    [Fact]
-    public void IsReadOnly_WhenNotManaged_IsTrue()
-    {
-        var source = new ConfigValueSource("/etc/dnsmasq.conf", "dnsmasq.conf", IsManaged: false);
-        Assert.True(source.IsReadOnly);
-    }
-}
@@ -0,0 +1,101 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+
+namespace DnsmasqWebUI.Tests.Helpers;
+
+/// <summary>
+/// Sample config line per option for consistent parser coverage. When adding new options to the app,
+/// add an entry here so the option-coverage test continues to exercise every option.
+/// </summary>
+public static class OptionCoverageData
+{
+    /// <summary>Option key and a minimal valid config line (without newline).</summary>
+    public static IReadOnlyList<(string OptionKey, string ConfigLine)> GetParserCoverageEntries()
+    {
+        return new (string, string)[]
+        {
+            // LastWins
+            (DnsmasqConfKeys.Port, "port=53"),
+            (DnsmasqConfKeys.CacheSize, "cache-size=500"),
+            (DnsmasqConfKeys.LocalTtl, "local-ttl=300"),
+            (DnsmasqConfKeys.MxTarget, "mx-target=mail.example.com"),
+            (DnsmasqConfKeys.DhcpLeasefile, "dhcp-leasefile=/var/lib/dnsmasq.leases"),
+            (DnsmasqConfKeys.DhcpLeaseMax, "dhcp-lease-max=1000"),
+            (DnsmasqConfKeys.Hostsdir, "hostsdir=/etc/dnsmasq.d"),
+            (DnsmasqConfKeys.PidFile, "pid-file=/run/dnsmasq.pid"),
+            (DnsmasqConfKeys.User, "user=nobody"),
+            (DnsmasqConfKeys.TftpRoot, "tftp-root=/var/lib/tftpboot"),
+            // Flag
+            (DnsmasqConfKeys.NoHosts, "no-hosts"),
+            (DnsmasqConfKeys.ExpandHosts, "expand-hosts"),
+            (DnsmasqConfKeys.BogusPriv, "bogus-priv"),
+            (DnsmasqConfKeys.NoResolv, "no-resolv"),
+            (DnsmasqConfKeys.DomainNeeded, "domain-needed"),
+            (DnsmasqConfKeys.StrictOrder, "strict-order"),
+            (DnsmasqConfKeys.AllServers, "all-servers"),
+            (DnsmasqConfKeys.BindInterfaces, "bind-interfaces"),
+            (DnsmasqConfKeys.DhcpAuthoritative, "dhcp-authoritative"),
+            (DnsmasqConfKeys.EnableTftp, "enable-tftp"),
+            (DnsmasqConfKeys.Dnssec, "dnssec"),
+            (DnsmasqConfKeys.Conntrack, "conntrack"),
+            (DnsmasqConfKeys.Do0x20Encode, "do-0x20-encode"),
+            (DnsmasqConfKeys.No0x20Encode, "no-0x20-encode"),
+            // Multi - resolver / DNS
+            (DnsmasqConfKeys.Server, "server=1.1.1.1"),
+            (DnsmasqConfKeys.Local, "local=/lan/"),
+            (DnsmasqConfKeys.RevServer, "rev-server=192.168.1.0/24,10.0.0.1"),
+            (DnsmasqConfKeys.Address, "address=/example.com/127.0.0.1"),
+            (DnsmasqConfKeys.Domain, "domain=home.lan,192.168.1.0/24"),
+            (DnsmasqConfKeys.Cname, "cname=www.example.com,example.com"),
+            (DnsmasqConfKeys.MxHost, "mx-host=example.com,mail.example.com,10"),
+            (DnsmasqConfKeys.Srv, "srv-host=_http._tcp.example.com,host.example.com,80"),
+            (DnsmasqConfKeys.PtrRecord, "ptr-record=1.168.192.in-addr.arpa,router.lan"),
+            (DnsmasqConfKeys.TxtRecord, "txt-record=example.com,text"),
+            (DnsmasqConfKeys.NaptrRecord, "naptr-record=example.com,0,0,a,s,r"),
+            (DnsmasqConfKeys.DnsRr, "dns-rr=example.com,16,01:02"),
+            (DnsmasqConfKeys.HostRecord, "host-record=host.example.com,1.2.3.4"),
+            (DnsmasqConfKeys.DynamicHost, "dynamic-host=example.com"),
+            (DnsmasqConfKeys.CaaRecord, "caa-record=example.com,0,issue,letsencrypt.org"),
+            (DnsmasqConfKeys.RebindDomainOk, "rebind-domain-ok=example.com"),
+            (DnsmasqConfKeys.BogusNxdomain, "bogus-nxdomain=192.168.1.1"),
+            (DnsmasqConfKeys.IgnoreAddress, "ignore-address=192.168.1.1"),
+            (DnsmasqConfKeys.Alias, "alias=0.0.0.0,example.com"),
+            (DnsmasqConfKeys.FilterRr, "filter-rr=0.0.0.0,A"),
+            (DnsmasqConfKeys.CacheRr, "cache-rr=0.0.0.0,A"),
+            (DnsmasqConfKeys.Ipset, "ipset=/example.com/set1"),
+            (DnsmasqConfKeys.Nftset, "nftset=/example.com/table/set"),
+            (DnsmasqConfKeys.ConnmarkAllowlist, "connmark-allowlist=0xff,example.com"),
+            // Multi - auth / synth
+            (DnsmasqConfKeys.AuthServer, "auth-server=zone.example.com,eth0"),
+            (DnsmasqConfKeys.SynthDomain, "synth-domain=dynamic.example.com,192.168.2.1,192.168.2.100"),
+            (DnsmasqConfKeys.AuthZone, "auth-zone=example.com"),
+            (DnsmasqConfKeys.TrustAnchor, "trust-anchor=.,20326,8,2,E4F1769B8A0E3142E125223716F878F0A3B2C3D4"),
+            // Multi - DHCP
+            (DnsmasqConfKeys.DhcpRange, "dhcp-range=192.168.1.50,192.168.1.150,12h"),
+            (DnsmasqConfKeys.DhcpHost, "dhcp-host=aa:bb:cc:dd:ee:ff,192.168.1.10"),
+            (DnsmasqConfKeys.DhcpOption, "dhcp-option=3,192.168.1.1"),
+            (DnsmasqConfKeys.DhcpOptionForce, "dhcp-option-force=option:dns-server,192.168.1.1"),
+            (DnsmasqConfKeys.DhcpMatch, "dhcp-match=set:efi,option:client-arch,6"),
+            (DnsmasqConfKeys.DhcpMac, "dhcp-mac=set:vendor,aa:bb:cc:dd:ee:ff"),
+            (DnsmasqConfKeys.DhcpNameMatch, "dhcp-name-match=set:name,hostname*"),
+            (DnsmasqConfKeys.DhcpIgnoreNames, "dhcp-ignore-names=tag:guest"),
+            (DnsmasqConfKeys.DhcpBoot, "dhcp-boot=pxelinux.0"),
+            (DnsmasqConfKeys.Leasequery, "leasequery=10.0.0.0/24"),
+            (DnsmasqConfKeys.RaParam, "ra-param=eth0,high"),
+            (DnsmasqConfKeys.Slaac, "slaac=eth0"),
+            (DnsmasqConfKeys.PxeService, "pxe-service=x86PC,Install Linux"),
+            (DnsmasqConfKeys.DhcpRelay, "dhcp-relay=192.168.1.1,eth0"),
+            (DnsmasqConfKeys.DhcpCircuitid, "dhcp-circuitid=eth0,010203"),
+            (DnsmasqConfKeys.DhcpRemoteid, "dhcp-remoteid=010203"),
+            (DnsmasqConfKeys.DhcpSubscrid, "dhcp-subscrid=010203"),
+            (DnsmasqConfKeys.TagIf, "tag-if=set:tag,eth0"),
+            (DnsmasqConfKeys.SharedNetwork, "shared-network=name,192.168.1.0/24"),
+            (DnsmasqConfKeys.DhcpOptionPxe, "dhcp-option-pxe=set:known,1"),
+            (DnsmasqConfKeys.DhcpVendorclass, "dhcp-vendorclass=set:pxe,PXEClient"),
+            (DnsmasqConfKeys.DhcpUserclass, "dhcp-userclass=set:efi,EFI"),
+            (DnsmasqConfKeys.AddnHosts, "addn-hosts=/etc/hosts.extra"),
+            (DnsmasqConfKeys.Interface, "interface=eth0"),
+            (DnsmasqConfKeys.ListenAddress, "listen-address=127.0.0.1"),
+            (DnsmasqConfKeys.ResolvFile, "resolv-file=/etc/resolv.dnsmasq"),
+        };
+    }
+}
@@ -0,0 +1,51 @@
+using System.Text.Json;
+
+namespace DnsmasqWebUI.Tests.Helpers;
+
+/// <summary>Expected parser/effective state for a real-world corpus case. Counts and booleans only.</summary>
+public sealed class CorpusExpected
+{
+    public int? ServerCountMin { get; set; }
+    public int? LocalCountMin { get; set; }
+    public int? AddressCountMin { get; set; }
+    public int? CacheSize { get; set; }
+    public int? AddnHostsCountMin { get; set; }
+    public int? DomainCountMin { get; set; }
+    public bool? NoHosts { get; set; }
+    public bool? NoResolv { get; set; }
+    public bool? BogusPriv { get; set; }
+    public string? Do0x20State { get; set; }
+    public int? Port { get; set; }
+    public bool? ExpandHosts { get; set; }
+    public int? CnameCountMin { get; set; }
+    public int? TxtRecordCountMin { get; set; }
+    public int? SrvCountMin { get; set; }
+    public int? PtrRecordCountMin { get; set; }
+    public int? MxHostCountMin { get; set; }
+    public int? AuthZoneCountMin { get; set; }
+    public int? SynthDomainCountMin { get; set; }
+    public int? AuthServerCountMin { get; set; }
+}
+
+/// <summary>Single real-world corpus case from dnsmasq-real-cases.json.</summary>
+public sealed class CorpusCase
+{
+    public string File { get; set; } = "";
+    public CorpusExpected Expected { get; set; } = new();
+    public List<string> SemanticInvalidOptions { get; set; } = [];
+}
+
+/// <summary>Loads real-world corpus index and resolves paths via TestDataHelper.</summary>
+public static class RealWorldCasesHelper
+{
+    private static readonly JsonSerializerOptions JsonOptions = new() { PropertyNameCaseInsensitive = true };
+
+    public static IReadOnlyList<CorpusCase> LoadCases()
+    {
+        var path = TestDataHelper.GetPath("real-world/dnsmasq-real-cases.json");
+        var json = File.ReadAllText(path);
+        return JsonSerializer.Deserialize<List<CorpusCase>>(json, JsonOptions) ?? [];
+    }
+
+    public static string Resolve(CorpusCase c) => TestDataHelper.GetPath(c.File);
+}
@@ -0,0 +1,50 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
+
+namespace DnsmasqWebUI.Tests.Helpers;
+
+/// <summary>Ensures corpus index and files stay in sync; fails fast when testdata drifts.</summary>
+public class RealWorldCorpusIntegrityTests
+{
+    [Fact]
+    public void EveryCorpusCase_PointsToExistingFile()
+    {
+        var cases = RealWorldCasesHelper.LoadCases();
+        Assert.NotEmpty(cases);
+        foreach (var c in cases)
+        {
+            var path = RealWorldCasesHelper.Resolve(c);
+            Assert.True(File.Exists(path), $"Corpus file missing: {c.File}");
+        }
+    }
+
+    [Fact]
+    public void EveryBadCase_DeclaresSemanticInvalidOptions()
+    {
+        var cases = RealWorldCasesHelper.LoadCases();
+        var badFiles = new[] { "bad/", "real-world/bad/" };
+        foreach (var c in cases)
+        {
+            var isBad = badFiles.Any(p => c.File.Contains(p, StringComparison.Ordinal));
+            if (isBad)
+                Assert.NotEmpty(c.SemanticInvalidOptions);
+        }
+    }
+
+    [Fact]
+    public void SemanticInvalidOptions_ArePresentInParsedValues()
+    {
+        foreach (var c in RealWorldCasesHelper.LoadCases())
+        {
+            if (c.SemanticInvalidOptions.Count == 0)
+                continue;
+            var mainPath = RealWorldCasesHelper.Resolve(c);
+            var paths = DnsmasqConfIncludeParser.GetIncludedPaths(mainPath);
+            foreach (var option in c.SemanticInvalidOptions)
+            {
+                var values = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, option);
+                Assert.NotEmpty(values);
+            }
+        }
+    }
+}
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Helpers;

 /// <summary>
 /// Resolves paths to testdata files. Files are copied to output (testdata/) when the project builds.
@@ -0,0 +1,43 @@
+using DnsmasqWebUI.Models.Config;
+
+namespace DnsmasqWebUI.Tests.Models.Config;
+
+public sealed class DnsmasqManagedPathSetTests
+{
+    [Fact]
+    public void FromOptions_WithoutManagedFilesDirectory_UsesMainConfigDirectory()
+    {
+        var options = new DnsmasqOptions
+        {
+            MainConfigPath = "/etc/dnsmasq.conf",
+            ManagedFileName = "zz-webui.conf",
+            ManagedHostsFileName = "zz-webui.hosts"
+        };
+
+        var paths = DnsmasqManagedPathSet.FromOptions(options);
+
+        Assert.Equal("/etc/dnsmasq.conf", paths.MainConfigPath);
+        Assert.Equal("/etc", paths.ManagedFilesDirectory);
+        Assert.Equal("/etc/zz-webui.conf", paths.ManagedFilePath);
+        Assert.Equal("/etc/zz-webui.hosts", paths.ManagedHostsFilePath);
+    }
+
+    [Fact]
+    public void FromOptions_WithManagedFilesDirectory_UsesOverrideDirectory()
+    {
+        var options = new DnsmasqOptions
+        {
+            MainConfigPath = "/etc/dnsmasq.conf",
+            ManagedFilesDirectory = "/srv/repo/dnsmasq",
+            ManagedFileName = "zz-webui.conf",
+            ManagedHostsFileName = "zz-webui.hosts"
+        };
+
+        var paths = DnsmasqManagedPathSet.FromOptions(options);
+
+        Assert.Equal("/etc/dnsmasq.conf", paths.MainConfigPath);
+        Assert.Equal("/srv/repo/dnsmasq", paths.ManagedFilesDirectory);
+        Assert.Equal("/srv/repo/dnsmasq/zz-webui.conf", paths.ManagedFilePath);
+        Assert.Equal("/srv/repo/dnsmasq/zz-webui.hosts", paths.ManagedHostsFilePath);
+    }
+}
@@ -0,0 +1,64 @@
+using DnsmasqWebUI.Models.Config;
+
+namespace DnsmasqWebUI.Tests.Models.Config;
+
+public sealed class DnsmasqOptionsValidatorTests
+{
+    [Fact]
+    public void Validate_WithRelativeManagedFilesDirectory_Fails()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-validator-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        File.WriteAllText(mainPath, "port=53\n");
+
+        try
+        {
+            var validator = new DnsmasqOptionsValidator();
+            var options = new DnsmasqOptions
+            {
+                MainConfigPath = mainPath,
+                ManagedFilesDirectory = "repo/dnsmasq"
+            };
+
+            var result = validator.Validate(null, options);
+
+            Assert.False(result.Succeeded);
+            Assert.NotNull(result.Failures);
+            Assert.Contains(result.Failures!, f => f.Contains("ManagedFilesDirectory", StringComparison.Ordinal));
+        }
+        finally
+        {
+            Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public void Validate_WithManagedFilesDirectoryAndFileNames_Succeeds()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-validator-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        File.WriteAllText(mainPath, "port=53\n");
+
+        try
+        {
+            var validator = new DnsmasqOptionsValidator();
+            var options = new DnsmasqOptions
+            {
+                MainConfigPath = mainPath,
+                ManagedFilesDirectory = Path.Combine(dir, "repo"),
+                ManagedFileName = "zz-webui.conf",
+                ManagedHostsFileName = "zz-webui.hosts"
+            };
+
+            var result = validator.Validate(null, options);
+
+            Assert.True(result.Succeeded);
+        }
+        finally
+        {
+            Directory.Delete(dir, recursive: true);
+        }
+    }
+}
@@ -0,0 +1,38 @@
+using DnsmasqWebUI.Models.Dhcp;
+
+namespace DnsmasqWebUI.Tests.Models.Dhcp;
+
+public sealed class DhcpManagedHostSelectionTests
+{
+    [Fact]
+    public void Single_removal_shifts_higher_indices()
+    {
+        var s = new HashSet<int> { 0, 2, 4 };
+        DhcpManagedHostSelection.RemapAfterRemovals(s, new[] { 1 });
+        Assert.Equal(new[] { 0, 1, 3 }, s.Order().ToArray());
+    }
+
+    [Fact]
+    public void Bulk_removal_removes_and_shifts()
+    {
+        var s = new HashSet<int> { 0, 2, 4 };
+        DhcpManagedHostSelection.RemapAfterRemovals(s, new[] { 1, 3, 5 });
+        Assert.Equal(new[] { 0, 1, 2 }, s.Order().ToArray());
+    }
+
+    [Fact]
+    public void Removing_edited_index_drops_it_from_selection()
+    {
+        var s = new HashSet<int> { 1, 3 };
+        DhcpManagedHostSelection.RemapAfterRemovals(s, new[] { 1 });
+        Assert.Equal(new[] { 2 }, s.Order().ToArray());
+    }
+
+    [Fact]
+    public void Empty_removed_is_noop()
+    {
+        var s = new HashSet<int> { 1, 2 };
+        DhcpManagedHostSelection.RemapAfterRemovals(s, Array.Empty<int>());
+        Assert.Equal(new[] { 1, 2 }, s.Order().ToArray());
+    }
+}
@@ -0,0 +1,40 @@
+using System.Linq;
+using DnsmasqWebUI.Models.Dhcp;
+
+namespace DnsmasqWebUI.Tests.Models.Dhcp;
+
+public class DhcpOptionDraftTests
+{
+    [Fact]
+    public void FromRaw_WithPrefixes_RoundTrips()
+    {
+        const string raw = "tag:guest,option:router,192.168.1.1";
+        var d = DhcpOptionDraft.FromRaw(raw);
+        Assert.True(d.IsStructured);
+        Assert.Equal("option:router", d.Selector);
+        Assert.Equal(raw, d.ToRaw());
+    }
+
+    [Fact]
+    public void Preset_Router_HasExpectedSelector()
+    {
+        var p = DhcpOptionPresets.All.First(x => x.Key == "router");
+        Assert.Equal("option:router", p.Selector);
+    }
+
+    [Fact]
+    public void ToRaw_WithTagPrefix_PreservesOrder()
+    {
+        var d = new DhcpOptionDraft
+        {
+            PrefixTokens = new[] { "tag:guest" },
+            Selector = "option:dns-server",
+            ValueTokens = new List<string> { "8.8.8.8", "8.8.4.4" }
+        };
+        const string expected = "tag:guest,option:dns-server,8.8.8.8,8.8.4.4";
+        Assert.Equal(expected, d.ToRaw());
+        var roundTrip = DhcpOptionDraft.FromRaw(expected);
+        Assert.True(roundTrip.IsStructured);
+        Assert.Equal(expected, roundTrip.ToRaw());
+    }
+}
@@ -0,0 +1,33 @@
+using DnsmasqWebUI.Models.Dhcp;
+
+namespace DnsmasqWebUI.Tests.Models.Dhcp;
+
+public class DhcpRangeDraftTests
+{
+    [Fact]
+    public void FromRaw_Structured_RoundTrips()
+    {
+        const string raw = "tag:guest,192.168.1.50,192.168.1.150,12h";
+        var d = DhcpRangeDraft.FromRaw(raw);
+        Assert.True(d.IsStructured);
+        Assert.Equal(raw, d.ToRaw());
+    }
+
+    [Fact]
+    public void FromRaw_Unparseable_UsesFallback()
+    {
+        const string raw = "not-a-valid-range";
+        var d = DhcpRangeDraft.FromRaw(raw);
+        Assert.False(d.IsStructured);
+        Assert.Equal(raw, d.ToRaw());
+    }
+
+    [Fact]
+    public void FromRaw_ConstructorIpv4Range_IsStructured()
+    {
+        const string raw = "192.168.1.50,192.168.1.150,255.255.255.0,12h";
+        var d = DhcpRangeDraft.FromRaw(raw);
+        Assert.True(d.IsStructured);
+        Assert.Equal(raw, d.ToRaw());
+    }
+}
@@ -0,0 +1,47 @@
+using DnsmasqWebUI.Models.DnsRecords;
+
+namespace DnsmasqWebUI.Tests.Models.DnsRecords;
+
+public sealed class DnsRecordsFileFilterBuilderTests
+{
+    private static DnsRecordRow Row(
+        string id,
+        string sourcePath,
+        bool isEditable,
+        bool isDraftOnly = false) =>
+        new(
+            Id: id,
+            OccurrenceId: id,
+            OptionName: "cname",
+            Family: DnsRecordFamily.Cname,
+            IndexInOption: 0,
+            RawValue: "alias,target",
+            Source: null,
+            SourcePath: sourcePath,
+            SourceLabel: Path.GetFileName(sourcePath),
+            IsDraftOnly: isDraftOnly,
+            IsEditable: isEditable,
+            Payload: new CnamePayload(["alias"], "target", null),
+            Issues: [],
+            Summary: "alias -> target");
+
+    [Fact]
+    public void Build_ClassifiesOnlyManagedConfigPathAsManaged()
+    {
+        var managed = "/etc/dnsmasq-webui/managed.conf";
+        var rows = new[]
+        {
+            Row("managed", managed, isEditable: true),
+            Row("draft-other", "/tmp/custom-writable.conf", isEditable: true, isDraftOnly: true)
+        };
+
+        var builder = new DnsRecordsFileFilterBuilder(rows, managed);
+        var model = builder.Build();
+
+        Assert.Equal(2, model.Sections.Count);
+        Assert.Equal("managed", model.Sections[0].Kind);
+        Assert.Equal(managed, model.Sections[0].Options[0].Value);
+        Assert.Equal("other", model.Sections[1].Kind);
+        Assert.Equal("/tmp/custom-writable.conf", model.Sections[1].Options[0].Value);
+    }
+}
@@ -0,0 +1,149 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Models.EffectiveConfig;
+
+public class EffectiveConfigMultiDisplayContextTests
+{
+    private static EffectiveMultiValueConfigFieldDescriptor DomainDescriptor(
+        IReadOnlyList<ValueWithSource> baseline) =>
+        new(
+            EffectiveConfigSections.SectionHosts,
+            DnsmasqConfKeys.Domain,
+            Status: null,
+            ResolveItems: _ => baseline,
+            Behavior: new DefaultMultiValueEditBehavior(),
+            Validator: null);
+
+    private static ConfigValueSource ReadonlySource() =>
+        new("/etc/dnsmasq.conf", "dnsmasq.conf", IsManaged: false, LineNumber: 1);
+
+    [Fact]
+    public void From_BaselineOnly_UsesBaselineItems()
+    {
+        var baseline = new List<ValueWithSource>
+        {
+            new("a.example", null),
+            new("b.example", null)
+        };
+        var d = DomainDescriptor(baseline);
+
+        var ctx = EffectiveConfigMultiDisplayContext.From(
+            d, baseline, pendingList: null, hasPendingChange: false, draftList: null,
+            isEditMode: false, isActive: false, fieldKey: "k");
+
+        Assert.Same(baseline, ctx.BaselineItems);
+        Assert.Equal(["a.example", "b.example"], ctx.EffectiveValues);
+        Assert.False(ctx.HasPendingChange);
+        Assert.False(ctx.HasDraftChange);
+        Assert.False(ctx.HasPendingOrDraft);
+    }
+
+    [Fact]
+    public void From_PendingOverridesBaseline_PreservesSourcesWhereValuesMatch()
+    {
+        var ro = ReadonlySource();
+        var baseline = new List<ValueWithSource>
+        {
+            new("a.example", ro),
+            new("b.example", null)
+        };
+        var d = DomainDescriptor(baseline);
+        var pending = new List<string> { "a.example", "c.example" };
+
+        var ctx = EffectiveConfigMultiDisplayContext.From(
+            d, baseline, pending, hasPendingChange: true, draftList: null,
+            isEditMode: false, isActive: false, fieldKey: "k");
+
+        Assert.Equal(["a.example", "c.example"], ctx.EffectiveValues);
+        Assert.True(ctx.HasPendingChange);
+        Assert.Equal(ro, ctx.EffectiveItems[0].Source);
+        Assert.Null(ctx.EffectiveItems[1].Source);
+    }
+
+    [Fact]
+    public void From_DraftOverridesPending()
+    {
+        var baseline = new List<ValueWithSource> { new("a.example", null) };
+        var d = DomainDescriptor(baseline);
+        var pending = new List<string> { "b.example" };
+        var draft = new List<string> { "c.example" };
+
+        var ctx = EffectiveContext(d, baseline, pending, draft);
+
+        Assert.Equal(["c.example"], ctx.EffectiveValues);
+        Assert.True(ctx.HasDraftChange);
+        Assert.True(ctx.HasPendingOrDraft);
+    }
+
+    [Fact]
+    public void From_AllReadonlyNotEditMode_SetsRowSourceFromFirstItem()
+    {
+        var ro = ReadonlySource();
+        var baseline = new List<ValueWithSource>
+        {
+            new("a.example", ro)
+        };
+        var d = DomainDescriptor(baseline);
+
+        var ctx = EffectiveConfigMultiDisplayContext.From(
+            d, baseline, null, false, null,
+            isEditMode: false, isActive: false, fieldKey: "k");
+
+        Assert.Equal(ro, ctx.RowSource);
+    }
+
+    [Fact]
+    public void From_EditModeOrMixedWritable_ClearsRowSource()
+    {
+        var ro = ReadonlySource();
+        var baseline = new List<ValueWithSource>
+        {
+            new("a.example", ro)
+        };
+        var d = DomainDescriptor(baseline);
+
+        var ctxEdit = EffectiveConfigMultiDisplayContext.From(
+            d, baseline, null, false, null,
+            isEditMode: true, isActive: false, fieldKey: "k");
+
+        Assert.Null(ctxEdit.RowSource);
+
+        var mixed = new List<ValueWithSource>
+        {
+            new("a.example", ro),
+            new("b.example", null)
+        };
+        var d2 = DomainDescriptor(mixed);
+        var ctxMixed = EffectiveConfigMultiDisplayContext.From(
+            d2, mixed, null, false, null,
+            isEditMode: false, isActive: false, fieldKey: "k");
+
+        Assert.Null(ctxMixed.RowSource);
+    }
+
+    [Fact]
+    public void From_IsActiveEditor_RespectsCapabilityDisabled()
+    {
+        var baseline = new List<ValueWithSource> { new("a.example", null) };
+        var d = DomainDescriptor(baseline) with { IsCapabilityDisabled = true };
+
+        var ctx = EffectiveConfigMultiDisplayContext.From(
+            d, baseline, null, false, null,
+            isEditMode: true, isActive: true, fieldKey: "k");
+
+        Assert.False(ctx.IsActiveEditor);
+        Assert.False(ctx.ShowEditableBadge);
+    }
+
+    private static EffectiveConfigMultiDisplayContext EffectiveContext(
+        EffectiveMultiValueConfigFieldDescriptor d,
+        IReadOnlyList<ValueWithSource> baseline,
+        IReadOnlyList<string>? pending,
+        IReadOnlyList<string>? draft) =>
+        EffectiveConfigMultiDisplayContext.From(
+            d, baseline, pending, pending != null, draft,
+            isEditMode: false, isActive: false, fieldKey: "k");
+}
@@ -0,0 +1,90 @@
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Models.Hosts;
+
+namespace DnsmasqWebUI.Tests.Models.EffectiveConfig;
+
+public class ManagedHostsPendingChangeDiffTests
+{
+    [Fact]
+    public void Build_same_entries_returns_empty()
+    {
+        var e = new HostEntry { Id = "a", LineNumber = 1, Address = "10.0.0.1", Names = new List<string> { "h" } };
+        var oldL = new List<HostEntry> { e };
+        var newL = new List<HostEntry>
+        {
+            new()
+            {
+                Id = e.Id,
+                LineNumber = e.LineNumber,
+                Address = e.Address,
+                Names = new List<string>(e.Names)
+            }
+        };
+        Assert.Empty(ManagedHostsPendingChangeDiff.Build(oldL, newL));
+    }
+
+    [Fact]
+    public void Build_added_entry()
+    {
+        var oldL = new List<HostEntry>();
+        var newL = new List<HostEntry>
+        {
+            new() { Id = "new:x", LineNumber = 1, Address = "192.168.0.1", Names = new List<string> { "router" } }
+        };
+        var d = ManagedHostsPendingChangeDiff.Build(oldL, newL);
+        var a = Assert.Single(d);
+        Assert.Equal(ManagedHostsLineDiffKind.Added, a.Kind);
+        Assert.Contains("192.168.0.1", a.AfterLine, StringComparison.Ordinal);
+        Assert.Contains("router", a.AfterLine, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void Build_removed_entry()
+    {
+        var oldL = new List<HostEntry>
+        {
+            new() { Id = "1", LineNumber = 1, Address = "10.0.0.2", Names = new List<string> { "x" } }
+        };
+        var newL = new List<HostEntry>();
+        var d = ManagedHostsPendingChangeDiff.Build(oldL, newL);
+        var r = Assert.Single(d);
+        Assert.Equal(ManagedHostsLineDiffKind.Removed, r.Kind);
+        Assert.Contains("10.0.0.2", r.BeforeLine, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void Build_modified_address()
+    {
+        var oldL = new List<HostEntry>
+        {
+            new() { Id = "k", LineNumber = 1, Address = "10.0.0.1", Names = new List<string> { "h" } }
+        };
+        var newL = new List<HostEntry>
+        {
+            new() { Id = "k", LineNumber = 1, Address = "10.0.0.9", Names = new List<string> { "h" } }
+        };
+        var d = ManagedHostsPendingChangeDiff.Build(oldL, newL);
+        var m = Assert.Single(d);
+        Assert.Equal(ManagedHostsLineDiffKind.Modified, m.Kind);
+        Assert.Contains("10.0.0.1", m.BeforeLine, StringComparison.Ordinal);
+        Assert.Contains("10.0.0.9", m.AfterLine, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void Build_order_only()
+    {
+        var oldL = new List<HostEntry>
+        {
+            new() { Id = "a", LineNumber = 1, Address = "10.0.0.1", Names = new List<string> { "a" } },
+            new() { Id = "b", LineNumber = 2, Address = "10.0.0.2", Names = new List<string> { "b" } }
+        };
+        var newL = new List<HostEntry>
+        {
+            new() { Id = "b", LineNumber = 1, Address = "10.0.0.2", Names = new List<string> { "b" } },
+            new() { Id = "a", LineNumber = 2, Address = "10.0.0.1", Names = new List<string> { "a" } }
+        };
+        var d = ManagedHostsPendingChangeDiff.Build(oldL, newL);
+        var o = Assert.Single(d);
+        Assert.Equal(ManagedHostsLineDiffKind.OrderOnly, o.Kind);
+    }
+}
@@ -0,0 +1,53 @@
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Models.Hosts;
+
+namespace DnsmasqWebUI.Tests.Models.EffectiveConfig;
+
+public class PendingManagedHostsChangeTests
+{
+    [Fact]
+    public void HasChanges_WhenEntriesDiffer_ReturnsTrue()
+    {
+        var oldEntries = new List<HostEntry> { new() { Id = "1", Address = "192.168.1.1", Names = new List<string> { "host1" } } };
+        var newEntries = new List<HostEntry> { new() { Id = "1", Address = "192.168.1.2", Names = new List<string> { "host1" } } };
+        var pending = new PendingManagedHostsChange(oldEntries, newEntries, "/etc/hosts");
+        Assert.True(pending.HasChanges);
+    }
+
+    [Fact]
+    public void HasChanges_WhenEntriesSame_ReturnsFalse()
+    {
+        var entries = new List<HostEntry> { new() { Id = "1", Address = "192.168.1.1", Names = new List<string> { "host1" } } };
+        var clone = entries.Select(e => new HostEntry { Id = e.Id, Address = e.Address, Names = new List<string>(e.Names) }).ToList();
+        var pending = new PendingManagedHostsChange(entries, clone, "/etc/hosts");
+        Assert.False(pending.HasChanges);
+    }
+
+    [Fact]
+    public void HasChanges_WhenCountDiffers_ReturnsTrue()
+    {
+        var oldEntries = new List<HostEntry> { new() { Id = "1", Address = "192.168.1.1", Names = new List<string>() } };
+        var newEntries = new List<HostEntry>
+        {
+            new() { Id = "1", Address = "192.168.1.1", Names = new List<string>() },
+            new() { Id = "2", Address = "192.168.1.2", Names = new List<string>() }
+        };
+        var pending = new PendingManagedHostsChange(oldEntries, newEntries, "/etc/hosts");
+        Assert.True(pending.HasChanges);
+    }
+
+    [Fact]
+    public void HasChanges_WhenInlineCommentDiffers_ReturnsTrue()
+    {
+        var oldEntries = new List<HostEntry>
+        {
+            new() { Id = "1", Address = "10.0.0.1", Names = new List<string> { "a" }, InlineComment = "old" }
+        };
+        var newEntries = new List<HostEntry>
+        {
+            new() { Id = "1", Address = "10.0.0.1", Names = new List<string> { "a" }, InlineComment = "new" }
+        };
+        var pending = new PendingManagedHostsChange(oldEntries, newEntries, "/etc/hosts");
+        Assert.True(pending.HasChanges);
+    }
+}
@@ -0,0 +1,93 @@
+using DnsmasqWebUI.Models.Hosts;
+
+namespace DnsmasqWebUI.Tests.Models.Hosts;
+
+public class HostsEffectiveNamesDomainRulesTests
+{
+    [Fact]
+    public void Expand_UsesMatchingScopedDomainForIpv4()
+    {
+        var names = new[] { "router" };
+        var domains = new[] { "home.lan", "corp.lan,10.20.0.0/16" };
+
+        var result = HostsEffectiveNames.Expand(names, expandHosts: true, domains, "10.20.1.9");
+
+        Assert.Equal(new[] { "router", "router.corp.lan" }, result);
+    }
+
+    [Fact]
+    public void Expand_FallsBackToDefaultDomainWhenNoScopedMatch()
+    {
+        var names = new[] { "cache" };
+        var domains = new[] { "home.lan", "corp.lan,10.20.0.0/16" };
+
+        var result = HostsEffectiveNames.Expand(names, expandHosts: true, domains, "10.99.1.9");
+
+        Assert.Equal(new[] { "cache", "cache.home.lan" }, result);
+    }
+
+    [Fact]
+    public void Expand_UsesLastParsedScopedRuleWhenRangesOverlap()
+    {
+        var names = new[] { "app" };
+        var domains = new[]
+        {
+            "home.lan",
+            "corp-wide.lan,10.0.0.0/8",
+            "corp-subnet.lan,10.20.0.0/16"
+        };
+
+        var result = HostsEffectiveNames.Expand(names, expandHosts: true, domains, "10.20.1.5");
+
+        Assert.Equal(new[] { "app", "app.corp-subnet.lan" }, result);
+    }
+
+    [Fact]
+    public void Expand_UsesDefaultDomainForIpv6Address()
+    {
+        var names = new[] { "node" };
+        var domains = new[] { "home.lan", "corp.lan,10.20.0.0/16" };
+
+        var result = HostsEffectiveNames.Expand(names, expandHosts: true, domains, "2001:db8::1");
+
+        Assert.Equal(new[] { "node", "node.home.lan" }, result);
+    }
+
+    [Fact]
+    public void ExplainSuffixSource_ScopedRuleMentionsRawLine()
+    {
+        var domains = new[] { "home.lan", "corp.lan,10.20.0.0/16" };
+        var msg = HostsEffectiveNames.ExplainSuffixSource(
+            expandHosts: true,
+            domains,
+            "10.20.1.9",
+            new[] { "router" });
+
+        Assert.Equal("Suffix from scoped rule: corp.lan,10.20.0.0/16", msg);
+    }
+
+    [Fact]
+    public void ExplainSuffixSource_DefaultDomainWhenNoScopedMatch()
+    {
+        var domains = new[] { "home.lan", "corp.lan,10.20.0.0/16" };
+        var msg = HostsEffectiveNames.ExplainSuffixSource(
+            expandHosts: true,
+            domains,
+            "10.99.1.9",
+            new[] { "cache" });
+
+        Assert.Equal("Suffix from default rule: home.lan", msg);
+    }
+
+    [Fact]
+    public void ExplainSuffixSource_ExpandHostsOff()
+    {
+        var msg = HostsEffectiveNames.ExplainSuffixSource(
+            expandHosts: false,
+            new[] { "home.lan" },
+            "10.0.0.1",
+            new[] { "a" });
+
+        Assert.Contains("expand-hosts is off", msg);
+    }
+}
@@ -0,0 +1,34 @@
+using DnsmasqWebUI.Models.Hosts;
+
+namespace DnsmasqWebUI.Tests.Models.Hosts;
+
+public class HostsEntryEditValidatorTests
+{
+    [Fact]
+    public void Empty_is_invalid()
+    {
+        var e = HostsEntryEditValidator.GetErrors("", Array.Empty<string>());
+        Assert.NotEmpty(e);
+    }
+
+    [Fact]
+    public void Valid_ipv4_and_name_ok()
+    {
+        Assert.True(HostsEntryEditValidator.IsValid("192.168.1.1", new[] { "router" }));
+    }
+
+    [Fact]
+    public void Missing_names_invalid()
+    {
+        var e = HostsEntryEditValidator.GetErrors("10.0.0.1", Array.Empty<string>());
+        Assert.Contains(e, x => x.Contains("hostname", StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public void Field_errors_split_address_and_names()
+    {
+        Assert.NotEmpty(HostsEntryEditValidator.GetAddressFieldErrors(""));
+        Assert.Empty(HostsEntryEditValidator.GetHostnameFieldErrors(new[] { "h" }));
+        Assert.NotEmpty(HostsEntryEditValidator.GetHostnameFieldErrors(Array.Empty<string>()));
+    }
+}
@@ -0,0 +1,111 @@
+using DnsmasqWebUI.Models.Hosts;
+using DnsmasqWebUI.Models.Ui;
+
+namespace DnsmasqWebUI.Tests.Models.Hosts;
+
+public sealed class HostsFileFilterBuilderTests
+{
+    private static HostsPageRow Row(HostsRowSourceKind kind, string path, bool isComment = false) =>
+        new(
+            Id: "id",
+            SourceKind: kind,
+            SourcePath: path,
+            IsEditable: false,
+            IsActive: true,
+            InactiveReason: null,
+            Address: "127.0.0.1",
+            Names: [],
+            EffectiveNames: [],
+            IsComment: isComment,
+            LineNumber: 1);
+
+    [Fact]
+    public void Build_InjectsManagedPath_WhenNotInRows()
+    {
+        var managed = "/data/managed.hosts";
+        var builder = new HostsFileFilterBuilder([], managed);
+        var model = builder.Build();
+
+        Assert.NotNull(model.AllOption);
+        var managedSection = model.Sections.Single();
+        Assert.Equal("Managed hosts", managedSection.Label);
+        Assert.Equal("managed", managedSection.Kind);
+        Assert.Single(managedSection.Options);
+        Assert.Equal(managed, managedSection.Options[0].Value);
+        Assert.Equal(0, managedSection.Options[0].Count);
+    }
+
+    [Fact]
+    public void Build_OrdersGroupsManagedSystemAddn_AndCountsNonComments()
+    {
+        var rows = new[]
+        {
+            Row(HostsRowSourceKind.SystemHosts, "/etc/hosts"),
+            Row(HostsRowSourceKind.Managed, "/m/a.hosts"),
+            Row(HostsRowSourceKind.Managed, "/m/a.hosts", isComment: true),
+            Row(HostsRowSourceKind.AddnHosts, "/extra/b.hosts"),
+        };
+
+        var builder = new HostsFileFilterBuilder(rows, managedHostsPath: null);
+        var model = builder.Build();
+
+        Assert.Equal(3, model.Sections.Count);
+        Assert.Equal("managed", model.Sections[0].Kind);
+        Assert.Equal("system", model.Sections[1].Kind);
+        Assert.Equal("addn", model.Sections[2].Kind);
+
+        Assert.Single(model.Sections[0].Options);
+        Assert.Equal(1, model.Sections[0].Options[0].Count);
+    }
+
+    [Fact]
+    public void GetSummaryText_AllFiles_ShowsRecordCount()
+    {
+        var rows = new[] { Row(HostsRowSourceKind.Managed, "/m/x.hosts") };
+        var builder = new HostsFileFilterBuilder(rows, null);
+        Assert.Equal("All files · 1 records", builder.GetSummaryText(""));
+        Assert.Equal("All files · 1 records", builder.GetSummaryText("   "));
+    }
+
+    [Fact]
+    public void GetSummaryText_SelectedFile_UsesShortLabelAndPrefix()
+    {
+        var rows = new[] { Row(HostsRowSourceKind.Managed, "/m/my.hosts") };
+        var builder = new HostsFileFilterBuilder(rows, null);
+        Assert.Equal("Managed · my.hosts (1)", builder.GetSummaryText("/m/my.hosts"));
+    }
+
+    [Fact]
+    public void GetSummaryText_UnknownPath_FallsBackToShortLabel()
+    {
+        var builder = new HostsFileFilterBuilder([], null);
+        Assert.Equal("orphan.txt", builder.GetSummaryText("/tmp/orphan.txt"));
+    }
+
+    [Fact]
+    public void GetTriggerSummary_SingleSource_SplitsPrefixPrimaryAndCount()
+    {
+        var rows = new[] { Row(HostsRowSourceKind.AddnHosts, "/etc/extra.d/hosts") };
+        var builder = new HostsFileFilterBuilder(rows, null);
+        var s = builder.GetTriggerSummary("/etc/extra.d/hosts");
+
+        Assert.Equal(GroupedSelectTriggerSummaryKind.SingleSource, s.Kind);
+        Assert.Equal("Additional", s.CategoryPrefix);
+        Assert.Equal("hosts", s.PrimaryLabel);
+        Assert.Equal("1", s.SecondaryMeta);
+        Assert.Equal("Additional · hosts (1)", s.AccessibleFullText);
+    }
+
+    [Fact]
+    public void GetTriggerSummary_AllSources_WithRecords_HasSecondaryMeta()
+    {
+        var rows = new[] { Row(HostsRowSourceKind.Managed, "/m/x.hosts") };
+        var builder = new HostsFileFilterBuilder(rows, null);
+        var s = builder.GetTriggerSummary("");
+
+        Assert.Equal(GroupedSelectTriggerSummaryKind.AllSources, s.Kind);
+        Assert.Null(s.CategoryPrefix);
+        Assert.Equal("All files", s.PrimaryLabel);
+        Assert.Equal("1 records", s.SecondaryMeta);
+    }
+}
@@ -0,0 +1,58 @@
+using DnsmasqWebUI.Infrastructure.Serialization;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+
+namespace DnsmasqWebUI.Tests.Serialization;
+
+public class DnsmasqConfTextTests
+{
+    [Fact]
+    public void DirectivePrefix_ReturnsOptionEquals()
+    {
+        Assert.Equal("dhcp-host=", DnsmasqConfText.DirectivePrefix(DnsmasqConfKeys.DhcpHost));
+        Assert.Equal("server=", DnsmasqConfText.DirectivePrefix(DnsmasqConfKeys.Server));
+    }
+
+    [Fact]
+    public void DirectiveLine_WhenValueNullOrEmpty_ReturnsOptionOnly()
+    {
+        Assert.Equal("dhcp-host", DnsmasqConfText.DirectiveLine("dhcp-host", null));
+        Assert.Equal("dhcp-host", DnsmasqConfText.DirectiveLine("dhcp-host", ""));
+    }
+
+    [Fact]
+    public void DirectiveLine_WhenValueProvided_ReturnsOptionEqualsValue()
+    {
+        Assert.Equal("dhcp-host=11:22:33:44:55:66,192.168.1.1", DnsmasqConfText.DirectiveLine("dhcp-host", "11:22:33:44:55:66,192.168.1.1"));
+    }
+
+    [Fact]
+    public void StripDirectivePrefix_WhenLineStartsWithPrefix_ReturnsRest()
+    {
+        var line = "dhcp-host=mac,ip";
+        Assert.Equal("mac,ip", DnsmasqConfText.StripDirectivePrefix(DnsmasqConfKeys.DhcpHost, line));
+    }
+
+    [Fact]
+    public void StripDirectivePrefix_WhenLineDoesNotStartWithPrefix_ReturnsFullLine()
+    {
+        var line = "other=value";
+        Assert.Equal("other=value", DnsmasqConfText.StripDirectivePrefix(DnsmasqConfKeys.DhcpHost, line));
+    }
+
+    [Fact]
+    public void StripDirectivePrefix_WhenLineIsCommented_PreservesLeadingHashInResult()
+    {
+        Assert.Equal("#mac,ip", DnsmasqConfText.StripDirectivePrefix(DnsmasqConfKeys.DhcpHost, "#dhcp-host=mac,ip"));
+        Assert.Equal("##mac,ip", DnsmasqConfText.StripDirectivePrefix(DnsmasqConfKeys.DhcpHost, "##dhcp-host=mac,ip"));
+    }
+
+    [Fact]
+    public void HasDirectivePrefix_MatchesOptionAndCommentedForms()
+    {
+        Assert.True(DnsmasqConfText.HasDirectivePrefix(DnsmasqConfKeys.DhcpHost, "dhcp-host=value"));
+        Assert.True(DnsmasqConfText.HasDirectivePrefix(DnsmasqConfKeys.DhcpHost, "#dhcp-host=value"));
+        Assert.True(DnsmasqConfText.HasDirectivePrefix(DnsmasqConfKeys.DhcpHost, "##dhcp-host=value"));
+        Assert.False(DnsmasqConfText.HasDirectivePrefix(DnsmasqConfKeys.DhcpHost, "server=8.8.8.8"));
+        Assert.False(DnsmasqConfText.HasDirectivePrefix(DnsmasqConfKeys.DhcpHost, "other"));
+    }
+}
@@ -0,0 +1,66 @@
+using DnsmasqWebUI.Infrastructure.Serialization;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Serialization;
+
+public class EffectiveConfigDirectiveSerializerTests
+{
+    private readonly EffectiveConfigDirectiveSerializer _sut = new();
+
+    [Fact]
+    public void SerializeSingle_Flag_True_WritesBareKey()
+    {
+        var result = _sut.SerializeSingle(DnsmasqConfKeys.Conntrack, true);
+        Assert.Equal(DnsmasqConfKeys.Conntrack, result);
+    }
+
+    [Fact]
+    public void SerializeSingle_Flag_False_WritesEmpty()
+    {
+        var result = _sut.SerializeSingle(DnsmasqConfKeys.Conntrack, false);
+        Assert.Equal("", result);
+    }
+
+    [Fact]
+    public void SerializeSingle_SingleValue_WritesKeyEqualsValue()
+    {
+        var result = _sut.SerializeSingle(DnsmasqConfKeys.Port, 5353);
+        Assert.Equal("port=5353", result);
+    }
+
+    [Fact]
+    public void SerializeSingle_KeyOnlyOrValue_Empty_WritesBareKey()
+    {
+        var result = _sut.SerializeSingle(DnsmasqConfKeys.UseStaleCache, "");
+        Assert.Equal(DnsmasqConfKeys.UseStaleCache, result);
+    }
+
+    [Fact]
+    public void SerializeMulti_MultiValue_WritesEachDirective()
+    {
+        var result = _sut.SerializeMulti(DnsmasqConfKeys.Server, ["1.1.1.1", "8.8.8.8"]);
+        Assert.Equal(["server=1.1.1.1", "server=8.8.8.8"], result);
+    }
+
+    [Fact]
+    public void SerializeMulti_MultiKeyOnlyOrValue_WritesMixedForms()
+    {
+        var result = _sut.SerializeMulti(DnsmasqConfKeys.Leasequery, ["", "net:tag"]);
+        Assert.Equal(["leasequery", "leasequery=net:tag"], result);
+    }
+
+    [Fact]
+    public void SerializeSingle_InversePair_Enabled_WritesPositiveKey()
+    {
+        var result = _sut.SerializeSingle(DnsmasqConfKeys.Do0x20Encode, ExplicitToggleState.Enabled);
+        Assert.Equal(DnsmasqConfKeys.Do0x20Encode, result);
+    }
+
+    [Fact]
+    public void SerializeSingle_InversePair_Disabled_WritesNegativeKey()
+    {
+        var result = _sut.SerializeSingle(DnsmasqConfKeys.Do0x20Encode, ExplicitToggleState.Disabled);
+        Assert.Equal(DnsmasqConfKeys.No0x20Encode, result);
+    }
+}
@@ -0,0 +1,106 @@
+using DnsmasqWebUI.Infrastructure.Serialization.OptionHandlers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.Dhcp;
+
+namespace DnsmasqWebUI.Tests.Serialization.OptionHandlers;
+
+public class DhcpHostOptionValueHandlerTests
+{
+    private readonly DhcpHostOptionValueHandler _sut = new();
+
+    [Fact]
+    public void OptionName_EqualsDnsmasqConfKeysDhcpHost()
+    {
+        Assert.Equal(DnsmasqConfKeys.DhcpHost, _sut.OptionName);
+    }
+
+    [Fact]
+    public void SerializeValue_EmitsValueOnlyForm()
+    {
+        var entry = new DhcpHostEntry
+        {
+            MacAddresses = new List<string> { "11:22:33:44:55:66" },
+            Address = "192.168.1.10"
+        };
+        var value = _sut.SerializeValue(entry);
+        Assert.Equal("11:22:33:44:55:66, 192.168.1.10", value);
+    }
+
+    [Fact]
+    public void SerializeValue_IgnoreEntry_EmitsIgnoreToken()
+    {
+        var entry = new DhcpHostEntry
+        {
+            MacAddresses = new List<string> { "aa:bb:cc:dd:ee:ff" },
+            Ignore = true
+        };
+        var value = _sut.SerializeValue(entry);
+        Assert.Contains("ignore", value);
+        Assert.Contains("aa:bb:cc:dd:ee:ff", value);
+    }
+
+    [Fact]
+    public void SerializeValue_EmptyEntry_ReturnsEmptyString()
+    {
+        var entry = new DhcpHostEntry();
+        var value = _sut.SerializeValue(entry);
+        Assert.Equal("", value);
+    }
+
+    [Fact]
+    public void TryParseValue_RoundTripsStructuredFields()
+    {
+        var input = new DhcpHostEntry
+        {
+            MacAddresses = new List<string> { "11:22:33:44:55:66" },
+            Address = "192.168.1.10",
+            Extra = new List<string> { "id:01:02:03", "set:test" },
+            Comment = "note",
+            IsComment = true
+        };
+        var value = _sut.SerializeValue(input);
+        var ok = _sut.TryParseValue(value, 1, out var output);
+        Assert.True(ok);
+        Assert.NotNull(output);
+        Assert.True(output!.IsComment);
+        Assert.Contains("id:01:02:03", output.Extra!);
+        Assert.Equal("note", output.Comment);
+    }
+
+    [Fact]
+    public void TryParseValue_IsComment_RoundTrips()
+    {
+        var entry = new DhcpHostEntry
+        {
+            MacAddresses = new List<string> { "aa:bb:cc:dd:ee:ff" },
+            Address = "192.168.1.1",
+            IsComment = true
+        };
+        var value = _sut.SerializeValue(entry);
+        Assert.StartsWith("#", value);
+        var ok = _sut.TryParseValue(value, 1, out var roundTripped);
+        Assert.True(ok);
+        Assert.NotNull(roundTripped);
+        Assert.True(roundTripped!.IsComment);
+        Assert.Single(roundTripped.MacAddresses!);
+        Assert.Equal("aa:bb:cc:dd:ee:ff", roundTripped.MacAddresses[0]);
+        Assert.Equal("192.168.1.1", roundTripped.Address);
+    }
+
+    [Fact]
+    public void TryParseValue_Comment_EmitsTrailingComment_AndRoundTrips()
+    {
+        var entry = new DhcpHostEntry
+        {
+            MacAddresses = new List<string> { "aa:bb:cc:dd:ee:ff" },
+            Address = "192.168.1.1",
+            Comment = " my note "
+        };
+        var value = _sut.SerializeValue(entry);
+        Assert.Contains(" # ", value);
+        var ok = _sut.TryParseValue(value, 1, out var roundTripped);
+        Assert.True(ok);
+        Assert.NotNull(roundTripped);
+        Assert.Equal("my note", roundTripped!.Comment?.Trim());
+    }
+}
@@ -0,0 +1,126 @@
+using System.Reflection;
+using DnsmasqWebUI.Infrastructure.Serialization.OptionHandlers;
+using DnsmasqWebUI.Infrastructure.Serialization.OptionHandlers.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.Dhcp;
+
+namespace DnsmasqWebUI.Tests.Serialization.OptionHandlers;
+
+/// <summary>Ensures structured handlers use DnsmasqConfKeys and registry has no duplicate option names.</summary>
+public class StructuredOptionValueHandlerRegistryTests
+{
+    [Fact]
+    public void DhcpHostOptionValueHandler_OptionName_EqualsDnsmasqConfKeysDhcpHost()
+    {
+        var handler = new DhcpHostOptionValueHandler();
+        Assert.Equal(DnsmasqConfKeys.DhcpHost, handler.OptionName);
+    }
+
+    [Fact]
+    public void DhcpHostOptionValueHandler_OptionName_IsFromDnsmasqConfKeys()
+    {
+        var handler = new DhcpHostOptionValueHandler();
+        var validKeys = GetDnsmasqConfKeysValues();
+        Assert.Contains(handler.OptionName, validKeys);
+    }
+
+    [Fact]
+    public void Registry_WithDhcpHostHandler_ReturnsHandlerForDhcpHost()
+    {
+        var handler = new DhcpHostOptionValueHandler();
+        var registry = new StructuredOptionValueHandlerRegistry(new[] { handler });
+        var resolved = registry.Get<DhcpHostEntry>(DnsmasqConfKeys.DhcpHost);
+        Assert.NotNull(resolved);
+        Assert.Equal(DnsmasqConfKeys.DhcpHost, resolved.OptionName);
+    }
+
+    [Fact]
+    public void Registry_IsStructured_WhenHandlerExists_ReturnsTrue()
+    {
+        var registry = new StructuredOptionValueHandlerRegistry([new DhcpHostOptionValueHandler()]);
+        Assert.True(registry.IsStructured(DnsmasqConfKeys.DhcpHost));
+        Assert.False(registry.IsStructured(DnsmasqConfKeys.Server));
+    }
+
+    [Fact]
+    public void Registry_GetRequired_WhenHandlerExists_ReturnsTypedHandler()
+    {
+        var registry = new StructuredOptionValueHandlerRegistry([new DhcpHostOptionValueHandler()]);
+        var handler = registry.GetRequired<DhcpHostEntry>(DnsmasqConfKeys.DhcpHost);
+        Assert.Equal(DnsmasqConfKeys.DhcpHost, handler.OptionName);
+    }
+
+    [Fact]
+    public void Registry_GetRequired_WhenOptionIsNotStructured_Throws()
+    {
+        var registry = new StructuredOptionValueHandlerRegistry([new DhcpHostOptionValueHandler()]);
+        var ex = Assert.Throws<InvalidOperationException>(() => registry.GetRequired<DhcpHostEntry>(DnsmasqConfKeys.Server));
+        Assert.Contains("not declared as a structured option", ex.Message);
+    }
+
+    [Fact]
+    public void Registry_DuplicateOptionNames_Throws()
+    {
+        var ex = Assert.Throws<InvalidOperationException>(() =>
+            new StructuredOptionValueHandlerRegistry([
+                new DhcpHostOptionValueHandler(),
+                new DuplicateDhcpHostHandler()
+            ]));
+        Assert.Contains("Duplicate structured option handlers", ex.Message);
+    }
+
+    [Fact]
+    public void Semantics_DhcpHost_HasStructuredValueTypeMatchingHandler()
+    {
+        var structuredType = EffectiveConfigSpecialOptionSemantics.GetStructuredValueType(DnsmasqConfKeys.DhcpHost);
+        Assert.NotNull(structuredType);
+        Assert.Equal(typeof(DhcpHostEntry), structuredType);
+        var handler = new DhcpHostOptionValueHandler();
+        Assert.Equal(structuredType, handler.ValueType);
+    }
+
+    [Fact]
+    public void Registry_HandlerWithoutStructuredMetadata_Throws()
+    {
+        var ex = Assert.Throws<InvalidOperationException>(() =>
+            new StructuredOptionValueHandlerRegistry([new InvalidServerHandler()]));
+        Assert.Contains("no StructuredValueType", ex.Message);
+    }
+
+    private static HashSet<string> GetDnsmasqConfKeysValues()
+    {
+        var set = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var field in typeof(DnsmasqConfKeys).GetFields(BindingFlags.Public | BindingFlags.Static))
+        {
+            if (field.FieldType == typeof(string) && field.GetValue(null) is string value)
+                set.Add(value);
+        }
+        return set;
+    }
+
+    private sealed class DuplicateDhcpHostHandler : IStructuredOptionValueHandler<DhcpHostEntry>
+    {
+        public string OptionName => DnsmasqConfKeys.DhcpHost;
+        public Type ValueType => typeof(DhcpHostEntry);
+        public string SerializeLine(DhcpHostEntry value) => "";
+        public string SerializeValue(DhcpHostEntry value) => "";
+        public bool TryParseValue(string text, int lineNumber, out DhcpHostEntry? value)
+        {
+            value = null;
+            return false;
+        }
+    }
+
+    private sealed class InvalidServerHandler : IStructuredOptionValueHandler<string>
+    {
+        public string OptionName => DnsmasqConfKeys.Server;
+        public Type ValueType => typeof(string);
+        public string SerializeLine(string value) => "";
+        public string SerializeValue(string value) => value;
+        public bool TryParseValue(string text, int lineNumber, out string? value)
+        {
+            value = text;
+            return true;
+        }
+    }
+}
@@ -0,0 +1,72 @@
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.Dnsmasq;
+
+/// <summary>
+/// Tests for parsing "Compile time options: ..." from dnsmasq --version output.
+/// </summary>
+public class DnsmasqCompileOptionsParserTests
+{
+    [Fact]
+    public void Parse_WhenNoCompileLine_ReturnsAllCapabilitiesFalse()
+    {
+        var result = DnsmasqCompileOptionsParser.Parse("Dnsmasq version 2.89\nCopyright ...", null);
+        Assert.False(result.Dhcp);
+        Assert.False(result.Tftp);
+        Assert.False(result.Dnssec);
+        Assert.False(result.Dbus);
+        Assert.NotNull(result.RawTokens);
+        Assert.Empty(result.RawTokens);
+    }
+
+    [Fact]
+    public void Parse_WhenCompileLineHasDnssec_SetsDnssecTrue()
+    {
+        var stdout = "Dnsmasq version 2.89\nCompile time options: IPv6 GNU-getopt no-DBus no-Idn DHCP DHCPv6 TFTP DNSSEC auth";
+        var result = DnsmasqCompileOptionsParser.Parse(stdout, null);
+        Assert.True(result.Dnssec);
+        Assert.True(result.Dhcp);
+        Assert.True(result.Tftp);
+        Assert.False(result.Dbus);
+        Assert.Contains("DNSSEC", result.RawTokens, StringComparer.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void Parse_WhenCompileLineHasDhcpOnly_SetsDhcpTrueOthersFalse()
+    {
+        var result = DnsmasqCompileOptionsParser.Parse(null, "Compile time options: DHCP no-DBus no-DNSSEC");
+        Assert.True(result.Dhcp);
+        Assert.False(result.Tftp);
+        Assert.False(result.Dnssec);
+        Assert.False(result.Dbus);
+    }
+
+    [Fact]
+    public void Parse_WhenCompileLineHasDhcpv6_SetsDhcpTrue()
+    {
+        var result = DnsmasqCompileOptionsParser.Parse("Compile time options: DHCPv6", null);
+        Assert.True(result.Dhcp);
+    }
+
+    [Fact]
+    public void Parse_WhenCompileLineHasTftp_SetsTftpTrue()
+    {
+        var result = DnsmasqCompileOptionsParser.Parse("Compile time options: TFTP", null);
+        Assert.True(result.Tftp);
+    }
+
+    [Fact]
+    public void Parse_WhenCompileLineHasDbus_SetsDbusTrue()
+    {
+        var result = DnsmasqCompileOptionsParser.Parse("Compile time options: DBus", null);
+        Assert.True(result.Dbus);
+    }
+
+    [Fact]
+    public void Parse_CombinesStdoutAndStderr()
+    {
+        var result = DnsmasqCompileOptionsParser.Parse("Version line\n", "Compile time options: DNSSEC");
+        Assert.True(result.Dnssec);
+    }
+}
@@ -1,7 +1,9 @@
 using DnsmasqWebUI.Models.Dhcp;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;

 /// <summary>
 /// Tests for DnsmasqConfDhcpHostLineParser. Format: dhcp-host=[hwaddr][,id:...][,set:tag][,tag:tag][,ip][,hostname][,lease][,ignore]
@@ -1,7 +1,7 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;

 /// <summary>
 /// Tests for DnsmasqConfDirectiveParser. Key/value parsing (TryParseKeyValue) and comment stripping (StripComment)
@@ -1,8 +1,10 @@
 using DnsmasqWebUI.Models.Config;
 using DnsmasqWebUI.Models.Dhcp;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;

 /// <summary>
 /// Tests for DnsmasqConfFileLineParser. Parses dnsmasq config file lines into Blank, Comment, AddnHosts, DhcpHost, Other.
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>Parser semantics: flags (option present/absent/with value), last-wins, case-sensitive, path order.</summary>
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>DHCP advanced, TFTP/PXE, DNSSEC, enable-dbus/ubus, fast-dns-retry.</summary>
@@ -283,7 +283,7 @@ public class DnsmasqConfIncludeParserDhcpTftpDnssecTests
    }

    [Fact]
-    public void GetFlagFromConfigFiles_DnssecCheckUnsigned_WhenPresent_ReturnsTrue()
+    public void GetLastValueFromConfigFiles_DnssecCheckUnsigned_WhenPresent_ReturnsValue()
    {
        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-dnsseccu-" + Guid.NewGuid().ToString("N"));
        Directory.CreateDirectory(dir);
@@ -291,8 +291,26 @@ public class DnsmasqConfIncludeParserDhcpTftpDnssecTests
        try
        {
            File.WriteAllText(conf, "dnssec-check-unsigned\n");
-            var result = DnsmasqConfIncludeParser.GetFlagFromConfigFiles(new[] { conf }, DnsmasqConfKeys.DnssecCheckUnsigned);
-            Assert.True(result);
+            var (value, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(new[] { conf }, DnsmasqConfKeys.DnssecCheckUnsigned);
+            Assert.NotNull(value);
+        }
+        finally
+        {
+            Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public void GetLastValueFromConfigFiles_DnssecCheckUnsigned_WhenEqualsNo_ReturnsNo()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-dnsseccu-no-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var conf = Path.Combine(dir, "dnsmasq.conf");
+        try
+        {
+            File.WriteAllText(conf, "dnssec-check-unsigned=no\n");
+            var (value, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(new[] { conf }, DnsmasqConfKeys.DnssecCheckUnsigned);
+            Assert.Equal("no", value);
        }
        finally
        {
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>Boolean flags: no-hosts, bogus-priv, strict-order, domain-needed, no-poll, bind-*, rebind-*, clear-on-reload, filter*, localise-queries, log-debug, dhcp-authoritative, leasefile-ro.</summary>
@@ -1,8 +1,10 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>Hosts (addn-hosts, hostsdir) and DHCP lease file parsing.</summary>
@@ -1,9 +1,9 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>Config discovery: conf-file=, conf-dir=, GetIncludedPaths, GetFirstConfDir, GetIncludedPathsWithSource, conf-dir suffix.</summary>
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>Interfaces, auth-server, DHCP/option/resolv multi-value, rebind/bogus/ignore/alias, filter-rr, cache-rr.</summary>
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;

 /// <summary>
 /// Positive parser tests for added options: key wired and "option present" behaviour.
@@ -79,6 +79,137 @@ public class DnsmasqConfIncludeParserNewOptionsTests
        WriteFlagAndAssertTrue(DnsmasqConfKeys.ProxyDnssec);
    }

+    [Fact]
+    public void GetLastValueFromConfigFiles_ConnmarkAllowlistEnable_WhenPresent_ReturnsValue()
+    {
+        WriteLastWinsKeyOnlyAndAssertPresent(DnsmasqConfKeys.ConnmarkAllowlistEnable);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_NoRoundRobin_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.NoRoundRobin);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_DnssecNoTimecheck_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.DnssecNoTimecheck);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_DnssecDebug_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.DnssecDebug);
+    }
+
+    [Fact]
+    public void GetMultiValueFromConfigFiles_Leasequery_WhenPresent_ReturnsValues()
+    {
+        var dir = CreateTempDir();
+        var conf = Path.Combine(dir, "dnsmasq.conf");
+        try
+        {
+            File.WriteAllText(conf, "leasequery\n");
+            var result = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(new[] { conf }, DnsmasqConfKeys.Leasequery);
+            Assert.Single(result);
+            Assert.Equal("", result[0]);
+        }
+        finally { Directory.Delete(dir, recursive: true); }
+    }
+
+    [Fact]
+    public void GetMultiValueFromConfigFiles_Leasequery_WithValue_IsParsed()
+    {
+        var dir = CreateTempDir();
+        var conf = Path.Combine(dir, "dnsmasq.conf");
+        try
+        {
+            File.WriteAllText(conf, "leasequery=10.0.0.0/24\n");
+            var result = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(new[] { conf }, DnsmasqConfKeys.Leasequery);
+            Assert.Equal("10.0.0.0/24", Assert.Single(result));
+        }
+        finally { Directory.Delete(dir, recursive: true); }
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_QuietDhcp_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.QuietDhcp);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_QuietTftp_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.QuietTftp);
+    }
+
+    [Fact]
+    public void GetLastValueFromConfigFiles_DhcpGenerateNames_WhenPresent_ReturnsValue()
+    {
+        WriteLastWinsKeyOnlyAndAssertPresent(DnsmasqConfKeys.DhcpGenerateNames);
+    }
+
+    [Fact]
+    public void GetLastValueFromConfigFiles_DhcpBroadcast_WhenPresent_ReturnsValue()
+    {
+        WriteLastWinsKeyOnlyAndAssertPresent(DnsmasqConfKeys.DhcpBroadcast);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_DhcpSequentialIp_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.DhcpSequentialIp);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_DhcpIgnoreClid_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.DhcpIgnoreClid);
+    }
+
+    [Fact]
+    public void GetLastValueFromConfigFiles_BootpDynamic_WhenPresent_ReturnsValue()
+    {
+        WriteLastWinsKeyOnlyAndAssertPresent(DnsmasqConfKeys.BootpDynamic);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_NoPing_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.NoPing);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_ScriptArp_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.ScriptArp);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_ScriptOnRenewal_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.ScriptOnRenewal);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_DhcpNoOverride_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.DhcpNoOverride);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_QuietDhcp6_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.QuietDhcp6);
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_QuietRa_WhenPresent_ReturnsTrue()
+    {
+        WriteFlagAndAssertTrue(DnsmasqConfKeys.QuietRa);
+    }
+
    // --- Multi-value (6): key=value line(s) → GetMultiValue returns value(s) ---

    [Fact]
@@ -258,16 +389,27 @@ public class DnsmasqConfIncludeParserNewOptionsTests
    }

    [Fact]
-    public void GetLastValueFromConfigFiles_Conntrack_WhenSet_ReturnsValue()
+    public void GetFlagFromConfigFiles_Conntrack_WhenPresent_ReturnsTrue()
    {
        var dir = CreateTempDir();
        var conf = Path.Combine(dir, "dnsmasq.conf");
-        var value = "42";
        try
        {
-            File.WriteAllText(conf, $"conntrack={value}\n");
-            var (result, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(new[] { conf }, DnsmasqConfKeys.Conntrack);
-            Assert.Equal(value, result);
+            File.WriteAllText(conf, "conntrack\n");
+            Assert.True(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(new[] { conf }, DnsmasqConfKeys.Conntrack));
+        }
+        finally { Directory.Delete(dir, recursive: true); }
+    }
+
+    [Fact]
+    public void GetFlagFromConfigFiles_Conntrack_WhenAbsent_ReturnsFalse()
+    {
+        var dir = CreateTempDir();
+        var conf = Path.Combine(dir, "dnsmasq.conf");
+        try
+        {
+            File.WriteAllText(conf, "port=53\n");
+            Assert.False(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(new[] { conf }, DnsmasqConfKeys.Conntrack));
        }
        finally { Directory.Delete(dir, recursive: true); }
    }
@@ -284,6 +426,19 @@ public class DnsmasqConfIncludeParserNewOptionsTests
        finally { Directory.Delete(dir, recursive: true); }
    }

+    private static void WriteLastWinsKeyOnlyAndAssertPresent(string key)
+    {
+        var dir = CreateTempDir();
+        var conf = Path.Combine(dir, "dnsmasq.conf");
+        try
+        {
+            File.WriteAllText(conf, key + "\n");
+            var (value, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(new[] { conf }, key);
+            Assert.NotNull(value);
+        }
+        finally { Directory.Delete(dir, recursive: true); }
+    }
+
    private static string CreateTempDir()
    {
        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-newopts-" + Guid.NewGuid().ToString("N"));
@@ -1,7 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
+using DnsmasqWebUI.Tests.Helpers;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;

 /// <summary>
 /// Tests that the parser correctly handles the official dnsmasq example (testdata/dnsmasq.official.conf.example).
@@ -79,32 +80,6 @@ public class DnsmasqConfIncludeParserOfficialExampleTests
        Assert.False(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(paths, DnsmasqConfKeys.LogDhcp));
    }

-    [Fact]
-    public void OfficialExample_FileContainsExpectedOptionNames()
-    {
-        var path = GetOfficialExamplePath();
-        var content = File.ReadAllText(path);
-        // Sanity: official example documents the options we support (as commented lines).
-        Assert.Contains("read-ethers", content);
-        Assert.Contains("dhcp-option-force", content);
-        Assert.Contains("dhcp-rapid-commit", content);
-        Assert.Contains("dhcp-script", content);
-        Assert.Contains("tftp-no-fail", content);
-        Assert.Contains("tftp-no-blocksize", content);
-        Assert.Contains("mx-target", content);
-        Assert.Contains("localmx", content);
-        Assert.Contains("selfmx", content);
-        Assert.Contains("enable-ra", content);
-        Assert.Contains("log-dhcp", content);
-        Assert.Contains("ipset=", content);
-        Assert.Contains("nftset=", content);
-        Assert.Contains("dhcp-mac", content);
-        Assert.Contains("dhcp-name-match", content);
-        Assert.Contains("dhcp-ignore-names", content);
-        // SRV records use option name srv-host (not "srv")
-        Assert.Contains("srv-host", content);
-    }
-
    [Fact]
    public void GetAddnHostsPathsFromConfigFiles_OfficialExample_AllCommented_ReturnsEmpty()
    {
@@ -123,4 +98,23 @@ public class DnsmasqConfIncludeParserOfficialExampleTests
        var noHosts = DnsmasqConfIncludeParser.GetNoHostsFromConfigFiles(paths);
        Assert.False(noHosts);
    }
+
+    /// <summary>Official-like sample with commented and active lines: commented ignored, active parsed, state reflects active only.</summary>
+    [Fact]
+    public void OfficialLikeActive_CommentedLinesIgnored_ActiveLinesParsed()
+    {
+        var mainPath = TestDataHelper.GetPath("real-world/edge/dnsmasq-real-official-like-active.conf");
+        Assert.True(File.Exists(mainPath));
+        var paths = DnsmasqConfIncludeParser.GetIncludedPaths(mainPath);
+
+        var (portVal, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(paths, DnsmasqConfKeys.Port);
+        Assert.NotNull(portVal);
+        Assert.True(int.TryParse(portVal, out var port) && port == 5353);
+
+        var servers = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.Server);
+        Assert.Single(servers);
+        Assert.Equal("1.1.1.1", servers[0]);
+
+        Assert.True(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(paths, DnsmasqConfKeys.ExpandHosts));
+    }
 }
@@ -0,0 +1,73 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
+
+/// <summary>
+/// Ensures every option in the coverage list is parsed consistently: one config line per option,
+/// dispatch by parser behavior (Flag / LastWins / Multi), assert we get a value back.
+/// Add new options to <see cref="OptionCoverageData.GetParserCoverageEntries"/> when adding to the app.
+/// </summary>
+public class DnsmasqConfIncludeParserOptionCoverageTests
+{
+    public static IEnumerable<object[]> GetCoverageEntries()
+    {
+        foreach (var (optionKey, configLine) in OptionCoverageData.GetParserCoverageEntries())
+            yield return new object[] { optionKey, configLine };
+    }
+
+    [Theory]
+    [MemberData(nameof(GetCoverageEntries))]
+    public void EveryOption_ParseSingleLine_ReturnsExpectedResult(string optionKey, string configLine)
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-opt-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var conf = Path.Combine(dir, "dnsmasq.conf");
+        try
+        {
+            File.WriteAllText(conf, configLine + "\n");
+            var paths = new[] { conf };
+
+            if (optionKey == DnsmasqConfKeys.AddnHosts)
+            {
+                var addn = DnsmasqConfIncludeParser.GetAddnHostsPathsFromConfigFiles(paths);
+                Assert.True(addn.Count >= 1, $"addn-hosts should parse from: {configLine}");
+                return;
+            }
+
+            var behavior = EffectiveConfigParserBehaviorMap.GetBehavior(optionKey);
+
+            switch (behavior)
+            {
+                case EffectiveConfigParserBehavior.Flag:
+                {
+                    var flag = DnsmasqConfIncludeParser.GetFlagFromConfigFiles(paths, optionKey);
+                    Assert.True(flag, $"Flag option {optionKey} should be true when set.");
+                    break;
+                }
+                case EffectiveConfigParserBehavior.LastWins:
+                {
+                    var (value, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(paths, optionKey);
+                    Assert.NotNull(value);
+                    Assert.True(value!.Length > 0, $"LastWins option {optionKey} should return non-empty value.");
+                    break;
+                }
+                case EffectiveConfigParserBehavior.Multi:
+                {
+                    var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, optionKey);
+                    Assert.True(list.Count >= 1, $"Multi option {optionKey} should return at least one value.");
+                    break;
+                }
+                default:
+                    Assert.Fail($"Unknown behavior for {optionKey}");
+                    break;
+            }
+        }
+        finally
+        {
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+}
@@ -0,0 +1,148 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
+
+/// <summary>
+/// Corpus-driven parser tests using testdata/real-world. Asserts counts, booleans, and effective state only.
+/// </summary>
+public class DnsmasqConfIncludeParserRealWorldCorpusTests
+{
+    public static IEnumerable<object[]> GetCases()
+    {
+        foreach (var c in RealWorldCasesHelper.LoadCases())
+            yield return new object[] { c };
+    }
+
+    [Theory]
+    [MemberData(nameof(GetCases))]
+    public void GetIncludedPaths_RealWorldCorpus_ReturnsAtLeastMain(CorpusCase c)
+    {
+        var mainPath = RealWorldCasesHelper.Resolve(c);
+        Assert.True(File.Exists(mainPath), $"Corpus file missing: {c.File}");
+
+        var paths = DnsmasqConfIncludeParser.GetIncludedPaths(mainPath);
+        Assert.NotNull(paths);
+        Assert.NotEmpty(paths);
+        Assert.Contains(Path.GetFullPath(mainPath), paths);
+    }
+
+    [Theory]
+    [MemberData(nameof(GetCases))]
+    public void ParseEffectiveSignals_FromRealWorldCorpus(CorpusCase c)
+    {
+        var e = c.Expected;
+        var hasAny = e.ServerCountMin is not null || e.NoHosts is not null || e.Do0x20State is not null ||
+                     e.Port is not null || e.ExpandHosts is not null || e.LocalCountMin is not null ||
+                     e.AddressCountMin is not null || e.CacheSize is not null || e.AddnHostsCountMin is not null ||
+                     e.DomainCountMin is not null || e.NoResolv is not null || e.BogusPriv is not null ||
+                     e.CnameCountMin is not null || e.TxtRecordCountMin is not null || e.SrvCountMin is not null ||
+                     e.PtrRecordCountMin is not null || e.MxHostCountMin is not null || e.AuthZoneCountMin is not null ||
+                     e.SynthDomainCountMin is not null || e.AuthServerCountMin is not null;
+        if (!hasAny)
+            return;
+
+        var mainPath = RealWorldCasesHelper.Resolve(c);
+        var paths = DnsmasqConfIncludeParser.GetIncludedPaths(mainPath);
+
+        if (e.ServerCountMin is int minServers)
+        {
+            var servers = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.Server);
+            Assert.True(servers.Count >= minServers, $"Expected at least {minServers} server(s) for {c.File}");
+        }
+        if (e.LocalCountMin is int minLocal)
+        {
+            var locals = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.Local);
+            Assert.True(locals.Count >= minLocal, $"Expected at least {minLocal} local(s) for {c.File}");
+        }
+        if (e.AddressCountMin is int minAddr)
+        {
+            var addrs = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.Address);
+            Assert.True(addrs.Count >= minAddr, $"Expected at least {minAddr} address(es) for {c.File}");
+        }
+        if (e.CacheSize is int cacheSize)
+        {
+            var (val, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(paths, DnsmasqConfKeys.CacheSize);
+            Assert.NotNull(val);
+            Assert.True(int.TryParse(val, out var n) && n == cacheSize);
+        }
+        if (e.AddnHostsCountMin is int minAddn)
+        {
+            var addn = DnsmasqConfIncludeParser.GetAddnHostsPathsFromConfigFiles(paths);
+            Assert.True(addn.Count >= minAddn);
+        }
+        if (e.DomainCountMin is int minDomain)
+        {
+            var domains = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.Domain);
+            Assert.True(domains.Count >= minDomain);
+        }
+        if (e.NoHosts is bool noHostsExpected)
+        {
+            var noHosts = DnsmasqConfIncludeParser.GetNoHostsFromConfigFiles(paths);
+            Assert.Equal(noHostsExpected, noHosts);
+        }
+        if (e.NoResolv is true)
+        {
+            Assert.True(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(paths, DnsmasqConfKeys.NoResolv));
+        }
+        if (e.BogusPriv is true)
+        {
+            Assert.True(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(paths, DnsmasqConfKeys.BogusPriv));
+        }
+        if (e.Do0x20State == "Disabled")
+        {
+            Assert.True(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(paths, DnsmasqConfKeys.No0x20Encode));
+        }
+        if (e.Port is int portExpected)
+        {
+            var (portVal, _) = DnsmasqConfIncludeParser.GetLastValueFromConfigFiles(paths, DnsmasqConfKeys.Port);
+            Assert.NotNull(portVal);
+            Assert.True(int.TryParse(portVal, out var port) && port == portExpected);
+        }
+        if (e.ExpandHosts is true)
+        {
+            Assert.True(DnsmasqConfIncludeParser.GetFlagFromConfigFiles(paths, DnsmasqConfKeys.ExpandHosts));
+        }
+        if (e.CnameCountMin is int minCname)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.Cname);
+            Assert.True(list.Count >= minCname);
+        }
+        if (e.TxtRecordCountMin is int minTxt)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.TxtRecord);
+            Assert.True(list.Count >= minTxt);
+        }
+        if (e.SrvCountMin is int minSrv)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.Srv);
+            Assert.True(list.Count >= minSrv);
+        }
+        if (e.PtrRecordCountMin is int minPtr)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.PtrRecord);
+            Assert.True(list.Count >= minPtr);
+        }
+        if (e.MxHostCountMin is int minMx)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.MxHost);
+            Assert.True(list.Count >= minMx);
+        }
+        if (e.AuthZoneCountMin is int minAz)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.AuthZone);
+            Assert.True(list.Count >= minAz);
+        }
+        if (e.SynthDomainCountMin is int minSd)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.SynthDomain);
+            Assert.True(list.Count >= minSd);
+        }
+        if (e.AuthServerCountMin is int minAs)
+        {
+            var list = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, DnsmasqConfKeys.AuthServer);
+            Assert.True(list.Count >= minAs);
+        }
+    }
+}
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>DNS records and local names: hostsdir, domain, cname, mx-host, srv, ptr/txt/naptr/host-record, dynamic-host, interface-name.</summary>
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>Server/local, rev-server, dhcp-range, all-servers, log-queries.</summary>
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;


 /// <summary>Single-value options (last wins): local-ttl, pid-file, user, group, auth-ttl, edns-packet-max, query-port, port-limit, min/max-port, log-async, local-service, dhcp-lease-max, neg/max/min-cache-ttl, dhcp-ttl.</summary>
@@ -0,0 +1,42 @@
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
+
+public class DnsmasqDhcpRangeValueParserTests
+{
+    [Fact]
+    public void TryParse_ValidRange_ReturnsStructuredTokens()
+    {
+        var ok = DnsmasqDhcpRangeValueParser.TryParse(
+            "tag:guest,set:known,192.168.1.50,192.168.1.150,12h",
+            out var parsed,
+            out var error);
+
+        Assert.True(ok);
+        Assert.Null(error);
+        Assert.NotNull(parsed);
+        Assert.Equal(["tag:guest", "set:known"], parsed!.Tags);
+        Assert.Equal("192.168.1.50", parsed.StartToken);
+        Assert.Equal("192.168.1.150", parsed.SecondToken);
+        Assert.Equal(["12h"], parsed.RemainingTokens);
+    }
+
+    [Fact]
+    public void TryParse_MalformedTrailingComma_ReturnsError()
+    {
+        var ok = DnsmasqDhcpRangeValueParser.TryParse("172.28.0.10,", out var parsed, out var error);
+
+        Assert.False(ok);
+        Assert.Null(parsed);
+        Assert.Equal("dhcp-range contains an empty comma-separated segment.", error);
+    }
+
+    [Fact]
+    public void GetIPv4StartEnd_ReturnsParsedIpv4Range()
+    {
+        var result = DnsmasqDhcpRangeValueParser.GetIPv4StartEnd("tag:guest,192.168.1.50,192.168.1.150,12h");
+
+        Assert.Equal(("192.168.1.50", "192.168.1.150"), result);
+    }
+}
@@ -1,7 +1,9 @@
 using DnsmasqWebUI.Models.Dhcp;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;

 /// <summary>
 /// Tests for DnsmasqLeasesFileLineParser. Format per dnsmasq author (dnsmasq-discuss 2006): five space-separated
@@ -1,7 +1,9 @@
 using DnsmasqWebUI.Models.Hosts;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;

-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;

 /// <summary>
 /// Tests for HostsFileLineParser. Format: IP_address canonical_hostname [aliases...] (hosts(5), RFC 952).
@@ -137,6 +139,17 @@ public class HostsFileLineParserTests
        Assert.Equal(address, e.Address);
        Assert.Single(e.Names);
        Assert.Equal(name, e.Names[0]);
+        Assert.Equal(comment, e.InlineComment);
+    }
+
+    [Fact]
+    public void ToLine_WithInlineComment_AppendsHashAndRoundTrips()
+    {
+        var line = "192.168.0.5 router # edge gateway";
+        var e = HostsFileLineParser.ParseLine(line, 1);
+        Assert.NotNull(e);
+        var back = HostsFileLineParser.ToLine(e!);
+        Assert.Equal(line, back);
    }

    [Fact]
@@ -0,0 +1,63 @@
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.EffectiveConfig;
+
+public class DomainRuleFieldsTests
+{
+    [Theory]
+    [InlineData("home.arpa", "home.arpa")]
+    [InlineData("#", "# (resolv.conf search)")]
+    [InlineData("example.com,192.168.0.0/24", "example.com · 192.168.0.0/24")]
+    [InlineData("example.com,192.168.0.0/24,local", "example.com · 192.168.0.0/24 · local DNS")]
+    [InlineData("example.com,eth0", "example.com · interface eth0")]
+    [InlineData("example.com,local", "example.com · local DNS")]
+    public void FormatSummary_FormatsExpected(string line, string expectedContains)
+    {
+        var s = DomainRuleFields.FormatSummary(line);
+        Assert.Equal(expectedContains, s);
+    }
+
+    [Fact]
+    public void Parse_RoundTrip_Unconditional()
+    {
+        var f = DomainRuleFields.Parse("my.domain");
+        Assert.False(f.IsRaw);
+        Assert.Equal("my.domain", f.ToConfigLine());
+    }
+
+    [Fact]
+    public void Parse_RoundTrip_RangeAndLocal()
+    {
+        var line = "my.domain,10.0.0.0/24,local";
+        var f = DomainRuleFields.Parse(line);
+        Assert.False(f.IsRaw);
+        Assert.Equal(line, f.ToConfigLine());
+    }
+
+    [Fact]
+    public void Parse_RoundTrip_Interface()
+    {
+        var line = "my.domain,br0";
+        var f = DomainRuleFields.Parse(line);
+        Assert.False(f.IsRaw);
+        Assert.Equal(DomainRuleScope.InterfaceName, f.Scope);
+        Assert.Equal(line, f.ToConfigLine());
+    }
+
+    [Fact]
+    public void Parse_TooManyTokens_UsesRaw()
+    {
+        var line = "a,b,c,d";
+        var f = DomainRuleFields.Parse(line);
+        Assert.True(f.IsRaw);
+        Assert.Equal(line, f.ToConfigLine());
+    }
+
+    [Fact]
+    public void FromRawConfigLine_PreservesLine()
+    {
+        var f = DomainRuleFields.FromRawConfigLine("  weird,line,here  ");
+        Assert.True(f.IsRaw);
+        Assert.Equal("weird,line,here", f.ToConfigLine());
+    }
+}
@@ -0,0 +1,89 @@
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.Filters;
+using Xunit;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.Filters;
+
+public class FilterRuleFieldsTests
+{
+    [Fact]
+    public void Address_AllDomains_NullSinkhole_SummaryAndRoundTrip()
+    {
+        var raw = "/#/#";
+        var p = AddressRuleFields.Parse(raw);
+        Assert.False(p.IsRaw);
+        Assert.Equal(AddressMatchMode.AllDomains, p.MatchMode);
+        Assert.Equal(AddressResponseMode.NullSinkhole, p.ResponseMode);
+        Assert.Equal("all domains return null/sinkhole", p.ToSummary());
+        Assert.Equal(raw, p.ToConfigLine());
+    }
+
+    [Fact]
+    public void Address_DomainPattern_Ip_Summary()
+    {
+        var raw = "/corp.local/10.0.0.2";
+        var p = AddressRuleFields.Parse(raw);
+        Assert.False(p.IsRaw);
+        Assert.Equal(AddressMatchMode.DomainPattern, p.MatchMode);
+        Assert.Equal("corp.local", p.DomainPath);
+        Assert.Equal("queries for /corp.local/ return 10.0.0.2", p.ToSummary());
+    }
+
+    [Fact]
+    public void Server_Scoped_Summary()
+    {
+        var raw = "/corp.local/10.0.0.2";
+        var p = ServerRuleFields.Parse(raw);
+        Assert.False(p.IsRaw);
+        Assert.True(p.IsScoped);
+        Assert.Equal("queries for /corp.local/ go to 10.0.0.2", p.ToSummary());
+    }
+
+    [Fact]
+    public void RevServer_Summary_MatchesExample()
+    {
+        var raw = "192.168.1.0/24,10.0.0.1";
+        var p = RevServerRuleFields.Parse(raw);
+        Assert.False(p.IsRaw);
+        Assert.Equal("reverse lookups for 192.168.1.0/24 go to 10.0.0.1", p.ToSummary());
+    }
+
+    [Fact]
+    public void BogusNxdomain_Summary()
+    {
+        var p = BogusNxdomainRuleFields.Parse("64.94.110.11/24");
+        Assert.False(p.IsRaw);
+        Assert.Contains("64.94.110.11/24", p.ToSummary());
+        Assert.Contains("bogus NXDOMAIN", p.ToSummary());
+    }
+
+    [Fact]
+    public void FilterRr_Summary()
+    {
+        var p = FilterRrRuleFields.Parse("0.0.0.0,A");
+        Assert.False(p.IsRaw);
+        Assert.Contains("A", p.ToSummary());
+        Assert.Contains("0.0.0.0", p.ToSummary());
+    }
+
+    [Fact]
+    public void FilterRr_MatchMayContainCommas_SplitsOnLastComma_RoundTrips()
+    {
+        const string raw = "10.0.0.0,192.168.1.0,A";
+        var p = FilterRrRuleFields.Parse(raw);
+        Assert.False(p.IsRaw);
+        Assert.Equal("10.0.0.0,192.168.1.0", p.MatchValue);
+        Assert.Equal("A", p.RecordType);
+        Assert.Equal(raw, p.ToConfigLine());
+    }
+
+    [Fact]
+    public void Local_UnqualifiedNames_Parse_ToConfigLine_RoundTrips()
+    {
+        const string raw = "//";
+        var p = LocalRuleFields.Parse(raw);
+        Assert.False(p.IsRaw);
+        Assert.Equal("", p.DomainPath);
+        Assert.Equal("unqualified names are answered locally only", p.ToSummary());
+        Assert.Equal(raw, p.ToConfigLine());
+    }
+}
@@ -0,0 +1,217 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
+using DnsmasqWebUI.Models.Config;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.Config;
+
+/// <summary>
+/// Tests effective-config resolution in ConfigSetCache (BuildEffectiveConfig / BuildEffectiveConfigSources).
+/// Verifies no-0x20-encode precedence and source attribution per dnsmasq docs.
+/// </summary>
+public class ConfigSetCacheEffectiveConfigTests
+{
+    private static (string Dir, string MainPath, string ManagedPath, ConfigSetCache Cache) CreateCacheWithManaged(string managedContent)
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-cache-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        File.WriteAllText(mainPath, "port=53\n");
+        File.WriteAllText(managedPath, managedContent);
+        var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+        var cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+        return (dir, mainPath, managedPath, cache);
+    }
+
+    [Fact]
+    public async Task Do0x20_BothPresent_No0x20Wins()
+    {
+        var (dir, _, managedPath, cache) = CreateCacheWithManaged("do-0x20-encode\nno-0x20-encode\n");
+        try
+        {
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal(ExplicitToggleState.Disabled, snapshot.Config.Do0x20EncodeState);
+            Assert.NotNull(snapshot.Sources.Do0x20Encode);
+            Assert.Equal(Path.GetFullPath(managedPath), snapshot.Sources.Do0x20Encode.FilePath, StringComparer.OrdinalIgnoreCase);
+        }
+        finally
+        {
+            cache.Dispose();
+            if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task Do0x20_OnlyDo_Enabled()
+    {
+        var (dir, _, _, cache) = CreateCacheWithManaged("do-0x20-encode\n");
+        try
+        {
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal(ExplicitToggleState.Enabled, snapshot.Config.Do0x20EncodeState);
+        }
+        finally
+        {
+            cache.Dispose();
+            if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task Do0x20_OnlyNo_Disabled()
+    {
+        var (dir, _, managedPath, cache) = CreateCacheWithManaged("no-0x20-encode\n");
+        try
+        {
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal(ExplicitToggleState.Disabled, snapshot.Config.Do0x20EncodeState);
+            Assert.NotNull(snapshot.Sources.Do0x20Encode);
+            Assert.Equal(Path.GetFullPath(managedPath), snapshot.Sources.Do0x20Encode.FilePath, StringComparer.OrdinalIgnoreCase);
+        }
+        finally
+        {
+            cache.Dispose();
+            if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task Do0x20_Neither_Default()
+    {
+        var (dir, _, _, cache) = CreateCacheWithManaged("port=53\n");
+        try
+        {
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal(ExplicitToggleState.Default, snapshot.Config.Do0x20EncodeState);
+            Assert.Null(snapshot.Sources.Do0x20Encode);
+        }
+        finally
+        {
+            cache.Dispose();
+            if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task Do0x20_SourceAttribution_WhenBothPresent_IsNo0x20Line()
+    {
+        var (dir, _, managedPath, cache) = CreateCacheWithManaged("no-0x20-encode\ndo-0x20-encode\n");
+        try
+        {
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal(ExplicitToggleState.Disabled, snapshot.Config.Do0x20EncodeState);
+            Assert.NotNull(snapshot.Sources.Do0x20Encode);
+            Assert.Equal(Path.GetFullPath(managedPath), snapshot.Sources.Do0x20Encode.FilePath, StringComparer.OrdinalIgnoreCase);
+        }
+        finally
+        {
+            cache.Dispose();
+            if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task StripFlags_ParseState_And_Source()
+    {
+        var (dir, _, managedPath, cache) = CreateCacheWithManaged("strip-mac\nstrip-subnet\n");
+        try
+        {
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.True(snapshot.Config.StripMac);
+            Assert.True(snapshot.Config.StripSubnet);
+            Assert.NotNull(snapshot.Sources.StripMac);
+            Assert.NotNull(snapshot.Sources.StripSubnet);
+            Assert.Equal(Path.GetFullPath(managedPath), snapshot.Sources.StripMac!.FilePath, StringComparer.OrdinalIgnoreCase);
+            Assert.Equal(Path.GetFullPath(managedPath), snapshot.Sources.StripSubnet!.FilePath, StringComparer.OrdinalIgnoreCase);
+        }
+        finally
+        {
+            cache.Dispose();
+            if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task RealWorldCorpus_EdgeCommentedActiveMix_Do0x20StateAndSource()
+    {
+        var mainPath = TestDataHelper.GetPath("real-world/edge/dnsmasq-real-edge-commented-active-mix.conf");
+        Assert.True(File.Exists(mainPath));
+        var dir = Path.GetDirectoryName(mainPath)!;
+        var managedName = "zz-managed.conf";
+        var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+        using var cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+        cache.Invalidate();
+        var snapshot = await cache.GetSnapshotAsync();
+        Assert.Equal(ExplicitToggleState.Disabled, snapshot.Config.Do0x20EncodeState);
+        Assert.NotNull(snapshot.Sources.Do0x20Encode);
+        Assert.Single(snapshot.Config.ServerValues);
+        Assert.Equal("1.1.1.1", snapshot.Config.ServerValues[0]);
+    }
+
+    [Fact]
+    public async Task RealWorldCorpus_GoodHomeBasic_ServerCountAndSource()
+    {
+        var mainPath = TestDataHelper.GetPath("real-world/good/dnsmasq-real-home-basic.conf");
+        Assert.True(File.Exists(mainPath));
+        var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = "zz-managed.conf" });
+        using var cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+        cache.Invalidate();
+        var snapshot = await cache.GetSnapshotAsync();
+        Assert.True(snapshot.Config.ServerValues.Count >= 2);
+        Assert.Equal(2, snapshot.Sources.ServerValues.Count);
+    }
+
+    [Fact]
+    public async Task RealWorldCorpus_GoodResolverRich_LocalAddressCacheSizeFlags()
+    {
+        var mainPath = TestDataHelper.GetPath("real-world/good/dnsmasq-real-resolver-rich.conf");
+        Assert.True(File.Exists(mainPath));
+        var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = "zz-managed.conf" });
+        using var cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+        cache.Invalidate();
+        var snapshot = await cache.GetSnapshotAsync();
+        Assert.True(snapshot.Config.ServerValues.Count >= 2);
+        Assert.True(snapshot.Config.LocalValues.Count >= 2);
+        Assert.True(snapshot.Config.AddressValues.Count >= 2);
+        Assert.Equal(1000, snapshot.Config.CacheSize);
+        Assert.True(snapshot.Config.NoResolv);
+        Assert.True(snapshot.Config.BogusPriv);
+        Assert.True(snapshot.Config.ExpandHosts);
+    }
+
+    [Fact]
+    public async Task GetSnapshot_WithManagedFilesDirectory_UsesOverridePaths()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-cache-" + Guid.NewGuid().ToString("N"));
+        var managedDir = Path.Combine(dir, "repo");
+        Directory.CreateDirectory(dir);
+        Directory.CreateDirectory(managedDir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedFileName = "zz-managed.conf";
+        var managedHostsFileName = "zz-managed.hosts";
+        var managedPath = Path.Combine(managedDir, managedFileName);
+        File.WriteAllText(mainPath, $"conf-file={managedPath}\n");
+        File.WriteAllText(managedPath, $"addn-hosts={Path.Combine(managedDir, managedHostsFileName)}\n");
+
+        using var cache = new ConfigSetCache(
+            Options.Create(new DnsmasqOptions
+            {
+                MainConfigPath = mainPath,
+                ManagedFilesDirectory = managedDir,
+                ManagedFileName = managedFileName,
+                ManagedHostsFileName = managedHostsFileName
+            }),
+            NullLogger<ConfigSetCache>.Instance);
+
+        var snapshot = await cache.GetSnapshotAsync();
+
+        Assert.Equal(Path.GetFullPath(managedPath), snapshot.Set.ManagedFilePath);
+        Assert.Equal(Path.GetFullPath(Path.Combine(managedDir, managedHostsFileName)), snapshot.Set.ManagedHostsFilePath);
+        Assert.Contains(snapshot.Set.Files, f => f.IsManaged && string.Equals(f.Path, Path.GetFullPath(managedPath), StringComparison.Ordinal));
+    }
+}
@@ -0,0 +1,735 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
+using DnsmasqWebUI.Models.Config;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.Config;
+
+/// <summary>
+/// Save-path tests for DnsmasqConfigService.ApplyEffectiveConfigChangesAsync.
+/// Verifies that pending changes produce the correct managed config lines.
+/// </summary>
+public class DnsmasqConfigServiceApplyChangesTests
+{
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_ConntrackTrue_WritesBareFlagLine()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Conntrack, false, true, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            Assert.True(File.Exists(managedPath));
+            var content = await File.ReadAllTextAsync(managedPath);
+            var lines = content.TrimEnd().Split('\n').Select(l => l.Trim()).Where(l => l.Length > 0).ToList();
+            Assert.Contains(lines, l => l == "conntrack");
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_ConntrackFalse_RemovesFlagLine()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            File.WriteAllText(managedPath, "conntrack\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            cache.Invalidate();
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Conntrack, true, false, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            var lines = content.TrimEnd().Split('\n').Select(l => l.Trim()).Where(l => l.Length > 0).ToList();
+            Assert.DoesNotContain(lines, l => l == "conntrack" || l.StartsWith("conntrack=", StringComparison.Ordinal));
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_StripMacTrue_WritesBareFlagLine()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.StripMac, false, true, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            Assert.True(File.Exists(managedPath));
+            var content = await File.ReadAllTextAsync(managedPath);
+            var lines = content.TrimEnd().Split('\n').Select(l => l.Trim()).Where(l => l.Length > 0).ToList();
+            Assert.Contains(lines, l => l == DnsmasqConfKeys.StripMac);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_StripSubnetFalse_RemovesFlagLine()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            File.WriteAllText(managedPath, "strip-subnet\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            cache.Invalidate();
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.StripSubnet, true, false, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            var lines = content.TrimEnd().Split('\n').Select(l => l.Trim()).Where(l => l.Length > 0).ToList();
+            Assert.DoesNotContain(lines, l => l == DnsmasqConfKeys.StripSubnet || l.StartsWith($"{DnsmasqConfKeys.StripSubnet}=", StringComparison.Ordinal));
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_DnssecCheckUnsignedNo_WritesEqualsNo()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionDnssec, DnsmasqConfKeys.DnssecCheckUnsigned, null, "no", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            Assert.True(File.Exists(managedPath));
+            var text = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("dnssec-check-unsigned=no", text);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_SingleValueNull_RemovesExistingLine()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            File.WriteAllText(managedPath, "port=54\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            cache.Invalidate();
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Port, "54", null, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            var lines = content.TrimEnd().Split('\n').Select(l => l.Trim()).Where(l => l.Length > 0).ToList();
+            Assert.DoesNotContain(lines, l => l == DnsmasqConfKeys.Port || l.StartsWith($"{DnsmasqConfKeys.Port}=", StringComparison.Ordinal));
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_KeyOnlyOrValue_KeyOnly_WritesBareKey()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.UseStaleCache, null, "", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            Assert.True(File.Exists(managedPath));
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("use-stale-cache", content);
+            Assert.DoesNotContain("use-stale-cache=", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_InversePair_Enabled_WritesDo0x20Encode()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Do0x20Encode, ExplicitToggleState.Default, ExplicitToggleState.Enabled, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            Assert.True(File.Exists(managedPath));
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("do-0x20-encode", content);
+            Assert.DoesNotContain("no-0x20-encode", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_Do0x20_Default_RemovesBothLines()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            File.WriteAllText(managedPath, "do-0x20-encode\nno-0x20-encode\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            cache.Invalidate();
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Do0x20Encode, ExplicitToggleState.Disabled, ExplicitToggleState.Default, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            var lines = content.TrimEnd().Split('\n').Select(l => l.Trim()).Where(l => l.Length > 0).ToList();
+            Assert.DoesNotContain(lines, l => l == "do-0x20-encode" || l == "no-0x20-encode");
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_Do0x20Enabled_RoundTripsToEffectiveState()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-roundtrip-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Do0x20Encode, ExplicitToggleState.Default, ExplicitToggleState.Enabled, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+            cache.Invalidate();
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal(ExplicitToggleState.Enabled, snapshot.Config.Do0x20EncodeState);
+            Assert.NotNull(snapshot.Sources.Do0x20Encode);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_UseStaleCache_RoundTripsToEffectiveState()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-roundtrip-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.UseStaleCache, null, "60", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+            cache.Invalidate();
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal("60", snapshot.Config.UseStaleCache);
+            Assert.NotNull(snapshot.Sources.UseStaleCache);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_Server_RoundTripsToEffectiveState()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-roundtrip-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Server, null, new List<string> { "1.1.1.1", "8.8.8.8" }, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+            cache.Invalidate();
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.Equal(2, snapshot.Config.ServerValues.Count);
+            Assert.Contains("1.1.1.1", snapshot.Config.ServerValues);
+            Assert.Contains("8.8.8.8", snapshot.Config.ServerValues);
+            Assert.Equal(2, snapshot.Sources.ServerValues.Count);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_Conntrack_RoundTripsToEffectiveState()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-roundtrip-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Conntrack, false, true, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+            cache.Invalidate();
+            var snapshot = await cache.GetSnapshotAsync();
+            Assert.True(snapshot.Config.Conntrack);
+            Assert.NotNull(snapshot.Sources.Conntrack);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_Do0x20_Disabled_WritesNo0x20Encode()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionResolver, DnsmasqConfKeys.Do0x20Encode, ExplicitToggleState.Default, ExplicitToggleState.Disabled, null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("no-0x20-encode", content);
+            Assert.DoesNotContain("do-0x20-encode", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_UseStaleCache_Value_WritesKeyEqualsValue()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.UseStaleCache, null, "60", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("use-stale-cache=60", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_AddMac_KeyOnly_WritesBareKey()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.AddMac, null, "", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("add-mac", content);
+            Assert.DoesNotContain("add-mac=", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_AddMac_ValueBase64_WritesKeyEqualsValue()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.AddMac, null, "base64", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("add-mac=base64", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_AddSubnet_KeyOnly_WritesBareKey()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.AddSubnet, null, "", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("add-subnet", content);
+            Assert.DoesNotContain("add-subnet=", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyChanges_Umbrella_KeyOnly_WritesBareKey()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(EffectiveConfigSections.SectionCache, DnsmasqConfKeys.Umbrella, null, "", null)
+            };
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var content = await File.ReadAllTextAsync(managedPath);
+            Assert.Contains("umbrella", content);
+            Assert.DoesNotContain("umbrella=", content);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task ApplyEffectiveConfigChangesAsync_Leasequery_MultiKeyOnlyOrValue_DoesNotDuplicateReadonlyValues()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-apply-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var readonlyPath = Path.Combine(dir, "readonly.conf");
+        var managedName = "zz-managed.conf";
+        var managedPath = Path.Combine(dir, managedName);
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, $"port=53\nconf-file={readonlyPath}\n");
+            File.WriteAllText(readonlyPath, "leasequery\nleasequery=10.0.0.0/24\n");
+            File.WriteAllText(managedPath, "leasequery=172.16.0.0/16\n");
+
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            cache.Invalidate();
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            // Simulate UI effective values (readonly + managed). Save should write only managed-only values.
+            var changes = new List<PendingEffectiveConfigChange>
+            {
+                new(
+                    EffectiveConfigSections.SectionDhcp,
+                    DnsmasqConfKeys.Leasequery,
+                    null,
+                    new List<string> { "", "10.0.0.0/24", "192.168.50.0/24" },
+                    null)
+            };
+
+            await configService.ApplyEffectiveConfigChangesAsync(changes);
+
+            var lines = (await File.ReadAllLinesAsync(managedPath))
+                .Select(l => l.Trim())
+                .Where(l => l.StartsWith("leasequery", StringComparison.Ordinal))
+                .ToList();
+
+            Assert.Single(lines);
+            Assert.Equal("leasequery=192.168.50.0/24", lines[0]);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+}
@@ -5,7 +5,7 @@ using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.Config;

 /// <summary>
 /// Tests for DnsmasqConfigSetService, including GetEffectiveConfigWithSources.
@@ -0,0 +1,209 @@
+using DnsmasqWebUI.Infrastructure.Serialization.OptionHandlers;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Dhcp;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Models.Dhcp;
+using DnsmasqWebUI.Models.Dhcp.Ui;
+using DnsmasqWebUI.Models.Dnsmasq;
+
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.Dhcp;
+
+public class DhcpPageProjectionServiceTests
+{
+    private static readonly DhcpPageProjectionService Sut = new(new EffectiveMultiValueProjectionService());
+    private static readonly DhcpHostOptionValueHandler Handler = new();
+
+    private static DhcpHostPageRow SyntheticRow(
+        int effectiveIndex,
+        DhcpSourceKind kind,
+        string sourcePath,
+        bool editable,
+        string mac,
+        string? name = null,
+        string? address = "192.168.1.10") =>
+        new(
+            EffectiveIndex: effectiveIndex,
+            ValueString: mac,
+            RowKey: $"t:{effectiveIndex}",
+            OccurrenceId: $"t:{effectiveIndex}",
+            SourceKind: kind,
+            SourcePath: sourcePath,
+            IsDraftOnly: false,
+            IsEditable: editable,
+            IsActive: true,
+            Entry: new DhcpHostEntry
+            {
+                LineNumber = effectiveIndex + 1,
+                MacAddresses = new List<string> { mac },
+                Name = name,
+                Address = address,
+                Lease = "infinite",
+                Extra = new List<string>()
+            },
+            Conflict: null,
+            LinkedLease: null,
+            MatchesManagedStatic: kind == DhcpSourceKind.Managed && editable);
+
+    [Fact]
+    public void BuildHostRows_NullSources_TreatsLinesAsManagedEditable()
+    {
+        var status = MinimalStatus(null, "/managed.conf", "/etc/dnsmasq.conf");
+        var values = new[] { "aa:bb:cc:dd:ee:ff,192.168.1.2" };
+
+        var rows = Sut.BuildHostRows(status, values, Handler);
+
+        Assert.Single(rows);
+        Assert.True(rows[0].IsEditable);
+        Assert.Equal(DhcpSourceKind.Managed, rows[0].SourceKind);
+    }
+
+    [Fact]
+    public void ApplyHostConflictsAndLeases_DetectsDuplicateMac()
+    {
+        var entry1 = new DhcpHostEntry
+        {
+            LineNumber = 1,
+            MacAddresses = new List<string> { "aa:bb:cc:dd:ee:ff" },
+            Address = "192.168.1.2"
+        };
+        var entry2 = new DhcpHostEntry
+        {
+            LineNumber = 2,
+            MacAddresses = new List<string> { "aa:bb:cc:dd:ee:ff" },
+            Address = "192.168.1.3"
+        };
+        var rows = new List<DhcpHostPageRow>
+        {
+            new(0, "a", "k0", "k0", DhcpSourceKind.Managed, "/m", false, true, true, entry1, null, null, true),
+            new(1, "b", "k1", "k1", DhcpSourceKind.Managed, "/m", false, true, true, entry2, null, null, true)
+        };
+
+        DhcpPageProjectionService.ApplyHostConflictsAndLeases(rows, null, null);
+
+        Assert.NotNull(rows[0].Conflict);
+        Assert.True(rows[0].Conflict!.DuplicateMac);
+        Assert.NotNull(rows[1].Conflict);
+        Assert.True(rows[1].Conflict!.DuplicateMac);
+    }
+
+    [Fact]
+    public void BuildHostGroups_PrependsEmptyManagedGroupWhenOnlyExternalRows()
+    {
+        var rows = new[]
+        {
+            SyntheticRow(0, DhcpSourceKind.MainConfig, "/etc/dnsmasq.conf", false, "aa:bb:cc:dd:ee:01")
+        };
+        var query = new DhcpPageQueryState("", null, DhcpHostSortMode.LineNumber, false);
+        var groups = Sut.BuildHostGroups(rows, query, "/var/lib/dnsmasq/managed.conf");
+
+        Assert.True(groups.Count >= 2);
+        Assert.Equal(DhcpSourceKind.Managed, groups[0].SourceKind);
+        Assert.Empty(groups[0].Rows);
+        Assert.True(groups[0].IsSourceEditable);
+        Assert.Single(groups[1].Rows);
+    }
+
+    [Fact]
+    public void BuildHostGroups_OrdersManagedGroupBeforeMainConfig()
+    {
+        var rows = new[]
+        {
+            SyntheticRow(1, DhcpSourceKind.MainConfig, "/etc/dnsmasq.conf", false, "aa:bb:cc:dd:ee:02"),
+            SyntheticRow(0, DhcpSourceKind.Managed, "/m.conf", true, "aa:bb:cc:dd:ee:01")
+        };
+        var query = new DhcpPageQueryState("", null, DhcpHostSortMode.LineNumber, false);
+        var groups = Sut.BuildHostGroups(rows, query, "/m.conf");
+
+        Assert.Equal(2, groups.Count);
+        Assert.Equal(DhcpSourceKind.Managed, groups[0].SourceKind);
+        Assert.Equal(DhcpSourceKind.MainConfig, groups[1].SourceKind);
+    }
+
+    [Fact]
+    public void BuildHostGroups_SearchKeepsOnlyMatchingRows()
+    {
+        var rows = new[]
+        {
+            SyntheticRow(0, DhcpSourceKind.Managed, "/m.conf", true, "aa:bb:cc:dd:ee:01", name: "printer-one"),
+            SyntheticRow(1, DhcpSourceKind.Managed, "/m.conf", true, "aa:bb:cc:dd:ee:02", name: "router-fw")
+        };
+        var query = new DhcpPageQueryState("printer", null, DhcpHostSortMode.LineNumber, false);
+        var groups = Sut.BuildHostGroups(rows, query, "/m.conf");
+
+        Assert.Single(groups);
+        Assert.Single(groups[0].Rows);
+        Assert.Contains("printer", groups[0].Rows[0].Entry.Name, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void BuildLeaseRows_FlagsManagedStaticWhenMacMatchesEditableRow()
+    {
+        var status = MinimalStatus(null, "/m.conf", "/etc/dnsmasq.conf");
+        var hostRows = new[]
+        {
+            SyntheticRow(0, DhcpSourceKind.Managed, "/m.conf", true, "11:22:33:44:55:66")
+        };
+        var leases = new List<LeaseEntry>
+        {
+            new()
+            {
+                Epoch = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
+                Mac = "11:22:33:44:55:66",
+                Address = "192.168.1.50",
+                Name = "x",
+                ClientId = ""
+            }
+        };
+
+        var vms = Sut.BuildLeaseRows(status, leases, hostRows);
+
+        Assert.Single(vms);
+        Assert.True(vms[0].HasManagedStaticByMac);
+        Assert.True(vms[0].HasAnyStaticByMac);
+    }
+
+    [Fact]
+    public void ApplyHostConflictsAndLeases_DetectsDuplicateAddress()
+    {
+        var entry1 = new DhcpHostEntry
+        {
+            LineNumber = 1,
+            MacAddresses = new List<string> { "aa:bb:cc:dd:ee:01" },
+            Address = "192.168.1.5"
+        };
+        var entry2 = new DhcpHostEntry
+        {
+            LineNumber = 2,
+            MacAddresses = new List<string> { "aa:bb:cc:dd:ee:02" },
+            Address = "192.168.1.5"
+        };
+        var rows = new List<DhcpHostPageRow>
+        {
+            new(0, "a", "k0", "k0", DhcpSourceKind.Managed, "/m", false, true, true, entry1, null, null, true),
+            new(1, "b", "k1", "k1", DhcpSourceKind.Managed, "/m", false, true, true, entry2, null, null, true)
+        };
+
+        DhcpPageProjectionService.ApplyHostConflictsAndLeases(rows, null, null);
+
+        Assert.NotNull(rows[0].Conflict);
+        Assert.True(rows[0].Conflict!.DuplicateAddress);
+        Assert.True(rows[1].Conflict!.DuplicateAddress);
+    }
+
+    private static DnsmasqServiceStatus MinimalStatus(
+        DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig.EffectiveConfigSources? sources,
+        string managedPath,
+        string mainPath) =>
+        new(
+            SystemHostsPath: null, SystemHostsPathExists: false, ManagedHostsFilePath: null, ManagedHostsPathExists: false,
+            NoHosts: false, AddnHostsPaths: [],
+            EffectiveConfig: null,
+            EffectiveConfigSources: sources,
+            MainConfigPath: mainPath, ManagedFilePath: managedPath, LeasesPath: null,
+            MainConfigPathExists: true, ManagedFilePathExists: true, LeasesPathConfigured: false, LeasesPathExists: false,
+            ConfigFiles: null, ReloadCommandConfigured: false, StatusCommandConfigured: false, StatusShowConfigured: false,
+            LogsConfigured: false, LogsPath: null, StatusShowCommand: null, LogsCommand: null,
+            DnsmasqStatus: "active", StatusCommandExitCode: null, StatusCommandStdout: null, StatusCommandStderr: null,
+            StatusShowOutput: null, LogsOutput: null, DhcpRangeStart: null, DhcpRangeEnd: null,
+            DnsmasqVersion: null, MinimumSupportedDnsmasqVersion: "2.90", DnsmasqVersionSupported: true, DnsmasqVersionError: null,
+            DnsmasqSupportsDhcp: true, DnsmasqSupportsTftp: true, DnsmasqSupportsDnssec: false, DnsmasqSupportsDbus: false);
+}
@@ -0,0 +1,131 @@
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.DnsRecords;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.DnsRecords.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using static DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata.EffectiveConfigSections;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Models.DnsRecords;
+
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.DnsRecords;
+
+public class DnsRecordDirectiveCodecProviderTests
+{
+    private readonly IDnsRecordDirectiveCodecProvider _provider = new DnsRecordDirectiveCodecProvider();
+
+    [Fact]
+    public void CnameCodec_RoundTrip_PreservesValue()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.Cname);
+        const string raw = "alias1,alias2,target.example.com,3600";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+        var p = Assert.IsType<CnamePayload>(row.Payload);
+        Assert.Equal(new[] { "alias1", "alias2" }, p.Aliases);
+        Assert.Equal("target.example.com", p.Target);
+        Assert.Equal(3600, p.Ttl);
+    }
+
+    [Fact]
+    public void AuthSoaCodec_RoundTrip_KeepsRefreshInCorrectSlotWhenHostmasterBlank()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.AuthSoa);
+        const string raw = "42,,3600";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+        var p = Assert.IsType<AuthSoaPayload>(row.Payload);
+        Assert.Equal("42", p.Serial);
+        Assert.Equal("3600", p.Refresh);
+    }
+
+    [Fact]
+    public void AuthSoaCodec_RoundTrip_FullLineWithHostmaster()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.AuthSoa);
+        const string raw = "1,hostmaster.example.com,3600,600,86400";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+        var p = Assert.IsType<AuthSoaPayload>(row.Payload);
+        Assert.Equal("1", p.Serial);
+        Assert.Equal("hostmaster.example.com", p.Hostmaster);
+        Assert.Equal("3600", p.Refresh);
+        Assert.Equal("600", p.Retry);
+        Assert.Equal("86400", p.Expiry);
+    }
+
+    [Fact]
+    public void AuthSoaCodec_RoundTrip_SerialOnly()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.AuthSoa);
+        const string raw = "99";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+    }
+
+    [Fact]
+    public void HostRecordCodec_RoundTrip_OwnersIpv4AndTtl()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.HostRecord);
+        const string raw = "host.example.com,www.host.example.com,192.168.1.10,120";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+        var p = Assert.IsType<HostRecordPayload>(row.Payload);
+        Assert.Equal(new[] { "host.example.com", "www.host.example.com" }, p.Owners);
+        Assert.Equal("192.168.1.10", p.IPv4);
+        Assert.Equal(120, p.Ttl);
+    }
+
+    [Fact]
+    public void SrvCodec_RoundTrip_PreservesValue()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.Srv);
+        const string raw = "_sip._tcp.example.com,host.example.com,5060,10,5";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+        var p = Assert.IsType<SrvPayload>(row.Payload);
+        Assert.Equal("_sip._tcp.example.com", p.ServiceName);
+        Assert.Equal("host.example.com", p.Target);
+        Assert.Equal(5060, p.Port);
+        Assert.Equal(10, p.Priority);
+        Assert.Equal(5, p.Weight);
+    }
+
+    [Fact]
+    public void SrvCodec_RoundTrip_ServiceAndTargetOnly_NoTrailingZeros()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.Srv);
+        const string raw = "_sip._tcp.example.com,host.example.com";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+        var p = Assert.IsType<SrvPayload>(row.Payload);
+        Assert.Null(p.Port);
+        Assert.Null(p.Priority);
+        Assert.Null(p.Weight);
+    }
+
+    [Fact]
+    public void SrvCodec_RoundTrip_ServiceTargetPort_OmitsPriorityAndWeight()
+    {
+        var codec = _provider.Get(DnsmasqConfKeys.Srv);
+        const string raw = "_http._tcp.example.com,host.example.com,80";
+        var row = codec.Parse(new ValueWithSource(raw, null), 0);
+        Assert.Equal(raw, codec.Serialize(row));
+        var p = Assert.IsType<SrvPayload>(row.Payload);
+        Assert.Equal(80, p.Port);
+        Assert.Null(p.Priority);
+        Assert.Null(p.Weight);
+    }
+
+    [Fact]
+    public void Provider_ListsEveryDnsRecordsSectionOptionExceptAdjunctFlags()
+    {
+        var sectionOptions = Sections
+            .First(s => s.SectionId == SectionDnsRecords)
+            .OptionNames;
+
+        foreach (var name in sectionOptions)
+        {
+            if (name is DnsmasqConfKeys.MxTarget or DnsmasqConfKeys.Localmx or DnsmasqConfKeys.Selfmx)
+                continue;
+            Assert.True(_provider.TryGet(name, out var c) && c != null, $"Missing codec for {name}");
+        }
+    }
+}
@@ -0,0 +1,534 @@
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.DnsRecords;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.DnsRecords.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Models.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Models.DnsRecords;
+
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.DnsRecords;
+
+public class DnsRecordsPageProjectionServiceTests
+{
+    private readonly DnsRecordsPageProjectionService _sut = new(
+        new DnsRecordDirectiveCodecProvider(),
+        new NoopOptionSemanticValidator(),
+        new EffectiveMultiValueProjectionService());
+
+    [Fact]
+    public void BuildRows_ReturnsEmpty_WhenEffectiveConfigNull()
+    {
+        var status = MinimalStatus() with { EffectiveConfig = null };
+        Assert.Empty(_sut.BuildRows(status));
+    }
+
+    [Fact]
+    public void FilterRows_HidesReadOnly_WhenShowReadOnlyFalse()
+    {
+        var rows = new[]
+        {
+            Row("a", DnsmasqConfKeys.Cname, DnsRecordFamily.Cname, "x,y", editable: true),
+            Row("b", DnsmasqConfKeys.Cname, DnsRecordFamily.Cname, "p,q", editable: false),
+        };
+        var q = new DnsRecordsQueryState("", DnsRecordsUiFamily.All, null, ShowReadOnly: false, OnlyWithIssues: false);
+        var filtered = _sut.FilterRows(rows, q);
+        Assert.Single(filtered);
+        Assert.Equal("a", filtered[0].Id);
+    }
+
+    [Fact]
+    public void FilterRows_SourcePathFilter_MatchesFilePath()
+    {
+        var src = new ConfigValueSource("/etc/extra.conf", "extra.conf", IsManaged: false);
+        var rows = new[]
+        {
+            Row("a", DnsmasqConfKeys.Cname, DnsRecordFamily.Cname, "x,y", editable: true, source: src),
+            Row("b", DnsmasqConfKeys.Cname, DnsRecordFamily.Cname, "p,q", editable: true, source: null),
+        };
+        var q = new DnsRecordsQueryState("", DnsRecordsUiFamily.All, "/etc/extra.conf", true, false);
+        var filtered = _sut.FilterRows(rows, q);
+        Assert.Single(filtered);
+        Assert.Equal("a", filtered[0].Id);
+    }
+
+    [Fact]
+    public void FilterRows_Search_MatchesSummaryCaseInsensitive()
+    {
+        var rows = new[]
+        {
+            Row("a", DnsmasqConfKeys.Cname, DnsRecordFamily.Cname, "x,y", editable: true, summary: "Alpha summary"),
+            Row("b", DnsmasqConfKeys.Cname, DnsRecordFamily.Cname, "p,q", editable: true, summary: "Beta"),
+        };
+        var q = new DnsRecordsQueryState("alpha", DnsRecordsUiFamily.All, null, true, false);
+        var filtered = _sut.FilterRows(rows, q);
+        Assert.Single(filtered);
+        Assert.Equal("a", filtered[0].Id);
+    }
+
+    [Fact]
+    public void FilterRows_UiFamily_Advanced_KeepsOnlyAdvancedFamilies()
+    {
+        var rows = new[]
+        {
+            Row("c", DnsmasqConfKeys.Cname, DnsRecordFamily.Cname, "x,y", true),
+            Row("n", DnsmasqConfKeys.NaptrRecord, DnsRecordFamily.Naptr, "1", true, payload: new NaptrPayload("e.com", "1", "2", "s", "SIP", "!^.*$!", "_sip._udp.example.com")),
+        };
+        var q = new DnsRecordsQueryState("", DnsRecordsUiFamily.Advanced, null, true, false);
+        var filtered = _sut.FilterRows(rows, q);
+        Assert.Single(filtered);
+        Assert.Equal("n", filtered[0].Id);
+    }
+
+    [Fact]
+    public void BuildRows_CurrentValuesAccessor_UsesDraftValuesAndManagedSourcePathForUnmatchedRows()
+    {
+        var status = MinimalStatus() with
+        {
+            ManagedFilePath = "/managed.conf",
+            EffectiveConfig = MinimalConfig() with { CnameValues = ["disk.example,target.example"] },
+            EffectiveConfigSources = MinimalSources() with
+            {
+                CnameValues = [new ValueWithSource("disk.example,target.example", new ConfigValueSource("/etc/dnsmasq.d/base.conf", "base.conf", false, 12))]
+            }
+        };
+
+        var rows = _sut.BuildRows(status, optionName => optionName == DnsmasqConfKeys.Cname
+            ? ["draft.example,target.example"]
+            : []);
+
+        var row = Assert.Single(rows);
+        Assert.Equal("draft.example,target.example", row.RawValue);
+        Assert.True(row.IsDraftOnly);
+        Assert.True(row.IsEditable);
+        Assert.Equal("/managed.conf", row.SourcePath);
+        Assert.Equal("managed.conf", row.SourceLabel);
+    }
+
+    private static DnsRecordRow Row(
+        string id,
+        string optionName,
+        DnsRecordFamily family,
+        string rawValue,
+        bool editable,
+        ConfigValueSource? source = null,
+        DnsRecordPayload? payload = null,
+        string? summary = null,
+        IReadOnlyList<DnsRecordIssue>? issues = null) =>
+        new(
+            id,
+            id,
+            optionName,
+            family,
+            IndexInOption: 0,
+            rawValue,
+            source,
+            source?.FilePath,
+            source?.FileName,
+            false,
+            editable,
+            payload ?? new CnamePayload(["x"], "y", null),
+            issues ?? [],
+            summary ?? rawValue);
+
+    private static EffectiveDnsmasqConfig MinimalConfig() =>
+        new(
+            NoHosts: false,
+            AddnHostsPaths: [],
+            HostsdirPath: null,
+            ServerValues: [],
+            LocalValues: [],
+            RevServerValues: [],
+            AddressValues: [],
+            Interfaces: [],
+            ListenAddresses: [],
+            ExceptInterfaces: [],
+            DhcpRanges: [],
+            DhcpHostLines: [],
+            DhcpOptionLines: [],
+            DhcpMatchValues: [],
+            DhcpBootValues: [],
+            DhcpIgnoreValues: [],
+            DhcpVendorclassValues: [],
+            DhcpUserclassValues: [],
+            RaParamValues: [],
+            SlaacValues: [],
+            PxeServiceValues: [],
+            TrustAnchorValues: [],
+            ResolvFiles: [],
+            RebindDomainOkValues: [],
+            BogusNxdomainValues: [],
+            IgnoreAddressValues: [],
+            AliasValues: [],
+            FilterRrValues: [],
+            CacheRrValues: [],
+            AuthServerValues: [],
+            NoDhcpInterfaceValues: [],
+            NoDhcpv4InterfaceValues: [],
+            NoDhcpv6InterfaceValues: [],
+            DomainValues: [],
+            CnameValues: [],
+            MxHostValues: [],
+            SrvValues: [],
+            PtrRecordValues: [],
+            TxtRecordValues: [],
+            NaptrRecordValues: [],
+            HostRecordValues: [],
+            DynamicHostValues: [],
+            InterfaceNameValues: [],
+            DhcpOptionForceLines: [],
+            IpsetValues: [],
+            NftsetValues: [],
+            DhcpMacValues: [],
+            DhcpNameMatchValues: [],
+            DhcpIgnoreNamesValues: [],
+            DhcpHostsfilePaths: [],
+            DhcpOptsfilePaths: [],
+            DhcpHostsdirPaths: [],
+            DhcpOptsdirPaths: [],
+            ConnmarkAllowlistValues: [],
+            CaaRecordValues: [],
+            DnsRrValues: [],
+            SynthDomainValues: [],
+            AuthZoneValues: [],
+            AuthSoaValues: [],
+            AuthSecServersValues: [],
+            AuthPeerValues: [],
+            DhcpRelayValues: [],
+            DhcpCircuitidValues: [],
+            DhcpRemoteidValues: [],
+            DhcpSubscridValues: [],
+            DhcpProxyValues: [],
+            TagIfValues: [],
+            BridgeInterfaceValues: [],
+            SharedNetworkValues: [],
+            DhcpOptionPxeValues: [],
+            ExpandHosts: false,
+            BogusPriv: false,
+            StrictOrder: false,
+            AllServers: false,
+            NoResolv: false,
+            DomainNeeded: false,
+            NoPoll: false,
+            BindInterfaces: false,
+            BindDynamic: false,
+            NoNegcache: false,
+            DnsLoopDetect: false,
+            StopDnsRebind: false,
+            RebindLocalhostOk: false,
+            ClearOnReload: false,
+            Filterwin2k: false,
+            FilterA: false,
+            FilterAaaa: false,
+            LocaliseQueries: false,
+            LogDebug: false,
+            DhcpAuthoritative: false,
+            LeasefileRo: false,
+            EnableTftp: false,
+            TftpSecure: false,
+            TftpNoFail: false,
+            TftpNoBlocksize: false,
+            Dnssec: false,
+            DnssecCheckUnsigned: null,
+            ReadEthers: false,
+            DhcpRapidCommit: false,
+            Localmx: false,
+            Selfmx: false,
+            EnableRa: false,
+            LogDhcp: false,
+            KeepInForeground: false,
+            NoDaemon: false,
+            ProxyDnssec: false,
+            ConnmarkAllowlistEnable: null,
+            NoRoundRobin: false,
+            DnssecNoTimecheck: false,
+            DnssecDebug: false,
+            LeasequeryValues: [],
+            DhcpGenerateNames: null,
+            DhcpBroadcast: null,
+            DhcpSequentialIp: false,
+            DhcpIgnoreClid: false,
+            BootpDynamic: null,
+            NoPing: false,
+            ScriptArp: false,
+            ScriptOnRenewal: false,
+            DhcpNoOverride: false,
+            QuietDhcp: false,
+            QuietDhcp6: false,
+            QuietRa: false,
+            QuietTftp: false,
+            DhcpLeaseFilePath: null,
+            CacheSize: null,
+            Port: null,
+            LocalTtl: null,
+            PidFilePath: null,
+            User: null,
+            Group: null,
+            LogFacility: null,
+            LogQueries: null,
+            AuthTtl: null,
+            EdnsPacketMax: null,
+            QueryPort: null,
+            PortLimit: null,
+            MinPort: null,
+            MaxPort: null,
+            LogAsync: null,
+            LocalService: null,
+            DhcpLeaseMax: null,
+            NegTtl: null,
+            MaxTtl: null,
+            MaxCacheTtl: null,
+            MinCacheTtl: null,
+            DhcpTtl: null,
+            TftpRootPath: null,
+            PxePrompt: null,
+            EnableDbus: null,
+            EnableUbus: null,
+            FastDnsRetry: null,
+            DhcpScriptPath: null,
+            MxTarget: null,
+            DnsForwardMax: null,
+            DumpfilePath: null,
+            Dumpmask: null,
+            AddCpeId: null,
+            DnssecTimestamp: null,
+            DnssecLimits: null,
+            DhcpAlternatePort: null,
+            DhcpDuid: null,
+            DhcpLuascriptPath: null,
+            DhcpScriptuser: null,
+            DhcpPxeVendor: null,
+            UseStaleCache: null,
+            AddMac: null,
+            StripMac: false,
+            AddSubnet: null,
+            StripSubnet: false,
+            Umbrella: null,
+            Do0x20EncodeState: ExplicitToggleState.Default,
+            Conntrack: false);
+
+    private static EffectiveConfigSources MinimalSources() =>
+        new(
+            NoHosts: null,
+            AddnHostsPaths: [],
+            HostsdirPath: null,
+            ServerValues: [],
+            LocalValues: [],
+            RevServerValues: [],
+            AddressValues: [],
+            Interfaces: [],
+            ListenAddresses: [],
+            ExceptInterfaces: [],
+            DhcpRanges: [],
+            DhcpHostLines: [],
+            DhcpOptionLines: [],
+            DhcpMatchValues: [],
+            DhcpBootValues: [],
+            DhcpIgnoreValues: [],
+            DhcpVendorclassValues: [],
+            DhcpUserclassValues: [],
+            RaParamValues: [],
+            SlaacValues: [],
+            PxeServiceValues: [],
+            TrustAnchorValues: [],
+            ResolvFiles: [],
+            RebindDomainOkValues: [],
+            BogusNxdomainValues: [],
+            IgnoreAddressValues: [],
+            AliasValues: [],
+            FilterRrValues: [],
+            CacheRrValues: [],
+            AuthServerValues: [],
+            NoDhcpInterfaceValues: [],
+            NoDhcpv4InterfaceValues: [],
+            NoDhcpv6InterfaceValues: [],
+            DomainValues: [],
+            CnameValues: [],
+            MxHostValues: [],
+            SrvValues: [],
+            PtrRecordValues: [],
+            TxtRecordValues: [],
+            NaptrRecordValues: [],
+            HostRecordValues: [],
+            DynamicHostValues: [],
+            InterfaceNameValues: [],
+            DhcpOptionForceLines: [],
+            IpsetValues: [],
+            NftsetValues: [],
+            DhcpMacValues: [],
+            DhcpNameMatchValues: [],
+            DhcpIgnoreNamesValues: [],
+            DhcpHostsfilePaths: [],
+            DhcpOptsfilePaths: [],
+            DhcpHostsdirPaths: [],
+            DhcpOptsdirPaths: [],
+            ConnmarkAllowlistValues: [],
+            CaaRecordValues: [],
+            DnsRrValues: [],
+            SynthDomainValues: [],
+            AuthZoneValues: [],
+            AuthSoaValues: [],
+            AuthSecServersValues: [],
+            AuthPeerValues: [],
+            DhcpRelayValues: [],
+            DhcpCircuitidValues: [],
+            DhcpRemoteidValues: [],
+            DhcpSubscridValues: [],
+            DhcpProxyValues: [],
+            TagIfValues: [],
+            BridgeInterfaceValues: [],
+            SharedNetworkValues: [],
+            DhcpOptionPxeValues: [],
+            ExpandHosts: null,
+            BogusPriv: null,
+            StrictOrder: null,
+            AllServers: null,
+            NoResolv: null,
+            DomainNeeded: null,
+            NoPoll: null,
+            BindInterfaces: null,
+            BindDynamic: null,
+            NoNegcache: null,
+            DnsLoopDetect: null,
+            StopDnsRebind: null,
+            RebindLocalhostOk: null,
+            ClearOnReload: null,
+            Filterwin2k: null,
+            FilterA: null,
+            FilterAaaa: null,
+            LocaliseQueries: null,
+            LogDebug: null,
+            DhcpAuthoritative: null,
+            LeasefileRo: null,
+            EnableTftp: null,
+            TftpSecure: null,
+            TftpNoFail: null,
+            TftpNoBlocksize: null,
+            Dnssec: null,
+            DnssecCheckUnsigned: null,
+            ReadEthers: null,
+            DhcpRapidCommit: null,
+            Localmx: null,
+            Selfmx: null,
+            EnableRa: null,
+            LogDhcp: null,
+            KeepInForeground: null,
+            NoDaemon: null,
+            ProxyDnssec: null,
+            ConnmarkAllowlistEnable: null,
+            NoRoundRobin: null,
+            DnssecNoTimecheck: null,
+            DnssecDebug: null,
+            LeasequeryValues: [],
+            DhcpGenerateNames: null,
+            DhcpBroadcast: null,
+            DhcpSequentialIp: null,
+            DhcpIgnoreClid: null,
+            BootpDynamic: null,
+            NoPing: null,
+            ScriptArp: null,
+            ScriptOnRenewal: null,
+            DhcpNoOverride: null,
+            QuietDhcp: null,
+            QuietDhcp6: null,
+            QuietRa: null,
+            QuietTftp: null,
+            DhcpLeaseFilePath: null,
+            CacheSize: null,
+            Port: null,
+            LocalTtl: null,
+            PidFilePath: null,
+            User: null,
+            Group: null,
+            LogFacility: null,
+            LogQueries: null,
+            AuthTtl: null,
+            EdnsPacketMax: null,
+            QueryPort: null,
+            PortLimit: null,
+            MinPort: null,
+            MaxPort: null,
+            LogAsync: null,
+            LocalService: null,
+            DhcpLeaseMax: null,
+            NegTtl: null,
+            MaxTtl: null,
+            MaxCacheTtl: null,
+            MinCacheTtl: null,
+            DhcpTtl: null,
+            TftpRootPath: null,
+            PxePrompt: null,
+            EnableDbus: null,
+            EnableUbus: null,
+            FastDnsRetry: null,
+            DhcpScriptPath: null,
+            MxTarget: null,
+            DnsForwardMax: null,
+            DumpfilePath: null,
+            Dumpmask: null,
+            AddCpeId: null,
+            DnssecTimestamp: null,
+            DnssecLimits: null,
+            DhcpAlternatePort: null,
+            DhcpDuid: null,
+            DhcpLuascriptPath: null,
+            DhcpScriptuser: null,
+            DhcpPxeVendor: null,
+            UseStaleCache: null,
+            AddMac: null,
+            StripMac: null,
+            AddSubnet: null,
+            StripSubnet: null,
+            Umbrella: null,
+            Do0x20Encode: null,
+            Conntrack: null);
+
+    private static DnsmasqServiceStatus MinimalStatus() =>
+        new(
+            SystemHostsPath: null,
+            SystemHostsPathExists: false,
+            ManagedHostsFilePath: null,
+            ManagedHostsPathExists: false,
+            NoHosts: false,
+            AddnHostsPaths: [],
+            EffectiveConfig: null,
+            EffectiveConfigSources: null,
+            MainConfigPath: null,
+            ManagedFilePath: null,
+            LeasesPath: null,
+            MainConfigPathExists: false,
+            ManagedFilePathExists: false,
+            LeasesPathConfigured: false,
+            LeasesPathExists: false,
+            ConfigFiles: null,
+            ReloadCommandConfigured: false,
+            StatusCommandConfigured: false,
+            StatusShowConfigured: false,
+            LogsConfigured: false,
+            LogsPath: null,
+            StatusShowCommand: null,
+            LogsCommand: null,
+            DnsmasqStatus: "active",
+            StatusCommandExitCode: null,
+            StatusCommandStdout: null,
+            StatusCommandStderr: null,
+            StatusShowOutput: null,
+            LogsOutput: null,
+            DhcpRangeStart: null,
+            DhcpRangeEnd: null,
+            DnsmasqVersion: null,
+            MinimumSupportedDnsmasqVersion: "2.91",
+            DnsmasqVersionSupported: true,
+            DnsmasqVersionError: null,
+            DnsmasqSupportsDhcp: true,
+            DnsmasqSupportsTftp: true,
+            DnsmasqSupportsDnssec: true,
+            DnsmasqSupportsDbus: false);
+
+    private sealed class NoopOptionSemanticValidator : IOptionSemanticValidator
+    {
+        public string? ValidateSingle(string optionName, object? value, OptionValidationSemantics semantics) => null;
+
+        public string? ValidateMultiItem(string optionName, string? value, OptionValidationSemantics semantics) => null;
+    }
+}
@@ -0,0 +1,462 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Rules;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig.CrossOption;
+
+public class CrossOptionRulesTests
+{
+    private static EffectiveConfigCrossOptionContext Ctx(EffectiveDnsmasqConfig cfg) =>
+        new(CrossOptionTestHelpers.Status(cfg), []);
+
+    [Fact]
+    public void NoResolvWithoutUpstreamsRule_Warns_when_no_server_and_no_resolv_file()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { NoResolv = true };
+        var rule = new NoResolvWithoutUpstreamsRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        var key = EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.Server);
+        Assert.Single(issues);
+        Assert.Equal(key, issues[0].FieldKey);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+    }
+
+    [Fact]
+    public void NoResolvWithoutUpstreamsRule_No_issue_when_resolv_file_configured()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            NoResolv = true,
+            ResolvFiles = ["/run/resolv.conf"]
+        };
+        var rule = new NoResolvWithoutUpstreamsRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void ConntrackWithQueryPortRule_Error_when_both_set()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { Conntrack = true, QueryPort = 5353 };
+        var rule = new ConntrackWithQueryPortRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Error, issues[0].Severity);
+        Assert.Contains("query-port", issues[0].Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void RebindExceptionsRequireStopDnsRebindRule_Warns_on_localhost_ok_without_stop()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { RebindLocalhostOk = true };
+        var rule = new RebindExceptionsRequireStopDnsRebindRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+    }
+
+    [Fact]
+    public void BogusPrivBlocksPrivateReverseServerRule_Warns_for_private_in_addr_server()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            BogusPriv = true,
+            ServerValues = ["/0.168.192.in-addr.arpa/10.0.0.1"]
+        };
+        var rule = new BogusPrivBlocksPrivateReverseServerRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.Server),
+            issues[0].FieldKey);
+    }
+
+    [Theory]
+    [InlineData("/10.in-addr.arpa/8.8.8.8")]
+    [InlineData("/31.172.in-addr.arpa/8.8.8.8")]
+    public void BogusPrivBlocksPrivateReverseServerRule_Warns_for_rfc1918_zone_roots(string serverValue)
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            BogusPriv = true,
+            ServerValues = [serverValue]
+        };
+        var rule = new BogusPrivBlocksPrivateReverseServerRule();
+        Assert.Single(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Theory]
+    [InlineData("/210.in-addr.arpa/8.8.8.8")]
+    [InlineData("/110.in-addr.arpa/8.8.8.8")]
+    [InlineData("/1.0.0.192.in-addr.arpa/8.8.8.8")]
+    [InlineData("/15.172.in-addr.arpa/8.8.8.8")]
+    [InlineData("/32.172.in-addr.arpa/8.8.8.8")]
+    [InlineData("/10.0.0.192.in-addr.arpa/8.8.8.8")]
+    public void BogusPrivBlocksPrivateReverseServerRule_No_issue_for_non_private_in_addr_substrings(string serverValue)
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            BogusPriv = true,
+            ServerValues = [serverValue]
+        };
+        var rule = new BogusPrivBlocksPrivateReverseServerRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Theory]
+    [InlineData("192.168.1.0/24,8.8.8.8")]
+    [InlineData("10.0.0.0/8,8.8.8.8")]
+    [InlineData("172.16.0.0/12,8.8.8.8")]
+    public void BogusPrivBlocksPrivateReverseServerRule_Warns_for_rfc1918_rev_server(string revServerValue)
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            BogusPriv = true,
+            RevServerValues = [revServerValue]
+        };
+        var rule = new BogusPrivBlocksPrivateReverseServerRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.RevServer),
+            issues[0].FieldKey);
+    }
+
+    [Theory]
+    [InlineData("8.8.8.0/24,1.1.1.1")]
+    [InlineData("1.0.0.0/8,1.1.1.1")]
+    public void BogusPrivBlocksPrivateReverseServerRule_No_issue_for_public_rev_server(string revServerValue)
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            BogusPriv = true,
+            RevServerValues = [revServerValue]
+        };
+        var rule = new BogusPrivBlocksPrivateReverseServerRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void BogusPrivBlocksPrivateReverseServerRule_Emits_separate_issues_for_server_and_rev_server()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            BogusPriv = true,
+            ServerValues = ["/0.168.192.in-addr.arpa/10.0.0.1"],
+            RevServerValues = ["192.168.2.0/24,8.8.8.8"]
+        };
+        var rule = new BogusPrivBlocksPrivateReverseServerRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Equal(2, issues.Count);
+        Assert.Contains(
+            issues,
+            i => i.FieldKey == EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.Server));
+        Assert.Contains(
+            issues,
+            i => i.FieldKey == EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.RevServer));
+    }
+
+    [Fact]
+    public void BogusPrivBlocksPrivateReverseServerRule_Pending_rev_server_overrides_disk()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            BogusPriv = true,
+            RevServerValues = ["8.8.8.0/24,1.1.1.1"]
+        };
+        var pending = new[]
+        {
+            new PendingOptionChange(
+                "resolver",
+                DnsmasqConfKeys.RevServer,
+                Array.Empty<string>(),
+                new[] { "192.168.1.0/24,8.8.8.8" },
+                null)
+        };
+        var ctx = new EffectiveConfigCrossOptionContext(CrossOptionTestHelpers.Status(cfg), pending);
+        var rule = new BogusPrivBlocksPrivateReverseServerRule();
+        var issues = rule.Evaluate(ctx);
+        Assert.Single(issues);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.RevServer),
+            issues[0].FieldKey);
+    }
+
+    [Fact]
+    public void NoPingWithDhcpSequentialIpRule_Warns_when_both_set()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            NoPing = true,
+            DhcpSequentialIp = true
+        };
+        var rule = new NoPingWithDhcpSequentialIpRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.DhcpSequentialIp),
+            issues[0].FieldKey);
+    }
+
+    [Theory]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NoPingWithDhcpSequentialIpRule_No_issue_unless_both(bool noPing, bool sequential)
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            NoPing = noPing,
+            DhcpSequentialIp = sequential
+        };
+        var rule = new NoPingWithDhcpSequentialIpRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void DnsPortZeroWithTftpOrPxeRule_Warns_when_port_zero_and_enable_tftp()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            Port = 0,
+            EnableTftp = true
+        };
+        var rule = new DnsPortZeroWithTftpOrPxeRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.Port),
+            issues[0].FieldKey);
+    }
+
+    [Fact]
+    public void DnsPortZeroWithTftpOrPxeRule_Warns_when_port_zero_and_pxe_service()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            Port = 0,
+            PxeServiceValues = ["x86PC,Boot from network,pxelinux"]
+        };
+        var rule = new DnsPortZeroWithTftpOrPxeRule();
+        Assert.Single(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void DnsPortZeroWithTftpOrPxeRule_No_issue_when_port_nonzero_even_with_netboot()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            Port = 53,
+            EnableTftp = true,
+            PxeServiceValues = ["x86PC,Boot from network,pxelinux"]
+        };
+        var rule = new DnsPortZeroWithTftpOrPxeRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void DnsPortZeroWithTftpOrPxeRule_No_issue_when_port_zero_without_tftp_or_pxe()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { Port = 0 };
+        var rule = new DnsPortZeroWithTftpOrPxeRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void DnssecPrerequisitesRule_Error_when_build_lacks_dnssec()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { Dnssec = true };
+        var status = CrossOptionTestHelpers.Status(cfg, dnsmasqSupportsDnssec: false);
+        var ctx = new EffectiveConfigCrossOptionContext(status, []);
+        var rule = new DnssecPrerequisitesRule();
+        var issues = rule.Evaluate(ctx);
+        var dnssecKey = EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.Dnssec);
+        Assert.Contains(issues, i =>
+            i.Severity == FieldIssueSeverity.Error && i.FieldKey == dnssecKey);
+    }
+
+    [Fact]
+    public void DnssecPrerequisitesRule_Warns_when_no_trust_anchors()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { Dnssec = true };
+        var rule = new DnssecPrerequisitesRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        var trustAnchorKey = EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.TrustAnchor);
+        Assert.Contains(issues, i =>
+            i.Severity == FieldIssueSeverity.Warning &&
+            i.FieldKey == trustAnchorKey &&
+            i.Message.Contains("trust-anchor", StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public void ProxyDnssecCacheWarningRule_Warns_when_cache_not_zero()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            ProxyDnssec = true,
+            CacheSize = 150
+        };
+        var rule = new ProxyDnssecCacheWarningRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.CacheSize),
+            issues[0].FieldKey);
+    }
+
+    [Fact]
+    public void ConnmarkAllowlistEnableRequiresAllowlistRule_Error_when_enable_key_only()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { ConnmarkAllowlistEnable = "" };
+        var rule = new ConnmarkAllowlistEnableRequiresAllowlistRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Error, issues[0].Severity);
+    }
+
+    [Fact]
+    public void ConnmarkAllowlistEnableRequiresAllowlistRule_No_issue_when_allowlists_present()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            ConnmarkAllowlistEnable = "0xff",
+            ConnmarkAllowlistValues = ["0x1,*.example.com"]
+        };
+        var rule = new ConnmarkAllowlistEnableRequiresAllowlistRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void QueryPortIgnoredForSourceBoundServerRule_Warns_when_server_has_at()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            QueryPort = 12345,
+            ServerValues = ["10.0.0.1@192.168.1.1"]
+        };
+        var rule = new QueryPortIgnoredForSourceBoundServerRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+    }
+
+    [Fact]
+    public void AddSubnetCacheBehaviorRule_Warns_when_add_subnet_set()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { AddSubnet = "24,96" };
+        var rule = new AddSubnetCacheBehaviorRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.AddSubnet),
+            issues[0].FieldKey);
+    }
+
+    [Fact]
+    public void Filterwin2kSrvWarningRule_Warns_when_enabled()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { Filterwin2k = true };
+        var rule = new Filterwin2kSrvWarningRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Contains("SRV", issues[0].Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void AddressLocalDnsmasq286CompatibilityRule_Warns_for_domain_address()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            AddressValues = ["/example.com/192.0.2.1"]
+        };
+        var rule = new AddressLocalDnsmasq286CompatibilityRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+    }
+
+    [Fact]
+    public void AddressLocalDnsmasq286CompatibilityRule_No_issue_when_matching_local_exists()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            AddressValues = ["/example.com/192.0.2.1"],
+            LocalValues = ["/example.com/"]
+        };
+        var rule = new AddressLocalDnsmasq286CompatibilityRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void AddressLocalDnsmasq286CompatibilityRule_No_issue_for_nxdomain_form_without_ip()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            AddressValues = ["/ads.example/"]
+        };
+        var rule = new AddressLocalDnsmasq286CompatibilityRule();
+        Assert.Empty(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void AddressLocalDnsmasq286CompatibilityRule_Warns_for_hash_target_without_local()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            AddressValues = ["/blocked.example/#"]
+        };
+        var rule = new AddressLocalDnsmasq286CompatibilityRule();
+        Assert.Single(rule.Evaluate(Ctx(cfg)));
+    }
+
+    [Fact]
+    public void DnssecCheckUnsignedRequiresDnssecRule_Warns_when_dnssec_check_unsigned_set_without_dnssec()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            Dnssec = false,
+            DnssecCheckUnsigned = ""
+        };
+        var rule = new DnssecCheckUnsignedRequiresDnssecRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.DnssecCheckUnsigned),
+            issues[0].FieldKey);
+    }
+
+    [Fact]
+    public void LocalServiceIgnoredByBindSettingsRule_Warns_when_local_service_with_interface_filters()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            LocalService = "net",
+            Interfaces = ["eth0"]
+        };
+        var rule = new LocalServiceIgnoredByBindSettingsRule();
+        var issues = rule.Evaluate(Ctx(cfg));
+        Assert.Single(issues);
+        Assert.Equal(FieldIssueSeverity.Warning, issues[0].Severity);
+        Assert.Equal(
+            EffectiveConfigCrossOptionContext.FieldKeyForOption(DnsmasqConfKeys.LocalService),
+            issues[0].FieldKey);
+    }
+
+    [Fact]
+    public void Pending_overlay_overrides_config_for_cross_option_rules()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { NoResolv = false };
+        var pending = new[]
+        {
+            new PendingOptionChange("resolver", DnsmasqConfKeys.NoResolv, false, true, null)
+        };
+        var ctx = new EffectiveConfigCrossOptionContext(CrossOptionTestHelpers.Status(cfg), pending);
+        var rule = new NoResolvWithoutUpstreamsRule();
+        var issues = rule.Evaluate(ctx);
+        Assert.Single(issues);
+    }
+}
@@ -0,0 +1,226 @@
+using DnsmasqWebUI.Models.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig.CrossOption;
+
+internal static class CrossOptionTestHelpers
+{
+    /// <summary>Minimal baseline effective config; override with record <c>with</c> in tests.</summary>
+    public static EffectiveDnsmasqConfig BaselineConfig() =>
+        new(
+            NoHosts: false,
+            AddnHostsPaths: Array.Empty<string>(),
+            HostsdirPath: null,
+            ServerValues: Array.Empty<string>(),
+            LocalValues: Array.Empty<string>(),
+            RevServerValues: Array.Empty<string>(),
+            AddressValues: Array.Empty<string>(),
+            Interfaces: Array.Empty<string>(),
+            ListenAddresses: Array.Empty<string>(),
+            ExceptInterfaces: Array.Empty<string>(),
+            DhcpRanges: Array.Empty<string>(),
+            DhcpHostLines: Array.Empty<string>(),
+            DhcpOptionLines: Array.Empty<string>(),
+            DhcpMatchValues: Array.Empty<string>(),
+            DhcpBootValues: Array.Empty<string>(),
+            DhcpIgnoreValues: Array.Empty<string>(),
+            DhcpVendorclassValues: Array.Empty<string>(),
+            DhcpUserclassValues: Array.Empty<string>(),
+            RaParamValues: Array.Empty<string>(),
+            SlaacValues: Array.Empty<string>(),
+            PxeServiceValues: Array.Empty<string>(),
+            TrustAnchorValues: Array.Empty<string>(),
+            ResolvFiles: Array.Empty<string>(),
+            RebindDomainOkValues: Array.Empty<string>(),
+            BogusNxdomainValues: Array.Empty<string>(),
+            IgnoreAddressValues: Array.Empty<string>(),
+            AliasValues: Array.Empty<string>(),
+            FilterRrValues: Array.Empty<string>(),
+            CacheRrValues: Array.Empty<string>(),
+            AuthServerValues: Array.Empty<string>(),
+            NoDhcpInterfaceValues: Array.Empty<string>(),
+            NoDhcpv4InterfaceValues: Array.Empty<string>(),
+            NoDhcpv6InterfaceValues: Array.Empty<string>(),
+            DomainValues: Array.Empty<string>(),
+            CnameValues: Array.Empty<string>(),
+            MxHostValues: Array.Empty<string>(),
+            SrvValues: Array.Empty<string>(),
+            PtrRecordValues: Array.Empty<string>(),
+            TxtRecordValues: Array.Empty<string>(),
+            NaptrRecordValues: Array.Empty<string>(),
+            HostRecordValues: Array.Empty<string>(),
+            DynamicHostValues: Array.Empty<string>(),
+            InterfaceNameValues: Array.Empty<string>(),
+            DhcpOptionForceLines: Array.Empty<string>(),
+            IpsetValues: Array.Empty<string>(),
+            NftsetValues: Array.Empty<string>(),
+            DhcpMacValues: Array.Empty<string>(),
+            DhcpNameMatchValues: Array.Empty<string>(),
+            DhcpIgnoreNamesValues: Array.Empty<string>(),
+            DhcpHostsfilePaths: Array.Empty<string>(),
+            DhcpOptsfilePaths: Array.Empty<string>(),
+            DhcpHostsdirPaths: Array.Empty<string>(),
+            DhcpOptsdirPaths: Array.Empty<string>(),
+            ConnmarkAllowlistValues: Array.Empty<string>(),
+            CaaRecordValues: Array.Empty<string>(),
+            DnsRrValues: Array.Empty<string>(),
+            SynthDomainValues: Array.Empty<string>(),
+            AuthZoneValues: Array.Empty<string>(),
+            AuthSoaValues: Array.Empty<string>(),
+            AuthSecServersValues: Array.Empty<string>(),
+            AuthPeerValues: Array.Empty<string>(),
+            DhcpRelayValues: Array.Empty<string>(),
+            DhcpCircuitidValues: Array.Empty<string>(),
+            DhcpRemoteidValues: Array.Empty<string>(),
+            DhcpSubscridValues: Array.Empty<string>(),
+            DhcpProxyValues: Array.Empty<string>(),
+            TagIfValues: Array.Empty<string>(),
+            BridgeInterfaceValues: Array.Empty<string>(),
+            SharedNetworkValues: Array.Empty<string>(),
+            DhcpOptionPxeValues: Array.Empty<string>(),
+            ExpandHosts: false,
+            BogusPriv: false,
+            StrictOrder: false,
+            AllServers: false,
+            NoResolv: false,
+            DomainNeeded: false,
+            NoPoll: false,
+            BindInterfaces: false,
+            BindDynamic: false,
+            NoNegcache: false,
+            DnsLoopDetect: false,
+            StopDnsRebind: false,
+            RebindLocalhostOk: false,
+            ClearOnReload: false,
+            Filterwin2k: false,
+            FilterA: false,
+            FilterAaaa: false,
+            LocaliseQueries: false,
+            LogDebug: false,
+            DhcpAuthoritative: false,
+            LeasefileRo: false,
+            EnableTftp: false,
+            TftpSecure: false,
+            TftpNoFail: false,
+            TftpNoBlocksize: false,
+            Dnssec: false,
+            DnssecCheckUnsigned: null,
+            ReadEthers: false,
+            DhcpRapidCommit: false,
+            Localmx: false,
+            Selfmx: false,
+            EnableRa: false,
+            LogDhcp: false,
+            KeepInForeground: false,
+            NoDaemon: false,
+            ProxyDnssec: false,
+            ConnmarkAllowlistEnable: null,
+            NoRoundRobin: false,
+            DnssecNoTimecheck: false,
+            DnssecDebug: false,
+            LeasequeryValues: Array.Empty<string>(),
+            DhcpGenerateNames: null,
+            DhcpBroadcast: null,
+            DhcpSequentialIp: false,
+            DhcpIgnoreClid: false,
+            BootpDynamic: null,
+            NoPing: false,
+            ScriptArp: false,
+            ScriptOnRenewal: false,
+            DhcpNoOverride: false,
+            QuietDhcp: false,
+            QuietDhcp6: false,
+            QuietRa: false,
+            QuietTftp: false,
+            DhcpLeaseFilePath: null,
+            CacheSize: null,
+            Port: null,
+            LocalTtl: null,
+            PidFilePath: null,
+            User: null,
+            Group: null,
+            LogFacility: null,
+            LogQueries: null,
+            AuthTtl: null,
+            EdnsPacketMax: null,
+            QueryPort: null,
+            PortLimit: null,
+            MinPort: null,
+            MaxPort: null,
+            LogAsync: null,
+            LocalService: null,
+            DhcpLeaseMax: null,
+            NegTtl: null,
+            MaxTtl: null,
+            MaxCacheTtl: null,
+            MinCacheTtl: null,
+            DhcpTtl: null,
+            TftpRootPath: null,
+            PxePrompt: null,
+            EnableDbus: null,
+            EnableUbus: null,
+            FastDnsRetry: null,
+            DhcpScriptPath: null,
+            MxTarget: null,
+            DnsForwardMax: null,
+            DumpfilePath: null,
+            Dumpmask: null,
+            AddCpeId: null,
+            DnssecTimestamp: null,
+            DnssecLimits: null,
+            DhcpAlternatePort: null,
+            DhcpDuid: null,
+            DhcpLuascriptPath: null,
+            DhcpScriptuser: null,
+            DhcpPxeVendor: null,
+            UseStaleCache: null,
+            AddMac: null,
+            StripMac: false,
+            AddSubnet: null,
+            StripSubnet: false,
+            Umbrella: null,
+            Do0x20EncodeState: ExplicitToggleState.Default,
+            Conntrack: false);
+
+    public static DnsmasqServiceStatus Status(EffectiveDnsmasqConfig config, bool dnsmasqSupportsDnssec = true) =>
+        new(
+            SystemHostsPath: null,
+            SystemHostsPathExists: false,
+            ManagedHostsFilePath: null,
+            ManagedHostsPathExists: false,
+            NoHosts: false,
+            AddnHostsPaths: Array.Empty<string>(),
+            EffectiveConfig: config,
+            EffectiveConfigSources: null,
+            MainConfigPath: null,
+            ManagedFilePath: null,
+            LeasesPath: null,
+            MainConfigPathExists: false,
+            ManagedFilePathExists: false,
+            LeasesPathConfigured: false,
+            LeasesPathExists: false,
+            ConfigFiles: null,
+            ReloadCommandConfigured: false,
+            StatusCommandConfigured: false,
+            StatusShowConfigured: false,
+            LogsConfigured: false,
+            LogsPath: null,
+            StatusShowCommand: null,
+            LogsCommand: null,
+            DnsmasqStatus: "active",
+            StatusCommandExitCode: null,
+            StatusCommandStdout: null,
+            StatusCommandStderr: null,
+            StatusShowOutput: null,
+            LogsOutput: null,
+            DhcpRangeStart: null,
+            DhcpRangeEnd: null,
+            DnsmasqVersion: "2.91",
+            MinimumSupportedDnsmasqVersion: "2.91",
+            DnsmasqVersionSupported: true,
+            DnsmasqVersionError: null,
+            DnsmasqSupportsDhcp: true,
+            DnsmasqSupportsTftp: true,
+            DnsmasqSupportsDnssec: dnsmasqSupportsDnssec,
+            DnsmasqSupportsDbus: false);
+}
@@ -0,0 +1,46 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig.CrossOption;
+
+public class EffectiveConfigCrossOptionContextTests
+{
+    [Fact]
+    public void GetMulti_WhenPendingNewValueIsNull_ReturnsEmpty_NotDiskValues()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { ServerValues = ["1.1.1.1", "8.8.8.8"] };
+        var pending = new[]
+        {
+            new PendingOptionChange("resolver", DnsmasqConfKeys.Server, new List<string> { "1.1.1.1" }, null, null)
+        };
+        var ctx = new EffectiveConfigCrossOptionContext(CrossOptionTestHelpers.Status(cfg), pending);
+        Assert.Empty(ctx.GetMulti(DnsmasqConfKeys.Server, c => c.ServerValues));
+    }
+
+    [Fact]
+    public void GetMulti_WhenPendingNewValueIsList_ReturnsPending_NotDisk()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { ServerValues = ["9.9.9.9"] };
+        var pending = new[]
+        {
+            new PendingOptionChange("resolver", DnsmasqConfKeys.Server, null, new List<string> { "1.1.1.1" }, null)
+        };
+        var ctx = new EffectiveConfigCrossOptionContext(CrossOptionTestHelpers.Status(cfg), pending);
+        var v = ctx.GetMulti(DnsmasqConfKeys.Server, c => c.ServerValues);
+        Assert.Single(v);
+        Assert.Equal("1.1.1.1", v[0]);
+    }
+
+    [Fact]
+    public void GetMulti_WhenPendingNewValueIsWrongType_ReturnsEmpty_NotDiskValues()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with { ServerValues = ["1.1.1.1"] };
+        var pending = new[]
+        {
+            new PendingOptionChange("resolver", DnsmasqConfKeys.Server, null, "not-a-list", null)
+        };
+        var ctx = new EffectiveConfigCrossOptionContext(CrossOptionTestHelpers.Status(cfg), pending);
+        Assert.Empty(ctx.GetMulti(DnsmasqConfKeys.Server, c => c.ServerValues));
+    }
+}
@@ -0,0 +1,30 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Rules;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig.CrossOption;
+
+public class EffectiveConfigCrossOptionValidationServiceTests
+{
+    [Fact]
+    public void Validate_aggregates_issues_from_all_rules()
+    {
+        var cfg = CrossOptionTestHelpers.BaselineConfig() with
+        {
+            Conntrack = true,
+            QueryPort = 1,
+            Filterwin2k = true
+        };
+        var status = CrossOptionTestHelpers.Status(cfg);
+        IReadOnlyList<IEffectiveConfigCrossOptionRule> rules =
+        [
+            new ConntrackWithQueryPortRule(),
+            new Filterwin2kSrvWarningRule()
+        ];
+        var service = new EffectiveConfigCrossOptionValidationService(rules);
+
+        var issues = service.Validate(status, []);
+
+        Assert.Equal(2, issues.Count);
+    }
+}
@@ -0,0 +1,82 @@
+using System.Linq;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Models.Hosts;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+public class EffectiveConfigEditSessionChangedEventTests
+{
+    [Fact]
+    public void TrackCommit_RaisesChanged()
+    {
+        var saveService = new StubSaveService();
+        var session = new EffectiveConfigEditSession(saveService);
+        session.Ui.EnterEditMode();
+        var raised = false;
+        session.Changed += () => raised = true;
+        session.Draft.TrackCommit(new EffectiveConfigEditCommittedArgs("resolver", "port", null, 5353, null));
+        Assert.True(raised);
+    }
+
+    [Fact]
+    public void EnterEditMode_RaisesChanged()
+    {
+        var saveService = new StubSaveService();
+        var session = new EffectiveConfigEditSession(saveService);
+        var raised = false;
+        session.Changed += () => raised = true;
+        session.Ui.EnterEditMode();
+        Assert.True(raised);
+    }
+
+    [Fact]
+    public void RevertChange_RaisesChanged()
+    {
+        var saveService = new StubSaveService();
+        var session = new EffectiveConfigEditSession(saveService);
+        session.Ui.EnterEditMode();
+        session.Draft.TrackCommit(new EffectiveConfigEditCommittedArgs("resolver", "port", null, 5353, null));
+        var raised = false;
+        session.Changed += () => raised = true;
+        session.Draft.RevertChange("resolver", "port");
+        Assert.True(raised);
+    }
+
+    [Fact]
+    public void Ui_EnterEditMode_DoesNotClearDraft()
+    {
+        var saveService = new StubSaveService();
+        var session = new EffectiveConfigEditSession(saveService);
+        var oldEntries = new List<HostEntry> { new() { Address = "1.2.3.4", Names = new List<string> { "a" } } };
+        var newEntries = new List<HostEntry> { new() { Address = "1.2.3.4", Names = new List<string> { "b" } } };
+        session.Draft.SetManagedHostsDraft(oldEntries, newEntries, "/tmp/managed.hosts");
+        Assert.Single(session.Draft.PendingChanges);
+        session.Ui.EnterEditMode();
+        Assert.Single(session.Draft.PendingChanges.OfType<PendingManagedHostsChange>());
+    }
+
+    [Fact]
+    public void SetManagedHostsDraft_StoresChange_AndRevertManagedHostsDraft_RemovesIt()
+    {
+        var saveService = new StubSaveService();
+        var session = new EffectiveConfigEditSession(saveService);
+        session.Ui.EnterEditMode();
+        var oldEntries = new List<HostEntry> { new() { Address = "1.2.3.4", Names = new List<string> { "a" } } };
+        var newEntries = new List<HostEntry> { new() { Address = "1.2.3.4", Names = new List<string> { "a", "b" } } };
+        session.Draft.SetManagedHostsDraft(oldEntries, newEntries, "/etc/hosts");
+        Assert.Single(session.Draft.PendingChanges.OfType<PendingManagedHostsChange>());
+        session.Draft.RevertManagedHostsDraft();
+        Assert.Empty(session.Draft.PendingChanges.OfType<PendingManagedHostsChange>());
+    }
+
+    private sealed class StubSaveService : IEffectiveConfigSaveService
+    {
+        public Task<EffectiveConfigSaveResult> SaveAsync(IReadOnlyList<PendingDnsmasqChange> changes, CancellationToken ct = default) =>
+            Task.FromResult(EffectiveConfigSaveResult.NoChanges());
+        public Task<EffectiveConfigRestoreResult> RestoreAsync(IReadOnlyList<DnsmasqManagedBackup> backups, CancellationToken ct = default) =>
+            Task.FromResult(new EffectiveConfigRestoreResult(false, false, -1, null, "Stub"));
+    }
+}
@@ -0,0 +1,140 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+/// <summary>
+/// Tests for option -> feature mapping and capability checks.
+/// </summary>
+public class EffectiveConfigFeatureRequirementsTests
+{
+    [Theory]
+    [InlineData(DnsmasqConfKeys.Dnssec, DnsmasqFeature.Dnssec)]
+    [InlineData(DnsmasqConfKeys.DnssecCheckUnsigned, DnsmasqFeature.Dnssec)]
+    [InlineData(DnsmasqConfKeys.TrustAnchor, DnsmasqFeature.Dnssec)]
+    [InlineData(DnsmasqConfKeys.DhcpRange, DnsmasqFeature.Dhcp)]
+    [InlineData(DnsmasqConfKeys.EnableTftp, DnsmasqFeature.Tftp)]
+    [InlineData(DnsmasqConfKeys.EnableDbus, DnsmasqFeature.Dbus)]
+    public void GetRequiredFeature_ReturnsExpectedFeature(string optionName, DnsmasqFeature expected)
+    {
+        var feature = EffectiveConfigFeatureRequirements.GetRequiredFeature(optionName);
+        Assert.NotNull(feature);
+        Assert.Equal(expected, feature.Value);
+    }
+
+    [Fact]
+    public void GetRequiredFeature_ForUnknownOption_ReturnsNull()
+    {
+        var feature = EffectiveConfigFeatureRequirements.GetRequiredFeature("no-such-option");
+        Assert.Null(feature);
+    }
+
+    [Fact]
+    public void IsSupportedByCapabilities_WhenCapabilityPresent_ReturnsTrue()
+    {
+        var caps = new DnsmasqCompileCapabilities(true, true, true, false,
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "DHCP", "TFTP", "DNSSEC" });
+        Assert.True(EffectiveConfigFeatureRequirements.IsSupportedByCapabilities(DnsmasqConfKeys.DnssecCheckUnsigned, caps));
+        Assert.True(EffectiveConfigFeatureRequirements.IsSupportedByCapabilities(DnsmasqConfKeys.DhcpRange, caps));
+    }
+
+    [Fact]
+    public void IsSupportedByCapabilities_WhenDnssecMissing_ReturnsFalseForDnssecOptions()
+    {
+        var caps = new DnsmasqCompileCapabilities(true, true, false, false,
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase));
+        Assert.False(EffectiveConfigFeatureRequirements.IsSupportedByCapabilities(DnsmasqConfKeys.Dnssec, caps));
+        Assert.False(EffectiveConfigFeatureRequirements.IsSupportedByCapabilities(DnsmasqConfKeys.DnssecCheckUnsigned, caps));
+    }
+
+    [Fact]
+    public void IsSupportedByCapabilities_ForOptionWithNoRequiredFeature_ReturnsTrue()
+    {
+        var caps = new DnsmasqCompileCapabilities(false, false, false, false,
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase));
+        Assert.True(EffectiveConfigFeatureRequirements.IsSupportedByCapabilities(DnsmasqConfKeys.Port, caps));
+    }
+
+    [Fact]
+    public void GetCapabilityDisabled_WhenStatusSupportsFeature_ReturnsNotDisabled()
+    {
+        var status = CreateStatusWithCapabilities(dnssec: true);
+        var (isDisabled, reason) = EffectiveConfigFeatureRequirements.GetCapabilityDisabled(DnsmasqConfKeys.DnssecCheckUnsigned, status);
+        Assert.False(isDisabled);
+        Assert.Null(reason);
+    }
+
+    [Fact]
+    public void GetCapabilityDisabled_WhenStatusMissingDnssec_ReturnsDisabledWithReason()
+    {
+        var status = CreateStatusWithCapabilities(dnssec: false);
+        var (isDisabled, reason) = EffectiveConfigFeatureRequirements.GetCapabilityDisabled(DnsmasqConfKeys.DnssecCheckUnsigned, status);
+        Assert.True(isDisabled);
+        Assert.NotNull(reason);
+    }
+
+    [Fact]
+    public void GetCapabilityDisabled_WhenStatusNull_ReturnsNotDisabled()
+    {
+        var (isDisabled, _) = EffectiveConfigFeatureRequirements.GetCapabilityDisabled(DnsmasqConfKeys.DnssecCheckUnsigned, null);
+        Assert.False(isDisabled);
+    }
+
+    /// <summary>
+    /// Save path uses IsSupportedByCapabilities(optionName, version.Capabilities) to reject changes before write.
+    /// This test asserts that logic: a build without DNSSEC would reject dnssec-check-unsigned.
+    /// </summary>
+    [Fact]
+    public void SaveGuard_WhenBuildHasNoDnssec_DnssecOptionChangesWouldBeRejected()
+    {
+        var noDnssecCaps = new DnsmasqCompileCapabilities(true, true, false, false,
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "DHCP", "TFTP" });
+        Assert.False(EffectiveConfigFeatureRequirements.IsSupportedByCapabilities(DnsmasqConfKeys.DnssecCheckUnsigned, noDnssecCaps));
+        Assert.NotNull(EffectiveConfigFeatureRequirements.GetUnsupportedReason(DnsmasqFeature.Dnssec));
+    }
+
+    private static DnsmasqServiceStatus CreateStatusWithCapabilities(bool dhcp = true, bool tftp = true, bool dnssec = true, bool dbus = false)
+    {
+        return new DnsmasqServiceStatus(
+            SystemHostsPath: null,
+            SystemHostsPathExists: false,
+            ManagedHostsFilePath: null,
+            ManagedHostsPathExists: false,
+            NoHosts: false,
+            AddnHostsPaths: Array.Empty<string>(),
+            EffectiveConfig: null,
+            EffectiveConfigSources: null,
+            MainConfigPath: null,
+            ManagedFilePath: null,
+            LeasesPath: null,
+            MainConfigPathExists: false,
+            ManagedFilePathExists: false,
+            LeasesPathConfigured: false,
+            LeasesPathExists: false,
+            ConfigFiles: null,
+            ReloadCommandConfigured: false,
+            StatusCommandConfigured: false,
+            StatusShowConfigured: false,
+            LogsConfigured: false,
+            LogsPath: null,
+            StatusShowCommand: null,
+            LogsCommand: null,
+            DnsmasqStatus: "active",
+            StatusCommandExitCode: null,
+            StatusCommandStdout: null,
+            StatusCommandStderr: null,
+            StatusShowOutput: null,
+            LogsOutput: null,
+            DhcpRangeStart: null,
+            DhcpRangeEnd: null,
+            DnsmasqVersion: "2.91",
+            MinimumSupportedDnsmasqVersion: "2.91",
+            DnsmasqVersionSupported: true,
+            DnsmasqVersionError: null,
+            DnsmasqSupportsDhcp: dhcp,
+            DnsmasqSupportsTftp: tftp,
+            DnsmasqSupportsDnssec: dnssec,
+            DnsmasqSupportsDbus: dbus);
+    }
+}
@@ -0,0 +1,103 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+/// <summary>
+/// Tests that field descriptors get IsCapabilityDisabled set when the status indicates the option is not supported by the dnsmasq build.
+/// </summary>
+public class EffectiveConfigFieldBuilderCapabilityTests
+{
+    [Fact]
+    public void GetSingleDescriptor_WhenDnssecOptionAndStatusHasNoDnssec_ReturnsDescriptorWithCapabilityDisabled()
+    {
+        var status = CreateStatusWithCapabilities(dnssec: false);
+        var descriptor = EffectiveConfigFieldBuilder.GetSingleDescriptor(
+            null,
+            DnsmasqConfKeys.DnssecCheckUnsigned,
+            status,
+            _ => null,
+            _ => null,
+            null);
+
+        Assert.True(descriptor.IsCapabilityDisabled);
+        Assert.NotNull(descriptor.CapabilityDisabledReason);
+    }
+
+    [Fact]
+    public void GetSingleDescriptor_WhenDnssecOptionAndStatusHasDnssec_ReturnsDescriptorWithCapabilityNotDisabled()
+    {
+        var status = CreateStatusWithCapabilities(dnssec: true);
+        var descriptor = EffectiveConfigFieldBuilder.GetSingleDescriptor(
+            null,
+            DnsmasqConfKeys.DnssecCheckUnsigned,
+            status,
+            _ => null,
+            _ => null,
+            null);
+
+        Assert.False(descriptor.IsCapabilityDisabled);
+        Assert.Null(descriptor.CapabilityDisabledReason);
+    }
+
+    [Fact]
+    public void GetSingleDescriptor_WhenOptionWithNoFeatureRequirement_ReturnsDescriptorWithCapabilityNotDisabled()
+    {
+        var status = CreateStatusWithCapabilities(dnssec: false);
+        var descriptor = EffectiveConfigFieldBuilder.GetSingleDescriptor(
+            null,
+            DnsmasqConfKeys.Port,
+            status,
+            _ => null,
+            _ => null,
+            null);
+
+        Assert.False(descriptor.IsCapabilityDisabled);
+        Assert.Null(descriptor.CapabilityDisabledReason);
+    }
+
+    private static DnsmasqServiceStatus CreateStatusWithCapabilities(bool dhcp = true, bool tftp = true, bool dnssec = true, bool dbus = false)
+    {
+        return new DnsmasqServiceStatus(
+            SystemHostsPath: null,
+            SystemHostsPathExists: false,
+            ManagedHostsFilePath: null,
+            ManagedHostsPathExists: false,
+            NoHosts: false,
+            AddnHostsPaths: Array.Empty<string>(),
+            EffectiveConfig: null,
+            EffectiveConfigSources: null,
+            MainConfigPath: null,
+            ManagedFilePath: null,
+            LeasesPath: null,
+            MainConfigPathExists: false,
+            ManagedFilePathExists: false,
+            LeasesPathConfigured: false,
+            LeasesPathExists: false,
+            ConfigFiles: null,
+            ReloadCommandConfigured: false,
+            StatusCommandConfigured: false,
+            StatusShowConfigured: false,
+            LogsConfigured: false,
+            LogsPath: null,
+            StatusShowCommand: null,
+            LogsCommand: null,
+            DnsmasqStatus: "active",
+            StatusCommandExitCode: null,
+            StatusCommandStdout: null,
+            StatusCommandStderr: null,
+            StatusShowOutput: null,
+            LogsOutput: null,
+            DhcpRangeStart: null,
+            DhcpRangeEnd: null,
+            DnsmasqVersion: "2.91",
+            MinimumSupportedDnsmasqVersion: "2.91",
+            DnsmasqVersionSupported: true,
+            DnsmasqVersionError: null,
+            DnsmasqSupportsDhcp: dhcp,
+            DnsmasqSupportsTftp: tftp,
+            DnsmasqSupportsDnssec: dnssec,
+            DnsmasqSupportsDbus: dbus);
+    }
+}
@@ -0,0 +1,45 @@
+using DnsmasqWebUI.Components.EffectiveConfig;
+using DnsmasqWebUI.Components.EffectiveConfig.CustomDisplays;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using Microsoft.AspNetCore.Components;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+public class EffectiveConfigRenderFragmentRegistryMultiTests
+{
+    [Fact]
+    public void BuildMultiFieldComponentFragment_Domain_ReturnsFragment()
+    {
+        var registry = new EffectiveConfigRenderFragmentRegistry(new OptionSemanticValidator([new DomainSemanticHandler()]));
+        var fragment = registry.BuildMultiFieldComponentFragment(
+            EffectiveConfigSections.SectionHosts,
+            DnsmasqConfKeys.Domain,
+            EventCallback<IReadOnlyList<string>>.Empty);
+
+        Assert.NotNull(fragment);
+    }
+
+    [Fact]
+    public void DomainMultiValueDisplay_InheritsMultiBase()
+    {
+        Assert.Equal(typeof(EffectiveConfigMultiValueDisplayBase), typeof(DomainMultiValueDisplay).BaseType);
+    }
+
+    /// <summary>Custom domain UI must still use RegisterSemanticMultiDescriptor wiring so per-item validation is not dropped.</summary>
+    [Fact]
+    public void GetMultiDescriptorFactory_Domain_WiresSemanticValidator()
+    {
+        var registry = new EffectiveConfigRenderFragmentRegistry(new OptionSemanticValidator([new DomainSemanticHandler()]));
+        var factory = registry.GetMultiDescriptorFactory(EffectiveConfigSections.SectionHosts, DnsmasqConfKeys.Domain);
+        Assert.NotNull(factory);
+
+        var descriptor = factory!(EffectiveConfigSections.SectionHosts, DnsmasqConfKeys.Domain, status: null, getItems: _ => null);
+        Assert.NotNull(descriptor.Validator);
+        Assert.Null(descriptor.Validator!.ValidateItem("example.com", Array.Empty<string>(), null));
+        Assert.NotNull(descriptor.Validator.ValidateItem("not a valid domain name!", Array.Empty<string>(), null));
+    }
+}
@@ -0,0 +1,119 @@
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Hosts.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Reload.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Version.Abstractions;
+using DnsmasqWebUI.Models.Hosts;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Models.Config;
+using DnsmasqWebUI.Models.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+/// <summary>
+/// Save path capability guard: unsupported-option changes return UnsupportedCapabilities
+/// before validation or reload can run.
+/// </summary>
+public class EffectiveConfigSaveServiceCapabilityTests
+{
+    [Fact]
+    public async Task SaveAsync_WhenCapabilitiesMissingDnssec_ReturnsUnsupportedCapabilitiesErrorCode()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-cap-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        var managedName = "zz-managed.conf";
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = managedName });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var versionService = new StubVersionService(CreateSupportedVersionInfo(dnssec: false));
+            var semanticValidationService = new EffectiveConfigSemanticValidationService(new OptionSemanticValidator(Array.Empty<IOptionSemanticHandler>()));
+
+            var saveService = new EffectiveConfigSaveService(
+                setService,
+                configService,
+                cache,
+                new StubHostsFileService(),
+                new UnexpectedValidationService(),
+                semanticValidationService,
+                new UnexpectedReloadService(),
+                versionService,
+                NullLogger<EffectiveConfigSaveService>.Instance);
+
+            var changes = new List<PendingDnsmasqChange>
+            {
+                new PendingOptionChange(EffectiveConfigSections.SectionDnssec, DnsmasqConfKeys.DnssecCheckUnsigned, null, "no", null)
+            };
+
+            var result = await saveService.SaveAsync(changes);
+
+            Assert.Equal(EffectiveConfigSaveResult.ErrorCodes.UnsupportedCapabilities, result.ErrorCode);
+            Assert.False(File.Exists(Path.Combine(dir, managedName)));
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    private sealed class StubVersionService : IDnsmasqVersionService
+    {
+        private readonly DnsmasqVersionInfo _info;
+
+        public StubVersionService(DnsmasqVersionInfo info) => _info = info;
+
+        public Task<DnsmasqVersionInfo> GetVersionInfoAsync(CancellationToken ct = default) =>
+            Task.FromResult(_info);
+    }
+
+    private static DnsmasqVersionInfo CreateSupportedVersionInfo(bool dnssec)
+    {
+        var capabilities = new DnsmasqCompileCapabilities(
+            Dhcp: true,
+            Tftp: true,
+            Dnssec: dnssec,
+            Dbus: false,
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "DHCP", "TFTP" });
+
+        return new DnsmasqVersionInfo(
+            new Version(2, 91),
+            new Version(2, 91),
+            ProbeSucceeded: true,
+            IsSupported: true,
+            "dnsmasq --version",
+            null,
+            capabilities);
+    }
+
+    private sealed class UnexpectedValidationService : IConfigValidationService
+    {
+        public Task<ConfigValidationResult> ValidateAsync(CancellationToken ct = default) =>
+            throw new InvalidOperationException("ValidateAsync should not be called when capabilities are unsupported.");
+    }
+
+    private sealed class UnexpectedReloadService : IReloadService
+    {
+        public Task<ReloadResult> ReloadAsync(CancellationToken ct = default) =>
+            throw new InvalidOperationException("ReloadAsync should not be called when capabilities are unsupported.");
+    }
+
+    private sealed class StubHostsFileService : IHostsFileService
+    {
+        public Task<IReadOnlyList<HostEntry>> ReadAsync(CancellationToken ct = default) => Task.FromResult<IReadOnlyList<HostEntry>>(new List<HostEntry>());
+        public Task WriteAsync(IReadOnlyList<HostEntry> entries, CancellationToken ct = default) => Task.CompletedTask;
+    }
+}
@@ -0,0 +1,216 @@
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Hosts.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Reload.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Version.Abstractions;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Models.Hosts;
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Models.Config;
+using DnsmasqWebUI.Models.Contracts;
+using DnsmasqWebUI.Models.Dhcp;
+using DnsmasqWebUI.Models.Dnsmasq;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+/// <summary>
+/// Tests for multi-file backup/restore and managed-hosts-only save.
+/// </summary>
+public class EffectiveConfigSaveServiceMultiBackupTests
+{
+    [Fact]
+    public async Task SaveAsync_WhenOnlyManagedHostsChange_BacksUpManagedHostsFile_WritesHosts_ValidatesAndReloads()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-hosts-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        ConfigSetCache? cache = null;
+        try
+        {
+            File.WriteAllText(mainPath, "port=53\n");
+            var options = Options.Create(new DnsmasqOptions
+            {
+                MainConfigPath = mainPath,
+                ManagedFileName = "zz-managed.conf",
+                ManagedHostsFileName = "zz-dnsmasq-webui.hosts"
+            });
+            cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+            var setService = new DnsmasqConfigSetService(cache);
+            var configService = new DnsmasqConfigService(setService, cache, NullLogger<DnsmasqConfigService>.Instance);
+
+            var set = await setService.GetConfigSetAsync();
+            var managedHostsPath = set.ManagedHostsFilePath!;
+            File.WriteAllText(managedHostsPath, "192.168.1.1 host1\n");
+
+            var writtenEntries = new List<IReadOnlyList<HostEntry>>();
+            var capturingHostsService = new CapturingHostsFileService(writtenEntries);
+
+            var versionService = new StubVersionService(CreateSupportedVersionInfo());
+            var semanticValidationService = new EffectiveConfigSemanticValidationService(new OptionSemanticValidator(Array.Empty<IOptionSemanticHandler>()));
+            var saveService = new EffectiveConfigSaveService(
+                setService,
+                configService,
+                cache,
+                capturingHostsService,
+                new StubValidationService(success: true),
+                semanticValidationService,
+                new StubReloadService(success: true),
+                versionService,
+                NullLogger<EffectiveConfigSaveService>.Instance);
+
+            var oldEntries = new List<HostEntry> { new() { Address = "192.168.1.1", Names = new List<string> { "host1" }, Id = "192.168.1.1|host1" } };
+            var newEntries = new List<HostEntry>
+            {
+                new() { Address = "192.168.1.1", Names = new List<string> { "host1" }, Id = "192.168.1.1|host1" },
+                new() { Address = "192.168.1.2", Names = new List<string> { "host2" }, Id = "192.168.1.2|host2" }
+            };
+            var changes = new List<PendingDnsmasqChange>
+            {
+                new PendingManagedHostsChange(oldEntries, newEntries, managedHostsPath)
+            };
+
+            var result = await saveService.SaveAsync(changes);
+
+            Assert.True(result.Saved);
+            Assert.True(result.Validated);
+            Assert.True(result.Restarted);
+            Assert.Null(result.ErrorCode);
+            Assert.Single(result.Backups);
+            Assert.Equal(DnsmasqManagedTargetKind.ManagedHosts, result.Backups[0].Kind);
+            Assert.Equal(managedHostsPath, result.Backups[0].TargetPath);
+            Assert.True(File.Exists(result.Backups[0].BackupPath));
+            Assert.Single(writtenEntries);
+            Assert.Equal(2, writtenEntries[0].Count);
+        }
+        finally
+        {
+            cache?.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public async Task RestoreAsync_WhenBackupsContainTwoTargets_RestoresBothThenReloads()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "dnsmasq-restore-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(dir);
+        var mainPath = Path.Combine(dir, "dnsmasq.conf");
+        File.WriteAllText(mainPath, "port=53\n");
+        var target1 = Path.Combine(dir, "target1.conf");
+        var target2 = Path.Combine(dir, "target2.hosts");
+        var backup1 = Path.Combine(dir, "backup1.bak");
+        var backup2 = Path.Combine(dir, "backup2.bak");
+        File.WriteAllText(target1, "original1");
+        File.WriteAllText(target2, "original2");
+        File.WriteAllText(backup1, "restored1");
+        File.WriteAllText(backup2, "restored2");
+
+        var backups = new List<DnsmasqManagedBackup>
+        {
+            new(DnsmasqManagedTargetKind.ManagedConfig, target1, backup1),
+            new(DnsmasqManagedTargetKind.ManagedHosts, target2, backup2)
+        };
+
+        var options = Options.Create(new DnsmasqOptions { MainConfigPath = mainPath, ManagedFileName = "x.conf" });
+        var cache = new ConfigSetCache(options, NullLogger<ConfigSetCache>.Instance);
+        var setService = new DnsmasqConfigSetService(cache);
+        try
+        {
+            var saveService = new EffectiveConfigSaveService(
+                setService,
+                new StubConfigService(),
+                cache,
+                new StubHostsFileService(),
+                new StubValidationService(success: true),
+                new EffectiveConfigSemanticValidationService(new OptionSemanticValidator(Array.Empty<IOptionSemanticHandler>())),
+                new StubReloadService(success: true),
+                new StubVersionService(CreateSupportedVersionInfo()),
+                NullLogger<EffectiveConfigSaveService>.Instance);
+
+            var result = await saveService.RestoreAsync(backups);
+
+            Assert.True(result.Restored);
+            Assert.True(result.Restarted);
+            Assert.Equal("restored1", File.ReadAllText(target1));
+            Assert.Equal("restored2", File.ReadAllText(target2));
+        }
+        finally
+        {
+            cache.Dispose();
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    private static DnsmasqVersionInfo CreateSupportedVersionInfo()
+    {
+        var capabilities = new DnsmasqCompileCapabilities(
+            Dhcp: true, Tftp: true, Dnssec: true, Dbus: false,
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "DHCP", "TFTP", "DNSSEC" });
+        return new DnsmasqVersionInfo(
+            new Version(2, 91), new Version(2, 91),
+            ProbeSucceeded: true, IsSupported: true, "dnsmasq --version", null, capabilities);
+    }
+
+    private sealed class CapturingHostsFileService : IHostsFileService
+    {
+        private readonly List<IReadOnlyList<HostEntry>> _written;
+
+        public CapturingHostsFileService(List<IReadOnlyList<HostEntry>> written) => _written = written;
+
+        public Task<IReadOnlyList<HostEntry>> ReadAsync(CancellationToken ct = default) =>
+            Task.FromResult<IReadOnlyList<HostEntry>>(new List<HostEntry>());
+
+        public Task WriteAsync(IReadOnlyList<HostEntry> entries, CancellationToken ct = default)
+        {
+            _written.Add(entries);
+            return Task.CompletedTask;
+        }
+    }
+
+    private sealed class StubVersionService : IDnsmasqVersionService
+    {
+        private readonly DnsmasqVersionInfo _info;
+        public StubVersionService(DnsmasqVersionInfo info) => _info = info;
+        public Task<DnsmasqVersionInfo> GetVersionInfoAsync(CancellationToken ct = default) => Task.FromResult(_info);
+    }
+
+    private sealed class StubValidationService : IConfigValidationService
+    {
+        private readonly bool _success;
+        public StubValidationService(bool success) => _success = success;
+        public Task<ConfigValidationResult> ValidateAsync(CancellationToken ct = default) =>
+            Task.FromResult(new ConfigValidationResult(_success, true, _success ? 0 : 1, null, null, null));
+    }
+
+    private sealed class StubReloadService : IReloadService
+    {
+        private readonly bool _success;
+        public StubReloadService(bool success) => _success = success;
+        public Task<ReloadResult> ReloadAsync(CancellationToken ct = default) =>
+            Task.FromResult(new ReloadResult(_success, _success ? 0 : 1, null, null));
+    }
+
+    private sealed class StubHostsFileService : IHostsFileService
+    {
+        public Task<IReadOnlyList<HostEntry>> ReadAsync(CancellationToken ct = default) =>
+            Task.FromResult<IReadOnlyList<HostEntry>>(new List<HostEntry>());
+        public Task WriteAsync(IReadOnlyList<HostEntry> entries, CancellationToken ct = default) => Task.CompletedTask;
+    }
+
+    private sealed class StubConfigService : IDnsmasqConfigService
+    {
+        public Task ApplyEffectiveConfigChangesAsync(IReadOnlyList<PendingEffectiveConfigChange> changes, CancellationToken ct = default) => Task.CompletedTask;
+        public Task<IReadOnlyList<DhcpHostEntry>> ReadDhcpHostsAsync(CancellationToken ct = default) => Task.FromResult<IReadOnlyList<DhcpHostEntry>>(Array.Empty<DhcpHostEntry>());
+        public Task WriteDhcpHostsAsync(IReadOnlyList<DhcpHostEntry> entries, CancellationToken ct = default) => Task.CompletedTask;
+        public Task<ManagedConfigContent> ReadManagedConfigAsync(CancellationToken ct = default) => Task.FromResult(new ManagedConfigContent(Array.Empty<DnsmasqConfLine>(), ""));
+        public Task WriteManagedConfigAsync(IReadOnlyList<DnsmasqConfLine> lines, CancellationToken ct = default) => Task.CompletedTask;
+    }
+}
@@ -0,0 +1,60 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+/// <summary>
+/// Wiring tests that ensure special-option semantics actually feed parser and registry behavior.
+/// </summary>
+public class EffectiveConfigSemanticsWiringTests
+{
+    [Fact]
+    public void Registry_WiresSemanticValidator_ForDnsRr()
+    {
+        var registry = new EffectiveConfigRenderFragmentRegistry(new OptionSemanticValidator([new DnsRrSemanticHandler()]));
+        var factory = registry.GetMultiDescriptorFactory(EffectiveConfigSections.SectionDnsRecords, DnsmasqConfKeys.DnsRr);
+        Assert.NotNull(factory);
+        var descriptor = factory!(EffectiveConfigSections.SectionDnsRecords, DnsmasqConfKeys.DnsRr, status: null, getItems: _ => null);
+        Assert.NotNull(descriptor.Validator);
+        Assert.Null(descriptor.Validator!.ValidateItem("example.com,16,01:02", Array.Empty<string>()));
+        Assert.NotNull(descriptor.Validator.ValidateItem("example.com,not-a-number", Array.Empty<string>()));
+    }
+
+    [Fact]
+    public void Registry_WiresLeasequeryMultiValidator_FromSpecialSemantics()
+    {
+        var registry = new EffectiveConfigRenderFragmentRegistry(new OptionSemanticValidator([new LeasequerySemanticHandler()]));
+        var factory = registry.GetMultiDescriptorFactory(EffectiveConfigSections.SectionDhcp, DnsmasqConfKeys.Leasequery);
+        Assert.NotNull(factory);
+
+        var descriptor = factory!(
+            EffectiveConfigSections.SectionDhcp,
+            DnsmasqConfKeys.Leasequery,
+            status: null,
+            getItems: _ => null);
+
+        Assert.NotNull(descriptor.Validator);
+        Assert.NotNull(descriptor.Validator!.ValidateItem("not-an-ip", Array.Empty<string>()));
+        Assert.Null(descriptor.Validator.ValidateItem("10.0.0.0/24", Array.Empty<string>()));
+    }
+
+    /// <summary>Pre-save semantic blocking: invalid leasequery value produces errors; SaveService uses this and returns SemanticValidationFailed before write.</summary>
+    [Fact]
+    public void SemanticValidationService_InvalidLeasequery_ReturnsError()
+    {
+        var validator = new OptionSemanticValidator([new LeasequerySemanticHandler()]);
+        var service = new EffectiveConfigSemanticValidationService(validator);
+        var changes = new List<PendingEffectiveConfigChange>
+        {
+            new(EffectiveConfigSections.SectionDhcp, DnsmasqConfKeys.Leasequery, null,
+                new List<string> { "not-an-ip" }, null)
+        };
+        var issues = service.Validate(changes);
+        Assert.NotEmpty(issues);
+        Assert.Contains(issues, i => i.Severity == FieldIssueSeverity.Error);
+    }
+}
@@ -1,6 +1,6 @@
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;

-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;

 /// <summary>
 /// Tests for EffectiveDnsmasqConfig, including GetLogsPath (log-facility as file path).
@@ -54,6 +54,24 @@ public class EffectiveDnsmasqConfigTests
            DhcpHostsfilePaths: Array.Empty<string>(),
            DhcpOptsfilePaths: Array.Empty<string>(),
            DhcpHostsdirPaths: Array.Empty<string>(),
+            DhcpOptsdirPaths: Array.Empty<string>(),
+            ConnmarkAllowlistValues: Array.Empty<string>(),
+            CaaRecordValues: Array.Empty<string>(),
+            DnsRrValues: Array.Empty<string>(),
+            SynthDomainValues: Array.Empty<string>(),
+            AuthZoneValues: Array.Empty<string>(),
+            AuthSoaValues: Array.Empty<string>(),
+            AuthSecServersValues: Array.Empty<string>(),
+            AuthPeerValues: Array.Empty<string>(),
+            DhcpRelayValues: Array.Empty<string>(),
+            DhcpCircuitidValues: Array.Empty<string>(),
+            DhcpRemoteidValues: Array.Empty<string>(),
+            DhcpSubscridValues: Array.Empty<string>(),
+            DhcpProxyValues: Array.Empty<string>(),
+            TagIfValues: Array.Empty<string>(),
+            BridgeInterfaceValues: Array.Empty<string>(),
+            SharedNetworkValues: Array.Empty<string>(),
+            DhcpOptionPxeValues: Array.Empty<string>(),
            ExpandHosts: false,
            BogusPriv: false,
            StrictOrder: false,
@@ -80,7 +98,7 @@ public class EffectiveDnsmasqConfigTests
            TftpNoFail: false,
            TftpNoBlocksize: false,
            Dnssec: false,
-            DnssecCheckUnsigned: false,
+            DnssecCheckUnsigned: null,
            ReadEthers: false,
            DhcpRapidCommit: false,
            Localmx: false,
@@ -90,6 +108,24 @@ public class EffectiveDnsmasqConfigTests
            KeepInForeground: false,
            NoDaemon: false,
            ProxyDnssec: false,
+            ConnmarkAllowlistEnable: null,
+            NoRoundRobin: false,
+            DnssecNoTimecheck: false,
+            DnssecDebug: false,
+            LeasequeryValues: Array.Empty<string>(),
+            DhcpGenerateNames: null,
+            DhcpBroadcast: null,
+            DhcpSequentialIp: false,
+            DhcpIgnoreClid: false,
+            BootpDynamic: null,
+            NoPing: false,
+            ScriptArp: false,
+            ScriptOnRenewal: false,
+            DhcpNoOverride: false,
+            QuietDhcp: false,
+            QuietDhcp6: false,
+            QuietRa: false,
+            QuietTftp: false,
            DhcpLeaseFilePath: null,
            CacheSize: null,
            Port: null,
@@ -120,7 +156,25 @@ public class EffectiveDnsmasqConfigTests
            FastDnsRetry: null,
            DhcpScriptPath: null,
            MxTarget: null,
-            Conntrack: null
+            DnsForwardMax: null,
+            DumpfilePath: null,
+            Dumpmask: null,
+            AddCpeId: null,
+            DnssecTimestamp: null,
+            DnssecLimits: null,
+            DhcpAlternatePort: null,
+            DhcpDuid: null,
+            DhcpLuascriptPath: null,
+            DhcpScriptuser: null,
+            DhcpPxeVendor: null,
+            UseStaleCache: null,
+            AddMac: null,
+            StripMac: false,
+            AddSubnet: null,
+            StripSubnet: false,
+            Umbrella: null,
+            Do0x20EncodeState: ExplicitToggleState.Default,
+            Conntrack: false
        );

    [Fact]
@@ -0,0 +1,39 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+public class EffectiveMultiValueProjectionServiceTests
+{
+    private readonly EffectiveMultiValueProjectionService _sut = new();
+
+    [Fact]
+    public void Project_ReusesBaselineSources_ByOccurrenceOrder()
+    {
+        var baseline = new[]
+        {
+            new ValueWithSource("same", new ConfigValueSource("/a.conf", "a.conf", true, 10)),
+            new ValueWithSource("same", new ConfigValueSource("/b.conf", "b.conf", false, 20))
+        };
+
+        var projected = _sut.Project(["same", "same"], baseline, "/managed.conf");
+
+        Assert.Equal("/a.conf", projected[0].Source?.FilePath);
+        Assert.Equal("/b.conf", projected[1].Source?.FilePath);
+        Assert.False(projected[0].IsDraftOnly);
+        Assert.False(projected[1].IsDraftOnly);
+    }
+
+    [Fact]
+    public void Project_UnmatchedRows_AreDraftEditableAndPointAtManagedPath()
+    {
+        var projected = _sut.Project(["draft-value"], [], "/managed.conf");
+
+        var row = Assert.Single(projected);
+        Assert.True(row.IsDraftOnly);
+        Assert.True(row.IsEditable);
+        Assert.Null(row.Source);
+        Assert.Equal("/managed.conf", row.DisplaySourcePath);
+        Assert.Equal("managed.conf", row.DisplaySourceLabel);
+    }
+}
@@ -0,0 +1,50 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+/// <summary>Corpus-driven semantic validation: bad samples produce errors for expected option keys only.</summary>
+public class OptionSemanticValidatorRealWorldCorpusTests
+{
+    private readonly IOptionSemanticValidator _validator = new OptionSemanticValidator([
+        new DomainSemanticHandler(),
+        new DnsRrSemanticHandler(),
+        new SynthDomainSemanticHandler(),
+        new AuthServerSemanticHandler(),
+        new SrvSemanticHandler(),
+    ]);
+
+    public static IEnumerable<object[]> GetCasesWithInvalidOptions()
+    {
+        foreach (var c in RealWorldCasesHelper.LoadCases())
+        {
+            if (c.SemanticInvalidOptions.Count > 0)
+                yield return new object[] { c };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(GetCasesWithInvalidOptions))]
+    public void SemanticInvalidOptions_FromCorpus_AreRejected(CorpusCase c)
+    {
+        var mainPath = RealWorldCasesHelper.Resolve(c);
+        var paths = DnsmasqConfIncludeParser.GetIncludedPaths(mainPath);
+        var semantics = new OptionValidationSemantics(OptionValidationKind.Complex, allowEmpty: true);
+
+        foreach (var option in c.SemanticInvalidOptions)
+        {
+            var values = DnsmasqConfIncludeParser.GetMultiValueFromConfigFiles(paths, option);
+            Assert.NotEmpty(values);
+
+            var anyInvalid = values.Any(v =>
+                _validator.ValidateMultiItem(option, v, semantics) is not null);
+
+            Assert.True(anyInvalid, $"Expected at least one invalid value for option '{option}' in {c.File}");
+        }
+    }
+}
@@ -0,0 +1,119 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
+
+/// <summary>
+/// Ensures every specialized option (one with a semantic handler) has at least one valid and one invalid
+/// test case; asserts only Null/NotNull, not error message text.
+/// </summary>
+public class OptionSemanticValidatorSpecializedTests
+{
+    private static readonly OptionValidationSemantics ComplexAllowEmpty = new(OptionValidationKind.Complex, allowEmpty: true);
+
+    private readonly IOptionSemanticValidator _validator = new OptionSemanticValidator([
+        new LeasequerySemanticHandler(),
+        new ServerSemanticHandler(),
+        new LocalSemanticHandler(),
+        new RevServerSemanticHandler(),
+        new AddressSemanticHandler(),
+        new TrustAnchorSemanticHandler(),
+        new AliasSemanticHandler(),
+        new IpsetSemanticHandler(),
+        new NftsetSemanticHandler(),
+        new IgnoreAddressSemanticHandler(),
+        new ConnmarkAllowlistSemanticHandler(),
+        new DhcpRangeSemanticHandler(),
+        new DhcpHostSemanticHandler(),
+        new DhcpOptionSemanticHandler(),
+        new DhcpMatchSemanticHandler(),
+        new DhcpMacSemanticHandler(),
+        new DhcpRelaySemanticHandler(),
+        new DhcpProxySemanticHandler(),
+        new RaParamSemanticHandler(),
+        new DhcpNameMatchSemanticHandler(),
+        new DhcpIgnoreSemanticHandler(),
+        new DhcpVendorclassSemanticHandler(),
+        new DhcpUserclassSemanticHandler(),
+        new TagIfSemanticHandler(),
+        new BridgeInterfaceSemanticHandler(),
+        new SharedNetworkSemanticHandler(),
+        new DhcpOptionPxeSemanticHandler(),
+        new RebindDomainOkSemanticHandler(),
+        new BogusNxdomainSemanticHandler(),
+        new DhcpIgnoreNamesSemanticHandler(),
+        new DhcpBootSemanticHandler(),
+        new SlaacSemanticHandler(),
+        new PxeServiceSemanticHandler(),
+        new DhcpCircuitidSemanticHandler(),
+        new DhcpRemoteidSemanticHandler(),
+        new DhcpSubscrIdSemanticHandler(),
+        new FilterRrSemanticHandler(),
+        new CacheRrSemanticHandler(),
+        new InterfaceNameSemanticHandler(),
+        new AuthServerSemanticHandler(),
+        new CnameSemanticHandler(),
+        new MxHostSemanticHandler(),
+        new PtrRecordSemanticHandler(),
+        new InterfaceNameRecordSemanticHandler(),
+        new CaaRecordSemanticHandler(),
+        new SrvSemanticHandler(),
+        new NaptrRecordSemanticHandler(),
+        new DnsRrSemanticHandler(),
+        new DynamicHostSemanticHandler(),
+        new AuthSoaSemanticHandler(),
+        new AuthSecServersSemanticHandler(),
+        new AuthPeerSemanticHandler(),
+        new HostRecordSemanticHandler(),
+        new TxtRecordSemanticHandler(),
+        new DomainSemanticHandler(),
+        new SynthDomainSemanticHandler(),
+        new AuthZoneSemanticHandler(),
+    ]);
+
+    /// <summary>Option key, one valid value (validator returns null), one invalid value (validator returns non-null).</summary>
+    public static IEnumerable<object[]> GetSpecializedValidInvalidPairs()
+    {
+        yield return new object[] { DnsmasqConfKeys.Leasequery, "10.0.0.0/24", "not-an-ip" };
+        yield return new object[] { DnsmasqConfKeys.Server, "1.1.1.1", "" };
+        yield return new object[] { DnsmasqConfKeys.Local, "/lan/", "" };
+        yield return new object[] { DnsmasqConfKeys.Address, "/example.com/127.0.0.1", "/bad..name/1.2.3.4" };
+        yield return new object[] { DnsmasqConfKeys.Domain, "home.lan,192.168.1.0/24", "example.com,192.168.1.0/24,local,extra" };
+        yield return new object[] { DnsmasqConfKeys.AuthServer, "zone.example.com,eth0", ",eth0" };
+        yield return new object[] { DnsmasqConfKeys.SynthDomain, "dynamic.example.com,192.168.2.1,192.168.2.100", "example.com," };
+        yield return new object[] { DnsmasqConfKeys.DnsRr, "example.com,16,01:02", "example.com,not-a-number" };
+        yield return new object[] { DnsmasqConfKeys.Srv, "_http._tcp.example.com,host.example.com,80", "_sip._tcp,target,99999" };
+        yield return new object[] { DnsmasqConfKeys.NaptrRecord, "example.com,0,0,a,s,r", "example.com,not-num,0,a,s,r" };
+        yield return new object[] { DnsmasqConfKeys.TxtRecord, "example.com,text", "" };
+        yield return new object[] { DnsmasqConfKeys.Cname, "www.example.com,example.com", "bad..name,example.com" };
+        yield return new object[] { DnsmasqConfKeys.MxHost, "example.com,mail.example.com,10", "bad..name,mail.example.com,10" };
+        yield return new object[] { DnsmasqConfKeys.PtrRecord, "1.168.192.in-addr.arpa,router.lan", "bad..arpa,host" };
+        yield return new object[] { DnsmasqConfKeys.RebindDomainOk, "example.com", "bad..name" };
+        yield return new object[] { DnsmasqConfKeys.BogusNxdomain, "192.168.1.1", "not-an-ip" };
+        yield return new object[] { DnsmasqConfKeys.ConnmarkAllowlist, "0xff,example.com", "not-a-mark,example.com" };
+        yield return new object[] { DnsmasqConfKeys.DhcpRange, "192.168.1.50,192.168.1.150,12h", "not-an-ip,192.168.1.150" };
+        yield return new object[] { DnsmasqConfKeys.DhcpHost, "aa:bb:cc:dd:ee:ff,192.168.1.10", "ignore" };
+        yield return new object[] { DnsmasqConfKeys.DhcpOption, "3,192.168.1.1", "option:," };
+        yield return new object[] { DnsmasqConfKeys.DhcpMatch, "set:efi,option:client-arch,6", "option:client-arch,6" };
+        yield return new object[] { DnsmasqConfKeys.DhcpMac, "set:vendor,aa:bb:cc:dd:ee:ff", "aa:bb:cc:dd:ee:ff" };
+        yield return new object[] { DnsmasqConfKeys.DhcpNameMatch, "set:tag,hostname*", "hostname*" };
+        yield return new object[] { DnsmasqConfKeys.DhcpIgnoreNames, "tag:guest", "guest" };
+        yield return new object[] { DnsmasqConfKeys.AuthZone, "example.com", "bad..name" };
+        yield return new object[] { DnsmasqConfKeys.FilterRr, "A,AAAA", "" };
+        yield return new object[] { DnsmasqConfKeys.CacheRr, "A,TXT", "" };
+    }
+
+    [Theory]
+    [MemberData(nameof(GetSpecializedValidInvalidPairs))]
+    public void SpecializedOption_ValidAccepted_InvalidRejected(string optionKey, string validValue, string invalidValue)
+    {
+        var validErr = _validator.ValidateMultiItem(optionKey, validValue, ComplexAllowEmpty);
+        Assert.Null(validErr);
+
+        var invalidErr = _validator.ValidateMultiItem(optionKey, invalidValue, ComplexAllowEmpty);
+        Assert.NotNull(invalidErr);
+    }
+}
@@ -0,0 +1,474 @@
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Filters;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Models.Dnsmasq;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+using DnsmasqWebUI.Models.Filters;
+using Xunit;
+
+namespace DnsmasqWebUI.Tests.Services.Filters;
+
+public class FiltersPageProjectionServiceTests
+{
+    private static DnsmasqServiceStatus MinimalStatus(
+        IReadOnlyList<string> addresses,
+        IReadOnlyList<ValueWithSource>? addressSources = null)
+    {
+        var cfg = TestConfig(addresses);
+        var sources = addressSources != null && addressSources.Count == addresses.Count
+            ? MinimalSources(addressSources)
+            : null;
+        return EmptyStatus() with { EffectiveConfig = cfg, EffectiveConfigSources = sources };
+    }
+
+    private static EffectiveConfigSources MinimalSources(IReadOnlyList<ValueWithSource> addressValues) =>
+        new(
+            NoHosts: null,
+            AddnHostsPaths: [],
+            HostsdirPath: null,
+            ServerValues: [],
+            LocalValues: [],
+            RevServerValues: [],
+            AddressValues: addressValues,
+            Interfaces: [],
+            ListenAddresses: [],
+            ExceptInterfaces: [],
+            DhcpRanges: [],
+            DhcpHostLines: [],
+            DhcpOptionLines: [],
+            DhcpMatchValues: [],
+            DhcpBootValues: [],
+            DhcpIgnoreValues: [],
+            DhcpVendorclassValues: [],
+            DhcpUserclassValues: [],
+            RaParamValues: [],
+            SlaacValues: [],
+            PxeServiceValues: [],
+            TrustAnchorValues: [],
+            ResolvFiles: [],
+            RebindDomainOkValues: [],
+            BogusNxdomainValues: [],
+            IgnoreAddressValues: [],
+            AliasValues: [],
+            FilterRrValues: [],
+            CacheRrValues: [],
+            AuthServerValues: [],
+            NoDhcpInterfaceValues: [],
+            NoDhcpv4InterfaceValues: [],
+            NoDhcpv6InterfaceValues: [],
+            DomainValues: [],
+            CnameValues: [],
+            MxHostValues: [],
+            SrvValues: [],
+            PtrRecordValues: [],
+            TxtRecordValues: [],
+            NaptrRecordValues: [],
+            HostRecordValues: [],
+            DynamicHostValues: [],
+            InterfaceNameValues: [],
+            DhcpOptionForceLines: [],
+            IpsetValues: [],
+            NftsetValues: [],
+            DhcpMacValues: [],
+            DhcpNameMatchValues: [],
+            DhcpIgnoreNamesValues: [],
+            DhcpHostsfilePaths: [],
+            DhcpOptsfilePaths: [],
+            DhcpHostsdirPaths: [],
+            DhcpOptsdirPaths: [],
+            ConnmarkAllowlistValues: [],
+            CaaRecordValues: [],
+            DnsRrValues: [],
+            SynthDomainValues: [],
+            AuthZoneValues: [],
+            AuthSoaValues: [],
+            AuthSecServersValues: [],
+            AuthPeerValues: [],
+            DhcpRelayValues: [],
+            DhcpCircuitidValues: [],
+            DhcpRemoteidValues: [],
+            DhcpSubscridValues: [],
+            DhcpProxyValues: [],
+            TagIfValues: [],
+            BridgeInterfaceValues: [],
+            SharedNetworkValues: [],
+            DhcpOptionPxeValues: [],
+            ExpandHosts: null,
+            BogusPriv: null,
+            StrictOrder: null,
+            AllServers: null,
+            NoResolv: null,
+            DomainNeeded: null,
+            NoPoll: null,
+            BindInterfaces: null,
+            BindDynamic: null,
+            NoNegcache: null,
+            DnsLoopDetect: null,
+            StopDnsRebind: null,
+            RebindLocalhostOk: null,
+            ClearOnReload: null,
+            Filterwin2k: null,
+            FilterA: null,
+            FilterAaaa: null,
+            LocaliseQueries: null,
+            LogDebug: null,
+            DhcpAuthoritative: null,
+            LeasefileRo: null,
+            EnableTftp: null,
+            TftpSecure: null,
+            TftpNoFail: null,
+            TftpNoBlocksize: null,
+            Dnssec: null,
+            DnssecCheckUnsigned: null,
+            ReadEthers: null,
+            DhcpRapidCommit: null,
+            Localmx: null,
+            Selfmx: null,
+            EnableRa: null,
+            LogDhcp: null,
+            KeepInForeground: null,
+            NoDaemon: null,
+            ProxyDnssec: null,
+            ConnmarkAllowlistEnable: null,
+            NoRoundRobin: null,
+            DnssecNoTimecheck: null,
+            DnssecDebug: null,
+            LeasequeryValues: [],
+            DhcpGenerateNames: null,
+            DhcpBroadcast: null,
+            DhcpSequentialIp: null,
+            DhcpIgnoreClid: null,
+            BootpDynamic: null,
+            NoPing: null,
+            ScriptArp: null,
+            ScriptOnRenewal: null,
+            DhcpNoOverride: null,
+            QuietDhcp: null,
+            QuietDhcp6: null,
+            QuietRa: null,
+            QuietTftp: null,
+            DhcpLeaseFilePath: null,
+            CacheSize: null,
+            Port: null,
+            LocalTtl: null,
+            PidFilePath: null,
+            User: null,
+            Group: null,
+            LogFacility: null,
+            LogQueries: null,
+            AuthTtl: null,
+            EdnsPacketMax: null,
+            QueryPort: null,
+            PortLimit: null,
+            MinPort: null,
+            MaxPort: null,
+            LogAsync: null,
+            LocalService: null,
+            DhcpLeaseMax: null,
+            NegTtl: null,
+            MaxTtl: null,
+            MaxCacheTtl: null,
+            MinCacheTtl: null,
+            DhcpTtl: null,
+            TftpRootPath: null,
+            PxePrompt: null,
+            EnableDbus: null,
+            EnableUbus: null,
+            FastDnsRetry: null,
+            DhcpScriptPath: null,
+            MxTarget: null,
+            DnsForwardMax: null,
+            DumpfilePath: null,
+            Dumpmask: null,
+            AddCpeId: null,
+            DnssecTimestamp: null,
+            DnssecLimits: null,
+            DhcpAlternatePort: null,
+            DhcpDuid: null,
+            DhcpLuascriptPath: null,
+            DhcpScriptuser: null,
+            DhcpPxeVendor: null,
+            UseStaleCache: null,
+            AddMac: null,
+            StripMac: null,
+            AddSubnet: null,
+            StripSubnet: null,
+            Umbrella: null,
+            Do0x20Encode: null,
+            Conntrack: null);
+
+    private static EffectiveDnsmasqConfig TestConfig(IReadOnlyList<string> addresses) =>
+        EmptyConfig() with { AddressValues = addresses };
+
+    private static EffectiveDnsmasqConfig EmptyConfig()
+    {
+        // Minimal non-null lists / defaults — only AddressValues overridden in tests
+        return new EffectiveDnsmasqConfig(
+            NoHosts: false,
+            AddnHostsPaths: [],
+            HostsdirPath: null,
+            ServerValues: [],
+            LocalValues: [],
+            RevServerValues: [],
+            AddressValues: [],
+            Interfaces: [],
+            ListenAddresses: [],
+            ExceptInterfaces: [],
+            DhcpRanges: [],
+            DhcpHostLines: [],
+            DhcpOptionLines: [],
+            DhcpMatchValues: [],
+            DhcpBootValues: [],
+            DhcpIgnoreValues: [],
+            DhcpVendorclassValues: [],
+            DhcpUserclassValues: [],
+            RaParamValues: [],
+            SlaacValues: [],
+            PxeServiceValues: [],
+            TrustAnchorValues: [],
+            ResolvFiles: [],
+            RebindDomainOkValues: [],
+            BogusNxdomainValues: [],
+            IgnoreAddressValues: [],
+            AliasValues: [],
+            FilterRrValues: [],
+            CacheRrValues: [],
+            AuthServerValues: [],
+            NoDhcpInterfaceValues: [],
+            NoDhcpv4InterfaceValues: [],
+            NoDhcpv6InterfaceValues: [],
+            DomainValues: [],
+            CnameValues: [],
+            MxHostValues: [],
+            SrvValues: [],
+            PtrRecordValues: [],
+            TxtRecordValues: [],
+            NaptrRecordValues: [],
+            HostRecordValues: [],
+            DynamicHostValues: [],
+            InterfaceNameValues: [],
+            DhcpOptionForceLines: [],
+            IpsetValues: [],
+            NftsetValues: [],
+            DhcpMacValues: [],
+            DhcpNameMatchValues: [],
+            DhcpIgnoreNamesValues: [],
+            DhcpHostsfilePaths: [],
+            DhcpOptsfilePaths: [],
+            DhcpHostsdirPaths: [],
+            DhcpOptsdirPaths: [],
+            ConnmarkAllowlistValues: [],
+            CaaRecordValues: [],
+            DnsRrValues: [],
+            SynthDomainValues: [],
+            AuthZoneValues: [],
+            AuthSoaValues: [],
+            AuthSecServersValues: [],
+            AuthPeerValues: [],
+            DhcpRelayValues: [],
+            DhcpCircuitidValues: [],
+            DhcpRemoteidValues: [],
+            DhcpSubscridValues: [],
+            DhcpProxyValues: [],
+            TagIfValues: [],
+            BridgeInterfaceValues: [],
+            SharedNetworkValues: [],
+            DhcpOptionPxeValues: [],
+            ExpandHosts: false,
+            BogusPriv: false,
+            StrictOrder: false,
+            AllServers: false,
+            NoResolv: false,
+            DomainNeeded: false,
+            NoPoll: false,
+            BindInterfaces: false,
+            BindDynamic: false,
+            NoNegcache: false,
+            DnsLoopDetect: false,
+            StopDnsRebind: false,
+            RebindLocalhostOk: false,
+            ClearOnReload: false,
+            Filterwin2k: false,
+            FilterA: false,
+            FilterAaaa: false,
+            LocaliseQueries: false,
+            LogDebug: false,
+            DhcpAuthoritative: false,
+            LeasefileRo: false,
+            EnableTftp: false,
+            TftpSecure: false,
+            TftpNoFail: false,
+            TftpNoBlocksize: false,
+            Dnssec: false,
+            DnssecCheckUnsigned: null,
+            ReadEthers: false,
+            DhcpRapidCommit: false,
+            Localmx: false,
+            Selfmx: false,
+            EnableRa: false,
+            LogDhcp: false,
+            KeepInForeground: false,
+            NoDaemon: false,
+            ProxyDnssec: false,
+            ConnmarkAllowlistEnable: null,
+            NoRoundRobin: false,
+            DnssecNoTimecheck: false,
+            DnssecDebug: false,
+            LeasequeryValues: [],
+            DhcpGenerateNames: null,
+            DhcpBroadcast: null,
+            DhcpSequentialIp: false,
+            DhcpIgnoreClid: false,
+            BootpDynamic: null,
+            NoPing: false,
+            ScriptArp: false,
+            ScriptOnRenewal: false,
+            DhcpNoOverride: false,
+            QuietDhcp: false,
+            QuietDhcp6: false,
+            QuietRa: false,
+            QuietTftp: false,
+            DhcpLeaseFilePath: null,
+            CacheSize: null,
+            Port: null,
+            LocalTtl: null,
+            PidFilePath: null,
+            User: null,
+            Group: null,
+            LogFacility: null,
+            LogQueries: null,
+            AuthTtl: null,
+            EdnsPacketMax: null,
+            QueryPort: null,
+            PortLimit: null,
+            MinPort: null,
+            MaxPort: null,
+            LogAsync: null,
+            LocalService: null,
+            DhcpLeaseMax: null,
+            NegTtl: null,
+            MaxTtl: null,
+            MaxCacheTtl: null,
+            MinCacheTtl: null,
+            DhcpTtl: null,
+            TftpRootPath: null,
+            PxePrompt: null,
+            EnableDbus: null,
+            EnableUbus: null,
+            FastDnsRetry: null,
+            DhcpScriptPath: null,
+            MxTarget: null,
+            DnsForwardMax: null,
+            DumpfilePath: null,
+            Dumpmask: null,
+            AddCpeId: null,
+            DnssecTimestamp: null,
+            DnssecLimits: null,
+            DhcpAlternatePort: null,
+            DhcpDuid: null,
+            DhcpLuascriptPath: null,
+            DhcpScriptuser: null,
+            DhcpPxeVendor: null,
+            UseStaleCache: null,
+            AddMac: null,
+            StripMac: false,
+            AddSubnet: null,
+            StripSubnet: false,
+            Umbrella: null,
+            Do0x20EncodeState: ExplicitToggleState.Default,
+            Conntrack: false);
+    }
+
+    private static DnsmasqServiceStatus EmptyStatus() =>
+        new(
+            SystemHostsPath: null,
+            SystemHostsPathExists: false,
+            ManagedHostsFilePath: null,
+            ManagedHostsPathExists: false,
+            NoHosts: false,
+            AddnHostsPaths: [],
+            EffectiveConfig: null,
+            EffectiveConfigSources: null,
+            MainConfigPath: null,
+            ManagedFilePath: "/managed.conf",
+            LeasesPath: null,
+            MainConfigPathExists: false,
+            ManagedFilePathExists: true,
+            LeasesPathConfigured: false,
+            LeasesPathExists: false,
+            ConfigFiles: [],
+            ReloadCommandConfigured: false,
+            StatusCommandConfigured: false,
+            StatusShowConfigured: false,
+            LogsConfigured: false,
+            LogsPath: null,
+            StatusShowCommand: null,
+            LogsCommand: null,
+            DnsmasqStatus: "active",
+            StatusCommandExitCode: null,
+            StatusCommandStdout: null,
+            StatusCommandStderr: null,
+            StatusShowOutput: null,
+            LogsOutput: null,
+            DhcpRangeStart: null,
+            DhcpRangeEnd: null,
+            DnsmasqVersion: null,
+            MinimumSupportedDnsmasqVersion: "0",
+            DnsmasqVersionSupported: true,
+            DnsmasqVersionError: null,
+            DnsmasqSupportsDhcp: false,
+            DnsmasqSupportsTftp: false,
+            DnsmasqSupportsDnssec: false,
+            DnsmasqSupportsDbus: false);
+
+    [Fact]
+    public void BuildGroups_MarksManagedAddressEditable()
+    {
+        var managed = new ConfigValueSource("/managed.conf", "managed.conf", IsManaged: true, 10);
+        var status = MinimalStatus(
+            ["/ads.example/#"],
+            [new ValueWithSource("/ads.example/#", managed)]);
+
+        var svc = new FiltersPageProjectionService(new FilterPolicySummaryFormatter(), new EffectiveMultiValueProjectionService());
+        var groups = svc.BuildGroups(status, new FilterPolicyQueryState("", null, null, null, null));
+        var blocking = groups.First(g => g.Category == FilterPolicyCategory.Blocking);
+        var row = Assert.Single(blocking.Rows);
+        Assert.True(row.IsEditable);
+        Assert.Equal(FilterPolicyKind.Address, row.Kind);
+    }
+
+    [Fact]
+    public void BuildGroups_ReadOnlyWhenSourceNotManaged()
+    {
+        var ro = new ConfigValueSource("/etc/dnsmasq.d/z.conf", "z.conf", IsManaged: false, 2);
+        var status = MinimalStatus(
+            ["/ads.example/#"],
+            [new ValueWithSource("/ads.example/#", ro)]);
+
+        var svc = new FiltersPageProjectionService(new FilterPolicySummaryFormatter(), new EffectiveMultiValueProjectionService());
+        var groups = svc.BuildGroups(status, new FilterPolicyQueryState("", null, null, null, null));
+        var row = Assert.Single(groups.First(g => g.Category == FilterPolicyCategory.Blocking).Rows);
+        Assert.False(row.IsEditable);
+    }
+
+    [Fact]
+    public void BuildGroups_CurrentValuesAccessor_UsesDraftManagedRows()
+    {
+        var ro = new ConfigValueSource("/etc/dnsmasq.d/z.conf", "z.conf", IsManaged: false, 2);
+        var status = MinimalStatus(
+            ["/ads.example/#"],
+            [new ValueWithSource("/ads.example/#", ro)]);
+
+        var svc = new FiltersPageProjectionService(new FilterPolicySummaryFormatter(), new EffectiveMultiValueProjectionService());
+        var groups = svc.BuildGroups(
+            status,
+            new FilterPolicyQueryState("", null, null, null, null),
+            optionName => optionName == DnsmasqConfKeys.Address ? ["/draft.example/#"] : []);
+
+        var row = Assert.Single(groups.First(g => g.Category == FilterPolicyCategory.Blocking).Rows);
+        Assert.Equal("/draft.example/#", row.RawValue);
+        Assert.True(row.IsEditable);
+        Assert.True(row.IsDraftOnly);
+        Assert.Equal("/managed.conf", row.SourcePath);
+    }
+}
@@ -0,0 +1,80 @@
+using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Hosts;
+using DnsmasqWebUI.Models.Hosts;
+
+namespace DnsmasqWebUI.Tests.Services.Hosts;
+
+public class HostsPageProjectionServiceTests
+{
+    private readonly HostsPageProjectionService _sut = new();
+
+    [Fact]
+    public void BuildGroups_SourcePathFilter_KeepsOnlyThatFile()
+    {
+        var rows = new HostsPageRow[]
+        {
+            new(
+                "m1",
+                HostsRowSourceKind.Managed,
+                "/data/managed.hosts",
+                IsEditable: true,
+                IsActive: true,
+                InactiveReason: null,
+                Address: "10.0.0.1",
+                Names: new[] { "a" },
+                EffectiveNames: new[] { "a" },
+                IsComment: false,
+                LineNumber: 1),
+            new(
+                "x1",
+                HostsRowSourceKind.AddnHosts,
+                "/etc/extra.hosts",
+                IsEditable: false,
+                IsActive: true,
+                InactiveReason: null,
+                Address: "10.0.0.2",
+                Names: new[] { "b" },
+                EffectiveNames: new[] { "b" },
+                IsComment: false,
+                LineNumber: 1),
+        };
+
+        var query = new HostsPageQueryState(
+            Search: "",
+            Grouping: HostsGroupingMode.Source,
+            Sort: HostsSortMode.LineNumber,
+            Descending: false,
+            SourceKindFilter: null,
+            SourcePathFilter: "/etc/extra.hosts",
+            EditableFilter: null,
+            ActiveFilter: null);
+
+        var groups = _sut.BuildGroups(rows, query);
+
+        Assert.Single(groups);
+        Assert.Equal("/etc/extra.hosts", groups[0].Subtitle);
+        Assert.Single(groups[0].Rows);
+    }
+
+    [Fact]
+    public void BuildGroups_SourcePathFilter_EmptyMeansAllFiles()
+    {
+        var rows = new HostsPageRow[]
+        {
+            new("m1", HostsRowSourceKind.Managed, "/a", true, true, null, "1.1.1.1", new[] { "a" }, new[] { "a" }, false, 1),
+            new("x1", HostsRowSourceKind.AddnHosts, "/b", false, true, null, "2.2.2.2", new[] { "b" }, new[] { "b" }, false, 1),
+        };
+
+        var query = new HostsPageQueryState(
+            "",
+            HostsGroupingMode.Source,
+            HostsSortMode.LineNumber,
+            false,
+            null,
+            SourcePathFilter: null,
+            null,
+            null);
+
+        var groups = _sut.BuildGroups(rows, query);
+        Assert.Equal(2, groups.Count);
+    }
+}
@@ -0,0 +1,171 @@
+@using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
+@using DnsmasqWebUI.Infrastructure.Services.UI.Notifications.Abstractions
+@inject INotificationService NotificationService
+@if (Rows.Count == 0)
+{
+    <p class="text-muted small">No rows for the current filters.</p>
+}
+else
+{
+    <div class="app-table-scroll-shell" data-table-scroll-cue>
+        <div class="app-table-scroll-region" data-table-scroll-region role="region" aria-label="DNS records table" tabindex="0">
+            <table class="table table-bordered table-hover app-data-table dns-records-table mb-0" id="@TableId">
+                <caption class="visually-hidden">@TableCaption</caption>
+                <thead>
+                <tr>
+                    <th scope="col" class="dns-records-type-th">
+                        <span class="align-middle">Type</span>
+                        <button type="button"
+                                class="btn btn-link btn-sm text-muted app-th-help-btn p-0 ms-1 align-middle border-0"
+                                title="@TypeColumnHelpText"
+                                aria-label="@TypeColumnHelpText"
+                                @onclick="OnTypeHelpClick"
+                                @onclick:stopPropagation="true">
+                            <i class="bi bi-question-circle" aria-hidden="true"></i>
+                        </button>
+                    </th>
+                    <th scope="col" class="dns-records-summary-th">
+                        <span class="align-middle">Summary</span>
+                        <button type="button"
+                                class="btn btn-link btn-sm text-muted app-th-help-btn p-0 ms-1 align-middle border-0"
+                                title="@SummaryColumnHelpText"
+                                aria-label="@SummaryColumnHelpText"
+                                @onclick="OnSummaryHelpClick"
+                                @onclick:stopPropagation="true">
+                            <i class="bi bi-question-circle" aria-hidden="true"></i>
+                        </button>
+                    </th>
+                    <th scope="col" class="dns-records-source-th">
+                        <span class="align-middle">Source</span>
+                        <button type="button"
+                                class="btn btn-link btn-sm text-muted app-th-help-btn p-0 ms-1 align-middle border-0"
+                                title="@SourceColumnHelpText"
+                                aria-label="@SourceColumnHelpText"
+                                @onclick="OnSourceHelpClick"
+                                @onclick:stopPropagation="true">
+                            <i class="bi bi-question-circle" aria-hidden="true"></i>
+                        </button>
+                    </th>
+                    <th scope="col" class="dns-records-status-th">
+                        <span class="align-middle">Status</span>
+                        <button type="button"
+                                class="btn btn-link btn-sm text-muted app-th-help-btn p-0 ms-1 align-middle border-0"
+                                title="@StatusColumnHelpText"
+                                aria-label="@StatusColumnHelpText"
+                                @onclick="OnStatusHelpClick"
+                                @onclick:stopPropagation="true">
+                            <i class="bi bi-question-circle" aria-hidden="true"></i>
+                        </button>
+                    </th>
+                    <th scope="col" class="dns-records-actions-col">
+                        <span class="align-middle">Actions</span>
+                        <button type="button"
+                                class="btn btn-link btn-sm text-muted app-th-help-btn p-0 ms-1 align-middle border-0"
+                                title="@ActionsColumnHelpText"
+                                aria-label="@ActionsColumnHelpText"
+                                @onclick="OnActionsHelpClick"
+                                @onclick:stopPropagation="true">
+                            <i class="bi bi-question-circle" aria-hidden="true"></i>
+                        </button>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach (var row in Rows)
+                {
+                    <tr @key="@row.OccurrenceId">
+                        <td><span class="badge bg-secondary">@row.OptionName</span></td>
+                        <td>
+                            <div class="dns-records-summary" title="@row.RawValue">@row.Summary</div>
+                            <code class="small text-muted dns-records-raw">@row.RawValue</code>
+                        </td>
+                        <td class="small">
+                            @if (string.IsNullOrWhiteSpace(row.SourcePath))
+                            {
+                                <span class="text-muted">—</span>
+                            }
+                            else
+                            {
+                                <span title="@row.SourcePath">@(row.SourceLabel ?? row.SourcePath)</span>
+                                @if (row.IsDraftOnly)
+                                {
+                                    <span class="badge bg-primary-subtle text-primary-emphasis ms-1">draft</span>
+                                }
+                                else if (row.Source?.IsReadOnly == true)
+                                {
+                                    <span class="badge bg-warning text-dark ms-1">read-only</span>
+                                }
+                                else
+                                {
+                                    <span class="badge bg-success ms-1">editable</span>
+                                }
+                            }
+                        </td>
+                        <td class="small">
+                            @if (row.Issues.Count == 0)
+                            {
+                                <span class="text-muted">OK</span>
+                            }
+                            else
+                            {
+                                @foreach (var issue in row.Issues.Take(3))
+                                {
+                                    var cls = issue.Severity == FieldIssueSeverity.Error ? "text-danger" : "text-warning";
+                                    <div class="@cls">@issue.Message</div>
+                                }
+                                @if (row.Issues.Count > 3)
+                                {
+                                    <div class="text-muted">…</div>
+                                }
+                            }
+                        </td>
+                        <td>
+                            <div class="btn-group btn-group-sm">
+                                <button type="button" class="btn btn-outline-primary btn-sm" disabled="@(!row.IsEditable)" @onclick="() => OnEditRow.InvokeAsync(row)">Edit</button>
+                                <button type="button" class="btn btn-outline-danger btn-sm" disabled="@(!row.IsEditable)" @onclick="() => OnDeleteRow.InvokeAsync(row)">Remove</button>
+                            </div>
+                        </td>
+                    </tr>
+                }
+                </tbody>
+            </table>
+        </div>
+    </div>
+}
+
+@code {
+    private const string TypeColumnHelpText =
+        "The dnsmasq option name for this line (for example cname, host-record, srv-host).";
+
+    private const string SummaryColumnHelpText =
+        "A short plain-language description of the record. The monospace line below is the exact config value dnsmasq uses.";
+
+    private const string SourceColumnHelpText =
+        "Which configuration file defined this line. Editable means the app can write changes to that source; read-only means it appears in the effective config but is not managed from the app’s writable file.";
+
+    private const string StatusColumnHelpText =
+        "Per-line syntax validation from option semantics plus page-local warnings (duplicates, incomplete rows, or unusual combinations such as CNAME vs host-record on the same name).";
+
+    private const string ActionsColumnHelpText =
+        "Edit opens the structured form for this directive when the row is editable. Remove drops this exact line from the effective multi-value list (same as deleting in Effective configuration).";
+
+    [Parameter] public string TableId { get; set; } = "dns-records-table";
+
+    [Parameter] public string TableCaption { get; set; } = "DNS record lines for scanning and editing";
+
+    [Parameter] public IReadOnlyList<DnsRecordRow> Rows { get; set; } = [];
+
+    [Parameter] public EventCallback<DnsRecordRow> OnEditRow { get; set; }
+
+    [Parameter] public EventCallback<DnsRecordRow> OnDeleteRow { get; set; }
+
+    private void OnTypeHelpClick() => NotificationService.ShowInfo(TypeColumnHelpText);
+
+    private void OnSummaryHelpClick() => NotificationService.ShowInfo(SummaryColumnHelpText);
+
+    private void OnSourceHelpClick() => NotificationService.ShowInfo(SourceColumnHelpText);
+
+    private void OnStatusHelpClick() => NotificationService.ShowInfo(StatusColumnHelpText);
+
+    private void OnActionsHelpClick() => NotificationService.ShowInfo(ActionsColumnHelpText);
+}
@@ -0,0 +1,253 @@
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+<h4 class="h6 mb-2">@_title</h4>
+@if (OptionName == DnsmasqConfKeys.NaptrRecord)
+{
+    <div class="row g-2">
+        <div class="col-md-3"><label class="form-label small mb-0">Name</label><input class="form-control form-control-sm" @bind="_nName" @bind:event="oninput" /></div>
+        <div class="col-md-1"><label class="form-label small mb-0">Order</label><input class="form-control form-control-sm" @bind="_nOrder" @bind:event="oninput" /></div>
+        <div class="col-md-1"><label class="form-label small mb-0">Pref</label><input class="form-control form-control-sm" @bind="_nPref" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">Flags</label><input class="form-control form-control-sm" @bind="_nFlags" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">Service</label><input class="form-control form-control-sm" @bind="_nService" @bind:event="oninput" /></div>
+        <div class="col-md-3"><label class="form-label small mb-0">Regexp</label><input class="form-control form-control-sm" @bind="_nRegexp" @bind:event="oninput" /></div>
+        <div class="col-md-6"><label class="form-label small mb-0">Replacement (optional)</label><input class="form-control form-control-sm" @bind="_nRepl" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.CaaRecord)
+{
+    <div class="row g-2">
+        <div class="col-md-3"><label class="form-label small mb-0">Name</label><input class="form-control form-control-sm" @bind="_cName" @bind:event="oninput" /></div>
+        <div class="col-md-1"><label class="form-label small mb-0">Flags</label><input class="form-control form-control-sm" @bind="_cFlags" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">Tag</label><input class="form-control form-control-sm" @bind="_cTag" @bind:event="oninput" /></div>
+        <div class="col-md-6"><label class="form-label small mb-0">Value</label><input class="form-control form-control-sm" @bind="_cValue" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.DnsRr)
+{
+    <div class="row g-2">
+        <div class="col-md-3"><label class="form-label small mb-0">Name</label><input class="form-control form-control-sm" @bind="_dName" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">RR number</label><input class="form-control form-control-sm" @bind="_dNum" @bind:event="oninput" /></div>
+        <div class="col-md-7"><label class="form-label small mb-0">Hex data (optional)</label><input class="form-control form-control-sm" @bind="_dHex" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.DynamicHost)
+{
+    <div class="row g-2">
+        <div class="col-md-2"><label class="form-label small mb-0">Name</label><input class="form-control form-control-sm" @bind="_yName" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">IPv4</label><input class="form-control form-control-sm" @bind="_yV4" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">IPv6</label><input class="form-control form-control-sm" @bind="_yV6" @bind:event="oninput" /></div>
+        <div class="col-md-3"><label class="form-label small mb-0">Interface</label><input class="form-control form-control-sm" @bind="_yIface" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.InterfaceName)
+{
+    <div class="row g-2">
+        <div class="col-md-4"><label class="form-label small mb-0">DNS name</label><input class="form-control form-control-sm" @bind="_iName" @bind:event="oninput" /></div>
+        <div class="col-md-4"><label class="form-label small mb-0">Interface[/4|/6]</label><input class="form-control form-control-sm" @bind="_iIface" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.SynthDomain)
+{
+    <div class="row g-2">
+        <div class="col-md-3"><label class="form-label small mb-0">Domain</label><input class="form-control form-control-sm" @bind="_sDomain" @bind:event="oninput" /></div>
+        <div class="col-md-3"><label class="form-label small mb-0">Address range</label><input class="form-control form-control-sm" @bind="_sRange" @bind:event="oninput" /></div>
+        <div class="col-md-4"><label class="form-label small mb-0">Prefix (optional)</label><input class="form-control form-control-sm" @bind="_sPrefix" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.AuthZone)
+{
+    <div class="row g-2">
+        <div class="col-md-3"><label class="form-label small mb-0">Domain</label><input class="form-control form-control-sm" @bind="_zDomain" @bind:event="oninput" /></div>
+        <div class="col-md-9"><label class="form-label small mb-0">Subnets / exclude:… (comma-separated)</label><input class="form-control form-control-sm" @bind="_zRest" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.AuthSoa)
+{
+    <div class="row g-2">
+        <div class="col-md-2"><label class="form-label small mb-0">Serial</label><input class="form-control form-control-sm" @bind="_aSerial" @bind:event="oninput" /></div>
+        <div class="col-md-3"><label class="form-label small mb-0">Hostmaster</label><input class="form-control form-control-sm" @bind="_aHm" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">Refresh</label><input class="form-control form-control-sm" @bind="_aRef" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">Retry</label><input class="form-control form-control-sm" @bind="_aRetry" @bind:event="oninput" /></div>
+        <div class="col-md-2"><label class="form-label small mb-0">Expiry</label><input class="form-control form-control-sm" @bind="_aEx" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.AuthSecServers)
+{
+    <div class="row g-2">
+        <div class="col-md-12"><label class="form-label small mb-0">Domains (comma-separated)</label><input class="form-control form-control-sm" @bind="_secDom" @bind:event="oninput" /></div>
+    </div>
+}
+else if (OptionName == DnsmasqConfKeys.AuthPeer)
+{
+    <div class="row g-2">
+        <div class="col-md-12"><label class="form-label small mb-0">IPs (comma-separated)</label><input class="form-control form-control-sm" @bind="_peerIp" @bind:event="oninput" /></div>
+    </div>
+}
+<div class="mt-2 d-flex gap-1">
+    <button type="button" class="btn btn-sm btn-primary" @onclick="SaveAsync">Save</button>
+    <button type="button" class="btn btn-sm btn-outline-secondary" @onclick="OnCancel">Cancel</button>
+</div>
+@if (_error != null)
+{
+    <p class="text-danger small mt-2 mb-0">@_error</p>
+}
+
+@code {
+    [Parameter, EditorRequired] public string OptionName { get; set; } = "";
+    [Parameter] public DnsRecordRow? Existing { get; set; }
+    [Parameter] public EventCallback<DnsRecordEditorResult> OnSave { get; set; }
+    [Parameter] public EventCallback OnCancel { get; set; }
+
+    private string _title = "Advanced record";
+    private string? _error;
+
+    private string _nName = "", _nOrder = "", _nPref = "", _nFlags = "", _nService = "", _nRegexp = "", _nRepl = "";
+    private string _cName = "", _cFlags = "", _cTag = "", _cValue = "";
+    private string _dName = "", _dNum = "", _dHex = "";
+    private string _yName = "", _yV4 = "", _yV6 = "", _yIface = "";
+    private string _iName = "", _iIface = "";
+    private string _sDomain = "", _sRange = "", _sPrefix = "";
+    private string _zDomain = "", _zRest = "";
+    private string _aSerial = "", _aHm = "", _aRef = "", _aRetry = "", _aEx = "";
+    private string _secDom = "";
+    private string _peerIp = "";
+    private string? _boundRowKey;
+
+    protected override void OnParametersSet()
+    {
+        _title = OptionName switch
+        {
+            DnsmasqConfKeys.NaptrRecord => "NAPTR",
+            DnsmasqConfKeys.CaaRecord => "CAA",
+            DnsmasqConfKeys.DnsRr => "dns-rr",
+            DnsmasqConfKeys.DynamicHost => "dynamic-host",
+            DnsmasqConfKeys.InterfaceName => "interface-name",
+            DnsmasqConfKeys.SynthDomain => "synth-domain",
+            DnsmasqConfKeys.AuthZone => "auth-zone",
+            DnsmasqConfKeys.AuthSoa => "auth-soa",
+            DnsmasqConfKeys.AuthSecServers => "auth-sec-servers",
+            DnsmasqConfKeys.AuthPeer => "auth-peer",
+            _ => OptionName
+        };
+
+        if (!DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref _boundRowKey, Existing, $"add:{OptionName}"))
+            return;
+
+        _error = null;
+        switch (Existing?.Payload)
+        {
+            case NaptrPayload n:
+                _nName = n.Name; _nOrder = n.Order; _nPref = n.Preference; _nFlags = n.Flags; _nService = n.Service; _nRegexp = n.Regexp; _nRepl = n.Replacement ?? "";
+                break;
+            case CaaPayload c:
+                _cName = c.Name; _cFlags = c.Flags; _cTag = c.Tag; _cValue = c.Value;
+                break;
+            case DnsRrPayload d:
+                _dName = d.Name; _dNum = d.RrNumber; _dHex = d.HexData ?? "";
+                break;
+            case DynamicHostPayload y:
+                _yName = y.Name; _yV4 = y.IPv4 ?? ""; _yV6 = y.IPv6 ?? ""; _yIface = y.Interface;
+                break;
+            case InterfaceNamePayload i:
+                _iName = i.DnsName; _iIface = i.InterfaceSpec;
+                break;
+            case SynthDomainPayload s:
+                _sDomain = s.Domain; _sRange = s.AddressRange; _sPrefix = s.Prefix ?? "";
+                break;
+            case AuthZonePayload z:
+                _zDomain = z.Domain; _zRest = z.SubnetsAndExcludes.Count > 0 ? string.Join(",", z.SubnetsAndExcludes) : "";
+                break;
+            case AuthSoaPayload a:
+                _aSerial = a.Serial; _aHm = a.Hostmaster ?? ""; _aRef = a.Refresh ?? ""; _aRetry = a.Retry ?? ""; _aEx = a.Expiry ?? "";
+                break;
+            case AuthSecServersPayload sec:
+                _secDom = string.Join(",", sec.Domains);
+                break;
+            case AuthPeerPayload ap:
+                _peerIp = string.Join(",", ap.Ips);
+                break;
+            default:
+                ClearIfNew();
+                break;
+        }
+    }
+
+    private void ClearIfNew()
+    {
+        if (Existing != null) return;
+        _nName = _nOrder = _nPref = _nFlags = _nService = _nRegexp = _nRepl = "";
+        _cName = _cFlags = _cTag = _cValue = "";
+        _dName = _dNum = _dHex = "";
+        _yName = _yV4 = _yV6 = _yIface = "";
+        _iName = _iIface = "";
+        _sDomain = _sRange = _sPrefix = "";
+        _zDomain = _zRest = "";
+        _aSerial = _aHm = _aRef = _aRetry = _aEx = "";
+        _secDom = "";
+        _peerIp = "";
+    }
+
+    private DnsRecordFamily FamilyForOption() => OptionName switch
+    {
+        DnsmasqConfKeys.NaptrRecord => DnsRecordFamily.Naptr,
+        DnsmasqConfKeys.CaaRecord => DnsRecordFamily.Caa,
+        DnsmasqConfKeys.DnsRr => DnsRecordFamily.DnsRr,
+        DnsmasqConfKeys.DynamicHost => DnsRecordFamily.DynamicHost,
+        DnsmasqConfKeys.InterfaceName => DnsRecordFamily.InterfaceName,
+        DnsmasqConfKeys.SynthDomain => DnsRecordFamily.SynthDomain,
+        DnsmasqConfKeys.AuthZone => DnsRecordFamily.AuthZone,
+        DnsmasqConfKeys.AuthSoa => DnsRecordFamily.AuthSoa,
+        DnsmasqConfKeys.AuthSecServers => DnsRecordFamily.AuthSecServers,
+        DnsmasqConfKeys.AuthPeer => DnsRecordFamily.AuthPeer,
+        _ => DnsRecordFamily.Cname
+    };
+
+    private async Task SaveAsync()
+    {
+        _error = null;
+        DnsRecordPayload payload;
+        try
+        {
+            payload = OptionName switch
+            {
+                DnsmasqConfKeys.NaptrRecord => new NaptrPayload(_nName.Trim(), _nOrder.Trim(), _nPref.Trim(), _nFlags.Trim(), _nService.Trim(), _nRegexp.Trim(), string.IsNullOrWhiteSpace(_nRepl) ? null : _nRepl.Trim()),
+                DnsmasqConfKeys.CaaRecord => new CaaPayload(_cName.Trim(), _cFlags.Trim(), _cTag.Trim(), _cValue.Trim()),
+                DnsmasqConfKeys.DnsRr => new DnsRrPayload(_dName.Trim(), _dNum.Trim(), string.IsNullOrWhiteSpace(_dHex) ? null : _dHex.Trim()),
+                DnsmasqConfKeys.DynamicHost => new DynamicHostPayload(_yName.Trim(), string.IsNullOrWhiteSpace(_yV4) ? null : _yV4.Trim(), string.IsNullOrWhiteSpace(_yV6) ? null : _yV6.Trim(), _yIface.Trim()),
+                DnsmasqConfKeys.InterfaceName => new InterfaceNamePayload(_iName.Trim(), _iIface.Trim()),
+                DnsmasqConfKeys.SynthDomain => new SynthDomainPayload(_sDomain.Trim(), _sRange.Trim(), string.IsNullOrWhiteSpace(_sPrefix) ? null : _sPrefix.Trim()),
+                DnsmasqConfKeys.AuthZone => new AuthZonePayload(_zDomain.Trim(), string.IsNullOrWhiteSpace(_zRest) ? [] : _zRest.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToArray()),
+                DnsmasqConfKeys.AuthSoa => new AuthSoaPayload(_aSerial.Trim(), string.IsNullOrWhiteSpace(_aHm) ? null : _aHm.Trim(), string.IsNullOrWhiteSpace(_aRef) ? null : _aRef.Trim(), string.IsNullOrWhiteSpace(_aRetry) ? null : _aRetry.Trim(), string.IsNullOrWhiteSpace(_aEx) ? null : _aEx.Trim()),
+                DnsmasqConfKeys.AuthSecServers => new AuthSecServersPayload(string.IsNullOrWhiteSpace(_secDom) ? [] : _secDom.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToArray()),
+                DnsmasqConfKeys.AuthPeer => new AuthPeerPayload(string.IsNullOrWhiteSpace(_peerIp) ? [] : _peerIp.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToArray()),
+                _ => throw new InvalidOperationException($"Unsupported option {OptionName}")
+            };
+        }
+        catch
+        {
+            _error = "Invalid input.";
+            return;
+        }
+
+        var fam = FamilyForOption();
+        var isNew = Existing == null;
+        var row = isNew
+            ? new DnsRecordRow(
+                Id: $"{OptionName}:new",
+                OccurrenceId: $"{OptionName}:new",
+                OptionName: OptionName,
+                Family: fam,
+                IndexInOption: -1,
+                RawValue: "",
+                Source: null,
+                SourcePath: null,
+                SourceLabel: null,
+                IsDraftOnly: false,
+                IsEditable: true,
+                Payload: payload,
+                Issues: [],
+                Summary: "")
+            : Existing! with { Payload = payload };
+
+        await OnSave.InvokeAsync(new DnsRecordEditorResult(row, isNew));
+    }
+}
@@ -0,0 +1,102 @@
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+<h4 class="h6 mb-2">CNAME</h4>
+<div class="row g-2 align-items-end">
+    <div class="col-md-4">
+        <label class="form-label small mb-0">Aliases (comma-separated)</label>
+        <input class="form-control form-control-sm" @bind="_aliases" @bind:event="oninput" />
+    </div>
+    <div class="col-md-4">
+        <label class="form-label small mb-0">Target</label>
+        <input class="form-control form-control-sm" @bind="_target" @bind:event="oninput" />
+    </div>
+    <div class="col-md-2">
+        <label class="form-label small mb-0">TTL (optional)</label>
+        <input class="form-control form-control-sm" type="number" min="1" @bind="_ttl" @bind:event="oninput" />
+    </div>
+    <div class="col-md-2 d-flex gap-1">
+        <button type="button" class="btn btn-sm btn-primary" @onclick="SaveAsync">Save</button>
+        <button type="button" class="btn btn-sm btn-outline-secondary" @onclick="OnCancel">Cancel</button>
+    </div>
+</div>
+@if (_error != null)
+{
+    <p class="text-danger small mt-2 mb-0">@_error</p>
+}
+
+@code {
+    [Parameter] public DnsRecordRow? Existing { get; set; }
+    [Parameter] public EventCallback<DnsRecordEditorResult> OnSave { get; set; }
+    [Parameter] public EventCallback OnCancel { get; set; }
+
+    private string _aliases = "";
+    private string _target = "";
+    private string _ttl = "";
+    private string? _error;
+    private string? _boundRowKey;
+
+    protected override void OnParametersSet()
+    {
+        if (!DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref _boundRowKey, Existing))
+            return;
+
+        if (Existing?.Payload is CnamePayload p)
+        {
+            _aliases = string.Join(", ", p.Aliases);
+            _target = p.Target;
+            _ttl = p.Ttl?.ToString() ?? "";
+        }
+        else
+        {
+            _aliases = "";
+            _target = "";
+            _ttl = "";
+        }
+
+        _error = null;
+    }
+
+    private async Task SaveAsync()
+    {
+        _error = null;
+        var parts = _aliases.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToList();
+        if (parts.Count == 0 || string.IsNullOrWhiteSpace(_target))
+        {
+            _error = "At least one alias and a target are required.";
+            return;
+        }
+
+        int? ttl = null;
+        if (!string.IsNullOrWhiteSpace(_ttl))
+        {
+            if (!int.TryParse(_ttl, out var t) || t <= 0)
+            {
+                _error = "TTL must be a positive integer.";
+                return;
+            }
+
+            ttl = t;
+        }
+
+        var payload = new CnamePayload(parts, _target.Trim(), ttl);
+        var isNew = Existing == null;
+        var row = isNew
+            ? new DnsRecordRow(
+                Id: $"{DnsmasqConfKeys.Cname}:new",
+                OccurrenceId: $"{DnsmasqConfKeys.Cname}:new",
+                OptionName: DnsmasqConfKeys.Cname,
+                Family: DnsRecordFamily.Cname,
+                IndexInOption: -1,
+                RawValue: "",
+                Source: null,
+                SourcePath: null,
+                SourceLabel: null,
+                IsDraftOnly: false,
+                IsEditable: true,
+                Payload: payload,
+                Issues: [],
+                Summary: "")
+            : Existing! with { Payload = payload };
+
+        await OnSave.InvokeAsync(new DnsRecordEditorResult(row, isNew));
+    }
+}
@@ -0,0 +1,26 @@
+using DnsmasqWebUI.Models.DnsRecords;
+
+namespace DnsmasqWebUI.Components.DnsRecords.Editors;
+
+/// <summary>
+/// Blazor calls <see cref="Microsoft.AspNetCore.Components.ComponentBase.OnParametersSet"/> on every parent render,
+/// not only when parameters change. Editors must not overwrite bound fields unless the edited row (or add-new session)
+/// actually changed.
+/// </summary>
+internal static class DnsRecordEditorSyncGuard
+{
+    /// <param name="lastBoundKey">Previous session key; updated when reseed runs.</param>
+    /// <param name="existing">Row being edited, or null for add-new.</param>
+    /// <param name="addModeKeyWhenNew">
+    /// When <paramref name="existing"/> is null, distinguishes add sessions (e.g. <c>add:naptr-record</c> vs <c>add:caa-record</c>).
+    /// Omit for editors that only ever add one directive type per component instance.
+    /// </param>
+    public static bool ShouldReseedFromExisting(ref string? lastBoundKey, DnsRecordRow? existing, string? addModeKeyWhenNew = null)
+    {
+        var key = existing?.Id ?? addModeKeyWhenNew ?? "";
+        if (string.Equals(lastBoundKey, key, StringComparison.Ordinal))
+            return false;
+        lastBoundKey = key;
+        return true;
+    }
+}
@@ -0,0 +1,111 @@
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+<h4 class="h6 mb-2">host-record (A / AAAA)</h4>
+<div class="row g-2 align-items-end">
+    <div class="col-md-3">
+        <label class="form-label small mb-0">Owner names (comma-separated)</label>
+        <input class="form-control form-control-sm" @bind="_owners" @bind:event="oninput" />
+    </div>
+    <div class="col-md-2">
+        <label class="form-label small mb-0">IPv4</label>
+        <input class="form-control form-control-sm" @bind="_v4" @bind:event="oninput" placeholder="optional" />
+    </div>
+    <div class="col-md-2">
+        <label class="form-label small mb-0">IPv6</label>
+        <input class="form-control form-control-sm" @bind="_v6" @bind:event="oninput" placeholder="optional" />
+    </div>
+    <div class="col-md-2">
+        <label class="form-label small mb-0">TTL</label>
+        <input class="form-control form-control-sm" type="number" min="1" @bind="_ttl" @bind:event="oninput" placeholder="optional" />
+    </div>
+    <div class="col-md-3 d-flex gap-1">
+        <button type="button" class="btn btn-sm btn-primary" @onclick="SaveAsync">Save</button>
+        <button type="button" class="btn btn-sm btn-outline-secondary" @onclick="OnCancel">Cancel</button>
+    </div>
+</div>
+@if (_error != null)
+{
+    <p class="text-danger small mt-2 mb-0">@_error</p>
+}
+
+@code {
+    [Parameter] public DnsRecordRow? Existing { get; set; }
+    [Parameter] public EventCallback<DnsRecordEditorResult> OnSave { get; set; }
+    [Parameter] public EventCallback OnCancel { get; set; }
+
+    private string _owners = "";
+    private string _v4 = "";
+    private string _v6 = "";
+    private string _ttl = "";
+    private string? _error;
+    private string? _boundRowKey;
+
+    protected override void OnParametersSet()
+    {
+        if (!DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref _boundRowKey, Existing))
+            return;
+
+        if (Existing?.Payload is HostRecordPayload p)
+        {
+            _owners = string.Join(", ", p.Owners);
+            _v4 = p.IPv4 ?? "";
+            _v6 = p.IPv6 ?? "";
+            _ttl = p.Ttl?.ToString() ?? "";
+        }
+        else
+        {
+            _owners = "";
+            _v4 = "";
+            _v6 = "";
+            _ttl = "";
+        }
+
+        _error = null;
+    }
+
+    private async Task SaveAsync()
+    {
+        _error = null;
+        var owners = _owners.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToList();
+        if (owners.Count == 0)
+        {
+            _error = "At least one owner name is required.";
+            return;
+        }
+
+        int? ttl = null;
+        if (!string.IsNullOrWhiteSpace(_ttl))
+        {
+            if (!int.TryParse(_ttl, out var t) || t <= 0)
+            {
+                _error = "TTL must be a positive integer.";
+                return;
+            }
+
+            ttl = t;
+        }
+
+        var v4 = string.IsNullOrWhiteSpace(_v4) ? null : _v4.Trim();
+        var v6 = string.IsNullOrWhiteSpace(_v6) ? null : _v6.Trim();
+        var payload = new HostRecordPayload(owners, v4, v6, ttl);
+        var isNew = Existing == null;
+        var row = isNew
+            ? new DnsRecordRow(
+                Id: $"{DnsmasqConfKeys.HostRecord}:new",
+                OccurrenceId: $"{DnsmasqConfKeys.HostRecord}:new",
+                OptionName: DnsmasqConfKeys.HostRecord,
+                Family: DnsRecordFamily.HostRecord,
+                IndexInOption: -1,
+                RawValue: "",
+                Source: null,
+                SourcePath: null,
+                SourceLabel: null,
+                IsDraftOnly: false,
+                IsEditable: true,
+                Payload: payload,
+                Issues: [],
+                Summary: "")
+            : Existing! with { Payload = payload };
+
+        await OnSave.InvokeAsync(new DnsRecordEditorResult(row, isNew));
+    }
+}
@@ -0,0 +1,102 @@
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+<h4 class="h6 mb-2">MX</h4>
+<div class="row g-2 align-items-end">
+    <div class="col-md-3">
+        <label class="form-label small mb-0">Domain</label>
+        <input class="form-control form-control-sm" @bind="_domain" @bind:event="oninput" />
+    </div>
+    <div class="col-md-3">
+        <label class="form-label small mb-0">Mail host</label>
+        <input class="form-control form-control-sm" @bind="_host" @bind:event="oninput" placeholder="optional" />
+    </div>
+    <div class="col-md-2">
+        <label class="form-label small mb-0">Preference</label>
+        <input class="form-control form-control-sm" type="number" min="0" max="65535" @bind="_pref" @bind:event="oninput" placeholder="optional" />
+    </div>
+    <div class="col-md-4 d-flex gap-1">
+        <button type="button" class="btn btn-sm btn-primary" @onclick="SaveAsync">Save</button>
+        <button type="button" class="btn btn-sm btn-outline-secondary" @onclick="OnCancel">Cancel</button>
+    </div>
+</div>
+@if (_error != null)
+{
+    <p class="text-danger small mt-2 mb-0">@_error</p>
+}
+
+@code {
+    [Parameter] public DnsRecordRow? Existing { get; set; }
+    [Parameter] public EventCallback<DnsRecordEditorResult> OnSave { get; set; }
+    [Parameter] public EventCallback OnCancel { get; set; }
+
+    private string _domain = "";
+    private string _host = "";
+    private string _pref = "";
+    private string? _error;
+    private string? _boundRowKey;
+
+    protected override void OnParametersSet()
+    {
+        if (!DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref _boundRowKey, Existing))
+            return;
+
+        if (Existing?.Payload is MxPayload p)
+        {
+            _domain = p.Domain;
+            _host = p.Hostname ?? "";
+            _pref = p.Preference?.ToString() ?? "";
+        }
+        else
+        {
+            _domain = "";
+            _host = "";
+            _pref = "";
+        }
+
+        _error = null;
+    }
+
+    private async Task SaveAsync()
+    {
+        _error = null;
+        if (string.IsNullOrWhiteSpace(_domain))
+        {
+            _error = "Domain is required.";
+            return;
+        }
+
+        int? pref = null;
+        if (!string.IsNullOrWhiteSpace(_pref))
+        {
+            if (!int.TryParse(_pref, out var p) || p is < 0 or > 65535)
+            {
+                _error = "Preference must be 0–65535.";
+                return;
+            }
+
+            pref = p;
+        }
+
+        var host = string.IsNullOrWhiteSpace(_host) ? null : _host.Trim();
+        var payload = new MxPayload(_domain.Trim(), host, pref);
+        var isNew = Existing == null;
+        var row = isNew
+            ? new DnsRecordRow(
+                Id: $"{DnsmasqConfKeys.MxHost}:new",
+                OccurrenceId: $"{DnsmasqConfKeys.MxHost}:new",
+                OptionName: DnsmasqConfKeys.MxHost,
+                Family: DnsRecordFamily.Mx,
+                IndexInOption: -1,
+                RawValue: "",
+                Source: null,
+                SourcePath: null,
+                SourceLabel: null,
+                IsDraftOnly: false,
+                IsEditable: true,
+                Payload: payload,
+                Issues: [],
+                Summary: "")
+            : Existing! with { Payload = payload };
+
+        await OnSave.InvokeAsync(new DnsRecordEditorResult(row, isNew));
+    }
+}
@@ -0,0 +1,82 @@
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+<h4 class="h6 mb-2">PTR</h4>
+<div class="row g-2 align-items-end">
+    <div class="col-md-4">
+        <label class="form-label small mb-0">Reverse name</label>
+        <input class="form-control form-control-sm" @bind="_name" @bind:event="oninput" />
+    </div>
+    <div class="col-md-4">
+        <label class="form-label small mb-0">Target</label>
+        <input class="form-control form-control-sm" @bind="_target" @bind:event="oninput" placeholder="optional" />
+    </div>
+    <div class="col-md-4 d-flex gap-1">
+        <button type="button" class="btn btn-sm btn-primary" @onclick="SaveAsync">Save</button>
+        <button type="button" class="btn btn-sm btn-outline-secondary" @onclick="OnCancel">Cancel</button>
+    </div>
+</div>
+@if (_error != null)
+{
+    <p class="text-danger small mt-2 mb-0">@_error</p>
+}
+
+@code {
+    [Parameter] public DnsRecordRow? Existing { get; set; }
+    [Parameter] public EventCallback<DnsRecordEditorResult> OnSave { get; set; }
+    [Parameter] public EventCallback OnCancel { get; set; }
+
+    private string _name = "";
+    private string _target = "";
+    private string? _error;
+    private string? _boundRowKey;
+
+    protected override void OnParametersSet()
+    {
+        if (!DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref _boundRowKey, Existing))
+            return;
+
+        if (Existing?.Payload is PtrPayload p)
+        {
+            _name = p.Name;
+            _target = p.Target ?? "";
+        }
+        else
+        {
+            _name = "";
+            _target = "";
+        }
+
+        _error = null;
+    }
+
+    private async Task SaveAsync()
+    {
+        _error = null;
+        if (string.IsNullOrWhiteSpace(_name))
+        {
+            _error = "Reverse name is required.";
+            return;
+        }
+
+        var payload = new PtrPayload(_name.Trim(), string.IsNullOrWhiteSpace(_target) ? null : _target.Trim());
+        var isNew = Existing == null;
+        var row = isNew
+            ? new DnsRecordRow(
+                Id: $"{DnsmasqConfKeys.PtrRecord}:new",
+                OccurrenceId: $"{DnsmasqConfKeys.PtrRecord}:new",
+                OptionName: DnsmasqConfKeys.PtrRecord,
+                Family: DnsRecordFamily.Ptr,
+                IndexInOption: -1,
+                RawValue: "",
+                Source: null,
+                SourcePath: null,
+                SourceLabel: null,
+                IsDraftOnly: false,
+                IsEditable: true,
+                Payload: payload,
+                Issues: [],
+                Summary: "")
+            : Existing! with { Payload = payload };
+
+        await OnSave.InvokeAsync(new DnsRecordEditorResult(row, isNew));
+    }
+}
@@ -0,0 +1,132 @@
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+<h4 class="h6 mb-2">SRV (srv-host)</h4>
+<div class="row g-2 align-items-end">
+    <div class="col-md-3">
+        <label class="form-label small mb-0">Service (_service._proto[.name])</label>
+        <input class="form-control form-control-sm" @bind="_svc" @bind:event="oninput" />
+    </div>
+    <div class="col-md-2">
+        <label class="form-label small mb-0">Target</label>
+        <input class="form-control form-control-sm" @bind="_target" @bind:event="oninput" placeholder="optional" />
+    </div>
+    <div class="col-md-1">
+        <label class="form-label small mb-0">Port</label>
+        <input class="form-control form-control-sm" type="number" min="0" max="65535" @bind="_port" @bind:event="oninput" />
+    </div>
+    <div class="col-md-1">
+        <label class="form-label small mb-0">Pri</label>
+        <input class="form-control form-control-sm" type="number" min="0" max="65535" @bind="_pri" @bind:event="oninput" />
+    </div>
+    <div class="col-md-1">
+        <label class="form-label small mb-0">Wt</label>
+        <input class="form-control form-control-sm" type="number" min="0" max="65535" @bind="_wt" @bind:event="oninput" />
+    </div>
+    <div class="col-md-4 d-flex gap-1">
+        <button type="button" class="btn btn-sm btn-primary" @onclick="SaveAsync">Save</button>
+        <button type="button" class="btn btn-sm btn-outline-secondary" @onclick="OnCancel">Cancel</button>
+    </div>
+</div>
+@if (_error != null)
+{
+    <p class="text-danger small mt-2 mb-0">@_error</p>
+}
+
+@code {
+    [Parameter] public DnsRecordRow? Existing { get; set; }
+    [Parameter] public EventCallback<DnsRecordEditorResult> OnSave { get; set; }
+    [Parameter] public EventCallback OnCancel { get; set; }
+
+    private string _svc = "";
+    private string _target = "";
+    private string _port = "";
+    private string _pri = "";
+    private string _wt = "";
+    private string? _error;
+    private string? _boundRowKey;
+
+    protected override void OnParametersSet()
+    {
+        if (!DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref _boundRowKey, Existing))
+            return;
+
+        if (Existing?.Payload is SrvPayload p)
+        {
+            _svc = p.ServiceName;
+            _target = p.Target ?? "";
+            _port = p.Port?.ToString() ?? "";
+            _pri = p.Priority?.ToString() ?? "";
+            _wt = p.Weight?.ToString() ?? "";
+        }
+        else
+        {
+            _svc = "";
+            _target = "";
+            _port = "";
+            _pri = "";
+            _wt = "";
+        }
+
+        _error = null;
+    }
+
+    private async Task SaveAsync()
+    {
+        _error = null;
+        if (string.IsNullOrWhiteSpace(_svc))
+        {
+            _error = "Service name is required.";
+            return;
+        }
+
+        int? port = null;
+        int? pri = null;
+        int? wt = null;
+        if (!string.IsNullOrWhiteSpace(_port) || !string.IsNullOrWhiteSpace(_pri) || !string.IsNullOrWhiteSpace(_wt))
+        {
+            if (!int.TryParse(string.IsNullOrWhiteSpace(_port) ? "0" : _port, out var po) || po is < 0 or > 65535)
+            {
+                _error = "Port must be 0–65535.";
+                return;
+            }
+
+            if (!int.TryParse(string.IsNullOrWhiteSpace(_pri) ? "0" : _pri, out var pr) || pr is < 0 or > 65535)
+            {
+                _error = "Priority must be 0–65535.";
+                return;
+            }
+
+            if (!int.TryParse(string.IsNullOrWhiteSpace(_wt) ? "0" : _wt, out var w) || w is < 0 or > 65535)
+            {
+                _error = "Weight must be 0–65535.";
+                return;
+            }
+
+            port = po;
+            pri = pr;
+            wt = w;
+        }
+
+        var tgt = string.IsNullOrWhiteSpace(_target) ? null : _target.Trim();
+        var payload = new SrvPayload(_svc.Trim(), tgt, port, pri, wt);
+        var isNew = Existing == null;
+        var row = isNew
+            ? new DnsRecordRow(
+                Id: $"{DnsmasqConfKeys.Srv}:new",
+                OccurrenceId: $"{DnsmasqConfKeys.Srv}:new",
+                OptionName: DnsmasqConfKeys.Srv,
+                Family: DnsRecordFamily.Srv,
+                IndexInOption: -1,
+                RawValue: "",
+                Source: null,
+                SourcePath: null,
+                SourceLabel: null,
+                IsDraftOnly: false,
+                IsEditable: true,
+                Payload: payload,
+                Issues: [],
+                Summary: "")
+            : Existing! with { Payload = payload };
+
+        await OnSave.InvokeAsync(new DnsRecordEditorResult(row, isNew));
+    }
+}
@@ -0,0 +1,82 @@
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+<h4 class="h6 mb-2">TXT</h4>
+<div class="row g-2 align-items-end">
+    <div class="col-md-3">
+        <label class="form-label small mb-0">Name</label>
+        <input class="form-control form-control-sm" @bind="_name" @bind:event="oninput" />
+    </div>
+    <div class="col-md-5">
+        <label class="form-label small mb-0">Text (optional; use quotes in raw config for commas)</label>
+        <input class="form-control form-control-sm" @bind="_text" @bind:event="oninput" />
+    </div>
+    <div class="col-md-4 d-flex gap-1">
+        <button type="button" class="btn btn-sm btn-primary" @onclick="SaveAsync">Save</button>
+        <button type="button" class="btn btn-sm btn-outline-secondary" @onclick="OnCancel">Cancel</button>
+    </div>
+</div>
+@if (_error != null)
+{
+    <p class="text-danger small mt-2 mb-0">@_error</p>
+}
+
+@code {
+    [Parameter] public DnsRecordRow? Existing { get; set; }
+    [Parameter] public EventCallback<DnsRecordEditorResult> OnSave { get; set; }
+    [Parameter] public EventCallback OnCancel { get; set; }
+
+    private string _name = "";
+    private string _text = "";
+    private string? _error;
+    private string? _boundRowKey;
+
+    protected override void OnParametersSet()
+    {
+        if (!DnsRecordEditorSyncGuard.ShouldReseedFromExisting(ref _boundRowKey, Existing))
+            return;
+
+        if (Existing?.Payload is TxtPayload p)
+        {
+            _name = p.Name;
+            _text = p.Text ?? "";
+        }
+        else
+        {
+            _name = "";
+            _text = "";
+        }
+
+        _error = null;
+    }
+
+    private async Task SaveAsync()
+    {
+        _error = null;
+        if (string.IsNullOrWhiteSpace(_name))
+        {
+            _error = "Name is required.";
+            return;
+        }
+
+        var payload = new TxtPayload(_name.Trim(), string.IsNullOrWhiteSpace(_text) ? null : _text.Trim());
+        var isNew = Existing == null;
+        var row = isNew
+            ? new DnsRecordRow(
+                Id: $"{DnsmasqConfKeys.TxtRecord}:new",
+                OccurrenceId: $"{DnsmasqConfKeys.TxtRecord}:new",
+                OptionName: DnsmasqConfKeys.TxtRecord,
+                Family: DnsRecordFamily.Txt,
+                IndexInOption: -1,
+                RawValue: "",
+                Source: null,
+                SourcePath: null,
+                SourceLabel: null,
+                IsDraftOnly: false,
+                IsEditable: true,
+                Payload: payload,
+                Issues: [],
+                Summary: "")
+            : Existing! with { Payload = payload };
+
+        await OnSave.InvokeAsync(new DnsRecordEditorResult(row, isNew));
+    }
+}
@@ -52,15 +52,12 @@ public partial class AppLogsFiltersModal : IAsyncDisposable
    {
        if (firstRender)
        {
-            try
+            _jsModule = await JSRuntime.InvokeAsyncSafe<IJSObjectReference>("import", default, "./js/dialog.js");
+            if (_jsModule != null)
            {
-                _jsModule = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/dialog.js");
                _dotNetRef = DotNetObjectReference.Create(this);
                _moduleLoaded = true;
            }
-            catch (InvalidOperationException) { }
-            catch (JSDisconnectedException) { }
-            catch (JSException) { }
        }

        if (IsVisible && _moduleLoaded && _jsModule != null)
@@ -146,6 +143,8 @@ public partial class AppLogsFiltersModal : IAsyncDisposable
        _cts.Cancel();
        _cts.Dispose();
        _dotNetRef?.Dispose();
+        _dotNetRef = null;
        await _jsModule.DisposeAsyncSafe();
+        _jsModule = null;
    }
 }
@@ -31,3 +31,7 @@
 </p>
 <AppLogsFiltersModal IsVisible="_filtersModalVisible" OnClose="CloseFiltersModal" />
 <LogsPreView Id="app-logs-pre" Placeholder="@_initialPlaceholder" Freeze="_logsContentReceived" />
+<div class="mt-2 d-flex flex-wrap gap-2 align-items-center">
+    <button class="btn btn-primary btn-sm" @onclick="RequestRefreshAsync" disabled="@_refreshing"><i class="bi bi-arrow-repeat me-1" aria-hidden="true"></i>Refresh</button>
+    <a href="api/logging/logs/download" download="app.log" class="btn btn-primary btn-sm"><i class="bi bi-download me-1" aria-hidden="true"></i>Download logs</a>
+</div>
@@ -19,6 +19,7 @@ public partial class AppLogsSection : IAsyncDisposable

    private bool _justUpdated;
    private bool _logsContentReceived;
+    private bool _refreshing;
    private int _intervalSeconds;
    private string _logLevel = "Information";
    private bool _logLevelDisabled;
@@ -61,13 +62,12 @@ public partial class AppLogsSection : IAsyncDisposable

        _hubConnection.On<LogsUpdatePayload>("AppLogsUpdate", OnAppLogsUpdate);

-        try
+        _logsJs = await JSRuntime.InvokeAsyncSafe<IJSObjectReference>("import", default, "./js/logs.js");
+        if (_logsJs == null)
        {
-            _logsJs = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/logs.js");
+            Logger.LogDebug("AppLogsSection: logs JS module unavailable (prerender, disconnect, or import failure)");
+            return;
        }
-        catch (InvalidOperationException ex) { Logger.LogDebug(ex, "AppLogsSection: JS import skipped (prerender)"); return; }
-        catch (JSDisconnectedException ex) { Logger.LogDebug(ex, "AppLogsSection: JS import skipped (circuit disconnected)"); return; }
-        catch (JSException ex) { Logger.LogDebug(ex, "AppLogsSection: JS import failed"); return; }

        await _hubConnection.StartAsync(_cts.Token);
        RestartPollTimer();
@@ -91,6 +91,25 @@ public partial class AppLogsSection : IAsyncDisposable
    private void OpenFiltersModal() => _filtersModalVisible = true;
    private void CloseFiltersModal() => _filtersModalVisible = false;

+    private async Task RequestRefreshAsync()
+    {
+        if (_hubConnection?.State != HubConnectionState.Connected)
+            return;
+        _refreshing = true;
+        StateHasChanged();
+        try
+        {
+            await _hubConnection.InvokeAsync("RequestAppLogsSnapshot", _cts.Token);
+        }
+        catch (OperationCanceledException) { }
+        catch (Exception) { /* ignore */ }
+        finally
+        {
+            _refreshing = false;
+            StateHasChanged();
+        }
+    }
+
    private async Task OnLogLevelChanged()
    {
        if (string.IsNullOrEmpty(_logLevel)) return;
@@ -149,6 +168,7 @@ public partial class AppLogsSection : IAsyncDisposable
        }
        catch (ObjectDisposedException) { /* Component disposed; ignore */ }
        catch (InvalidOperationException) { /* Circuit disconnected; ignore */ }
+        catch (JSDisconnectedException) { /* Circuit gone before InvokeAsync completed */ }
    }

    private void SetJustUpdated()
@@ -0,0 +1,74 @@
+@namespace DnsmasqWebUI.Components.Dnsmasq
+@using DnsmasqWebUI.Models.Dnsmasq
+@using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
+
+<div class="config-file-list">
+    @{
+        var configFileList = Status.ConfigFiles?.Count > 0 ? Status.ConfigFiles : ConfigSet?.Files;
+        var hasList = configFileList != null && configFileList.Count > 0;
+        var mainEntry = hasList ? configFileList![0] : null;
+        var hasMoreThanOne = hasList && configFileList!.Count > 1;
+        var fileCount = hasList ? configFileList!.Count : 2;
+        var showToggle = hasMoreThanOne || (!hasList && Status.ManagedFilePath != null);
+    }
+    <div class="config-file-list-header">
+        <p class="config-file-list-title mb-0">Config files (load order)</p>
+        @if (showToggle)
+        {
+            <button type="button"
+                    class="config-file-list-toggle"
+                    @onclick="ToggleExpanded"
+                    aria-expanded="@_expanded"
+                    aria-label="@(_expanded ? "Show only main config" : "Show all config files")">
+                <i class="bi @(_expanded ? "bi-chevron-up" : "bi-chevron-down")" aria-hidden="true"></i>
+                <span>@(_expanded ? "Show less" : $"Show all ({fileCount} files)")</span>
+            </button>
+        }
+    </div>
+    <div class="config-file-list-content-row">
+        <div class="config-file-list-list">
+            <ul class="list-unstyled config-file-list-main">
+                @if (hasList)
+                {
+                    <ConfigFileListItem Entry="@mainEntry" Status="Status" />
+                }
+                else
+                {
+                    <li><strong>Main config:</strong> @(Status.MainConfigPath ?? "—") @(Status.MainConfigPathExists ? "✓" : "(missing)")</li>
+                }
+            </ul>
+            @if (showToggle)
+            {
+                <div class="config-file-list-expandable @(_expanded ? "expanded" : null)">
+                    <div class="config-file-list-expandable-inner">
+                        <ul class="list-unstyled">
+                            @if (hasList)
+                            {
+                                @foreach (var f in configFileList!.Skip(1))
+                                {
+                                    <ConfigFileListItem Entry="f" Status="Status" />
+                                }
+                            }
+                            else
+                            {
+                                <li><strong>Managed file:</strong> @(Status.ManagedFilePath ?? "—") @(Status.ManagedFilePathExists ? "✓" : "(not created yet)")</li>
+                            }
+                        </ul>
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter, EditorRequired]
+    public DnsmasqServiceStatus Status { get; set; } = null!;
+
+    [Parameter]
+    public DnsmasqConfigSet? ConfigSet { get; set; }
+
+    private bool _expanded;
+
+    private void ToggleExpanded() => _expanded = !_expanded;
+}
@@ -0,0 +1,106 @@
+/* Config file list: card-style block with expandable list */
+.config-file-list {
+    --cfl-radius: var(--app-radius, 0.375rem);
+    --cfl-spacing: var(--app-spacing-md, 1rem);
+    --cfl-border: 1px solid #e9ecef;
+    --cfl-bg: #f8f9fa;
+    --cfl-bg-hover: #e9ecef;
+}
+
+.config-file-list {
+    border-radius: var(--cfl-radius);
+    border: var(--cfl-border);
+    background: var(--cfl-bg);
+    padding: var(--cfl-spacing);
+    margin-top: 0.5rem;
+}
+
+.config-file-list-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.75rem;
+    margin-bottom: 0.5rem;
+}
+
+.config-file-list .config-file-list-title {
+    font-size: 0.9375rem;
+    font-weight: 600;
+    color: #212529;
+    margin-bottom: 0;
+}
+
+.config-file-list ul {
+    margin: 0;
+    padding-left: 1.25rem;
+    font-size: 0.875rem;
+    line-height: 1.6;
+    color: #495057;
+}
+
+.config-file-list ul li {
+    padding: 0.2rem 0;
+}
+
+/* List content row (toggle is in header now) */
+.config-file-list-content-row {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.75rem;
+}
+
+.config-file-list-list {
+    flex: 1;
+    min-width: 0;
+}
+
+.config-file-list .config-file-list-toggle {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.35rem;
+    flex-shrink: 0;
+    padding: 0.35rem 0.5rem;
+    font-size: 0.8125rem;
+    font-weight: 500;
+    color: #0d6efd;
+    background: transparent;
+    border: none;
+    border-radius: var(--cfl-radius);
+    cursor: pointer;
+    transition: background-color 0.15s ease, color 0.15s ease;
+}
+
+.config-file-list .config-file-list-toggle:hover {
+    background: var(--cfl-bg-hover);
+    color: #0a58ca;
+}
+
+.config-file-list .config-file-list-toggle:focus-visible {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem rgba(13, 110, 253, 0.25);
+}
+
+.config-file-list .config-file-list-toggle .bi {
+    font-size: 0.875rem;
+    transition: transform 0.2s ease;
+}
+
+/* Expandable section: animate height with grid 0fr → 1fr */
+.config-file-list-expandable {
+    display: grid;
+    grid-template-rows: 0fr;
+    transition: grid-template-rows 0.25s ease-out;
+}
+
+.config-file-list-expandable.expanded {
+    grid-template-rows: 1fr;
+}
+
+.config-file-list-expandable-inner {
+    min-height: 0;
+    overflow: hidden;
+}
+
+.config-file-list-expandable-inner ul {
+    padding-top: 0.15rem;
+}
@@ -0,0 +1,30 @@
+@namespace DnsmasqWebUI.Components.Dnsmasq
+@using DnsmasqWebUI.Models.Dnsmasq
+@using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
+
+<li>
+    @if (Entry.IsManaged)
+    {
+        <StatusBadge Kind="StatusBadgeKind.Managed" Text="managed" Class="me-1" />
+    }
+    else
+    {
+        <StatusBadge Kind="StatusBadgeKind.SourceMain" Text="@(Entry.Source.ToString().ToLowerInvariant())" Class="me-1" />
+    }
+    @Entry.Path
+    @{
+        var isMain = string.Equals(Entry.Path, Status.MainConfigPath, StringComparison.Ordinal);
+        var isManaged = Entry.IsManaged;
+        var exists = isMain ? Status.MainConfigPathExists : (isManaged ? Status.ManagedFilePathExists : (bool?)null);
+    }
+    @if (exists == true) { <text> ✓</text> }
+    @if (exists == false) { <text> @(isManaged ? "(not created yet)" : "(missing)")</text> }
+</li>
+
+@code {
+    [Parameter, EditorRequired]
+    public DnsmasqConfigSetEntry Entry { get; set; } = null!;
+
+    [Parameter, EditorRequired]
+    public DnsmasqServiceStatus Status { get; set; } = null!;
+}
@@ -63,13 +63,12 @@ public partial class LogsSection : IAsyncDisposable

        _hubConnection.On<LogsUpdatePayload>("DnsmasqLogsUpdate", OnDnsmasqLogsUpdate);

-        try
+        _logsJs = await JSRuntime.InvokeAsyncSafe<IJSObjectReference>("import", default, "./js/logs.js");
+        if (_logsJs == null)
        {
-            _logsJs = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/logs.js");
+            Logger.LogDebug("LogsSection: logs JS module unavailable (prerender, disconnect, or import failure)");
+            return;
        }
-        catch (InvalidOperationException ex) { Logger.LogDebug(ex, "LogsSection: JS import skipped (prerender)"); return; }
-        catch (JSDisconnectedException ex) { Logger.LogDebug(ex, "LogsSection: JS import skipped (circuit disconnected)"); return; }
-        catch (JSException ex) { Logger.LogDebug(ex, "LogsSection: JS import failed"); return; }

        await _hubConnection.StartAsync(_cts.Token);
        RestartPollTimer();
@@ -135,6 +134,7 @@ public partial class LogsSection : IAsyncDisposable
        }
        catch (ObjectDisposedException) { /* Component disposed; ignore */ }
        catch (InvalidOperationException) { /* Circuit disconnected; ignore */ }
+        catch (JSDisconnectedException) { /* Circuit gone before InvokeAsync completed */ }
    }

    private void SetJustUpdated()
@@ -24,7 +24,21 @@
    {
        <pre class="pre-block mb-0" style="max-height: 22rem;">@_status.StatusShowOutput</pre>
    }
-    <div class="mt-2">
+    <div class="mt-2 d-flex align-items-center gap-2 flex-wrap">
        <button class="btn btn-primary btn-sm" @onclick="RefreshAsync" disabled="@_refreshing"><i class="bi bi-arrow-repeat me-1" aria-hidden="true"></i>Refresh</button>
+        @if (ReloadCommandConfigured && OnReloadRequested.HasDelegate)
+        {
+            <button class="btn btn-primary btn-sm" @onclick="InvokeReloadAsync" disabled="@IsReloading" title="Reload dnsmasq config (e.g. SIGHUP)">
+                @if (IsReloading)
+                {
+                    <span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>
+                }
+                else
+                {
+                    <i class="bi bi-arrow-repeat me-1" aria-hidden="true"></i>
+                }
+                Reload
+            </button>
+        }
    </div>
 }
@@ -19,6 +19,11 @@ public partial class StatusSection : IDisposable

    [Parameter] public bool IsReloading { get; set; }

+    /// <summary>When set and reload is configured, show a "Reload config" button next to Refresh.</summary>
+    [Parameter] public EventCallback OnReloadRequested { get; set; }
+
+    [Parameter] public bool ReloadCommandConfigured { get; set; }
+
    [Parameter] public EventCallback OnOpenSettings { get; set; }

    [Inject] private IStatusClient StatusClient { get; set; } = null!;
@@ -55,6 +60,8 @@ public partial class StatusSection : IDisposable

    private static readonly TimeSpan MinUpdatingDuration = TimeSpan.FromSeconds(1);

+    private Task InvokeReloadAsync() => OnReloadRequested.InvokeAsync();
+
    private async Task RefreshAsync()
    {
        var started = DateTime.UtcNow;
@@ -1,4 +1,5 @@
@namespace DnsmasqWebUI.Components.EffectiveConfig
+@using DnsmasqWebUI.Extensions.Interop
@inject IJSRuntime JSRuntime

 <div class="d-flex align-items-center gap-1 @CssClass">
@@ -15,13 +16,7 @@
    private async Task CopyAsync()
    {
        if (string.IsNullOrEmpty(Text)) return;
-        try
-        {
-            await JSRuntime.InvokeVoidAsync("copyToClipboard", Text);
-        }
-        catch
-        {
-            // Clipboard not available or failed
-        }
+        // window.copyToClipboard from wwwroot/js/copy-to-clipboard.js; swallow disconnect / clipboard failures.
+        await JSRuntime.InvokeVoidAsyncSafe("copyToClipboard", args: new object?[] { Text });
    }
 }
@@ -0,0 +1,22 @@
+using Microsoft.AspNetCore.Components;
+using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
+
+namespace DnsmasqWebUI.Components.EffectiveConfig;
+
+/// <summary>
+/// Base for custom effective-config multi-value displays; mirrors <see cref="EffectiveConfigValueDisplayBase"/> for singles.
+/// </summary>
+public abstract class EffectiveConfigMultiValueDisplayBase : ComponentBase
+{
+    [Parameter]
+    public EffectiveConfigMultiDisplayContext Context { get; set; } = null!;
+
+    [Parameter]
+    public EventCallback<IReadOnlyList<string>> OnValuesChanged { get; set; }
+
+    protected IReadOnlyList<ValueWithSource> EffectiveItems => Context.EffectiveItems;
+
+    protected IReadOnlyList<string> EffectiveValues => Context.EffectiveValues;
+
+    protected Task NotifyValuesChanged(IReadOnlyList<string> values) => OnValuesChanged.InvokeAsync(values);
+}
@@ -31,7 +31,7 @@ public abstract class EffectiveConfigValueDisplayBase : ComponentBase
    /// <summary>Returns the value to display: pending change NewValue if this field has one, else descriptor value (not yet written to disk).</summary>
    protected object? GetEffectiveDisplayValue()
    {
-        var pending = Session?.PendingChanges.FirstOrDefault(c =>
+        var pending = Session?.Draft.PendingChanges.OfType<PendingOptionChange>().FirstOrDefault(c =>
            string.Equals(c.SectionId, Descriptor.SectionId, StringComparison.OrdinalIgnoreCase) &&
            string.Equals(c.OptionName, Descriptor.OptionName, StringComparison.OrdinalIgnoreCase));
        return pending != null ? pending.NewValue : Descriptor.GetValue();
@@ -1,13 +1,13 @@
@namespace DnsmasqWebUI.Components.EffectiveConfig
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions
@using DnsmasqWebUI.Models.Dnsmasq
@using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
-@inject IEffectiveConfigRenderFragmentRegistry RenderFragmentRegistry
+@inject IEffectiveConfigDescriptorProvider DescriptorProvider

 <div class="ec-sections small">
    @{
        var views = EffectiveConfigViews.GetViewsForContext(Context);
-        var descriptorsBySection = EffectiveConfigViews.GetDescriptorsBySection(Status, views, RenderFragmentRegistry);
+        var descriptorsBySection = Status != null ? DescriptorProvider.GetBySection(Status, views) : new Dictionary<string, IReadOnlyList<EffectiveConfigFieldDescriptor>>();
        var hasSearch = !string.IsNullOrWhiteSpace(SearchTerm);
        var term = SearchTerm?.Trim() ?? "";
    }
@@ -1,10 +1,12 @@
@namespace DnsmasqWebUI.Components.EffectiveConfig
@using DnsmasqWebUI.Models.Dnsmasq
@using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions
@inject IEffectiveConfigEditSession Session
+@inject IEffectiveConfigCrossOptionValidationService CrossOptionValidation
@inject IJSRuntime JSRuntime
+@implements IDisposable

@if (Status != null)
 {
@@ -16,17 +18,18 @@
        var _allSectionsExpanded = _sectionViews.Count > 0 && _sectionViews.All(v => _openPanels.Contains(v.SectionId));
    }
    <EffectiveConfigToolbar ShowSearchBox="@ShowSearchBox" SearchTerm="@_searchTerm" SearchTermChanged="@OnSearchTermChanged"
-        IsEditMode="@Session.IsEditMode" PendingChangesCount="@Session.PendingChanges.Count"
+        IsEditMode="@Session.Ui.IsEditMode" PendingChangesCount="@Session.Draft.PendingChanges.Count"
+        ValidationSummary="@Session.Draft.GetValidationSummary()"
        AllSectionsExpanded="@_allSectionsExpanded"
        OnExpandAll="ExpandAll" OnCollapseAll="CollapseAll" OnEnterEditMode="EnterEditMode" OnExitEditModeWithConfirm="ExitEditModeWithConfirmAsync" OnOpenSaveModal="OpenSaveModal" />
    <CascadingValue Value="@Session">
    <CascadingValue Value="@_uiContext">
        <EffectiveConfigPanels Status="@Status" Context="@Context" SearchTerm="@_searchTerm" OpenSectionIds="@_openPanels"
-            OnSectionToggle="OnSectionToggle" IsEditMode="@Session.IsEditMode" ActiveFieldKey="@Session.ActiveFieldKey" />
+            OnSectionToggle="OnSectionToggle" IsEditMode="@Session.Ui.IsEditMode" ActiveFieldKey="@Session.Ui.ActiveFieldKey" />
    </CascadingValue>
    </CascadingValue>
-    <EffectiveConfigSaveFlow ShowModal="@_showSaveModal" PendingChanges="@Session.PendingChanges" Status="@Status" Session="@Session"
-        OnClose="CloseSaveModal" OnSaveCompleted="OnSaveCompleted" OnCloseAndEndEdit="CloseSaveModalAndEndEdit" />
+    <EffectiveConfigSaveFlow ShowModal="@_showSaveModal" PendingChanges="@Session.Draft.PendingChanges" Status="@Status" Session="@Session"
+        OnClose="CloseSaveModal" OnRevertedNotify="OnRevertedFromSaveModal" OnSaveCompleted="OnSaveCompleted" OnContinueEditingAfterSavedFailure="ContinueEditingAfterSavedFailureAsync" OnCloseAndEndEdit="CloseSaveModalAndEndEdit" />
 </div>
 }

@@ -57,6 +60,7 @@

    protected override void OnInitialized()
    {
+        Session.Changed += HandleSessionChanged;
        _uiContext = new EffectiveConfigUiContext
        {
            RequestOptionHelpAsync = HandleOptionHelpRequested,
@@ -67,11 +71,19 @@
                return Task.CompletedTask;
            },
            ActivateFieldAsync = fieldKey => { ActivateField(fieldKey); return Task.CompletedTask; },
-            DeactivateFieldAsync = () => { Session.DeactivateField(); return InvokeAsync(StateHasChanged); },
-            CommitFieldAsync = args => { HandleFieldEditCommitted(args); return Task.CompletedTask; }
+            DeactivateFieldAsync = () => { Session.Ui.DeactivateField(); return InvokeAsync(StateHasChanged); },
+            CommitFieldAsync = args => { HandleFieldEditCommitted(args); return Task.CompletedTask; },
+            RevertFieldAsync = (sectionId, optionName) => { Session.Draft.RevertChange(sectionId, optionName); RunCrossOptionEvaluator(); return InvokeAsync(StateHasChanged); }
        };
    }

+    private void HandleSessionChanged() => _ = InvokeAsync(StateHasChanged);
+
+    public void Dispose()
+    {
+        Session.Changed -= HandleSessionChanged;
+    }
+
    private async Task OnSearchTermChanged(string value)
    {
        _searchTerm = value ?? "";
@@ -142,53 +154,86 @@

    private void EnterEditMode()
    {
-        Session.EnterEditMode();
+        Session.Ui.EnterEditMode();
+        RefreshCrossOptionAfterEnteringEditMode();
        StateHasChanged();
    }

    private async Task ExitEditModeWithConfirmAsync()
    {
-        if (Session.PendingChanges.Count > 0)
+        if (Session.Draft.PendingChanges.Count > 0)
        {
-            var module = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/dialog.js");
+            var module = await JSRuntime.InvokeAsyncSafe<IJSObjectReference>("import", default, "./js/dialog.js");
+            if (module == null)
+                return;
+
            try
            {
-                var confirmed = await module.InvokeAsync<bool>("confirmMessage", "Discard unsaved changes and exit edit mode?");
-                if (!confirmed) return;
+                var confirmed = await module.InvokeAsyncSafe<bool>("confirmMessage", "Discard unsaved changes and exit edit mode?");
+                if (confirmed != true)
+                    return;
            }
            finally
            {
-                await module.DisposeAsync();
+                await module.DisposeAsyncSafe();
            }
        }
-        Session.ExitEditModeDiscard();
+        Session.Draft.DiscardAllDraft();
+        Session.Ui.ExitEditMode();
        StateHasChanged();
    }

    private void DeactivateActiveFieldIfClicked()
    {
-        if (Session.IsEditMode && Session.ActiveFieldKey != null)
+        if (Session.Ui.IsEditMode && Session.Ui.ActiveFieldKey != null)
        {
-            Session.DeactivateField();
+            Session.Ui.DeactivateField();
            StateHasChanged();
        }
    }

    private void ActivateField(string fieldKey)
    {
-        Session.ActivateField(fieldKey);
+        Session.Ui.ActivateField(fieldKey);
        StateHasChanged();
    }

    private void HandleFieldEditCommitted(EffectiveConfigEditCommittedArgs args)
    {
-        Session.TrackCommit(args);
+        Session.Draft.TrackCommit(args);
+        Session.Ui.DeactivateField();
+        RunCrossOptionEvaluator();
+        StateHasChanged();
+    }
+
+    private void RunCrossOptionEvaluator()
+    {
+        var optionChanges = Session.Draft.PendingChanges.OfType<PendingOptionChange>().ToList();
+        var issues = CrossOptionValidation.Validate(Status, optionChanges);
+        Session.Draft.SetCrossOptionIssues(issues);
+    }
+
+    /// <summary>
+    /// After entering edit mode, repopulate cross-option issues from disk + pending.
+    /// </summary>
+    private void RefreshCrossOptionAfterEnteringEditMode()
+    {
+        if (Status != null)
+            RunCrossOptionEvaluator();
+    }
+
+    private void OnRevertedFromSaveModal()
+    {
+        RunCrossOptionEvaluator();
        StateHasChanged();
    }

    private void OpenSaveModal()
    {
-        if (Session.PendingChanges.Count == 0) return;
+        var hasPending = Session.Draft.PendingChanges.Count > 0;
+        var hasValidation = Session.Draft.GetValidationSummary().Count > 0;
+        if (!hasPending && !hasValidation)
+            return;
        _showSaveModal = true;
        StateHasChanged();
    }
@@ -199,10 +244,22 @@
        StateHasChanged();
    }

+    private async Task ContinueEditingAfterSavedFailureAsync()
+    {
+        _showSaveModal = false;
+        Session.Draft.DiscardAllDraft();
+        Session.Ui.ExitEditMode();
+        await OnSaveCompleted.InvokeAsync();
+        Session.Ui.EnterEditMode();
+        RefreshCrossOptionAfterEnteringEditMode();
+        StateHasChanged();
+    }
+
    private void CloseSaveModalAndEndEdit()
    {
        _showSaveModal = false;
-        Session.ExitEditModeDiscard();
+        Session.Draft.DiscardAllDraft();
+        Session.Ui.ExitEditMode();
        StateHasChanged();
    }
 }
@@ -38,6 +38,14 @@
    margin-left: auto;
 }

+::deep .ec-toolbar-changes-link {
+    cursor: pointer;
+}
+
+::deep .ec-toolbar-changes-link:hover {
+    text-decoration: underline;
+}
+
 .ec-sections {
    display: flex;
    flex-direction: column;
@@ -117,6 +125,22 @@
    opacity: 1;
 }

+/* Animated expand/collapse: grid 0fr → 1fr */
+::deep .ec-section-collapse {
+    display: grid;
+    grid-template-rows: 0fr;
+    transition: grid-template-rows 0.25s ease-out;
+}
+
+::deep .ec-section-collapse-open {
+    grid-template-rows: 1fr;
+}
+
+::deep .ec-section-collapse-inner {
+    min-height: 0;
+    overflow: hidden;
+}
+
 ::deep .ec-section-body {
    padding: 0.25rem 1rem 0.5rem 1rem;
    padding-left: 1rem;
@@ -148,6 +172,16 @@
    margin-bottom: 0.35rem;
 }

+/* Option label + field-level badges (editable / ok / cancel) on one row */
+::deep .ec-field-label-row {
+    display: inline-flex;
+    flex-wrap: wrap;
+    align-items: baseline;
+    gap: 0.25rem 0.5rem;
+    flex: 0 1 auto;
+    min-width: 0;
+}
+
 ::deep .ec-field:last-child {
    margin-bottom: 0;
 }
@@ -179,11 +213,23 @@
    gap: 0.25rem;
 }

-/* Edit wrapper (checkbox/input) shrinks to content so the editable badge stays on the same line */
+/* When a field is active: value + badges in one block so any click inside (checkbox, input, ok/cancel) doesn't deactivate */
+::deep .ec-field-value-when-editing {
+    display: inline-flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    gap: 0.25rem;
+    min-width: 0;
+    max-width: 100%;
+}
+
+/* Edit wrapper (checkbox/input) shrinks to content */
 ::deep .ec-field-edit-wrapper {
-    flex: 0 0 auto;
+    flex: 0 1 auto;
    display: inline-flex;
    align-items: center;
+    min-width: 0;
+    max-width: 100%;
 }

 /* Input/select in value area can shrink so the editable badge stays on the same line */
@@ -221,6 +267,24 @@
    margin-bottom: 0;
 }

+::deep .ec-field-value-list li.ec-multi-list-empty-hint {
+    list-style: none;
+    margin-left: -1.25rem;
+}
+
+/* Shared with default and custom (e.g. domain) multi-value editors */
+::deep .ec-field-value-list li.ec-multi-list-add-item {
+    list-style: none;
+    margin-left: -1.25rem;
+    margin-top: 0.25rem;
+    padding-top: 0.25rem;
+    border-top: 1px dashed var(--bs-border-color, #dee2e6);
+}
+
+::deep .ec-field-value-list li.ec-multi-list-add-item > .ec-multi-list-row-controls > .status-badge-inline {
+    margin-left: auto;
+}
+
 /* Long paths/URLs wrap; allow break anywhere so nothing is clipped */
 ::deep .ec-field-value-item {
    display: inline;
@@ -240,6 +304,25 @@
    line-height: 1;
 }

+/* Only when field is in edit mode: push ok/cancel/revert to end and allow them to wrap first on narrow widths */
+::deep .ec-field-value-when-editing > .status-badge-inline {
+    flex: 0 0 auto;
+    white-space: nowrap;
+    margin-left: auto;
+}
+
+@media (max-width: 575.98px) {
+    ::deep .ec-field-value-when-editing {
+        flex-wrap: wrap;
+    }
+
+    ::deep .ec-field-value-when-editing > .status-badge-inline {
+        flex-basis: 100%;
+        margin-left: 0;
+        margin-top: 0.15rem;
+    }
+}
+
@media (max-width: 767.98px) {
    ::deep .ec-section-header {
        padding-left: 0.75rem;
@@ -8,8 +8,9 @@
            <span class="ec-section-title fw-bold">@Title</span>
            <i class="bi @(IsOpen ? "bi-chevron-down" : "bi-chevron-right") ec-section-chevron" aria-hidden="true"></i>
        </button>
-        <div class="collapse @(IsOpen ? "show" : "")">
-            <div class="ec-section-body">
+        <div class="ec-section-collapse @(IsOpen ? "ec-section-collapse-open" : "")">
+            <div class="ec-section-collapse-inner">
+                <div class="ec-section-body">
                <ul class="list-unstyled mb-0">
                    @foreach (var f in Descriptors)
                    {
@@ -18,6 +19,7 @@
                            IsEditMode="@IsEditMode" IsActive="@(ActiveFieldKey == fieldKey)" />
                    }
                </ul>
+                </div>
            </div>
        </div>
    </div>
@@ -22,7 +22,39 @@
            </button>
            @if (PendingChangesCount > 0)
            {
-                <span class="text-muted small">@PendingChangesCount change(s)</span>
+                <span class="text-muted small ec-toolbar-changes-link" role="button" tabindex="0"
+                      @onclick="OnOpenSaveModal"
+                      @onkeydown="OnChangesLinkKeyDown"
+                      title="Open save dialog"
+                      aria-label="Open save dialog">
+                    @PendingChangesCount change(s)
+                </span>
+            }
+            @if (ValidationErrorCount > 0 || ValidationWarningCount > 0)
+            {
+                <span class="small ec-toolbar-validation-count" aria-live="polite">
+                    @if (ValidationErrorCount > 0)
+                    {
+                        <span class="text-danger fw-medium ec-toolbar-changes-link" role="button" tabindex="0"
+                              title="@ValidationErrorTooltip"
+                              aria-label="Open validation summary"
+                              @onclick="OnOpenSaveModal"
+                              @onkeydown="OnValidationLinkKeyDown">
+                            @ValidationErrorCount error(s)
+                        </span>
+                    }
+                    @if (ValidationErrorCount > 0 && ValidationWarningCount > 0) { <span class="text-muted">·</span> }
+                    @if (ValidationWarningCount > 0)
+                    {
+                        <span class="text-warning ec-toolbar-changes-link" role="button" tabindex="0"
+                              title="@ValidationWarningTooltip"
+                              aria-label="Open validation summary"
+                              @onclick="OnOpenSaveModal"
+                              @onkeydown="OnValidationLinkKeyDown">
+                            @ValidationWarningCount warning(s)
+                        </span>
+                    }
+                </span>
            }
        }
        else
@@ -40,6 +72,11 @@
    [Parameter] public EventCallback<string> SearchTermChanged { get; set; }
    [Parameter] public bool IsEditMode { get; set; }
    [Parameter] public int PendingChangesCount { get; set; }
+    [Parameter] public IReadOnlyList<FieldIssue>? ValidationSummary { get; set; }
+    private int ValidationErrorCount => ValidationSummary?.Count(i => i.Severity == FieldIssueSeverity.Error) ?? 0;
+    private int ValidationWarningCount => ValidationSummary?.Count(i => i.Severity == FieldIssueSeverity.Warning) ?? 0;
+    private string ValidationErrorTooltip => ValidationSummary == null ? "" : string.Join("\n", ValidationSummary.Where(i => i.Severity == FieldIssueSeverity.Error).Select(i => i.Message));
+    private string ValidationWarningTooltip => ValidationSummary == null ? "" : string.Join("\n", ValidationSummary.Where(i => i.Severity == FieldIssueSeverity.Warning).Select(i => i.Message));
    [Parameter] public bool AllSectionsExpanded { get; set; }
    [Parameter] public EventCallback OnExpandAll { get; set; }
    [Parameter] public EventCallback OnCollapseAll { get; set; }
@@ -59,4 +96,16 @@
    {
        await SearchTermChanged.InvokeAsync(e.Value?.ToString() ?? "");
    }
+
+    private async Task OnChangesLinkKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == "Enter" || e.Key == " ")
+            await OnOpenSaveModal.InvokeAsync();
+    }
+
+    private async Task OnValidationLinkKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Key == "Enter" || e.Key == " ")
+            await OnOpenSaveModal.InvokeAsync();
+    }
 }
--- a/Show More
+++ b/Show More