trunk-recorder: mark drb-upload.sh and run.sh executable (node-26#45)

TR execvp()s the uploadScript; without +x every call failed with status 127
on node-002 and nothing was uploaded.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.env.example

@@ -108,6 +108,23 @@ UPLOAD_SPOOL_MAX_AGE_HOURS=72
 UPLOAD_RETRY_MIN_SECONDS=15
 UPLOAD_RETRY_MAX_SECONDS=600
 
+# --- Recorder backend (node-26#45) -------------------------------------------
+# op25 (default): OP25 + PulseAudio recorder, one call at a time.
+# trunk-recorder: Trunk Recorder records every talkgroup at once, with call
+# boundaries from the decoder. Set BOTH lines below to switch; OP25 is then
+# never started (it would hold the SDR), and the live browser stream (Icecast)
+# goes quiet — Discord live audio keeps working.
+RECORDER_BACKEND=op25
+# COMPOSE_PROFILES=trunk-recorder
+# Trunk Recorder SDR settings (only read with RECORDER_BACKEND=trunk-recorder).
+# TR_SAMPLE_RATE=2400000
+# TR_GAIN=34
+# TR_CENTER_HZ=            # override the computed centre frequency
+# TR_DIGITAL_RECORDERS=4   # simultaneous voice channels on a trunked system
+# TR_MIN_DURATION=1.0      # seconds; shorter calls are dropped by TR
+# TR_SQUELCH_DB=-50        # conventional channels; absolute dB, tune per site
+# TR_LIVE_PORT=9123        # local UDP port for simplestream -> Discord
+
 # OP25 container (usually no need to change)
 OP25_API_URL=http://localhost:8001
 OP25_TERMINAL_URL=http://localhost:8081

.gitea/workflows/promote.yml

@@ -1,39 +0,0 @@
-name: Promote release
-
-# node-26#49: move the major tag (v1) to a tested release. Customer nodes
-# (updater REF=v1) install it on their next timer run, because its version is
-# numerically higher than what they run. Never moves it backwards.
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Release to promote, e.g. 1.1.3 (must already be tagged v1.1.3)"
-        required: true
-
-jobs:
-  promote:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Move the major tag
-        env:
-          VERSION: ${{ inputs.version }}
-        run: |
-          [[ "$VERSION" =~ ^([0-9]+)\.[0-9]+\.[0-9]+$ ]] || { echo "version must be MAJOR.MINOR.PATCH, got '$VERSION'"; exit 1; }
-          MAJOR="${BASH_REMATCH[1]}"
-          git fetch --force --tags origin
-          git rev-parse -q --verify "refs/tags/v$VERSION" >/dev/null || { echo "tag v$VERSION does not exist"; exit 1; }
-          # Refuse to go backwards: compare with the release v$MAJOR points at now.
-          CUR="$(git tag --points-at "v$MAJOR" 2>/dev/null | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \
-                 | sed 's/^v//' | sort -t. -k1,1n -k2,2n -k3,3n | tail -1 || true)"
-          if [ -n "$CUR" ]; then
-            HIGHEST="$(printf '%s\n%s\n' "$CUR" "$VERSION" | sort -t. -k1,1n -k2,2n -k3,3n | tail -1)"
-            [ "$HIGHEST" = "$VERSION" ] || { echo "v$MAJOR is at $CUR, newer than $VERSION — refusing to roll back here"; exit 1; }
-          fi
-          git tag -f "v$MAJOR" "v$VERSION^{commit}"
-          git push --force origin "refs/tags/v$MAJOR"
-          echo "v$MAJOR -> $VERSION (was ${CUR:-untagged})"

.gitea/workflows/version-tag.yml

@@ -1,31 +0,0 @@
-name: Tag release
-
-# node-26#49: every push to main is a release, vMAJOR.MINOR.PATCH (see
-# scripts/next-version.sh). Test nodes (updater REF=latest) install the
-# highest tag on their next timer run; customer nodes (REF=v1) wait for the
-# Promote workflow.
-
-on:
-  push:
-    branches: [main]
-
-concurrency:
-  group: version-tag
-  cancel-in-progress: false
-
-jobs:
-  tag:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Tag this commit
-        run: |
-          git fetch --force --tags origin
-          TAG="$(bash scripts/next-version.sh)"
-          if [ -z "$TAG" ]; then echo "already tagged"; exit 0; fi
-          git tag "$TAG"
-          git push origin "refs/tags/$TAG"
-          echo "released $TAG"

VERSION

@@ -1 +0,0 @@
-1.1

docker-compose.yml

@@ -51,6 +51,35 @@ services:
     volumes:
       - /dev:/dev
 
+  # Trunk Recorder (node-26#45) — the alternative recorder. Opt-in per node:
+  # it only starts when the node's .env has COMPOSE_PROFILES=trunk-recorder,
+  # and the edge-node only uses it with RECORDER_BACKEND=trunk-recorder. Set
+  # both or neither. Upstream image, pinned by tag AND digest (the digest is
+  # the multi-arch index for 5.2.1 on Docker Hub, amd64/arm64/arm/v7); bump
+  # both together. GPL-3.0: we ship it unmodified as a separate program —
+  # see trunk-recorder/README.md for the source offer.
+  #
+  # The edge-node writes ./configs/trunk-recorder/config.json; run.sh (our
+  # supervisor, replacing the image's CMD) restarts TR when it changes. It
+  # shares OP25's dongle slot, so op25 is never started on such a node.
+  trunk-recorder:
+    image: robotastic/trunk-recorder:5.2.1@sha256:c3e425858bfca16c609d8612808a83f06b0f376d950d11733d7c25b2a28f8866
+    profiles: ["trunk-recorder"]
+    restart: unless-stopped
+    network_mode: host
+    devices:
+      - /dev/bus/usb:/dev/bus/usb
+    # TR stages each transmission in tempDir (/dev/shm); Docker's 64 MB
+    # default is tight with several recorders running at once.
+    shm_size: 256m
+    entrypoint: ["/bin/sh", "/drb/run.sh"]
+    environment:
+      TZ: ${TZ:-UTC}
+    volumes:
+      - ./configs/trunk-recorder:/app
+      - ./recordings:/recordings
+      - ./trunk-recorder:/drb:ro
+
   edge-node:
     image: ${IMAGE_REGISTRY:-git.vpn.cusano.net}/${DOCKER_ORG:-logan}/${DOCKER_REPO:-node-26}/edge-node:${DRB_TAG_EDGE_NODE:-latest}
     build: ./drb-edge-node

drb-edge-node/app/config.py

@@ -1,14 +1,11 @@
 from pydantic_settings import BaseSettings
-from typing import Optional
+from typing import Literal, Optional
 
 
 class Settings(BaseSettings):
     # Node identity
     node_id: str
     node_name: str = "Unnamed Node"
-    # The release installed on this node (node-26#49). The host updater writes
-    # DRB_VERSION to .env after each update; "untagged" before the first one.
-    drb_version: str = "untagged"
     node_lat: float = 0.0
     node_lon: float = 0.0
 
@@ -173,6 +170,46 @@ class Settings(BaseSettings):
     # 120 s; a failure here just lands in the spool.
     upload_inline_timeout_seconds: float = 30.0
 
+    # ------------------------------------------------------------------
+    # Recorder backend (node-26#45)
+    #
+    #   op25            OP25 decodes, Liquidsoap mixes into PulseAudio, and
+    #                   call_recorder/metadata_watcher cut calls out of that
+    #                   one stream. The default; every existing node.
+    #   trunk-recorder  Trunk Recorder owns the SDR and records every grant at
+    #                   once, with call boundaries from the decoder. Its
+    #                   uploadScript drops each finished call in tr_inbox_dir
+    #                   and app/internal/trunk_recorder.py uploads it through
+    #                   the same spool. OP25 is never started (it would fight
+    #                   TR for the dongle) and the PulseAudio recorder stays
+    #                   off, so a call is never uploaded twice. Needs the
+    #                   compose profile too: COMPOSE_PROFILES=trunk-recorder.
+    # ------------------------------------------------------------------
+    recorder_backend: Literal["op25", "trunk-recorder"] = "op25"
+    # Shared with the trunk-recorder container (mounted there as /app):
+    # config.json, the CSVs, its logs, and the supervisor's status file.
+    tr_config_dir: Optional[str] = None  # default <config_path>/trunk-recorder
+    # Where TR's uploadScript hands over finished calls (default
+    # <recordings_path>/tr-inbox). Same bind mount in both containers.
+    tr_inbox_dir: Optional[str] = None
+    # Source (SDR) settings for the generated config. 2.4 Msps is the most an
+    # RTL-SDR does without dropping samples; ~2 MHz of it is usable.
+    tr_sample_rate: int = 2_400_000
+    tr_gain: float = 34.0  # dB; matches op25-container's rtl-sdr-v3 preset (lna:34)
+    tr_center_hz: Optional[int] = None  # override the computed centre frequency
+    # Simultaneous voice channels on a trunked system. Each costs CPU (on a
+    # Pi 4 roughly 4-6 is the ceiling); conventional channels get one each.
+    tr_digital_recorders: int = 4
+    # TR deletes calls shorter than this. Matches the key-up noise the old
+    # recorder's trim + all-silence check threw away.
+    tr_min_duration: float = 1.0
+    # Conventional squelch, absolute dB (TR has no noise squelch). Used when
+    # the system config gives no squelch_threshold. Needs hand tuning per site.
+    tr_squelch_db: float = -50.0
+    # simplestream UDP port for live audio (TR -> edge-node -> PulseAudio ->
+    # Discord). Local only.
+    tr_live_port: int = 9123
+
     # ------------------------------------------------------------------
     # Local dashboard / API authentication
     #

drb-edge-node/app/internal/call_recorder.py

@@ -64,7 +64,7 @@ from collections import deque
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import List, Optional, Tuple
+from typing import Dict, List, Optional, Tuple
 
 from app.config import settings
 from app.internal import audio_trim, pcm, pulse, upload_spool
@@ -335,10 +335,15 @@ class CallRecorder:
     # Lifecycle
     # ------------------------------------------------------------------
 
-    async def start(self) -> None:
-        """Start the persistent capture. Call once from app lifespan."""
-        self._stream_task = asyncio.create_task(self._capture_loop())
-        logger.info("PulseAudio ring-buffer starting.")
+    async def start(self, capture: bool = True) -> None:
+        """Start the persistent capture. Call once from app lifespan.
+
+        capture=False starts only the upload spool: with the trunk-recorder
+        backend (node-26#45) TR does the recording, and a second recorder on
+        the same audio would upload every call twice."""
+        if capture:
+            self._stream_task = asyncio.create_task(self._capture_loop())
+            logger.info("PulseAudio ring-buffer starting.")
         if settings.c2_url:
             self.spool.start()
 
@@ -766,14 +771,15 @@ class CallRecorder:
     # ------------------------------------------------------------------
 
     async def _post(self, file_path: Path, meta: UploadMeta) -> UploadResult:
-        return await upload_spool.post_recording(file_path, meta, AUDIO_MIME)
+        return await upload_spool.post_recording(file_path, meta, upload_spool.mime_for(file_path, AUDIO_MIME))
 
     async def _post_inline(self, file_path: Path, meta: UploadMeta) -> UploadResult:
         # metadata_watcher awaits on_call_end, so this attempt blocks the poll
         # loop. With the spool behind it, it can afford a short timeout; the
         # background retries get the full UPLOAD_TIMEOUT_SECONDS.
         return await upload_spool.post_recording(
-            file_path, meta, AUDIO_MIME, timeout=settings.upload_inline_timeout_seconds,
+            file_path, meta, upload_spool.mime_for(file_path, AUDIO_MIME),
+            timeout=settings.upload_inline_timeout_seconds,
         )
 
     async def upload_recording(
@@ -785,7 +791,7 @@ class CallRecorder:
         system_id: Optional[str] = None,
         audio_start_epoch: Optional[float] = None,
         audio_end_epoch: Optional[float] = None,
-        radios: Optional[str] = None,
+        extra: Optional[Dict[str, str]] = None,
     ) -> Optional[str]:
         """
         Upload once, inline. Returns the storage URL on success.
@@ -803,7 +809,7 @@ class CallRecorder:
         meta = UploadMeta(
             call_id=call_id, talkgroup_id=talkgroup_id, talkgroup_name=talkgroup_name,
             system_id=system_id, audio_start_epoch=audio_start_epoch, audio_end_epoch=audio_end_epoch,
-            radios=radios,
+            extra=extra,
         )
         result = await self._post_inline(file_path, meta)
         self.spool.last_result = {"call_id": call_id, "kind": result.kind, "status": result.status,

drb-edge-node/app/internal/health.py

@@ -8,6 +8,10 @@ answers one of those for one link in the chain
     password -> C2 enrollment -> MQTT -> SDR -> what to listen to -> OP25
              -> decoding -> audio (PulseAudio) -> local stream (Icecast)
 
+With RECORDER_BACKEND=trunk-recorder (node-26#45) the last four are replaced
+by Trunk Recorder's: supervisor state, control-channel decode rate (from its
+log), recordings handed over, and the live feed to Discord.
+
 `gather_facts()` does the I/O; `build_checks()` is a pure function of those
 facts so every state (unapproved, no SDR, OP25 crashed, …) is unit-testable.
 
@@ -208,6 +212,10 @@ def build_checks(f: Dict[str, Any]) -> List[Dict[str, str]]:
         kind = "P25 conventional" if src.get("mode") == "conventional" else src["type"]
         checks.append(_check("source", "What to listen to", OK, f"{src['name']} ({kind}) — {origin}."))
 
+    if f.get("backend") == "trunk-recorder":
+        checks.extend(_trunk_recorder_checks(f, src, now))
+        return checks
+
     # 6. OP25
     op25 = f.get("op25_status")
     running = op25 == "running"
@@ -302,6 +310,104 @@ def build_checks(f: Dict[str, Any]) -> List[Dict[str, str]]:
     return checks
 
 
+def _trunk_recorder_checks(f: Dict[str, Any], src: Optional[Dict[str, Any]], now: float) -> List[Dict[str, str]]:
+    """Checks 6-9 when Trunk Recorder is the recorder (node-26#45)."""
+    tr = f.get("tr") or {}
+    checks: List[Dict[str, str]] = []
+    status = tr.get("status")
+    state = (status or {}).get("state")
+    running = False
+    label = "Radio recorder (Trunk Recorder)"
+    if tr.get("config_error"):
+        checks.append(_check(
+            "recorder", label, ERROR, f"Couldn't build its config — {tr['config_error']}",
+            "Fix the system's channel list (or TR_* settings in .env); the node retries on the next config push.",
+        ))
+    elif status is None:
+        checks.append(_check(
+            "recorder", label, ERROR, "The trunk-recorder service isn't running.",
+            "Set COMPOSE_PROFILES=trunk-recorder in the node's .env, then run `docker compose up -d`.",
+        ))
+    elif status.get("stale"):
+        checks.append(_check(
+            "recorder", label, ERROR, f"Its supervisor stopped reporting {_ago(status.get('age_seconds') or 0)}.",
+            "Check the trunk-recorder container: `docker compose logs trunk-recorder`.",
+        ))
+    elif state == "running":
+        running = True
+        up = now - float(status.get("started_at") or now)
+        restarts = int(status.get("restarts") or 0)
+        checks.append(_check(
+            "recorder", label, OK if restarts < 3 else WARN,
+            f"Running for {_ago(up).replace(' ago', '')}"
+            + (f" — restarted {restarts} times since the container started." if restarts else "."),
+            "" if restarts < 3 else "Frequent restarts: `docker compose logs trunk-recorder` says why.",
+        ))
+    elif state == "crashed":
+        checks.append(_check(
+            "recorder", label, ERROR, f"Exited (code {status.get('last_exit')}) — restarting.",
+            "Usually the SDR is unplugged or held by another program. `docker compose logs trunk-recorder`.",
+        ))
+    elif state == "stopped":
+        checks.append(_check("recorder", label, WARN, "Stopped from the dashboard.", "Press Start."))
+    elif not src:
+        checks.append(_check("recorder", label, OFF, "Waiting — choose what to listen to first."))
+    else:
+        checks.append(_check("recorder", label, WARN, "Waiting for its config…"))
+
+    mode = (src or {}).get("mode")
+    if not running:
+        checks.append(_check("decode", "Decoding", OFF, "Starts when Trunk Recorder runs."))
+    elif mode == "trunked":
+        rate = tr.get("decode_rate")
+        age = tr.get("log_age_seconds")
+        if rate is None or age is None or age > 30:
+            checks.append(_check(
+                "decode", "Decoding", WARN, "No control-channel report from Trunk Recorder yet.",
+                "Give it 30 seconds after a start; if it stays, `docker compose logs trunk-recorder`.",
+            ))
+        elif rate > 0:
+            checks.append(_check("decode", "Decoding", OK, f"Decoding the control channel ({rate:g} messages/sec)."))
+        else:
+            checks.append(_check(
+                "decode", "Decoding", ERROR, "Not decoding the control channel (0 messages/sec).",
+                "Usually a wrong control-channel frequency, a weak signal/antenna, or SDR frequency error (PPM).",
+            ))
+    else:
+        checks.append(_check(
+            "decode", "Decoding", OK, "Listening (conventional) — channels record when their squelch opens.",
+            "If calls never arrive through a busy period, the squelch (TR_SQUELCH_DB or the system's "
+            "squelch_threshold) may be set too high.",
+        ))
+
+    last = tr.get("last_call_epoch")
+    backlog = int(tr.get("inbox_backlog") or 0)
+    if not running and not last:
+        checks.append(_check("audio", "Recordings", OFF, "Nothing recorded yet."))
+    elif backlog > 20:
+        checks.append(_check(
+            "audio", "Recordings", WARN, f"{backlog} finished calls waiting to be sent.",
+            "Normal for a minute after the server link comes back; if it keeps growing, check the C2 link.",
+        ))
+    elif last:
+        extra = f", {tr['encrypted_skipped']} encrypted skipped" if tr.get("encrypted_skipped") else ""
+        checks.append(_check(
+            "audio", "Recordings", OK,
+            f"Last call {_ago(now - last)} ({tr.get('calls_ingested', 0)} since start{extra}).",
+        ))
+    else:
+        checks.append(_check("audio", "Recordings", OK, "Recorder up — no call yet."))
+
+    live = tr.get("live") or {}
+    heard = live.get("last_packet_epoch")
+    checks.append(_check(
+        "stream", "Live audio", OK if heard else OFF,
+        ("Feeding Discord — last audio " + _ago(now - heard) + "." if heard else "Feeds Discord once a call is heard.")
+        + " The local browser stream isn't available with Trunk Recorder.",
+    ))
+    return checks
+
+
 async def icecast_live() -> Optional[bool]:
     """True if the configured mount has a source, False if not, None if Icecast is down."""
     url = f"http://{settings.icecast_host}:{settings.icecast_port}/status-json.xsl"
@@ -342,8 +448,11 @@ async def gather_facts() -> Dict[str, Any]:
             sdr_count = op25_devs["count"]
 
     activity = call_recorder.audio_activity()
+    from app.internal import trunk_recorder as tr
     return {
         "now": time.time(),
+        "backend": settings.recorder_backend,
+        "tr": tr.trunk_recorder.health_facts() if tr.enabled() else None,
         "node_id": settings.node_id,
         "default_password": auth.is_using_default_password(),
         "c2_url": settings.c2_url,

drb-edge-node/app/internal/metadata_watcher.py

@@ -132,11 +132,6 @@ ATTRIBUTION_LOOKAHEAD_SECONDS = 2.0
 CONSOLE_HISTORY_SECONDS = 180.0
 CONSOLE_HISTORY_MAX = 1200
 
-# Sightings of the same radio closer together than this are one transmission.
-# The radio ID shows up in only ~44% of 0.5 s polls during a burst (server-26#304
-# P0 probe, 2026-11-08), so gaps of a few polls inside one key-up are normal.
-TX_MERGE_GAP_SECONDS = 2.0
-
 # How far back to look for a duplicate before appending a grant. OP25's call_log
 # deque drains on read so repeats should not happen, but a re-delivered entry
 # would otherwise inflate the transmission count and the attribution score.
@@ -212,21 +207,6 @@ def _talker(channel: Dict[str, Any]) -> Optional[tuple]:
     return tgid, rid
 
 
-def rebase_radios(radios: List[Dict[str, Any]], shift: float, span: float) -> List[Dict[str, Any]]:
-    """Move call-relative radio offsets into another frame (the trimmed audio file).
-
-    `shift` is call start minus the new origin; offsets land clamped to [0, span]
-    so a talker before the file's first sample sits at 0, not before it.
-    """
-    span = max(0.0, span)
-    return [
-        {**r,
-         "start": round(min(max(0.0, r["start"] + shift), span), 2),
-         "end": round(min(max(0.0, r["end"] + shift), span), 2)}
-        for r in radios
-    ]
-
-
 def _iso(epoch: Optional[float]) -> Optional[str]:
     if epoch is None:
         return None
@@ -274,10 +254,6 @@ class MetadataWatcher:
         self._current_srcaddr: Optional[int] = None
         self._started_at: Optional[float] = None   # audio onset, or grant epoch in fallback mode
         self._transmissions: int = 0
-        # Every radio heard on the open segment, in order: [rid, first_epoch,
-        # last_epoch]. srcaddr above keeps only the latest one; one recording
-        # often holds a dispatcher and a unit (server-26#304).
-        self._tx: List[List[Any]] = []
         # True when the open segment is governed by audio, False for the
         # console fallback. Fixed at open so capture flapping cannot switch the
         # rules underneath a live segment.
@@ -583,7 +559,6 @@ class MetadataWatcher:
             self._current_tgid_name = entry.get("tgtag") or ""
             self._current_freq = entry.get("freq")
             self._current_srcaddr = _as_int(entry.get("rid"))
-            self._note_tx(self._current_srcaddr, started_at)
             self._transmissions += 1
             logger.info(
                 f"Late attribution: segment {self._active_call_id} adopted tgid {tgid} from a grant "
@@ -596,13 +571,11 @@ class MetadataWatcher:
             # of a single conversation lands in one file.
             self._transmissions += 1
             self._refresh_meta_from_log(entry)
-            self._note_tx(_as_int(entry.get("rid")), started_at)
             return
 
         if self._same_channel(tgid, entry.get("freq"), entry.get("tgtag") or ""):
             self._transmissions += 1
             self._refresh_meta_from_log(entry)
-            self._note_tx(_as_int(entry.get("rid")), started_at)
             return
 
         # FORCED SPLIT. Two talkgroups can be back to back with no silence
@@ -653,7 +626,6 @@ class MetadataWatcher:
                 ours = True
                 if srcaddr is not None:
                     self._current_srcaddr = srcaddr
-                    self._note_tx(srcaddr, now)
                 self._last_activity = now
                 self._refresh_meta_from_channel(channel)
 
@@ -666,7 +638,6 @@ class MetadataWatcher:
                 self._current_tgid_name = active[0].get("tag") or ""
                 self._current_freq = active[0].get("freq")
                 self._current_srcaddr = _as_int(active[0].get("srcaddr"))
-                self._note_tx(self._current_srcaddr, now)
                 logger.info(f"Late attribution: segment {self._active_call_id} adopted tgid {tgid} from channel state.")
             return
 
@@ -738,7 +709,6 @@ class MetadataWatcher:
             self._last_tx_end = None
             self._last_activity = now
             self._refresh_meta_from_log(entry)
-            self._note_tx(_as_int(entry.get("rid")), started_at)
             return
 
         await self._close_segment(started_at + _tail_pad(), reason="tgid_change")
@@ -760,7 +730,6 @@ class MetadataWatcher:
                 tx_active = True
                 if srcaddr is not None:
                     self._current_srcaddr = srcaddr
-                    self._note_tx(srcaddr, now)
                 self._refresh_meta_from_channel(channel)
             elif chan_tgid is not None:
                 foreign_active_tgid = chan_tgid
@@ -823,28 +792,6 @@ class MetadataWatcher:
     # Segment open / close
     # ------------------------------------------------------------------
 
-    def _note_tx(self, rid: Optional[int], epoch: float) -> None:
-        """Record a sighting of `rid` talking on the open segment."""
-        if rid is None or self._active_call_id is None:
-            return
-        last = self._tx[-1] if self._tx else None
-        if last is not None and last[0] == rid and epoch - last[2] <= TX_MERGE_GAP_SECONDS:
-            last[2] = max(last[2], epoch)
-            return
-        self._tx.append([rid, epoch, epoch])
-
-    def _radios(self, start: float, end: float) -> List[Dict[str, Any]]:
-        """The segment's transmissions as offsets (seconds) from its start, clamped to it."""
-        span = max(0.0, end - start)
-        return [
-            {
-                "radio": rid,
-                "start": round(min(max(0.0, first - start), span), 2),
-                "end": round(min(max(0.0, last - start), span), 2),
-            }
-            for rid, first, last in self._tx
-        ]
-
     def _refresh_meta_from_log(self, entry: Dict[str, Any]) -> None:
         if not self._current_tgid_name:
             self._current_tgid_name = entry.get("tgtag") or ""
@@ -879,8 +826,6 @@ class MetadataWatcher:
         self._started_at = started_at
         self._transmissions = max(1, transmissions)
         self._audio_driven = audio_driven
-        self._tx = []
-        self._note_tx(srcaddr, started_at)
 
         # Console fallback assumes the transmission is still up; it learns
         # otherwise from the next channel scan.
@@ -931,7 +876,6 @@ class MetadataWatcher:
             "ended_at": _iso(end_epoch),
             "ended_at_epoch": end_epoch,
             "transmissions": self._transmissions,
-            "radios": self._radios(started_at if started_at is not None else end_epoch, end_epoch),
             "end_reason": reason,
             "attributed": attributed,
             "driver": "audio" if self._audio_driven else "console",
@@ -966,7 +910,6 @@ class MetadataWatcher:
         self._current_srcaddr = None
         self._started_at = None
         self._transmissions = 0
-        self._tx = []
         self._tx_active = False
         self._last_tx_end = None
         self._audio_driven = False
@@ -1006,10 +949,6 @@ class MetadataWatcher:
                 self._current_freq = found.freq
             if found.rid is not None and self._current_srcaddr is None:
                 self._current_srcaddr = found.rid
-                if not self._tx:
-                    # Only as the sole entry: the window's latest radio has no
-                    # timing of its own, so it must not reorder real sightings.
-                    self._note_tx(found.rid, start)
             self._transmissions = max(self._transmissions, found.grants)
             return
 

drb-edge-node/app/internal/mqtt_manager.py

@@ -378,7 +378,6 @@ class MQTTManager:
             "enforce_override_timeout": config.enforce_override_timeout,
             "secondary_sdr_mode": config.secondary_sdr_mode,
             "secondary_sdr_priority": config.secondary_sdr_priority,
-            "version": settings.drb_version,
         }
         payload["sdr_pins"] = config.sdr_pins
         # Conventional channels (node-26#24): name/freq/NAC and whether the
@@ -420,6 +419,14 @@ class MQTTManager:
         last = spool["last_result"] or {}
         payload["last_upload_status"] = last.get("status")
         payload["last_upload_kind"] = last.get("kind")
+        # node-26#45: which recorder this node runs; C2 ignores unknown keys.
+        payload["recorder_backend"] = settings.recorder_backend
+        from app.internal import trunk_recorder as tr
+        if tr.enabled():
+            facts = tr.trunk_recorder.health_facts()
+            payload["tr_state"] = (facts["status"] or {}).get("state")
+            payload["tr_decode_rate"] = facts["decode_rate"]
+            payload["tr_inbox_backlog"] = facts["inbox_backlog"]
         self._publish(self._t_checkin, payload, qos=1)
 
     def _publish(self, topic: str, payload: dict, qos: int = 0, retain: bool = False):

drb-edge-node/app/internal/radio_backend.py

@@ -0,0 +1,55 @@
+"""
+Start/stop "the radio" without every caller knowing which recorder backend is
+active (node-26#45). Every path that used to call op25_client.start/stop — C2
+config pushes, the op25_restart command, the dashboard, SDR re-pinning — goes
+through here.
+
+With RECORDER_BACKEND=trunk-recorder, OP25 is never started: both open the
+same RTL-SDR, and OP25 holding it would starve Trunk Recorder. start() becomes
+a restart request to trunk-recorder/run.sh instead.
+"""
+import time
+from typing import Optional
+
+from app.internal import trunk_recorder as tr
+from app.internal.logger import logger
+from app.internal.op25_client import op25_client
+
+
+def name() -> str:
+    return "Trunk Recorder" if tr.enabled() else "OP25"
+
+
+async def start(wait: bool = True) -> bool:
+    return await start_with_reason(wait) is None
+
+
+async def start_with_reason(wait: bool = True) -> Optional[str]:
+    """None on success, else a human-readable reason.
+
+    For Trunk Recorder, `wait` blocks until run.sh reports TR restarted (up
+    to trunk_recorder.RESTART_WAIT_SECONDS), like op25_client.start returns
+    only once OP25 has started — callers hand the spare dongles out next.
+    """
+    if not tr.enabled():
+        return await op25_client.start_with_reason()
+    if tr.trunk_recorder.config_error:
+        return tr.trunk_recorder.config_error
+    requested = time.time()
+    if not tr.trunk_recorder.request_restart():
+        return f"Couldn't write to {tr.config_dir()} to restart Trunk Recorder."
+    if not wait:
+        return None
+    err = await tr.trunk_recorder.wait_started_since(requested)
+    if err:
+        logger.error(err)
+    return err
+
+
+async def stop() -> bool:
+    if not tr.enabled():
+        return await op25_client.stop()
+    ok = tr.trunk_recorder.request_stop()
+    if ok:
+        logger.info("Trunk Recorder stop requested.")
+    return ok

drb-edge-node/app/internal/sdr_settings.py

@@ -83,7 +83,18 @@ async def set_sdr_settings(priority: Optional[Iterable[str]] = None,
         cfg.sdr_pins = normalize_sdr_pins(pins)
     save_node_config(cfg)
 
-    if cfg.sdr_pins.get("op25") != old_op25:
+    if cfg.sdr_pins.get("op25") != old_op25 and settings.recorder_backend == "trunk-recorder":
+        # Trunk Recorder takes the "op25" dongle (node-26#45): rewrite its
+        # config with the new serial; run.sh restarts it on the change.
+        from app.internal.health import active_config
+        from app.main import _generate_op25_config
+        await secondary_sdr_client.apply([], {}, [])
+        current = active_config(cfg)
+        if current is not None and await _generate_op25_config(current):
+            from app.internal import radio_backend
+            await radio_backend.start()  # waits until TR holds the new dongle
+        logger.info(f"Trunk Recorder moved to SDR {cfg.sdr_pins.get('op25') or 'rtl=0 (first dongle)'}")
+    elif cfg.sdr_pins.get("op25") != old_op25:
         from app.internal.op25_client import op25_client
         # Free the new dongle first if a decoder holds it, then move OP25.
         await secondary_sdr_client.apply([], {}, [])

drb-edge-node/app/internal/tr_calls.py

@@ -0,0 +1,210 @@
+"""
+Trunk Recorder call JSON -> what DRB sends for one call (node-26#45).
+
+TR writes one JSON per call next to its WAV and passes both to uploadScript.
+The shape is `create_call_json` in trunk-recorder/call_concluder/
+call_concluder.cc at v5.2.1 (keys, in order: freq, freq_error, signal, noise,
+source_num, recorder_num, tdma_slot, phase2_tdma, start_time, stop_time,
+start_time_ms, stop_time_ms, emergency, priority, mode, duplex, encrypted,
+call_length, call_length_ms, talkgroup, talkgroup_tag, talkgroup_description,
+talkgroup_group_tag, talkgroup_group, color_code, audio_type, short_name,
+patched_talkgroups?, freqList[], srcList[]). Older TR releases omit the *_ms
+keys, so both are read.
+
+Pure: trunk_recorder.py does the I/O.
+"""
+import json
+import uuid
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
+from typing import Any, Dict, List, Optional
+
+DRIVER = "trunk-recorder"
+# Fixed namespace so a call's id is a pure function of its JSON: re-reading the
+# same file after a crash yields the same call_id, so C2 overwrites rather than
+# duplicates (trunk_recorder.py relies on this to be restart-safe).
+CALL_ID_NAMESPACE = uuid.UUID("5d0c7f4e-2b8f-4e0e-9a59-45c0de7c0045")
+
+
+def _iso(epoch: float) -> str:
+    return datetime.fromtimestamp(epoch, timezone.utc).isoformat()
+
+
+def _int(value: Any) -> Optional[int]:
+    try:
+        return int(value)
+    except (TypeError, ValueError):
+        return None
+
+
+def _epoch(data: Dict[str, Any], key: str) -> Optional[float]:
+    ms = data.get(f"{key}_ms")
+    if isinstance(ms, (int, float)) and ms > 0:
+        return ms / 1000.0
+    s = data.get(key)
+    if isinstance(s, (int, float)) and s > 0:
+        return float(s)
+    return None
+
+
+@dataclass
+class TrCall:
+    call_id: str
+    tgid: int
+    tgid_name: str
+    freq: Optional[int]
+    start_epoch: float
+    stop_epoch: float
+    units: List[int] = field(default_factory=list)
+    emergency: bool = False
+    encrypted: bool = False
+    src_list: List[Dict[str, Any]] = field(default_factory=list)
+    freq_list: List[Dict[str, Any]] = field(default_factory=list)
+    call_length: Optional[float] = None
+    signal: Optional[int] = None
+    noise: Optional[int] = None
+    freq_error: Optional[int] = None
+    decode_errors: Optional[int] = None
+    spikes: Optional[int] = None
+    patched_talkgroups: List[int] = field(default_factory=list)
+    short_name: str = ""
+
+    @property
+    def srcaddr(self) -> Optional[int]:
+        return self.units[0] if self.units else None
+
+    def start_payload(self) -> Dict[str, Any]:
+        """MQTT call_start — the keys main.on_call_start publishes, which C2's
+        _on_call_start reads (tgid, tgid_name, freq, srcaddr, started_at)."""
+        return {
+            "call_id": self.call_id,
+            "tgid": self.tgid,
+            "tgid_name": self.tgid_name,
+            "freq": self.freq,
+            "srcaddr": self.srcaddr,
+            "started_at": _iso(self.start_epoch),
+            "started_at_epoch": self.start_epoch,
+            "attributed": True,
+            "driver": DRIVER,
+        }
+
+    def audio_end_epoch(self, wav_seconds: Optional[float] = None) -> float:
+        """Wall clock at the END of the audio file.
+
+        NOT stop_time: TR joins a call's transmissions back to back and drops
+        the gaps between them, so the WAV is shorter than stop - start by the
+        sum of the gaps. start + WAV length is what the file's last sample
+        maps to only if there were no gaps; the exact per-transmission map is
+        srcList/freqList (time = wall clock, pos = offset in the file), sent
+        as src_list / freq_list.
+        """
+        if wav_seconds is None:
+            return self.stop_epoch
+        return self.start_epoch + wav_seconds
+
+    def end_payload(self, wav_seconds: Optional[float] = None) -> Dict[str, Any]:
+        """MQTT call_end. TR cut the call on decoder boundaries with no
+        trimming, so the audio starts at the call start; see audio_end_epoch
+        for why it does not end at the call end."""
+        audio_end = self.audio_end_epoch(wav_seconds)
+        out = self.start_payload()
+        out.update({
+            "ended_at": _iso(self.stop_epoch),
+            "ended_at_epoch": self.stop_epoch,
+            "audio_start_at": _iso(self.start_epoch),
+            "audio_end_at": _iso(audio_end),
+            "audio_start_epoch": self.start_epoch,
+            "audio_end_epoch": audio_end,
+            "units": self.units,
+            "emergency": self.emergency,
+            "encrypted": self.encrypted,
+        })
+        return out
+
+    def upload_extra(self) -> Dict[str, str]:
+        """Extra /upload form fields. C2 declares none of these yet, so FastAPI
+        ignores them (same as audio_start_epoch today); they are here for when
+        it does."""
+        extra = {
+            "recorder_backend": DRIVER,
+            "units": ",".join(str(u) for u in self.units),
+            "src_list": json.dumps(self.src_list, separators=(",", ":")),
+            "freq_list": json.dumps(self.freq_list, separators=(",", ":")),
+            "emergency": "1" if self.emergency else "0",
+            "encrypted": "1" if self.encrypted else "0",
+            "started_at_epoch": f"{self.start_epoch:.3f}",
+            "ended_at_epoch": f"{self.stop_epoch:.3f}",
+        }
+        optional = {
+            "freq": self.freq, "call_length": self.call_length, "signal": self.signal, "noise": self.noise,
+            "freq_error": self.freq_error, "decode_errors": self.decode_errors, "spikes": self.spikes,
+        }
+        extra.update({k: str(v) for k, v in optional.items() if v is not None})
+        if self.patched_talkgroups:
+            extra["patched_talkgroups"] = ",".join(str(t) for t in self.patched_talkgroups)
+        return extra
+
+
+def parse_call(data: Dict[str, Any], node_id: str, file_stem: str = "") -> TrCall:
+    """One TR call JSON -> TrCall. ValueError if it has no talkgroup or start."""
+    tgid = _int(data.get("talkgroup"))
+    if not tgid or tgid <= 0:
+        raise ValueError(f"call JSON has no talkgroup ({data.get('talkgroup')!r})")
+    start = _epoch(data, "start_time")
+    if start is None:
+        raise ValueError("call JSON has no start_time")
+    stop = _epoch(data, "stop_time")
+    length = data.get("call_length_ms")
+    length_s = (length / 1000.0) if isinstance(length, (int, float)) and length > 0 else None
+    if length_s is None and isinstance(data.get("call_length"), (int, float)):
+        length_s = float(data["call_length"])
+    if stop is None or stop < start:
+        stop = start + (length_s or 0.0)
+
+    src_list: List[Dict[str, Any]] = []
+    units: List[int] = []
+    unit_emergency = False
+    for s in data.get("srcList") or []:
+        if not isinstance(s, dict):
+            continue
+        src = _int(s.get("src"))
+        entry = {"src": src, "time": s.get("time"), "pos": s.get("pos"),
+                 "emergency": bool(_int(s.get("emergency")))}
+        if s.get("tag"):
+            entry["tag"] = s.get("tag")
+        src_list.append(entry)
+        unit_emergency = unit_emergency or entry["emergency"]
+        # TR reports 0 / -1 when the unit id wasn't decoded.
+        if src and src > 0 and src not in units:
+            units.append(src)
+
+    freq_list = [f for f in data.get("freqList") or [] if isinstance(f, dict)]
+    errors = sum(_int(f.get("error_count")) or 0 for f in freq_list) if freq_list else None
+    spikes = sum(_int(f.get("spike_count")) or 0 for f in freq_list) if freq_list else None
+
+    freq = _int(data.get("freq"))
+    short_name = str(data.get("short_name") or "")
+    key = f"{node_id}|{short_name}|{tgid}|{start:.3f}|{freq}|{file_stem}"
+    return TrCall(
+        call_id=str(uuid.uuid5(CALL_ID_NAMESPACE, key)),
+        tgid=tgid,
+        tgid_name=str(data.get("talkgroup_tag") or data.get("talkgroup_description") or ""),
+        freq=freq,
+        start_epoch=start,
+        stop_epoch=stop,
+        units=units,
+        emergency=bool(_int(data.get("emergency"))) or unit_emergency,
+        encrypted=bool(_int(data.get("encrypted"))),
+        src_list=src_list,
+        freq_list=[{"freq": _int(f.get("freq")), "time": f.get("time"), "pos": f.get("pos"), "len": f.get("len"),
+                    "error_count": _int(f.get("error_count")), "spike_count": _int(f.get("spike_count"))}
+                   for f in freq_list],
+        call_length=round(length_s, 3) if length_s is not None else None,
+        signal=_int(data.get("signal")),
+        noise=_int(data.get("noise")),
+        freq_error=_int(data.get("freq_error")),
+        decode_errors=errors,
+        spikes=spikes,
+        patched_talkgroups=[t for t in (_int(x) for x in data.get("patched_talkgroups") or []) if t],
+        short_name=short_name,
+    )

drb-edge-node/app/internal/tr_config.py

@@ -0,0 +1,291 @@
+"""
+Trunk Recorder config.json (+ CSVs) from the C2 system config (node-26#45).
+
+Same input as radio_config.build_generate_payload — the SystemConfig C2 pushes —
+so a node can switch backends without anyone re-entering its system:
+
+    P25 trunked       -> system type "p25", control_channels, talkgroupsFile
+    P25 conventional  -> "conventionalP25", channelFile
+    Analog            -> "conventional",    channelFile, squelch
+
+Schema per Trunk Recorder v5.2.1 docs/CONFIGURE.md. Pure functions: the I/O is
+in trunk_recorder.py. Unverified against a radio — see the notes inline.
+
+Conventional channels are numbered with conventional.channel_tgid (frequency in
+100 Hz units), the same synthetic talkgroup the OP25 path reports, so C2 names
+a TR call and an OP25 call on the same channel identically.
+"""
+import csv
+import io
+from typing import Any, Dict, List, Optional, Tuple
+
+from app.internal.logger import logger
+from app.internal.conventional import channel_tgid
+from app.internal.radio_config import (
+    ANALOG, CONVENTIONAL, DMR, TRUNKED, analog_frequency, conventional_channels, system_mode, to_hz,
+)
+
+# Paths INSIDE the trunk-recorder container (see docker-compose.yml).
+TR_APP_DIR = "/app"                         # tr_config_dir is mounted here
+TR_UPLOAD_SCRIPT = "/drb/drb-upload.sh"     # ./trunk-recorder, read-only
+TR_CAPTURE_DIR = "/recordings/tr-capture"   # ./recordings
+TR_TEMP_DIR = "/dev/shm"                    # TR's recommended tmpfs (shm_size in compose)
+TALKGROUPS_FILE = "talkgroups.csv"
+CHANNELS_FILE = "channels.csv"
+SHORT_NAME = "drb"
+
+# TR splits a call longer than this; mirrors call_recorder.MAX_RECORDING_SECONDS.
+MAX_DURATION_SECONDS = 600
+# Seconds of control-channel silence before TR closes a call (TR's default).
+CALL_TIMEOUT_SECONDS = 3
+
+# Of an RTL-SDR's sample rate, the share that is usable passband (anti-alias
+# roll-off eats the edges). Channels must sit inside +-(rate * share / 2).
+USABLE_BANDWIDTH_SHARE = 0.8
+# The RTL-SDR's DC spike sits on the centre frequency; keep channels off it.
+DC_SPIKE_GUARD_HZ = 25_000
+CENTER_NUDGES_HZ = (0, 150_000, -150_000, 300_000, -300_000)
+
+
+def _fits(center: int, freqs: List[int], half_band: float) -> bool:
+    return all(abs(f - center) <= half_band for f in freqs)
+
+
+def widest_cover(freqs: List[int], rate: int) -> List[int]:
+    """The largest run of frequencies one SDR at `rate` can hold at once
+    (ties: the lowest). A trunked system lists every control channel it might
+    use, but TR needs only one live at a time, so a list wider than the SDR is
+    cut down to what fits instead of refusing the whole system."""
+    half = rate * USABLE_BANDWIDTH_SHARE / 2
+    fs = sorted(set(freqs))
+    best: List[int] = []
+    for i, lo in enumerate(fs):
+        run = [f for f in fs[i:] if f - lo <= 2 * half]
+        if len(run) > len(best):
+            best = run
+    return best
+
+
+def choose_center(freqs: List[int], rate: int, override: Optional[int] = None) -> int:
+    """A centre frequency that puts every channel in the passband and none on
+    the DC spike. ValueError if they cannot all fit on one SDR."""
+    if not freqs:
+        raise ValueError("No frequencies to tune to.")
+    half = rate * USABLE_BANDWIDTH_SHARE / 2
+    if override:
+        if not _fits(override, freqs, half):
+            raise ValueError(f"TR_CENTER_HZ {override} leaves a channel outside the SDR's {2 * half / 1e6:.1f} MHz.")
+        return int(override)
+    lo, hi = min(freqs), max(freqs)
+    if hi - lo > 2 * half:
+        raise ValueError(
+            f"Channels span {(hi - lo) / 1e6:.3f} MHz, more than one SDR at {rate / 1e6:.1f} Msps covers "
+            f"({2 * half / 1e6:.2f} MHz). Trim the channel list or raise TR_SAMPLE_RATE."
+        )
+    mid = int(round((lo + hi) / 2))
+    for nudge in CENTER_NUDGES_HZ:
+        c = mid + nudge
+        if _fits(c, freqs, half) and all(abs(f - c) >= DC_SPIKE_GUARD_HZ for f in freqs):
+            return c
+    return mid  # channels packed around the middle: accept the spike over not fitting
+
+
+def _csv(header: List[str], rows: List[List[Any]]) -> str:
+    buf = io.StringIO()
+    w = csv.writer(buf, lineterminator="\n")
+    w.writerow(header)
+    w.writerows(rows)
+    return buf.getvalue()
+
+
+def talkgroups_csv(talkgroups: List[Dict[str, Any]]) -> str:
+    """TR talkgroupsFile: header row required, "Decimal" first (CONFIGURE.md)."""
+    rows = []
+    for tg in talkgroups:
+        if tg.get("id") is None:
+            continue
+        name = str(tg.get("name") or "").strip()
+        rows.append([int(tg["id"]), "D", name, name, "", ""])
+    return _csv(["Decimal", "Mode", "Alpha Tag", "Description", "Tag", "Category"], rows)
+
+
+def channels_csv(channels: List[Dict[str, Any]], squelch: Optional[float] = None) -> str:
+    """TR channelFile: header required, "TG Number" first; Frequency in Hz
+    (no decimal point = Hz). Per-channel Squelch overrides the system's."""
+    header = ["TG Number", "Frequency", "Alpha Tag", "Description"]
+    if squelch is not None:
+        header.append("Squelch")
+    rows = []
+    for ch in channels:
+        name = ch.get("name") or f"{ch['frequency'] / 1e6:.4f} MHz"
+        row = [channel_tgid(ch["frequency"]), ch["frequency"], name, name]
+        if squelch is not None:
+            row.append(squelch)
+        rows.append(row)
+    return _csv(header, rows)
+
+
+def _analog_channels(config: Dict[str, Any]) -> List[Dict[str, Any]]:
+    """Every analog channel the config lists (OP25 only ever used the first)."""
+    out = []
+    for raw in (config or {}).get("channels") or []:
+        if isinstance(raw, dict) and raw.get("freq") not in (None, ""):
+            out.append({"frequency": to_hz(raw["freq"]), "name": str(raw.get("name") or "").strip()})
+    if not out:
+        freq = analog_frequency(config)
+        if freq:
+            out.append({"frequency": freq, "name": ""})
+    return out
+
+
+def _analog_squelch(config: Dict[str, Any], default_db: float) -> float:
+    """TR's squelch is an absolute power level — OP25's "power" mode. Its
+    squelch_threshold carries over; noise/voice squelch_db has no TR
+    equivalent, so those fall back to the default (which needs site tuning)."""
+    value = (config or {}).get("squelch_threshold")
+    if value is None or (isinstance(value, str) and not value.strip()):
+        return float(default_db)
+    try:
+        return float(value)
+    except (TypeError, ValueError):
+        raise ValueError(f"squelch_threshold {value!r} isn't a number.")
+
+
+def build_tr_config(
+    system_type: str,
+    name: str,
+    config: Dict[str, Any],
+    *,
+    device_serial: Optional[str],
+    ppm: Optional[float],
+    sample_rate: int,
+    gain: float,
+    digital_recorders: int,
+    min_duration: float,
+    squelch_db: float,
+    live_port: int,
+    center_override: Optional[int] = None,
+) -> Tuple[Dict[str, Any], Dict[str, str]]:
+    """SystemConfig fields -> (config.json dict, {filename: contents} to write beside it).
+
+    ValueError when the system can't be expressed (DMR, no channels, too wide).
+    """
+    config = config or {}
+    mode = system_mode(system_type, config)
+    files: Dict[str, str] = {}
+    # Kept per system, not globally: audioArchive/callLog false makes TR delete
+    # the wav/json after uploadScript returns, which is why drb-upload.sh
+    # copies them out before it exits.
+    system: Dict[str, Any] = {
+        "shortName": SHORT_NAME,
+        "uploadScript": TR_UPLOAD_SCRIPT,
+        "audioArchive": False,
+        "callLog": False,
+        # WAV, not TR's 32k AAC: the recorder's own rule is one lossless copy
+        # for Whisper (call_recorder AUDIO_* notes). 8 kHz mono is ~1 MB/min.
+        "compressWav": False,
+        "minDuration": float(min_duration),
+        "maxDuration": MAX_DURATION_SECONDS,
+        "hideEncrypted": False,
+    }
+    source: Dict[str, Any] = {
+        "driver": "osmosdr",
+        # By serial, like OP25 (sdr_settings.pin_op25_device): "rtl=0" means
+        # whichever dongle enumerated first, which a decoder can take.
+        "device": f"rtl={device_serial}" if device_serial else "rtl=0",
+        "rate": int(sample_rate),
+        "gain": float(gain),
+        "ppm": float(ppm or 0.0),
+    }
+
+    if mode == DMR:
+        raise ValueError("DMR isn't supported by the edge node.")
+
+    if mode == TRUNKED:
+        ccs = [to_hz(c) for c in config.get("control_channels") or []]
+        if not ccs:
+            raise ValueError(f"System {name!r} has no control channels.")
+        talkgroups = [tg for tg in config.get("talkgroups") or [] if tg.get("id") is not None]
+        system.update({
+            "type": "p25",
+            "control_channels": ccs,
+            # TR's default; "fsk4" is accepted too. Overridable from C2.
+            "modulation": str(config.get("modulation") or "qpsk"),
+        })
+        # Same rule as OP25's whitelist: a talkgroup list means record only
+        # those; no list means record everything.
+        if talkgroups:
+            files[TALKGROUPS_FILE] = talkgroups_csv(talkgroups)
+            system["talkgroupsFile"] = f"{TR_APP_DIR}/{TALKGROUPS_FILE}"
+            system["recordUnknown"] = False
+        else:
+            system["recordUnknown"] = True
+        # Voice channels are wherever the system grants them; only the control
+        # channels are known here, so the SDR is centred on those. A system
+        # whose voice channels sit outside that ~2 MHz loses those calls (TR
+        # logs "no source covering" for each) — needs a second source.
+        if center_override:
+            half = int(sample_rate) * USABLE_BANDWIDTH_SHARE / 2
+            covered = [c for c in ccs if abs(c - center_override) <= half]
+            if not covered:
+                raise ValueError(f"TR_CENTER_HZ {center_override} covers none of {name!r}'s control channels.")
+        else:
+            covered = widest_cover(ccs, int(sample_rate))
+        if len(covered) < len(ccs):
+            system["control_channels"] = covered
+            logger.warning(
+                f"Control channels span {(max(ccs) - min(ccs)) / 1e6:.3f} MHz, wider than one SDR; "
+                f"using the {len(covered)} of {len(ccs)} that fit "
+                f"({min(covered) / 1e6:.5f}-{max(covered) / 1e6:.5f} MHz)."
+            )
+        freqs = covered
+        source["digitalRecorders"] = int(digital_recorders)
+    elif mode == CONVENTIONAL:
+        chans = conventional_channels(config)
+        if not chans:
+            raise ValueError(f"System {name!r} has no conventional channels.")
+        # No NAC filter: TR's conventionalP25 records whatever it decodes, so a
+        # mistyped NAC can no longer silently drop every call (node-26#33).
+        system.update({"type": "conventionalP25", "channelFile": f"{TR_APP_DIR}/{CHANNELS_FILE}",
+                       "squelch": float(squelch_db)})
+        files[CHANNELS_FILE] = channels_csv(chans)
+        freqs = [c["frequency"] for c in chans]
+    else:  # ANALOG
+        chans = _analog_channels(config)
+        if not chans:
+            raise ValueError(f"System {name!r} has no analog frequency.")
+        squelch = _analog_squelch(config, squelch_db)
+        system.update({"type": "conventional", "channelFile": f"{TR_APP_DIR}/{CHANNELS_FILE}",
+                       "squelch": squelch})
+        files[CHANNELS_FILE] = channels_csv(chans)
+        freqs = [c["frequency"] for c in chans]
+
+    source["center"] = choose_center(freqs, int(sample_rate), center_override)
+
+    tr = {
+        "ver": 2,
+        "sources": [source],
+        "systems": [system],
+        "tempDir": TR_TEMP_DIR,
+        "captureDir": TR_CAPTURE_DIR,
+        "callTimeout": CALL_TIMEOUT_SECONDS,
+        # File log too (stdout still goes to docker logs): trunk_recorder.py
+        # reads the control-channel decode rate from it for the health check.
+        "logFile": True,
+        "logDir": f"{TR_APP_DIR}/logs",
+        "logColor": "none",  # TR 5.x: a string ("console"|"none"), not a bool
+        # Live audio for Discord: simplestream sends every call's PCM to the
+        # edge-node, which follows one talkgroup at a time into PulseAudio.
+        "audioStreaming": True,
+        "plugins": [{
+            "name": "simplestream",
+            "library": "libsimplestream.so",
+            "streams": [{"TGID": 0, "address": "127.0.0.1", "port": int(live_port), "sendTGID": True}],
+        }],
+    }
+    return tr, files
+
+
+def live_sample_rate(system_type: str, config: Dict[str, Any]) -> int:
+    """simplestream sends analog audio at 16 kHz and digital at 8 kHz (Plugins.md)."""
+    return 16000 if system_mode(system_type, config or {}) == ANALOG else 8000

drb-edge-node/app/internal/trunk_recorder.py

@@ -0,0 +1,575 @@
+"""
+Trunk Recorder backend, edge-node side (node-26#45). Active only when
+RECORDER_BACKEND=trunk-recorder.
+
+    C2 SystemConfig --apply_config--> <tr_config_dir>/config.json (+ CSVs)
+                                      trunk-recorder/run.sh restarts TR on change
+    TR finishes a call --drb-upload.sh--> <tr_inbox_dir>/<stem>.wav, then <stem>.json
+    ingest loop --> MQTT call_start --> /upload (call_recorder.upload_recording,
+                    i.e. the node-26#44 spool) --> MQTT call_end
+    TR simplestream (UDP) --LiveAudioBridge--> pacat --> drb_sink --> Discord
+
+Why an inbox directory and not an HTTP endpoint: TR deletes the WAV/JSON as
+soon as uploadScript returns (audioArchive/callLog false), so the script must
+copy the files out synchronously anyway, and a file on the host disk survives
+an edge-node restart where a POST to a down edge-node would not. The JSON is
+moved in LAST, so its presence means the WAV is complete.
+
+Restart safety: a call_id is a pure function of the JSON (tr_calls.parse_call),
+and the WAV is renamed to `<YYYYmmdd_HHMMSS>_<call_id>.wav` (the name the spool
+recovers a call_id from) before anything is sent. A crash at any step re-runs
+the same call with the same id, so C2 overwrites instead of duplicating; a JSON
+whose WAV is already gone was handed to the uploader and is just removed.
+"""
+import asyncio
+import json
+import math
+import os
+import re
+import time
+import wave
+from datetime import datetime
+from pathlib import Path
+from typing import Any, Dict, List, Optional, Set
+
+from app.config import settings
+from app.internal.logger import logger
+from app.internal.tr_calls import TrCall, parse_call
+from app.models import SystemConfig
+
+CONFIG_FILE = "config.json"
+STATUS_FILE = "drb-status.json"       # written by trunk-recorder/run.sh every few seconds
+RESTART_REQUEST = "restart-request"   # run.sh restarts TR when this appears
+STOP_REQUEST = "stop-request"         # run.sh keeps TR stopped while this exists
+
+INBOX_POLL_SECONDS = 1.0
+INGEST_CONCURRENCY = 4
+# Hand-off is wav-then-json; a JSON whose WAV never shows is dropped after this.
+ORPHAN_JSON_SECONDS = 60.0
+# C2 creates the call doc from MQTT call_start, and only that message carries
+# the talkgroup and start time. With the broker down, call_start is dropped
+# (mqtt_manager buffers only call_end), so a call waits in the inbox this long
+# for MQTT to come back before it is sent without one.
+MQTT_WAIT_SECONDS = 600.0
+# call_start must be written before /upload stamps audio_gcs_uri: C2's
+# _on_call_start writes the doc with merge=False and would erase it
+# (server-26#303; drop this lead once C2 makes call_start create-only).
+CALL_START_LEAD_SECONDS = 1.0
+# A WAV with no JSON this old is a hand-off drb-upload.sh never finished.
+STRAY_WAV_SECONDS = 3600.0
+# How long radio_backend waits for run.sh to (re)start TR after a request: it
+# polls every 5 s and may spend 15 s stopping the old process.
+RESTART_WAIT_SECONDS = 30.0
+RESTART_POLL_SECONDS = 1.0
+# The name process() renames a claimed WAV to; never swept (its JSON is what
+# drives it, and os.replace keeps TR's old mtime).
+CANONICAL_WAV_RE = re.compile(r"^\d{8}_\d{6}_[0-9a-f-]{36}\.wav$")
+# run.sh rewrites its status every 5 s; past this the supervisor is gone.
+STATUS_STALE_SECONDS = 20.0
+LOG_TAIL_BYTES = 64 * 1024
+# TR logs this for every trunked system every few seconds (main.cpp
+# check_message_count). Exact wording unverified against a live log.
+DECODE_RATE_RE = re.compile(r"Decode Rate:\s*([0-9.]+)\s*/\s*sec", re.IGNORECASE)
+
+
+def enabled() -> bool:
+    return settings.recorder_backend == "trunk-recorder"
+
+
+def config_dir() -> Path:
+    return Path(settings.tr_config_dir or (Path(settings.config_path) / "trunk-recorder"))
+
+
+def inbox_dir() -> Path:
+    return Path(settings.tr_inbox_dir or (Path(settings.recordings_path) / "tr-inbox"))
+
+
+def _atomic_write(path: Path, text: str) -> None:
+    tmp = path.with_name(path.name + ".tmp")
+    tmp.write_text(text)
+    os.replace(tmp, path)
+
+
+def wav_seconds(path: Path) -> Optional[float]:
+    """Length of a WAV from its header; None if it can't be read."""
+    try:
+        with wave.open(str(path), "rb") as w:
+            rate = w.getframerate()
+            return w.getnframes() / rate if rate else None
+    except (OSError, EOFError, wave.Error):
+        return None
+
+
+def canonical_wav_name(call: TrCall) -> str:
+    stamp = datetime.fromtimestamp(call.start_epoch).strftime("%Y%m%d_%H%M%S")
+    return f"{stamp}_{call.call_id}.wav"
+
+
+class TrunkRecorder:
+    def __init__(self):
+        self.config_error: Optional[str] = None
+        self.calls_ingested = 0
+        self.encrypted_skipped = 0
+        self.last_call_epoch: Optional[float] = None
+        self.last_call: Optional[Dict[str, Any]] = None
+        self._task: Optional[asyncio.Task] = None
+        self._inflight: Set[str] = set()
+        self._sem = asyncio.Semaphore(INGEST_CONCURRENCY)
+        self.live = LiveAudioBridge()
+
+    # ------------------------------------------------------------------
+    # Config + supervisor requests
+    # ------------------------------------------------------------------
+
+    async def apply_config(self, config: SystemConfig) -> bool:
+        """Write TR's config for `config`. run.sh restarts TR when config.json
+        changes; a restart request covers a CSV-only change."""
+        from app.internal.config_manager import load_node_config
+        from app.internal.sdr_settings import op25_serial
+        from app.internal.secondary_sdr_client import secondary_sdr_client
+        from app.internal.tr_config import build_tr_config, live_sample_rate
+
+        node_cfg = load_node_config()
+        # TR takes the dongle OP25 would have (pin or first detected), so the
+        # secondary decoders' reservation logic is unchanged.
+        devs = await secondary_sdr_client.devices()
+        serial = op25_serial(node_cfg, devs)
+        if serial and devs and sum(d["serial"] == serial for d in devs) > 1:
+            serial = None  # two dongles share it: by-serial would be ambiguous
+        try:
+            tr, files = build_tr_config(
+                config.type, config.name, config.config,
+                device_serial=serial, ppm=node_cfg.ppm_override,
+                sample_rate=settings.tr_sample_rate, gain=settings.tr_gain,
+                digital_recorders=settings.tr_digital_recorders, min_duration=settings.tr_min_duration,
+                squelch_db=settings.tr_squelch_db, live_port=settings.tr_live_port,
+                center_override=settings.tr_center_hz,
+            )
+        except ValueError as e:
+            self.config_error = f"System {config.name!r}: {e}"
+            logger.error(f"Trunk Recorder config not written — {self.config_error}")
+            return False
+        try:
+            d = config_dir()
+            d.mkdir(parents=True, exist_ok=True)
+            (d / "logs").mkdir(exist_ok=True)
+            # CSVs first: run.sh restarts on config.json, which must never
+            # point at a file that isn't there yet.
+            for name, text in files.items():
+                _atomic_write(d / name, text)
+            _atomic_write(d / CONFIG_FILE, json.dumps(tr, indent=2))
+        except OSError as e:
+            self.config_error = f"Couldn't write {config_dir()}: {e}"
+            logger.error(self.config_error)
+            return False
+        self.config_error = None
+        self.live.sample_rate = live_sample_rate(config.type, config.config)
+        logger.info(f"Trunk Recorder config written for {config.name} (SDR {serial or 'rtl=0'}).")
+        return True
+
+    def request_restart(self) -> bool:
+        try:
+            d = config_dir()
+            d.mkdir(parents=True, exist_ok=True)
+            (d / STOP_REQUEST).unlink(missing_ok=True)
+            (d / RESTART_REQUEST).write_text(str(time.time()))
+            return True
+        except OSError as e:
+            logger.error(f"Couldn't ask Trunk Recorder to restart: {e}")
+            return False
+
+    async def wait_started_since(self, since: float, timeout: Optional[float] = None) -> Optional[str]:
+        """Wait until run.sh reports TR running with started_at >= `since`.
+
+        Callers hand the spare dongles to the secondary decoders right after a
+        start; returning before TR has actually reopened its SDR would let a
+        decoder take it. None when started, else why not.
+        """
+        timeout = RESTART_WAIT_SECONDS if timeout is None else timeout
+        deadline = time.time() + timeout
+        while True:
+            st = self.supervisor_status()
+            if st and not st["stale"] and st.get("state") == "running" \
+                    and float(st.get("started_at") or 0) >= math.floor(since):
+                return None
+            if time.time() >= deadline:
+                break
+            await asyncio.sleep(RESTART_POLL_SECONDS)
+        if st is None:
+            return "The trunk-recorder service isn't running (is COMPOSE_PROFILES=trunk-recorder set?)."
+        return f"Trunk Recorder didn't restart within {timeout:.0f}s (state: {st.get('state')})."
+
+    def request_stop(self) -> bool:
+        try:
+            d = config_dir()
+            d.mkdir(parents=True, exist_ok=True)
+            (d / STOP_REQUEST).write_text(str(time.time()))
+            return True
+        except OSError as e:
+            logger.error(f"Couldn't ask Trunk Recorder to stop: {e}")
+            return False
+
+    # ------------------------------------------------------------------
+    # Health
+    # ------------------------------------------------------------------
+
+    def supervisor_status(self, now: Optional[float] = None) -> Optional[Dict[str, Any]]:
+        now = time.time() if now is None else now
+        try:
+            data = json.loads((config_dir() / STATUS_FILE).read_text())
+        except (OSError, ValueError):
+            return None
+        data["age_seconds"] = round(now - float(data.get("epoch") or 0), 1)
+        data["stale"] = data["age_seconds"] > STATUS_STALE_SECONDS
+        return data
+
+    def log_facts(self, now: Optional[float] = None) -> Dict[str, Any]:
+        now = time.time() if now is None else now
+        logs = config_dir() / "logs"
+        try:
+            files = [p for p in logs.iterdir() if p.is_file()]
+        except OSError:
+            files = []
+        if not files:
+            return {"log_age_seconds": None, "decode_rate": None}
+        newest = max(files, key=lambda p: p.stat().st_mtime)
+        age = now - newest.stat().st_mtime
+        rate = None
+        try:
+            with open(newest, "rb") as f:
+                f.seek(max(0, newest.stat().st_size - LOG_TAIL_BYTES))
+                tail = f.read().decode(errors="replace")
+            found = DECODE_RATE_RE.findall(tail)
+            rate = float(found[-1]) if found else None
+        except OSError:
+            pass
+        return {"log_age_seconds": round(age, 1), "decode_rate": rate}
+
+    def log_tail(self, lines: int = 80) -> List[str]:
+        """Last lines of TR's newest log file, for the dashboard's log panel."""
+        try:
+            files = [p for p in (config_dir() / "logs").iterdir() if p.is_file()]
+            if not files:
+                return []
+            newest = max(files, key=lambda p: p.stat().st_mtime)
+            with open(newest, "rb") as f:
+                f.seek(max(0, newest.stat().st_size - LOG_TAIL_BYTES))
+                text = f.read().decode(errors="replace")
+        except OSError:
+            return []
+        return text.splitlines()[-max(1, min(int(lines), 500)):]
+
+    def sweep_stray_wavs(self, now: Optional[float] = None) -> int:
+        """Delete WAVs whose JSON never arrived (drb-upload.sh died between
+        its two moves). Canonical names (already claimed by a JSON)
+        are never touched, so only true strays go."""
+        now = time.time() if now is None else now
+        removed = 0
+        try:
+            jsons = {p.stem for p in inbox_dir().glob("*.json")}
+            for wav in inbox_dir().glob("*.wav"):
+                if wav.stem in jsons or CANONICAL_WAV_RE.match(wav.name) \
+                        or now - wav.stat().st_mtime < STRAY_WAV_SECONDS:
+                    continue
+                logger.error(f"Trunk Recorder WAV {wav.name} has had no call JSON for an hour — deleting it.")
+                wav.unlink(missing_ok=True)
+                removed += 1
+        except OSError:
+            pass
+        return removed
+
+    def inbox_backlog(self) -> int:
+        try:
+            return sum(1 for _ in inbox_dir().glob("*.json"))
+        except OSError:
+            return 0
+
+    def health_facts(self) -> Dict[str, Any]:
+        return {
+            "status": self.supervisor_status(),
+            **self.log_facts(),
+            "config_error": self.config_error,
+            "inbox_backlog": self.inbox_backlog(),
+            "calls_ingested": self.calls_ingested,
+            "encrypted_skipped": self.encrypted_skipped,
+            "last_call_epoch": self.last_call_epoch,
+            "last_call": self.last_call,
+            "live": self.live.stats(),
+        }
+
+    # ------------------------------------------------------------------
+    # Ingest
+    # ------------------------------------------------------------------
+
+    async def start(self) -> None:
+        inbox_dir().mkdir(parents=True, exist_ok=True)
+        if self._task is None or self._task.done():
+            self._task = asyncio.create_task(self._run())
+        await self.live.start()
+
+    async def stop(self) -> None:
+        if self._task:
+            self._task.cancel()
+            try:
+                await self._task
+            except asyncio.CancelledError:
+                pass
+            self._task = None
+        await self.live.stop()
+
+    async def _run(self) -> None:
+        backlog = self.inbox_backlog()
+        if backlog:
+            logger.info(f"Trunk Recorder inbox has {backlog} call(s) from before this start — sending.")
+        last_sweep = 0.0
+        while True:
+            try:
+                await self.scan_once()
+                if time.time() - last_sweep > 300:
+                    last_sweep = time.time()
+                    self.sweep_stray_wavs()
+            except asyncio.CancelledError:
+                raise
+            except Exception as e:
+                logger.error(f"Trunk Recorder inbox pass failed: {e}")
+            await asyncio.sleep(INBOX_POLL_SECONDS)
+
+    async def scan_once(self, wait: bool = False) -> int:
+        """Start a task per ready call. Returns how many were started; with
+        `wait`, also waits for them (tests)."""
+        from app.internal.mqtt_manager import mqtt_manager
+        try:
+            ready = sorted(inbox_dir().glob("*.json"), key=lambda p: p.stat().st_mtime)
+        except OSError:
+            return 0
+        started: List[asyncio.Task] = []
+        now = time.time()
+        for path in ready:
+            if path.name in self._inflight:
+                continue
+            try:
+                age = now - path.stat().st_mtime
+            except OSError:
+                continue
+            if not mqtt_manager.is_connected and age < MQTT_WAIT_SECONDS:
+                continue
+            self._inflight.add(path.name)
+            started.append(asyncio.create_task(self._guarded(path)))
+        if wait and started:
+            await asyncio.gather(*started)
+        return len(started)
+
+    async def _guarded(self, path: Path) -> None:
+        try:
+            async with self._sem:
+                await self.process(path)
+        except Exception as e:
+            logger.error(f"Trunk Recorder call {path.name} failed: {e}")
+        finally:
+            self._inflight.discard(path.name)
+
+    async def process(self, json_path: Path) -> None:
+        from app.internal.call_recorder import call_recorder
+        from app.internal.config_manager import load_node_config
+        from app.internal.mqtt_manager import mqtt_manager
+
+        try:
+            data = json.loads(json_path.read_text())
+            call = parse_call(data, settings.node_id, json_path.stem)
+        except (OSError, ValueError) as e:
+            logger.error(f"Trunk Recorder call {json_path.name} is unreadable ({e}) — dropping it.")
+            json_path.with_suffix(".wav").unlink(missing_ok=True)
+            json_path.unlink(missing_ok=True)
+            return
+
+        raw_wav = json_path.with_suffix(".wav")
+        wav = json_path.parent / canonical_wav_name(call)
+        if raw_wav.exists():
+            os.replace(raw_wav, wav)
+        if not wav.exists():
+            age = time.time() - json_path.stat().st_mtime
+            if age > ORPHAN_JSON_SECONDS:
+                # Either TR's hand-off broke, or a previous pass already handed
+                # this WAV to the uploader (which deletes or spools it) and
+                # died before removing the JSON. Either way nothing to send.
+                # Still close it in C2: if a previous pass uploaded and died
+                # before this point, the doc would otherwise stay "active".
+                # _on_call_end merges, so a repeat is harmless.
+                logger.warning(f"Trunk Recorder call {call.call_id}: no audio beside {json_path.name} — removing it.")
+                await mqtt_manager.publish_metadata("call_end", {**call.end_payload(), "audio_skipped": "no_audio"})
+                json_path.unlink(missing_ok=True)
+            return
+
+        await mqtt_manager.publish_metadata("call_start", call.start_payload())
+        seconds = wav_seconds(wav)
+        end = call.end_payload(seconds)
+
+        if call.encrypted:
+            # Encrypted P25 voice decodes to noise: nothing for Whisper. The
+            # call is still reported so C2 sees the activity.
+            wav.unlink(missing_ok=True)
+            end["audio_skipped"] = "encrypted"
+            self.encrypted_skipped += 1
+        elif settings.c2_url:
+            await asyncio.sleep(CALL_START_LEAD_SECONDS)
+            node_cfg = load_node_config()
+            url = await call_recorder.upload_recording(
+                wav, call.call_id,
+                talkgroup_id=call.tgid, talkgroup_name=call.tgid_name or None,
+                system_id=node_cfg.assigned_system_id,
+                audio_start_epoch=call.start_epoch, audio_end_epoch=call.audio_end_epoch(seconds),
+                extra=call.upload_extra(),
+            )
+            if url:
+                end["audio_url"] = url
+            else:
+                kind = (call_recorder.spool.last_result or {}).get("kind")
+                end["audio_upload"] = {"retry": "spooled", "lost": "lost"}.get(kind, "rejected")
+        else:
+            wav.unlink(missing_ok=True)
+
+        await mqtt_manager.publish_metadata("call_end", end)
+        json_path.unlink(missing_ok=True)
+        self.calls_ingested += 1
+        self.last_call_epoch = time.time()
+        self.last_call = {"call_id": call.call_id, "tgid": call.tgid, "tgid_name": call.tgid_name,
+                          "units": call.units, "duration": round(call.stop_epoch - call.start_epoch, 1),
+                          "encrypted": call.encrypted, "emergency": call.emergency}
+        logger.info(
+            f"TR call {call.call_id}: TG {call.tgid} {call.tgid_name!r}, "
+            f"{call.stop_epoch - call.start_epoch:.1f}s, units {call.units or '-'}"
+            + (" [EMERGENCY]" if call.emergency else "") + (" [encrypted]" if call.encrypted else "")
+        )
+
+
+class LiveAudioBridge:
+    """TR simplestream (UDP, s16le mono, 4-byte little-endian TGID prefix) ->
+    `pacat` into drb_sink, so Discord keeps reading drb_sink.monitor unchanged.
+
+    TR records every talkgroup at once and streams them all to one port;
+    interleaving two calls' packets would garble both. So this follows ONE
+    talkgroup — the first heard — until it has been quiet for HOLD_SECONDS,
+    like the one-voice-channel scanner OP25 was. Recording is unaffected:
+    every call is still recorded and uploaded in full.
+    """
+
+    HOLD_SECONDS = 2.0
+    RESPAWN_SECONDS = 5.0
+    MAX_BUFFERED_BYTES = 64 * 1024  # ~4 s at 8 kHz; beyond this pacat is stuck, drop
+
+    def __init__(self):
+        self.sample_rate = 8000
+        self.current_tgid: Optional[int] = None
+        self.last_packet_epoch: Optional[float] = None
+        self._last_current_epoch = 0.0
+        self.packets = 0
+        self.dropped = 0
+        self._transport = None
+        self._proc: Optional[asyncio.subprocess.Process] = None
+        self._proc_rate: Optional[int] = None
+        self._spawn_after = 0.0
+        self._spawning = False
+
+    def stats(self) -> Dict[str, Any]:
+        return {"current_tgid": self.current_tgid, "last_packet_epoch": self.last_packet_epoch,
+                "packets": self.packets, "dropped": self.dropped,
+                "pacat_running": self._proc is not None and self._proc.returncode is None}
+
+    async def start(self) -> None:
+        loop = asyncio.get_running_loop()
+        bridge = self
+
+        class _Proto(asyncio.DatagramProtocol):
+            def datagram_received(self, data, addr):
+                bridge.feed(data)
+
+        try:
+            self._transport, _ = await loop.create_datagram_endpoint(
+                _Proto, local_addr=("127.0.0.1", settings.tr_live_port),
+            )
+            logger.info(f"Trunk Recorder live audio: listening on 127.0.0.1:{settings.tr_live_port}.")
+        except OSError as e:
+            logger.error(f"Trunk Recorder live audio disabled — can't bind UDP {settings.tr_live_port}: {e}")
+
+    async def stop(self) -> None:
+        if self._transport:
+            self._transport.close()
+            self._transport = None
+        if self._proc and self._proc.returncode is None:
+            self._proc.terminate()
+        self._proc = None
+
+    def select(self, tgid: int, now: float) -> bool:
+        """Follow-one-talkgroup policy. True if this packet should be played."""
+        if self.current_tgid is None or now - self._last_current_epoch > self.HOLD_SECONDS:
+            self.current_tgid = tgid
+        if tgid != self.current_tgid:
+            return False
+        self._last_current_epoch = now
+        return True
+
+    def feed(self, data: bytes, now: Optional[float] = None) -> Optional[bytes]:
+        """One datagram. Returns the PCM that was (or would be) played."""
+        if len(data) <= 4:
+            return None
+        now = time.time() if now is None else now
+        tgid = int.from_bytes(data[:4], "little")
+        self.packets += 1
+        self.last_packet_epoch = now
+        if not self.select(tgid, now):
+            return None
+        pcm = data[4:]
+        self._write(pcm)
+        return pcm
+
+    def _write(self, pcm: bytes) -> None:
+        proc = self._proc
+        if proc is None or proc.returncode is not None:
+            self._ensure_pacat()
+            return
+        if self._proc_rate != self.sample_rate:
+            # A config change, not a failure: no respawn throttle.
+            self._spawn_after = 0.0
+            self._ensure_pacat()
+            return
+        stdin = proc.stdin
+        if stdin is None or stdin.is_closing():
+            return
+        try:
+            if stdin.transport.get_write_buffer_size() > self.MAX_BUFFERED_BYTES:
+                self.dropped += 1
+                return
+            stdin.write(pcm)
+        except (BrokenPipeError, ConnectionResetError, RuntimeError):
+            self._proc = None  # pacat died; respawned on the next packet
+
+    def _ensure_pacat(self) -> None:
+        if self._spawning or time.time() < self._spawn_after:
+            return
+        self._spawning = True
+        self._spawn_after = time.time() + self.RESPAWN_SECONDS
+        try:
+            asyncio.get_running_loop().create_task(self._spawn())
+        except RuntimeError:
+            self._spawning = False
+
+    async def _spawn(self) -> None:
+        try:
+            if self._proc and self._proc.returncode is None:
+                self._proc.terminate()
+            sink = settings.pulse_source.removesuffix(".monitor")
+            self._proc = await asyncio.create_subprocess_exec(
+                "pacat", "--playback", "--raw", "--format=s16le", f"--rate={self.sample_rate}",
+                "--channels=1", f"--device={sink}", "--latency-msec=250", "--client-name=drb-trunk-recorder",
+                stdin=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.DEVNULL,
+                stderr=asyncio.subprocess.DEVNULL,
+            )
+            self._proc_rate = self.sample_rate
+        except Exception as e:
+            logger.error(f"Trunk Recorder live audio: pacat failed to start ({e}); retrying.")
+            self._proc = None
+        finally:
+            self._spawning = False
+
+
+trunk_recorder = TrunkRecorder()

drb-edge-node/app/internal/upload_spool.py

@@ -71,10 +71,18 @@ class UploadMeta:
     system_id: Optional[str] = None
     audio_start_epoch: Optional[float] = None
     audio_end_epoch: Optional[float] = None
-    # JSON list of {radio, start, end} — every radio heard on the call
-    # (server-26#304). Sent here as well as on call_end because C2 starts the
-    # pipeline from /upload, before call_end arrives.
-    radios: Optional[str] = None
+    # Further form fields, sent as-is (Trunk Recorder calls carry units,
+    # emergency, encryption — node-26#45). Kept in the sidecar like the rest.
+    extra: Optional[Dict[str, str]] = None
+
+
+# By extension, so a spooled file is re-sent with the type it was first sent
+# with — the PulseAudio recorder writes FLAC, Trunk Recorder WAV.
+AUDIO_MIME_BY_SUFFIX = {".flac": "audio/flac", ".wav": "audio/wav", ".mp3": "audio/mpeg", ".m4a": "audio/mp4"}
+
+
+def mime_for(path: Path, default: str = "application/octet-stream") -> str:
+    return AUDIO_MIME_BY_SUFFIX.get(path.suffix.lower(), default)
 
 
 @dataclass
@@ -112,8 +120,9 @@ def _form(meta: UploadMeta) -> Dict[str, str]:
         form["audio_start_epoch"] = f"{meta.audio_start_epoch:.3f}"
     if meta.audio_end_epoch is not None:
         form["audio_end_epoch"] = f"{meta.audio_end_epoch:.3f}"
-    if meta.radios:
-        form["radios"] = meta.radios
+    for key, value in (meta.extra or {}).items():
+        if value is not None and key not in form:
+            form[key] = str(value)
     return form
 
 

drb-edge-node/app/main.py

@@ -1,5 +1,4 @@
 import asyncio
-import json
 from contextlib import asynccontextmanager
 from datetime import datetime, timezone
 from typing import Optional
@@ -10,7 +9,7 @@ from app.models import SystemConfig, normalize_sdr_pins, normalize_secondary_pri
 from app.internal.logger import logger
 from app.internal.mqtt_manager import mqtt_manager
 from app.internal import credentials
-from app.internal.metadata_watcher import metadata_watcher, rebase_radios
+from app.internal.metadata_watcher import metadata_watcher
 from app.internal.call_recorder import call_recorder
 from app.internal.discord_radio import radio_bot
 from app.internal.config_manager import (
@@ -94,15 +93,6 @@ async def on_call_end(data: dict):
         data["audio_end_at"] = _iso(recording.audio_end_epoch)
         data["audio_start_epoch"] = recording.audio_start_epoch
         data["audio_end_epoch"] = recording.audio_end_epoch
-        # Radio offsets were measured from the call start; C2 maps an offset
-        # to wall clock as audio_start_epoch + t (above), so put them in the
-        # audio file's frame (server-26#304).
-        if data.get("radios") and data.get("started_at_epoch") is not None:
-            data["radios"] = rebase_radios(
-                data["radios"],
-                shift=data["started_at_epoch"] - recording.audio_start_epoch,
-                span=recording.audio_end_epoch - recording.audio_start_epoch,
-            )
         data["audio_lead_trimmed"] = round(recording.lead_trimmed, 3)
         data["audio_tail_trimmed"] = round(recording.tail_trimmed, 3)
         if recording.clamped_seconds:
@@ -118,7 +108,6 @@ async def on_call_end(data: dict):
             system_id=node_cfg.assigned_system_id,
             audio_start_epoch=recording.audio_start_epoch,
             audio_end_epoch=recording.audio_end_epoch,
-            radios=json.dumps(data["radios"]) if data.get("radios") else None,
         )
         if audio_url:
             data["audio_url"] = audio_url
@@ -179,10 +168,12 @@ async def on_command(payload: dict):
         except ValueError as e:
             logger.error(f"Rejected SDR settings from C2: {e}")
     elif action == "op25_restart":
-        from app.internal.op25_client import op25_client
-        await op25_client.stop()
+        # Restarts whichever recorder is active (node-26#45): C2 still calls
+        # it "Restart OP25".
+        from app.internal import radio_backend
+        await radio_backend.stop()
         await asyncio.sleep(2)
-        await op25_client.start()
+        await radio_backend.start()
     elif action == "node_update":
         # node-26#15: the container cannot (and must not) update itself. It
         # drops a sentinel in /configs; the host's drb-update.path unit
@@ -212,7 +203,14 @@ async def _generate_op25_config(config: SystemConfig) -> bool:
 
     Trunked / conventional / analog are told apart in radio_config (node-26#24);
     a system saved before that has no `mode` and is trunked, as it always was.
+
+    With RECORDER_BACKEND=trunk-recorder this writes Trunk Recorder's
+    config.json instead (node-26#45) — the one place every caller (C2 push,
+    dashboard, startup resume) goes through.
     """
+    from app.internal import trunk_recorder as tr
+    if tr.enabled():
+        return await tr.trunk_recorder.apply_config(config)
     from app.internal.op25_client import op25_client
     from app.internal.radio_config import build_generate_payload
     node_cfg = load_node_config()
@@ -275,19 +273,20 @@ async def on_config_push(payload: dict):
             logger.error(f"Ignoring invalid sdr_pins in config push: {e}")
     save_node_config(node_cfg)
 
-    from app.internal.op25_client import op25_client
+    from app.internal import radio_backend
     if not await _generate_op25_config(config):
-        logger.error(f"Failed to generate OP25 config for {config.name}")
+        logger.error(f"Failed to generate {radio_backend.name()} config for {config.name}")
         return
 
     # OP25's (pinned) dongle may be one a decoder holds right now: free the
     # spares, restart OP25 on its own dongle, then hand the rest back out.
+    # (Trunk Recorder takes the same dongle — node-26#45.)
     from app.internal.secondary_sdr_client import secondary_sdr_client
     from app.internal.sdr_settings import apply_secondaries
     await secondary_sdr_client.apply([], {}, [])
-    await op25_client.stop()
+    await radio_backend.stop()
     await asyncio.sleep(2)
-    await op25_client.start()
+    await radio_backend.start()
     logger.info(f"Config push applied: {config.name}")
     await apply_secondaries()
 
@@ -320,8 +319,21 @@ async def lifespan(app: FastAPI):
 
     # Start services (radio_bot starts when C2's retained discord/desired arrives)
     await mqtt_manager.connect()
-    await metadata_watcher.start()
-    await call_recorder.start()  # persistent PulseAudio ring buffer
+    from app.internal import radio_backend
+    from app.internal import trunk_recorder as tr
+    if tr.enabled():
+        # node-26#45: Trunk Recorder records; the OP25 watcher and the
+        # PulseAudio recorder stay off so no call is uploaded twice. Only the
+        # upload spool runs. OP25 is stopped in case it was running before the
+        # backend was switched — it would hold the SDR Trunk Recorder needs.
+        logger.info("Recorder backend: Trunk Recorder (OP25 and the PulseAudio recorder are off).")
+        from app.internal.op25_client import op25_client
+        await op25_client.stop()
+        await call_recorder.start(capture=False)
+        await tr.trunk_recorder.start()
+    else:
+        await metadata_watcher.start()
+        await call_recorder.start()  # persistent PulseAudio ring buffer
 
     # Start system caching in background
     from app.internal.system_cacher import fetch_and_cache_systems
@@ -341,13 +353,14 @@ async def lifespan(app: FastAPI):
     # not-yet-approved node listening to a system chosen on the local
     # dashboard (an override) must come back on it after a reboot too.
     if active_config:
-        from app.internal.op25_client import op25_client
-        logger.info("Node has a system to listen to — waiting for OP25 API then generating config.")
+        logger.info(f"Node has a system to listen to — generating the {radio_backend.name()} config.")
         for attempt in range(10):
             if await _generate_op25_config(active_config):
-                await op25_client.start()
+                # No wait at startup: the trunk-recorder container may still be
+                # coming up, and the app must start serving regardless.
+                await radio_backend.start(wait=False)
                 break
-            logger.warning(f"OP25 not ready yet (attempt {attempt + 1}/10), retrying in 3s…")
+            logger.warning(f"{radio_backend.name()} not ready yet (attempt {attempt + 1}/10), retrying in 3s…")
             await asyncio.sleep(3)
 
     # After op25 has claimed its dongle, so the decoders only get the spares.
@@ -366,6 +379,7 @@ async def lifespan(app: FastAPI):
     heartbeat_task.cancel()
     telemetry_task.cancel()
     await metadata_watcher.stop()
+    await tr.trunk_recorder.stop()
     await call_recorder.stop()
     await radio_bot.stop()
     await mqtt_manager.disconnect()

drb-edge-node/app/routers/api.py

@@ -97,9 +97,18 @@ async def get_status():
         "icecast_port": settings.icecast_port,
         "icecast_mount": settings.icecast_mount,
         "op25": op25_status,
+        # Which recorder is live (node-26#45) and, for Trunk Recorder, its
+        # supervisor state / decode rate / handed-over calls.
+        "recorder_backend": settings.recorder_backend,
+        "trunk_recorder": _tr_facts(),
     }
 
 
+def _tr_facts():
+    from app.internal import trunk_recorder as tr
+    return tr.trunk_recorder.health_facts() if tr.enabled() else None
+
+
 @router.get("/health")
 async def get_health():
     """Plain-language setup/status checklist for the dashboard (see internal/health.py)."""
@@ -110,7 +119,9 @@ async def get_health():
 
 @router.post("/op25/start")
 async def start_op25():
-    err = await op25_client.start_with_reason()
+    # The active recorder (node-26#45) — the dashboard's Start button.
+    from app.internal import radio_backend
+    err = await radio_backend.start_with_reason()
     if err:
         raise HTTPException(502, err)
     return {"ok": True}
@@ -118,14 +129,18 @@ async def start_op25():
 
 @router.post("/op25/stop")
 async def stop_op25():
-    ok = await op25_client.stop()
+    from app.internal import radio_backend
+    ok = await radio_backend.stop()
     if not ok:
-        raise HTTPException(502, "The op25 container did not answer the stop request.")
+        raise HTTPException(502, f"{radio_backend.name()} did not accept the stop request.")
     return {"ok": True}
 
 
 @router.get("/op25/log")
 async def op25_log(lines: int = 80):
+    from app.internal import trunk_recorder as tr
+    if tr.enabled():
+        return {"lines": tr.trunk_recorder.log_tail(lines)}
     out = await op25_client.log(lines)
     if out is None:
         raise HTTPException(502, "The op25 container isn't answering.")
@@ -138,17 +153,22 @@ async def get_config():
 
 
 async def _restart_op25_with(config: SystemConfig) -> None:
-    """Generate OP25's config for `config` and restart OP25 on it."""
+    """Generate the active recorder's config for `config` and restart it on it."""
     from app.main import _generate_op25_config
+    from app.internal import radio_backend
     if not await _generate_op25_config(config):
+        from app.internal import trunk_recorder as tr
+        if tr.enabled():
+            detail = tr.trunk_recorder.config_error or f"Trunk Recorder config for {config.name} failed."
+            raise HTTPException(502, detail)
         raise HTTPException(
             502, f"The op25 container did not accept the config for {config.name} — is it running?",
         )
-    await op25_client.stop()
+    await radio_backend.stop()
     await asyncio.sleep(2)
-    err = await op25_client.start_with_reason()
+    err = await radio_backend.start_with_reason()
     if err:
-        raise HTTPException(502, f"Config saved, but OP25 did not start: {err}")
+        raise HTTPException(502, f"Config saved, but {radio_backend.name()} did not start: {err}")
 
 
 async def _apply_override(config: SystemConfig) -> None:
@@ -350,7 +370,8 @@ async def revert_config():
     else:
         # Nothing from C2 to go back to: stop rather than keep decoding a
         # system the dashboard now says is cleared.
-        await op25_client.stop()
+        from app.internal import radio_backend
+        await radio_backend.stop()
 
     if mqtt_manager.is_connected:
         await mqtt_manager.publish_checkin()

drb-edge-node/app/templates/index.html

@@ -142,6 +142,7 @@
     <audio id="player" controls preload="none">Your browser can't play the stream — use the direct link.</audio>
     <dl class="kv">
       <dt>Listening to</dt><dd id="now-system">—</dd>
+      <dt>Recorder</dt><dd id="now-backend">—</dd>
       <dt>Talkgroup</dt><dd id="now-tg">—</dd>
       <dt>Last heard</dt><dd id="now-heard">—</dd>
       <dt>Stream link</dt><dd><a id="stream-link" class="mono" href="#" target="_blank" rel="noopener">—</a></dd>
@@ -318,7 +319,8 @@
         ? `<span class="mono">TG ${esc(heard.tgid)}</span>${heard.name ? ' ' + esc(heard.name) : ''}` +
           ` · ${ago(heard.epoch)}${heard.freq ? ` · <span class="mono">${esc(mhz(heard.freq))}</span>` : ''}`
         : 'Nothing heard since the node started.';
-      const op = d.checks.find(c => c.id === 'op25');
+      // 'recorder' is the Trunk Recorder backend's check (node-26#45).
+      const op = d.checks.find(c => c.id === 'op25' || c.id === 'recorder');
       const src = d.checks.find(c => c.id === 'source');
       const running = op && op.state === 'ok';
       $('op25-start').disabled = running || (src && src.state !== 'ok');
@@ -340,6 +342,15 @@
       $('node-id').textContent = d.node_id || '';
       document.title = `${d.node_name || 'DRB Edge Node'} — DRB`;
       $('now-system').textContent = d.system_name ? `${d.system_name} (${d.system_kind || d.system_type})` : 'Nothing chosen yet';
+      const isTR = d.recorder_backend === 'trunk-recorder';
+      const trState = isTR && d.trunk_recorder && d.trunk_recorder.status ? d.trunk_recorder.status.state : null;
+      $('now-backend').textContent = isTR
+        ? `Trunk Recorder${trState ? ` (${trState.replace(/_/g, ' ')})` : ' (not running)'} — every talkgroup recorded at once`
+        : 'OP25 — one call at a time';
+      recorderName = isTR ? 'Trunk Recorder' : 'OP25';
+      $('op25-start').textContent = `Start ${recorderName}`;
+      $('op25-stop').textContent = `Stop ${recorderName}`;
+      if ($('op25-log').hidden) $('log-toggle').textContent = `Show ${recorderName} log`;
       $('now-tg').innerHTML = d.active_tgid
         ? `<span class="live">${esc(d.active_tgid_name || 'Talkgroup')}</span> <span class="mono">TG ${esc(d.active_tgid)}</span>`
         : 'No call right now';
@@ -374,7 +385,8 @@
     $('ack-btn').hidden = !(d.local_choice && d.has_c2_system && d.enforce_override_timeout);
   }
 
-  // ── OP25 controls + log ────────────────────────────────────────────────
+  // ── OP25 / Trunk Recorder controls + log ───────────────────────────────
+  let recorderName = 'OP25';
   async function op25(action) {
     $('op25-msg').className = 'msg';
     $('op25-msg').textContent = action === 'start' ? 'Starting…' : 'Stopping…';
@@ -391,19 +403,19 @@
     const pre = $('op25-log');
     try {
       const d = await api('/api/op25/log?lines=120');
-      pre.textContent = d.lines.length ? d.lines.join('\n') : 'OP25 has printed nothing since it last started.';
+      pre.textContent = d.lines.length ? d.lines.join('\n') : `${recorderName} has printed nothing since it last started.`;
     } catch (e) {
       pre.textContent = `Couldn't load the log: ${e.message}`;
     }
     pre.hidden = false;
-    $('log-toggle').textContent = 'Hide OP25 log';
+    $('log-toggle').textContent = `Hide ${recorderName} log`;
     $('log-toggle').setAttribute('aria-expanded', 'true');
   }
   function toggleLog() {
     const pre = $('op25-log');
     if (pre.hidden) return loadLog();
     pre.hidden = true;
-    $('log-toggle').textContent = 'Show OP25 log';
+    $('log-toggle').textContent = `Show ${recorderName} log`;
     $('log-toggle').setAttribute('aria-expanded', 'false');
   }
 

drb-edge-node/tests/test_host_updater.py

@@ -44,11 +44,6 @@ case "$1" in
           *:docker-compose.yml) cat "$STUB_REPO/docker-compose.yml" ;;
         esac ;;
   checkout) echo "${@: -1}" > "$STUB/head" ;;
-  tag)
-    if [ "$2" = --points-at ]; then
-      if [ "$3" = HEAD ]; then cat "$STUB/tags_head" 2>/dev/null; else cat "$STUB/tags_new" 2>/dev/null; fi
-    else cat "$STUB/tags_all" 2>/dev/null; fi
-    exit 0 ;;
   *) exit 0 ;;
 esac
 '''
@@ -126,7 +121,7 @@ def test_no_request_means_checkin_only(env):
     calls = _calls(env)
     assert "update-check" in calls
     assert "docker" not in calls
-    assert "checkout" not in calls
+    assert "fetch" not in calls
 
 
 def test_c2_request_updates_once_and_reports(env):
@@ -253,74 +248,3 @@ def test_target_without_pinning_still_updates(env):
     assert (env["stub"] / "head").read_text().strip() == NEW
     assert _pulled(_calls(env))
     assert "DRB_TAG_" not in (env["inst"] / ".env").read_text()
-
-
-# ---------------------------------------------------------------------------
-# Releases (node-26#49): a newer version on the node's channel is a reason to
-# update by itself, and versions compare per field as integers.
-# ---------------------------------------------------------------------------
-
-def _channel(env, ref, all_tags, target_tags, head_tags):
-    env["conf"].write_text(env["conf"].read_text().replace("REF=v1", f"REF={ref}"))
-    (env["stub"] / "tags_all").write_text("\n".join(all_tags) + "\n")
-    (env["stub"] / "tags_new").write_text("\n".join(target_tags) + "\n")
-    (env["stub"] / "tags_head").write_text("\n".join(head_tags) + "\n")
-
-
-def test_latest_channel_installs_a_newer_release_unasked(env):
-    # 1.1.10 is newer than 1.1.9: compared as integers, not strings or floats.
-    _channel(env, "latest", ["v1", "v1.1.9", "v1.1.10", "v1.1.2"], ["v1.1.10"], ["v1.1.9"])
-    r = _run(env)
-    assert r.returncode == 0, r.stderr + r.stdout
-    assert "release 1.1.10 on latest (installed 1.1.9)" in r.stdout
-    assert (env["stub"] / "head").read_text().strip() == NEW
-    assert "DRB_VERSION=1.1.10" in (env["inst"] / ".env").read_text()
-
-
-def test_never_downgrades(env):
-    _channel(env, "latest", ["v1.1.9", "v1.2.0"], ["v1.1.9"], ["v1.2.0"])
-    r = _run(env)
-    assert r.returncode == 0, r.stderr
-    assert "docker" not in _calls(env)
-
-
-def test_same_release_is_not_reinstalled(env):
-    _channel(env, "v1", ["v1", "v1.1.3"], ["v1", "v1.1.3"], ["v1", "v1.1.3"])
-    assert _run(env).returncode == 0
-    assert "docker" not in _calls(env)
-
-
-def test_promoted_major_tag_installs_on_stable_nodes(env):
-    _channel(env, "v1", ["v1", "v1.1.0", "v1.1.4"], ["v1", "v1.1.4"], ["v1.1.0"])
-    r = _run(env)
-    assert r.returncode == 0, r.stderr + r.stdout
-    assert "release 1.1.4 on v1" in r.stdout
-    assert (env["stub"] / "head").read_text().strip() == NEW
-
-
-def test_untagged_target_still_needs_a_request(env):
-    """v1 before its first promotion points at a commit with no release tag."""
-    _channel(env, "v1", ["v1"], ["v1"], [])
-    assert _run(env).returncode == 0
-    assert "docker" not in _calls(env)
-
-
-def test_next_version_counts_patches_as_integers(tmp_path):
-    script = REPO_ROOT / "scripts" / "next-version.sh"
-    g = ["git", "-c", "user.email=t@t", "-c", "user.name=t", "-C", str(tmp_path)]
-    subprocess.run(["git", "init", "-q", str(tmp_path)], check=True)
-    (tmp_path / "VERSION").write_text("1.1\n")
-    subprocess.run(g + ["commit", "-q", "--allow-empty", "-m", "a"], check=True)
-
-    def nxt():
-        return subprocess.run(["bash", str(script)], cwd=tmp_path, capture_output=True, text=True,
-                              check=True).stdout.strip()
-
-    assert nxt() == "v1.1.0"
-    for t in ("v1.1.0", "v1.1.9", "v1.0.30"):
-        subprocess.run(g + ["tag", t], check=True)
-    assert nxt() == "", "a commit that already has a release gets no second one"
-    subprocess.run(g + ["commit", "-q", "--allow-empty", "-m", "b"], check=True)
-    assert nxt() == "v1.1.10"
-    (tmp_path / "VERSION").write_text("1.2\n")
-    assert nxt() == "v1.2.0"

drb-edge-node/tests/test_metadata_watcher.py

@@ -27,7 +27,6 @@ from app.internal.metadata_watcher import (
     MAX_SEGMENT_SECONDS,
     MetadataWatcher,
     OP25_OFFLINE_GRACE,
-    rebase_radios,
 )
 from app.internal.op25_client import TerminalUpdate, parse_terminal_messages
 
@@ -1148,86 +1147,3 @@ async def test_console_history_is_bounded(hearing, clock, audio):
     clock.advance(CONSOLE_HISTORY_SECONDS + 1)
     await tick(hearing, update())
     assert all(e.epoch >= clock.now - CONSOLE_HISTORY_SECONDS for e in hearing._console)
-
-
-# ---------------------------------------------------------------------------
-# Every radio on the call (server-26#304) — not just the last srcaddr
-# ---------------------------------------------------------------------------
-
-@pytest.mark.asyncio
-async def test_call_end_lists_every_radio_in_order(watcher, clock):
-    """Dispatcher, unit, dispatcher on one talkgroup: three transmissions."""
-    start = clock.now
-    await tick(watcher, update(call_log=[grant(1234, start, rid=555)],
-                               channels=[channel(tgid=1234, srcaddr=555)]))
-    clock.advance(1.0)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=555)]))
-    clock.advance(1.0)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=777)]))
-    clock.advance(0.5)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=777)]))
-    clock.advance(1.0)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=555)]))
-    clock.advance(0.5)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=0, hold_tgid=1234)]))
-    clock.advance(settings.call_idle_timeout + 0.5)
-    await tick(watcher, update(channels=[channel()]))
-
-    payload = watcher.on_call_end.call_args[0][0]
-    assert [r["radio"] for r in payload["radios"]] == [555, 777, 555]
-    assert payload["radios"][0] == {"radio": 555, "start": 0.0, "end": 1.0}
-    assert payload["radios"][1] == {"radio": 777, "start": 2.0, "end": 2.5}
-    # srcaddr keeps its old meaning (the latest talker) for existing readers.
-    assert payload["srcaddr"] == 555
-
-
-@pytest.mark.asyncio
-async def test_missed_polls_inside_one_keyup_stay_one_transmission(watcher, clock):
-    """The radio ID drops out of some polls mid-transmission; that is not a new key-up."""
-    await tick(watcher, update(call_log=[grant(1234, clock.now, rid=555)],
-                               channels=[channel(tgid=1234, srcaddr=555)]))
-    clock.advance(0.5)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=0, hold_tgid=1234)]))
-    clock.advance(1.0)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=555)]))
-    clock.advance(0.5)
-    await tick(watcher, update(channels=[channel(tgid=1234, srcaddr=0, hold_tgid=1234)]))
-    clock.advance(settings.call_idle_timeout + 0.5)
-    await tick(watcher, update(channels=[channel()]))
-
-    radios = watcher.on_call_end.call_args[0][0]["radios"]
-    assert radios == [{"radio": 555, "start": 0.0, "end": 1.5}]
-
-
-@pytest.mark.asyncio
-async def test_radio_list_resets_between_calls(watcher, clock):
-    await tick(watcher, update(call_log=[grant(1234, clock.now, rid=555)]))
-    clock.advance(0.2)
-    await tick(watcher, update(call_log=[grant(4321, clock.now, rid=888)]))
-
-    first = watcher.on_call_end.call_args[0][0]
-    assert [r["radio"] for r in first["radios"]] == [555]
-    assert watcher._tx == [[888, clock.now, clock.now]]
-
-
-@pytest.mark.asyncio
-async def test_audio_mode_records_a_radio_seen_only_in_a_grant(hearing, clock, audio):
-    """A short key-up between channel polls is only visible as a call_log grant."""
-    audio.speak()
-    await tick(hearing, update(call_log=[grant(1234, clock.now, rid=555)],
-                               channels=[channel(tgid=1234, srcaddr=555)]))
-    clock.advance(1.0)
-    audio.speak()
-    await tick(hearing, update(call_log=[grant(1234, clock.now, rid=777)]))
-    clock.advance(settings.call_silence_timeout + 0.5)
-    await tick(hearing, update(channels=[channel()]))
-
-    radios = hearing.on_call_end.call_args[0][0]["radios"]
-    assert [r["radio"] for r in radios] == [555, 777]
-
-
-def test_rebase_radios_moves_offsets_into_the_audio_frame():
-    """The file starts 0.25 s of pre-roll before the call, then 1.0 s of lead was trimmed."""
-    radios = [{"radio": 555, "start": 0.0, "end": 2.0}, {"radio": 777, "start": 3.0, "end": 9.0}]
-    out = rebase_radios(radios, shift=-0.75, span=6.0)
-    assert out == [{"radio": 555, "start": 0.0, "end": 1.25}, {"radio": 777, "start": 2.25, "end": 6.0}]

drb-edge-node/tests/test_trunk_recorder.py

@@ -0,0 +1,508 @@
+"""
+Trunk Recorder backend (node-26#45): config generation from the C2 system
+config, the TR call JSON -> MQTT + /upload mapping, the inbox hand-off, the
+live-audio follow policy and the health checklist.
+
+No radio here: nothing in this file has run against a real Trunk Recorder.
+The sample call JSON below is built from `create_call_json` in
+trunk-recorder/call_concluder/call_concluder.cc at tag v5.2.1 (key names and
+order as written there); the values are invented.
+"""
+import json
+from pathlib import Path
+
+import pytest
+
+from app.config import settings
+from app.internal import health, radio_backend, tr_config, upload_spool
+from app.internal import trunk_recorder as trmod
+from app.internal.conventional import channel_tgid
+from app.internal.tr_calls import parse_call
+from app.internal.upload_spool import UploadMeta
+
+# Shape: call_concluder.cc v5.2.1 create_call_json. Values invented.
+SAMPLE_CALL = {
+    "freq": 851012500,
+    "freq_error": -112,
+    "signal": -48,
+    "noise": -98,
+    "source_num": 0,
+    "recorder_num": 2,
+    "tdma_slot": 0,
+    "phase2_tdma": 0,
+    "start_time": 1793145600,
+    "stop_time": 1793145612,
+    "start_time_ms": 1793145600250,
+    "stop_time_ms": 1793145612730,
+    "emergency": 0,
+    "priority": 1,
+    "mode": 0,
+    "duplex": 0,
+    "encrypted": 0,
+    "call_length": 12,
+    "call_length_ms": 12480,
+    "talkgroup": 101,
+    "talkgroup_tag": "PD Dispatch",
+    "talkgroup_description": "Police Dispatch",
+    "talkgroup_group_tag": "Law Dispatch",
+    "talkgroup_group": "Police",
+    "color_code": -1,
+    "audio_type": "digital",
+    "short_name": "drb",
+    "freqList": [
+        {"freq": 851012500, "time": 1793145600, "pos": 0.0, "len": 5.2, "error_count": 3, "spike_count": 1},
+        {"freq": 851012500, "time": 1793145606, "pos": 5.2, "len": 7.28, "error_count": 2, "spike_count": 0},
+    ],
+    "srcList": [
+        {"src": 1234567, "time": 1793145600, "pos": 0.0, "emergency": 0, "signal_system": "", "tag": "Car 12",
+         "tag_ota": ""},
+        {"src": 7654321, "time": 1793145606, "pos": 5.2, "emergency": 1, "signal_system": "", "tag": "",
+         "tag_ota": ""},
+        {"src": 1234567, "time": 1793145610, "pos": 9.9, "emergency": 0, "signal_system": "", "tag": "Car 12",
+         "tag_ota": ""},
+        {"src": -1, "time": 1793145611, "pos": 11.0, "emergency": 0, "signal_system": "", "tag": "", "tag_ota": ""},
+    ],
+}
+
+TR_KW = dict(device_serial="00000101", ppm=1.5, sample_rate=2_400_000, gain=34.0, digital_recorders=4,
+             min_duration=1.0, squelch_db=-50.0, live_port=9123)
+
+
+# ---------------------------------------------------------------------------
+# Config generation
+# ---------------------------------------------------------------------------
+
+def test_trunked_config_from_c2_system():
+    cfg = {"control_channels": [851.0125, 851.2625], "talkgroups": [{"id": 101, "name": "PD Dispatch, Main"},
+                                                                    {"id": 202, "name": "Fire"}]}
+    tr, files = tr_config.build_tr_config("P25", "County", cfg, **TR_KW)
+    assert tr["ver"] == 2
+    src, sys_ = tr["sources"][0], tr["systems"][0]
+    assert src["driver"] == "osmosdr" and src["device"] == "rtl=00000101"
+    assert src["ppm"] == 1.5 and src["gain"] == 34.0 and src["rate"] == 2_400_000
+    assert src["digitalRecorders"] == 4
+    assert all(abs(f - src["center"]) <= 960_000 for f in (851_012_500, 851_262_500))
+    assert all(abs(f - src["center"]) >= tr_config.DC_SPIKE_GUARD_HZ for f in (851_012_500, 851_262_500))
+    assert sys_["type"] == "p25" and sys_["control_channels"] == [851_012_500, 851_262_500]
+    assert sys_["talkgroupsFile"] == "/app/talkgroups.csv" and sys_["recordUnknown"] is False
+    assert sys_["uploadScript"] == "/drb/drb-upload.sh"
+    assert sys_["audioArchive"] is False and sys_["callLog"] is False and sys_["compressWav"] is False
+    assert tr["tempDir"] == "/dev/shm" and tr["audioStreaming"] is True
+    stream = tr["plugins"][0]["streams"][0]
+    assert tr["plugins"][0]["library"] == "libsimplestream.so"
+    assert stream == {"TGID": 0, "address": "127.0.0.1", "port": 9123, "sendTGID": True}
+    lines = files["talkgroups.csv"].splitlines()
+    assert lines[0].startswith("Decimal,")       # TR: header required, Decimal first
+    assert lines[1] == '101,D,"PD Dispatch, Main","PD Dispatch, Main",,'
+
+
+def test_trunked_without_talkgroups_records_everything():
+    tr, files = tr_config.build_tr_config("P25", "County", {"control_channels": [851.0125]}, **TR_KW)
+    assert tr["systems"][0]["recordUnknown"] is True
+    assert "talkgroupsFile" not in tr["systems"][0] and not files
+
+
+def test_conventional_p25_uses_synthetic_tgids():
+    cfg = {"mode": "conventional", "channels": [{"freq": 460.400, "name": "PD1", "nac": "293"},
+                                                {"freq": 460.425, "name": "PD3"}]}
+    tr, files = tr_config.build_tr_config("P25", "WPPD", cfg, **TR_KW)
+    sys_ = tr["systems"][0]
+    assert sys_["type"] == "conventionalP25" and sys_["channelFile"] == "/app/channels.csv"
+    assert "digitalRecorders" not in tr["sources"][0]
+    rows = files["channels.csv"].splitlines()
+    assert rows[0].startswith("TG Number,Frequency")
+    # Same id the OP25 path reports for the channel, so C2 names both alike.
+    assert rows[1] == f"{channel_tgid(460_400_000)},460400000,PD1,PD1"
+
+
+def test_analog_squelch_threshold_carries_over_else_default():
+    cfg = {"channels": [{"freq": 154.25, "name": "FD"}], "squelch_mode": "power", "squelch_threshold": -62}
+    tr, files = tr_config.build_tr_config("NBFM", "FD", cfg, **TR_KW)
+    assert tr["systems"][0]["type"] == "conventional" and tr["systems"][0]["squelch"] == -62.0
+    tr, _ = tr_config.build_tr_config("NBFM", "FD", {"channels": [{"freq": 154.25}]}, **TR_KW)
+    assert tr["systems"][0]["squelch"] == -50.0
+    # Single channel: centre moved off it (DC spike).
+    assert abs(tr["sources"][0]["center"] - 154_250_000) >= tr_config.DC_SPIKE_GUARD_HZ
+    assert tr_config.live_sample_rate("NBFM", {}) == 16000 and tr_config.live_sample_rate("P25", {}) == 8000
+
+
+def test_legacy_analog_and_unpinned_sdr():
+    kw = {**TR_KW, "device_serial": None}
+    tr, _ = tr_config.build_tr_config("NBFM", "Old", {"control_channels": [155.1]}, **kw)
+    assert tr["sources"][0]["device"] == "rtl=0"
+    assert "155100000" in _["channels.csv"]
+
+
+@pytest.mark.parametrize("stype,cfg", [
+    ("DMR", {"control_channels": [450.0]}),
+    ("P25", {"control_channels": []}),
+    ("P25", {"mode": "conventional", "channels": [{"freq": 851.0}, {"freq": 855.0}]}),  # 4 MHz: every channel must fit
+    ("P25", {"mode": "conventional", "channels": []}),
+])
+def test_unbuildable_systems_raise(stype, cfg):
+    with pytest.raises(ValueError):
+        tr_config.build_tr_config(stype, "x", cfg, **TR_KW)
+
+
+def test_center_override_is_validated():
+    assert tr_config.choose_center([851_000_000], 2_400_000, override=851_500_000) == 851_500_000
+    with pytest.raises(ValueError):
+        tr_config.choose_center([851_000_000], 2_400_000, override=853_000_000)
+
+
+# ---------------------------------------------------------------------------
+# Call JSON -> MQTT + /upload
+# ---------------------------------------------------------------------------
+
+def test_parse_call_maps_tr_json():
+    call = parse_call(SAMPLE_CALL, "node-001", "101-1793145600.250_851012500-call_7")
+    assert call.tgid == 101 and call.tgid_name == "PD Dispatch" and call.freq == 851_012_500
+    assert call.start_epoch == pytest.approx(1793145600.25) and call.stop_epoch == pytest.approx(1793145612.73)
+    assert call.units == [1234567, 7654321]          # unique, in order, undecoded (-1) dropped
+    assert call.emergency is True                     # a unit's emergency flag counts
+    assert call.encrypted is False
+    assert call.decode_errors == 5 and call.spikes == 1 and call.call_length == pytest.approx(12.48)
+    # Deterministic: same JSON -> same id (restart safety), different node -> different id.
+    assert parse_call(SAMPLE_CALL, "node-001", "101-1793145600.250_851012500-call_7").call_id == call.call_id
+    assert parse_call(SAMPLE_CALL, "node-002", "101-1793145600.250_851012500-call_7").call_id != call.call_id
+
+    start = call.start_payload()
+    assert start["tgid"] == 101 and start["tgid_name"] == "PD Dispatch" and start["srcaddr"] == 1234567
+    assert start["attributed"] is True and start["driver"] == "trunk-recorder"
+    assert start["started_at"].startswith("2026-")
+    end = call.end_payload()
+    assert end["ended_at_epoch"] == pytest.approx(1793145612.73)
+    assert end["audio_start_epoch"] == call.start_epoch and end["units"] == [1234567, 7654321]
+    assert end["emergency"] is True and end["encrypted"] is False
+
+
+def test_upload_form_carries_tr_fields():
+    call = parse_call(SAMPLE_CALL, "node-001")
+    meta = UploadMeta(call_id=call.call_id, talkgroup_id=call.tgid, talkgroup_name=call.tgid_name,
+                      system_id="sys1", audio_start_epoch=call.start_epoch, audio_end_epoch=call.stop_epoch,
+                      extra=call.upload_extra())
+    form = upload_spool._form(meta)
+    # Fields C2's /upload declares today:
+    assert form["call_id"] == call.call_id and form["talkgroup_id"] == "101"
+    assert form["talkgroup_name"] == "PD Dispatch" and form["system_id"] == "sys1"
+    # Extra fields (ignored by C2 until it declares them):
+    assert form["units"] == "1234567,7654321" and form["emergency"] == "1" and form["encrypted"] == "0"
+    assert form["freq"] == "851012500" and form["recorder_backend"] == "trunk-recorder"
+    assert json.loads(form["src_list"])[1] == {"src": 7654321, "time": 1793145606, "pos": 5.2, "emergency": True}
+    # Extra can never overwrite a core field.
+    meta.extra = {"call_id": "evil"}
+    assert upload_spool._form(meta)["call_id"] == call.call_id
+
+
+def test_parse_call_old_tr_without_ms_and_bad_json():
+    old = {k: v for k, v in SAMPLE_CALL.items() if not k.endswith("_ms")}
+    call = parse_call(old, "n")
+    assert call.start_epoch == 1793145600.0 and call.stop_epoch == 1793145612.0
+    with pytest.raises(ValueError):
+        parse_call({**SAMPLE_CALL, "talkgroup": 0}, "n")
+    with pytest.raises(ValueError):
+        parse_call({k: v for k, v in old.items() if k != "start_time"}, "n")
+
+
+def test_mime_follows_suffix():
+    assert upload_spool.mime_for(Path("a.wav")) == "audio/wav"
+    assert upload_spool.mime_for(Path("a.flac")) == "audio/flac"
+
+
+# ---------------------------------------------------------------------------
+# Inbox hand-off
+# ---------------------------------------------------------------------------
+
+class FakeMQTT:
+    is_connected = True
+
+    def __init__(self):
+        self.events = []
+
+    async def publish_metadata(self, event, data):
+        self.events.append((event, dict(data)))
+
+
+class FakeRecorder:
+    def __init__(self, url="gs://b/calls/x.wav"):
+        self.url = url
+        self.uploads = []
+
+        class _Spool:
+            last_result = {"kind": "retry"}
+        self.spool = _Spool()
+
+    async def upload_recording(self, path, call_id, **kw):
+        assert path.exists()
+        self.uploads.append((path.name, call_id, kw))
+        path.unlink()
+        return self.url
+
+
+@pytest.fixture
+def tr_env(tmp_path, monkeypatch):
+    monkeypatch.setattr(settings, "recorder_backend", "trunk-recorder")
+    monkeypatch.setattr(settings, "tr_inbox_dir", str(tmp_path / "inbox"))
+    monkeypatch.setattr(settings, "tr_config_dir", str(tmp_path / "tr"))
+    monkeypatch.setattr(settings, "c2_url", "https://c2.example")
+    monkeypatch.setattr(trmod, "CALL_START_LEAD_SECONDS", 0)
+    mqtt, rec = FakeMQTT(), FakeRecorder()
+    import app.internal.call_recorder as cr
+    import app.internal.mqtt_manager as mm
+    monkeypatch.setattr(mm, "mqtt_manager", mqtt)
+    monkeypatch.setattr(cr, "call_recorder", rec)
+    (tmp_path / "inbox").mkdir()
+    return tmp_path / "inbox", mqtt, rec
+
+
+def _wav(path: Path, seconds: float = 2.0, rate: int = 8000) -> None:
+    import wave
+    with wave.open(str(path), "wb") as w:
+        w.setnchannels(1)
+        w.setsampwidth(2)
+        w.setframerate(rate)
+        w.writeframes(b"\x00\x00" * int(seconds * rate))
+
+
+def _drop(inbox: Path, data=SAMPLE_CALL, stem="101-1793145600.250_851012500-call_7", wav=True, seconds=11.68):
+    if wav:
+        _wav(inbox / f"{stem}.wav", seconds)
+    (inbox / f"{stem}.json").write_text(json.dumps(data))
+
+
+async def test_inbox_call_is_published_and_uploaded_once(tr_env):
+    inbox, mqtt, rec = tr_env
+    _drop(inbox)
+    t = trmod.TrunkRecorder()
+    assert await t.scan_once(wait=True) == 1
+    assert [e for e, _ in mqtt.events] == ["call_start", "call_end"]
+    start, end = mqtt.events[0][1], mqtt.events[1][1]
+    assert len(rec.uploads) == 1
+    name, call_id, kw = rec.uploads[0]
+    assert call_id == start["call_id"] == end["call_id"]
+    # Renamed to the spool's recoverable <date>_<time>_<call_id> form.
+    assert name.endswith(f"_{call_id}.wav") and name.count("_") == 2
+    assert kw["talkgroup_id"] == 101 and kw["extra"]["units"] == "1234567,7654321"
+    assert end["audio_url"] == "gs://b/calls/x.wav"
+    # TR drops the gaps between transmissions: the audio ends at start + WAV
+    # length (11.68 s), not at stop_time (12.48 s after start).
+    assert end["audio_end_epoch"] == pytest.approx(1793145600.25 + 11.68)
+    assert kw["audio_end_epoch"] == pytest.approx(1793145600.25 + 11.68)
+    assert end["ended_at_epoch"] == pytest.approx(1793145612.73)
+    assert json.loads(kw["extra"]["freq_list"])[1]["pos"] == 5.2
+    assert list(inbox.iterdir()) == []
+    assert await t.scan_once(wait=True) == 0
+
+
+async def test_encrypted_call_is_reported_not_uploaded(tr_env):
+    inbox, mqtt, rec = tr_env
+    _drop(inbox, {**SAMPLE_CALL, "encrypted": 1})
+    t = trmod.TrunkRecorder()
+    await t.scan_once(wait=True)
+    assert rec.uploads == []
+    assert mqtt.events[-1][1]["audio_skipped"] == "encrypted" and t.encrypted_skipped == 1
+    assert list(inbox.iterdir()) == []
+
+
+async def test_spooled_upload_is_reported(tr_env):
+    inbox, mqtt, rec = tr_env
+    rec.url = None
+    _drop(inbox)
+    await trmod.TrunkRecorder().scan_once(wait=True)
+    assert mqtt.events[-1][1]["audio_upload"] == "spooled"
+
+
+async def test_json_waits_for_wav_then_orphan_is_dropped(tr_env, monkeypatch):
+    inbox, mqtt, rec = tr_env
+    _drop(inbox, wav=False)
+    t = trmod.TrunkRecorder()
+    await t.scan_once(wait=True)
+    assert mqtt.events == [] and len(list(inbox.glob("*.json"))) == 1
+    monkeypatch.setattr(trmod, "ORPHAN_JSON_SECONDS", -1)
+    await t.scan_once(wait=True)
+    # Closed in C2 anyway: a previous pass may have uploaded it and died.
+    assert [e for e, _ in mqtt.events] == ["call_end"] and mqtt.events[0][1]["audio_skipped"] == "no_audio"
+    assert list(inbox.glob("*.json")) == []
+
+
+def test_stray_wavs_are_swept_but_claimed_ones_kept(tr_env):
+    inbox, _, _ = tr_env
+    (inbox / "stray-call_1.wav").write_bytes(b"x")
+    (inbox / "waiting-call_2.wav").write_bytes(b"x")
+    (inbox / "waiting-call_2.json").write_text("{}")
+    claimed = "20261027_120000_" + "0" * 8 + "-0000-0000-0000-" + "0" * 12 + ".wav"
+    (inbox / claimed).write_bytes(b"x")
+    t = trmod.TrunkRecorder()
+    assert t.sweep_stray_wavs() == 0                       # all younger than an hour
+    assert t.sweep_stray_wavs(now=4_000_000_000) == 1
+    assert sorted(p.name for p in inbox.iterdir()) == sorted([claimed, "waiting-call_2.json", "waiting-call_2.wav"])
+
+
+async def test_waits_for_mqtt_so_call_start_isnt_lost(tr_env):
+    inbox, mqtt, rec = tr_env
+    mqtt.is_connected = False
+    _drop(inbox)
+    assert await trmod.TrunkRecorder().scan_once(wait=True) == 0
+    assert rec.uploads == []
+
+
+async def test_unreadable_json_is_dropped(tr_env):
+    inbox, mqtt, rec = tr_env
+    (inbox / "bad.wav").write_bytes(b"x")
+    (inbox / "bad.json").write_text("{not json")
+    await trmod.TrunkRecorder().scan_once(wait=True)
+    assert list(inbox.iterdir()) == [] and mqtt.events == []
+
+
+# ---------------------------------------------------------------------------
+# Config files on disk, supervisor requests, backend dispatch
+# ---------------------------------------------------------------------------
+
+async def test_apply_config_writes_files_and_restart(tr_env, monkeypatch, tmp_path):
+    from app.models import SystemConfig
+    import app.internal.secondary_sdr_client as ssc
+
+    async def devices():
+        return [{"serial": "00000101", "index": 0}]
+    monkeypatch.setattr(ssc.secondary_sdr_client, "devices", devices)
+    t = trmod.TrunkRecorder()
+    ok = await t.apply_config(SystemConfig(system_id="s1", name="County", type="P25",
+                                           config={"control_channels": [851.0125], "talkgroups": [{"id": 1}]}))
+    assert ok and t.config_error is None
+    d = tmp_path / "tr"
+    cfg = json.loads((d / "config.json").read_text())
+    assert cfg["sources"][0]["device"] == "rtl=00000101" and (d / "talkgroups.csv").exists()
+
+    bad = await t.apply_config(SystemConfig(system_id="s2", name="Wide", type="P25",
+                                            config={"mode": "conventional",
+                                                    "channels": [{"freq": 851.0}, {"freq": 856.0}]}))
+    assert not bad and "MHz" in t.config_error
+    # radio_backend reports the config error instead of pretending to start.
+    monkeypatch.setattr(trmod, "trunk_recorder", t)
+    assert "MHz" in await radio_backend.start_with_reason()
+    t.config_error = None
+    monkeypatch.setattr(trmod, "RESTART_POLL_SECONDS", 0.01)
+    # start() waits for run.sh to report a restart, so decoders aren't handed
+    # the dongle before TR has it.
+    monkeypatch.setattr(trmod, "RESTART_WAIT_SECONDS", 0.05)
+    assert "isn't running" in await radio_backend.start_with_reason()
+    assert (d / "restart-request").exists()
+    import time as _t
+    (d / "drb-status.json").write_text(json.dumps({"state": "running", "epoch": _t.time(),
+                                                   "started_at": _t.time() - 600}))
+    assert "didn't restart" in await radio_backend.start_with_reason()   # still the old process
+    (d / "drb-status.json").write_text(json.dumps({"state": "running", "epoch": _t.time() + 5,
+                                                   "started_at": _t.time() + 5}))
+    assert await radio_backend.start_with_reason() is None
+    assert await radio_backend.start_with_reason(wait=False) is None
+    assert await radio_backend.stop() and (d / "stop-request").exists()
+    assert await radio_backend.start() and not (d / "stop-request").exists()
+
+
+async def test_op25_backend_still_drives_op25(monkeypatch):
+    monkeypatch.setattr(settings, "recorder_backend", "op25")
+    calls = []
+
+    async def start_with_reason():
+        calls.append("start")
+        return None
+    monkeypatch.setattr(radio_backend.op25_client, "start_with_reason", start_with_reason)
+    assert await radio_backend.start() and calls == ["start"]
+
+
+def test_supervisor_status_and_decode_rate(tr_env, tmp_path):
+    d = tmp_path / "tr"
+    (d / "logs").mkdir(parents=True)
+    t = trmod.TrunkRecorder()
+    assert t.supervisor_status() is None
+    (d / "drb-status.json").write_text(json.dumps({"state": "running", "epoch": 1000, "started_at": 900}))
+    st = t.supervisor_status(now=1005)
+    assert st["state"] == "running" and not st["stale"]
+    assert t.supervisor_status(now=1100)["stale"]
+    (d / "logs" / "10-27-2026_1200_00.log").write_text(
+        "[2026-10-27 12:00:03.1] (info)   [drb]\tControl Channel Message Decode Rate: 38/sec, count:  114\n"
+        "[2026-10-27 12:00:06.1] (error)  [drb]\tControl Channel Message Decode Rate: 0/sec, count:  0\n")
+    assert t.log_facts()["decode_rate"] == 0.0
+    assert t.log_tail(1)[0].endswith("count:  0")
+
+
+# ---------------------------------------------------------------------------
+# Live audio: follow one talkgroup
+# ---------------------------------------------------------------------------
+
+def test_live_bridge_follows_one_talkgroup():
+    b = trmod.LiveAudioBridge()
+    b._write = lambda pcm: None
+    pkt = lambda tg: tg.to_bytes(4, "little") + b"\x01\x00" * 80   # noqa: E731
+    assert b.feed(pkt(101), now=0.0) is not None
+    assert b.feed(pkt(202), now=0.5) is None                      # simultaneous call: not mixed in
+    assert b.feed(pkt(101), now=1.0) is not None
+    assert b.feed(pkt(202), now=1.0 + b.HOLD_SECONDS + 0.1) is not None   # 101 went quiet: switch
+    assert b.current_tgid == 202 and b.packets == 4
+    assert b.feed(b"\x00\x00", now=9.0) is None
+
+
+# ---------------------------------------------------------------------------
+# Health checklist
+# ---------------------------------------------------------------------------
+
+def _facts(tr, mode="trunked", **over):
+    now = 1_000_000.0
+    f = {
+        "now": now, "node_id": "n", "default_password": False, "c2_url": "https://c2", "has_api_key": True,
+        "mqtt_connected": True, "mqtt_broker": "m", "mqtt_port": 8883, "sdr_count": 1,
+        "source": {"name": "County", "type": "P25", "system_id": "s1", "local": False, "mode": mode},
+        "op25_status": "stopped", "console": {}, "audio_capturing": False, "last_voice_epoch": None,
+        "icecast_live": False, "icecast_port": 8000, "backend": "trunk-recorder", "tr": tr,
+    }
+    f.update(over)
+    return {c["id"]: c for c in health.build_checks(f)}
+
+
+def _tr(**over):
+    now = 1_000_000.0
+    t = {"status": {"state": "running", "started_at": now - 600, "restarts": 0, "stale": False, "age_seconds": 2},
+         "log_age_seconds": 3, "decode_rate": 38.0, "config_error": None, "inbox_backlog": 0,
+         "calls_ingested": 5, "encrypted_skipped": 0, "last_call_epoch": now - 30, "last_call": None,
+         "live": {"last_packet_epoch": now - 30}}
+    t.update(over)
+    return t
+
+
+def test_health_tr_running_and_decoding():
+    c = _facts(_tr())
+    assert "op25" not in c and c["recorder"]["state"] == "ok"
+    assert c["decode"]["state"] == "ok" and "38" in c["decode"]["summary"]
+    assert c["audio"]["state"] == "ok" and c["stream"]["state"] == "ok"
+
+
+@pytest.mark.parametrize("tr,cid,state", [
+    (None, "recorder", "error"),
+    ({"status": None}, "recorder", "error"),                               # profile not enabled
+    ({"status": {"state": "crashed", "last_exit": 1, "stale": False}}, "recorder", "error"),
+    ({"status": {"state": "running", "stale": True, "age_seconds": 60}}, "recorder", "error"),
+    ({"config_error": "too wide"}, "recorder", "error"),
+    ({"decode_rate": 0.0}, "decode", "error"),
+    ({"decode_rate": None}, "decode", "warn"),
+    ({"inbox_backlog": 50}, "audio", "warn"),
+])
+def test_health_tr_failures(tr, cid, state):
+    facts = None if tr is None else _tr(**tr)
+    assert _facts(facts)[cid]["state"] == state
+
+
+def test_health_tr_conventional_has_no_decode_rate():
+    assert _facts(_tr(decode_rate=None), mode="conventional")["decode"]["state"] == "ok"
+
+
+def test_wide_control_channel_list_is_cut_to_what_one_sdr_covers():
+    # MTA Zone 2 (node-002): five control channels spanning 4.15 MHz.
+    ccs = [770_156_250, 770_431_250, 773_293_750, 773_843_750, 774_306_250]
+    assert tr_config.widest_cover(ccs, 2_400_000) == ccs[2:]
+
+
+def test_center_override_keeps_only_the_control_channels_it_covers():
+    tr, _ = tr_config.build_tr_config(
+        "P25", "MTA", {"control_channels": [770.15625, 770.43125, 773.29375]},
+        **{**TR_KW, "center_override": 770_900_000})
+    assert tr["systems"][0]["control_channels"] == [770_156_250, 770_431_250]

drb-edge-node/tests/test_upload_spool.py

@@ -228,10 +228,3 @@ async def test_wake_makes_everything_due_now(tmp_path):
     sp.add(_recording(tmp_path), UploadMeta(call_id="c1"), UploadResult(RETRY, status=401))
     sp.wake()
     assert await sp.drain_once() == 1
-
-
-def test_form_carries_the_radio_list_and_omits_it_when_empty():
-    """C2 starts correlation from /upload, so the radio list rides on it (server-26#304)."""
-    radios = json.dumps([{"radio": 555, "start": 0.0, "end": 1.0}])
-    assert upload_spool._form(UploadMeta(call_id="c1", radios=radios))["radios"] == radios
-    assert "radios" not in upload_spool._form(UploadMeta(call_id="c1"))

scripts/drb-update.sh

@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 #
 # DRB node host updater (node-26#15). Runs as root from systemd:
-#   drb-update.timer  -> every ~15 min: HTTPS check-in with C2; update if asked,
-#                        or if the configured channel has a newer release
-#                        (node-26#49: REF=latest follows the highest vX.Y.Z
-#                        tag, REF=v1 follows the promoted major tag)
+#   drb-update.timer  -> every ~15 min: HTTPS check-in with C2; update if asked
 #   drb-update.path   -> fires when the edge-node container drops
 #                        <install>/configs/update-requested (MQTT node_update)
 # Both start drb-update.service, which runs this script. install-updater.sh
@@ -29,42 +26,6 @@
 # very file mid-run cannot change what is executing.
 set -euo pipefail
 
-# ── Release versions (node-26#49) ─────────────────────────────────────────
-# Versions are MAJOR.MINOR.PATCH and every comparison is per field, as
-# integers: 1.10.0 > 1.9.3. Never string or float order ("1.10" < "1.9" as a
-# float, "1.10.0" < "1.9.3" as a string).
-semver_sort() { sort -t. -k1,1n -k2,2n -k3,3n; }
-
-semver_gt() {  # semver_gt A B -> true when A is newer than B
-  local a b i
-  IFS=. read -r -a a <<< "$1"; IFS=. read -r -a b <<< "$2"
-  for i in 0 1 2; do
-    (( 10#${a[i]:-0} > 10#${b[i]:-0} )) && return 0
-    (( 10#${a[i]:-0} < 10#${b[i]:-0} )) && return 1
-  done
-  return 1
-}
-
-version_at() {  # highest X.Y.Z release tagged on a commit, or nothing
-  git tag --points-at "$1" 2>/dev/null | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \
-    | sed 's/^v//' | semver_sort | tail -1 || true
-}
-
-resolve_target() {  # REF -> a ref name git can resolve, or fail
-  local ref="$1" top
-  if [ "$ref" = latest ]; then
-    top="$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sed 's/^v//' | semver_sort | tail -1 || true)"
-    [ -n "$top" ] || return 1
-    echo "refs/tags/v$top"
-  elif git show-ref --verify -q "refs/remotes/origin/$ref"; then
-    echo "refs/remotes/origin/$ref"
-  elif git show-ref --verify -q "refs/tags/$ref"; then
-    echo "refs/tags/$ref"
-  else
-    return 1
-  fi
-}
-
 main() {
   local CONF="${DRB_UPDATER_CONF:-/etc/drb/updater.conf}"
   local STATE_DIR="${DRB_UPDATER_STATE:-/var/lib/drb-update}"
@@ -157,22 +118,6 @@ main() {
     new_request="$requested"
     reason="${reason:-C2 request $requested}"
   fi
-  # A newer release on this node's channel is a reason on its own (node-26#49).
-  # Only ever forward, and only between tagged releases: an untagged target
-  # (a branch REF, or v1 before its first promotion) still needs a request.
-  if [ -z "$reason" ]; then
-    local origin_url target tv iv
-    origin_url="$(git remote get-url origin 2>/dev/null || true)"
-    if [ "$origin_url" = "$REPO_URL" ] \
-       && git -c protocol.allow=never -c protocol.https.allow=always fetch -q --force --tags --prune origin \
-       && target="$(resolve_target "$REF")"; then
-      tv="$(version_at "$(git rev-parse "$target^{commit}")")"
-      iv="$(version_at HEAD)"
-      if [ -n "$tv" ] && { [ -z "$iv" ] || semver_gt "$tv" "$iv"; }; then
-        reason="release $tv on $REF (installed ${iv:-untagged})"
-      fi
-    fi
-  fi
   [ -n "$reason" ] || { log "no update requested"; return 0; }
 
   # ── Update ─────────────────────────────────────────────────────────────
@@ -200,7 +145,13 @@ do_update() {
   git -c protocol.allow=never -c protocol.https.allow=always fetch --force --tags --prune origin || return 1
 
   local target
-  target="$(resolve_target "$REF")" || { err "ref '$REF' not found on origin"; return 1; }
+  if git show-ref --verify -q "refs/remotes/origin/$REF"; then
+    target="refs/remotes/origin/$REF"
+  elif git show-ref --verify -q "refs/tags/$REF"; then
+    target="refs/tags/$REF"
+  else
+    err "ref '$REF' not found on origin"; return 1
+  fi
   local old new
   old="$(git rev-parse HEAD)"; new="$(git rev-parse "$target^{commit}")"
 
@@ -255,11 +206,6 @@ do_update() {
     drb_pin_image_tags "$INSTALL_DIR/.env" "$INSTALL_DIR" "$new" || { err "could not write image pins to .env"; return 1; }
   fi
 
-  # The release this node now runs, for its checkin (node-26#49).
-  local ver; ver="$(version_at "$new")"
-  sed -i '/^DRB_VERSION=/d' "$INSTALL_DIR/.env"
-  printf 'DRB_VERSION=%s\n' "${ver:-untagged}" >> "$INSTALL_DIR/.env"
-
   if [ "$BUILD" = 1 ]; then
     docker compose build || return 1   # tags the local builds with the same pins
   fi

scripts/next-version.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# node-26#49 — the release tag this commit should get, or nothing if it has one.
-#
-# VERSION holds MAJOR.MINOR and is edited by hand. PATCH is automatic: one
-# more than the highest existing vMAJOR.MINOR.PATCH tag, compared as an
-# integer (so .10 follows .9), starting at 0 for a new MAJOR.MINOR.
-#
-# Usage: scripts/next-version.sh   (from the repo root, tags fetched)
-set -euo pipefail
-
-base="$(tr -d ' \r\n' < VERSION)"
-[[ "$base" =~ ^[0-9]+\.[0-9]+$ ]] || { echo "VERSION must be MAJOR.MINOR, got '$base'" >&2; exit 1; }
-pattern="^v${base//./\\.}\\.[0-9]+$"
-
-if git tag --points-at HEAD | grep -qE "$pattern"; then
-  exit 0   # this commit is already released
-fi
-
-last="$(git tag -l "v${base}.*" | grep -E "$pattern" | sed "s/^v${base}\.//" | sort -n | tail -1 || true)"
-echo "v${base}.$(( ${last:--1} + 1 ))"

trunk-recorder/README.md

@@ -0,0 +1,34 @@
+# Trunk Recorder on a DRB node (node-26#45)
+
+Opt-in alternative to the OP25 recorder. On a node, set both in `.env`, then
+`docker compose up -d`:
+
+    RECORDER_BACKEND=trunk-recorder
+    COMPOSE_PROFILES=trunk-recorder
+
+Set both back (`RECORDER_BACKEND=op25`, remove `COMPOSE_PROFILES`) to return
+to OP25.
+
+- `run.sh`: supervisor that replaces the image's CMD. It restarts TR when the
+  edge-node rewrites `configs/trunk-recorder/config.json`, and writes
+  `drb-status.json` for the dashboard health check.
+- `drb-upload.sh`: TR's `uploadScript`. It copies each finished call (WAV +
+  JSON) into `recordings/tr-inbox`, where the edge-node uploads it through the
+  normal spool.
+
+## License (GPL-3.0)
+
+Trunk Recorder is GPL-3.0. DRB runs the unmodified upstream image
+`robotastic/trunk-recorder:5.2.1` (digest pinned in `docker-compose.yml`) as a
+separate program. It talks to DRB only through files, a script argument list
+and a local UDP socket. That makes it mere aggregation, the same position we
+already hold for OP25.
+
+Anyone we distribute a node image or device to must still be able to get the
+corresponding source. Upstream source for this exact version is at
+<https://github.com/TrunkRecorder/trunk-recorder/tree/v5.2.1>. If we ever ship
+the TR image ourselves (mirrored to our registry, preinstalled on a sold
+device), we must also offer that source directly, in writing, for three years,
+or ship it alongside. Pointing to upstream alone is not enough at that point.
+Any patch to TR itself makes DRB's copy a modified version, which must then be
+published under GPL-3.0.

trunk-recorder/drb-upload.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+# Trunk Recorder uploadScript (node-26#45). TR runs this after every call as
+#     drb-upload.sh <call.wav> <call.json> <call.m4a>
+# (run_upload_script_argv, call_concluder.cc v5.2.1; the m4a only exists with
+# compressWav, which DRB leaves off). TR deletes the wav/json as soon as this
+# exits (audioArchive/callLog false), so it copies them into the edge-node's
+# inbox first. Order matters: the WAV lands first and the JSON last, so the
+# JSON's presence tells the edge-node the WAV is complete. Exit non-zero = TR
+# marks the call failed.
+set -u
+WAV="${1:?wav path}"
+JSON="${2:?json path}"
+INBOX="${DRB_TR_INBOX:-/recordings/tr-inbox}"
+TMP="$INBOX/.incoming"
+
+[ -f "$WAV" ] && [ -f "$JSON" ] || { echo "drb-upload: missing $WAV or $JSON" >&2; exit 1; }
+mkdir -p "$TMP" || exit 1
+
+stem="$(basename "$JSON" .json)"
+# Hard link when on the same filesystem (no copy, TR's unlink leaves ours);
+# copy otherwise.
+put() { ln -f "$1" "$2" 2>/dev/null || cp -f "$1" "$2"; }
+
+put "$WAV" "$TMP/$stem.wav" || exit 1
+put "$JSON" "$TMP/$stem.json" || exit 1
+mv -f "$TMP/$stem.wav" "$INBOX/$stem.wav" || exit 1
+mv -f "$TMP/$stem.json" "$INBOX/$stem.json" || exit 1
+exit 0

trunk-recorder/run.sh

@@ -0,0 +1,87 @@
+#!/bin/sh
+# Supervisor for Trunk Recorder inside its container (node-26#45).
+#
+# The edge-node writes /app/config.json from the C2 system config but has no
+# Docker access, so it cannot restart this container. This loop does it:
+#   - waits for config.json, then runs trunk-recorder on it
+#   - restarts it when config.json changes or /app/restart-request appears
+#   - keeps it stopped while /app/stop-request exists (dashboard Stop)
+#   - restarts it after a crash, backing off 5 s -> 60 s (`restarts` counts
+#     crashes only, not config restarts)
+#   - writes /app/drb-status.json every few seconds for the edge-node's health
+#     check (state, pid, started_at, restarts, last_exit, epoch)
+set -u
+APP="${DRB_TR_APP:-/app}"
+CFG="$APP/config.json"
+STATUS="$APP/drb-status.json"
+RESTART="$APP/restart-request"
+STOP="$APP/stop-request"
+REC="${DRB_RECORDINGS:-/recordings}"
+mkdir -p "$APP/logs" "$REC/tr-capture" "$REC/tr-inbox"
+
+pid=""
+started=0
+restarts=0
+last_exit=null
+backoff=5
+cfgsum=""
+
+write_status() {
+  printf '{"state":"%s","pid":%s,"started_at":%s,"restarts":%s,"last_exit":%s,"epoch":%s}\n' \
+    "$1" "${pid:-null}" "$started" "$restarts" "$last_exit" "$(date +%s)" > "$STATUS.tmp" \
+    && mv -f "$STATUS.tmp" "$STATUS"
+}
+
+sum() { md5sum "$CFG" 2>/dev/null | cut -d' ' -f1; }
+
+stop_tr() {
+  if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
+    kill -TERM "$pid"
+    i=0
+    while kill -0 "$pid" 2>/dev/null && [ "$i" -lt 30 ]; do sleep 0.5; i=$((i + 1)); done
+    kill -KILL "$pid" 2>/dev/null
+    wait "$pid" 2>/dev/null
+  fi
+  pid=""
+}
+
+trap 'stop_tr; write_status stopped; exit 0' TERM INT
+
+nap() { sleep "$1" & wait $!; }
+
+while :; do
+  if [ -f "$STOP" ]; then
+    [ -n "$pid" ] && { echo "drb: stop requested"; stop_tr; }
+    write_status stopped; nap 2; continue
+  fi
+  if [ ! -f "$CFG" ]; then
+    write_status waiting_for_config; nap 5; continue
+  fi
+  if [ -z "$pid" ]; then
+    rm -f "$RESTART"
+    cfgsum="$(sum)"
+    echo "drb: starting trunk-recorder"
+    trunk-recorder --config="$CFG" &
+    pid=$!
+    started="$(date +%s)"
+  fi
+  write_status running
+  nap 5
+  if ! kill -0 "$pid" 2>/dev/null; then
+    wait "$pid" 2>/dev/null
+    last_exit=$?
+    pid=""
+    restarts=$((restarts + 1))
+    # A run that lasted a while resets the backoff.
+    [ $(( $(date +%s) - started )) -gt 120 ] && backoff=5
+    echo "drb: trunk-recorder exited ($last_exit); restarting in ${backoff}s"
+    write_status crashed
+    nap "$backoff"
+    backoff=$((backoff * 2)); [ "$backoff" -gt 60 ] && backoff=60
+    continue
+  fi
+  if [ -f "$RESTART" ] || [ "$(sum)" != "$cfgsum" ]; then
+    echo "drb: config changed or restart requested — restarting trunk-recorder"
+    stop_tr
+  fi
+done