chore: release v0.20.9

Multi-amp: Settings->Amplifier becomes a list (amps.json, legacy single-amp keys auto-migrate to entry #1); one client per enabled amp with per-id bindings (GetAmplifiers/SaveAmplifiers/GetAmpStatuses/AmpOperate/AmpPower/AmpPowerLevel/AmpFanMode); legacy a.pgxl/a.spe/a.acom point at the first enabled amp of each family. Amp cards in FlexPanel and Station Control gain a dropdown to pick the amp; the status bar shows one clickable chip per amp. Use case: two SPEs run in parallel.

Flex v4 DSP (8000/Aurora): NRL/ANFL (lms_nr/lms_anf), NRS (speex_nr), NRF (nrf) with level sliders, RNN (rnnoise) and ANFT on/off — keys per the FlexLib slice docs; the section only shows when the radio reports these keys (dsp_v4 flag), so 6000-series panels are unchanged.

.gitignore

@@ -46,3 +46,4 @@ cat.log
 .env.local
 *.pem
 *.key
+*.syso

README.fr.md

@@ -0,0 +1,334 @@
+# OpsLog
+
+<a href="https://discord.gg/FYM8yw5pT" target="_blank">
+  <img src="https://img.shields.io/badge/Discord-Rejoindre%20le%20serveur-5865F2?logo=discord&logoColor=white" alt="Rejoindre notre Discord" />
+</a>
+
+Un logiciel de log radioamateur moderne et rapide pour Windows — saisie façon
+Log4OM, CAT en temps réel pour **OmniRig**, **FlexRadio/SmartSDR** natif,
+**Icom CI-V** natif (USB **et** à distance par internet, en remplacement de
+RS-BA1) et **TCI** (SunSDR / Expert Electronics), cluster DX avec alertes de
+spots, suivi des diplômes, cartes, log de concours, gestion des QSL et un
+concepteur de cartes QSL. Construit avec **Wails v2** (backend Go + frontend
+React/TypeScript), **100 % Go** (sans CGO) : SQLite pour la configuration,
+**MySQL partagé** optionnel pour le journal afin que plusieurs opérateurs
+partagent un même log. Entièrement thémable et bilingue (anglais / français).
+
+Développé par **F4BPO**.
+
+---
+
+## Compilation / développement
+
+- **Dev :** `wails dev` (rechargement à chaud Vite ; méthodes Go accessibles sur http://localhost:34115).
+- **Build :** `wails build` (utiliser la version wails v2.11 du projet — `~/go/bin/wails.exe`).
+- **Régénérer les bindings Go↔TS** après modification des méthodes `App`
+  exportées : `wails generate module`.
+- **Release :** `.vscode/release.ps1` (Ctrl+Maj+P → *Tasks: Run Task* →
+  *Release OpsLog*) — incrémente la version, pousse le source sur Gitea, compile
+  l'exe et le publie sur les releases Gitea + GitHub.
+
+---
+
+## Journalisation
+
+- **Bandeau de saisie façon Log4OM :** indicatif, RST émis/reçu, nom/QTH/locator,
+  bande/mode, fréquence TX/RX (split), heure de début/fin, commentaire/note. Le
+  **drapeau** de l'entité contactée est affiché en grand à côté des champs RST.
+- **Recherche d'indicatif** (QRZ.com / HamQTH) avec photo, pré-remplissage du
+  nom/QTH/locator et onglet QRZ.com.
+- **Résolution DXCC hors ligne** depuis `cty.dat` (pays, zones CQ/ITU,
+  continent), avec gestion des `/MM` `/AM` `/B` (balise) et des changements de
+  district (`/8`, `/W6`), plus les dérogations DXpédition de ClubLog par dates.
+- **QSO récents**, matrice **déjà contactés** (par créneau bande/mode),
+  re-résolution en masse depuis cty/QRZ/ClubLog, envoi en masse vers les services
+  QSL.
+- **Constructeur de filtres QSO avancé** (champ / opérateur / valeur, ET / OU,
+  préréglages enregistrés) avec **export ADIF** des lignes filtrées ou
+  sélectionnées.
+- **Recherche de doublons** (Outils) — regroupe les QSO par même indicatif +
+  bande + mode (optionnellement même jour / minute) et permet de choisir lesquels
+  supprimer.
+- **Conforme ADIF 3.1.7** en import/export : dictionnaire complet des champs,
+  30 colonnes promues, éditeur générique de « champs supplémentaires » et modes
+  d'export standard/complet.
+- **Profils :** chaque réglage est par profil ; chaque profil peut pointer son
+  journal vers le fichier SQLite local ou une base **MySQL partagée**
+  (multi-opérateur).
+
+## Cartes & antenne
+
+- **Vue principale = deux volets configurables** (par profil, Réglages → Général
+  → *Vue principale*) : carte grand-cercle, carte locator (rue), la grille du
+  cluster, la grille des déjà-contactés, les QSO récents, les **commandes
+  FlexRadio**, la **console Icom** ou le panneau **Net control**.
+- **Carte grand-cercle** avec distance & azimut trajet court/long, fonds de carte
+  sélectionnables (Light / Voyager / Street / Satellite, tous sans clé et
+  légendés) et le(s) **lobe(s) du faisceau d'antenne** tracés depuis l'azimut du
+  rotor.
+- **Compas de rotor** (azimutal équidistant, clic pour tourner) piloté par
+  PstRotator.
+- **Support Ultrabeam** (Normal / inversé 180° / bidirectionnel) : la direction
+  rayonnée est en vert et le **boom mécanique** en gris, à la fois sur le compas
+  et sur la carte, pour toujours savoir où pointe l'antenne.
+
+## Cluster DX
+
+- Plusieurs serveurs de cluster avec reconnexion auto, un maître pour les
+  commandes.
+- **Barre latérale de filtres** (recherche d'indicatif, masquer-déjà-contactés,
+  grouper les doublons, bande / mode / statut / source) partagée entre l'onglet
+  Cluster et le volet cluster de la vue principale, avec bascule affichage/masquage.
+- **Statut** par spot (nouveau / nouvelle bande / nouveau créneau / contacté),
+  clic pour accorder la radio, et une **bandmap** multi-bandes (bandes façon
+  panadapter).
+- Les spots **POTA** sont étiquetés avec leur référence de parc (via
+  `api.pota.app`).
+- **Alertes de spots** (façon Log4OM) : règles sur indicatif / pays / bande /
+  mode / spotter, avec notification sonore, visuelle et e-mail (Outils →
+  *Gestion des alertes*).
+
+## Contrôle CAT
+
+Quatre backends natifs (Réglages → CAT), chacun avec reconnexion auto et une
+connexion rapide non bloquante — une radio éteinte ne fige jamais l'application :
+
+- **OmniRig** (Rig 1/2, changement à chaud) — fonctionne avec toute radio
+  supportée par OmniRig.
+- **FlexRadio (SmartSDR)** via l'API TCP de la radio — fréquence / mode / split
+  de la slice en temps réel, découverte UDP, et **spots panadapter** (les spots
+  du cluster poussés sur l'écran Flex, clic → remplir l'indicatif).
+- **Icom CI-V** — natif, via le port **USB** de la radio *ou* par internet via le
+  **serveur LAN intégré** de la radio (voir *Icom à distance* ci-dessous). Ni
+  RS-BA1 ni Remote Utility nécessaires.
+- **TCI** (WebSocket) — SunSDR / ExpertSDR2 et tout serveur compatible TCI :
+  fréquence / mode / PTT / split, plus spots panorama optionnels.
+
+Le mode est lu depuis la radio ; le sous-mode numérique (FT4 vs FT8) est déduit
+de la fréquence. Les **antennes RX/TX Flex par bande** sont configurables et
+appliquées automatiquement au changement de bande.
+
+### Onglet de commande FlexRadio (façon SmartSDR)
+
+Affiché uniquement quand le backend CAT est une FlexRadio :
+
+- **Émission :** puissance RF, puissance d'accord, TUNE, MOX, processeur de
+  parole (NOR/DX/DX+), VOX (+ niveau + délai), moniteur (+ niveau), gain micro.
+- **Réception (slice active) :** mode/seuil AGC, niveau audio, NB / NR / ANF.
+- **Coupleur d'antenne (ATU) :** accord / bypass / mémoires.
+- **Amplificateur :** la carte de commande suit l'ampli configuré —
+  **PowerGenius XL** (operate/standby, mode ventilateur, défaut) ou
+  **SPE Expert** (operate/standby, Marche/Arrêt, niveau Low/Mid/High, barre de
+  puissance de sortie, bande & température).
+- **Mesures en direct** via le flux UDP VITA-49 : S-mètre (unités S), puissance
+  directe (W), ROS, ALC, température PA, tension, plus les mesures de l'ampli.
+
+### Onglet de commande Icom
+
+Affiché quand le backend CAT est Icom (USB ou réseau). Une console complète façon
+RS-BA1 :
+
+- **Double afficheur VFO** (MAIN / SUB) avec la grande fréquence tabulaire, le
+  badge de mode, la bande et l'offset RIT/ΔTX, et une **rangée de boutons de
+  mode** (SSB / CW / RTTY / PSK / AM / FM).
+- **Scope de spectre + waterfall** (panadapter) : ON/OFF, CTR/FIX, double-clic
+  pour accorder, et boutons **◀ ⊙ ▶** pour centrer le scope sur la fréquence
+  actuelle (±50 kHz) et le décaler à gauche/droite.
+- **Mesures en direct** toujours visibles : S-mètre (clic → remplir le RST),
+  puissance en watts, ROS.
+- **DSP réception :** gain AF / RF, squelch, AGC, préampli, atténuateur, filtre
+  (FIL1/2/3), NB, NR, ANF et — **en CW seulement** — l'**APF** (filtre de pic
+  audio).
+- **Passe-bande / notch :** Twin PBT (intérieur / extérieur), notch manuel +
+  position.
+- **Émission :** puissance RF, MOX, TUNE, **split avec offset automatique**
+  (+5 kHz en SSB, +1 kHz en CW), et moniteur. **En phonie seulement** : gain
+  micro, processeur de parole, VOX (+ gain + anti-VOX). Les commandes qui ne
+  s'appliquent pas au mode courant sont masquées automatiquement.
+- **Bandes & antenne :** boutons de bande en un clic et sélection ANT1/ANT2.
+- **Clarificateurs :** RIT et ΔTX avec accord molette / ± (Ctrl+←/→ décale le
+  RIT).
+- Boutons **Marche / Arrêt** (manuels par choix — l'application ne réveille
+  jamais la radio à la connexion).
+- La **manipulation CW** peut passer par le keyer intégré de la radio (voir
+  *Keyers* ci-dessous).
+
+### Icom à distance (par internet, sans RS-BA1)
+
+OpsLog parle directement le protocole réseau intégré de l'IC-7610 — il
+**remplace à la fois l'Icom Remote Utility et RS-BA1**. Saisissez l'IP de la
+radio, le nom/mot de passe Network User1 et l'adresse CI-V, et toute la console
+Icom fonctionne sur le LAN/internet : login + token (renouvelé automatiquement),
+tunnel CI-V, retransmission côté réception pour une liaison très stable même
+avec le panadapter en flux, et Marche/Arrêt manuel. (L'audio est hors périmètre
+— utilisez la radio en USB + une liaison voix comme Mumble.)
+
+## Keyers & audio
+
+- **Keyer CW** avec macros et macros sur touches F. Le moteur du keyer est
+  sélectionnable : **WinKeyer** (K1EL WK1/2/3 sur port COM), **FlexRadio CWX**
+  (le keyer intégré de la radio via l'API SmartSDR — type-ahead et retour arrière,
+  sans WinKeyer ni SmartCAT), **Icom** (le keyer intégré de la radio via CI-V —
+  sans matériel supplémentaire, fonctionne aussi à distance) ou **TCI**.
+- **Keyer vocal numérique** (DVK) : enregistrer les messages vocaux F1–F6 et les
+  émettre.
+- **Enregistrement audio des QSO :** capture continue en tampon glissant ; au
+  *Log QSO* le contact est sauvegardé dans un WAV par QSO
+  (`INDICATIF_AAAAMMJJ_HHMMSS.wav`) ; mixe RX + micro.
+
+## Amplis & commutateurs
+
+- **Amplificateurs** (Réglages → Amplificateur — la carte de commande apparaît
+  sur l'onglet FlexRadio, ou seule quand ni Flex ni Icom n'est actif) :
+  - **PowerGenius XL** (4O3A) en TCP direct — operate/standby, sélecteur de mode
+    ventilateur et affichage des défauts.
+  - **SPE Expert** (1.3K-FA / 1.5K-FA / 2K-FA) via **USB** (COM virtuel) ou le
+    **réseau** (pont RS232-Ethernet) — operate/standby, Marche/Arrêt, niveau de
+    sortie Low / Mid / High, une barre de puissance et le statut en direct (bande,
+    ROS, courant PA, température, avertissements/alarmes).
+- Commutateur d'antenne **Antenna Genius** (4O3A) via TCP/GSCP — un widget de
+  commutation A/B ancré.
+- Panneau **Station Control** (ancrable, widgets réordonnables par glisser) : le
+  **rotor**, la commande d'éléments **Ultrabeam** et des **cartes relais** —
+  WebSwitch 1216H, KMTronic, **Denkovi** USB (bit-bang FT245 D2XX, 4 ou 8 relais)
+  et USB-série générique (CH340 / LCUS, protocole A0) — pour l'alimentation, les
+  antennes et accessoires de la station.
+- **Relais automatiques** (Réglages) : bascule les relais de Station Control
+  automatiquement selon la fréquence / bande de la radio (comme PstRotator) — par
+  relais, une fenêtre de fréquence ou un ensemble de bandes.
+
+## QSL & diplômes
+
+- **Moteur de diplômes :** définitions intégrées + personnalisées (partagées
+  **globalement** entre profils) — DXCC, WAS / WAZ / WAC, WPX,
+  IOTA / POTA / SOTA / WWFF, **DDFM**, contacté/confirmé/validé par bande & mode,
+  règles OU et affectation manuelle de références, détection de référence en
+  direct à la saisie de l'indicatif, **import de listes de références** pour les
+  totaux/noms, et un **Rescan** qui relit le journal (récupère les nouvelles
+  confirmations LoTW/QRZ).
+- **Services QSL :** ClubLog (upload ADIF par lots), LoTW, QRZ.com, eQSL —
+  upload et **téléchargement des confirmations** (qui rafraîchit automatiquement
+  les stats de diplômes).
+- **Concepteur de cartes QSL** (voir ci-dessous).
+- **eQSL par e-mail :** clic droit sur un QSO → *Envoyer l'eQSL par e-mail* via
+  le compte SMTP configuré. (Outlook/Hotmail désactivent le SMTP basic-auth —
+  utilisez Gmail avec un mot de passe d'application, ou un mot de passe
+  d'application Microsoft.)
+
+## Log de concours
+
+- **Onglet Contest :** choisissez un concours (liste ADIF `CONTEST_ID` intégrée)
+  et un échange (numéro de série courant ou échange fixe). OpsLog remplit
+  automatiquement `CONTEST_ID` et les numéros émis/reçus (`STX` / `SRX`), impose
+  un début/fin de fenêtre, signale les doublons et tient un tableau de score en
+  direct.
+
+## Statistiques
+
+- **Tableau de bord des statistiques :** tuiles de synthèse (QSO, indicatifs
+  uniques, entités DXCC, continents, % confirmés) plus des graphiques — QSO **par
+  mode**, un split **CW / phonie / data** par bande, l'**activité dans le temps**
+  (vues glissantes jour / 7 jours / 30 jours / 12 mois), par opérateur et par
+  continent. Filtres par plage de dates, par opérateur et par concours, et une vue
+  **Table** qui reprend chaque graphique.
+
+## Statut opérateur en direct (événements spéciaux)
+
+Pour un indicatif d'événement spécial multi-op sur un journal MySQL partagé (ex.
+**TM74TFR**) : Réglages → Général → *Publier le statut opérateur en direct*.
+Chaque instance OpsLog envoie un battement de cœur de son activité (indicatif de
+l'opérateur, bande, fréquence, mode) dans une table `live_status` toutes les
+~15 s. Un petit rendu PHP
+([`docs/livestatus/tm74-status.php`](docs/livestatus/tm74-status.php)) sur votre
+propre serveur web lit cette table et produit une page/image en direct que vous
+pouvez intégrer sur la bio **QRZ.com** de la station
+(`<img src="…/tm74-status.php?img=1">`). OpsLog écrit seulement dans la base —
+ce n'est pas un serveur web.
+
+## Net control
+
+- **Log de net dirigé** (Outils → Net) : un roster global (`nets.json`) plus une
+  session active en mémoire — pointez les stations présentes, puis loguez tout le
+  net d'un coup en utilisant la fréquence CAT.
+
+## Apparence & langue
+
+- **Thèmes :** quatre thèmes complets (Clair chaud, Sombre chaud, Graphite
+  sombre, Contraste élevé) plus **Auto** (suit la préférence clair/sombre du
+  système), sélectionnables dans Réglages → Général. Chaque panneau et chaque
+  table AG-Grid suit le thème.
+- **Bilingue :** interface complète **anglais / français**, avec un choix de
+  drapeau au premier lancement et un sélecteur dans Réglages → Général.
+
+## Sécurité
+
+- **Coffre à secrets :** chiffrement optionnel par phrase de passe des mots de
+  passe stockés (AES-GCM + PBKDF2). Les valeurs chiffrées sont portables ; une
+  seule invite de déverrouillage au lancement les déchiffre pour la session.
+
+## Intégrations (sortantes)
+
+- **Émetteurs UDP :** pousser la fréquence actuelle vers **PstRotator**, les
+  infos radio au format **N1MM `RadioInfo`**, ou un **enregistrement ADIF à
+  chaque QSO logué** — pour que les outils externes (contrôle de rotor,
+  applications numériques, autres logiciels de log) restent synchronisés.
+
+## Divers
+
+- **Démarrage automatique :** lancer des programmes externes (WSJT-X, JTAlert,
+  contrôle de rotor…) au démarrage d'OpsLog, en sautant ceux déjà lancés.
+- **Sauvegarde :** sauvegarde optionnelle base + ADIF à la fermeture.
+- **Vérification de mise à jour** au démarrage et toutes les 5 minutes (et à
+  l'ouverture d'Aide → À propos), avec un toast (désactivable), plus une fenêtre
+  **Nouveautés** qui affiche le changelog (anglais / français) au premier
+  lancement après une mise à jour — réouvrable à tout moment depuis le menu Aide.
+- **Télémétrie d'usage anonyme** (un battement de cœur quotidien : ID
+  d'installation aléatoire + version + OS — aucune donnée d'indicatif ou de QSO ;
+  désactivable dans les Préférences).
+
+---
+
+## Concepteur de cartes QSL
+
+Outils → *Concepteur de cartes QSL…* transforme quelques photos en une carte
+eQSL soignée :
+
+1. Choisissez 1 à 6 photos (jpeg/png). OpsLog les analyse hors ligne (grille de
+   détail/luminance) et propose **3 designs** — indicatif dans la zone la plus
+   calme de la meilleure photo, nom de l'opérateur, zones CQ/ITU + ligne locator,
+   drapeau du pays, les autres photos en inserts encadrés, et un encart de
+   confirmation par QSO.
+2. Choisissez une proposition et affinez-la : cliquez un élément pour le
+   sélectionner, glissez pour déplacer, changez la police / le préréglage de
+   style (gel or, gel argent, contour blanc classique, script, plat) et les
+   réglages par préréglage dans le panneau de droite.
+3. Enregistrez le modèle (les photos sont copiées dans
+   `data/qsl/templates/<id>/`, les originaux peuvent donc être déplacés). Un
+   modèle peut être le défaut par profil.
+
+Envoi : clic droit sur un QSO → *Envoyer l'eQSL par e-mail*. La carte est rendue
+avec les données de ce QSO, matricée en JPEG ≤ 800 Ko, archivée dans
+`data/qsl/outbox/` et envoyée via le compte SMTP configuré à l'adresse trouvée
+par la recherche QRZ/HamQTH. En cas de succès le QSO est marqué `EQSL_SENT=Y`
+(ADIF). Les modèles de sujet/corps de l'e-mail sont dans le concepteur (variables
+`{CALL} {DATE} {BAND} {MODE} {MYCALL}`).
+
+Polices : Archivo Black, Lilita One, Baloo 2, Oswald, Great Vibes, Allura
+(toutes OFL, embarquées — licences dans `internal/qslcard/assets/fonts/`) ;
+Cooper Black est proposée si MS Office l'a installée. Drapeaux : flag-icons
+(MIT), embarqués pour les entités DXCC couramment contactées.
+
+---
+
+## Données & stockage
+
+- La **config** (réglages, profils, radios/antennes, nœuds de cluster, cache de
+  recherche, listes de diplômes, modèles QSL) réside toujours dans le fichier
+  SQLite local sous `data/` — instantané même quand le journal est sur un MySQL
+  lointain.
+- Le **journal** (QSO) réside là où pointe le profil actif : le fichier SQLite
+  local ou une base **MySQL** partagée par profil.
+
+---
+
+*An English version of this document is available in [README.md](README.md).*

README.md

@@ -1,10 +1,17 @@
 # OpsLog
 
+<a href="https://discord.gg/FYM8yw5pT" target="_blank">
+  <img src="https://img.shields.io/badge/Discord-Join%20the%20server-5865F2?logo=discord&logoColor=white" alt="Join our Discord" />
+</a>
+
 A modern, fast ham-radio logger for Windows — Log4OM-style entry, real-time CAT
-(OmniRig **and** native FlexRadio/SmartSDR), DX cluster, awards tracking, maps,
-QSL management and a QSL-card designer. Built with **Wails v2** (Go backend +
+for **OmniRig**, native **FlexRadio/SmartSDR**, native **Icom CI-V** (USB **and**
+remote-over-internet, replacing RS-BA1) and **TCI** (SunSDR / Expert Electronics),
+DX cluster with spot alerts, awards tracking, maps, contest logging, QSL
+management and a QSL-card designer. Built with **Wails v2** (Go backend +
 React/TypeScript frontend), **pure Go** (no CGO): SQLite for configuration,
 optional **shared MySQL** for the logbook so several operators can run one log.
+Fully themeable and bilingual (English / French).
 
 Developed by **F4BPO**.
 
@@ -30,10 +37,16 @@ Developed by **F4BPO**.
 - **Callsign lookup** (QRZ.com / HamQTH) with photo, auto-fill of name/QTH/grid
   and the QRZ.com tab.
 - **Offline DXCC** resolution from `cty.dat` (country, CQ/ITU zones, continent),
-  with `/MM` `/AM` and call-area (`/8`, `/W6`) handling, plus ClubLog DXpedition
-  date overrides.
+  with `/MM` `/AM` `/B` (beacon) and call-area (`/8`, `/W6`) handling, plus
+  ClubLog DXpedition date overrides.
 - **Recent QSOs**, **Worked-before** matrix (per band/mode slot), bulk re-resolve
   from cty/QRZ/ClubLog, bulk send to QSL services.
+- **Advanced QSO filter builder** (field / operator / value, AND / OR, saved
+  presets) with filtered- and selected-row **ADIF export**.
+- **Find duplicates** (Tools) — groups QSOs by same call + band + mode (optionally
+  same day / minute) and lets you pick which to delete.
+- **ADIF 3.1.7 compliant** import/export: a full field dictionary, 30 promoted
+  columns, a generic "extra fields" editor and standard/all export modes.
 - **Profiles:** every setting is per-profile; each profile can point its logbook
   at the local SQLite file or a **shared MySQL** database (multi-operator).
 
@@ -41,7 +54,8 @@ Developed by **F4BPO**.
 
 - **Main view = two configurable panes** (per profile, Settings → General →
   *Main view*): great-circle map, locator (street) map, the cluster grid, the
-  worked-before grid, or the **FlexRadio controls**.
+  worked-before grid, recent QSOs, the **FlexRadio controls**, the **Icom
+  console** or the **Net control** panel.
 - **Great-circle map** with short/long-path distance & azimuth, selectable
   basemaps (Light / Voyager / Street / Satellite, all key-free and labelled) and
   the **antenna beam lobe(s)** drawn from the rotor azimuth.
@@ -58,15 +72,29 @@ Developed by **F4BPO**.
   pane, with a show/hide toggle.
 - Per-spot **status** (new / new-band / new-slot / worked), click-to-tune the
   rig, and a multi-band **Band Map** (panadapter-style strips).
+- **POTA** spots are tagged with their park reference (via `api.pota.app`).
+- **Spot alerts** (Log4OM-style): rules on call / country / band / mode /
+  spotter, with sound, visual and e-mail notification (Tools → *Alert
+  management*).
 
 ## CAT control
 
-- **OmniRig** backend (Rig 1/2, hot-swap), and a native **FlexRadio (SmartSDR)**
-  backend over the radio's TCP API — real-time slice freq/mode/split, auto
-  reconnect, UDP discovery, and **panadapter spots** (cluster spots pushed to the
-  Flex display, click → fill the call).
-- Mode is taken from the radio; the digital sub-mode (FT4 vs FT8) is inferred
-  from the frequency.
+Four native backends (Settings → CAT), each with auto-reconnect and a fast,
+non-blocking connect so a powered-off radio never freezes the app:
+
+- **OmniRig** (Rig 1/2, hot-swap) — works with any OmniRig-supported rig.
+- **FlexRadio (SmartSDR)** over the radio's TCP API — real-time slice freq /
+  mode / split, UDP discovery, and **panadapter spots** (cluster spots pushed to
+  the Flex display, click → fill the call).
+- **Icom CI-V** — native, over the radio's **USB** port *or* over the internet
+  via the radio's **built-in LAN server** (see *Remote Icom* below). No RS-BA1 or
+  Remote Utility needed.
+- **TCI** (WebSocket) — SunSDR / ExpertSDR2 and any TCI-compatible server:
+  freq / mode / PTT / split, plus optional panorama spots.
+
+Mode is taken from the radio; the digital sub-mode (FT4 vs FT8) is inferred from
+the frequency. **Per-band Flex RX/TX antennas** can be configured and are applied
+automatically on band change.
 
 ### FlexRadio control tab (SmartSDR-style)
 
@@ -76,23 +104,86 @@ Shown only when the CAT backend is a FlexRadio:
   VOX (+ level + delay), monitor (+ level), mic gain.
 - **Receive (active slice):** AGC mode/threshold, audio level, NB / NR / ANF.
 - **Antenna tuner (ATU):** tune / bypass / memories.
-- **Amplifier:** PowerGenius XL operate/standby + fault.
+- **Amplifier:** the amp card follows whichever amplifier is configured —
+  **PowerGenius XL** (operate/standby, fan mode, fault) or **SPE Expert**
+  (operate/standby, ON/OFF, Low/Mid/High level, output-power bar, band &
+  temperature).
 - **Live meters** over the UDP VITA-49 stream: S-meter (S-units), forward power
   (W), SWR, ALC, PA temperature, voltage, plus the amplifier's meters.
 
+### Icom control tab
+
+Shown when the CAT backend is Icom (USB or network). A full RS-BA1-style console:
+
+- **Twin VFO readout** (MAIN / SUB) with the big tabular frequency, mode badge,
+  band and RIT/ΔTX offset, and a **mode-button row** (SSB / CW / RTTY / PSK /
+  AM / FM).
+- **Spectrum scope + waterfall** (panadapter): ON/OFF, CTR/FIX, double-click to
+  tune, and **◀ ⊙ ▶** buttons to centre the scope on the current frequency
+  (±50 kHz) and pan left/right.
+- **Live meters** always visible: S-meter (click → fill RST), power in watts, SWR.
+- **Receive DSP:** AF / RF gain, squelch, AGC, preamp, attenuator, filter
+  (FIL1/2/3), NB, NR, ANF and — **on CW only** — the **APF** (audio peak filter).
+- **Passband / notch:** Twin PBT (inner / outer), manual notch + position.
+- **Transmit:** RF power, MOX, TUNE, **split with an automatic offset**
+  (+5 kHz on SSB, +1 kHz on CW), and monitor. On **voice modes only**: mic gain,
+  speech compressor, VOX (+ gain + anti-VOX). Controls that don't apply to the
+  current mode are hidden automatically.
+- **Bands & antenna:** one-touch band buttons and ANT1/ANT2 selection.
+- **Clarifiers:** RIT and ΔTX with wheel / ± tuning (Ctrl+←/→ nudges RIT).
+- **Power ON / OFF** buttons (manual by design — the app never wakes the rig on
+  connect).
+- **CW keying** can run through the radio's own keyer (see *Keyers* below).
+
+### Remote Icom (over the internet, no RS-BA1)
+
+OpsLog speaks the IC-7610's built-in network protocol directly — it **replaces
+both the Icom Remote Utility and RS-BA1**. Enter the radio's IP, the Network
+User1 name/password and the CI-V address, and the whole Icom console works over
+the LAN/internet: login + token (auto-renewed), CI-V tunnel, receive-side
+retransmit for a rock-solid link even with the panadapter streaming, and manual
+power ON/OFF. (Audio is out of scope — use the radio in USB + a voice link such
+as Mumble.)
+
 ## Keyers & audio
 
-- **WinKeyer** CW keyer (macros, F-key macros, auto-call repeat).
-- **Digital Voice Keyer** (DVK) message playback.
-- **QSO audio recording** (SSB/DAX) archived per QSO; disabled for CW (no DAX
-  audio in CW).
+- **CW keyer** with macros and F-key macros. The keyer engine is selectable:
+  **WinKeyer** (K1EL WK1/2/3 over a COM port), **FlexRadio CWX** (the radio's
+  built-in keyer over the SmartSDR API — type-ahead and backspace, no WinKeyer or
+  SmartCAT needed), **Icom** (the radio's own keyer over CI-V — no extra hardware,
+  works over the remote link too) or **TCI**.
+- **Digital Voice Keyer** (DVK): record F1–F6 voice messages and transmit them.
+- **QSO audio recording:** continuous rolling capture; on *Log QSO* the contact
+  is saved to a per-QSO WAV (`CALL_YYYYMMDD_HHMMSS.wav`); mixes RX + mic.
+
+## Amplifiers & switches
+
+- **Amplifiers** (Settings → Amplifier — the control card appears on the
+  FlexRadio tab, or on its own when neither Flex nor Icom is active):
+  - **PowerGenius XL** (4O3A) over direct TCP — operate/standby, fan-mode
+    selector and fault display.
+  - **SPE Expert** (1.3K-FA / 1.5K-FA / 2K-FA) over **USB** (virtual COM) or the
+    **network** (RS232-to-Ethernet bridge) — operate/standby, ON/OFF,
+    Low / Mid / High output level, an output-power bar and live status (band,
+    SWR, PA current, temperature, warnings/alarms).
+- **Antenna Genius** (4O3A) antenna switch over TCP/GSCP — a docked A/B
+  antenna-switch widget.
+- **Station Control** panel (dockable, drag-to-reorder widgets): the **rotator**,
+  **Ultrabeam** element control and **relay boards** — WebSwitch 1216H, KMTronic,
+  **Denkovi** USB (FT245 D2XX bit-bang, 4 or 8 relays) and generic USB-serial
+  (CH340 / LCUS, A0 protocol) — for station power, antennas and accessories.
+- **Relay auto-control** (Settings): switch Station-Control relays automatically
+  from the rig frequency / band (like PstRotator) — per relay, a frequency window
+  or a set of bands.
 
 ## QSL & awards
 
 - **Awards engine:** built-in + custom award definitions (shared **globally**
-  across profiles), worked/confirmed/validated by band & mode, OR rules and
-  manual reference assignment, live reference detection on call entry, and a
-  **Rescan** that re-pulls the logbook (picks up fresh LoTW/QRZ confirmations).
+  across profiles) — DXCC, WAS / WAZ / WAC, WPX, IOTA / POTA / SOTA / WWFF,
+  **DDFM**, worked/confirmed/validated by band & mode, OR rules and manual
+  reference assignment, live reference detection on call entry, **reference-list
+  import** for totals/names, and a **Rescan** that re-pulls the logbook (picks up
+  fresh LoTW/QRZ confirmations).
 - **QSL services:** ClubLog (batched ADIF upload), LoTW, QRZ.com, eQSL — upload
   and **confirmation download** (which auto-refreshes the award stats).
 - **QSL Card Designer** (see below).
@@ -100,6 +191,21 @@ Shown only when the CAT backend is a FlexRadio:
   SMTP account. (Outlook/Hotmail disable basic-auth SMTP — use Gmail with an app
   password, or a Microsoft app password.)
 
+## Contest logging
+
+- **Contest tab:** pick a contest (built-in ADIF `CONTEST_ID` list) and an
+  exchange (running serial or a fixed exchange). OpsLog auto-fills `CONTEST_ID`
+  and the sent/received serials (`STX` / `SRX`), enforces a window start/end,
+  flags dupes and keeps a live scoreboard.
+
+## Statistics
+
+- **Logbook statistics dashboard:** headline tiles (QSOs, unique callsigns, DXCC
+  entities, continents, % confirmed) plus charts — QSOs **by mode**, a per-band
+  **CW / phone / data** split, **activity over time** (rolling day / 7-day /
+  30-day / 12-month views), by operator and by continent. Date-range, per-operator
+  and per-contest filters, and a **Table** view that mirrors every chart.
+
 ## Multi-operator live status (special events)
 
 For a multi-op special-event call on a shared MySQL logbook (e.g. **TM74TFR**):
@@ -111,11 +217,41 @@ own web server reads that table and produces a live page/image you can embed on
 the station's **QRZ.com** bio (`<img src="…/tm74-status.php?img=1">`). OpsLog
 only writes to the DB — it is not a web server.
 
+## Net control
+
+- **Directed-net logging** (Tools → Net): a global roster (`nets.json`) plus an
+  in-memory active session — check stations in, then log the whole net at once
+  using the CAT frequency.
+
+## Appearance & language
+
+- **Themes:** four complete themes (Warm light, Warm dark, Graphite dark, High
+  contrast) plus **Auto** (follows the OS light/dark preference), selectable in
+  Settings → General. Every panel and every AG-Grid table follows the theme.
+- **Bilingual:** full **English / French** UI, with a first-run flag chooser and
+  a switcher in Settings → General.
+
+## Security
+
+- **Secret vault:** opt-in passphrase encryption of the stored passwords
+  (AES-GCM + PBKDF2). Encrypted values are portable; a single unlock prompt at
+  launch decrypts them for the session.
+
+## Integrations (outbound)
+
+- **UDP emitters:** push the current frequency to **PstRotator**, radio info in
+  **N1MM `RadioInfo`** format, or an **ADIF record on each logged QSO** — so
+  external tools (rotator control, digital apps, other loggers) stay in sync.
+
 ## Other
 
 - **Autostart:** launch external programs (WSJT-X, JTAlert, rotator control…) at
   OpsLog startup, skipping any already running.
-- **Update check** at startup with a toast (toggleable).
+- **Backup:** optional database + ADIF backup at shutdown.
+- **Update check** at startup and every 5 minutes (and on opening Help → About),
+  with a toast (toggleable), plus a **What's new** dialog that shows the changelog
+  (English / French) on the first launch after an update — reopenable any time
+  from the Help menu.
 - **Anonymous usage telemetry** (a once-a-day heartbeat: random install ID +
   version + OS — no callsign or QSO data; opt-out in Preferences).
 
@@ -156,3 +292,7 @@ commonly-worked DXCC entities.
   `data/` — instant even when the logbook is on a far-away MySQL.
 - **Logbook** (QSOs) lives where the active profile points it: the local SQLite
   file or a per-profile shared **MySQL** database.
+
+---
+
+*A French version of this document is available in [README.fr.md](README.fr.md).*

adifwatch.go

@@ -0,0 +1,251 @@
+package main
+
+// ADIF monitor: watches a configurable list of external ADIF files (fldigi's
+// RTTY logbook, N1MM, VarAC…) and imports newly appended QSOs into OpsLog as if
+// they had been logged here — same enrichment, dedup and automatic upload to
+// external services (QRZ, Club Log…). Deliberately simpler than Log4OM's monitor:
+// no per-file "upload" / "delete after load" toggles — importing + auto-upload is
+// just what happens.
+//
+// Design notes:
+//   - A newly added file starts at its CURRENT size (Offset = -1 sentinel → set to
+//     size on first scan) so the QSOs already in it are NOT bulk-imported; only
+//     contacts appended AFTER you add the file come in.
+//   - Reads only up to the last complete <eor>, so a half-written record waits for
+//     the next poll instead of importing a truncated QSO.
+//   - Each record is fed through LogUDPLoggedADIF, which already does the full
+//     enrichment + ±2-minute dedup (shared udpLogMu, so it can't race the UDP
+//     auto-log) + automatic external-service upload.
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"time"
+
+	wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
+
+	"hamlog/internal/applog"
+)
+
+const keyADIFMonitor = "adifmon.config"
+
+// ADIFWatchFile is one monitored ADIF file.
+type ADIFWatchFile struct {
+	Path    string `json:"path"`
+	Enabled bool   `json:"enabled"`
+	// Offset is the number of bytes already consumed. -1 means "not yet
+	// initialised": the first scan sets it to the file's current size so existing
+	// history is skipped.
+	Offset int64 `json:"offset"`
+}
+
+// ADIFMonitorConfig is the whole monitor setup: a master switch + the file list.
+type ADIFMonitorConfig struct {
+	Enabled bool            `json:"enabled"`
+	Files   []ADIFWatchFile `json:"files"`
+}
+
+const eorTag = "<eor>"
+
+func (a *App) loadADIFMonitorLocked() ADIFMonitorConfig {
+	var cfg ADIFMonitorConfig
+	if a.settings == nil {
+		return cfg
+	}
+	s, _ := a.settings.GetGlobal(a.ctx, keyADIFMonitor)
+	if strings.TrimSpace(s) != "" {
+		_ = json.Unmarshal([]byte(s), &cfg)
+	}
+	return cfg
+}
+
+func (a *App) saveADIFMonitorLocked(cfg ADIFMonitorConfig) {
+	b, _ := json.Marshal(cfg)
+	a.setSettingGlobal(keyADIFMonitor, string(b))
+}
+
+// GetADIFMonitor returns the monitor configuration for the settings UI.
+func (a *App) GetADIFMonitor() ADIFMonitorConfig {
+	a.adifMonMu.Lock()
+	defer a.adifMonMu.Unlock()
+	return a.loadADIFMonitorLocked()
+}
+
+// SaveADIFMonitor persists the monitor configuration. A file the user just added
+// gets Offset = -1 so its existing content is skipped (only QSOs logged AFTER it
+// was added import); a file already present keeps its current read position.
+func (a *App) SaveADIFMonitor(cfg ADIFMonitorConfig) error {
+	a.adifMonMu.Lock()
+	defer a.adifMonMu.Unlock()
+	old := a.loadADIFMonitorLocked()
+	oldOff := make(map[string]int64, len(old.Files))
+	for _, f := range old.Files {
+		oldOff[strings.TrimSpace(f.Path)] = f.Offset
+	}
+	for i := range cfg.Files {
+		cfg.Files[i].Path = strings.TrimSpace(cfg.Files[i].Path)
+		if off, ok := oldOff[cfg.Files[i].Path]; ok {
+			cfg.Files[i].Offset = off // keep the read position of an existing file
+		} else {
+			cfg.Files[i].Offset = -1 // new file → skip its existing history
+		}
+	}
+	a.saveADIFMonitorLocked(cfg)
+	return nil
+}
+
+// PickADIFMonitorFile opens a file dialog to choose an ADIF file to monitor.
+func (a *App) PickADIFMonitorFile() (string, error) {
+	if a.ctx == nil {
+		return "", fmt.Errorf("no app context")
+	}
+	return wruntime.OpenFileDialog(a.ctx, wruntime.OpenDialogOptions{
+		Title: "Choose an ADIF file to monitor",
+		Filters: []wruntime.FileFilter{
+			{DisplayName: "ADIF (*.adi;*.adif)", Pattern: "*.adi;*.adif"},
+			{DisplayName: "All files (*.*)", Pattern: "*.*"},
+		},
+	})
+}
+
+// adifMonitorLoop polls the enabled ADIF files every few seconds and imports any
+// newly appended QSOs. Runs for the app's lifetime on its own goroutine.
+func (a *App) adifMonitorLoop() {
+	tick := time.NewTicker(5 * time.Second)
+	defer tick.Stop()
+	for range tick.C {
+		if a.ctx == nil || a.qso == nil {
+			continue
+		}
+		a.scanADIFMonitors()
+	}
+}
+
+// scanADIFMonitors walks the enabled files once, importing new records and
+// persisting advanced offsets.
+func (a *App) scanADIFMonitors() {
+	a.adifMonMu.Lock()
+	cfg := a.loadADIFMonitorLocked()
+	a.adifMonMu.Unlock()
+	if !cfg.Enabled || len(cfg.Files) == 0 {
+		return
+	}
+
+	// path → new offset, for the files we advanced this pass.
+	advanced := map[string]int64{}
+	for i := range cfg.Files {
+		f := &cfg.Files[i]
+		if !f.Enabled || strings.TrimSpace(f.Path) == "" {
+			continue
+		}
+		fi, err := os.Stat(f.Path)
+		if err != nil {
+			continue // not present (yet) — try again next tick
+		}
+		size := fi.Size()
+		if f.Offset < 0 {
+			// First sight of this file → skip whatever history it already holds.
+			advanced[f.Path] = size
+			continue
+		}
+		if size < f.Offset {
+			f.Offset = 0 // truncated / rotated → re-read from the start (dedup protects us)
+		}
+		if size == f.Offset {
+			continue // nothing new
+		}
+		newOff, n := a.importADIFAppend(f.Path, f.Offset, size)
+		if newOff != f.Offset {
+			advanced[f.Path] = newOff
+		}
+		if n > 0 {
+			applog.Printf("adif monitor: imported %d QSO(s) from %s", n, f.Path)
+			if a.ctx != nil {
+				wruntime.EventsEmit(a.ctx, "adifmon:imported", map[string]any{"file": f.Path, "count": n})
+			}
+		}
+	}
+
+	if len(advanced) == 0 {
+		return
+	}
+	// Persist the advanced offsets WITHOUT clobbering a concurrent UI save of the
+	// file list: re-read the stored config and only patch offsets for paths that
+	// still exist there.
+	a.adifMonMu.Lock()
+	cur := a.loadADIFMonitorLocked()
+	for i := range cur.Files {
+		if off, ok := advanced[strings.TrimSpace(cur.Files[i].Path)]; ok {
+			cur.Files[i].Offset = off
+		}
+	}
+	a.saveADIFMonitorLocked(cur)
+	a.adifMonMu.Unlock()
+}
+
+// importADIFAppend reads bytes [from,to) of an ADIF file, imports every COMPLETE
+// record found (up to the last <eor>) and returns the new offset (just past that
+// last <eor>) plus how many QSOs were actually imported (duplicates excluded).
+func (a *App) importADIFAppend(path string, from, to int64) (int64, int) {
+	fh, err := os.Open(path)
+	if err != nil {
+		return from, 0
+	}
+	defer fh.Close()
+	if _, err := fh.Seek(from, io.SeekStart); err != nil {
+		return from, 0
+	}
+	buf := make([]byte, to-from)
+	nRead, err := io.ReadFull(fh, buf)
+	if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
+		return from, 0
+	}
+	buf = buf[:nRead]
+
+	// Only consume up to the last complete <eor>; a half-written trailing record
+	// waits for the next poll.
+	lower := bytes.ToLower(buf)
+	last := bytes.LastIndex(lower, []byte(eorTag))
+	if last < 0 {
+		return from, 0 // no complete record yet
+	}
+	end := last + len(eorTag)
+	chunk := buf[:end]
+
+	count := 0
+	for _, rec := range splitADIFRecords(chunk) {
+		if strings.TrimSpace(rec) == "" {
+			continue
+		}
+		if _, err := a.LogUDPLoggedADIF(rec); err == nil {
+			count++
+		}
+		// A duplicate (already in the log within ±2 min) returns an error and is
+		// simply not counted — expected when the same QSO is also logged in OpsLog.
+	}
+	return from + int64(end), count
+}
+
+// splitADIFRecords cuts an ADIF byte slice into individual record texts, each
+// ending at its <eor> (case-insensitive). Any leading file header (up to the
+// first record's <eor>) rides along with the first record — LogUDPLoggedADIF
+// parses past an <EOH> header fine, and prepends one when there is none.
+func splitADIFRecords(b []byte) []string {
+	lower := bytes.ToLower(b)
+	var out []string
+	start := 0
+	for {
+		rel := bytes.Index(lower[start:], []byte(eorTag))
+		if rel < 0 {
+			break
+		}
+		end := start + rel + len(eorTag)
+		out = append(out, string(b[start:end]))
+		start = end
+	}
+	return out
+}

app_cw.go

@@ -1,149 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"time"
-
-	"hamlog/internal/applog"
-	"hamlog/internal/audio"
-	"hamlog/internal/cwdecode"
-
-	wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
-)
-
-// CW decoder: taps the RX audio device (the same "From radio" capture the DVK
-// and QSO recorder use) and streams decoded Morse text to the UI. It is started
-// only by the frontend, and only while the entry mode is CW.
-//
-// Pitch targeting: the single-channel decoder is far more reliable when it locks
-// to a KNOWN pitch (a narrow filter at the signal frequency, like a skimmer)
-// instead of auto-searching for the loudest tone. So we follow the radio's CW
-// pitch (FlexRadio cw_pitch) when available — or a manual override — and fall
-// back to auto-search otherwise.
-
-// cwTargetPitch returns the pitch (Hz) the decoder should lock to: the manual
-// override if set, else the FlexRadio's CW pitch when it's in CW, else 0 (auto).
-func (a *App) cwTargetPitch() int {
-	if a.cwPitchHz > 0 {
-		return a.cwPitchHz
-	}
-	if a.cat != nil {
-		if st, ok := a.cat.FlexState(); ok && st.Available {
-			// Only trust the radio's pitch when it's actually in CW.
-			if st.Mode == "CW" || st.Mode == "CWL" || st.Mode == "CWU" {
-				if st.CWPitch > 0 {
-					return st.CWPitch
-				}
-			}
-		}
-	}
-	return 0
-}
-
-// StartCWDecoder begins decoding CW from the configured RX audio device. The
-// frontend calls this when the decoder toggle is on AND the mode is CW. Safe to
-// call repeatedly; a second call is a no-op while already running.
-func (a *App) StartCWDecoder() error {
-	a.cwMu.Lock()
-	defer a.cwMu.Unlock()
-	if a.cwStop != nil {
-		return nil // already running
-	}
-	dev := ""
-	if a.settings != nil {
-		dev, _ = a.settings.Get(a.ctx, keyAudioFromRadio)
-	}
-	if dev == "" {
-		return fmt.Errorf("no RX audio device configured (set \"From radio\" in Audio settings)")
-	}
-
-	dec := cwdecode.New(audio.SampleRate,
-		func(text string) {
-			if a.ctx != nil {
-				wruntime.EventsEmit(a.ctx, "cw:text", text)
-			}
-		},
-		func(st cwdecode.Status) {
-			if a.ctx != nil {
-				wruntime.EventsEmit(a.ctx, "cw:status", st)
-			}
-		},
-	)
-	dec.SetTarget(a.cwTargetPitch())
-	a.cwDecoder = dec
-
-	stop := make(chan struct{})
-	a.cwStop = stop
-	go func() {
-		if err := audio.StreamCapture(dev, stop, dec.Process); err != nil {
-			applog.Printf("cw: capture failed: %v", err)
-			if a.ctx != nil {
-				wruntime.EventsEmit(a.ctx, "cw:error", err.Error())
-			}
-		}
-		a.cwMu.Lock()
-		if a.cwStop == stop {
-			a.cwStop = nil
-			a.cwDecoder = nil
-		}
-		a.cwMu.Unlock()
-	}()
-	// Follow the radio's CW pitch live (every second) while this run is active.
-	go a.cwFollowPitch(stop, dec)
-	return nil
-}
-
-// cwFollowPitch keeps the decoder locked to the current target pitch until stop.
-func (a *App) cwFollowPitch(stop <-chan struct{}, dec *cwdecode.Decoder) {
-	t := time.NewTicker(time.Second)
-	defer t.Stop()
-	for {
-		select {
-		case <-stop:
-			return
-		case <-t.C:
-			dec.SetTarget(a.cwTargetPitch())
-		}
-	}
-}
-
-// StopCWDecoder halts the CW decoder if running.
-func (a *App) StopCWDecoder() {
-	a.cwMu.Lock()
-	stop := a.cwStop
-	a.cwStop = nil
-	a.cwDecoder = nil
-	a.cwMu.Unlock()
-	if stop != nil {
-		close(stop)
-	}
-}
-
-// CWDecoderRunning reports whether the decoder is currently capturing.
-func (a *App) CWDecoderRunning() bool {
-	a.cwMu.Lock()
-	defer a.cwMu.Unlock()
-	return a.cwStop != nil
-}
-
-// SetCWDecoderPitch sets a manual decode pitch (Hz); 0 returns to auto (follow
-// the Flex CW pitch, or search). Applies live to a running decoder.
-func (a *App) SetCWDecoderPitch(hz int) {
-	if hz < 0 {
-		hz = 0
-	}
-	a.cwMu.Lock()
-	a.cwPitchHz = hz
-	dec := a.cwDecoder
-	a.cwMu.Unlock()
-	if dec != nil {
-		dec.SetTarget(a.cwTargetPitch())
-	}
-}
-
-// GetCWDecoderPitch returns the manual override (0 = auto / follow Flex).
-func (a *App) GetCWDecoderPitch() int {
-	a.cwMu.Lock()
-	defer a.cwMu.Unlock()
-	return a.cwPitchHz
-}

app_qsl_designer.go

@@ -122,12 +122,20 @@ func (a *App) QSLGenerateProposals(photoPaths []string) ([]string, error) {
 	return out, nil
 }
 
-// QSLListTemplates returns all saved templates (defaults first).
+// QSLListTemplates returns the templates for the ACTIVE profile (its own plus any
+// shared/global ones), defaults first — so the default is per-profile, not a
+// single global list shared by every profile.
 func (a *App) QSLListTemplates() ([]QSLTemplateInfo, error) {
 	if a.qslTemplates == nil {
 		return nil, fmt.Errorf("db not initialized")
 	}
-	recs, err := a.qslTemplates.List(a.ctx)
+	var recs []qslcard.Record
+	var err error
+	if p, e := a.profiles.Active(a.ctx); e == nil {
+		recs, err = a.qslTemplates.ListFor(a.ctx, p.ID)
+	} else {
+		recs, err = a.qslTemplates.List(a.ctx)
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -429,17 +437,16 @@ func (a *App) SendEQSL(qsoID int64, templateID int64, jpegB64 string) error {
 		applog.Printf("qsl: send eQSL to %s (%s) failed: %v", to, q.Callsign, err)
 		return err
 	}
-	// Record WHEN OpsLog e-mailed its own QSL card, in a dedicated app field —
-	// NOT the ADIF eqsl_sent flag, which belongs to eQSL.cc and must stay
-	// independent. q came straight from GetByID, so a full Update rewrites the
-	// row unchanged apart from this field.
-	if q.Extras == nil {
-		q.Extras = map[string]string{}
-	}
-	q.Extras[appQSLCardSentField] = time.Now().UTC().Format(time.RFC3339)
-	if err := a.qso.Update(a.ctx, q); err != nil {
-		applog.Printf("qsl: eQSL sent to %s but marking failed: %v", q.Callsign, err)
-		return fmt.Errorf("eQSL sent but status not saved: %w", err)
+	// Record WHEN OpsLog e-mailed its own QSL card, in a dedicated app field — NOT
+	// the ADIF eqsl_sent flag, which belongs to eQSL.cc and must stay independent.
+	//
+	// Stamp ONLY this extras key (targeted UPDATE), never a full-row write. The `q`
+	// read up top is now stale after the slow e-mail send, and rewriting the whole
+	// row would revert any column an auto-upload changed meanwhile — that's how
+	// sending a QSL card was flipping clublog_qso_upload_status back from Y to R.
+	if err := a.qso.SetExtra(a.ctx, qsoID, appQSLCardSentField, time.Now().UTC().Format(time.RFC3339)); err != nil {
+		applog.Printf("qsl: card sent to %s but marking failed: %v", q.Callsign, err)
+		return fmt.Errorf("QSL card sent but status not saved: %w", err)
 	}
 	applog.Printf("qsl: eQSL sent to %s (%s)", to, q.Callsign)
 	wruntime.EventsEmit(a.ctx, "qsl:sent", qsoID)

awards_catalog_test.go

@@ -0,0 +1,112 @@
+package main
+
+import (
+	"testing"
+
+	"hamlog/internal/award"
+)
+
+// The catalog is the channel through which a shipped award is both DELIVERED and
+// CORRECTED. These tests pin the three rules that make that safe:
+//   - a new catalog award reaches an operator who already has awards stored;
+//   - a fixed one (higher Version) replaces the stored copy;
+//   - unless the operator has edited it, in which case their work wins.
+
+func catalogDef(t *testing.T, code string) award.Def {
+	t.Helper()
+	for _, d := range award.Defaults() {
+		if d.Code == code {
+			return d
+		}
+	}
+	t.Fatalf("%s is not in the catalog", code)
+	return award.Def{}
+}
+
+func findDef(defs []award.Def, code string) (award.Def, bool) {
+	for _, d := range defs {
+		if d.Code == code {
+			return d, true
+		}
+	}
+	return award.Def{}, false
+}
+
+func TestMergeCatalogAddsMissingAward(t *testing.T) {
+	stored := []award.Def{{Code: "MYOWN", Name: "Mine", Valid: true}}
+	got, updated, changed := mergeCatalog(stored)
+	if !changed {
+		t.Fatal("merge reported no change, but every catalog award was missing")
+	}
+	if len(updated) != 0 {
+		t.Errorf("updated = %v, want none: an ADDED award is not an UPDATED one", updated)
+	}
+	if _, ok := findDef(got, "FFMA"); !ok {
+		t.Error("FFMA was not added — a newly shipped award never reaches an existing install")
+	}
+	if _, ok := findDef(got, "MYOWN"); !ok {
+		t.Error("the operator's own award was dropped by the merge")
+	}
+}
+
+func TestMergeCatalogUpdatesOlderVersion(t *testing.T) {
+	// The stored copy is an older revision of a shipped award, with a broken rule.
+	old := catalogDef(t, "FFMA")
+	old.Version = catalogDef(t, "FFMA").Version - 1
+	old.Field = "wrong"
+	old.Valid = false // the operator disabled it — a preference, not a definition
+
+	got, updated, changed := mergeCatalog([]award.Def{old})
+	if !changed || len(updated) == 0 {
+		t.Fatal("a higher catalog version did not replace the stored definition — a shipped award could never be FIXED")
+	}
+	d, _ := findDef(got, "FFMA")
+	if d.Field != "grid4" {
+		t.Errorf("FFMA field = %q, want the catalog's %q", d.Field, "grid4")
+	}
+	if d.Valid {
+		t.Error("the update re-enabled an award the operator had switched off; that is their choice to make, not ours")
+	}
+}
+
+func TestMergeCatalogSkipsUserEdited(t *testing.T) {
+	old := catalogDef(t, "FFMA")
+	old.Version = catalogDef(t, "FFMA").Version - 1
+	old.Field = "mine"
+	old.UserEdited = true
+
+	got, updated, _ := mergeCatalog([]award.Def{old})
+	if len(updated) != 0 {
+		t.Fatalf("updated = %v: an award the operator has edited must never be overwritten", updated)
+	}
+	if d, _ := findDef(got, "FFMA"); d.Field != "mine" {
+		t.Errorf("field = %q, want the operator's %q", d.Field, "mine")
+	}
+}
+
+func TestMarkUserEditedOnlyOnRealChange(t *testing.T) {
+	prev := []award.Def{
+		{Code: "A", Name: "A", Field: "state", Valid: true, Version: 2},
+		{Code: "B", Name: "B", Field: "cqz", Valid: true, Version: 2},
+	}
+	next := []award.Def{
+		{Code: "A", Name: "A", Field: "state", Valid: true},   // untouched
+		{Code: "B", Name: "B", Field: "county", Valid: true},  // changed
+		{Code: "C", Name: "C", Field: "note", Valid: true},    // brand new
+	}
+	markUserEdited(next, prev)
+
+	if next[0].UserEdited {
+		t.Error("A was flagged as edited although nothing about it changed — every save would freeze every award out of future updates")
+	}
+	if !next[1].UserEdited {
+		t.Error("B changed field and was not flagged; a catalog update would overwrite the operator's work")
+	}
+	if next[2].UserEdited {
+		t.Error("C is a brand-new award; there is no shipped version to protect it from")
+	}
+	// A save must not pretend to be a new shipped revision.
+	if next[0].Version != 2 || next[1].Version != 2 {
+		t.Errorf("versions = %d/%d, want both 2: saving is not shipping", next[0].Version, next[1].Version)
+	}
+}

changelog.go

@@ -0,0 +1,81 @@
+package main
+
+import (
+	_ "embed"
+	"encoding/json"
+	"strings"
+
+	"hamlog/internal/applog"
+)
+
+//go:embed changelog.json
+var changelogJSON []byte
+
+// ChangelogEntry is one release's user-facing notes, in English and French. It's
+// shown once on the first launch after an update (the "What's new" dialog),
+// derived from the release's commit history.
+type ChangelogEntry struct {
+	Version string   `json:"version"`
+	Date    string   `json:"date"`
+	EN      []string `json:"en"`
+	FR      []string `json:"fr"`
+}
+
+const keyChangelogSeen = "changelog.last_seen_version"
+
+func loadChangelog() []ChangelogEntry {
+	var out []ChangelogEntry
+	if err := json.Unmarshal(changelogJSON, &out); err != nil {
+		applog.Printf("changelog: parse failed: %v", err)
+	}
+	return out
+}
+
+// GetChangelog returns every changelog entry up to the running version (newest
+// first), without touching the "seen" marker — for a "What's new" button that
+// reopens the notes on demand.
+func (a *App) GetChangelog() []ChangelogEntry {
+	out := []ChangelogEntry{}
+	for _, e := range loadChangelog() {
+		if strings.TrimSpace(e.Version) == "" || versionLess(appVersion, e.Version) {
+			continue
+		}
+		out = append(out, e)
+	}
+	return out
+}
+
+// GetWhatsNew returns the changelog entries the operator hasn't seen yet — the
+// notes for every version newer than the last one they ran, up to the current
+// build — and records the current version as seen so it pops exactly once per
+// update. Empty when there's nothing new.
+func (a *App) GetWhatsNew() []ChangelogEntry {
+	if a.settings == nil {
+		return nil
+	}
+	lastSeen, _ := a.settings.GetGlobal(a.ctx, keyChangelogSeen)
+	cur := appVersion
+	a.setSettingGlobal(keyChangelogSeen, cur) // advance the marker now
+
+	out := []ChangelogEntry{}
+	for _, e := range loadChangelog() {
+		if strings.TrimSpace(e.Version) == "" {
+			continue
+		}
+		if versionLess(cur, e.Version) {
+			continue // don't preview notes for a version newer than we run
+		}
+		if lastSeen == "" {
+			// First run of the feature (fresh install, or upgrade from a build that
+			// predates it): show only the CURRENT version's notes, once.
+			if e.Version == cur {
+				out = append(out, e)
+			}
+			continue
+		}
+		if versionLess(lastSeen, e.Version) {
+			out = append(out, e)
+		}
+	}
+	return out
+}

changelog.json

@@ -0,0 +1,128 @@
+[
+  {
+    "version": "0.20.9",
+    "date": "2026-07-22",
+    "en": [
+      "The PGXL amplifier chip and Station Control widget now read the OPERATE state from the FlexRadio (like the Flex panel) — the chip no longer shows STANDBY while the amp is operating, and clicking it toggles the amp through the radio.",
+      "Right-click 'Send to LoTW / QRZ / Club Log…' now reports its result as a notification — a failed upload (e.g. TQSL not configured) was completely silent outside the QSL Manager, which looked like nothing was sent.",
+      "The number of selected QSOs is now always visible at the top of the log grid — no need to open the right-click menu to see it.",
+      "NET Control: the worked-before list gets the same right-click menu as Recent QSOs (update from cty/QRZ/Club Log, send to services, recording e-mail, eQSL, delete).",
+      "Leaving compact mode restores the window's previous size AND position (it used to snap to a fixed size wherever the compact strip had been dragged).",
+      "The advanced filter's 'My callsign' field is renamed 'Station callsign' so it is findable under its ADIF name (it filters STATION_CALLSIGN).",
+      "Filtering now shows EVERY match: the on-screen row limit (Max) only applies to the unfiltered log — a filter matching 200 QSOs displays all 200 even with Max at 100 (safety cap 10,000, with a warning to narrow the filter beyond that).",
+      "New 'Select all' button in the log grid toolbar — selects every displayed row (respecting active column filters) in one click, ready for send-to-LoTW, bulk edit or export; once everything is selected it flips to 'Unselect all'.",
+      "NET Control: drag & drop between the two lists — drag a roster station onto the on-air list to start its QSO, and drag an on-air station onto the roster to log it (same as the Log & end button).",
+      "New option (Settings → General): 'Group digital modes as one (DXCC-style)' — when on, the matrix newness badges and the cluster new/new-band/new-mode/new-slot colouring treat FT8/FT4/RTTY/PSK… as a single Digital mode, matching how DXCC counts; when off (default), each digital mode remains its own potential slot.",
+      "Multiple amplifiers: Settings → Amplifier is now a LIST — configure several amps (e.g. two SPEs run in parallel), each with its own name and connection. The amp cards in the Flex panel and Station Control get a dropdown to pick which amp they show, and the bottom status bar shows one clickable chip per amp. Existing single-amp setups migrate automatically.",
+      "FlexRadio panel: the SmartSDR v4 DSP filters are now controllable — NRL and ANFL (legacy LMS), NRS (spectral subtraction), NRF (noise reduction with filter) with their level sliders, plus RNN (AI noise reduction) and ANFT (FFT auto-notch) toggles. The section appears automatically on radios that support them (8000/Aurora series). Layout rebalanced: RIT/XIT moved to the Transmit column and the antenna selection now sits at the top of the Receive column, alongside a new DAX button (SmartSDR's transmit-bar DAX toggle — TX audio from DAX, for WSJT-X & co)."
+    ],
+    "fr": [
+      "La pastille ampli PGXL et le widget Station Control lisent maintenant l'état OPERATE depuis le FlexRadio (comme le panneau Flex) — la pastille n'affiche plus STANDBY quand l'ampli est en service, et un clic bascule l'ampli via la radio.",
+      "Le clic droit « Send to LoTW / QRZ / Club Log… » affiche maintenant son résultat en notification — un envoi échoué (p. ex. TQSL non configuré) était totalement silencieux hors du QSL Manager, comme si rien n'était parti.",
+      "Le nombre de QSO sélectionnés est maintenant toujours visible en haut de la grille du log — plus besoin d'ouvrir le menu clic droit pour le voir.",
+      "NET Control : la liste worked-before dispose du même menu clic droit que QSO récents (mise à jour cty/QRZ/Club Log, envoi aux services, e-mail d'enregistrement, eQSL, suppression).",
+      "Quitter le mode compact restaure la taille ET la position précédentes de la fenêtre (avant, elle reprenait une taille fixe là où la barre compacte avait été déplacée).",
+      "Le champ « Mon indicatif » du filtre avancé est renommé « Station callsign » pour être trouvable sous son nom ADIF (il filtre STATION_CALLSIGN).",
+      "Le filtrage affiche maintenant TOUTES les correspondances : la limite d'affichage (Max) ne s'applique qu'au log non filtré — un filtre qui matche 200 QSO les affiche tous les 200 même avec Max à 100 (plafond de sécurité 10 000, avec un avertissement pour affiner au-delà).",
+      "Nouveau bouton « Tout sélectionner » dans la barre d'outils de la grille — sélectionne toutes les lignes affichées (en respectant les filtres de colonnes actifs) en un clic, prêt pour l'envoi LoTW, le bulk edit ou l'export ; une fois tout sélectionné il devient « Tout désélectionner ».",
+      "NET Control : glisser-déposer entre les deux listes — glisser une station du roster vers la liste on air démarre son QSO, et glisser une station on air vers le roster l'enregistre au log (comme le bouton Logger & terminer).",
+      "Nouvelle option (Réglages → Général) : « Regrouper les modes digitaux en un seul (style DXCC) » — activée, les badges de nouveauté de la matrice et le coloriage cluster new/new-band/new-mode/new-slot traitent FT8/FT4/RTTY/PSK… comme un seul mode Digital, comme le DXCC ; désactivée (défaut), chaque mode digital reste un slot potentiel distinct.",
+      "Plusieurs amplificateurs : Réglages → Amplificateur est maintenant une LISTE — configurez plusieurs amplis (p. ex. deux SPE en parallèle), chacun avec son nom et sa connexion. Les cartes ampli du panneau Flex et de Station Control ont une liste déroulante pour choisir lequel afficher, et la barre du bas montre une pastille cliquable par ampli. Les configurations mono-ampli existantes migrent automatiquement.",
+      "Panneau FlexRadio : les filtres DSP SmartSDR v4 sont maintenant pilotables — NRL et ANFL (LMS legacy), NRS (soustraction spectrale), NRF (réduction de bruit avec filtre) avec leurs curseurs de niveau, plus les interrupteurs RNN (réduction de bruit par IA) et ANFT (notch automatique FFT). La section apparaît automatiquement sur les radios qui les supportent (séries 8000/Aurora). Mise en page rééquilibrée : RIT/XIT passent dans la colonne Transmit et la sélection d'antennes s'affiche en haut de la colonne Receive, avec un nouveau bouton DAX (le toggle DAX du bandeau transmit de SmartSDR — audio d'émission via DAX, pour WSJT-X & co)."
+    ]
+  },
+  {
+    "version": "0.20.8",
+    "date": "2026-07-21",
+    "en": [
+      "New: microHAM ARCO rotator controlled natively — no PstRotator needed. Over the LAN or over USB: set the ARCO's CONTROL PROTOCOL (LAN or USB) to 'Yaesu GS-232A' and pick 'microHAM ARCO' in Settings → Rotator.",
+      "Amplifier without a FlexRadio: the amplifier controls (OPERATE/STANDBY, ON/OFF, live power/SWR/temperature) now also live in the Station Control tab, and a status chip sits in the bottom bar next to Cluster/CAT/Rotator — green ON AIR = OPERATE, orange = STANDBY, red = offline. Clicking the chip toggles OPERATE/STANDBY on all three amps (PowerGenius XL included, over its direct network link).",
+      "NET Control: after logging a station, the next on-air station is selected automatically (chain log → log → log), and a new 'Log everyone' button logs every on-air station at once when the net ends.",
+      "Switching to a profile whose MySQL database is unreachable now shows a clear warning — before, OpsLog silently stayed on the previous logbook and QSOs could land in the wrong log.",
+      "The ON AIR badge is back for local (SQLite) logbooks — it had disappeared with the removal of the live-status option."
+    ],
+    "fr": [
+      "Nouveau : rotator microHAM ARCO contrôlé en natif — sans PstRotator. Par le réseau ou par USB : régler le CONTROL PROTOCOL de l'ARCO (LAN ou USB) sur « Yaesu GS-232A » et choisir « microHAM ARCO » dans Réglages → Rotator.",
+      "Amplificateur sans FlexRadio : les commandes d'ampli (OPERATE/STANDBY, ON/OFF, puissance/ROS/température en direct) sont maintenant aussi dans l'onglet Station Control, et une pastille de statut s'affiche dans la barre du bas à côté de Cluster/CAT/Rotator — vert = OPERATE, orange = STANDBY, rouge = hors ligne. Un clic sur la pastille bascule OPERATE/STANDBY sur les trois amplis (PowerGenius XL compris, via son lien réseau direct).",
+      "NET Control : après avoir loggé une station, la station on air suivante est sélectionnée automatiquement (enchaînement log → log → log), et un nouveau bouton « Logger tout le monde » enregistre toutes les stations on air d'un coup à la fin du net.",
+      "Passer sur un profil dont la base MySQL est injoignable affiche maintenant un avertissement clair — avant, OpsLog restait silencieusement sur l'ancien logbook et les QSO pouvaient partir dans le mauvais log.",
+      "Le badge ON AIR est de retour pour les logbooks locaux (SQLite) — il avait disparu avec la suppression de l'option de statut en direct."
+    ]
+  },
+  {
+    "version": "0.20.7",
+    "date": "2026-07-21",
+    "en": [
+      "New: ACOM amplifier support (500S / 600S / 700S / 1200S / 2020S) — OPERATE/STANDBY/OFF, live telemetry (power, SWR, PA temperature, band, fan) in Settings and the radio panel, over USB serial or an RS232-to-Ethernet bridge. Power-ON works over serial when the cable wires the DTR/RTS pins. The Amplifier settings now pick Brand then Model.",
+      "Multi-operator live sync fixed: the shared-MySQL connection pool was too small, so after a while the grid, chat and 'stations on air' silently stopped updating. The pool is now sized for real multi-op use (with 5 operators it stays well within a max_connections=300 server).",
+      "Live operator status is now always published on a shared MySQL logbook — the Settings toggle is gone. You still go off-air automatically 5 minutes after your last QSO, and the 'stations on air' panel refreshes noticeably faster (a redundant table check on every read was removed).",
+      "The By-Continent statistics donut now totals the same as your QSO count — QSOs whose continent couldn't be resolved are shown as an 'Unknown' slice instead of being dropped (the Continents count still lists only real continents)."
+    ],
+    "fr": [
+      "Nouveau : prise en charge des amplificateurs ACOM (500S / 600S / 700S / 1200S / 2020S) — OPERATE/STANDBY/OFF, télémétrie en direct (puissance, ROS, température PA, bande, ventilateur) dans les Réglages et le panneau radio, en USB série ou via un pont RS232-vers-Ethernet. La mise en marche fonctionne en série si le câble relie les broches DTR/RTS. Les réglages Amplificateur se font maintenant par Marque puis Modèle.",
+      "Synchronisation multi-opérateurs corrigée : le pool de connexions MySQL partagé était trop petit, et au bout d'un moment la grille, le chat et « stations on air » cessaient silencieusement de se mettre à jour. Le pool est maintenant dimensionné pour un vrai multi-op (à 5 opérateurs, on reste largement sous un serveur à max_connections=300).",
+      "Le statut opérateur en direct est maintenant toujours publié sur un logbook MySQL partagé — l'option des Réglages a disparu. Vous passez toujours hors antenne automatiquement 5 minutes après votre dernier QSO, et le panneau « stations on air » se rafraîchit nettement plus vite (une vérification de table redondante à chaque lecture a été supprimée).",
+      "La donut « Par continent » des statistiques totalise maintenant le même nombre que le total de QSO — les QSO dont le continent n'a pas pu être résolu apparaissent dans un segment « Unknown » au lieu d'être ignorés (le compteur Continents ne liste toujours que les vrais continents)."
+    ]
+  },
+  {
+    "version": "0.20.6",
+    "date": "2026-07-21",
+    "en": [
+      "Amplifier controls now live right in the FlexRadio panel: OPERATE/STANDBY, ON/OFF, Low/Mid/High power level, an output-power bar and live band / SWR / temperature — for both PowerGenius XL and SPE Expert. The card is hidden when no amplifier is selected.",
+      "Faster startup: the radio (CAT) connects immediately instead of waiting behind the shared-MySQL connection, and MySQL itself connects much faster.",
+      "No more lost QSOs: an FT8/MSHV QSO that can't reach a laggy shared database is parked and re-logged automatically once it recovers; simultaneous QSOs from a multi-stream are now queued instead of failing with 'too many requests'.",
+      "The 'stations on air' widget now updates within a second of a QSO (it used to lag up to ~45s behind the ON-AIR badge).",
+      "Relay boards (Denkovi / USB-serial) stay connected reliably now, with a Test-connection button and detect feedback in the Station Control setup.",
+      "<LOGQSO> in a CW macro logs the contact at that exact point in the macro, and pressing ESC before it runs cancels the log.",
+      "Auto-call now waits exactly the gap you set between calls (it was waiting far longer).",
+      "Statistics: the redundant per-band chart was merged into the CW / phone / data split.",
+      "Cluster self-spot pop-ups now show the band.",
+      "The bottom status bar is no longer hidden behind a scrollbar in a small window.",
+      "Update check now also runs when you open Help - About, and every 5 minutes."
+    ],
+    "fr": [
+      "Les commandes d'amplificateur sont maintenant directement dans le panneau FlexRadio : OPERATE/STANDBY, Marche/Arrêt, niveau Low/Mid/High, une barre de puissance de sortie et l'état en direct bande / ROS / température — pour PowerGenius XL comme pour SPE Expert. La carte est masquée si aucun ampli n'est sélectionné.",
+      "Démarrage plus rapide : la radio (CAT) se connecte immédiatement au lieu d'attendre derrière la connexion MySQL partagée, et MySQL lui-même se connecte bien plus vite.",
+      "Plus de QSO perdus : un QSO FT8/MSHV qui n'atteint pas une base partagée lente est mis de côté et ré-enregistré automatiquement dès qu'elle répond ; les QSO simultanés d'un multi-stream sont maintenant mis en file au lieu d'échouer avec « too many requests ».",
+      "Le widget « stations on air » se met à jour en une seconde après un QSO (il pouvait accuser jusqu'à ~45s de retard sur le badge ON AIR).",
+      "Les cartes relais (Denkovi / USB-série) restent connectées de façon fiable, avec un bouton « Tester la connexion » et un retour de détection dans la configuration Station Control.",
+      "<LOGQSO> dans une macro CW enregistre le contact à cet endroit précis de la macro, et appuyer sur ÉCHAP avant son exécution annule l'enregistrement.",
+      "L'appel automatique respecte maintenant exactement l'intervalle réglé entre les appels (il attendait bien plus longtemps).",
+      "Statistiques : le graphique par bande redondant a été fusionné avec la répartition CW / phone / data.",
+      "Les popups d'auto-spot du cluster affichent maintenant la bande.",
+      "La barre de statut du bas n'est plus masquée par une barre de défilement en fenêtre réduite.",
+      "La vérification de mise à jour se déclenche aussi à l'ouverture d'Aide - À propos, et toutes les 5 minutes."
+    ]
+  },
+  {
+    "version": "0.20.5",
+    "date": "2026-07-20",
+    "en": [
+      "New FlexRadio CWX CW keyer: key CW straight over the SmartSDR connection — no WinKeyer or SmartCAT needed. Type-ahead and mid-send backspace supported.",
+      "ESC now stops CW on whichever keyer is active (WinKeyer / Icom / Flex), and typing a callsign aborts a running macro.",
+      "New Amplifier settings section (was 'Power Genius'): control SPE Expert amps (1.3K / 1.5K / 2K) over USB serial or an RS232-to-Ethernet bridge — OPERATE/STANDBY and live status. PowerGenius XL still supported.",
+      "Denkovi USB relay boards supported (4/8 relays, FT245), plus generic CH340/LCUS USB-serial relay boards.",
+      "Rename your database from Settings without losing any configuration.",
+      "Awards: DDFM now finds the French department from the address postal code; refs are stored on each QSO for faster columns; 'Publish to catalog' shares an edited award with your team on the next release; award columns are remembered per profile.",
+      "Statistics: per-band mode split (CW / phone / data), and an activity chart with a Day / Week / Month / Year selector (rolling, real dates).",
+      "'Stations on air' widget updates within seconds and fits more stations.",
+      "The audio CW decoder was removed.",
+      "Fixes: Antenna Genius buttons ignored clicks while a macro was sending; File → Exit; and more.",
+      "This 'What's new' summary now appears on the first launch after each update."
+    ],
+    "fr": [
+      "Nouveau keyer CW FlexRadio CWX : manipulation CW directement via la connexion SmartSDR — plus besoin de WinKeyer ni de SmartCAT. Type-ahead et retour arrière en cours d'envoi supportés.",
+      "ESC arrête maintenant le CW sur le moteur actif (WinKeyer / Icom / Flex), et taper un indicatif interrompt une macro en cours.",
+      "Nouvelle section Amplificateur (ex « Power Genius ») : pilotage des SPE Expert (1.3K / 1.5K / 2K) en USB série ou via un pont RS232→Ethernet — OPERATE/STANDBY et état en direct. PowerGenius XL toujours supporté.",
+      "Cartes relais USB Denkovi (4/8 relais, FT245), plus cartes USB-série génériques CH340/LCUS.",
+      "Renommer sa base depuis les réglages sans perdre la configuration.",
+      "Awards : DDFM trouve le département français depuis le code postal de l'adresse ; les réfs sont stockées sur chaque QSO (colonnes plus rapides) ; « Publier au catalogue » partage un award édité avec l'équipe à la prochaine mise à jour ; les colonnes d'award sont mémorisées par profil.",
+      "Statistiques : répartition des modes par bande (CW / phone / data), et un graphe d'activité avec sélecteur Jour / Semaine / Mois / Année (glissant, dates réelles).",
+      "Le widget « Stations on air » se met à jour en quelques secondes et affiche plus de stations.",
+      "Le décodeur CW audio a été retiré.",
+      "Corrections : les boutons Antenna Genius ignoraient les clics pendant l'envoi d'une macro ; Fichier → Quitter ; et d'autres.",
+      "Ce résumé « Nouveautés » s'affiche désormais au premier lancement après chaque mise à jour."
+    ]
+  }
+]

cmd/cntygen/main.go

@@ -0,0 +1,100 @@
+package main
+
+// One-shot generator: reads the FIPS county CSV and emits
+// internal/awardref/uscounties_gen.go. Not part of the build.
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"sort"
+	"strings"
+
+	"hamlog/internal/award"
+)
+
+// dxccForState maps the two US "states" that are separate DXCC entities.
+func dxccForState(st string) int {
+	switch st {
+	case "AK":
+		return 6
+	case "HI":
+		return 110
+	default:
+		return 291
+	}
+}
+
+// territories we exclude entirely — plus DC, which USA-CA does not count as a
+// county.
+var skipState = map[string]bool{"PR": true, "GU": true, "VI": true, "AS": true, "MP": true, "NA": true, "DC": true}
+
+// excludedUSACA reports county-equivalents that the CQ USA-CA award does NOT
+// count as counties: the independent cities of Virginia and Carson City (NV).
+// (Baltimore MD and St. Louis MO ARE counted, so they are kept.) A contact in
+// one of these counts toward a bordering county under the award rules.
+func excludedUSACA(state, name string) bool {
+	n := strings.ToLower(strings.TrimSpace(name))
+	switch state {
+	case "VA":
+		return strings.HasSuffix(n, " city")
+	case "NV":
+		return n == "carson city"
+	}
+	return false
+}
+
+func main() {
+	f, err := os.Open(os.Args[1])
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+
+	type row struct{ code, name string; dxcc int }
+	var rows []row
+	seen := map[string]bool{}
+	sc := bufio.NewScanner(f)
+	sc.Scan() // header
+	for sc.Scan() {
+		line := sc.Text()
+		parts := strings.SplitN(line, ",", 3)
+		if len(parts) < 3 {
+			continue
+		}
+		name := strings.TrimSpace(parts[1])
+		st := strings.TrimSpace(parts[2])
+		if skipState[st] || len(st) != 2 || strings.EqualFold(name, "UNITED STATES") {
+			continue
+		}
+		if excludedUSACA(st, name) {
+			continue
+		}
+		// State header rows have an all-caps state NAME and state code "NA"
+		// (already skipped). County rows have a 2-letter state code.
+		code := award.USCountyKey(st, name)
+		if code == "" || seen[code] {
+			continue
+		}
+		seen[code] = true
+		rows = append(rows, row{code: code, name: name + ", " + st, dxcc: dxccForState(st)})
+	}
+	sort.Slice(rows, func(i, j int) bool { return rows[i].code < rows[j].code })
+
+	var b strings.Builder
+	b.WriteString("// Code generated by cmd/cntygen from FIPS county data. DO NOT EDIT.\n")
+	b.WriteString("package awardref\n\n")
+	b.WriteString("// usCounties is the US Counties (USA-CA) reference list: one entry per county\n")
+	b.WriteString("// in the 50 states, keyed by the canonical \"STATE,COUNTY\" match code that\n")
+	b.WriteString("// award.usCountyKey produces from a QSO's state + cnty fields.\n")
+	fmt.Fprintf(&b, "func usCounties() []Ref {\n\treturn []Ref{\n")
+	for _, r := range rows {
+		fmt.Fprintf(&b, "\t\tref(%q, %q, %d),\n", r.code, r.name, r.dxcc)
+	}
+	b.WriteString("\t}\n}\n")
+
+	if err := os.WriteFile(os.Args[2], []byte(b.String()), 0o644); err != nil {
+		panic(err)
+	}
+	fmt.Printf("wrote %d counties to %s\n", len(rows), os.Args[2])
+}

cmd/icomnettest/main.go

@@ -1,23 +1,21 @@
-// Command icomnettest is an iteration probe for the Icom IP remote protocol
-// (the LAN server built into the IC-7610 — the one RS-BA1 and wfview talk to).
-// We're reimplementing it from the public protocol description, so this tool
-// drives the CONTROL stream (default UDP 50001) and hex-dumps every packet both
-// ways, letting us confirm the framing / type codes against the real rig before
-// folding it into internal/cat/icomnet. Nothing here is copied from wfview
-// (GPLv3) — it's a clean-room implementation from the protocol structure.
+// Command icomnettest is an iteration probe for the Icom IP remote protocol —
+// the LAN server built into the IC-7610 that the Icom "Remote Utility" (and
+// wfview) talk to. OpsLog reimplements this directly so it can BE both the
+// Remote Utility (Ethernet ↔ radio) and the logger/CAT client, dropping the
+// virtual-COM + RS-BA1 chain entirely.
 //
-// This first milestone is the CONNECTION HANDSHAKE only (no login yet):
-//   areYouThere → iAmHere → areYouReady → iAmReady → periodic idle pings.
-// Watch the log: if the rig answers our areYouThere we've got the framing right;
-// its reply reveals the remote station ID we echo back. Login (token + user/
-// password) is the next step once the handshake is confirmed.
+// This probe drives TWO streams and hex-dumps everything:
+//   Control (UDP 50001): handshake → login → token   [VERIFIED on the real rig]
+//   CI-V    (UDP 50002): handshake → openClose(open) → send CI-V read-freq
+//                        (FE FE 98 E0 03 FD) → print the rig's reply.
+// Framing (passcode table, packet offsets, CI-V data_packet, openclose) is
+// reimplemented from the public wfview protocol and verified byte-for-byte
+// against real Remote-Utility captures (build/bin/civ*.pcapng). No GPLv3 code.
 //
 // Usage:
-//   go run ./cmd/icomnettest 192.168.1.60            # control port 50001
-//   go run ./cmd/icomnettest 192.168.1.60 50001 20   # port + run seconds
+//   go run ./cmd/icomnettest <rig-ip> <user> <pass> [compname]
 //
-// SAFE: only the control stream, no CI-V commands, no TX — it just opens and
-// pings, then disconnects. Share the log and we iterate.
+// SAFE: read-only CI-V (operating frequency). No TX, no writes.
 package main
 
 import (
@@ -26,83 +24,59 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"strconv"
 	"time"
 )
 
-// Control-stream packet types (best-known values from the public protocol
-// description — the very thing we're verifying with this probe).
-const (
-	typeAreYouThere = 0x03
-	typeIAmHere     = 0x04
-	typeDisconnect  = 0x05
-	typeAreYouReady = 0x06 // same type both directions (areYouReady / iAmReady)
-	typeIdle        = 0x00 // 16-byte keepalive (retransmit/ack carrier)
-	typePing        = 0x07 // 21-byte ping (offset 16 = 0x00 request / 0x01 reply, +4-byte payload)
-)
+var le = binary.LittleEndian
+var be = binary.BigEndian
 
-// ctrlPacket is the 16-byte common control packet, all fields little-endian:
-//
-//	uint32 len (=0x10) · uint16 type · uint16 seq · uint32 sentid · uint32 rcvdid
-func ctrlPacket(typ uint16, seq uint16, sentid, rcvdid uint32) []byte {
-	b := make([]byte, 16)
-	binary.LittleEndian.PutUint32(b[0:], 0x10)
-	binary.LittleEndian.PutUint16(b[4:], typ)
-	binary.LittleEndian.PutUint16(b[6:], seq)
-	binary.LittleEndian.PutUint32(b[8:], sentid)
-	binary.LittleEndian.PutUint32(b[12:], rcvdid)
-	return b
-}
-
-// passcodeSeq is Icom's fixed obfuscation table for the login username/password
-// (used by RS-BA1). BEST-EFFORT public reconstruction — the values that matter
-// for a given credential are sequence[char+index]; if the radio rejects auth,
-// compare the "scrambled" bytes this tool prints against a real login capture to
-// correct the needed entries.
+// passcodeSeq — Icom's obfuscation table (values live at index 0x20..0x7e).
+// VERIFIED: user "f6bgc" → 3F 65 50 25 55 (matches the capture).
 var passcodeSeq = [256]byte{
-	0x47, 0x5d, 0x4c, 0x42, 0x66, 0x20, 0x23, 0x46, 0x4e, 0x57, 0x45, 0x3d, 0x67, 0x76, 0x60, 0x41,
-	0x62, 0x39, 0x59, 0x2d, 0x68, 0x7e, 0x20, 0x77, 0x5f, 0x51, 0x3e, 0x70, 0x4d, 0x1f, 0x74, 0x38,
-	0x2c, 0x4b, 0x1e, 0x54, 0x30, 0x71, 0x2b, 0x2a, 0x66, 0x27, 0x2e, 0x58, 0x24, 0x21, 0x2f, 0x50,
-	0x1b, 0x73, 0x69, 0x36, 0x1d, 0x4f, 0x1c, 0x51, 0x2e, 0x1e, 0x45, 0x2e, 0x22, 0x50, 0x64, 0x66,
-	0x24, 0x36, 0x0c, 0x7d, 0x50, 0x25, 0x7c, 0x3f, 0x2d, 0x35, 0x71, 0x6a, 0x0e, 0x41, 0x2a, 0x67,
-	0x7c, 0x64, 0x77, 0x67, 0x6d, 0x5b, 0x3d, 0x5b, 0x2b, 0x67, 0x6c, 0x39, 0x35, 0x76, 0x3b, 0x2f,
-	0x2f, 0x6d, 0x59, 0x6e, 0x59, 0x77, 0x3b, 0x24, 0x74, 0x7c, 0x6b, 0x37, 0x54, 0x5c, 0x4d, 0x1f,
-	0x27, 0x69, 0x5b, 0x2e, 0x28, 0x35, 0x77, 0x74, 0x35, 0x1f, 0x6a, 0x2a, 0x28, 0x30, 0x25, 0x20,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0x47, 0x5d, 0x4c, 0x42, 0x66, 0x20, 0x23, 0x46, 0x4e, 0x57, 0x45, 0x3d, 0x67, 0x76, 0x60, 0x41, 0x62, 0x39, 0x59, 0x2d, 0x68, 0x7e,
+	0x7c, 0x65, 0x7d, 0x49, 0x29, 0x72, 0x73, 0x78, 0x21, 0x6e, 0x5a, 0x5e, 0x4a, 0x3e, 0x71, 0x2c, 0x2a, 0x54, 0x3c, 0x3a, 0x63, 0x4f,
+	0x43, 0x75, 0x27, 0x79, 0x5b, 0x35, 0x70, 0x48, 0x6b, 0x56, 0x6f, 0x34, 0x32, 0x6c, 0x30, 0x61, 0x6d, 0x7b, 0x2f, 0x4b, 0x64, 0x38,
+	0x2b, 0x2e, 0x50, 0x40, 0x3f, 0x55, 0x33, 0x37, 0x25, 0x77, 0x24, 0x26, 0x74, 0x6a, 0x28, 0x53, 0x4d, 0x69, 0x22, 0x5c, 0x44, 0x31,
+	0x36, 0x58, 0x3b, 0x7a, 0x51, 0x5f, 0x52,
 }
 
-// passcode scrambles s (username or password) via the Icom sequence table.
 func passcode(s string) []byte {
-	out := make([]byte, len(s))
-	for i := 0; i < len(s); i++ {
+	out := make([]byte, 0, len(s))
+	for i := 0; i < len(s) && i < 16; i++ {
 		p := int(s[i]) + i
-		if p > 0x7f {
-			p = ((p - 0x7f) % 0x33) - 1
-			if p < 0 {
-				p = 0
-			}
+		if p > 126 {
+			p = 32 + p%127
 		}
-		out[i] = passcodeSeq[p&0xff]
+		out = append(out, passcodeSeq[p])
 	}
 	return out
 }
 
-// buildLogin builds the 0x80-byte login packet: control header + username/
-// password (scrambled) at 0x40/0x50 and the app name at 0x60. The middle fields
-// (payload size, request type, inner seq, token request) are a best-effort
-// reconstruction and may need adjustment against a capture.
-func buildLogin(seq uint16, sentid, rcvdid uint32, innerSeq, tokRequest uint16, user, pass, name string) []byte {
+// --- packet builders (offsets verified vs wfview structs + real captures) ---
+
+func ctrlPacket(typ, seq uint16, sentid, rcvdid uint32) []byte {
+	b := make([]byte, 16)
+	le.PutUint32(b[0:], 0x10)
+	le.PutUint16(b[4:], typ)
+	le.PutUint16(b[6:], seq)
+	le.PutUint32(b[8:], sentid)
+	le.PutUint32(b[12:], rcvdid)
+	return b
+}
+
+func buildLogin(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, user, pass, name string) []byte {
 	b := make([]byte, 0x80)
-	binary.LittleEndian.PutUint32(b[0:], 0x80) // len
-	// type (b[4:6]) = 0x00
-	binary.LittleEndian.PutUint16(b[6:], seq)
-	binary.LittleEndian.PutUint32(b[8:], sentid)
-	binary.LittleEndian.PutUint32(b[12:], rcvdid)
-	binary.LittleEndian.PutUint32(b[16:], 0x70) // payload size (len - 0x10)
-	binary.LittleEndian.PutUint16(b[20:], 0x00) // requesttype
-	binary.LittleEndian.PutUint16(b[22:], 0x01) // requestreply
-	binary.LittleEndian.PutUint16(b[24:], innerSeq)
-	binary.LittleEndian.PutUint16(b[26:], tokRequest)
-	// token (b[0x20:0x24]) = 0 until the rig grants one
+	le.PutUint32(b[0:], 0x80)
+	le.PutUint16(b[6:], seq)
+	le.PutUint32(b[8:], sentid)
+	le.PutUint32(b[12:], rcvdid)
+	be.PutUint32(b[0x10:], 0x80-0x10)
+	b[0x14] = 0x01 // requestreply
+	b[0x15] = 0x00 // requesttype = login
+	be.PutUint16(b[0x16:], innerSeq)
+	le.PutUint16(b[0x1a:], tokReq)
+	le.PutUint32(b[0x1c:], token)
 	copy(b[0x40:0x50], passcode(user))
 	copy(b[0x50:0x60], passcode(pass))
 	nm := name
@@ -113,140 +87,380 @@ func buildLogin(seq uint16, sentid, rcvdid uint32, innerSeq, tokRequest uint16,
 	return b
 }
 
-func parseHeader(b []byte) (length uint32, typ, seq uint16, sentid, rcvdid uint32, ok bool) {
+func buildToken(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32) []byte {
+	b := make([]byte, 0x40)
+	le.PutUint32(b[0:], 0x40)
+	le.PutUint16(b[6:], seq)
+	le.PutUint32(b[8:], sentid)
+	le.PutUint32(b[12:], rcvdid)
+	be.PutUint32(b[0x10:], 0x40-0x10)
+	b[0x14] = 0x01 // requestreply
+	b[0x15] = 0x02 // requesttype = token
+	be.PutUint16(b[0x16:], innerSeq)
+	le.PutUint16(b[0x1a:], tokReq)
+	le.PutUint32(b[0x1c:], token)
+	return b
+}
+
+// buildConnInfo — 144-byte sendRequestStream on the CONTROL stream. Tells the
+// rig to route the CI-V/audio streams to the authenticated session and which
+// local ports we use. Values verified byte-for-byte vs a real Remote-Utility
+// capture (civ4): requesttype=0x03, commoncap=0x8010, the rig's MAC echoed,
+// name "IC-7610", scrambled username, rxenable=0 (audio off — CI-V only),
+// rxcodec 0x10 / txcodec 0x04, rxsample 16000 / txsample 8000 (BE), civport /
+// audioport (BE), txbuffer 100.
+func buildConnInfo(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, user string, rigMAC []byte, civPort, audioPort uint16) []byte {
+	b := make([]byte, 0x90)
+	le.PutUint32(b[0:], 0x90)
+	le.PutUint16(b[6:], seq)
+	le.PutUint32(b[8:], sentid)
+	le.PutUint32(b[12:], rcvdid)
+	be.PutUint32(b[0x10:], 0x90-0x10)
+	b[0x14] = 0x01 // requestreply
+	b[0x15] = 0x03 // requesttype = conninfo / open streams
+	be.PutUint16(b[0x16:], innerSeq)
+	le.PutUint16(b[0x1a:], tokReq)
+	le.PutUint32(b[0x1c:], token)
+	le.PutUint16(b[0x27:], 0x8010) // commoncap
+	copy(b[0x2a:0x30], rigMAC)     // macaddress (the rig's, echoed back)
+	copy(b[0x40:0x60], []byte("IC-7610"))
+	copy(b[0x60:0x70], passcode(user))
+	b[0x70] = 0x00 // rxenable (0 = audio off)
+	b[0x71] = 0x00 // txenable
+	b[0x72] = 0x10 // rxcodec
+	b[0x73] = 0x04 // txcodec
+	be.PutUint32(b[0x74:], 16000) // rxsample
+	be.PutUint32(b[0x78:], 8000)  // txsample
+	be.PutUint32(b[0x7c:], uint32(civPort))
+	be.PutUint32(b[0x80:], uint32(audioPort))
+	be.PutUint32(b[0x84:], 100) // txbuffer
+	b[0x88] = 0x00              // convert
+	return b
+}
+
+// buildOpenClose — 22-byte start/stop for the CI-V stream. magic 0x04=open,
+// 0x00=close. data=0x01c0 (@0x10), civSeq (BE @0x13), magic (@0x15).
+func buildOpenClose(seq uint16, sentid, rcvdid uint32, civSeq uint16, magic byte) []byte {
+	b := make([]byte, 0x16)
+	le.PutUint32(b[0:], 0x16)
+	le.PutUint16(b[6:], seq)
+	le.PutUint32(b[8:], sentid)
+	le.PutUint32(b[12:], rcvdid)
+	le.PutUint16(b[0x10:], 0x01c0)
+	be.PutUint16(b[0x13:], civSeq)
+	b[0x15] = magic
+	return b
+}
+
+// buildCivData — wraps raw CI-V bytes: 21-byte header (reply 0xc1 @0x10,
+// datalen LE @0x11, civSeq BE @0x13) + CI-V frame @0x15.
+func buildCivData(seq uint16, sentid, rcvdid uint32, civSeq uint16, civ []byte) []byte {
+	n := 0x15 + len(civ)
+	b := make([]byte, n)
+	le.PutUint32(b[0:], uint32(n))
+	le.PutUint16(b[6:], seq)
+	le.PutUint32(b[8:], sentid)
+	le.PutUint32(b[12:], rcvdid)
+	b[0x10] = 0xc1
+	le.PutUint16(b[0x11:], uint16(len(civ)))
+	be.PutUint16(b[0x13:], civSeq)
+	copy(b[0x15:], civ)
+	return b
+}
+
+func header(b []byte) (length uint32, typ, seq uint16, sentid, rcvdid uint32, ok bool) {
 	if len(b) < 16 {
 		return 0, 0, 0, 0, 0, false
 	}
-	length = binary.LittleEndian.Uint32(b[0:])
-	typ = binary.LittleEndian.Uint16(b[4:])
-	seq = binary.LittleEndian.Uint16(b[6:])
-	sentid = binary.LittleEndian.Uint32(b[8:])
-	rcvdid = binary.LittleEndian.Uint32(b[12:])
-	return length, typ, seq, sentid, rcvdid, true
+	return le.Uint32(b[0:]), le.Uint16(b[4:]), le.Uint16(b[6:]), le.Uint32(b[8:]), le.Uint32(b[12:]), true
+}
+
+func localID(conn net.Conn) uint32 {
+	a := conn.LocalAddr().(*net.UDPAddr)
+	return uint32(a.IP.To4()[0])<<24 | uint32(a.IP.To4()[1])<<16 | uint32(uint16(a.Port))
+}
+
+func recv(conn net.Conn, ms int, buf []byte) ([]byte, bool) {
+	_ = conn.SetReadDeadline(time.Now().Add(time.Duration(ms) * time.Millisecond))
+	n, err := conn.Read(buf)
+	if err != nil {
+		return nil, false
+	}
+	return append([]byte(nil), buf[:n]...), true
+}
+
+func dump(tag string, p []byte) { fmt.Printf("%s (%d)\n%s\n", tag, len(p), hex.Dump(p)) }
+
+// pingReply mirrors a ping, swaps ids, sets the reply flag at offset 16.
+func pingReply(pkt []byte, myID, remoteID uint32) []byte {
+	r := append([]byte(nil), pkt...)
+	if len(r) >= 17 {
+		le.PutUint32(r[8:], myID)
+		le.PutUint32(r[12:], remoteID)
+		r[16] = 0x01
+	}
+	return r
+}
+
+// handshake: areYouThere(seq0) → iAmHere → areYouReady(seq1) → iAmReady.
+// Returns the rig's remote id. Replies to any pings meanwhile.
+func handshake(conn net.Conn, myID uint32, label string) (uint32, bool) {
+	buf := make([]byte, 2048)
+	conn.Write(ctrlPacket(0x03, 0, myID, 0)) // areYouThere
+	fmt.Printf("[%s] TX areYouThere\n", label)
+	var remoteID uint32
+	deadline := time.Now().Add(4 * time.Second)
+	lastTry := time.Now()
+	for time.Now().Before(deadline) {
+		p, ok := recv(conn, 200, buf)
+		if !ok {
+			if remoteID == 0 && time.Since(lastTry) > 500*time.Millisecond {
+				conn.Write(ctrlPacket(0x03, 0, myID, 0))
+				lastTry = time.Now()
+			}
+			continue
+		}
+		_, typ, _, sentid, _, ok := header(p)
+		if !ok {
+			continue
+		}
+		switch typ {
+		case 0x04: // iAmHere
+			remoteID = sentid
+			fmt.Printf("[%s] iAmHere remoteID=0x%08X → TX areYouReady\n", label, remoteID)
+			conn.Write(ctrlPacket(0x06, 1, myID, remoteID))
+		case 0x06: // iAmReady
+			if remoteID != 0 {
+				fmt.Printf("[%s] iAmReady — link up ✓\n", label)
+				return remoteID, true
+			}
+		case 0x07: // ping
+			conn.Write(pingReply(p, myID, remoteID))
+		}
+	}
+	return remoteID, false
 }
 
 func main() {
-	if len(os.Args) < 2 {
-		fmt.Println("usage: icomnettest <rig-ip> [user] [password]")
-		fmt.Println("  <rig-ip> only          → handshake + ping probe")
-		fmt.Println("  <rig-ip> <user> <pass> → also attempt login")
-		fmt.Println("example: icomnettest 192.168.1.60 f6bgc cgb6f1")
+	if len(os.Args) < 4 {
+		fmt.Println("usage: icomnettest <rig-ip> <user> <pass> [compname]")
 		os.Exit(2)
 	}
-	ip := os.Args[1]
-	port := 50001
-	runSecs := 25
-	user, pass := "", ""
-	if len(os.Args) >= 4 {
-		user, pass = os.Args[2], os.Args[3]
+	ip, user, pass := os.Args[1], os.Args[2], os.Args[3]
+	compName := "OpsLog"
+	if len(os.Args) >= 5 {
+		compName = os.Args[4]
 	}
 
-	target := net.JoinHostPort(ip, strconv.Itoa(port))
-	conn, err := net.Dial("udp4", target)
+	// ===================== CONTROL STREAM (50001) =====================
+	ctrl, err := net.Dial("udp4", net.JoinHostPort(ip, "50001"))
 	if err != nil {
-		fmt.Printf("dial %s: %v\n", target, err)
+		fmt.Printf("dial control: %v\n", err)
 		os.Exit(1)
 	}
-	defer conn.Close()
+	defer ctrl.Close()
+	cID := localID(ctrl)
+	fmt.Printf("=== CONTROL 50001 (myID=0x%08X) ===\n", cID)
+	fmt.Printf("scrambled user=% X  pass=% X\n\n", passcode(user), passcode(pass))
 
-	// Our local station ID. Real clients derive it from the local IP:port; a
-	// stable non-zero value is fine for probing. We'll refine once we see how the
-	// rig echoes it back.
-	local := conn.LocalAddr().(*net.UDPAddr)
-	myID := uint32(local.IP.To4()[0])<<24 | uint32(local.IP.To4()[1])<<16 | uint32(uint16(local.Port))
-	var remoteID uint32
-	var seq uint16
-
-	logTx := func(name string, p []byte) {
-		fmt.Printf("TX %-14s (%d bytes)\n%s\n", name, len(p), hex.Dump(p))
-		if _, err := conn.Write(p); err != nil {
-			fmt.Printf("   write error: %v\n", err)
-		}
+	cRemote, ok := handshake(ctrl, cID, "ctrl")
+	if !ok {
+		fmt.Println("control handshake failed")
+		return
 	}
 
-	fmt.Printf("Probing Icom control stream at %s  (myID=0x%08X)\n\n", target, myID)
-	if user != "" {
-		fmt.Printf("Login mode: user=%q pass=%q\n", user, pass)
-		fmt.Printf("  scrambled user = % X\n", passcode(user))
-		fmt.Printf("  scrambled pass = % X\n\n", passcode(pass))
-	}
-	var innerSeq uint16 = 0x0001
-	var tokRequest uint16 = 0x1234 // fixed for reproducibility (no RNG in this probe)
-	loginSent := false
+	// login → token
+	var cTracked uint16 = 1
+	var cInner uint16 = 1
+	tokReq := uint16(0x0c77)
+	dump("[ctrl] TX login", buildLogin(cTracked, cInner, tokReq, cID, cRemote, 0, user, pass, compName))
+	ctrl.Write(buildLogin(cTracked, cInner, tokReq, cID, cRemote, 0, user, pass, compName))
+	cTracked++
+	cInner++
 
-	// 1) areYouThere — ask the rig to announce itself.
-	seq++
-	logTx("areYouThere", ctrlPacket(typeAreYouThere, seq, myID, 0))
-
-	// Read loop: dump everything, and advance the handshake when we recognise a
-	// reply. Runs for runSecs then disconnects.
-	deadline := time.Now().Add(time.Duration(runSecs) * time.Second)
+	var token uint32
 	buf := make([]byte, 2048)
-	lastIdle := time.Now()
-	readyStarted := false
-	for time.Now().Before(deadline) {
-		_ = conn.SetReadDeadline(time.Now().Add(200 * time.Millisecond))
-		n, err := conn.Read(buf)
-		if err != nil {
-			if ne, ok := err.(net.Error); ok && ne.Timeout() {
-				// Periodic idle keepalive once connected.
-				if remoteID != 0 && time.Since(lastIdle) > 100*time.Millisecond {
-					seq++
-					logTx("idle", ctrlPacket(typeIdle, seq, myID, remoteID))
-					lastIdle = time.Now()
-				}
-				continue
-			}
-			fmt.Printf("read error: %v\n", err)
-			break
-		}
-		pkt := append([]byte(nil), buf[:n]...)
-		length, typ, rseq, sentid, rcvdid, ok := parseHeader(pkt)
+	deadline := time.Now().Add(4 * time.Second)
+	for token == 0 && time.Now().Before(deadline) {
+		p, ok := recv(ctrl, 200, buf)
 		if !ok {
-			fmt.Printf("RX (%d bytes, too short to parse)\n%s\n", n, hex.Dump(pkt))
 			continue
 		}
-		fmt.Printf("RX len=%d type=0x%02X seq=%d sentid=0x%08X rcvdid=0x%08X (%d bytes)\n%s\n",
-			length, typ, rseq, sentid, rcvdid, n, hex.Dump(pkt))
+		length, typ, _, _, _, _ := header(p)
+		if typ == 0x00 && length == 0x60 && len(p) >= 0x34 { // login response
+			token = le.Uint32(p[0x1c:])
+			errCode := le.Uint32(p[0x30:])
+			if errCode != 0 || token == 0 {
+				fmt.Printf(">> LOGIN REJECTED err=0x%08X token=0x%08X\n", errCode, token)
+				return
+			}
+			fmt.Printf(">> LOGIN OK ✓ token=0x%08X\n", token)
+			ctrl.Write(buildToken(cTracked, cInner, tokReq, cID, cRemote, token))
+			cTracked++
+			cInner++
+		} else if typ == 0x07 {
+			ctrl.Write(pingReply(p, cID, cRemote))
+		}
+	}
+	if token == 0 {
+		fmt.Println("no token — login not accepted")
+		return
+	}
 
-		switch typ {
-		case typeIAmHere:
-			remoteID = sentid // the rig's ID — echo it back as rcvdid from now on
-			fmt.Printf(">> iAmHere: remoteID=0x%08X — sending areYouReady\n\n", remoteID)
-			seq++
-			logTx("areYouReady", ctrlPacket(typeAreYouReady, seq, myID, remoteID))
-			readyStarted = true
-		case typeAreYouReady:
-			if readyStarted && !loginSent {
-				fmt.Printf(">> iAmReady — control link is up.\n\n")
-				if user != "" {
-					seq++
-					lg := buildLogin(seq, myID, remoteID, innerSeq, tokRequest, user, pass, "OpsLog")
-					fmt.Printf(">> sending login (user=%q)\n", user)
-					logTx("login", lg)
-					loginSent = true
-				}
+	// Send conninfo on the control stream — routes the CI-V stream to this
+	// authenticated session and announces our civ/audio local ports (50002/3).
+	rigMAC := []byte{0x00, 0x90, 0xc7, 0x09, 0xba, 0x3f} // F6BGC's IC-7610 (from the caps packet)
+	dump("[ctrl] TX conninfo", buildConnInfo(cTracked, cInner, tokReq, cID, cRemote, token, user, rigMAC, 50002, 50003))
+	ctrl.Write(buildConnInfo(cTracked, cInner, tokReq, cID, cRemote, token, user, rigMAC, 50002, 50003))
+	cTracked++
+	cInner++
+	// Let the rig's caps/conninfo replies flow for ~600ms (reply to pings).
+	drainEnd := time.Now().Add(600 * time.Millisecond)
+	for time.Now().Before(drainEnd) {
+		if p, ok := recv(ctrl, 100, buf); ok {
+			if _, typ, _, _, _, _ := header(p); typ == 0x07 {
+				ctrl.Write(pingReply(p, cID, cRemote))
 			}
-		case typePing:
-			// Reply to the rig's ping: mirror the packet, swap sender/receiver IDs,
-			// set the reply flag at offset 16. Keeps the link healthy so we can
-			// observe the connection long enough to work on login.
-			reply := append([]byte(nil), pkt...)
-			if len(reply) >= 17 {
-				binary.LittleEndian.PutUint32(reply[8:], myID)
-				binary.LittleEndian.PutUint32(reply[12:], remoteID)
-				reply[16] = 0x01 // request → reply
-				logTx("pingReply", reply)
-			}
-		case typeDisconnect:
-			fmt.Printf(">> rig sent disconnect\n\n")
 		}
 	}
 
-	// Clean disconnect.
-	if remoteID != 0 {
-		seq++
-		logTx("disconnect", ctrlPacket(typeDisconnect, seq, myID, remoteID))
+	// ===================== CI-V STREAM (50002) =====================
+	// Bind our civ socket to LOCAL port 50002 (= the civport announced above),
+	// as the Remote Utility does. Requires the Remote Utility to be CLOSED.
+	civ, err := net.DialUDP("udp4", &net.UDPAddr{Port: 50002}, &net.UDPAddr{IP: net.ParseIP(ip), Port: 50002})
+	if err != nil {
+		fmt.Printf("dial civ (local :50002 — is the Remote Utility still running?): %v\n", err)
+		return
 	}
-	fmt.Println("Done. Paste the log — especially the rig's replies to areYouThere.")
+	defer civ.Close()
+	vID := localID(civ)
+	fmt.Printf("\n=== CI-V 50002 (myID=0x%08X) ===\n", vID)
+	vRemote, ok := handshake(civ, vID, "civ")
+	if !ok {
+		fmt.Println("CI-V handshake failed (may need the conninfo packet on control first)")
+		return
+	}
+
+	var vTracked uint16 = 1 // outer tracked seq @0x06
+	var vCivSeq uint16 = 1  // inner CI-V seq @0x13 (BE)
+	// openClose(open) starts CI-V data flow.
+	dump("[civ] TX openClose(open)", buildOpenClose(vTracked, vID, vRemote, vCivSeq, 0x04))
+	civ.Write(buildOpenClose(vTracked, vID, vRemote, vCivSeq, 0x04))
+	vTracked++
+	vCivSeq++
+
+	// Try several read commands, spaced out. Some rigs NG the basic 0x03 read
+	// over the network tunnel; 0x25 / 0x04 and unsolicited transceive frames
+	// (sent when you turn the VFO) still work. The tunnel itself is proven, so
+	// this figures out which read the rig actually answers.
+	sendCiv := func(name string, f []byte) {
+		fmt.Printf("[civ] TX %s\n", name)
+		civ.Write(buildCivData(vTracked, vID, vRemote, vCivSeq, f))
+		vTracked++
+		vCivSeq++
+	}
+	// The rig is in STANDBY (network up, radio off) — it NG's every command
+	// until powered on via CI-V. Send power-on (0x18 0x01, with an FE wake
+	// preamble, as the Remote Utility does), then poll read-freq while it boots.
+	powerOn := make([]byte, 0, 32)
+	for i := 0; i < 25; i++ {
+		powerOn = append(powerOn, 0xFE)
+	}
+	powerOn = append(powerOn, 0xFE, 0xFE, 0x98, 0xE0, 0x18, 0x01, 0xFD)
+	time.Sleep(300 * time.Millisecond)
+	sendCiv("POWER ON (0x18 01)", powerOn)
+	fmt.Print("\n>>> rig booting (~10-15 s) — polling read-freq until it answers <<<\n\n")
+	readFreq := []byte{0xFE, 0xFE, 0x98, 0xE0, 0x03, 0xFD}
+
+	cbuf := make([]byte, 4096)
+	vbuf := make([]byte, 4096)
+	end := time.Now().Add(30 * time.Second)
+	lastIdleC, lastIdleV, lastCmd := time.Now(), time.Now(), time.Now()
+	for time.Now().Before(end) {
+		if p, ok := recv(ctrl, 40, cbuf); ok {
+			if _, typ, _, _, _, _ := header(p); typ == 0x07 {
+				ctrl.Write(pingReply(p, cID, cRemote))
+			}
+		} else if time.Since(lastIdleC) > 200*time.Millisecond {
+			ctrl.Write(ctrlPacket(0x00, 0, cID, cRemote))
+			lastIdleC = time.Now()
+		}
+		if p, ok := recv(civ, 40, vbuf); ok {
+			_, typ, _, _, _, _ := header(p)
+			if typ == 0x07 {
+				civ.Write(pingReply(p, vID, vRemote))
+			} else if typ == 0x00 && len(p) > 0x15 && p[0x10] == 0xc1 {
+				f := p[0x15:]
+				if d := decodeCiv(f); d != "" {
+					fmt.Printf(">> CI-V RX: % X   %s\n", f, d)
+				}
+			}
+		} else if time.Since(lastIdleV) > 200*time.Millisecond {
+			civ.Write(ctrlPacket(0x00, 0, vID, vRemote))
+			lastIdleV = time.Now()
+		}
+		if time.Since(lastCmd) > 1000*time.Millisecond {
+			sendCiv("read-freq 0x03", readFreq)
+			lastCmd = time.Now()
+		}
+	}
+
+	// Clean close.
+	civ.Write(buildOpenClose(vTracked, vID, vRemote, vCivSeq, 0x00)) // openClose(close)
+	civ.Write(ctrlPacket(0x05, 0, vID, vRemote))                     // disconnect
+	ctrl.Write(ctrlPacket(0x05, 0, cID, cRemote))
+	fmt.Println("\nDone. Look for '>> CI-V RX:' and 'FREQUENCY reply'.")
+}
+
+// decodeCiv describes a received CI-V frame (FE FE <to> <from> <cmd> … FD).
+// Only frames FROM the rig (from=0x98) are interesting; our own echoed commands
+// (from=0xE0) return "" so they're not printed.
+func decodeCiv(f []byte) string {
+	if len(f) < 6 || f[0] != 0xFE || f[1] != 0xFE {
+		return ""
+	}
+	if f[3] != 0x98 { // not from the rig (our echoed command) — skip
+		return ""
+	}
+	cmd := f[4]
+	body := f[5 : len(f)-1] // between cmd and the trailing FD
+	switch cmd {
+	case 0xFA:
+		return "NG (command rejected)"
+	case 0xFB:
+		return "OK (ack)"
+	case 0x00, 0x03, 0x05: // (transceive) freq / read-freq
+		if len(body) >= 5 {
+			return "FREQ " + decodeFreq(body[:5])
+		}
+	case 0x25: // read/set VFO freq (body = subcmd + 5 BCD)
+		if len(body) >= 6 {
+			return fmt.Sprintf("VFO%d FREQ %s", body[0], decodeFreq(body[1:6]))
+		}
+	case 0x01, 0x04: // (transceive) mode / read-mode
+		if len(body) >= 1 {
+			return fmt.Sprintf("MODE 0x%02X filt 0x%02X", body[0], lastOr(body, 1))
+		}
+	}
+	return fmt.Sprintf("cmd 0x%02X", cmd)
+}
+
+func lastOr(b []byte, i int) byte {
+	if i < len(b) {
+		return b[i]
+	}
+	return 0
+}
+
+// decodeFreq turns Icom little-endian BCD (5 bytes) into a MHz string.
+func decodeFreq(bcd []byte) string {
+	var hz uint64
+	mul := uint64(1)
+	for _, b := range bcd {
+		hz += uint64(b&0x0f) * mul
+		mul *= 10
+		hz += uint64(b>>4) * mul
+		mul *= 10
+	}
+	return fmt.Sprintf("%.6f MHz", float64(hz)/1e6)
 }

docs/livestatus/tm74-status.php

@@ -17,6 +17,7 @@
  */
 
 $DB_HOST = '10.10.10.15';      // your MySQL host (same as OpsLog's logbook)
+$DB_PORT = 3306;               // MySQL port — change if your server listens elsewhere
 $DB_NAME = 'opslog';           // database name
 $DB_USER = 'opslog';
 $DB_PASS = 'CHANGE_ME';
@@ -27,7 +28,7 @@ $STALE_SECONDS = 120;          // an operator is "active" if seen within this wi
 // instead of a fatal "table doesn't exist".
 mysqli_report(MYSQLI_REPORT_OFF);
 
-$mysqli = @new mysqli($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME);
+$mysqli = @new mysqli($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_PORT);
 if ($mysqli->connect_errno) {
     http_response_code(500);
     exit('DB error');

frontend/src/components/AntGeniusPanel.tsx

@@ -1,14 +1,30 @@
-import { Antenna, X } from 'lucide-react';
+import { useState } from 'react';
+import { Antenna, X, ListFilter } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { useI18n } from '@/lib/i18n';
 
-export type AGAntenna = { index: number; name: string };
+export type AGAntenna = { index: number; name: string; bands?: number };
 export type AGStatus = {
   connected: boolean; host?: string; last_error?: string;
   port_a: number; port_b: number; tx_a?: boolean; tx_b?: boolean;
   antennas: AGAntenna[];
 };
 
+// AG_BAND_BITS maps a band name to its bit in the 4O3A Antenna Genius band
+// bitmask (standard HF+6m order, bit 0 = 160m). Used to show only the antennas
+// configured for the current band, like the native app. If the mapping ever
+// proves off on real hardware, the debug log (antgenius: antenna raw …) shows the
+// device's actual mask so it can be corrected.
+const AG_BAND_BITS: Record<string, number> = {
+  '160m': 1 << 0, '80m': 1 << 1, '60m': 0, '40m': 1 << 2, '30m': 1 << 3,
+  '20m': 1 << 4, '17m': 1 << 5, '15m': 1 << 6, '12m': 1 << 7, '10m': 1 << 8, '6m': 1 << 9,
+};
+
+function bandBit(band?: string): number {
+  if (!band) return 0;
+  return AG_BAND_BITS[band.trim().toLowerCase()] ?? 0;
+}
+
 // Format an antenna name: first letter uppercase, the rest lowercase
 // (e.g. "DX COMMANDER" → "Dx commander").
 function pretty(name: string): string {
@@ -17,39 +33,64 @@ function pretty(name: string): string {
   return t.charAt(0).toUpperCase() + t.slice(1).toLowerCase();
 }
 
+// PortBtn is defined at MODULE scope on purpose. Defined inside AntGeniusPanel it
+// would be a new component *type* on every render, so React would unmount and
+// remount every port button each time the panel re-renders — harmless when that's
+// rare, but with the CW decoder running the parent re-renders many times a second
+// and the buttons were being torn down mid-click (mousedown and mouseup landing on
+// different element instances), so antenna changes silently did nothing.
+function PortBtn({ port, index, active, tx, onActivate, t }: {
+  port: 1 | 2; index: number; active: boolean; tx: boolean;
+  onActivate: (port: number, antenna: number) => void;
+  t: (key: string, vars?: Record<string, string | number>) => string;
+}) {
+  const letter = port === 1 ? 'A' : 'B';
+  const cls = tx
+    ? 'bg-gradient-to-b from-red-500 to-rose-600 text-white border-red-400/50 shadow-[0_0_10px_rgba(244,63,94,0.5)] animate-pulse'
+    : active
+      ? (port === 1
+        ? 'bg-gradient-to-b from-emerald-400 to-emerald-600 text-white border-emerald-300/60 shadow-[0_0_9px_rgba(16,185,129,0.45)]'
+        : 'bg-gradient-to-b from-sky-400 to-sky-600 text-white border-sky-300/60 shadow-[0_0_9px_rgba(14,165,233,0.45)]')
+      : 'bg-card text-muted-foreground border-border hover:bg-muted hover:text-foreground';
+  return (
+    <button
+      type="button"
+      onClick={() => onActivate(port, active ? 0 : index)}
+      title={active ? t('agp.portDeselect', { letter }) : t('agp.portSelect', { letter })}
+      className={cn('w-8 shrink-0 rounded-lg text-xs font-bold py-1.5 border transition-all active:scale-95', cls)}
+    >
+      {letter}
+    </button>
+  );
+}
+
 // AntGeniusPanel — antenna-switch widget for a 4O3A Antenna Genius, styled to
 // match the app's light theme with soft gradients + glows. Each antenna row has
 // a port-A button (left) and port-B button (right). Colours: green = selected on
 // port A, blue = selected on port B, red (pulsing) = that port is transmitting.
 // Clicking an already-selected port deselects it (port → None).
-export function AntGeniusPanel({ status, onActivate, onClose }: {
+export function AntGeniusPanel({ status, onActivate, onClose, band }: {
   status: AGStatus;
   onActivate: (port: number, antenna: number) => void; // antenna 0 = deselect
   onClose: () => void;
+  band?: string; // current operating band (e.g. "20m") for the band filter
 }) {
   const { t } = useI18n();
-  const list = status.antennas ?? [];
+  const allAntennas = status.antennas ?? [];
 
-  const PortBtn = ({ port, index, active, tx }: { port: 1 | 2; index: number; active: boolean; tx: boolean }) => {
-    const letter = port === 1 ? 'A' : 'B';
-    const cls = tx
-      ? 'bg-gradient-to-b from-red-500 to-rose-600 text-white border-red-400/50 shadow-[0_0_10px_rgba(244,63,94,0.5)] animate-pulse'
-      : active
-        ? (port === 1
-          ? 'bg-gradient-to-b from-emerald-400 to-emerald-600 text-white border-emerald-300/60 shadow-[0_0_9px_rgba(16,185,129,0.45)]'
-          : 'bg-gradient-to-b from-sky-400 to-sky-600 text-white border-sky-300/60 shadow-[0_0_9px_rgba(14,165,233,0.45)]')
-        : 'bg-card text-muted-foreground border-border hover:bg-muted hover:text-foreground';
-    return (
-      <button
-        type="button"
-        onClick={() => onActivate(port, active ? 0 : index)}
-        title={active ? t('agp.portDeselect', { letter }) : t('agp.portSelect', { letter })}
-        className={cn('w-8 shrink-0 rounded-lg text-xs font-bold py-1.5 border transition-all active:scale-95', cls)}
-      >
-        {letter}
-      </button>
-    );
-  };
+  // Band filter (persisted, default ON): show only antennas whose band mask
+  // includes the current band — matching the native 4O3A app. Antennas with an
+  // unknown mask (0) always show, and if the filter would hide EVERYTHING (e.g. a
+  // band we can't map, or masks the device didn't send) we fall back to the full
+  // list so the panel is never mysteriously empty.
+  const [bandFilter, setBandFilter] = useState(() => localStorage.getItem('opslog.agBandFilter') !== '0');
+  const toggleBandFilter = () => setBandFilter((v) => { const n = !v; localStorage.setItem('opslog.agBandFilter', n ? '1' : '0'); return n; });
+  const bit = bandBit(band);
+  let list = allAntennas;
+  if (bandFilter && bit !== 0) {
+    const filtered = allAntennas.filter((a) => !a.bands || (a.bands & bit) !== 0);
+    if (filtered.length > 0) list = filtered;
+  }
 
   return (
     <div className="h-full flex flex-col rounded-xl border border-border bg-gradient-to-b from-card to-muted/30 shadow-sm overflow-hidden">
@@ -57,6 +98,11 @@ export function AntGeniusPanel({ status, onActivate, onClose }: {
         <Antenna className={cn('size-4', status.connected ? 'text-success drop-shadow-[0_0_3px_rgba(16,185,129,0.55)]' : 'text-muted-foreground')} />
         <span className="text-xs font-bold uppercase tracking-[0.18em] text-foreground/80">Antenna Genius</span>
         <span className="flex-1" />
+        <button type="button" onClick={toggleBandFilter}
+          title={bandFilter ? t('agp.filterOnHint', { band: band || '' }) : t('agp.filterOffHint')}
+          className={cn('transition-colors', bandFilter ? 'text-primary' : 'text-muted-foreground/50 hover:text-muted-foreground')}>
+          <ListFilter className="size-3.5" />
+        </button>
         <span className="inline-flex items-center gap-1.5 text-[10px] font-mono uppercase tracking-wider">
           <span className={cn('size-1.5 rounded-full', status.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)] animate-pulse' : 'bg-danger')} />
           <span className={status.connected ? 'text-success' : 'text-danger'}>{status.connected ? t('agp.online') : t('agp.offline')}</span>
@@ -88,11 +134,11 @@ export function AntGeniusPanel({ status, onActivate, onClose }: {
                 : 'bg-card/70 text-foreground/80 border-border hover:bg-muted/60';
           return (
             <div key={a.index} className="flex items-center gap-1.5">
-              <PortBtn port={1} index={a.index} active={aActive} tx={aTx} />
+              <PortBtn port={1} index={a.index} active={aActive} tx={aTx} onActivate={onActivate} t={t} />
               <div className={cn('flex-1 min-w-0 truncate text-center text-xs font-semibold tracking-wide rounded-lg px-2 py-1.5 border transition-all', nameCls)}>
                 {pretty(a.name)}
               </div>
-              <PortBtn port={2} index={a.index} active={bActive} tx={bTx} />
+              <PortBtn port={2} index={a.index} active={bActive} tx={bTx} onActivate={onActivate} t={t} />
             </div>
           );
         })}

frontend/src/components/AwardEditor.tsx

@@ -1,5 +1,5 @@
-import { useEffect, useMemo, useState } from 'react';
-import { Plus, Trash2, RotateCcw, Save, Download, Upload, Loader2, Search } from 'lucide-react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Plus, Trash2, RotateCcw, Save, Download, Upload, Loader2, Search, FolderOpen, ArrowUpCircle } from 'lucide-react';
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
@@ -18,7 +18,9 @@ import {
   ImportAwardReferencesText, GetAwardPresets, ApplyAwardPreset,
   ListCountries, DXCCForCountry, DXCCName,
   PopulateBuiltinReferences, HasBuiltinReferences,
-  ExportAwards, ImportAwards,
+  ExportAwards, ImportAwards, InspectAwardImport, ApplyAwardImport, GetCatalogCodes, OpenAwardsFolder,
+  ExportAwardForCatalog,
+  GetAwardUpdates, ApplyAwardUpdate, DismissAwardUpdate, ExplainAward,
 } from '../../wailsjs/go/main/App';
 
 // Above this many references the editor stops loading the whole list and
@@ -30,12 +32,13 @@ type RefMeta = { code: string; count: number; updated_at: string; can_update: bo
 export type AwardDef = {
   code: string; name: string; description?: string; valid?: boolean; protected?: boolean;
   url?: string; download_url?: string; ref_url?: string; valid_from?: string; valid_to?: string; alias?: string;
+  ref_display?: string; // grid column shows: ref | name | both
   type?: string; field: string; match_by?: string; exact_match?: boolean; pattern: string;
-  leading_str?: string; trailing_str?: string; multi?: boolean; dynamic?: boolean; add_prefixes?: string[];
+  leading_str?: string; trailing_str?: string; dynamic?: boolean;
   or_rules?: AwardOrRule[];
   dxcc_filter: number[] | null; valid_bands?: string[]; valid_modes?: string[]; emission?: string[];
   confirm: string[] | null; validate?: string[] | null; grant_codes?: string; export_credit_granted?: boolean;
-  total: number; builtin?: boolean;
+  total: number; builtin?: boolean; version?: number;
 };
 
 type AwardOrRule = {
@@ -153,6 +156,9 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
   const [search, setSearch] = useState('');
   const [updating, setUpdating] = useState<string | null>(null);
   const [err, setErr] = useState('');
+  // Version to stamp into a "publish for catalog" export — defaults to one past
+  // the selected award's current version whenever the selection changes.
+  const [catVer, setCatVer] = useState('1');
 
   // The err banner doubles as a success/notice area (export path, import counts,
   // "populated N refs"). Auto-dismiss it after a few seconds so it doesn't stay
@@ -176,7 +182,91 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
     loadMeta();
   }, [open]);
 
+  // Codes present in the SHIPPED catalog. Anything in the database that isn't in
+  // here exists only on this machine — it is yours alone, and a reinstall loses it
+  // unless it has been exported. The list flags those.
+  const [catalogCodes, setCatalogCodes] = useState<string[]>([]);
+  useEffect(() => {
+    if (!open) return;
+    GetCatalogCodes().then((c: any) => setCatalogCodes(((c ?? []) as string[]).map((s) => s.toUpperCase()))).catch(() => {});
+  }, [open]);
+
+  // Shipped fixes we did NOT apply, because this award carries the operator's own
+  // changes and we will not overwrite those behind their back. Offered, not forced.
+  type AwardUpdate = { code: string; name: string; from: number; to: number };
+  const [updates, setUpdates] = useState<AwardUpdate[]>([]);
+  const loadUpdates = useCallback(() => {
+    GetAwardUpdates().then((u: any) => setUpdates(Array.isArray(u) ? u : [])).catch(() => {});
+  }, []);
+  useEffect(() => { if (open) loadUpdates(); }, [open, loadUpdates]);
+
+  // Pending import awaiting the operator's decision on the awards that collide.
+  type ImportEntry = { code: string; name: string; references: number; exists: boolean; mine_name: string; mine_refs: number; protected: boolean };
+  type ImportPreview = { path: string; awards: ImportEntry[] };
+  const [importPreview, setImportPreview] = useState<ImportPreview | null>(null);
+  const [decisions, setDecisions] = useState<Record<string, string>>({});
+  useEffect(() => {
+    if (!importPreview) return;
+    // Default to the SAFE choice: keep what you have. An import must never destroy
+    // an award because the operator clicked through a dialog without reading it.
+    const d: Record<string, string> = {};
+    for (const e of importPreview.awards) d[e.code] = e.exists ? 'skip' : 'replace';
+    setDecisions(d);
+  }, [importPreview]);
+
   const cur = defs[sel];
+  const selUpdate = updates.find((u) => (u.code ?? '').toUpperCase() === (cur?.code ?? '').toUpperCase()) ?? null;
+  useEffect(() => { setCatVer(String((cur?.version ?? 0) + 1)); }, [cur?.code]);
+
+  // ── Award tester: run the award's rules against a real QSO and show every step.
+  type Rejected = { candidate: string; reason: string };
+  type Step = {
+    rule: string; field: string; match_by?: string; exact?: boolean; pattern?: string;
+    field_value?: string; candidates?: string[]; kept?: string[]; rejected?: Rejected[];
+    skipped?: boolean; error?: string;
+  };
+  type Explanation = {
+    code: string; in_scope: boolean; scope_error?: string; predefined: boolean;
+    ref_count: number; steps: Step[]; manual?: string[]; result: string[];
+  };
+  type TestRow = { qso: any; explanation: Explanation };
+  const [testCall, setTestCall] = useState('');
+  const [testRows, setTestRows] = useState<TestRow[] | null>(null);
+  const [testErr, setTestErr] = useState('');
+  const [testing, setTesting] = useState(false);
+  const runTest = async () => {
+    if (!cur) return;
+    setTesting(true); setTestErr(''); setTestRows(null);
+    try {
+      const r = await ExplainAward(cur.code, testCall);
+      setTestRows((Array.isArray(r) ? r : []) as TestRow[]);
+    } catch (e: any) {
+      setTestErr(String(e?.message ?? e));
+    } finally {
+      setTesting(false);
+    }
+  };
+  // The tester reads the SAVED award, not the unsaved edits in this dialog — so say
+  // so, rather than let the operator test a rule they only think they applied.
+  useEffect(() => { setTestRows(null); setTestErr(''); }, [sel]);
+
+  // Several QSOs with the same station usually trace IDENTICALLY, and twenty copies
+  // of the same trace is noise. But they don't always: scope is judged per QSO
+  // (band, mode, date — FFMA's 1983 cut-off), a manual override lives ON a QSO, and
+  // two contacts can even hold different QTHs. That divergence is often the actual
+  // answer ("why does my 2019 QSO count and my 2024 one not?"), so we group by
+  // trace instead of dropping it: one card per distinct outcome, with its count.
+  const testGroups = useMemo(() => {
+    if (!testRows) return null;
+    const groups: { key: string; rows: TestRow[] }[] = [];
+    for (const row of testRows) {
+      const key = JSON.stringify(row.explanation);
+      const g = groups.find((x) => x.key === key);
+      if (g) g.rows.push(row);
+      else groups.push({ key, rows: [row] });
+    }
+    return groups;
+  }, [testRows]);
   const patch = (p: Partial<AwardDef>) => setDefs((ds) => ds.map((d, j) => (j === sel ? { ...d, ...p } : d)));
   const toggleIn = (key: keyof AwardDef, v: string) => {
     const arr = ((cur?.[key] as string[]) ?? []);
@@ -214,17 +304,52 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
       if (p) setErr(t('awed.exportedTo', { path: p }));
     } catch (e: any) { setErr(String(e?.message ?? e)); }
   }
-  // Import an award bundle: definitions are upserted by code, reference lists
-  // replaced. Reloads the editor afterwards.
+  // Export the SELECTED award as a catalog-ready JSON, stamped with a version, to
+  // paste over internal/award/catalog/<code>.json. A new release then ships it to
+  // the whole team (unedited copies auto-upgrade; edited ones are offered it).
+  async function exportForCatalog() {
+    setErr('');
+    if (!cur) return;
+    const v = Math.trunc(Number(catVer));
+    if (!Number.isFinite(v) || v < 1) { setErr(t('awed.catalogBadVersion')); return; }
+    try {
+      const p = await ExportAwardForCatalog(cur.code.trim().toUpperCase(), v);
+      if (p) setErr(t('awed.catalogExportedTo', { path: p }));
+    } catch (e: any) { setErr(String(e?.message ?? e)); }
+  }
+  // Import: LOOK FIRST, then ask.
+  //
+  // This used to merge by code with "imported wins", silently — import a WAPC
+  // someone shared and YOUR WAPC (its province list, its city regexes) was
+  // destroyed without a word. Sharing awards is exactly what we want people to do,
+  // so it must not be a data-loss trap.
   async function importAwards() {
     setErr('');
     try {
-      const r: any = await ImportAwards();
-      if (!r || (!r.awards && !r.references)) return; // cancelled
+      const p: any = await InspectAwardImport();
+      if (!p?.path) return; // cancelled
+      const clashes = (p.awards ?? []).filter((e: any) => e.exists);
+      if (clashes.length === 0) {
+        // Nothing collides — nothing to ask. This is the common case.
+        const dec: Record<string, string> = {};
+        for (const e of p.awards) dec[e.code] = 'replace';
+        await applyImport(p.path, dec);
+        return;
+      }
+      setImportPreview(p); // → the collision dialog decides
+    } catch (e: any) { setErr(String(e?.message ?? e)); }
+  }
+
+  async function applyImport(path: string, decisions: Record<string, string>) {
+    try {
+      const r: any = await ApplyAwardImport(path, decisions);
+      setImportPreview(null);
       const [d] = await Promise.all([GetAwardDefs(), loadMeta()]);
       setDefs((d ?? []) as any); setSel(0);
       onSaved();
-      setErr(t('awed.importedMsg', { awards: r.awards, references: r.references }));
+      if (r?.awards || r?.references) {
+        setErr(t('awed.importedMsg', { awards: r.awards, references: r.references }));
+      }
     } catch (e: any) { setErr(String(e?.message ?? e)); }
   }
   async function updateList(code: string) {
@@ -245,7 +370,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
 
   return (
     <Dialog open={open} onOpenChange={(o) => { if (!o) onClose(); }}>
-      <DialogContent className="max-w-5xl max-h-[92vh] grid grid-rows-[auto_1fr_auto] gap-0 p-0">
+      <DialogContent className="max-w-6xl w-[95vw] max-h-[92vh] grid grid-rows-[auto_1fr_auto] gap-0 p-0">
         <DialogHeader className="px-5 py-3 border-b">
           <DialogTitle>{t('awed.awardManagement')}</DialogTitle>
         </DialogHeader>
@@ -260,15 +385,37 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
               </div>
             </div>
             <div className="flex-1 overflow-auto">
-              {filtered.map(({ d, i }) => (
-                <button key={i} onClick={() => setSel(i)}
-                  className={cn('flex w-full items-center gap-2 px-3 py-1.5 text-left text-xs border-b border-border/30',
-                    i === sel ? 'bg-accent' : 'hover:bg-accent/50')}>
-                  <span className={cn('size-1.5 rounded-full shrink-0', d.valid === false ? 'bg-muted-foreground/40' : 'bg-success')} />
-                  <span className="font-mono font-semibold shrink-0">{d.code}</span>
-                  <span className="text-muted-foreground truncate">{d.name}</span>
-                </button>
-              ))}
+              {filtered.map(({ d, i }) => {
+                // An award that is NOT in the shipped catalog exists only in THIS
+                // database: nobody else has it, and a reinstall loses it unless it
+                // has been exported. That deserves to be visible at a glance, not
+                // discovered the hard way.
+                const onlyHere = !catalogCodes.includes((d.code ?? '').toUpperCase());
+                // A pending update is only reachable from the award's own banner, so
+                // the list has to say which award to open — otherwise the fix waits
+                // behind a click nobody knows to make.
+                const hasUpdate = updates.some((u) => (u.code ?? '').toUpperCase() === (d.code ?? '').toUpperCase());
+                return (
+                  <button key={i} onClick={() => setSel(i)}
+                    className={cn('flex w-full items-center gap-2 px-3 py-1.5 text-left text-xs border-b border-border/30',
+                      i === sel ? 'bg-accent' : 'hover:bg-accent/50')}>
+                    <span className={cn('size-1.5 rounded-full shrink-0', d.valid === false ? 'bg-muted-foreground/40' : 'bg-success')} />
+                    <span className="font-mono font-semibold shrink-0">{d.code}</span>
+                    <span className="text-muted-foreground truncate">{d.name}</span>
+                    {hasUpdate && (
+                      <span className="ml-auto shrink-0" title={t('awed.updateAvailable')}>
+                        <ArrowUpCircle className="size-3.5 text-info" />
+                      </span>
+                    )}
+                    {onlyHere && (
+                      <span className="ml-auto shrink-0 px-1 rounded border border-warning-border bg-warning-muted text-warning-muted-foreground text-[9px] font-semibold uppercase tracking-wide"
+                        title={t('awed.onlyHereTip')}>
+                        {t('awed.onlyHere')}
+                      </span>
+                    )}
+                  </button>
+                );
+              })}
             </div>
             <Button variant="ghost" size="sm" className="m-2 h-7 justify-start" onClick={addAward}>
               <Plus className="size-3.5 mr-1" /> {t('awed.newAward')}
@@ -278,6 +425,37 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
           {/* Right: tabbed editor for selected award */}
           <div className="flex flex-col min-h-0 overflow-hidden">
             {err && <div onClick={() => setErr('')} title={t('awed.clickToDismiss')} className="mx-4 mt-3 text-xs text-destructive bg-destructive/10 border border-destructive/30 rounded px-3 py-1.5 whitespace-pre-line break-all cursor-pointer">{err}</div>}
+            {/* A fix shipped for an award this operator has customised. We did NOT
+                apply it — that would destroy their work — so we offer it, and say
+                plainly what accepting costs. */}
+            {cur && selUpdate && (
+              <div className="mx-4 mt-3 rounded border border-info/40 bg-info/10 px-3 py-2 text-xs">
+                <div className="flex items-center gap-2">
+                  <ArrowUpCircle className="size-4 text-info shrink-0" />
+                  <div className="flex-1 min-w-0">
+                    <div className="font-medium">{t('awed.updateAvailable')}</div>
+                    <div className="text-muted-foreground">{t('awed.updateOverwrites')}</div>
+                  </div>
+                  <Button size="sm" className="h-7 px-2 text-[11px]"
+                    onClick={async () => {
+                      try {
+                        await ApplyAwardUpdate(cur.code);
+                        // The backend rewrote this award (and its references) — pull the
+                        // new state back, or the editor would keep showing, and on the
+                        // next Save re-persist, the definition we just replaced.
+                        setDefs(((await GetAwardDefs()) ?? []) as any);
+                        loadMeta();
+                        loadUpdates();
+                      } catch (e: any) { setErr(String(e?.message ?? e)); }
+                    }}>{t('awed.updateApply')}</Button>
+                  <Button size="sm" variant="ghost" className="h-7 px-2 text-[11px]"
+                    onClick={async () => {
+                      try { await DismissAwardUpdate(cur.code); loadUpdates(); }
+                      catch (e: any) { setErr(String(e?.message ?? e)); }
+                    }}>{t('awed.updateKeepMine')}</Button>
+                </div>
+              </div>
+            )}
             {!cur ? (
               <div className="flex-1 grid place-items-center text-sm text-muted-foreground">{t('awed.selectOrCreate')}</div>
             ) : (
@@ -287,6 +465,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
                   <TabsTrigger value="type">{t('awed.tabType')}</TabsTrigger>
                   <TabsTrigger value="conf">{t('awed.tabConfirmation')}</TabsTrigger>
                   <TabsTrigger value="refs">{t('awed.tabReferences')}</TabsTrigger>
+                  <TabsTrigger value="test">{t('awed.tabTest')}</TabsTrigger>
                 </TabsList>
 
                 <div className="flex-1 overflow-auto p-4">
@@ -296,11 +475,30 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
                       <Input className="h-8 w-28 font-mono font-semibold" value={cur.code} onChange={(e) => patch({ code: e.target.value })} placeholder="CODE" />
                       <Input className="h-8 flex-1" value={cur.name} onChange={(e) => patch({ name: e.target.value })} placeholder={t('awed.awardName')} />
                       <label className="flex items-center gap-1.5 text-xs cursor-pointer"><Checkbox checked={cur.valid !== false} onCheckedChange={(c) => patch({ valid: !!c })} /> {t('awed.valid')}</label>
+                      {/* No "Built-in" checkbox: an award OpsLog ships IS built-in, and
+                          the catalog derives that on load. Asking the author to tick a
+                          box to declare it would be one more step nobody can guess —
+                          forget it and the award silently misses every future catalog
+                          correction. "Protected" stays: whether an award can be deleted
+                          IS a real choice. */}
+                      <label className="flex items-center gap-1.5 text-xs cursor-pointer" title={t('awed.protectedTip')}>
+                        <Checkbox checked={!!cur.protected} onCheckedChange={(c) => patch({ protected: !!c })} /> {t('awed.protectedFlag')}
+                      </label>
                       <button className="text-muted-foreground hover:text-destructive" title={t('awed.deleteAward')} onClick={() => removeAward(sel)}><Trash2 className="size-4" /></button>
                     </div>
                     <Field2 label={t('awed.description')}><Input className="h-8" value={cur.description ?? ''} onChange={(e) => patch({ description: e.target.value })} /></Field2>
                     <Field2 label={t('awed.awardUrl')}><Input className="h-8" value={cur.url ?? ''} onChange={(e) => patch({ url: e.target.value })} /></Field2>
                     <Field2 label={t('awed.referenceUrl')}><Input className="h-8" value={cur.ref_url ?? ''} onChange={(e) => patch({ ref_url: e.target.value })} placeholder="https://…/<REF>" /></Field2>
+                    <Field2 label={t('awed.refDisplay')}>
+                      <Select value={cur.ref_display || 'ref'} onValueChange={(v) => patch({ ref_display: v })}>
+                        <SelectTrigger className="h-8 text-xs w-48"><SelectValue /></SelectTrigger>
+                        <SelectContent>
+                          <SelectItem value="ref">{t('awed.refDisplayRef')}</SelectItem>
+                          <SelectItem value="name">{t('awed.refDisplayName')}</SelectItem>
+                          <SelectItem value="both">{t('awed.refDisplayBoth')}</SelectItem>
+                        </SelectContent>
+                      </Select>
+                    </Field2>
                     <div className="grid grid-cols-2 gap-3">
                       <Field2 label={t('awed.validFrom')}><Input type="date" className="h-8" value={cur.valid_from ?? ''} onChange={(e) => patch({ valid_from: e.target.value })} /></Field2>
                       <Field2 label={t('awed.validTo')}><Input type="date" className="h-8" value={cur.valid_to ?? ''} onChange={(e) => patch({ valid_to: e.target.value })} /></Field2>
@@ -327,7 +525,9 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
                         }</SelectContent>
                       </Select>
                     </Field2>
-                    <label className="flex items-center gap-2 text-xs cursor-pointer"><Checkbox checked={!!cur.multi} onCheckedChange={(c) => patch({ multi: !!c })} /> {t('awed.allowMultiple')}</label>
+                    {/* No "allow multiple references" switch: a QSO always counts for
+                        every reference its field holds (an n-fer POTA activation, a
+                        VUCC grid-line contact). The old checkbox was read by nothing. */}
                     <label className="flex items-center gap-2 text-xs cursor-pointer"><Checkbox checked={!!cur.dynamic} onCheckedChange={(c) => patch({ dynamic: !!c })} /> {t('awed.dynamicRefs')}</label>
 
                     <div className="border-t pt-2.5 mt-1 space-y-2.5">
@@ -354,8 +554,10 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
                         <Field2 label={t('awed.trailingString')}><Input className="h-8 font-mono text-xs" value={cur.trailing_str ?? ''} onChange={(e) => patch({ trailing_str: e.target.value })} /></Field2>
                       </div>
 
-                      {/* Additional OR searches: a QSO earns a reference if the
-                          primary rule OR any of these match. */}
+                      {/* Fallback searches: tried in order, only while nothing
+                          has matched yet — the first that hits wins (short-circuit),
+                          so a value already resolved by the primary rule isn't
+                          re-derived differently by a later one. */}
                       <div className="border-t pt-2.5 space-y-2">
                         <div className="flex items-center justify-between">
                           <p className="text-[11px] text-muted-foreground">{t('awed.additionalSearches')} <span className="font-semibold">(OR)</span> {t('awed.orAlsoMatch')}</p>
@@ -412,8 +614,105 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
                         ))}
                       </div>
                     </div>
-                    <Field2 label={t('awed.grantCodes')}><Input className="h-8" value={cur.grant_codes ?? ''} onChange={(e) => patch({ grant_codes: e.target.value })} /></Field2>
-                    <label className="flex items-center gap-2 text-xs cursor-pointer"><Checkbox checked={!!cur.export_credit_granted} onCheckedChange={(c) => patch({ export_credit_granted: !!c })} /> {t('awed.exportCreditGranted')}</label>
+                    {/* "Grant codes" and "export credit_granted" used to live here. No
+                        ADIF export has ever written CREDIT_GRANTED, so both controls
+                        did nothing at all. The stored values are kept (see award.Def);
+                        put the controls back when the export is actually wired up. */}
+                  </TabsContent>
+
+                  {/* ── Test ──
+                      Runs the SAVED award against a real QSO and shows every rule:
+                      what it scanned, what it produced, and why each candidate was
+                      rejected. An award that matches nothing used to be a black box. */}
+                  <TabsContent value="test" className="mt-0 space-y-3">
+                    <div className="flex items-end gap-2">
+                      <div className="flex flex-col gap-1">
+                        <Label className="text-xs text-muted-foreground">{t('awed.testCallsign')}</Label>
+                        <Input className="h-8 w-40 font-mono uppercase" value={testCall} placeholder="I2IFT"
+                          onChange={(e) => setTestCall(e.target.value.toUpperCase())}
+                          onKeyDown={(e) => { if (e.key === 'Enter') runTest(); }} />
+                      </div>
+                      <Button size="sm" className="h-8" onClick={runTest} disabled={testing || !testCall.trim()}>
+                        {testing ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <Search className="size-3.5 mr-1" />}
+                        {t('awed.testRun')}
+                      </Button>
+                      <span className="text-[11px] text-muted-foreground pb-1">{t('awed.testSavedOnly')}</span>
+                    </div>
+
+                    {testErr && <div className="text-xs text-destructive bg-destructive/10 border border-destructive/30 rounded px-3 py-1.5">{testErr}</div>}
+
+                    {testGroups?.map((g, ri) => {
+                      const row = g.rows[0];
+                      const ex = row.explanation;
+                      const matched = (ex.result ?? []).length > 0;
+                      const qsoLabel = (q: any) => `${String(q?.qso_date ?? '').slice(0, 10)} · ${q?.band} · ${q?.mode}`;
+                      return (
+                        <div key={ri} className="rounded border border-border overflow-hidden">
+                          <div className="flex items-center gap-2 px-3 py-1.5 bg-muted/40 text-xs border-b border-border">
+                            <span className="font-mono font-semibold">{row.qso?.callsign}</span>
+                            <span className="text-muted-foreground font-mono">{qsoLabel(row.qso)}</span>
+                            {g.rows.length > 1 && (
+                              <span className="text-muted-foreground" title={g.rows.slice(1).map((r) => qsoLabel(r.qso)).join('\n')}>
+                                {t('awed.testSameAs', { n: String(g.rows.length - 1) })}
+                              </span>
+                            )}
+                            <span className={cn('ml-auto px-1.5 rounded text-[10px] font-semibold uppercase tracking-wide',
+                              matched ? 'bg-success/15 text-success' : 'bg-muted-foreground/15 text-muted-foreground')}>
+                              {matched ? (ex.result ?? []).join(', ') : t('awed.testNoMatch')}
+                            </span>
+                          </div>
+
+                          {!ex.in_scope ? (
+                            <div className="px-3 py-2 text-xs">
+                              <span className="font-medium">{t('awed.testOutOfScope')}</span>{' '}
+                              <span className="text-muted-foreground">{ex.scope_error}</span>
+                            </div>
+                          ) : (
+                            <div className="divide-y divide-border/50">
+                              {(ex.steps ?? []).map((s, si) => (
+                                <div key={si} className={cn('px-3 py-2 text-xs', s.skipped && 'opacity-50')}>
+                                  <div className="flex flex-wrap items-center gap-1.5">
+                                    <span className="font-semibold uppercase text-[10px] tracking-wide">{s.rule}</span>
+                                    <span className="text-muted-foreground">
+                                      {s.field}{s.match_by ? ` / ${s.match_by}` : ''}{s.exact ? ` / ${t('awed.exact')}` : ''}
+                                    </span>
+                                    {s.skipped && <span className="text-muted-foreground italic">— {t('awed.testSkipped')}</span>}
+                                    {s.error && <span className="text-destructive">— {s.error}</span>}
+                                  </div>
+                                  {!s.skipped && !s.error && (
+                                    <div className="mt-1 space-y-0.5 pl-3 border-l-2 border-border">
+                                      <div>
+                                        <span className="text-muted-foreground">{t('awed.testFieldValue')}: </span>
+                                        {s.field_value
+                                          ? <span className="font-mono">{s.field_value}</span>
+                                          : <span className="italic text-muted-foreground">{t('awed.testEmptyField')}</span>}
+                                      </div>
+                                      {(s.kept ?? []).map((k) => (
+                                        <div key={k} className="text-success font-mono">✓ {k}</div>
+                                      ))}
+                                      {(s.rejected ?? []).map((r, i2) => (
+                                        <div key={i2} className="font-mono text-muted-foreground">
+                                          ✗ {r.candidate} <span className="font-sans">— {r.reason}</span>
+                                        </div>
+                                      ))}
+                                      {!(s.kept ?? []).length && !(s.rejected ?? []).length && s.field_value && (
+                                        <div className="italic text-muted-foreground">{t('awed.testNoCandidate')}</div>
+                                      )}
+                                    </div>
+                                  )}
+                                </div>
+                              ))}
+                              {(ex.manual ?? []).length > 0 && (
+                                <div className="px-3 py-2 text-xs">
+                                  <span className="font-semibold uppercase text-[10px] tracking-wide">{t('awed.testManual')}</span>{' '}
+                                  <span className="font-mono text-success">{(ex.manual ?? []).join(', ')}</span>
+                                </div>
+                              )}
+                            </div>
+                          )}
+                        </div>
+                      );
+                    })}
                   </TabsContent>
 
                   {/* ── References ── */}
@@ -438,11 +737,90 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
           <Button variant="outline" onClick={importAwards} title={t('awed.importTitle')}>
             <Upload className="size-3.5 mr-1" /> {t('awed.import')}
           </Button>
+          {/* The drop folder: put an award JSON here and it installs on restart —
+              no rebuild, nobody to ask. Opening it beats printing a path someone
+              then has to retype. */}
+          <Button variant="ghost" onClick={() => OpenAwardsFolder().catch((e: any) => setErr(String(e?.message ?? e)))}
+            title={t('awed.awardsFolderTip')}>
+            <FolderOpen className="size-3.5 mr-1" /> {t('awed.awardsFolder')}
+          </Button>
+          {/* Publish the selected award to the catalog: stamp a version and write a
+              file to paste over internal/award/catalog/<code>.json, so a release
+              ships your change to the whole team. */}
+          {cur && (
+            <div className="flex items-center gap-1" title={t('awed.catalogPublishTip')}>
+              <input type="number" min={1} value={catVer} onChange={(e) => setCatVer(e.target.value)}
+                className="h-8 w-14 rounded border border-input bg-background px-1.5 text-xs font-mono" />
+              <Button variant="outline" onClick={exportForCatalog}>
+                <Download className="size-3.5 mr-1" /> {t('awed.catalogPublish')}
+              </Button>
+            </div>
+          )}
           <div className="flex-1" />
           <Button variant="outline" onClick={onClose}>{t('awed.cancel')}</Button>
           <Button onClick={save}><Save className="size-3.5 mr-1" /> {t('awed.save')}</Button>
         </DialogFooter>
       </DialogContent>
+
+      {/* Collision dialog. The import cannot silently replace an award you already
+          have — importing a shared WAPC used to destroy yours (province list, city
+          regexes, band scope) without a word. You decide, per award. */}
+      {importPreview && (
+        <Dialog open onOpenChange={() => setImportPreview(null)}>
+          <DialogContent className="max-w-2xl">
+            <DialogHeader>
+              <DialogTitle>{t('awed.importCollisionTitle')}</DialogTitle>
+            </DialogHeader>
+            <p className="text-xs text-muted-foreground -mt-2">{t('awed.importCollisionHint')}</p>
+            <div className="max-h-[50vh] overflow-auto flex flex-col gap-2 mt-2">
+              {importPreview.awards.map((e) => (
+                <div key={e.code} className="rounded-md border border-border p-2.5">
+                  <div className="flex items-baseline gap-2 min-w-0">
+                    <span className="font-mono font-semibold text-sm">{e.code}</span>
+                    <span className="text-xs text-muted-foreground truncate">{e.name}</span>
+                    <span className="ml-auto shrink-0 text-[11px] text-muted-foreground tabular-nums">
+                      {t('awed.importRefs', { n: e.references })}
+                    </span>
+                  </div>
+
+                  {!e.exists ? (
+                    <p className="mt-1 text-[11px] text-success-muted-foreground">{t('awed.importNew')}</p>
+                  ) : (
+                    <>
+                      <p className="mt-1 text-[11px] text-warning-muted-foreground">
+                        {t('awed.importExists', { name: e.mine_name || e.code, n: e.mine_refs })}
+                        {e.protected && ` · ${t('awed.importProtected')}`}
+                      </p>
+                      <div className="mt-1.5 flex flex-wrap gap-1.5">
+                        {([
+                          ['skip', t('awed.importKeepMine')],
+                          ['replace', t('awed.importReplace')],
+                          ['copy', t('awed.importCopy', { code: e.code })],
+                        ] as [string, string][]).map(([v, label]) => (
+                          <button key={v} type="button"
+                            onClick={() => setDecisions((d) => ({ ...d, [e.code]: v }))}
+                            className={cn('px-2 h-7 rounded-md border text-xs',
+                              decisions[e.code] === v
+                                ? 'border-primary bg-primary text-primary-foreground'
+                                : 'border-border hover:bg-muted')}>
+                            {label}
+                          </button>
+                        ))}
+                      </div>
+                    </>
+                  )}
+                </div>
+              ))}
+            </div>
+            <DialogFooter>
+              <Button variant="outline" onClick={() => setImportPreview(null)}>{t('awed.cancel')}</Button>
+              <Button onClick={() => applyImport(importPreview.path, decisions)}>
+                <Upload className="size-3.5 mr-1" /> {t('awed.import2')}
+              </Button>
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
+      )}
     </Dialog>
   );
 }
@@ -595,26 +973,18 @@ function ReferencesPanel({ code, presets, meta, onUpdateOnline, updating, onChan
                 <button className="text-muted-foreground hover:text-destructive" onClick={() => delRef(sel.code)}><Trash2 className="size-4" /></button>
               </div>
               <Field2 label={t('awed.description')}><Input className="h-8" value={sel.name ?? ''} onChange={(e) => patchSel({ name: e.target.value })} /></Field2>
-              <div className="grid grid-cols-2 gap-3">
-                <Field2 label={t('awed.group')}><Input className="h-8" value={sel.group ?? ''} onChange={(e) => patchSel({ group: e.target.value })} /></Field2>
-                <Field2 label={t('awed.subgroup')}><Input className="h-8" value={sel.subgrp ?? ''} onChange={(e) => patchSel({ subgrp: e.target.value })} /></Field2>
-              </div>
+              {/* One per row: side by side, each half spends 120px of its width on
+                  the label column and the input is left too narrow to read a group
+                  name ("Basilicata" → "Basili"). */}
+              <Field2 label={t('awed.group')}><Input className="h-8" value={sel.group ?? ''} onChange={(e) => patchSel({ group: e.target.value })} /></Field2>
+              <Field2 label={t('awed.subgroup')}><Input className="h-8" value={sel.subgrp ?? ''} onChange={(e) => patchSel({ subgrp: e.target.value })} /></Field2>
               <Field2 label="DXCC"><Input type="number" className="h-8 w-32 font-mono" value={sel.dxcc || ''} onChange={(e) => patchSel({ dxcc: parseInt(e.target.value, 10) || 0 })} /></Field2>
               <Field2 label={t('awed.patternRegex')}><Input className="h-8 font-mono text-xs" value={sel.pattern ?? ''} onChange={(e) => patchSel({ pattern: e.target.value })} placeholder={t('awed.perRefRegex')} /></Field2>
-              <div className="grid grid-cols-3 gap-3">
-                <div className="flex flex-col gap-1 min-w-0">
-                  <Label className="text-xs text-muted-foreground">{t('awed.score')}</Label>
-                  <Input type="number" className="h-8 font-mono w-full" value={sel.score ?? 0} onChange={(e) => patchSel({ score: parseInt(e.target.value, 10) || 0 })} />
-                </div>
-                <div className="flex flex-col gap-1 min-w-0">
-                  <Label className="text-xs text-muted-foreground">{t('awed.bonus')}</Label>
-                  <Input type="number" className="h-8 font-mono w-full" value={sel.bonus ?? 0} onChange={(e) => patchSel({ bonus: parseInt(e.target.value, 10) || 0 })} />
-                </div>
-                <div className="flex flex-col gap-1 min-w-0">
-                  <Label className="text-xs text-muted-foreground">{t('awed.grid')}</Label>
-                  <Input className="h-8 font-mono w-full" value={sel.gridsquare ?? ''} onChange={(e) => patchSel({ gridsquare: e.target.value })} />
-                </div>
-              </div>
+              {/* Score / Bonus were here. Nothing computes an award score, so both
+                  boxes were pure decoration. The columns stay in the database — a
+                  third-party list may carry the values — but they are not offered
+                  for editing until something actually reads them. */}
+              <Field2 label={t('awed.grid')}><Input className="h-8 font-mono" value={sel.gridsquare ?? ''} onChange={(e) => patchSel({ gridsquare: e.target.value })} /></Field2>
               <div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveRef(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
             </div>
           )}

frontend/src/components/AwardsPanel.tsx

@@ -61,7 +61,7 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
 
 type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[] };
 
-export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void } = {}) {
+export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
   const { t } = useI18n();
   const [awardList, setAwardList] = useState<AwardListItem[]>([]);
   // Computed results are cached per award code — each award is scanned only the
@@ -220,7 +220,7 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
             {t('awp.rescan')}
           </Button>
         </div>
-        <AwardEditor open={editing} onClose={() => setEditing(false)} onSaved={() => { setByCode({}); loadList(); }} />
+        <AwardEditor open={editing} onClose={() => setEditing(false)} onSaved={() => { setByCode({}); loadList(); onAwardsChanged?.(); }} />
         {/* Quick selector — scales when there are many awards. */}
         {awardList.length > 0 && (
           <div className="px-2 py-2 border-b border-border/40">

frontend/src/components/BandSlotGrid.tsx

@@ -109,14 +109,21 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
   // "Newness" of the current band+mode entry, for the award/DX-chase badges.
   // Derived straight from the entity's real band_status (all bands it was
   // worked on — not just the operator's configured column list).
-  // Newness uses the ACTUAL mode (FT8 / FT4 / RTTY…), not the PH/CW/DIG class:
-  // DIG is a group, so FT4 after FT8 is genuinely a new mode. dxcc_band_modes
-  // lists every real (band, mode) the entity was worked on.
+  // By default newness uses the ACTUAL mode (FT8 / FT4 / RTTY…): DIG is a
+  // group, so FT4 after FT8 is genuinely a new mode. The operator can opt into
+  // DXCC-style grouping instead (Settings → General), where all digital modes
+  // count as ONE — then FT4 after FT8 is just "worked".
+  const groupDigital = localStorage.getItem('opslog.groupDigitalSlots') === '1';
+  const normMode = (m: string): string => {
+    const u = (m || '').toUpperCase().trim();
+    if (!groupDigital) return u;
+    return u === '' || u === 'CW' || PHONE_MODES.has(u) ? u : 'DIG';
+  };
   const bandModes = (wb?.dxcc_band_modes ?? []) as { band: string; mode: string }[];
-  const curMode = (currentMode || '').toUpperCase().trim();
+  const curMode = normMode(currentMode);
   const bandWorked = bandModes.some((bm) => bm.band === currentBand);          // entity worked on this band (any mode)
-  const modeWorked = !!curMode && bandModes.some((bm) => (bm.mode || '').toUpperCase() === curMode); // …in this exact mode (any band)
-  const slotWorked = !!curMode && bandModes.some((bm) => bm.band === currentBand && (bm.mode || '').toUpperCase() === curMode);
+  const modeWorked = !!curMode && bandModes.some((bm) => normMode(bm.mode) === curMode); // …in this (normalised) mode (any band)
+  const slotWorked = !!curMode && bandModes.some((bm) => bm.band === currentBand && normMode(bm.mode) === curMode);
   // Mutually-exclusive badges, shown only when the entity is worked but this
   // exact band+mode is NOT yet:
   //   New Band & Mode = both the band AND the mode are new for this entity.

frontend/src/components/BulkEditModal.tsx

@@ -49,6 +49,30 @@ const FIELDS: FieldDef[] = [
   { id: 'my_wwff_ref',      label: 'bulk.fMyWwff',       group: 'My station', kind: 'text', upper: true },
   { id: 'my_sig',           label: 'bulk.fMySig',        group: 'My station', kind: 'text' },
   { id: 'my_sig_info',      label: 'bulk.fMySigInfo',    group: 'My station', kind: 'text' },
+  { id: 'my_name',          label: 'bulk.fMyName',       group: 'My station', kind: 'text' },
+  { id: 'my_arrl_sect',     label: 'bulk.fMyArrlSect',   group: 'My station', kind: 'text', upper: true },
+  { id: 'my_darc_dok',      label: 'bulk.fMyDarcDok',    group: 'My station', kind: 'text', upper: true },
+  { id: 'my_vucc_grids',    label: 'bulk.fMyVuccGrids',  group: 'My station', kind: 'text', upper: true },
+  // Contest
+  { id: 'contest_id', label: 'bulk.fContestId',  group: 'Contest', kind: 'text', upper: true },
+  { id: 'srx_string', label: 'bulk.fSrxString',  group: 'Contest', kind: 'text' },
+  { id: 'stx_string', label: 'bulk.fStxString',  group: 'Contest', kind: 'text' },
+  { id: 'arrl_sect',  label: 'bulk.fArrlSect',   group: 'Contest', kind: 'text', upper: true },
+  { id: 'precedence', label: 'bulk.fPrecedence', group: 'Contest', kind: 'text', upper: true },
+  { id: 'class',      label: 'bulk.fClass',      group: 'Contest', kind: 'text', upper: true },
+  // Propagation / satellite
+  { id: 'prop_mode', label: 'bulk.fPropMode', group: 'Propagation', kind: 'text', upper: true },
+  { id: 'sat_name',  label: 'bulk.fSatName',  group: 'Propagation', kind: 'text', upper: true },
+  { id: 'sat_mode',  label: 'bulk.fSatMode',  group: 'Propagation', kind: 'text', upper: true },
+  // Contacted station (location / activation refs / SIG)
+  { id: 'state',    label: 'bulk.fState',   group: 'Contacted station', kind: 'text', upper: true },
+  { id: 'cnty',     label: 'bulk.fCnty',    group: 'Contacted station', kind: 'text' },
+  { id: 'pota_ref', label: 'bulk.fPotaRef', group: 'Contacted station', kind: 'text', upper: true },
+  { id: 'sota_ref', label: 'bulk.fSotaRef', group: 'Contacted station', kind: 'text', upper: true },
+  { id: 'wwff_ref', label: 'bulk.fWwffRef', group: 'Contacted station', kind: 'text', upper: true },
+  { id: 'iota',     label: 'bulk.fIota',    group: 'Contacted station', kind: 'text', upper: true },
+  { id: 'sig',      label: 'bulk.fSig',     group: 'Contacted station', kind: 'text' },
+  { id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' },
   // Misc
   { id: 'comment', label: 'bulk.fComment', group: 'Misc', kind: 'text' },
   { id: 'notes',   label: 'bulk.fNotes',   group: 'Misc', kind: 'text' },
@@ -65,11 +89,14 @@ const STATUS_VALUES: { v: string; label: string }[] = [
   { v: '_', label: 'bulk.statusBlank' },
 ];
 
-const GROUPS = ['QSL / upload', 'My station', 'Misc'];
+const GROUPS = ['QSL / upload', 'My station', 'Contacted station', 'Contest', 'Propagation', 'Misc'];
 // Maps the internal group key → its i18n label key.
 const GROUP_LABELS: Record<string, string> = {
   'QSL / upload': 'bulk.groupQsl',
   'My station': 'bulk.groupMyStation',
+  'Contacted station': 'bulk.groupContacted',
+  'Contest': 'bulk.groupContest',
+  'Propagation': 'bulk.groupPropagation',
   'Misc': 'bulk.groupMisc',
 };
 
@@ -130,9 +157,12 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
                 {GROUPS.map((g) => (
                   <div key={g}>
                     <div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{t(GROUP_LABELS[g])}</div>
-                    {FIELDS.filter((f) => f.group === g).map((f) => (
-                      <SelectItem key={f.id} value={f.id}>{t(f.label)}</SelectItem>
-                    ))}
+                    {FIELDS.filter((f) => f.group === g)
+                      .map((f) => ({ f, txt: t(f.label) }))
+                      .sort((a, b) => a.txt.localeCompare(b.txt))
+                      .map(({ f, txt }) => (
+                        <SelectItem key={f.id} value={f.id}>{txt}</SelectItem>
+                      ))}
                   </div>
                 ))}
               </SelectContent>

frontend/src/components/ClusterGrid.tsx

@@ -51,6 +51,8 @@ export type SpotStatusEntry = {
   country?: string;
   continent?: string;
   worked_call?: boolean;
+  new_county?: boolean;
+  new_pota?: boolean;
 };
 
 type Props = {
@@ -101,13 +103,43 @@ function statusFor(p: any): SpotStatusEntry | undefined {
 // Status column, using the same colours as the per-cell fills (NEW DXCC =
 // call cell, NEW BAND = band cell, NEW SLOT = mode cell). Returns null when
 // there's nothing notable to show.
-function statusBadge(t: TFn, s: SpotStatusEntry | undefined): { text: string; fg: string; bg: string } | null {
+type Badge = { text: string; fg: string; bg: string; bd: string };
+
+// tok builds a badge from a semantic status token (success/warning/caution/
+// danger/info/neutral) so the colours adapt to every theme via CSS variables,
+// instead of the hard-coded light-theme pastels that looked wrong in dark mode.
+function tok(name: string, text: string): Badge {
+  if (name === 'neutral') return { text, fg: 'var(--muted-foreground)', bg: 'var(--muted)', bd: 'var(--border)' };
+  return { text, fg: `var(--${name}-muted-foreground)`, bg: `var(--${name}-muted)`, bd: `var(--${name}-border)` };
+}
+
+// cellChip wraps a Band/Mode cell value in a small rounded pill (same look as the
+// Status badges) when the slot is notable, instead of flooding the whole cell with
+// a heavy muted fill that turned into an ugly olive block on dark themes. `name` is
+// null → plain text, no pill.
+function cellChip(value: any, name: string | null): any {
+  const txt = value === undefined || value === null || value === '' ? '' : String(value);
+  if (!name) return txt || <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
+  // Inherit the column's font size (no fixed 9px / height) so a pill around a
+  // callsign stays the same size as the plain callsigns next to it — just tinted
+  // and rounded, not shrunk.
+  return (
+    <span style={{
+      display: 'inline-flex', alignItems: 'center', lineHeight: 1.1,
+      backgroundColor: `var(--${name}-muted)`, color: `var(--${name}-muted-foreground)`,
+      border: `1px solid var(--${name}-border)`, fontWeight: 700,
+      padding: '1px 6px', borderRadius: 999, whiteSpace: 'nowrap',
+    }}>{txt}</span>
+  );
+}
+
+function statusBadge(t: TFn, s: SpotStatusEntry | undefined): Badge | null {
   switch (s?.status) {
-    case 'new':      return { text: t('clg2.newDxcc'), fg: '#be123c', bg: '#ffe4e6' };
-    case 'new-band': return { text: t('clg2.newBand'), fg: '#92400e', bg: '#fde68a' };
-    case 'new-mode': return { text: t('clg2.newMode'), fg: '#854d0e', bg: '#fef08a' };
-    case 'new-slot': return { text: t('clg2.newSlot'), fg: '#854d0e', bg: '#fef08a' };
-    default:         return s?.worked_call ? { text: t('clg2.wkdCall'), fg: '#0369a1', bg: '#e0f2fe' } : null;
+    case 'new':      return tok('danger',  t('clg2.newDxcc'));
+    case 'new-band': return tok('warning', t('clg2.newBand'));
+    case 'new-mode': return tok('caution', t('clg2.newMode'));
+    case 'new-slot': return tok('caution', t('clg2.newSlot'));
+    default:         return s?.worked_call ? tok('neutral', t('clg2.wkdCall')) : null;
   }
 }
 
@@ -117,18 +149,23 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
     headerName: t('clg2.c.time'), field: 'time_utc' as any, width: 80, cellClass: 'font-mono',
     defaultVisible: true,
     sort: 'desc',
-    cellStyle: { color: '#7a6b50' },
+    cellStyle: { color: 'var(--muted-foreground)' },
   },
   {
     group: 'Spot', label: t('clg2.c.call'),  colId: 'call',
     headerName: t('clg2.c.call'), field: 'dx_call' as any, width: 120,
     defaultVisible: true,
     cellClass: 'font-mono',
-    // New DXCC entity → fill the whole cell (no padded pill, so calls stay
-    // aligned with non-new rows). Text colour also flags worked-call vs new-call.
-    cellStyle: (p: any): any => (statusFor(p)?.status === 'new'
-      ? { backgroundColor: '#ffe4e6', color: '#be123c', fontWeight: 700 }
-      : { color: statusFor(p)?.worked_call ? '#0369a1' : '#b8410c', fontWeight: 700 }),
+    // NEW DXCC → a danger pill around the call, consistent with the NEW BAND /
+    // NEW MODE pills (same look, same tokens). Worked-call stays blue bold text;
+    // a plain spot inherits the theme's normal text colour so callsigns blend in
+    // with the rest of the row instead of always shouting a colour.
+    cellRenderer: (p: any) => {
+      const s = statusFor(p);
+      if (s?.status === 'new') return cellChip(p.value, 'danger');
+      const color = s?.worked_call ? 'var(--info)' : undefined;
+      return <span style={{ color, fontWeight: 700 }}>{p.value ?? ''}</span>;
+    },
     tooltipValueGetter: (p: any) => {
       const s = statusFor(p);
       return s?.status === 'new' ? t('clg2.tipNewDxcc', { country: s?.country ?? '' }) : s?.worked_call ? t('clg2.tipWorkedCall') : undefined;
@@ -136,26 +173,42 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
   },
   {
     group: 'Spot', label: t('clg2.c.status'), colId: 'status',
-    headerName: t('clg2.c.status'), width: 96, sortable: true,
+    headerName: t('clg2.c.status'), width: 120, sortable: true,
     defaultVisible: true,
     // Spells out the slot status as a text badge so NEW SLOT (and the others)
-    // is obvious at the row level, not just a single coloured cell.
+    // is obvious at the row level, not just a single coloured cell. NEW COUNTY
+    // and NEW POTA are orthogonal, so they stack as extra badges.
     valueGetter: (p: any) => {
       const s = statusFor(p);
-      if (s?.status === 'new') return t('clg2.newDxcc');
-      if (s?.status === 'new-band') return t('clg2.newBand');
-      if (s?.status === 'new-mode') return t('clg2.newMode');
-      if (s?.status === 'new-slot') return t('clg2.newSlot');
-      return s?.worked_call ? t('clg2.wkdCall') : '';
+      const parts: string[] = [];
+      if (s?.status === 'new') parts.push(t('clg2.newDxcc'));
+      else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
+      else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
+      else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
+      else if (s?.worked_call) parts.push(t('clg2.wkdCall'));
+      if (s?.new_county) parts.push(t('clg2.newCounty'));
+      if (s?.new_pota) parts.push(t('clg2.newPota'));
+      return parts.join(' ');
     },
     cellRenderer: (p: any) => {
-      const b = statusBadge(t, statusFor(p));
-      if (!b) return <span style={{ color: '#a8a29e', fontSize: 10 }}>—</span>;
+      const s = statusFor(p);
+      const badges: Badge[] = [];
+      const b = statusBadge(t, s);
+      if (b) badges.push(b);
+      if (s?.new_county) badges.push(tok('info', t('clg2.newCounty')));
+      if (s?.new_pota) badges.push(tok('success', t('clg2.newPota')));
+      if (badges.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
       return (
-        <span style={{
-          backgroundColor: b.bg, color: b.fg, fontWeight: 700, fontSize: 10,
-          padding: '1px 6px', borderRadius: 4, letterSpacing: 0.3, whiteSpace: 'nowrap',
-        }}>{b.text}</span>
+        <span style={{ display: 'flex', height: '100%', flexWrap: 'wrap', gap: 2, alignItems: 'center' }}>
+          {badges.map((bd, i) => (
+            <span key={i} style={{
+              display: 'inline-flex', alignItems: 'center', height: 15, lineHeight: 1,
+              backgroundColor: bd.bg, color: bd.fg, border: `1px solid ${bd.bd}`,
+              fontWeight: 700, fontSize: 9,
+              padding: '0 5px', borderRadius: 999, letterSpacing: 0.3, whiteSpace: 'nowrap',
+            }}>{bd.text}</span>
+          ))}
+        </span>
       );
     },
     tooltipValueGetter: (p: any) => {
@@ -171,7 +224,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
     group: 'Spot', label: t('clg2.c.pota'), colId: 'pota',
     headerName: t('clg2.c.pota'), field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
     defaultVisible: true,
-    cellStyle: { color: '#166534' },
+    cellStyle: { color: 'var(--success)' },
     tooltipValueGetter: (p: any) => (p.data?.pota_name ? t('clg2.tipPota', { name: p.data.pota_name }) : undefined),
   },
   {
@@ -186,10 +239,8 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
     headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
     defaultVisible: true,
     cellClass: 'font-mono',
-    // NEW BAND for this entity → fill the cell (keeps the band text aligned).
-    cellStyle: (p: any) => (statusFor(p)?.status === 'new-band'
-      ? { backgroundColor: '#fde68a', color: '#92400e', fontWeight: 700 }
-      : undefined),
+    // NEW BAND for this entity → small warning pill around the band text.
+    cellRenderer: (p: any) => cellChip(p.value, statusFor(p)?.status === 'new-band' ? 'warning' : null),
     tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
   },
   {
@@ -198,16 +249,11 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
     defaultVisible: true,
     cellClass: 'font-mono',
     valueGetter: (p: any) => p.data ? inferSpotMode(p.data.comment ?? '', p.data.freq_hz) : '',
-    // Fill the mode cell: teal = NEW MODE (mode never worked on this entity),
-    // yellow = NEW SLOT (this band+mode combo new, but the mode was worked elsewhere).
-    cellStyle: (p: any) => {
-      const st = statusFor(p)?.status;
-      // Both NEW MODE and NEW SLOT highlight the mode cell (same yellow); the
-      // Status badge text tells them apart.
-      if (st === 'new-mode' || st === 'new-slot') return { backgroundColor: '#fef08a', color: '#854d0e', fontWeight: 700 };
-      return undefined;
-    },
-    cellRenderer: (p: any) => p.value ? p.value : <span style={{ color: '#a8a29e', fontSize: 10 }}>—</span>,
+    // Only NEW MODE pills the mode cell — there the mode itself is genuinely new
+    // for the entity. NEW SLOT means band AND mode were each worked before (just
+    // not together), so highlighting the mode cell would wrongly imply "CW is new";
+    // that case is signalled by the Status badge alone.
+    cellRenderer: (p: any) => cellChip(p.value, statusFor(p)?.status === 'new-mode' ? 'caution' : null),
     tooltipValueGetter: (p: any) => {
       const st = statusFor(p)?.status;
       if (st === 'new-mode') return t('clg2.tipNewMode');
@@ -219,7 +265,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
     group: 'Spot', label: t('clg2.c.pfx'), colId: 'pfx',
     headerName: t('clg2.c.pfx'), width: 60, cellClass: 'font-mono',
     valueGetter: (p: any) => fmtPfx(p.data?.dx_call ?? ''),
-    cellStyle: { color: '#7a6b50' },
+    cellStyle: { color: 'var(--muted-foreground)' },
   },
   {
     group: 'Geo', label: t('clg2.c.cqz'), colId: 'cqz',
@@ -256,7 +302,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
     valueGetter: (p: any) => p.data?.country ?? p.context?.spotStatus?.[
       spotStatusKey(p.data?.dx_call, p.data?.band ?? '', p.data?.comment ?? '', p.data?.freq_hz)
     ]?.country ?? '',
-    cellStyle: { color: '#7a6b50' },
+    cellStyle: { color: 'var(--muted-foreground)' },
   },
   {
     group: 'Spot', label: t('clg2.c.continent'), colId: 'continent',
@@ -265,31 +311,31 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
     valueGetter: (p: any) => p.data?.continent ?? p.context?.spotStatus?.[
       spotStatusKey(p.data?.dx_call, p.data?.band ?? '', p.data?.comment ?? '', p.data?.freq_hz)
     ]?.continent ?? '',
-    cellStyle: { color: '#7a6b50', fontSize: 10 },
+    cellStyle: { color: 'var(--muted-foreground)', fontSize: 10 },
   },
   {
     group: 'Spot', label: t('clg2.c.spotter'), colId: 'spotter',
     headerName: t('clg2.c.spotter'), field: 'spotter' as any, width: 100, cellClass: 'font-mono',
     defaultVisible: true,
     valueFormatter: (p) => cleanSpotter(p.value ?? ''),
-    cellStyle: { color: '#7a6b50' },
+    cellStyle: { color: 'var(--muted-foreground)' },
   },
   {
     group: 'Spot', label: t('clg2.c.source'), colId: 'source',
     headerName: t('clg2.c.source'), field: 'source_name' as any, width: 100,
     defaultVisible: true,
-    cellStyle: { color: '#9a8870', fontSize: 10 },
+    cellStyle: { color: 'var(--muted-foreground)', fontSize: 10 },
   },
   {
     group: 'Spot', label: t('clg2.c.locator'), colId: 'locator',
     headerName: t('clg2.h.locator'), field: 'locator' as any, width: 80, cellClass: 'font-mono',
-    cellStyle: { color: '#7a6b50' },
+    cellStyle: { color: 'var(--muted-foreground)' },
   },
   {
     group: 'Spot', label: t('clg2.c.comment'), colId: 'comment',
     headerName: t('clg2.c.comment'), field: 'comment' as any, flex: 1, minWidth: 160,
     defaultVisible: true,
-    cellStyle: { color: '#7a6b50' },
+    cellStyle: { color: 'var(--muted-foreground)' },
   },
   {
     group: 'Spot', label: t('clg2.c.received_at'), colId: 'received_at',

frontend/src/components/DvkPanel.tsx

@@ -25,8 +25,8 @@ export function DvkPanel({ messages, status, onPlay, onStop, onClose }: Props) {
       <div className="flex items-center gap-2 px-3 py-1.5 border-b border-border bg-muted/40 shrink-0">
         <Mic className="size-3.5 text-primary" />
         <span className="text-[11px] font-semibold uppercase tracking-wider">{t('dvkp.voiceKeyer')}</span>
-        <span className={cn('size-2 rounded-full', status.playing ? 'bg-warning animate-pulse' : 'bg-success')} />
-        {status.playing && <span className="text-[10px] text-warning font-medium">tx...</span>}
+        <span className={cn('size-2 rounded-full', status.playing ? 'bg-danger animate-pulse' : 'bg-success')} />
+        {status.playing && <span className="text-[10px] text-danger font-medium">TX</span>}
         <div className="flex-1" />
         <Button variant="ghost" size="sm" className="h-6 px-2 text-[11px]" onClick={onStop} disabled={!status.playing}>
           <Square className="size-3" /> {t('dvkp.stop')}

frontend/src/components/FilterBuilder.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
 import { writeUiPref } from '@/lib/uiPref';
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
@@ -134,6 +134,12 @@ interface Props {
 
 export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
   const { t } = useI18n();
+  // Field dropdown sorted alphabetically by translated label (the FIELDS array is
+  // grouped by category for maintenance; the operator wants it A→Z to find things).
+  const sortedFields = useMemo(
+    () => FIELDS.map((f) => ({ f, txt: t(f.label) })).sort((a, b) => a.txt.localeCompare(b.txt)),
+    [t],
+  );
   const [conditions, setConditions] = useState<FilterCondition[]>([]);
   const [match, setMatch] = useState<'AND' | 'OR'>('AND');
   const [presets, setPresets] = useState<Record<string, QueryFilter>>({});
@@ -237,7 +243,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
                 }}>
                   <SelectTrigger className="h-8 w-48 text-xs"><SelectValue /></SelectTrigger>
                   <SelectContent className="max-h-72">
-                    {FIELDS.map((f) => <SelectItem key={f.value} value={f.value}>{t(f.label)}</SelectItem>)}
+                    {sortedFields.map(({ f, txt }) => <SelectItem key={f.value} value={f.value}>{txt}</SelectItem>)}
                   </SelectContent>
                 </Select>
                 <Select value={c.op} onValueChange={(v) => setCond(i, { op: v as FilterOp })}>

frontend/src/components/FirstRunModal.tsx

@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { cn } from '@/lib/utils';
-import { useI18n } from '@/lib/i18n';
+import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
 import { GetActiveProfile, SaveProfile, DownloadAllReferenceLists } from '../../wailsjs/go/main/App';
 import type { profile as profileModels } from '../../wailsjs/go/models';
 
@@ -14,7 +14,7 @@ type Profile = Omit<profileModels.Profile, 'convertValues'>;
 // (no callsign configured yet). It writes straight into the active profile, so
 // OpsLog has a valid station before any QSO is logged. Not dismissable.
 export function FirstRunModal({ onDone }: { onDone: () => void }) {
-  const { t } = useI18n();
+  const { t, lang, setLang } = useI18n();
   const [p, setP] = useState<Profile | null>(null);
   const [saving, setSaving] = useState(false);
   const [err, setErr] = useState('');
@@ -68,6 +68,22 @@ export function FirstRunModal({ onDone }: { onDone: () => void }) {
   return (
     <div className="fixed inset-0 z-[200] flex items-center justify-center bg-black/40 backdrop-blur-sm">
       <div className="w-full max-w-md rounded-xl border border-border bg-card shadow-2xl p-6 animate-in fade-in zoom-in-95">
+        {/* Language chooser — lives here (and not only in the localStorage-backed
+            first-launch flag gate) so a fresh setup always offers EN/FR, like the
+            station identity below. */}
+        <div className="flex justify-center mb-4">
+          <div className="inline-flex rounded-md border border-border overflow-hidden">
+            {([['en', FlagGB, 'English'], ['fr', FlagFR, 'Français']] as [Lang, typeof FlagGB, string][]).map(([code, Flag, label]) => (
+              <button key={code} type="button" onClick={() => setLang(code)}
+                className={cn('flex items-center gap-2 px-3 py-1.5 text-sm font-medium border-l border-border first:border-l-0 transition-colors',
+                  lang === code ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
+                <Flag className="w-5 rounded-[2px] border border-border/30" />
+                {label}
+              </button>
+            ))}
+          </div>
+        </div>
+
         <div className="flex items-center gap-2 mb-1">
           <Radio className="size-5 text-primary" />
           <h2 className="text-lg font-semibold">{t('frm.welcome')}</h2>

frontend/src/components/FlexPanel.tsx

@@ -5,11 +5,17 @@ import {
   FlexSetProcessor, FlexSetProcessorLevel, FlexSetMon, FlexSetMonLevel, FlexSetMic,
   FlexMox, FlexAmpOperate,
   GetPGXLStatus, PGXLSetFanMode,
-  FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit,
+  GetAmpStatuses, AmpOperate, AmpPower, AmpPowerLevel,
+  FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit, FlexSetActiveSlice, FlexSetTXSlice,
+  FlexSetRIT, FlexSetRITFreq, FlexSetXIT, FlexSetXITFreq,
   FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel,
+  FlexSetLMSNR, FlexSetLMSNRLevel, FlexSetLMSANF, FlexSetLMSANFLevel,
+  FlexSetSpeexNR, FlexSetSpeexNRLevel, FlexSetRNN, FlexSetANFT, FlexSetNRF, FlexSetNRFLevel, FlexSetTXDAX,
+  FlexSetWNB, FlexSetWNBLevel, FlexSetTXFilter, FlexSetMicProfile,
   FlexSetAPF, FlexSetAPFLevel, FlexSetCWSpeed, FlexSetCWPitch, FlexSetCWBreakInDelay,
   FlexSetCWSidetone, FlexSetSidetoneLevel, FlexSetCWFilter, FlexSetFilter,
 } from '../../wailsjs/go/main/App';
+import { EventsOn } from '../../wailsjs/runtime/runtime';
 import { cn } from '@/lib/utils';
 import { useI18n } from '@/lib/i18n';
 import { sMeterRST } from '@/lib/rst';
@@ -24,22 +30,34 @@ type FlexState = {
   rx_avail: boolean; agc_mode?: string; agc_threshold: number; audio_level: number; mute: boolean;
   rx_ant?: string; tx_ant?: string; ant_list?: string[]; tx_ant_list?: string[];
   split: boolean; rx_freq_hz?: number; tx_freq_hz?: number;
+  rit: boolean; rit_freq: number; xit: boolean; xit_freq: number;
   nb: boolean; nb_level: number; nr: boolean; nr_level: number; anf: boolean; anf_level: number;
+  wnb: boolean; wnb_level: number;
+  // SmartSDR v4 DSP (8000/Aurora) — dsp_v4 is true once the radio reports them.
+  lms_nr?: boolean; lms_nr_level?: number; lms_anf?: boolean; lms_anf_level?: number;
+  speex_nr?: boolean; speex_nr_level?: number; rnn?: boolean; anft?: boolean;
+  nrf?: boolean; nrf_level?: number; dsp_v4?: boolean;
+  dax_ch?: number; tx_dax?: boolean;
+  tx_filter_low: number; tx_filter_high: number; mic_profile?: string; mic_profiles?: string[];
   mode?: string;
   cw_speed: number; cw_pitch: number; cw_break_in_delay: number; cw_sidetone: boolean; cw_mon_level: number;
   apf: boolean; apf_level: number; filter_lo: number; filter_hi: number;
   amp_available: boolean; amp_model?: string; amp_operate: boolean; amp_fault?: string;
   meters?: Meter[];
+  slices?: FlexSlice[];
 };
 
-type Meter = { id: number; src?: string; name?: string; unit?: string; value: number; lo: number; hi: number };
+type FlexSlice = { index: number; letter: string; freq_hz: number; mode?: string; band?: string; active: boolean; tx: boolean };
+type Meter = { id: number; src?: string; name?: string; unit?: string; slice?: number; value: number; lo: number; hi: number };
 
 const ZERO: FlexState = {
   available: false, rf_power: 0, tune_power: 0, tune: false, transmitting: false,
   vox_enable: false, vox_level: 0, vox_delay: 0, proc_enable: false, proc_level: 0,
   mon: false, mon_level: 0, mic_level: 0, atu_memories: false,
   rx_avail: false, agc_threshold: 0, audio_level: 0, mute: false, split: false,
+  rit: false, rit_freq: 0, xit: false, xit_freq: 0,
   nb: false, nb_level: 0, nr: false, nr_level: 0, anf: false, anf_level: 0,
+  wnb: false, wnb_level: 0, tx_filter_low: 0, tx_filter_high: 0,
   cw_speed: 25, cw_pitch: 600, cw_break_in_delay: 30, cw_sidetone: true, cw_mon_level: 0,
   apf: false, apf_level: 0, filter_lo: 0, filter_hi: 0,
   amp_available: false, amp_operate: false,
@@ -137,31 +155,93 @@ function LevelRow({ label, on, onToggle, value, onLevel, disabled, accent, slide
   );
 }
 
+// OffsetRow — RIT / XIT: a switch plus one signed offset field you scrub with the
+// wheel (or ± , or the arrow keys once focused; hold Ctrl/Shift for 100 Hz steps).
+// Deliberately the same control as the Icom panel's ShiftRow, so the two rigs are
+// driven identically.
+//
+// The offset is NOT cleared when the switch goes off: SmartSDR keeps it, so
+// flipping RIT back on returns you exactly where you were, like the radio's own
+// knob. Zeroing it is a separate, deliberate act — that is what the 0 button is for.
+const OFFSET_MAX = 99999; // SmartSDR's limit
+function OffsetRow({ label, on, onToggle, hz, onHz, disabled, title }: {
+  label: string; on: boolean; onToggle: () => void; hz: number; onHz: (v: number) => void;
+  disabled?: boolean; title?: string;
+}) {
+  const ref = useRef<HTMLDivElement>(null);
+  const step = useRef((_d: number) => {});
+  step.current = (d: number) => onHz(Math.max(-OFFSET_MAX, Math.min(OFFSET_MAX, (hz || 0) + d)));
+
+  // React's onWheel is passive, so preventDefault() there is ignored and the panel
+  // scrolls under the cursor instead of the value changing. Bind it natively.
+  useEffect(() => {
+    const el = ref.current;
+    if (!el) return;
+    const onWheel = (e: WheelEvent) => {
+      e.preventDefault();
+      const mag = e.ctrlKey || e.shiftKey ? 100 : 10;
+      step.current(e.deltaY < 0 ? mag : -mag);
+    };
+    el.addEventListener('wheel', onWheel, { passive: false });
+    return () => el.removeEventListener('wheel', onWheel);
+  }, []);
+
+  const onKey = (e: React.KeyboardEvent) => {
+    const up = e.key === 'ArrowUp' || e.key === 'ArrowRight';
+    const dn = e.key === 'ArrowDown' || e.key === 'ArrowLeft';
+    if (!up && !dn) return;
+    e.preventDefault();
+    const mag = e.ctrlKey || e.shiftKey ? 100 : 10;
+    step.current(up ? mag : -mag);
+  };
+
+  return (
+    <div className="flex items-center gap-2" title={title}>
+      <Chip on={on} onClick={onToggle} label={label} disabled={disabled} accent="cyan" />
+      <div ref={ref} data-offsetrow tabIndex={disabled || !on ? -1 : 0} onKeyDown={onKey}
+        className={cn('flex-1 flex items-center justify-between rounded-md border px-1 py-0.5 select-none',
+          'focus:outline-none focus:ring-2 focus:ring-info/50',
+          on && !disabled ? 'border-border bg-muted/40 cursor-ns-resize' : 'border-border/60 bg-muted/20 opacity-60')}>
+        <button type="button" disabled={disabled || !on} onClick={() => step.current(-10)}
+          className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground disabled:hover:text-muted-foreground">−</button>
+        <span className={cn('text-sm font-mono font-bold tabular-nums', on && hz ? 'text-info' : 'text-muted-foreground')}>
+          {hz > 0 ? '+' : hz < 0 ? '−' : ''}{Math.abs(hz || 0)} Hz
+        </span>
+        <button type="button" disabled={disabled || !on} onClick={() => step.current(10)}
+          className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground disabled:hover:text-muted-foreground">+</button>
+      </div>
+      <button type="button" disabled={disabled || !hz} onClick={() => onHz(0)}
+        className="w-8 shrink-0 py-1 rounded-md text-[11px] font-bold border border-border bg-card text-muted-foreground hover:bg-muted disabled:opacity-30">0</button>
+    </div>
+  );
+}
+
 // MeterBar — a segmented "LED" instrument bar (radio look) scaled by lo/hi.
 // `display` overrides the numeric readout; `segColor` colours segments by their
 // 0..1 position (zones); the top ~18% light red by default (overload/peak).
 const METER_SEGMENTS = 26;
-function MeterBar({ label, value, unit, lo, hi, accent = '#16a34a', extra, display, segColor, onClick, title }: {
+function MeterBar({ label, value, unit, lo, hi, accent = '#16a34a', extra, display, segColor, onClick, title, compact }: {
   label: string; value: number; unit?: string; lo: number; hi: number; accent?: string; extra?: string; display?: string;
-  segColor?: (frac: number) => string; onClick?: () => void; title?: string;
+  segColor?: (frac: number) => string; onClick?: () => void; title?: string; compact?: boolean;
 }) {
   const span = hi - lo;
   const pct = span > 0 ? Math.max(0, Math.min(100, ((value - lo) / span) * 100)) : 0;
   const lit = Math.round((pct / 100) * METER_SEGMENTS);
   return (
     <div onClick={onClick} title={title}
-      className={cn('rounded-lg border border-border/70 px-2.5 py-2 bg-gradient-to-b from-card to-muted/40 shadow-sm min-w-0',
+      className={cn('rounded-lg border border-border/70 bg-gradient-to-b from-card to-muted/40 shadow-sm min-w-0',
+        compact ? 'px-2 py-1' : 'px-2.5 py-2',
         onClick && 'cursor-pointer hover:border-primary/60 hover:from-muted/40')}>
-      <div className="flex items-baseline justify-between gap-1 mb-1.5">
+      <div className={cn('flex items-baseline justify-between gap-1', compact ? 'mb-1' : 'mb-1.5')}>
         <span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground truncate">{label}</span>
-        <span className="text-sm font-mono font-bold tabular-nums whitespace-nowrap text-foreground/90">
+        <span className={cn('font-mono font-bold tabular-nums whitespace-nowrap text-foreground/90', compact ? 'text-xs' : 'text-sm')}>
           {display !== undefined ? display : (
             <>{Math.abs(value) >= 100 ? value.toFixed(0) : value.toFixed(1)}<span className="text-muted-foreground text-[10px] ml-0.5">{unit}</span></>
           )}
         </span>
       </div>
       {/* LED bar — recessed track + gradient segments for a cleaner instrument look. */}
-      <div className="flex gap-[2px] h-3 items-stretch rounded-[3px] bg-black/10 p-[2px]">
+      <div className={cn('flex gap-[2px] items-stretch rounded-[3px] bg-black/10 p-[2px]', compact ? 'h-2' : 'h-3')}>
         {Array.from({ length: METER_SEGMENTS }).map((_, i) => {
           const on = i < lit;
           const frac = i / METER_SEGMENTS;
@@ -174,7 +254,7 @@ function MeterBar({ label, value, unit, lo, hi, accent = '#16a34a', extra, displ
           );
         })}
       </div>
-      {extra && <div className="text-[10px] text-muted-foreground/70 mt-1 text-right font-mono">{extra}</div>}
+      {extra && !compact && <div className="text-[10px] text-muted-foreground/70 mt-1 text-right font-mono">{extra}</div>}
     </div>
   );
 }
@@ -191,12 +271,43 @@ function Card({ icon: Icon, title, accent, children }: { icon: any; title: strin
   );
 }
 
+// speMaxW is the amp's rated output, used as the power-bar full scale. Derived from
+// the model string the amp reports (13K→1.3kW, 15K→1.5kW, 2K/20K→2kW).
+function speMaxW(model?: string): number {
+  const m = (model || '').toUpperCase();
+  if (m.includes('20K') || m.includes('2K')) return 2000;
+  if (m.includes('15K')) return 1500;
+  return 1300; // 1.3K-FA default
+}
+
+// powerLevelLabel spells out the SPE power-level code (L/M/H) in full.
+function powerLevelLabel(pl?: string): string {
+  switch ((pl || '').trim().toUpperCase()) {
+    case 'L': return 'Low';
+    case 'M': return 'Mid';
+    case 'H': return 'High';
+    default: return pl || '';
+  }
+}
+
 // onCWSpeed (optional): notified when the operator changes CW speed here, so the
 // host can keep the WinKeyer (which actually sends the macros) in sync.
 export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number) => void; onReportRST?: (rst: string) => void } = {}) {
   const { t } = useI18n();
   const [st, setSt] = useState<FlexState>(ZERO);
   const hold = useRef<Record<string, number>>({});
+  // Keep the host's keyer speed (used for CW-length estimates and the keyer panel)
+  // in step with the radio's ACTUAL CW speed — including when it's changed on the
+  // radio / in SmartSDR, not just via the slider below. Notify only on a real change.
+  const lastCwSpeed = useRef<number | null>(null);
+  useEffect(() => {
+    const w = st.cw_speed;
+    if (typeof w === 'number' && w > 0 && w !== lastCwSpeed.current) {
+      lastCwSpeed.current = w;
+      onCWSpeed?.(w);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [st.cw_speed]);
   // Peak-hold: keep the highest reading for ~2 s so the jittery VITA-49 meters
   // read steadily instead of jumping every poll.
   const peak = useRef<Record<string, { v: number; t: number }>>({});
@@ -238,6 +349,32 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
     return () => { alive = false; window.clearInterval(id); };
   }, []);
 
+  // Configured amplifiers (Settings → Amplifier) — possibly SEVERAL (some ops
+  // run two SPEs in parallel). The card shows ONE at a time; the dropdown picks
+  // which, and the choice is remembered per panel.
+  const [ampList, setAmpList] = useState<any[]>([]);
+  const [ampSel, setAmpSel] = useState<string>(() => localStorage.getItem('opslog.ampSel.flex') || '');
+  useEffect(() => {
+    let alive = true;
+    const tick = () => GetAmpStatuses().then((l: any) => alive && setAmpList((l ?? []) as any[])).catch(() => {});
+    tick();
+    const id = window.setInterval(tick, 1500);
+    return () => { alive = false; window.clearInterval(id); };
+  }, []);
+  const selAmp = ampList.find((a: any) => a.id === ampSel) ?? ampList[0];
+  const isSPE = !!selAmp?.spe;
+  const isACOM = !!selAmp?.acom;
+  const spe = selAmp?.spe ?? { connected: false };
+  const acom = selAmp?.acom ?? { connected: false };
+  const ampPicker = ampList.length > 1 && selAmp ? (
+    <select value={selAmp.id}
+      onChange={(e) => { setAmpSel(e.target.value); localStorage.setItem('opslog.ampSel.flex', e.target.value); }}
+      title={t('flxp.ampPick')}
+      className="h-8 rounded-md border border-border bg-card px-2 text-xs font-semibold outline-none">
+      {ampList.map((a: any) => <option key={a.id} value={a.id}>{a.name}</option>)}
+    </select>
+  ) : null;
+
   const change = (key: keyof FlexState, val: number | boolean | string, send: () => Promise<any>) => {
     hold.current[key] = Date.now() + 900;
     setSt((p) => ({ ...p, [key]: val }));
@@ -246,6 +383,39 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
 
   const off = !st.available;
   const rxOff = off || !st.rx_avail;
+
+  // Radio-style global RIT tuning: Ctrl+←/→ nudges the RIT offset (Ctrl+Shift =
+  // ±100 Hz) from ANYWHERE — including while the callsign/RST entry field has
+  // focus, which is where the operator is while working a station. Only the RIT
+  // offset row itself (data-offsetrow) is skipped, since it handles its own
+  // arrows. Text-field word navigation via Ctrl+← / → is overridden only while
+  // RIT is actually engaged (guarded below), which is fine mid-QSO. Requires RIT
+  // on and the RX available.
+  useEffect(() => {
+    const onKey = (e: KeyboardEvent) => {
+      if (!(e.ctrlKey || e.metaKey)) return;
+      if (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight') return;
+      const ae = document.activeElement as HTMLElement | null;
+      if (ae && ae.hasAttribute('data-offsetrow')) return;
+      if (!st.rit || rxOff) return;
+      e.preventDefault();
+      const mag = e.shiftKey ? 100 : 10;
+      const next = (st.rit_freq || 0) + (e.key === 'ArrowRight' ? mag : -mag);
+      change('rit_freq', next, () => FlexSetRITFreq(next));
+    };
+    window.addEventListener('keydown', onKey);
+    return () => window.removeEventListener('keydown', onKey);
+  }, [st.rit, st.rit_freq, rxOff]);
+
+  // Clear the RIT offset back to 0 whenever a QSO is logged (any path: Log
+  // button, keyer macro, WSJT-X), so the next station starts centred. Only acts
+  // when there's actually a non-zero offset to clear.
+  useEffect(() => {
+    const off = EventsOn('qso:logged', () => {
+      if (st.rit && (st.rit_freq || 0) !== 0) change('rit_freq', 0, () => FlexSetRITFreq(0));
+    });
+    return () => off();
+  }, [st.rit, st.rit_freq]);
   const isCW = (st.mode || '').toUpperCase().includes('CW');
   const PROC = [{ v: '0', l: 'NOR' }, { v: '1', l: 'DX' }, { v: '2', l: 'DX+' }];
   const AGC = [{ v: 'off', l: 'OFF' }, { v: 'slow', l: 'SLOW' }, { v: 'med', l: 'MED' }, { v: 'fast', l: 'FAST' }];
@@ -260,6 +430,13 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
     ? SSB_BW.reduce((best, bw) => (Math.abs(bw - curBW) < Math.abs(best - curBW) ? bw : best), SSB_BW[0])
     : -1;
 
+  // Compact header readouts for PA voltage + temperature (numbers, not bars) — the
+  // user wanted these in the header to save vertical space in the Meters card.
+  const hdrMeters = st.meters || [];
+  const hdrFind = (name: string) => hdrMeters.find((m) => (m.name || '').toUpperCase().includes(name) && !(m.src || '').toUpperCase().includes('AMP'));
+  const voltM = hdrFind('13.8') || hdrFind('VOLT');
+  const patempM = hdrFind('PATEMP') || hdrFind('PA TEMP');
+
   return (
     <div className="h-full min-h-0 overflow-auto bg-background">
       <div className="max-w-5xl mx-auto p-3 space-y-3">
@@ -272,6 +449,23 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
             <span className="text-[11px] text-slate-400">{t('flxp.smartsdrRemote')}</span>
           </div>
           <div className="flex-1" />
+          {/* Compact PA voltage + temperature readouts (numbers) to save space. */}
+          {!off && (voltM || patempM) && (
+            <div className="flex items-center gap-4 mr-1 font-mono tabular-nums">
+              {voltM && (
+                <span className="flex flex-col items-end leading-none">
+                  <span className="text-[9px] uppercase tracking-wider text-slate-400 font-sans">{t('flxp.voltage')}</span>
+                  <span className="text-sm font-bold">{voltM.value.toFixed(1)}<span className="text-[9px] text-slate-400 ml-0.5">V</span></span>
+                </span>
+              )}
+              {patempM && (
+                <span className="flex flex-col items-end leading-none">
+                  <span className="text-[9px] uppercase tracking-wider text-slate-400 font-sans">{t('flxp.paTemp')}</span>
+                  <span className={cn('text-sm font-bold', patempM.value >= 70 ? 'text-red-400' : patempM.value >= 55 ? 'text-amber-400' : 'text-slate-100')}>{patempM.value.toFixed(0)}<span className="text-[9px] text-slate-400 ml-0.5">°C</span></span>
+                </span>
+              )}
+            </div>
+          )}
           <span className={cn('inline-flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-sm font-extrabold tracking-wider',
             !st.available ? 'bg-muted text-muted-foreground'
               : st.transmitting ? 'bg-danger text-danger-foreground shadow-[0_0_16px] shadow-danger/60' : 'bg-success text-success-foreground')}>
@@ -280,6 +474,99 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
           </span>
         </div>
 
+        {/* Slices A/B/C/D — every in-use receiver. Click one to make it the
+            ACTIVE slice: the main frequency, mode, DSP and spot-clicks all follow
+            it. The active slice is highlighted; the TX slice is flagged. */}
+        {!!st.slices && st.slices.length > 0 && (
+          <div className="flex flex-wrap items-center gap-2">
+            {st.slices.map((sl) => (
+              <button key={sl.index} type="button" disabled={off}
+                onClick={() => FlexSetActiveSlice(sl.index).catch(() => {})}
+                title={t('flxp.sliceHint')}
+                className={cn('flex items-center gap-2 rounded-lg border px-3 py-1.5 transition-colors disabled:opacity-40',
+                  sl.active ? 'border-info bg-info/10 ring-1 ring-info' : 'border-border bg-card hover:bg-muted')}>
+                <span className={cn('inline-flex size-6 items-center justify-center rounded-md text-sm font-extrabold',
+                  sl.active ? 'bg-info text-info-foreground' : 'bg-muted text-muted-foreground')}>{sl.letter}</span>
+                <span className="flex items-baseline gap-1.5">
+                  <span className="font-mono font-bold tabular-nums text-sm leading-none">{(sl.freq_hz / 1e6).toFixed(3)}</span>
+                  <span className="text-[11px] text-muted-foreground uppercase leading-none">{sl.mode}</span>
+                  {sl.band ? <span className="text-[10px] text-muted-foreground leading-none">{sl.band}</span> : null}
+                </span>
+                {/* TX badge — click a non-TX slice's badge to move TX onto it
+                    (e.g. transmit on the active slice). stopPropagation so it
+                    doesn't also fire the outer "make active" click. */}
+                <span role="button" tabIndex={-1}
+                  onClick={(e) => { e.stopPropagation(); if (!sl.tx && !off) FlexSetTXSlice(sl.index).catch(() => {}); }}
+                  title={sl.tx ? t('flxp.txSlice') : t('flxp.setTxSlice')}
+                  className={cn('rounded text-[10px] font-bold px-1',
+                    sl.tx ? 'bg-danger text-danger-foreground' : 'border border-danger/50 text-danger cursor-pointer hover:bg-danger/10')}>
+                  TX
+                </span>
+              </button>
+            ))}
+          </div>
+        )}
+
+        {/* Live meters (UDP VITA-49 stream) — placed right under the slices. */}
+        <Card icon={Gauge} title={t('flxp.meters')}>
+          {(() => {
+            const meters = st.meters || [];
+            if (off || meters.length === 0) {
+              return <p className="text-[11px] text-muted-foreground text-center py-2">{t('flxp.noMeters')}</p>;
+            }
+            const isDbm = (m?: Meter) => !!m && /dbm/i.test(m.unit || '');
+            const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
+            // Radio meters (exclude the amplifier's, which we show separately).
+            const radio = (name: string) => meters.find((m) =>
+              (m.name || '').toUpperCase().includes(name) && !(m.src || '').toUpperCase().includes('AMP'));
+            // Per-slice (SLC) meters — S-meter — exist once PER SLICE, so pick the
+            // one for the ACTIVE slice; otherwise we'd always show slice A's level.
+            const activeSlice = (st.slices || []).find((s) => s.active)?.index ?? -1;
+            const sliceMeter = (name: string) => {
+              const m = meters.filter((x) => (x.name || '').toUpperCase().includes(name) && !(x.src || '').toUpperCase().includes('AMP'));
+              if (m.length === 0) return undefined;
+              return m.find((x) => (x.src || '').toUpperCase().includes('SLC') && x.slice === activeSlice) || m[0];
+            };
+            const sig = sliceMeter('LEVEL') || sliceMeter('SIGNAL');
+            const fwd = radio('FWDPWR');
+            const swr = radio('SWR');
+            // Mic input level + speech-compression (voltage & PA temp live in the
+            // header now). All already in the meter stream.
+            const mic = meters.find((m) => /MIC/i.test(m.name || '') && !(m.src || '').toUpperCase().includes('AMP'));
+            const comp = radio('COMPPEAK') || radio('COMP');
+            // S-meter: dBm → S-units (S9 = -73 dBm on HF, 6 dB per unit).
+            const sUnit = (dbm: number) => {
+              const sv = (dbm + 127) / 6; // S0 = -127 dBm
+              if (sv >= 9) {
+                const over = Math.max(0, Math.round(dbm + 73)); // dB over S9
+                return { display: over > 0 ? `S9+${over}` : 'S9', bar: sv, s: 9, over };
+              }
+              return { display: `S${Math.max(0, Math.round(sv))}`, bar: Math.max(0, sv), s: Math.max(0, sv), over: 0 };
+            };
+            const cur = [
+              sig && (() => { const dbm = peakHold('s', sig.value); const s = sUnit(dbm); return (
+                <MeterBar key="s" label="S-METER" value={s.bar} lo={0} hi={19} accent="#16a34a" display={s.display} extra={`${dbm.toFixed(1)} dBm`}
+                  title={onReportRST ? t('rst.clickToFill') : undefined}
+                  onClick={onReportRST ? () => onReportRST(sMeterRST(s.s, s.over, st.mode)) : undefined}
+                  segColor={(fr) => { const sval = fr * 19; return sval < 9 ? '#16a34a' : sval < 12.33 ? '#f59e0b' : '#dc2626'; }} />
+              ); })(),
+              fwd && (() => { const w = peakHold('p', isDbm(fwd) ? dbmToW(fwd.value) : fwd.value); return (
+                <MeterBar key="p" label="PWR" unit="W" lo={0} hi={120} accent="#dc2626"
+                  value={w} extra={isDbm(fwd) ? `${fwd.value.toFixed(1)} dBm` : undefined} />
+              ); })(),
+              swr && <MeterBar key="w" label="SWR" value={peakHold('w', swr.value)} unit="" lo={1} hi={3} accent="#d97706" />,
+              // Mic input level: fixed -40..+10 dB scale, RED from 0 dB up (overdrive).
+              mic && <MeterBar key="mic" label="MIC" value={peakHold('mic', mic.value)} unit={mic.unit || 'dB'} lo={-40} hi={10} accent="#16a34a"
+                segColor={(fr) => (fr >= 0.8 ? '#dc2626' : fr >= 0.7 ? '#f59e0b' : '#16a34a')} />,
+              // Speech compression (dB of gain reduction).
+              comp && <MeterBar key="comp" label="COMP" value={peakHold('comp', comp.value)} unit={comp.unit || 'dB'} lo={0} hi={(comp.hi && comp.hi > 0) ? comp.hi : 25} accent="#0891b2" />,
+            ].filter(Boolean);
+            return (
+              <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">{cur}</div>
+            );
+          })()}
+        </Card>
+
         {off && (
           <div className="text-center text-sm text-muted-foreground py-6">
             {t('flxp.waiting')}
@@ -330,6 +617,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
               )}
             </div>
 
+
             {!isCW ? (
             <div className="border-t border-border/60 pt-3 space-y-3">
               <div className="flex items-center gap-2">
@@ -356,6 +644,39 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
                 <Slider value={st.mic_level} disabled={off} accent="#2563eb" onChange={(v) => change('mic_level', v, () => FlexSetMic(v))} />
                 <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.mic_level}</span>
               </div>
+              {/* TX audio bandwidth — low/high cut (Hz). Typed locally, committed on
+                  blur/Enter so we don't spam a command per keystroke; the hold guard
+                  keeps the poll from clobbering the field mid-edit. */}
+              <div className="flex items-center gap-2">
+                <span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">{t('flxp.txFilter')}</span>
+                {(() => {
+                  const editTX = (patch: Partial<FlexState>) => { hold.current['tx_filter_low'] = Date.now() + 8000; hold.current['tx_filter_high'] = Date.now() + 8000; setSt((p) => ({ ...p, ...patch })); };
+                  const commitTX = () => { hold.current['tx_filter_low'] = Date.now() + 900; hold.current['tx_filter_high'] = Date.now() + 900; FlexSetTXFilter(st.tx_filter_low || 0, st.tx_filter_high || 0).catch(() => {}); };
+                  const inp = 'w-[70px] h-8 rounded-md border border-input bg-background px-2 text-xs font-mono tabular-nums disabled:opacity-40';
+                  return (<>
+                    <input type="number" step={50} min={0} disabled={off} value={st.tx_filter_low || 0} className={inp}
+                      onChange={(e) => editTX({ tx_filter_low: parseInt(e.target.value, 10) || 0 })}
+                      onBlur={commitTX} onKeyDown={(e) => { if (e.key === 'Enter') { (e.target as HTMLInputElement).blur(); } }} />
+                    <span className="text-muted-foreground text-xs">–</span>
+                    <input type="number" step={50} min={0} disabled={off} value={st.tx_filter_high || 0} className={inp}
+                      onChange={(e) => editTX({ tx_filter_high: parseInt(e.target.value, 10) || 0 })}
+                      onBlur={commitTX} onKeyDown={(e) => { if (e.key === 'Enter') { (e.target as HTMLInputElement).blur(); } }} />
+                    <span className="text-[10px] text-muted-foreground/70 font-mono">Hz</span>
+                  </>);
+                })()}
+              </div>
+              {/* Mic profile — SmartSDR named mic-EQ/processor presets. */}
+              {!!st.mic_profiles && st.mic_profiles.length > 0 && (
+                <div className="flex items-center gap-2">
+                  <span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">{t('flxp.micProfile')}</span>
+                  <select disabled={off} value={st.mic_profile || ''}
+                    onChange={(e) => { const v = e.target.value; hold.current['mic_profile'] = Date.now() + 2000; setSt((p) => ({ ...p, mic_profile: v })); FlexSetMicProfile(v).catch(() => {}); }}
+                    className="flex-1 min-w-0 h-8 rounded-md border border-input bg-background px-2 text-xs">
+                    {!st.mic_profiles.includes(st.mic_profile || '') && <option value="">—</option>}
+                    {st.mic_profiles.map((p) => <option key={p} value={p}>{p}</option>)}
+                  </select>
+                </div>
+              )}
             </div>
             ) : (
             /* CW keyer controls (replace VOX/PROC/MIC when the slice is in CW). */
@@ -380,12 +701,24 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
                 onLevel={(v) => change('cw_mon_level', v, () => FlexSetSidetoneLevel(v))} />
             </div>
             )}
+
+            {/* RIT/XIT live on the TRANSMIT side to balance the two columns — the
+                RECEIVE card grew tall with the v4 DSP rows. */}
+            <div className="space-y-1.5 border-t border-border/60 pt-3">
+              <OffsetRow label="RIT" on={st.rit} disabled={rxOff} hz={st.rit_freq} title={t('flxp.ritHint')}
+                onToggle={() => change('rit', !st.rit, () => FlexSetRIT(!st.rit))}
+                onHz={(v) => change('rit_freq', v, () => FlexSetRITFreq(v))} />
+              <OffsetRow label="XIT" on={st.xit} disabled={rxOff} hz={st.xit_freq} title={t('flxp.xitHint')}
+                onToggle={() => change('xit', !st.xit, () => FlexSetXIT(!st.xit))}
+                onHz={(v) => change('xit_freq', v, () => FlexSetXITFreq(v))} />
+            </div>
           </Card>
 
           {/* RECEIVE */}
           <Card icon={AudioLines} title={t('flxp.receiveActive')} accent="#0891b2">
+            {/* Antenna selection sits at the very top of the RX column. */}
             {((st.ant_list?.length ?? 0) > 0 || (st.tx_ant_list?.length ?? 0) > 0) && (
-              <div className="flex items-center gap-2">
+              <div className="flex items-center gap-2 pb-3 border-b border-border/60">
                 <span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">Ant</span>
                 <div className="flex items-center gap-1.5 flex-1 min-w-0">
                   <span className="text-[10px] text-muted-foreground">RX</span>
@@ -400,6 +733,14 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
                     className="h-7 flex-1 min-w-0 rounded-md border border-input bg-background px-1.5 text-xs font-mono disabled:opacity-40">
                     {((st.tx_ant_list?.length ? st.tx_ant_list : st.ant_list) ?? []).map((a) => <option key={a} value={a}>{a}</option>)}
                   </select>
+                  {/* DAX on/off — SmartSDR's transmit-bar DAX button (TX audio from
+                      DAX, e.g. WSJT-X). "transmit set dax=", not the slice channel. */}
+                  <button type="button" disabled={off} title={t('flxp.daxHint')}
+                    onClick={() => change('tx_dax', !st.tx_dax, () => FlexSetTXDAX(!st.tx_dax))}
+                    className={cn('h-7 px-2.5 shrink-0 rounded-md border text-[11px] font-bold transition-colors disabled:opacity-40',
+                      st.tx_dax ? 'bg-info text-info-foreground border-info' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
+                    DAX
+                  </button>
                 </div>
               </div>
             )}
@@ -429,6 +770,10 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
               <LevelRow label="NB" on={st.nb} disabled={rxOff} value={st.nb_level} accent="amber" sliderAccent="#d97706"
                 onToggle={() => change('nb', !st.nb, () => FlexSetNB(!st.nb))}
                 onLevel={(v) => change('nb_level', v, () => FlexSetNBLevel(v))} />
+              {/* WNB — wideband noise blanker (the extra hardware NR the Flex has). */}
+              <LevelRow label="WNB" on={st.wnb} disabled={rxOff} value={st.wnb_level} accent="amber" sliderAccent="#f59e0b"
+                onToggle={() => change('wnb', !st.wnb, () => FlexSetWNB(!st.wnb))}
+                onLevel={(v) => change('wnb_level', v, () => FlexSetWNBLevel(v))} />
               <LevelRow label="NR" on={st.nr} disabled={rxOff} value={st.nr_level} accent="cyan" sliderAccent="#0891b2"
                 onToggle={() => change('nr', !st.nr, () => FlexSetNR(!st.nr))}
                 onLevel={(v) => change('nr_level', v, () => FlexSetNRLevel(v))} />
@@ -439,6 +784,49 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
                   onLevel={(v) => change('anf_level', v, () => FlexSetANFLevel(v))} />
               )}
             </div>
+            {/* SmartSDR v4 DSP (8000/Aurora series) — NRL/ANFL (legacy LMS), NRS
+                (spectral subtraction), NRF (NR w/ filter), RNN (AI NR), ANFT (FFT
+                notch). Only shown when the radio actually reports these slice keys
+                (older 6000s never do). API keys per the FlexLib slice docs. */}
+            {st.dsp_v4 && (
+              <div className="border-t border-border/60 pt-3 space-y-3">
+                <LevelRow label="NRL" on={!!st.lms_nr} disabled={rxOff} value={st.lms_nr_level ?? 0} accent="cyan" sliderAccent="#0e7490"
+                  onToggle={() => change('lms_nr', !st.lms_nr, () => FlexSetLMSNR(!st.lms_nr))}
+                  onLevel={(v) => change('lms_nr_level', v, () => FlexSetLMSNRLevel(v))} />
+                <LevelRow label="NRS" on={!!st.speex_nr} disabled={rxOff} value={st.speex_nr_level ?? 0} accent="cyan" sliderAccent="#06b6d4"
+                  onToggle={() => change('speex_nr', !st.speex_nr, () => FlexSetSpeexNR(!st.speex_nr))}
+                  onLevel={(v) => change('speex_nr_level', v, () => FlexSetSpeexNRLevel(v))} />
+                <LevelRow label="NRF" on={!!st.nrf} disabled={rxOff} value={st.nrf_level ?? 0} accent="cyan" sliderAccent="#0369a1"
+                  onToggle={() => change('nrf', !st.nrf, () => FlexSetNRF(!st.nrf))}
+                  onLevel={(v) => change('nrf_level', v, () => FlexSetNRFLevel(v))} />
+                {/* Notch filters target carriers in voice — hidden in CW like ANF. */}
+                {!isCW && (
+                  <LevelRow label="ANFL" on={!!st.lms_anf} disabled={rxOff} value={st.lms_anf_level ?? 0} accent="violet" sliderAccent="#8b5cf6"
+                    onToggle={() => change('lms_anf', !st.lms_anf, () => FlexSetLMSANF(!st.lms_anf))}
+                    onLevel={(v) => change('lms_anf_level', v, () => FlexSetLMSANFLevel(v))} />
+                )}
+                {/* RNN and ANFT are on/off only — no level in the API. */}
+                <div className="flex items-center gap-2">
+                  <span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground" title={t('flxp.dspV4Hint')}>AI/FFT</span>
+                  <button type="button" disabled={rxOff}
+                    title={t('flxp.rnnHint')}
+                    onClick={() => change('rnn', !st.rnn, () => FlexSetRNN(!st.rnn))}
+                    className={cn('px-2.5 py-1 rounded-md border text-[11px] font-bold transition-colors disabled:opacity-30',
+                      st.rnn ? 'bg-primary text-primary-foreground border-primary' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
+                    RNN
+                  </button>
+                  {!isCW && (
+                    <button type="button" disabled={rxOff}
+                      title={t('flxp.anftHint')}
+                      onClick={() => change('anft', !st.anft, () => FlexSetANFT(!st.anft))}
+                      className={cn('px-2.5 py-1 rounded-md border text-[11px] font-bold transition-colors disabled:opacity-30',
+                        st.anft ? 'bg-primary text-primary-foreground border-primary' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
+                      ANFT
+                    </button>
+                  )}
+                </div>
+              </div>
+            )}
             {isCW && (
               <div className="border-t border-border/60 pt-3 space-y-3">
                 <LevelRow label="APF" on={st.apf} disabled={rxOff} value={st.apf_level} accent="emerald" sliderAccent="#16a34a"
@@ -488,10 +876,118 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
           </Card>
         </div>
 
-        {/* External amplifier (PowerGenius XL) — only when detected. */}
-        {st.amp_available && (
+        {/* SPE Expert amplifier (serial/TCP) — shown when it's the configured amp.
+            The Flex doesn't report SPE amps, so this card is driven by OpsLog's own
+            SPE link rather than the Flex amplifier object. */}
+        {isSPE && (
+          <Card icon={Flame} title={`${t('flxp.amplifier')} · ${selAmp?.name || `SPE${spe.model ? ' ' + spe.model : ''}`}`} accent="#ea580c">
+            <div className="flex items-center gap-3 flex-wrap">
+              {ampPicker}
+              <button type="button" disabled={!spe.connected}
+                onClick={() => AmpOperate(selAmp.id, !spe.operate).catch(() => {})}
+                className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
+                  spe.operate ? 'bg-warning text-warning-foreground border-warning shadow-[0_0_14px] shadow-warning/50' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
+                {spe.operate ? 'OPERATE' : 'STANDBY'}
+              </button>
+              {/* Power ON / OFF (best-guess keystrokes from the APG — verify on hw). */}
+              <div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
+                <button type="button" disabled={!spe.connected}
+                  onClick={() => AmpPower(selAmp.id, true).catch(() => {})}
+                  className="px-3 py-2 text-sm font-bold bg-card text-success hover:bg-success/15 disabled:opacity-30">ON</button>
+                <button type="button" disabled={!spe.connected}
+                  onClick={() => AmpPower(selAmp.id, false).catch(() => {})}
+                  className="px-3 py-2 text-sm font-bold bg-card text-danger border-l-2 border-success/70 hover:bg-danger/15 disabled:opacity-30">OFF</button>
+              </div>
+              {/* Output power level: Low / Mid / High. */}
+              <div className="inline-flex rounded-lg overflow-hidden border border-border">
+                {(['L', 'M', 'H'] as const).map((lvl, i) => {
+                  const active = (spe.power_level || '').trim().toUpperCase() === lvl;
+                  return (
+                    <button key={lvl} type="button" disabled={!spe.connected}
+                      onClick={() => AmpPowerLevel(selAmp.id, lvl).catch(() => {})}
+                      className={cn('px-3 py-2 text-sm font-bold disabled:opacity-30', i > 0 && 'border-l border-border',
+                        active ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
+                      {powerLevelLabel(lvl)}
+                    </button>
+                  );
+                })}
+              </div>
+              <span className={cn('inline-flex items-center gap-1.5 text-sm', spe.connected ? 'text-muted-foreground' : 'text-danger')}>
+                <span className={cn('size-2 rounded-full', spe.connected ? 'bg-success' : 'bg-danger')} />
+                {spe.connected ? (spe.tx ? 'TX' : 'RX') : t('flxp.speOffline')}
+              </span>
+              {spe.connected && (
+                <span className="text-sm font-mono text-muted-foreground tabular-nums">
+                  {spe.band ? `${spe.band} · ` : ''}{spe.output_w}W · SWR {Number(spe.swr_ant ?? 0).toFixed(1)} · {spe.temp_c}°C · {powerLevelLabel(spe.power_level)}
+                </span>
+              )}
+              <div className="flex-1" />
+              {(spe.warnings || spe.alarms) && (
+                <span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">⚠ {spe.warnings} {spe.alarms}</span>
+              )}
+            </div>
+            {spe.connected && (
+              <MeterBar label={t('flxp.outputPower')} value={Number(spe.output_w) || 0} unit="W"
+                lo={0} hi={speMaxW(spe.model)}
+                display={`${Number(spe.output_w) || 0} W`}
+                segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
+            )}
+          </Card>
+        )}
+
+        {/* ACOM amplifier (serial/TCP) — shown when it's the configured amp. Driven
+            by OpsLog's own ACOM link (the Flex doesn't report ACOM amps). */}
+        {isACOM && (
+          <Card icon={Flame} title={`${t('flxp.amplifier')} · ${selAmp?.name || `ACOM${acom.model ? ' ' + acom.model : ''}`}`} accent="#ea580c">
+            <div className="flex items-center gap-3 flex-wrap">
+              {ampPicker}
+              <button type="button" disabled={!acom.connected}
+                onClick={() => AmpOperate(selAmp.id, !acom.operate).catch(() => {})}
+                className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
+                  acom.operate ? 'bg-warning text-warning-foreground border-warning shadow-[0_0_14px] shadow-warning/50' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
+                {acom.operate ? 'OPERATE' : 'STANDBY'}
+              </button>
+              {/* Power ON is a DTR/RTS pulse — serial only, and it works while the amp
+                  is off (the port stays open), so gate on port_open not connected. */}
+              <div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
+                <button type="button" disabled={!(acom.port_open && acom.transport === 'serial')}
+                  onClick={() => AmpPower(selAmp.id, true).catch(() => {})}
+                  title={acom.transport === 'serial' ? 'Power on (DTR/RTS pulse — needs the power-on pins wired)' : 'Power-on needs the serial DTR/RTS lines — not available over a network bridge'}
+                  className="px-3 py-2 text-sm font-bold bg-card text-success hover:bg-success/15 disabled:opacity-30">ON</button>
+                <button type="button" disabled={!acom.connected}
+                  onClick={() => AmpPower(selAmp.id, false).catch(() => {})}
+                  className="px-3 py-2 text-sm font-bold bg-card text-danger border-l-2 border-success/70 hover:bg-danger/15 disabled:opacity-30">OFF</button>
+              </div>
+              <span className={cn('inline-flex items-center gap-1.5 text-sm', acom.connected ? 'text-muted-foreground' : 'text-danger')}>
+                <span className={cn('size-2 rounded-full', acom.connected ? 'bg-success' : 'bg-danger')} />
+                {acom.connected ? acom.state : t('flxp.acomOffline')}
+              </span>
+              {acom.connected && (
+                <span className="text-sm font-mono text-muted-foreground tabular-nums">
+                  {acom.band ? `${acom.band} · ` : ''}{acom.fwd_w}W · SWR {Number(acom.swr ?? 0).toFixed(1)} · {acom.temp_c}°C · Fan {acom.fan}
+                </span>
+              )}
+              <div className="flex-1" />
+              {acom.err_text && (
+                <span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">⚠ {acom.err_text}</span>
+              )}
+            </div>
+            {acom.connected && (
+              <MeterBar label={t('flxp.outputPower')} value={Number(acom.fwd_w) || 0} unit="W"
+                lo={0} hi={Number(acom.max_w) || 800}
+                display={`${Number(acom.fwd_w) || 0} W`}
+                segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
+            )}
+          </Card>
+        )}
+
+        {/* External amplifier (PowerGenius XL) — only when the Flex reports one AND
+            PowerGenius is the selected amp type. Running an SPE Expert or ACOM hides
+            this Flex-reported card so two amps don't both show. */}
+        {st.amp_available && !isSPE && !isACOM && (
           <Card icon={Flame} title={`${t('flxp.amplifier')}${st.amp_model ? ' · ' + st.amp_model : ''}`} accent="#ea580c">
             <div className="flex items-center gap-3">
+              {ampPicker}
               <button type="button" disabled={off}
                 onClick={() => change('amp_operate', !st.amp_operate, () => FlexAmpOperate(!st.amp_operate))}
                 className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
@@ -504,7 +1000,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
               {/* Fan mode — shown when the PowerGenius is configured (Settings →
                   PowerGenius). The dot shows the direct-connection state; the
                   selector is disabled until connected (hover it for the error). */}
-              {(pg.host || pg.connected) && (
+              {selAmp?.type === 'pgxl' && (pg.host || pg.connected) && (
                 <label className="flex items-center gap-1.5 text-xs" title={pg.connected ? t('flxp.pgConnected') : (pg.last_error || t('flxp.pgOffline'))}>
                   <span className={cn('size-1.5 rounded-full', pg.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-danger')} />
                   <span className="text-muted-foreground">{t('flxp.fan')}</span>
@@ -525,71 +1021,39 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
                 <span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">{t('flxp.fault')}: {st.amp_fault}</span>
               )}
             </div>
+            {/* Amplifier meters (FWD / ID / TEMP) — moved here from the Meters card
+                and shown compact so they sit with the amp controls. */}
+            {(() => {
+              const meters = st.meters || [];
+              const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
+              const amp = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
+                && !/^(RL|DRV)$/i.test((m.name || '').trim()));
+              if (off || amp.length === 0) return null;
+              return (
+                <div className="grid grid-cols-2 sm:grid-cols-3 gap-2 mt-2 pt-2 border-t border-border/50">
+                  {amp.map((m) => {
+                    if (/fwd|pwr/i.test(m.name || '') && /dbm/i.test(m.unit || '')) {
+                      return <MeterBar key={m.id} compact label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, dbmToW(m.value))} unit="W" lo={0} hi={2000} accent="#dc2626" />;
+                    }
+                    const acc = /temp|degc|degf/i.test(`${m.unit}${m.name}`) ? '#ea580c' : /volt/i.test(m.unit || '') ? '#2563eb' : '#16a34a';
+                    // Drain current (ID): the PGXL reports a full-scale far too small
+                    // for this meter (~3 A), so 1.5 A pinned the bar near half. The
+                    // value itself is fine — only the bar's range was wrong. Give it a
+                    // fixed 25 A scale (the PGXL's LDMOS pair tops out around 20 A), and
+                    // only override an unusable reported range, not a sane one.
+                    let lo = m.lo, hi = m.hi;
+                    if (/amp/i.test(m.unit || '') || /^ID$|current/i.test(m.name || '')) {
+                      lo = 0;
+                      hi = m.hi >= 25 ? m.hi : 25;
+                    }
+                    return <MeterBar key={m.id} compact label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={lo} hi={hi} accent={acc} />;
+                  })}
+                </div>
+              );
+            })()}
           </Card>
         )}
 
-        {/* Live meters (UDP VITA-49 stream) */}
-        <Card icon={Gauge} title={t('flxp.meters')}>
-          {(() => {
-            const meters = st.meters || [];
-            if (off || meters.length === 0) {
-              return <p className="text-[11px] text-muted-foreground text-center py-2">{t('flxp.noMeters')}</p>;
-            }
-            const isDbm = (m?: Meter) => !!m && /dbm/i.test(m.unit || '');
-            const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
-            // Radio meters (exclude the amplifier's, which we show separately).
-            const radio = (name: string) => meters.find((m) =>
-              (m.name || '').toUpperCase().includes(name) && !(m.src || '').toUpperCase().includes('AMP'));
-            const sig = radio('LEVEL') || radio('SIGNAL');
-            const fwd = radio('FWDPWR');
-            const swr = radio('SWR');
-            const amp = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
-              && !/^(RL|DRV)$/i.test((m.name || '').trim()));
-            const accentFor = (m: Meter) => /swr/i.test(`${m.unit}${m.name}`) ? '#dc2626'
-              : /temp|degc|degf/i.test(`${m.unit}${m.name}`) ? '#ea580c'
-              : /volt/i.test(m.unit || '') ? '#2563eb' : '#16a34a';
-            // S-meter: dBm → S-units (S9 = -73 dBm on HF, 6 dB per unit).
-            const sUnit = (dbm: number) => {
-              const sv = (dbm + 127) / 6; // S0 = -127 dBm
-              if (sv >= 9) {
-                const over = Math.max(0, Math.round(dbm + 73)); // dB over S9
-                return { display: over > 0 ? `S9+${over}` : 'S9', bar: sv, s: 9, over };
-              }
-              return { display: `S${Math.max(0, Math.round(sv))}`, bar: Math.max(0, sv), s: Math.max(0, sv), over: 0 };
-            };
-            const cur = [
-              sig && (() => { const dbm = peakHold('s', sig.value); const s = sUnit(dbm); return (
-                <MeterBar key="s" label="S-METER" value={s.bar} lo={0} hi={19} accent="#16a34a" display={s.display} extra={`${dbm.toFixed(1)} dBm`}
-                  title={onReportRST ? t('rst.clickToFill') : undefined}
-                  onClick={onReportRST ? () => onReportRST(sMeterRST(s.s, s.over, st.mode)) : undefined}
-                  segColor={(fr) => { const sval = fr * 19; return sval < 9 ? '#16a34a' : sval < 12.33 ? '#f59e0b' : '#dc2626'; }} />
-              ); })(),
-              fwd && (() => { const w = peakHold('p', isDbm(fwd) ? dbmToW(fwd.value) : fwd.value); return (
-                <MeterBar key="p" label="PWR" unit="W" lo={0} hi={120} accent="#dc2626"
-                  value={w} extra={isDbm(fwd) ? `${fwd.value.toFixed(1)} dBm` : undefined} />
-              ); })(),
-              swr && <MeterBar key="w" label="SWR" value={peakHold('w', swr.value)} unit="" lo={1} hi={3} accent="#d97706" />,
-            ].filter(Boolean);
-            return (
-              <>
-                <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">{cur}</div>
-                {amp.length > 0 && (
-                  <div className="border-t border-border/60 pt-2 mt-1">
-                    <div className="text-[10px] font-bold tracking-wider text-muted-foreground mb-1.5">{t('flxp.amplifierHdr')}</div>
-                    <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">
-                      {amp.map((m) => {
-                        if (/fwd|pwr/i.test(m.name || '') && isDbm(m)) {
-                          return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, dbmToW(m.value))} unit="W" lo={0} hi={2000} accent="#dc2626" extra={`${m.value.toFixed(1)} dBm`} />;
-                        }
-                        return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={m.lo} hi={m.hi} accent={accentFor(m)} />;
-                      })}
-                    </div>
-                  </div>
-                )}
-              </>
-            );
-          })()}
-        </Card>
       </div>
     </div>
   );

frontend/src/components/IcomPanel.tsx

@@ -1,12 +1,15 @@
 import { useEffect, useRef, useState } from 'react';
-import { Radio, AudioLines, RefreshCw, Mic, Activity, SlidersHorizontal } from 'lucide-react';
+import { Radio, AudioLines, Mic, Activity, SlidersHorizontal, Antenna, Filter, Power } from 'lucide-react';
 import {
   GetIcomState, IcomRefresh,
   IcomSetAFGain, IcomSetRFGain, IcomSetNB, IcomSetNBLevel, IcomSetNR, IcomSetNRLevel,
-  IcomSetANF, IcomSetAGC, IcomSetPreamp, IcomSetAtt, IcomSetFilter,
+  IcomSetANF, IcomSetAPF, IcomSetAGC, IcomSetPreamp, IcomSetAtt, IcomSetFilter,
   IcomSetRFPower, IcomSetMicGain, IcomSetSplit, IcomTune, IcomSetPTT,
-  IcomSetScope, IcomScopeData, IcomSetScopeMode, GetCATState, SetCATFrequency,
+  IcomSetScope, IcomScopeData, IcomSetScopeMode, IcomSetScopeEdges, GetCATState, SetCATFrequency, SetCATMode,
   IcomSetRIT, IcomSetRITOn, IcomSetXITOn,
+  IcomSetAntenna, IcomSetPBTInner, IcomSetPBTOuter, IcomSetManualNotch, IcomSetNotchPos,
+  IcomSetSquelch, IcomSetComp, IcomSetCompLevel, IcomSetMonitor, IcomSetMonLevel,
+  IcomSetVOX, IcomSetVOXGain, IcomSetAntiVOX, IcomSetPower,
 } from '../../wailsjs/go/main/App';
 import { cn } from '@/lib/utils';
 import { useI18n } from '@/lib/i18n';
@@ -18,20 +21,75 @@ type IcomState = {
   s_meter: number; power_meter: number; swr_meter: number;
   rf_power: number; mic_gain: number;
   af_gain: number; rf_gain: number;
-  nb: boolean; nb_level: number; nr: boolean; nr_level: number; anf: boolean;
+  nb: boolean; nb_level: number; nr: boolean; nr_level: number; anf: boolean; apf: boolean;
   agc?: string; preamp: number; att: number; filter: number;
   rit_hz: number; rit_on: boolean; xit_on: boolean;
+  antenna: number;
+  pbt_inner: number; pbt_outer: number; manual_notch: boolean; notch_pos: number;
+  squelch: number; comp: boolean; comp_level: number;
+  monitor: boolean; mon_level: number;
+  vox: boolean; vox_gain: number; anti_vox: number;
 };
 
 const ZERO: IcomState = {
   available: false, transmitting: false, split: false,
   s_meter: 0, power_meter: 0, swr_meter: 0, rf_power: 0, mic_gain: 0,
   af_gain: 0, rf_gain: 0,
-  nb: false, nb_level: 0, nr: false, nr_level: 0, anf: false,
+  nb: false, nb_level: 0, nr: false, nr_level: 0, anf: false, apf: false,
   preamp: 0, att: 0, filter: 1,
   rit_hz: 0, rit_on: false, xit_on: false,
+  antenna: 1,
+  pbt_inner: 50, pbt_outer: 50, manual_notch: false, notch_pos: 50,
+  squelch: 0, comp: false, comp_level: 0,
+  monitor: false, mon_level: 0,
+  vox: false, vox_gain: 0, anti_vox: 0,
 };
 
+// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
+// the plain SetFrequency command — no band-stacking codes needed. Hz values.
+const BANDS: { l: string; hz: number }[] = [
+  { l: '160', hz: 1_840_000 }, { l: '80', hz: 3_750_000 }, { l: '40', hz: 7_100_000 },
+  { l: '30', hz: 10_130_000 }, { l: '20', hz: 14_150_000 }, { l: '17', hz: 18_130_000 },
+  { l: '15', hz: 21_250_000 }, { l: '12', hz: 24_950_000 }, { l: '10', hz: 28_400_000 },
+  { l: '6', hz: 50_150_000 },
+];
+
+// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
+// SSB by frequency and the rig's data variant for digital modes.
+const MODES = ['SSB', 'CW', 'RTTY', 'PSK', 'AM', 'FM'];
+
+// Attenuator steps are MODEL-dependent even though the CI-V command (0x11) is the
+// same: the value byte is the dB. The IC-7610 (and 7700/7800/7851) have a 6/12/18
+// dB stepped attenuator; the IC-7300/705/7100 have a single 20 dB attenuator; the
+// IC-9700 a single 10 dB. Offering the wrong steps = a dead button (the rig NAKs
+// e.g. 6 dB on a 7300). Default to the common single 20 dB for unknown models.
+function attOptions(model?: string): { v: string; l: string }[] {
+  const m = (model ?? '').toUpperCase();
+  const OFF = { v: '0', l: 'OFF' };
+  if (/(7610|7700|7800|7850|7851)/.test(m)) {
+    return [OFF, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }];
+  }
+  if (m.includes('9700')) return [OFF, { v: '10', l: '10dB' }];
+  return [OFF, { v: '20', l: '20dB' }]; // IC-7300 / IC-705 / IC-7100 / default
+}
+
+// fmtVFO renders a Hz frequency the way an Icom front panel does:
+// MHz "." 3-digit-kHz "." 2-digit-(10 Hz). 21032000 → "21.032.00".
+function fmtVFO(hz?: number): string {
+  if (!hz || hz <= 0) return '––.–––.––';
+  const mhz = Math.floor(hz / 1_000_000);
+  const khz = Math.floor((hz % 1_000_000) / 1000);
+  const h2 = Math.floor((hz % 1000) / 10);
+  return `${mhz}.${String(khz).padStart(3, '0')}.${String(h2).padStart(2, '0')}`;
+}
+
+// modeMatches marks a mode button active, folding the rig's USB/LSB into SSB.
+function modeMatches(btn: string, cur?: string): boolean {
+  if (!cur) return false;
+  if (btn === 'SSB') return cur === 'SSB' || cur === 'USB' || cur === 'LSB';
+  return btn === cur;
+}
+
 function Slider({ value, onChange, disabled, accent = '#2563eb', step = 1 }: {
   value: number; onChange: (v: number) => void; disabled?: boolean; accent?: string; step?: number;
 }) {
@@ -148,25 +206,6 @@ function Meter({ label, value, accent, scale, onClick, title }: { label: string;
   return <div className="flex items-center gap-2">{body}</div>;
 }
 
-// HdrMeter — a compact live meter for the model header band (S when receiving,
-// Po/SWR when transmitting). Clickable variant sends the S reading to RST tx.
-function HdrMeter({ label, value, accent, scale, onClick, title }: {
-  label: string; value: number; accent: string; scale: string; onClick?: () => void; title?: string;
-}) {
-  const v = Math.max(0, Math.min(100, value));
-  const body = (
-    <>
-      <span className="w-5 shrink-0 text-[10px] font-bold uppercase tracking-wider text-muted-foreground">{label}</span>
-      <div className="w-24 sm:w-32 h-2 rounded-full bg-muted/70 overflow-hidden">
-        <div className="h-full rounded-full transition-[width] duration-150" style={{ width: `${v}%`, background: accent }} />
-      </div>
-      <span className="w-12 text-right text-[11px] font-mono font-bold tabular-nums" style={{ color: accent }}>{scale}</span>
-    </>
-  );
-  if (onClick) return <button type="button" onClick={onClick} title={title} className="flex items-center gap-1.5 rounded-md hover:bg-muted/60 px-1.5 py-0.5 -my-0.5">{body}</button>;
-  return <div className="flex items-center gap-1.5 px-1.5">{body}</div>;
-}
-
 // ShiftRow — a RIT / ΔTX offset control: on/off chip + a wheel-adjustable signed
 // offset (±10 Hz per notch or per ± button) + a clear (0) button.
 function ShiftRow({ label, on, hz, accent, onToggle, onDelta, onClear }: {
@@ -244,12 +283,31 @@ function ScopePanadapter() {
   const holdRef = useRef<number[]>([]); // per-bin peak-hold line
   const spanRef = useRef({ low: 0, high: 0 }); // latest sweep edges, for click-to-tune
   const vfoRef = useRef(0);    // latest VFO frequency, for wheel-tune
+  const centerRef = useRef(0); // scope centre we last set (for pan ◀/▶)
 
   const toggle = () => {
     const next = !on;
     setOn(next);
     IcomSetScope(next).catch(() => {});
   };
+
+  // Centre/pan the FIXED scope: set the edges to centre ±50 kHz (a 100 kHz
+  // window). "Centre" uses the live VFO; ◀/▶ shift the window by 50 kHz. This
+  // just writes the rig's fixed edges — simple and independent of the waveform
+  // decode.
+  const SCOPE_HALF = 50_000;
+  const applyEdges = (center: number) => {
+    if (center <= 0) return;
+    centerRef.current = center;
+    setFixed(true);
+    IcomSetScopeEdges(center - SCOPE_HALF, center + SCOPE_HALF).catch(() => {});
+  };
+  const centerOnVfo = async () => {
+    let c = vfoRef.current;
+    if (c <= 0) { try { const cs = await GetCATState(); c = cs?.freq_hz || 0; } catch {} }
+    applyEdges(c);
+  };
+  const pan = (dir: number) => applyEdges((centerRef.current || vfoRef.current) + dir * SCOPE_HALF);
   const setMode = (nextFixed: boolean) => {
     setFixed(nextFixed);
     IcomSetScopeMode(nextFixed).catch(() => {});
@@ -370,19 +428,28 @@ function ScopePanadapter() {
     ctx.strokeStyle = '#7dd3fc'; ctx.lineWidth = 1.5; ctx.lineJoin = 'round'; ctx.stroke();
     ctx.restore();
 
-    // VFO marker: translucent band + crisp line + top marker triangle. In centre
-    // mode the span tracks the VFO, so fall back to the exact centre when the
-    // reported freq isn't inside the (just-updated) span — you always see where
-    // you are.
-    const inSpan = vfoHz > 0 && lowHz > 0 && highHz > lowHz && vfoHz >= lowHz && vfoHz <= highHz;
-    const markerX = inSpan ? ((vfoHz - lowHz) / (highHz - lowHz)) * w : (!fixedMode ? w / 2 : -1);
+    // VFO marker: you should ALWAYS see where you are. Exact position when the VFO
+    // is inside the span; the centre in CTR mode; clamped to the nearest edge with
+    // a sideways arrow in FIX mode when the fixed scope doesn't cover the VFO (so
+    // you can tell which way to tune to get it back on-screen).
+    const haveVfo = vfoHz > 0 && lowHz > 0 && highHz > lowHz;
+    const inSpan = haveVfo && vfoHz >= lowHz && vfoHz <= highHz;
+    let markerX = -1;
+    let offEdge = 0; // -1 = VFO off the left edge, +1 = off the right
+    if (inSpan) markerX = ((vfoHz - lowHz) / (highHz - lowHz)) * w;
+    else if (!fixedMode) markerX = w / 2;
+    else if (haveVfo) { offEdge = vfoHz < lowHz ? -1 : 1; markerX = offEdge < 0 ? 1 : w - 1; }
     if (markerX >= 0) {
       const x = markerX;
       ctx.fillStyle = 'rgba(244,63,94,0.10)'; ctx.fillRect(x - 5, 0, 10, h);
       ctx.strokeStyle = 'rgba(244,63,94,0.9)'; ctx.lineWidth = 1.25;
       ctx.beginPath(); ctx.moveTo(x, 0); ctx.lineTo(x, h); ctx.stroke();
       ctx.fillStyle = 'rgba(244,63,94,0.95)';
-      ctx.beginPath(); ctx.moveTo(x - 4, 0); ctx.lineTo(x + 4, 0); ctx.lineTo(x, 6); ctx.closePath(); ctx.fill();
+      if (offEdge === 0) {
+        ctx.beginPath(); ctx.moveTo(x - 4, 0); ctx.lineTo(x + 4, 0); ctx.lineTo(x, 6); ctx.closePath(); ctx.fill();
+      } else {
+        const yh = 8; ctx.beginPath(); ctx.moveTo(x, yh - 5); ctx.lineTo(x + offEdge * 7, yh); ctx.lineTo(x, yh + 5); ctx.closePath(); ctx.fill();
+      }
     }
 
     // Frequency scale. In fixed mode the rig reports usable edge frequencies, so
@@ -448,6 +515,16 @@ function ScopePanadapter() {
         <Activity className="size-4" style={{ color: '#38bdf8' }} />
         <span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{t('icmp.spectrum')}</span>
         <div className="ml-auto flex items-center gap-2 shrink-0">
+          {on && (
+            <div className="inline-flex rounded-md border border-border overflow-hidden">
+              <button type="button" onClick={() => pan(-1)} title={t('icmp.scopePanDown')}
+                className="px-2 py-1 text-xs font-bold bg-card text-muted-foreground hover:bg-muted border-r border-border">◀</button>
+              <button type="button" onClick={centerOnVfo} title={t('icmp.scopeCenterVfo')}
+                className="px-2 py-1 text-[11px] font-bold bg-card text-muted-foreground hover:bg-muted border-r border-border">⊙</button>
+              <button type="button" onClick={() => pan(1)} title={t('icmp.scopePanUp')}
+                className="px-2 py-1 text-xs font-bold bg-card text-muted-foreground hover:bg-muted">▶</button>
+            </div>
+          )}
           {on && (
             <Segmented value={fixed ? 'FIX' : 'CTR'} options={[{ v: 'CTR', l: 'CTR' }, { v: 'FIX', l: 'FIX' }]}
               onChange={(v) => setMode(v === 'FIX')} />
@@ -472,20 +549,24 @@ function ScopePanadapter() {
 // Unlike the Flex (which pushes state), the Icom is polled: meters/TX state are
 // read every cache cycle; DSP set-controls are optimistic and reconcile on the
 // next poll. Front-panel knob changes for DSP show after ↻ Refresh.
-export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void } = {}) {
+export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (rst: string) => void; isNetwork?: boolean } = {}) {
   const { t } = useI18n();
   const [st, setSt] = useState<IcomState>(ZERO);
-  const [busy, setBusy] = useState(false);
+  const [cat, setCat] = useState<any>(null); // RigState (freq/mode/split) for the VFO display
   const [tuning, setTuning] = useState(false);
   const txRef = useRef(false);
   const stRef = useRef<IcomState>(ZERO); stRef.current = st;
 
-  const load = () => GetIcomState().then((s) => setSt((s ?? ZERO) as IcomState)).catch(() => {});
+  const load = () => {
+    GetIcomState().then((s) => setSt((s ?? ZERO) as IcomState)).catch(() => {});
+    GetCATState().then((c) => setCat(c ?? null)).catch(() => {});
+  };
+  const setMode = (m: string) => { setCat((c: any) => (c ? { ...c, mode: m } : c)); SetCATMode(m).catch(() => {}); };
+  // Initial one-shot read of the rig's DSP snapshot on mount (the 500ms poll only
+  // re-reads the cache; the backend also loads DSP on the first responsive read).
   const refresh = async () => {
-    setBusy(true);
     try { await IcomRefresh(); } catch {}
     await load();
-    setBusy(false);
   };
 
   useEffect(() => {
@@ -543,6 +624,17 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
   }
 
   const tx = st.transmitting;
+  // VFO readout. In split the active/listening VFO is RX (freq_rx_hz) and the
+  // other is TX (freq_hz); otherwise there's a single VFO (freq_hz).
+  const split = !!cat?.split;
+  const mainHz: number = split ? (cat?.freq_rx_hz || 0) : (cat?.freq_hz || 0);
+  const subHz: number = split ? (cat?.freq_hz || 0) : 0;
+  const curMode: string = cat?.mode || st.mode || '';
+  // Mode-dependent controls: VOX / speech-comp / mic are voice-only (hidden on
+  // CW and data); APF (audio peak filter) is CW-only. Fold USB/LSB into phone.
+  const um = curMode.toUpperCase();
+  const isCW = um === 'CW' || um === 'CWR';
+  const isPhone = um === 'SSB' || um === 'USB' || um === 'LSB' || um === 'AM' || um === 'FM';
 
   return (
     <div className="h-full min-h-0 overflow-auto bg-background">
@@ -559,26 +651,99 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
           {st.mode ? <span className="text-xs font-mono text-muted-foreground">{st.mode}</span> : null}
           {st.split ? <span className="rounded-md bg-warning/20 px-1.5 py-0.5 text-[10px] font-bold uppercase tracking-wider text-warning">Split</span> : null}
         </div>
-        {/* Live meter in the header band: S when receiving (click → RST tx), Po when transmitting. */}
-        <div className="hidden md:flex items-center">
-          {tx ? (
-            <HdrMeter label="Po" value={st.power_meter} accent="#ef4444" scale={`${st.power_meter}%`} />
-          ) : (() => { const sp = sParts(st.s_meter); return (
-            <HdrMeter label="S" value={st.s_meter} accent="#22c55e" scale={sp.label}
-              title={onReportRST ? t('rst.clickToFill') : undefined}
-              onClick={onReportRST ? () => onReportRST(sMeterRST(sp.s, sp.over, st.mode)) : undefined} />
-          ); })()}
+        <div className="flex items-center gap-1.5">
+          {/* Radio power ON / OFF — NETWORK only. Over USB the CI-V interface is
+              unpowered while the rig is off, so power-ON can't reach it (OFF works
+              but ON doesn't); hiding both avoids a dead button. On the network the
+              rig's LAN server stays alive in standby, so both work. */}
+          {isNetwork && (
+            <>
+              <button type="button" onClick={() => IcomSetPower(true).catch(() => {})} title={t('icmp.powerOnHint')}
+                className="inline-flex items-center gap-1 rounded-md border border-success/60 bg-success/10 px-2 py-1 text-xs font-bold text-success hover:bg-success/20">
+                <Power className="size-3.5" /> ON
+              </button>
+              <button type="button" onClick={() => IcomSetPower(false).catch(() => {})} title={t('icmp.powerOffHint')}
+                className="inline-flex items-center gap-1 rounded-md border border-destructive/60 bg-destructive/10 px-2 py-1 text-xs font-bold text-destructive hover:bg-destructive/20">
+                <Power className="size-3.5" /> OFF
+              </button>
+            </>
+          )}
         </div>
-        <button type="button" onClick={refresh} disabled={busy}
-          className="inline-flex items-center gap-1.5 rounded-md border border-border bg-card px-2 py-1 text-xs hover:bg-muted disabled:opacity-40">
-          <RefreshCw className={cn('size-3.5', busy && 'animate-spin')} /> {t('icmp.refresh')}
-        </button>
+      </div>
+
+      {/* VFO readout — the RS-BA1-style twin display: MAIN (active) + SUB, the big
+          tabular frequency, mode badge, band, and the RIT/ΔTX offset. */}
+      <div className="rounded-xl border border-border bg-muted/25 shadow-inner overflow-hidden">
+        <div className="grid grid-cols-2 divide-x divide-border/60">
+          {/* MAIN VFO */}
+          <div className="px-4 py-3">
+            <div className="flex items-center justify-between mb-1.5">
+              <span className={cn('text-[10px] font-bold uppercase tracking-widest', tx ? 'text-destructive' : 'text-success')}>{tx ? 'Main · TX' : 'Main'}</span>
+              {curMode ? <span className="rounded px-1.5 py-0.5 text-[10px] font-bold bg-primary/15 text-primary">{curMode}</span> : null}
+            </div>
+            <div className="font-mono font-bold tabular-nums leading-none text-foreground" style={{ fontSize: 'clamp(1.5rem, 4.5vw, 2.25rem)' }}>{fmtVFO(mainHz)}</div>
+            <div className="mt-1.5 flex items-center gap-2 text-[11px] font-mono text-muted-foreground">
+              <span>{cat?.band || (mainHz ? '' : '—')}</span>
+              {st.rit_on ? <span className="text-primary">RIT {st.rit_hz > 0 ? '+' : st.rit_hz < 0 ? '−' : ''}{Math.abs(st.rit_hz)}</span> : null}
+              {st.xit_on ? <span className="text-warning">ΔTX</span> : null}
+            </div>
+          </div>
+          {/* SUB VFO (populated in split; dimmed otherwise) */}
+          <div className={cn('px-4 py-3', !split && 'opacity-40')}>
+            <div className="flex items-center justify-between mb-1.5">
+              <span className="text-[10px] font-bold uppercase tracking-widest text-muted-foreground">Sub</span>
+              {split ? <span className="rounded px-1.5 py-0.5 text-[10px] font-bold bg-warning/15 text-warning">SPLIT</span> : null}
+            </div>
+            <div className="font-mono font-bold tabular-nums leading-none text-muted-foreground" style={{ fontSize: 'clamp(1.5rem, 4.5vw, 2.25rem)' }}>{fmtVFO(subHz)}</div>
+            <div className="mt-1.5 text-[11px] font-mono text-muted-foreground">{split ? 'TX' : ''}</div>
+          </div>
+        </div>
+        {/* Mode selector row (RS-BA1's SSB/CW/RTTY/PSK/AM/FM). */}
+        <div className="grid grid-cols-6 border-t border-border/60 divide-x divide-border/60">
+          {MODES.map((m) => {
+            const on = modeMatches(m, curMode);
+            return (
+              <button key={m} type="button" onClick={() => setMode(m)}
+                className={cn('py-1.5 text-[11px] font-bold tracking-wide transition-colors',
+                  on ? 'bg-primary text-primary-foreground' : 'bg-card/40 text-muted-foreground hover:bg-muted')}>
+                {m}
+              </button>
+            );
+          })}
+        </div>
+      </div>
+
+      {/* Live meters — always visible: S (RX, click → RST), Po in watts, SWR. */}
+      <div className="rounded-xl border border-border bg-card px-3 py-2.5 shadow-sm grid grid-cols-1 sm:grid-cols-3 gap-x-5 gap-y-2">
+        {(() => { const sp = sParts(st.s_meter); return (
+          <Meter label="S" value={st.s_meter} accent="#22c55e" scale={sp.label}
+            title={onReportRST ? t('rst.clickToFill') : undefined}
+            onClick={onReportRST ? () => onReportRST(sMeterRST(sp.s, sp.over, st.mode)) : undefined} />
+        ); })()}
+        <Meter label="Po" value={st.power_meter} accent="#ef4444" scale={`${st.power_meter} W`} />
+        <Meter label="SWR" value={st.swr_meter} accent="#f59e0b" scale={st.swr_meter > 0 ? `${(1 + st.swr_meter / 33.3).toFixed(1)}` : '1.0'} />
       </div>
 
       {/* Spectrum panadapter (full width). */}
       <ScopePanadapter />
 
       <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
+      {/* Band buttons + antenna selection. */}
+      <Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
+        <div className="grid grid-cols-5 gap-1.5">
+          {BANDS.map((b) => (
+            <button key={b.l} type="button" onClick={() => SetCATFrequency(b.hz).catch(() => {})}
+              className="px-1 py-1.5 rounded-md text-[11px] font-bold border border-border bg-card text-foreground hover:bg-muted transition-colors">
+              {b.l}
+            </button>
+          ))}
+        </div>
+        <Row label={t('icmp.antenna')}>
+          <Segmented value={String(st.antenna)} options={[{ v: '1', l: 'ANT1' }, { v: '2', l: 'ANT2' }]}
+            onChange={(v) => set({ antenna: parseInt(v) }, () => IcomSetAntenna(parseInt(v)))} />
+        </Row>
+      </Card>
+
       {/* Clarifiers: RIT & ΔTX (XIT) — wheel or ± to shift, Ctrl+←/→ shifts RIT. */}
       <Card icon={SlidersHorizontal} title={t('icmp.clarifiers')} accent="#8b5cf6">
         <ShiftRow label="RIT" accent="#8b5cf6" on={st.rit_on} hz={st.rit_hz}
@@ -588,12 +753,6 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
           onToggle={() => set({ xit_on: !st.xit_on }, () => IcomSetXITOn(!st.xit_on))}
           onDelta={(d) => setRit(st.rit_hz + d)} onClear={() => setRit(0)} />
         <p className="text-[11px] text-muted-foreground">{t('icmp.ritHint')}</p>
-        {tx && (
-          <div className="pt-1 border-t border-border/60 space-y-3">
-            <Meter label="Po" value={st.power_meter} accent="#ef4444" scale={`${st.power_meter}%`} />
-            <Meter label="SWR" value={st.swr_meter} accent="#f59e0b" scale={st.swr_meter > 0 ? `${(1 + st.swr_meter / 33.3).toFixed(1)}` : '1.0'} />
-          </div>
-        )}
       </Card>
 
       {/* Transmit controls. */}
@@ -602,10 +761,12 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
           <Slider value={st.rf_power} accent="#ef4444" onChange={(v) => set({ rf_power: v }, () => IcomSetRFPower(v))} />
           <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.rf_power}</span>
         </Row>
-        <Row label={t('icmp.mic')}>
-          <Slider value={st.mic_gain} accent="#ef4444" onChange={(v) => set({ mic_gain: v }, () => IcomSetMicGain(v))} />
-          <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.mic_gain}</span>
-        </Row>
+        {isPhone && (
+          <Row label={t('icmp.mic')}>
+            <Slider value={st.mic_gain} accent="#ef4444" onChange={(v) => set({ mic_gain: v }, () => IcomSetMicGain(v))} />
+            <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.mic_gain}</span>
+          </Row>
+        )}
         <div className="flex items-center gap-2 pt-1">
           <button type="button" onClick={toggleMox}
             className={cn('flex-1 px-3 py-1.5 rounded-md text-xs font-bold border transition-colors',
@@ -619,6 +780,27 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
             TUNE
           </button>
         </div>
+        {/* Monitor (all modes) + speech processor / VOX (voice modes only —
+            they don't exist on CW or data). */}
+        <div className="pt-2 mt-1 border-t border-border/60 space-y-3">
+          <LevelRow label="MON" on={st.monitor} value={st.mon_level}
+            onToggle={() => set({ monitor: !st.monitor }, () => IcomSetMonitor(!st.monitor))}
+            onLevel={(v) => set({ mon_level: v }, () => IcomSetMonLevel(v))} />
+          {isPhone && (
+            <>
+              <LevelRow label="COMP" on={st.comp} value={st.comp_level}
+                onToggle={() => set({ comp: !st.comp }, () => IcomSetComp(!st.comp))}
+                onLevel={(v) => set({ comp_level: v }, () => IcomSetCompLevel(v))} />
+              <LevelRow label="VOX" on={st.vox} value={st.vox_gain}
+                onToggle={() => set({ vox: !st.vox }, () => IcomSetVOX(!st.vox))}
+                onLevel={(v) => set({ vox_gain: v }, () => IcomSetVOXGain(v))} />
+              <Row label="Anti-VOX">
+                <Slider value={st.anti_vox} disabled={!st.vox} onChange={(v) => set({ anti_vox: v }, () => IcomSetAntiVOX(v))} />
+                <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.anti_vox}</span>
+              </Row>
+            </>
+          )}
+        </div>
       </Card>
 
       <Card icon={Radio} title={t('icmp.receive')} accent="#2563eb">
@@ -630,6 +812,10 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
           <Slider value={st.rf_gain} onChange={(v) => set({ rf_gain: v }, () => IcomSetRFGain(v))} />
           <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.rf_gain}</span>
         </Row>
+        <Row label={t('icmp.squelch')}>
+          <Slider value={st.squelch} onChange={(v) => set({ squelch: v }, () => IcomSetSquelch(v))} />
+          <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.squelch}</span>
+        </Row>
         <Row label="AGC">
           <Segmented value={st.agc || ''} options={[{ v: 'FAST', l: 'FAST' }, { v: 'MID', l: 'MID' }, { v: 'SLOW', l: 'SLOW' }]}
             onChange={(v) => set({ agc: v }, () => IcomSetAGC(v))} />
@@ -639,7 +825,7 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
             onChange={(v) => set({ preamp: parseInt(v) }, () => IcomSetPreamp(parseInt(v)))} />
         </Row>
         <Row label="Att">
-          <Segmented value={String(st.att)} options={[{ v: '0', l: 'OFF' }, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }]}
+          <Segmented value={String(st.att)} options={attOptions(cat?.rig)}
             onChange={(v) => set({ att: parseInt(v) }, () => IcomSetAtt(parseInt(v)))} />
         </Row>
         <Row label={t('icmp.filter')}>
@@ -648,6 +834,31 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
         </Row>
       </Card>
 
+      {/* Twin PBT + manual notch. Sliders are 0-100 with 50 = centre. */}
+      <Card icon={Filter} title={t('icmp.passband')} accent="#7c3aed">
+        <Row label="PBT-IN">
+          <Slider value={st.pbt_inner} accent="#7c3aed" onChange={(v) => set({ pbt_inner: v }, () => IcomSetPBTInner(v))} />
+          <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.pbt_inner - 50 > 0 ? '+' : ''}{st.pbt_inner - 50}</span>
+        </Row>
+        <Row label="PBT-OUT">
+          <Slider value={st.pbt_outer} accent="#7c3aed" onChange={(v) => set({ pbt_outer: v }, () => IcomSetPBTOuter(v))} />
+          <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.pbt_outer - 50 > 0 ? '+' : ''}{st.pbt_outer - 50}</span>
+        </Row>
+        <button type="button"
+          onClick={() => { set({ pbt_inner: 50 }, () => IcomSetPBTInner(50)); set({ pbt_outer: 50 }, () => IcomSetPBTOuter(50)); }}
+          className="w-full py-1 rounded-md text-[11px] font-bold border border-border bg-card text-muted-foreground hover:bg-muted">
+          {t('icmp.pbtCenter')}
+        </button>
+        <div className="pt-1 border-t border-border/60 space-y-3">
+          <div className="flex items-center gap-2">
+            <Chip label="MN" on={st.manual_notch} onClick={() => set({ manual_notch: !st.manual_notch }, () => IcomSetManualNotch(!st.manual_notch))} />
+            <Slider value={st.notch_pos} disabled={!st.manual_notch} accent="#7c3aed" onChange={(v) => set({ notch_pos: v }, () => IcomSetNotchPos(v))} />
+            <span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.notch_pos}</span>
+          </div>
+          <p className="text-[11px] text-muted-foreground">{t('icmp.manualNotch')}</p>
+        </div>
+      </Card>
+
       <Card icon={AudioLines} title={t('icmp.noiseNotch')} accent="#16a34a">
         <LevelRow label="NB" on={st.nb} value={st.nb_level}
           onToggle={() => set({ nb: !st.nb }, () => IcomSetNB(!st.nb))}
@@ -659,6 +870,13 @@ export function IcomPanel({ onReportRST }: { onReportRST?: (rst: string) => void
           <Chip label="ANF" on={st.anf} onClick={() => set({ anf: !st.anf }, () => IcomSetANF(!st.anf))} />
           <span className="text-xs text-muted-foreground">{t('icmp.autoNotch')}</span>
         </div>
+        {/* APF (audio peak filter) — CW only: peaks the CW tone. */}
+        {isCW && (
+          <div className="flex items-center gap-2">
+            <Chip label="APF" on={st.apf} onClick={() => set({ apf: !st.apf }, () => IcomSetAPF(!st.apf))} />
+            <span className="text-xs text-muted-foreground">{t('icmp.apf')}</span>
+          </div>
+        )}
       </Card>
       </div>
       </div>

frontend/src/components/MainMap.tsx

@@ -64,6 +64,24 @@ function loadBasemap(): BasemapKey {
   return v === 'voyager' || v === 'street' || v === 'satellite' ? v : 'light';
 }
 
+// addBasemap (re)installs the imagery layer and, for satellite, its transparent
+// place-name overlay. updateWhenIdle/keepBuffer keep the number of live tiles
+// down: satellite loads TWO tile layers, so its tile count — and the composited
+// layers WebView2 has to hold — is double every other basemap's.
+function addBasemap(
+  m: L.Map,
+  key: BasemapKey,
+  base: React.MutableRefObject<L.TileLayer | null>,
+  labels: React.MutableRefObject<L.TileLayer | null>,
+) {
+  if (base.current) { m.removeLayer(base.current); base.current = null; }
+  if (labels.current) { m.removeLayer(labels.current); labels.current = null; }
+  const bm = BASEMAPS[key];
+  const opts: L.TileLayerOptions = { maxZoom: 19, updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1 };
+  base.current = L.tileLayer(bm.url, { ...opts, attribution: bm.attr, subdomains: bm.subdomains ?? 'abc' }).addTo(m);
+  if (bm.labelsUrl) labels.current = L.tileLayer(bm.labelsUrl, opts).addTo(m);
+}
+
 function dot(color: string): L.DivIcon {
   return L.divIcon({
     className: '',
@@ -103,11 +121,14 @@ export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, b
   // One-time map creation.
   useEffect(() => {
     if (worldRef.current && !worldMap.current) {
-      const m = L.map(worldRef.current, { zoomControl: true, attributionControl: true, worldCopyJump: true })
+      // preferCanvas: the beam lobe is a dense FAN of translucent radials — up to
+      // ~120 thick strokes with a bidirectional Ultrabeam. As SVG that is ~120
+      // composited paths re-rasterised on every pan, zoom and redraw, which is
+      // enough to blow WebView2's raster budget and leave the window painting in
+      // patches. On canvas it is a single layer.
+      const m = L.map(worldRef.current, { zoomControl: true, attributionControl: true, worldCopyJump: true, preferCanvas: true })
         .setView([20, 0], 1);
-      const bm = BASEMAPS[basemap];
-      baseLayer.current = L.tileLayer(bm.url, { attribution: bm.attr, subdomains: bm.subdomains ?? 'abc', maxZoom: 19 }).addTo(m);
-      if (bm.labelsUrl) labelsLayer.current = L.tileLayer(bm.labelsUrl, { maxZoom: 19 }).addTo(m);
+      addBasemap(m, basemap, baseLayer, labelsLayer);
       worldOverlay.current = L.layerGroup().addTo(m);
       worldMap.current = m;
       const sv = loadMapView();
@@ -115,7 +136,12 @@ export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, b
       m.on('moveend', () => { if (!autoZoomRef.current) saveMapView(m); });
     }
     const t = window.setTimeout(() => { worldMap.current?.invalidateSize(); }, 80);
-    return () => window.clearTimeout(t);
+    // Resizing the pane is the ONLY thing that needs invalidateSize. Calling it on
+    // every overlay redraw (as before) forced a full repaint of the map each time
+    // the rotor moved a degree.
+    const ro = new ResizeObserver(() => worldMap.current?.invalidateSize());
+    if (worldRef.current) ro.observe(worldRef.current);
+    return () => { window.clearTimeout(t); ro.disconnect(); };
   }, []);
 
   // Swap the basemap (and its optional place-name overlay) when the operator
@@ -123,12 +149,7 @@ export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, b
   // overlayPane, always above any tile layer, so nothing to re-stack there.
   useEffect(() => {
     const m = worldMap.current;
-    if (!m) return;
-    if (baseLayer.current) { m.removeLayer(baseLayer.current); baseLayer.current = null; }
-    if (labelsLayer.current) { m.removeLayer(labelsLayer.current); labelsLayer.current = null; }
-    const bm = BASEMAPS[basemap];
-    baseLayer.current = L.tileLayer(bm.url, { attribution: bm.attr, subdomains: bm.subdomains ?? 'abc', maxZoom: 19 }).addTo(m);
-    if (bm.labelsUrl) labelsLayer.current = L.tileLayer(bm.labelsUrl, { maxZoom: 19 }).addTo(m);
+    if (m) addBasemap(m, basemap, baseLayer, labelsLayer);
   }, [basemap]);
 
   // Redraw overlays whenever the operator/DX grids (or beam) change.
@@ -224,9 +245,14 @@ export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, b
         wm.setView([from.lat, from.lon], 3);
       }
     }
-    setTimeout(() => { wm.invalidateSize(); }, 0);
+    // No invalidateSize() here — a ResizeObserver handles the only case that needs
+    // it. Forcing a full map repaint on every redraw is what made a moving rotor
+    // thrash the compositor.
+    // Headings are rounded in the deps: a rotor reports a jittering float, and a
+    // tenth of a degree is invisible on a 5500 km lobe but rebuilds every polyline.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [fromGrid, toGrid, fromLabel, toLabel, (beamAzimuths ?? []).map((a) => Math.round(a)).join(','), beamWidth, boomAzimuth, autoZoom, zoomSignal]);
+  }, [fromGrid, toGrid, fromLabel, toLabel, (beamAzimuths ?? []).map((a) => Math.round(a)).join(','), beamWidth,
+      boomAzimuth == null ? null : Math.round(boomAzimuth), autoZoom, zoomSignal]);
 
   const path = pathBetween(fromGrid, toGrid);
 

frontend/src/components/NetControlPanel.tsx

@@ -5,7 +5,7 @@ import {
 } from 'ag-grid-community';
 import { hamlogGridTheme } from '@/lib/gridTheme';
 import { AgGridReact } from 'ag-grid-react';
-import { Plus, Trash2, Radio, PlusCircle, MinusCircle, Search, UserPlus } from 'lucide-react';
+import { Plus, Trash2, Radio, PlusCircle, MinusCircle, Search, UserPlus, History } from 'lucide-react';
 import {
   Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
 } from '@/components/ui/dialog';
@@ -14,12 +14,14 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Badge } from '@/components/ui/badge';
 import { QSOEditModal } from '@/components/QSOEditModal';
+import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
 import { useI18n } from '@/lib/i18n';
 import type { QSOForm } from '@/types';
 import {
   NetList, NetCreate, NetRename, NetDelete, NetOpen, NetClose, NetOpenID,
   NetRoster, NetRosterUpsert, NetRosterRemove, NetLookup,
   NetActiveList, NetActivate, NetDeactivate, NetUpdateActive, NetDiscardActive,
+  WorkedBefore,
 } from '@/../wailsjs/go/main/App';
 import { netctl } from '@/../wailsjs/go/models';
 
@@ -40,14 +42,28 @@ function fmtTimeOn(s: any): string {
 
 const emptyStation = (): Station => netctl.Station.createFrom({ callsign: '' });
 
+// The right-click actions of the main Recent QSOs grid (update from cty/QRZ/
+// Club Log, send to services, recording e-mail, eQSL, delete) — passed down so
+// the worked-before grid here offers the SAME context menu on logged QSOs.
+type QSOMenuHandlers = {
+  onUpdateFromCty?: (ids: number[]) => void;
+  onUpdateFromQRZ?: (ids: number[]) => void;
+  onUpdateFromClublog?: (ids: number[]) => void;
+  onSendTo?: (service: string, ids: number[]) => void;
+  onSendRecording?: (ids: number[]) => void;
+  onSendEQSL?: (ids: number[]) => void;
+  onDelete?: (ids: number[]) => void;
+};
+
 type Props = {
   onLogged?: () => void;
   countries?: string[];
   bands?: string[];
   modes?: string[];
+  qsoMenuHandlers?: QSOMenuHandlers;
 };
 
-export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
+export function NetControlPanel({ onLogged, countries, bands, modes, qsoMenuHandlers }: Props) {
   const { t } = useI18n();
   const [nets, setNets] = useState<Net[]>([]);
   const [selId, setSelId] = useState<string>('');
@@ -58,14 +74,74 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
 
   // Full-QSO edit modal for an on-air draft (same one Recent QSOs uses).
   const [editingDraft, setEditingDraft] = useState<QSOForm | null>(null);
+  const [selectedActiveIds, setSelectedActiveIds] = useState<number[]>([]);
+  // Programmatic row selection in the on-air grid (auto-advance after logging).
+  const [selectRow, setSelectRow] = useState<{ id: number; seq: number }>({ id: 0, seq: 0 });
 
   // Add/edit-contact dialog.
   const [contactOpen, setContactOpen] = useState(false);
   const [contact, setContact] = useState<Station>(emptyStation());
   const [looking, setLooking] = useState(false);
 
-  const activeGrid = useRef<any>(null);
   const rosterGrid = useRef<any>(null);
+  // Cross-grid drag & drop: roster row → on-air grid puts the station on air;
+  // on-air row → roster grid logs it (same as the "Log & end" button). AG-Grid
+  // external drop zones need each grid's api + the OTHER grid's container div.
+  const onAirApi = useRef<any>(null);
+  const onAirWrap = useRef<HTMLDivElement | null>(null);
+  const rosterWrap = useRef<HTMLDivElement | null>(null);
+  const dropZonesDone = useRef({ roster: false, onair: false });
+  // Callbacks live in refs so the drop-zone closures (registered once) always
+  // call the CURRENT activate/deactivate, not a stale first-render one.
+  const activateRef = useRef<(call: string) => void>(() => {});
+  const deactivateRef = useRef<(id?: number) => void>(() => {});
+  const wireDropZones = useCallback(() => {
+    const rApi = rosterGrid.current?.api;
+    if (rApi && onAirWrap.current && !dropZonesDone.current.roster) {
+      dropZonesDone.current.roster = true;
+      rApi.addRowDropZone({
+        getContainer: () => onAirWrap.current!,
+        onDragStop: (p: any) => { const call = p.node?.data?.callsign; if (call) activateRef.current(call); },
+      });
+    }
+    if (onAirApi.current && rosterWrap.current && !dropZonesDone.current.onair) {
+      dropZonesDone.current.onair = true;
+      onAirApi.current.addRowDropZone({
+        getContainer: () => rosterWrap.current!,
+        onDragStop: (p: any) => { const id = p.node?.data?.id; if (id != null) deactivateRef.current(id); },
+      });
+    }
+  }, []);
+
+  // Worked-before for the clicked station (see if/when we contacted it before).
+  const [wbCall, setWbCall] = useState('');
+  const [wb, setWb] = useState<any>(null);
+  const [wbBusy, setWbBusy] = useState(false);
+  const wbReq = useRef(0);
+  // Resizable height (drag the handle on top). Persisted.
+  const [wbHeight, setWbHeight] = useState(() => {
+    const v = parseInt(localStorage.getItem('opslog.netWbHeight') || '', 10);
+    return v >= 80 && v <= 600 ? v : 176;
+  });
+  useEffect(() => { localStorage.setItem('opslog.netWbHeight', String(wbHeight)); }, [wbHeight]);
+  const startWbResize = (e: React.MouseEvent) => {
+    e.preventDefault();
+    const startY = e.clientY, startH = wbHeight;
+    const onMove = (ev: MouseEvent) => setWbHeight(Math.max(80, Math.min(600, startH - (ev.clientY - startY))));
+    const onUp = () => { document.removeEventListener('mousemove', onMove); document.removeEventListener('mouseup', onUp); };
+    document.addEventListener('mousemove', onMove);
+    document.addEventListener('mouseup', onUp);
+  };
+  const showWorkedBefore = useCallback(async (call: string, dxcc = 0) => {
+    const c = (call ?? '').trim().toUpperCase();
+    setWbCall(c);
+    if (!c) { setWb(null); return; }
+    const req = ++wbReq.current;
+    setWbBusy(true);
+    try { const r = await WorkedBefore(c, dxcc); if (wbReq.current === req) setWb(r); }
+    catch { if (wbReq.current === req) setWb(null); }
+    finally { if (wbReq.current === req) setWbBusy(false); }
+  }, []);
 
   const isOpen = openId !== '' && openId === selId;
 
@@ -145,10 +221,38 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
     catch (e: any) { setError(String(e?.message ?? e)); }
   }
   // Active → logged (end QSO, removed from session, written to the logbook).
+  // Then auto-select the FIRST remaining on-air station, so the operator can
+  // chain "log → log → log" without re-clicking a row each time.
   async function deactivate(id?: number) {
     if (id == null) return;
-    try { await NetDeactivate(id); await refreshActive(); onLogged?.(); }
-    catch (e: any) { setError(String(e?.message ?? e)); }
+    const next = active.find((a) => a.id !== id); // computed BEFORE the list shrinks
+    try {
+      await NetDeactivate(id);
+      await refreshActive();
+      onLogged?.();
+      if (next?.id != null) {
+        setSelectRow((s) => ({ id: next.id as number, seq: s.seq + 1 }));
+        setSelectedActiveIds([next.id as number]);
+        showWorkedBefore(next.callsign, (next as any).dxcc ?? 0);
+      }
+    } catch (e: any) { setError(String(e?.message ?? e)); }
+  }
+  // Keep the drop-zone closures pointed at the CURRENT handlers.
+  activateRef.current = activate;
+  deactivateRef.current = deactivate;
+
+  // Log EVERYONE still on air (end of net): each draft is written to the logbook
+  // exactly as the single-log button would.
+  async function logAll() {
+    if (active.length === 0) return;
+    if (!window.confirm(t('ncp.logAllConfirm', { n: active.length }))) return;
+    try {
+      for (const a of [...active]) {
+        if (a.id != null) await NetDeactivate(a.id as number);
+      }
+      await refreshActive();
+      onLogged?.();
+    } catch (e: any) { setError(String(e?.message ?? e)); await refreshActive(); }
   }
 
   // Edit-modal handlers (operate on the in-memory draft, not the DB).
@@ -173,6 +277,9 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
         ...c, callsign: (r.callsign || call).toUpperCase(),
         name: r.name || c.name, qth: r.qth || c.qth, country: r.country || c.country,
         dxcc: r.dxcc || c.dxcc, itu: r.itu || c.itu, cq: r.cq || c.cq,
+        grid: r.grid || c.grid, address: r.address || c.address, state: r.state || c.state,
+        cnty: r.cnty || c.cnty, cont: r.cont || c.cont, lat: r.lat || c.lat, lon: r.lon || c.lon,
+        email: r.email || c.email,
       }));
     } catch (e: any) { setError(String(e?.message ?? e)); }
     finally { setLooking(false); }
@@ -196,20 +303,9 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
     } catch (e: any) { setError(String(e?.message ?? e)); }
   }
 
-  const activeCols = useMemo<ColDef<QSOForm>[]>(() => [
-    { headerName: t('ncp.colCallsign'), field: 'callsign', width: 110, cellClass: 'font-mono font-semibold' },
-    { headerName: t('ncp.colName'), field: 'name', flex: 1 },
-    { headerName: 'QTH', field: 'qth', flex: 1 },
-    { headerName: t('ncp.colTimeOn'), valueGetter: (p) => fmtTimeOn((p.data as any)?.qso_date), width: 90, cellClass: 'font-mono text-[11px]' },
-    { headerName: t('ncp.colBand'), field: 'band', width: 70, cellClass: 'font-mono' },
-    { headerName: t('ncp.colMode'), field: 'mode', width: 70, cellClass: 'font-mono' },
-    { headerName: 'RST S', field: 'rst_sent', width: 70, cellClass: 'font-mono' },
-    { headerName: 'RST R', field: 'rst_rcvd', width: 70, cellClass: 'font-mono' },
-    { headerName: t('ncp.colComment'), field: 'comment', flex: 1.5 },
-  ], [t]);
-
   const rosterCols = useMemo<ColDef<Station>[]>(() => [
-    { headerName: t('ncp.colCallsign'), field: 'callsign', width: 110, cellClass: 'font-mono font-semibold' },
+    // rowDrag: drag a roster station onto the on-air grid to start its QSO.
+    { headerName: t('ncp.colCallsign'), field: 'callsign', width: 110, cellClass: 'font-mono font-semibold', rowDrag: true },
     { headerName: t('ncp.colName'), field: 'name', flex: 1 },
     { headerName: 'QTH', field: 'qth', flex: 1 },
     { headerName: t('ncp.colCountry'), field: 'country', width: 130 },
@@ -258,29 +354,67 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
             {t('ncp.onAirActive')}
             <span className="ml-auto font-normal normal-case opacity-90">{t('ncp.activeHint')}</span>
           </div>
-          <div style={{ flex: 1, minHeight: 0, position: 'relative' }}>
-            <div style={{ position: 'absolute', inset: 0 }}>
-              <AgGridReact<QSOForm>
-                ref={activeGrid}
-                theme={hamlogTheme}
-                rowData={active}
-                columnDefs={activeCols}
-                defaultColDef={defaultColDef}
-                onRowDoubleClicked={(e) => e.data && setEditingDraft(e.data)}
-                rowSelection={{ mode: 'singleRow', checkboxes: false, enableClickSelection: true }}
-                animateRows={false}
-                getRowId={(p) => String((p.data as any).id)}
-              />
-            </div>
+          <div ref={onAirWrap} className="flex flex-col min-h-0 flex-1">
+            <RecentQSOsGrid
+              rows={active}
+              total={active.length}
+              storageKey="net.onair"
+              selectRowSignal={selectRow}
+              rowDragCall
+              onGridApi={(api) => { onAirApi.current = api; wireDropZones(); }}
+              onRowClicked={(q) => showWorkedBefore(q.callsign, (q as any).dxcc ?? 0)}
+              onRowDoubleClicked={(q) => setEditingDraft(q)}
+              onRowSelected={setSelectedActiveIds}
+            />
           </div>
           {isOpen && active.length > 0 && (
             <div className="px-3 py-1.5 border-t border-border/60 bg-muted/30 flex items-center gap-2">
               <Button variant="ghost" size="sm" className="h-7 text-[11px]"
-                onClick={() => { const r = activeGrid.current?.api?.getSelectedRows?.()?.[0] as QSOForm; if (r) deactivate(r.id as number); }}>
+                onClick={() => { if (selectedActiveIds[0] != null) deactivate(selectedActiveIds[0]); }}>
                 <MinusCircle className="size-3.5" /> {t('ncp.logEndSelected')}
               </Button>
+              <Button variant="ghost" size="sm" className="h-7 text-[11px] ml-auto" onClick={logAll}>
+                <MinusCircle className="size-3.5" /> {t('ncp.logAll', { n: active.length })}
+              </Button>
             </div>
           )}
+
+          {/* Worked-before for the clicked station — click a row (on air or
+              roster) to see if/when we contacted it before. Lives INSIDE the
+              on-air column so resizing only splits this column; the roster on
+              the right keeps its full height. */}
+          <div className="shrink-0 flex flex-col" style={{ height: wbHeight }}>
+            <div className="h-1.5 shrink-0 cursor-ns-resize border-t border-border/60 hover:bg-primary/40 transition-colors" onMouseDown={startWbResize} title={t('ncp.wbResize')} />
+            <div className="flex-1 min-h-0 bg-card flex flex-col">
+              <div className="flex items-center gap-2 px-3 py-1.5 bg-muted/40 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground shrink-0">
+                <History className="size-3.5" />
+                {t('ncp.workedBefore')}
+                {wbCall && <span className="font-mono text-foreground normal-case">{wbCall}</span>}
+                {wb && wb.count > 0 && (
+                  <span className="ml-auto font-normal normal-case text-foreground">
+                    {wb.count} QSO · {t('ncp.wbFirst')} {String(wb.first ?? '').slice(0, 10)} · {t('ncp.wbLast')} {String(wb.last ?? '').slice(0, 10)}
+                    {wb.dxcc_name ? ` · ${wb.dxcc_name} (${wb.dxcc_count})` : ''}
+                  </span>
+                )}
+              </div>
+              <div className="flex-1 min-h-0 flex flex-col">
+                {!wbCall ? (
+                  <div className="flex h-full items-center justify-center text-xs text-muted-foreground">{t('ncp.wbHint')}</div>
+                ) : wbBusy ? (
+                  <div className="flex h-full items-center justify-center text-xs text-muted-foreground">…</div>
+                ) : !wb || wb.count === 0 ? (
+                  <div className="flex h-full items-center justify-center text-xs text-muted-foreground">{t('ncp.wbNone')} {wbCall}</div>
+                ) : (
+                  <RecentQSOsGrid
+                    rows={(wb.entries ?? []) as any}
+                    total={wb.count}
+                    storageKey="net.wb"
+                    {...qsoMenuHandlers}
+                  />
+                )}
+              </div>
+            </div>
+          </div>
         </div>
 
         {/* NET USERS / roster (right) */}
@@ -289,7 +423,7 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
             {t('ncp.netUsersRoster')}
             <span className="ml-auto font-normal normal-case opacity-90">{t('ncp.rosterHint')}</span>
           </div>
-          <div style={{ flex: 1, minHeight: 0, position: 'relative' }}>
+          <div ref={rosterWrap} style={{ flex: 1, minHeight: 0, position: 'relative' }}>
             <div style={{ position: 'absolute', inset: 0 }}>
               <AgGridReact<Station>
                 ref={rosterGrid}
@@ -298,6 +432,8 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
                 columnDefs={rosterCols}
                 defaultColDef={defaultColDef}
                 rowSelection={{ mode: 'multiRow', checkboxes: false, headerCheckbox: false, enableClickSelection: true }}
+                onGridReady={() => wireDropZones()}
+                onRowClicked={(e) => e.data && showWorkedBefore(e.data.callsign, (e.data as any).dxcc ?? 0)}
                 onRowDoubleClicked={(e) => e.data && activate(e.data.callsign)}
                 animateRows={false}
                 getRowId={(p) => String((p.data as any).callsign)}

frontend/src/components/QSLManagerModal.tsx

@@ -8,7 +8,7 @@ import {
   Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
 } from '@/components/ui/select';
 import { cn } from '@/lib/utils';
-import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign } from '../../wailsjs/go/main/App';
+import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
 import { Input } from '@/components/ui/input';
 import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
 import { EventsOn } from '../../wailsjs/runtime/runtime';
@@ -32,7 +32,7 @@ const UPLOAD_COLS: ColDef<UploadRow>[] = [
 
 type Confirmation = {
   callsign: string; qso_date: string; band: string; mode: string; country: string;
-  new_dxcc: boolean; new_band: boolean; new_slot: boolean;
+  new_dxcc: boolean; new_band: boolean; new_mode: boolean; new_slot: boolean;
 };
 
 const SERVICES = [
@@ -208,18 +208,27 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
   const [busy, setBusy] = useState(false);
   const [logAction, setLogAction] = useState<'upload' | 'download'>('upload');
 
+  // Worked/confirmed tallies. Slots are counted by mode CLASS (PH/CW/DIGI) — the
+  // raw-mode granularity (RTTY ≠ FT8) stays only in the cluster/matrix new-slot flag.
+  const [stats, setStats] = useState<any>(
+    { slots_worked: 0, slots_confirmed: 0, dxcc_worked: 0, dxcc_confirmed: 0, ph_worked: 0, ph_confirmed: 0, cw_worked: 0, cw_confirmed: 0, dig_worked: 0, dig_confirmed: 0 });
+  const refreshCounts = useCallback(() => { GetSlotStats().then((c: any) => setStats(c)).catch(() => {}); }, []);
+  useEffect(() => { refreshCounts(); }, [refreshCounts]);
+
   useEffect(() => {
     const offLog = EventsOn('qslmgr:log', (line: string) => setLogLines((p) => [...p, line]));
     const offDone = EventsOn('qslmgr:done', (d: any) => {
       setLogLines((p) => [...p, `— Done: ${d?.uploaded ?? 0}/${d?.total ?? 0} —`]);
       setBusy(false);
+      refreshCounts(); // a download may have added confirmations
     });
     const offConf = EventsOn('qslmgr:confirmations', (list: any) => {
       setConfirmations((list ?? []) as Confirmation[]);
       setViewMode('confirmations');
+      refreshCounts();
     });
     return () => { offLog(); offDone(); offConf(); };
-  }, []);
+  }, [refreshCounts]);
 
   const serviceLabel = useMemo(() => SERVICES.find((s) => s.v === service)?.label ?? service, [service]);
 
@@ -231,9 +240,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
 
   const shownConfs = useMemo(() => confirmations.filter((c) => {
     switch (confFilter) {
-      case 'new':  return c.new_dxcc || c.new_band || c.new_slot;
+      case 'new':  return c.new_dxcc || c.new_band || c.new_mode || c.new_slot;
       case 'dxcc': return c.new_dxcc;
       case 'band': return c.new_band;
+      case 'mode': return c.new_mode;
       case 'slot': return c.new_slot;
       default:     return true;
     }
@@ -353,6 +363,22 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
           </>
         )}
         <div className="flex-1" />
+        {/* Worked / confirmed tallies. Slots by mode class (PH/CW/DIGI), with the
+            per-class breakdown so the totals are checkable. */}
+        <div className="self-center flex items-center gap-3 text-[11px] font-mono" title={t('qslm.countsTip')}>
+          <span className="flex items-center gap-1">
+            <span className="text-muted-foreground uppercase text-[9px] tracking-wider">{t('qslm.slots')}</span>
+            <span className="font-semibold">{stats.slots_worked}</span>
+            <span className="text-muted-foreground">/</span>
+            <span className="text-success font-semibold">{stats.slots_confirmed}</span>
+          </span>
+          <span className="flex items-center gap-1">
+            <span className="text-muted-foreground uppercase text-[9px] tracking-wider">DXCC</span>
+            <span className="font-semibold">{stats.dxcc_worked}</span>
+            <span className="text-muted-foreground">/</span>
+            <span className="text-success font-semibold">{stats.dxcc_confirmed}</span>
+          </span>
+        </div>
         {service === 'pota' && potaRes && (
           <span className="text-xs text-muted-foreground">
             {t('qslm.potaSummaryShort', { updated: potaRes.updated, added: potaRes.added, already: potaRes.already_tagged, unmatched: potaRes.unmatched })}{potaRes.skipped_other_call > 0 ? t('qslm.potaOtherCall', { n: potaRes.skipped_other_call }) : ''} / {potaRes.fetched}
@@ -371,6 +397,7 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
                 <SelectItem value="new">{t('qslm.filterNew')}</SelectItem>
                 <SelectItem value="dxcc">{t('qslm.filterNewDxcc')}</SelectItem>
                 <SelectItem value="band">{t('qslm.filterNewBand')}</SelectItem>
+                <SelectItem value="mode">{t('qslm.filterNewMode')}</SelectItem>
                 <SelectItem value="slot">{t('qslm.filterNewSlot')}</SelectItem>
               </SelectContent>
             </Select>
@@ -491,6 +518,7 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
                     <td className="py-1 px-2">
                       {c.new_dxcc ? <span className="inline-block px-1.5 py-px rounded text-[9px] font-bold bg-danger-muted text-danger-muted-foreground border border-danger-border">{t('qslm.newDxcc')}</span>
                         : c.new_band ? <span className="inline-block px-1.5 py-px rounded text-[9px] font-bold bg-warning-muted text-warning-muted-foreground border border-warning-border">{t('qslm.newBand')}</span>
+                        : c.new_mode ? <span className="inline-block px-1.5 py-px rounded text-[9px] font-bold bg-info-muted text-info-muted-foreground border border-info-border">{t('qslm.newMode')}</span>
                         : c.new_slot ? <span className="inline-block px-1.5 py-px rounded text-[9px] font-bold bg-caution-muted text-caution-muted-foreground border border-caution-border">{t('qslm.newSlot')}</span>
                         : <span className="text-muted-foreground/50">—</span>}
                     </td>

frontend/src/components/QSOEditModal.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { Trash2, Search, Loader2 } from 'lucide-react';
-import { LookupCallsign, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs } from '../../wailsjs/go/main/App';
+import { LookupCallsign, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs, GetListsSettings } from '../../wailsjs/go/main/App';
+import { rstOptions, type RSTLists } from '@/lib/rst';
 import { AwardRefSelector } from '@/components/AwardRefSelector';
 import { AdifExtrasEditor } from '@/components/AdifExtrasEditor';
 import { applyAwardRefs } from '@/lib/awardRefs';
@@ -80,11 +81,23 @@ function StatusCell({ value }: { value?: string }) {
   if (v === '') {
     return <span className="block text-center text-[11px] text-muted-foreground">—</span>;
   }
+  // One colour per state, and each colour means something:
+  //   Yes       green   — confirmed, the thing you wanted
+  //   Requested blue    — in flight, waiting on the other end. Not a problem.
+  //   Modified  orange  — uploaded, then the QSO changed: it needs re-uploading.
+  //                       This is the ONLY state asking for action, so it gets the
+  //                       only alarming colour.
+  //   No        neutral — nothing done yet. Every freshly logged QSO is "No" on
+  //                       every row; painting that orange (as it used to be, in the
+  //                       same orange as Requested) made the table shout about a
+  //                       non-problem and told you nothing apart.
+  //   Ignore    dashed  — deliberately excluded, on purpose.
   const label = v === 'Y' ? t('qedit.qslYes') : v === 'R' ? t('qedit.qslRequested') : v === 'I' ? t('qedit.qslIgnore') : v === 'M' ? t('qedit.statusModified') : t('qedit.qslNo');
-  const cls = v === 'Y' ? 'bg-success text-success-foreground'
-    : v === 'R' ? 'bg-warning text-warning-foreground'
-    : v === 'I' ? 'bg-muted-foreground text-background'
-    : 'bg-warning text-warning-foreground';
+  const cls = v === 'Y' ? 'bg-success text-success-foreground border border-success'
+    : v === 'R' ? 'bg-info-muted text-info-muted-foreground border border-info-border'
+    : v === 'M' ? 'bg-warning text-warning-foreground border border-warning'
+    : v === 'I' ? 'bg-muted text-muted-foreground border border-dashed border-border italic'
+    : 'bg-muted text-muted-foreground border border-border';
   return <span className={cn('block text-center text-[11px] font-semibold rounded px-1 py-0.5', cls)}>{label}</span>;
 }
 
@@ -163,6 +176,13 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
     return base;
   }, [modes, qso.mode]);
   const [draft, setDraft] = useState<QSO>(() => JSON.parse(JSON.stringify(qso)));
+  // Per-mode RST dropdown choices, loaded from the same settings as the entry form.
+  const [rstLists, setRstLists] = useState<RSTLists>({ phone: [], cw: [], digital: [] });
+  useEffect(() => {
+    GetListsSettings()
+      .then((l: any) => setRstLists({ phone: l?.rst_phone ?? [], cw: l?.rst_cw ?? [], digital: l?.rst_digital ?? [] }))
+      .catch(() => {});
+  }, []);
   // Frequencies are edited as kHz + Hz (Log4OM style) and recombined on save.
   const splitHz = (hz?: number) => hz
     ? { khz: String(Math.floor(hz / 1000)), hz: String(hz % 1000).padStart(3, '0') }
@@ -187,6 +207,9 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
   // WPX, …) are derived from the QSO by the backend and shown read-only.
   const awardFieldRef = useRef<Record<string, string>>({});
   const [awardRefs, setAwardRefs] = useState('');
+  // The refs present when the editor opened, so on save we can tell which ones
+  // were REMOVED and strip their in-field tokens (see applyAwardRefs).
+  const seedAwardRefsRef = useRef('');
   const [computedRefs, setComputedRefs] = useState<Array<{ code: string; ref: string; name?: string }>>([]);
 
   // Load award definitions once, then seed the editable manual refs from the QSO.
@@ -207,6 +230,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
             .filter((r: any) => r.pickable)
             .map((r: any) => `${String(r.code).toUpperCase()}@${String(r.ref).toUpperCase()}`)
             .join(';');
+          seedAwardRefsRef.current = seed;
           setAwardRefs(seed);
         } catch { /* leave manual refs empty on failure */ }
       })
@@ -327,7 +351,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
     // the dedicated columns, then route the picked refs back onto the payload
     // (POTA/SOTA/IOTA → columns, WWFF/custom → extras).
     out.iota = ''; out.sota_ref = ''; out.pota_ref = '';
-    applyAwardRefs(out, awardRefs, awardFieldRef.current);
+    applyAwardRefs(out, awardRefs, awardFieldRef.current, seedAwardRefsRef.current);
     onSave(out);
   }
 
@@ -347,7 +371,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
 
   return (
     <Dialog open onOpenChange={(o) => { if (!o) onClose(); }}>
-      <DialogContent className="max-w-4xl max-h-[92vh] grid grid-rows-[auto_1fr_auto] gap-0 p-0">
+      <DialogContent className="max-w-5xl max-h-[92vh] grid grid-rows-[auto_1fr_auto] gap-0 p-0">
         <DialogHeader className="flex-row items-baseline gap-2">
           <DialogTitle>{t('qedit.title')}</DialogTitle>
           <span className="font-mono text-xs text-muted-foreground">#{draft.id} — {draft.callsign}</span>
@@ -388,9 +412,9 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
                     value={draft.callsign ?? ''} onChange={(e) => set('callsign', e.target.value)} />
                 </div>
                 <div className="flex flex-col w-20"><Label>S</Label>
-                  <Input value={draft.rst_sent ?? ''} onChange={(e) => set('rst_sent', e.target.value)} className="font-mono" /></div>
+                  <Combobox value={draft.rst_sent ?? ''} options={rstOptions(draft.mode ?? '', rstLists)} commitOnType onChange={(v) => set('rst_sent', v)} /></div>
                 <div className="flex flex-col w-20"><Label>R</Label>
-                  <Input value={draft.rst_rcvd ?? ''} onChange={(e) => set('rst_rcvd', e.target.value)} className="font-mono" /></div>
+                  <Combobox value={draft.rst_rcvd ?? ''} options={rstOptions(draft.mode ?? '', rstLists)} commitOnType onChange={(v) => set('rst_rcvd', v)} /></div>
                 <Button type="button" variant="outline" className="h-10" onClick={fetchLookup} disabled={looking}
                   title={t('qedit.fetchTitle')}>
                   {looking ? <Loader2 className="size-4 animate-spin" /> : <Search className="size-4" />} {t('qedit.fetch')}
@@ -567,9 +591,13 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
                       </p>
                     </div>
 
-                    {/* Right: live status grid for every channel */}
-                    <div className="w-72 shrink-0">
-                      <table className="w-full border-separate" style={{ borderSpacing: 4 }}>
+                    {/* Right: live status grid for every channel.
+                        Sized by its content, not pinned to a width: a fixed 288px box
+                        left the label column too narrow, so "QSL (paper)" wrapped onto
+                        two lines and padded out the whole row. There is spare width to
+                        the right — spend it on the label. */}
+                    <div className="shrink-0">
+                      <table className="border-separate" style={{ borderSpacing: 4 }}>
                         <thead>
                           <tr className="text-[10px] uppercase tracking-wider text-muted-foreground">
                             <th className="text-left font-semibold">{t('qedit.thType')}</th>
@@ -580,7 +608,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
                         <tbody>
                           {CONFIRMATIONS.map((c) => (
                             <tr key={c.key} className="text-xs">
-                              <td className="font-medium pr-2 py-0.5">{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</td>
+                              <td className="font-medium pr-3 py-0.5 whitespace-nowrap">{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</td>
                               <td className="w-24"><StatusCell value={val(c.sent)} /></td>
                               <td className="w-24">{c.rcvd ? <StatusCell value={val(c.rcvd)} /> : <span className="block text-center text-[11px] text-muted-foreground">—</span>}</td>
                             </tr>

frontend/src/components/RecentQSOsGrid.tsx

@@ -5,7 +5,7 @@ import {
 } from 'ag-grid-community';
 import { hamlogGridTheme } from '@/lib/gridTheme';
 import { AgGridReact } from 'ag-grid-react';
-import { Columns3, FilterX } from 'lucide-react';
+import { Columns3, FilterX, ListChecks } from 'lucide-react';
 import type { QSOForm } from '@/types';
 import { QSOContextMenu, type QSOMenuState } from './QSOContextMenu';
 import {
@@ -30,7 +30,20 @@ type Props = {
   // Bump this number to programmatically select every row (e.g. after a search
   // in the QSL Manager, where the default is "all selected").
   selectAllSignal?: number;
+  // Bump `seq` to programmatically select the single row with this id (e.g. NET
+  // Control auto-advancing to the next on-air station after logging one).
+  selectRowSignal?: { id: number; seq: number };
+  // Show a row-drag handle on the callsign column (NET Control: drag an on-air
+  // row onto the roster to log it). Pair with onGridApi so the parent can
+  // register external drop zones via api.addRowDropZone.
+  rowDragCall?: boolean;
+  onGridApi?: (api: any) => void;
+  // storageKey scopes the persisted column layout/visibility. Omit for the main
+  // log (keeps the historical keys); pass a distinct value (e.g. "net.onair") to
+  // reuse this grid elsewhere with its OWN independent column config.
+  storageKey?: string;
   onRowDoubleClicked?: (q: QSOForm) => void;
+  onRowClicked?: (q: QSOForm) => void;
   onRowSelected?: (ids: number[]) => void;
   onUpdateFromCty?: (ids: number[]) => void;
   onUpdateFromQRZ?: (ids: number[]) => void;
@@ -44,12 +57,16 @@ type Props = {
   onExportCabrilloSelected?: (ids: number[]) => void;
   onExportCabrilloFiltered?: () => void;
   onDelete?: (ids: number[]) => void;
+  // Reports how many rows the grid shows after its COLUMN filters (the funnel
+  // icons), or null when no column filter is active — so the parent's "Showing X
+  // of Y" can reflect them. Fired on filter change and when the data updates.
+  onFilteredCountChange?: (count: number | null) => void;
   // One column per defined award; the cell shows the reference this QSO counts
   // for (from row.award_refs[CODE], attached by the parent). Hidden by default.
   awardCols?: { code: string; name: string }[];
 };
 
-const COL_STATE_KEY = 'hamlog.qsoColState.v2';
+const BASE_COLSTATE_KEY = 'hamlog.qsoColState.v2';
 
 function fmtMhzDots(hz?: number): string {
   if (!hz) return '';
@@ -92,7 +109,7 @@ export const makeColCatalog = (t: TFn): ColEntry[] => [
   // ── QSO basics ──
   { group: 'QSO', label: t('rqg.c.qso_date'),  colId: 'qso_date', headerName: t('rqg.c.qso_date'), field: 'qso_date' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value), sort: 'desc', defaultVisible: true },
   { group: 'QSO', label: t('rqg.c.qso_date_off'),  colId: 'qso_date_off', headerName: t('rqg.c.qso_date_off'), field: 'qso_date_off' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value) },
-  { group: 'QSO', label: t('rqg.c.callsign'),  colId: 'callsign', headerName: t('rqg.c.callsign'), field: 'callsign' as any, width: 110, cellClass: 'font-mono font-semibold', cellStyle: { color: '#b8410c' }, defaultVisible: true },
+  { group: 'QSO', label: t('rqg.c.callsign'),  colId: 'callsign', headerName: t('rqg.c.callsign'), field: 'callsign' as any, width: 110, cellClass: 'font-mono font-semibold', defaultVisible: true },
   { group: 'QSO', label: t('rqg.c.band'),      colId: 'band', headerName: t('rqg.c.band'), field: 'band' as any, width: 75, cellClass: 'font-mono', defaultVisible: true },
   { group: 'QSO', label: t('rqg.c.band_rx'),   colId: 'band_rx', headerName: t('rqg.c.band_rx'), field: 'band_rx' as any, width: 75, cellClass: 'font-mono' },
   { group: 'QSO', label: t('rqg.c.mode'),      colId: 'mode', headerName: t('rqg.c.mode'), field: 'mode' as any, width: 80, cellClass: 'font-mono', defaultVisible: true },
@@ -203,6 +220,13 @@ export const makeColCatalog = (t: TFn): ColEntry[] => [
   { group: 'My station', label: t('rqg.c.my_zip'),       colId: 'my_postal_code',   headerName: t('rqg.h.my_zip'),     field: 'my_postal_code' as any,   width: 80 },
   { group: 'My station', label: t('rqg.c.my_rig'),       colId: 'my_rig',           headerName: t('rqg.c.my_rig'),  field: 'my_rig' as any,           width: 130 },
   { group: 'My station', label: t('rqg.c.my_antenna'),   colId: 'my_antenna',       headerName: t('rqg.h.my_antenna'),  field: 'my_antenna' as any,       width: 130 },
+  { group: 'My station', label: t('rqg.c.my_name'),      colId: 'my_name',          headerName: t('rqg.c.my_name'), field: 'my_name' as any,          width: 120 },
+  { group: 'My station', label: t('rqg.c.my_wwff'),      colId: 'my_wwff_ref',      headerName: t('rqg.c.my_wwff'), field: 'my_wwff_ref' as any,      width: 110, cellClass: 'font-mono' },
+  { group: 'My station', label: t('rqg.c.my_sig'),       colId: 'my_sig',           headerName: t('rqg.c.my_sig'),  field: 'my_sig' as any,           width: 90 },
+  { group: 'My station', label: t('rqg.c.my_sig_info'),  colId: 'my_sig_info',      headerName: t('rqg.c.my_sig_info'), field: 'my_sig_info' as any,    width: 120 },
+  { group: 'My station', label: t('rqg.c.my_arrl_sect'), colId: 'my_arrl_sect',     headerName: t('rqg.c.my_arrl_sect'), field: 'my_arrl_sect' as any,  width: 90, cellClass: 'font-mono' },
+  { group: 'My station', label: t('rqg.c.my_darc_dok'),  colId: 'my_darc_dok',      headerName: t('rqg.c.my_darc_dok'), field: 'my_darc_dok' as any,    width: 90, cellClass: 'font-mono' },
+  { group: 'My station', label: t('rqg.c.my_vucc_grids'),colId: 'my_vucc_grids',    headerName: t('rqg.c.my_vucc_grids'), field: 'my_vucc_grids' as any, width: 130, cellClass: 'font-mono' },
 
   // ── Misc ──
   { group: 'Misc', label: t('rqg.c.comment'),  colId: 'comment',     headerName: t('rqg.c.comment'),    field: 'comment' as any,     flex: 1, minWidth: 160, defaultVisible: true },
@@ -226,11 +250,23 @@ const GRP_KEYS: Record<string, string> = {
 };
 export const groupLabel = (t: TFn, g: string): string => t(GRP_KEYS[g] ?? g);
 
-export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, awardCols }: Props) {
+// Award columns are governed SOLELY by the awardShown code-set, never by AG
+// Grid's saved column state. Stripping them here (on both save and restore)
+// stops a stale saved state from re-hiding a shown award column on every
+// awardCols rebuild — the desync that made award columns vanish mid-session.
+const stripAwardCols = (st: any[] | null | undefined): any[] =>
+  (st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_'));
+
+export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, rowDragCall, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
   const { t } = useI18n();
   const gridRef = useRef<any>(null);
   const [pickerOpen, setPickerOpen] = useState(false);
+  // Column-layout persistence keys — scoped by storageKey so a reused instance
+  // (e.g. the Net panel) keeps its own layout independent of the main log.
+  const colStateKey = storageKey ? `hamlog.qsoColState.${storageKey}` : BASE_COLSTATE_KEY;
   const [menu, setMenu] = useState<QSOMenuState>(null);
+  const [selCount, setSelCount] = useState(0); // live selection count shown in the toolbar
+  const [dispCount, setDispCount] = useState(0); // rows currently displayed (post column filters) — drives Select all ↔ Unselect all
 
   // Localized column catalog — rebuilt when the language changes.
   const COL_CATALOG = useMemo(() => makeColCatalog(t), [t]);
@@ -262,11 +298,39 @@ export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRo
   // auto-save during that window. Set in the memo (runs at render, before the
   // column events) and cleared by the re-apply effect below.
   const restoringRef = useRef(true);
+
+  // Award-column visibility is stored as an explicit set of award CODES, NOT via
+  // AG Grid's column-state round-trip. Those columns load asynchronously and
+  // race the state restore, and AG Grid preserves an existing column's visibility
+  // across a columnDefs rebuild instead of re-reading `hide` — which is exactly
+  // why previously-shown award columns kept vanishing on reopen. A dedicated set
+  // is deterministic: it drives `hide` directly and is re-enforced below.
+  const AWARD_SHOWN_KEY = storageKey ? `hamlog.awardColsShown.${storageKey}` : 'hamlog.awardColsShown';
+  const [awardShown, setAwardShown] = useState<Set<string>>(() => new Set((loadLocal(AWARD_SHOWN_KEY) ?? []).map((s) => String(s).toUpperCase())));
+  useEffect(() => {
+    // Fresh machine: hydrate the set from the portable DB copy, then seed the cache.
+    if (loadLocal(AWARD_SHOWN_KEY)) return;
+    loadRemote(AWARD_SHOWN_KEY).then((remote) => {
+      if (remote && remote.length) {
+        seedLocal(AWARD_SHOWN_KEY, remote);
+        setAwardShown(new Set(remote.map((s: any) => String(s).toUpperCase())));
+      }
+    });
+  }, []);
+  const persistAwardShown = useCallback((next: Set<string>) => {
+    setAwardShown(next);
+    saveState(AWARD_SHOWN_KEY, [...next]);
+  }, []);
+
   const columnDefs = useMemo<ColDef<QSOForm>[]>(() => {
     restoringRef.current = true;
     const base = COL_CATALOG.map((c) => {
       const { group: _g, label: _l, defaultVisible, ...rest } = c;
-      return { ...rest, hide: !defaultVisible };
+      const col: ColDef<QSOForm> = { ...rest, hide: !defaultVisible };
+      if (rowDragCall && ((rest as any).colId === 'callsign' || (rest as any).field === 'callsign')) {
+        col.rowDrag = true;
+      }
+      return col;
     });
     const awards: ColDef<QSOForm>[] = (awardCols ?? []).map((a) => ({
       colId: `award_${a.code}`,
@@ -274,10 +338,26 @@ export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRo
       headerTooltip: t('rqg.awardTip', { name: a.name }),
       width: 110,
       cellClass: 'text-[11px]',
+      // Visibility comes from the persisted award-code set, so a column the user
+      // showed reappears on reopen and one they didn't stays hidden.
+      hide: !awardShown.has(a.code.toUpperCase()),
       valueGetter: (p) => (p.data as any)?.award_refs?.[a.code.toUpperCase()] ?? '',
     }));
     return [...base, ...awards];
-  }, [awardCols, COL_CATALOG, t]);
+  }, [awardCols, COL_CATALOG, t, awardShown, rowDragCall]);
+
+  // Enforce award-column visibility via the API after the columns (re)appear —
+  // colDef.hide alone isn't honoured by AG Grid for a column that already exists,
+  // so we set it explicitly whenever the award set or the loaded columns change.
+  useEffect(() => {
+    const api = gridRef.current?.api;
+    if (!api || !awardCols?.length) return;
+    for (const a of awardCols) {
+      const want = awardShown.has(a.code.toUpperCase());
+      const col = api.getColumn(`award_${a.code}`);
+      if (col && col.isVisible() !== want) api.setColumnsVisible([`award_${a.code}`], want);
+    }
+  }, [awardCols, awardShown]);
 
   const defaultColDef = useMemo<ColDef>(() => ({
     sortable: true,
@@ -287,42 +367,56 @@ export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRo
   }), []);
 
   function onGridReady(e: GridReadyEvent) {
-    const local = loadLocal(COL_STATE_KEY);
-    if (local) e.api.applyColumnState({ state: local as ColumnState[], applyOrder: true });
+    onGridApi?.(e.api);
+    const local = loadLocal(colStateKey);
+    if (local) e.api.applyColumnState({ state: stripAwardCols(local) as ColumnState[], applyOrder: true });
     // Fall back to the portable DB copy when the local cache is empty
     // (fresh machine / after a reinstall), then re-seed the cache.
-    loadRemote(COL_STATE_KEY).then((remote) => {
+    loadRemote(colStateKey).then((remote) => {
       if (remote && !local) {
-        e.api.applyColumnState({ state: remote as ColumnState[], applyOrder: true });
-        seedLocal(COL_STATE_KEY, remote);
+        e.api.applyColumnState({ state: stripAwardCols(remote) as ColumnState[], applyOrder: true });
+        seedLocal(colStateKey, remote);
       }
     });
   }
+  // Report the post-column-filter row count (funnel filters) to the parent, or
+  // null when no column filter is active, so "Showing X of Y" reflects them.
+  const reportFilteredCount = useCallback((e: { api?: any }) => {
+    const api = e?.api ?? gridRef.current?.api;
+    if (api?.getDisplayedRowCount) setDispCount(api.getDisplayedRowCount());
+    if (!api || !onFilteredCountChange) return;
+    onFilteredCountChange(api.isAnyFilterPresent?.() ? api.getDisplayedRowCount() : null);
+  }, [onFilteredCountChange]);
   const saveColumnState = useCallback(() => {
     if (restoringRef.current) return; // ignore the events fired by a column rebuild
     const state = gridRef.current?.api?.getColumnState();
-    if (state) saveState(COL_STATE_KEY, state);
+    if (state) saveState(colStateKey, stripAwardCols(state));
   }, []);
 
-  // The award columns load asynchronously; when they arrive (or change) the
-  // columnDefs memo is rebuilt and AG Grid re-applies each colDef's `hide`
-  // default — wiping the user's saved visibility (award columns reappear,
-  // manually-shown ones like LoTW sent vanish). Re-apply the saved state after
-  // every rebuild so the user's choices win. No-op before the grid is ready.
+  // columnDefs is rebuilt whenever the award columns load OR the user toggles an
+  // award column (both change the memo → restoringRef flips true at line 316). Each
+  // rebuild makes AG Grid re-apply every colDef's `hide` default, wiping the user's
+  // saved visibility of the NON-award columns (QTH/Grid reappear, a manually-shown
+  // LoTW-sent vanishes). Re-apply the saved (award-stripped) state after EVERY such
+  // rebuild — hence awardShown in the deps, not just awardCols; without it, toggling
+  // an award reset the other columns AND left restoringRef stuck true (saving off).
   useEffect(() => {
     const api = gridRef.current?.api;
-    const local = loadLocal(COL_STATE_KEY);
-    if (api && local) api.applyColumnState({ state: local as ColumnState[], applyOrder: true });
+    const local = loadLocal(colStateKey);
+    if (api && local) api.applyColumnState({ state: stripAwardCols(local) as ColumnState[], applyOrder: true });
     // Re-enable saving once AG Grid has settled the column events from the rebuild.
     const t = window.setTimeout(() => { restoringRef.current = false; }, 0);
     return () => window.clearTimeout(t);
-  }, [awardCols]);
+  }, [awardCols, awardShown]);
 
   function handleRowDoubleClicked(e: RowDoubleClickedEvent<QSOForm>) {
     if (e.data && onRowDoubleClicked) onRowDoubleClicked(e.data);
   }
   function onSelectionChanged() {
-    const sel = (gridRef.current?.api?.getSelectedRows() as QSOForm[] | undefined) ?? [];
+    const api = gridRef.current?.api;
+    const sel = (api?.getSelectedRows() as QSOForm[] | undefined) ?? [];
+    setSelCount(sel.length);
+    setDispCount(api?.getDisplayedRowCount?.() ?? 0);
     onRowSelected?.(sel.map((r) => r.id as number).filter((id) => id != null));
   }
   // Select every row when the caller bumps selectAllSignal (QSL Manager search).
@@ -331,15 +425,42 @@ export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRo
     gridRef.current?.api?.selectAll();
   }, [selectAllSignal]);
 
+  // Select ONE row by id when the caller bumps selectRowSignal.seq. Deferred a
+  // tick so a row-data refresh in the same render settles first.
+  useEffect(() => {
+    if (!selectRowSignal || selectRowSignal.seq === 0) return;
+    const t = window.setTimeout(() => {
+      const api = gridRef.current?.api;
+      if (!api) return;
+      api.deselectAll();
+      api.forEachNode((n: any) => {
+        if (n.data?.id === selectRowSignal.id) n.setSelected(true);
+      });
+    }, 0);
+    return () => window.clearTimeout(t);
+  }, [selectRowSignal?.seq]);
+
   // ── Column picker (visibility) ──
   // Drives AG Grid via setColumnsVisible(). We don't keep a parallel React
   // state for "which columns are visible" — AG Grid's column state is the
   // source of truth, and saveColumnState persists it.
   function isColVisible(colId: string): boolean {
+    // Award columns: the persisted set is the source of truth (see awardShown).
+    if (colId.startsWith('award_')) return awardShown.has(colId.slice('award_'.length).toUpperCase());
     const col = gridRef.current?.api?.getColumn(colId);
     return col ? col.isVisible() : !!COL_CATALOG.find((c) => c.colId === colId)?.defaultVisible;
   }
   function setColVisible(colId: string, visible: boolean) {
+    // Award columns are driven by the persisted code set — update it and let the
+    // enforce effect apply visibility. This is what makes them stick across reopen.
+    if (colId.startsWith('award_')) {
+      const code = colId.slice('award_'.length).toUpperCase();
+      const next = new Set(awardShown);
+      if (visible) next.add(code); else next.delete(code);
+      persistAwardShown(next);
+      gridRef.current?.api?.setColumnsVisible([colId], visible);
+      return;
+    }
     const api = gridRef.current?.api;
     if (!api) return;
     api.setColumnsVisible([colId], visible);
@@ -367,11 +488,40 @@ export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRo
     api.setColumnsVisible(visible, true);
     api.setColumnsVisible(hidden, false);
     saveColumnState();
+    // Award columns are opt-in: reset hides them all.
+    persistAwardShown(new Set());
+    (awardCols ?? []).forEach((a) => api.setColumnsVisible([`award_${a.code}`], false));
   }
 
   return (
     <>
       <div className="flex items-center justify-end gap-2 px-2.5 py-1 border-b border-border/60 bg-muted/20">
+        {/* Live selection count — visible without opening the context menu. */}
+        {selCount > 0 && (
+          <span className="mr-auto text-[11px] font-semibold text-primary tabular-nums px-1.5">
+            {t('rqg.selectedCount', { n: selCount })}
+          </span>
+        )}
+        {/* Select every loaded row that passes the active column filters — so a
+            filtered view can be selected in one click (then send to LoTW, bulk
+            edit, export…). Once everything is selected the same button flips to
+            "Unselect all". */}
+        {(() => {
+          const allSelected = selCount > 0 && dispCount > 0 && selCount >= dispCount;
+          return (
+            <Button variant="ghost" size="sm" className="h-7 text-[11px]"
+              title={allSelected ? t('rqg.unselectAllTitle') : t('rqg.selectAllTitle')}
+              onClick={() => {
+                const api: any = gridRef.current?.api;
+                if (!api) return;
+                if (allSelected) api.deselectAll();
+                else if (typeof api.selectAllFiltered === 'function') api.selectAllFiltered();
+                else api.selectAll('filtered');
+              }}>
+              <ListChecks className="size-3.5" /> {allSelected ? t('rqg.unselectAll') : t('rqg.selectAll')}
+            </Button>
+          );
+        })()}
         <Button variant="ghost" size="sm" className="h-7 text-[11px]" onClick={() => gridRef.current?.api?.setFilterModel(null)}
           title={t('rqg.clearFiltersTitle')}>
           <FilterX className="size-3.5" /> {t('rqg.clearFilters')}
@@ -390,12 +540,15 @@ export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRo
             defaultColDef={defaultColDef}
             rowSelection={{ mode: 'multiRow', checkboxes: false, headerCheckbox: false, enableClickSelection: true }}
             onGridReady={onGridReady}
+            onFilterChanged={reportFilteredCount}
+            onModelUpdated={reportFilteredCount}
             onColumnResized={saveColumnState}
             onColumnMoved={saveColumnState}
             onColumnPinned={saveColumnState}
             onColumnVisible={saveColumnState}
             onSortChanged={saveColumnState}
             onRowDoubleClicked={handleRowDoubleClicked}
+            onRowClicked={(e) => e.data && onRowClicked?.(e.data)}
             onSelectionChanged={onSelectionChanged}
             onCellContextMenu={onCellContextMenu}
             preventDefaultOnContextMenu
@@ -463,8 +616,8 @@ export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRo
                 <div className="flex items-center justify-between mb-2 pb-1.5 border-b border-border/60">
                   <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">{t('rqg.grpAwards')}</span>
                   <div className="flex gap-0.5">
-                    <button className="text-[10px] text-primary hover:underline px-1" onClick={() => { awardCols.forEach((a) => setColVisible(`award_${a.code}`, true)); }}>{t('rqg.all')}</button>
-                    <button className="text-[10px] text-muted-foreground hover:underline px-1" onClick={() => { awardCols.forEach((a) => setColVisible(`award_${a.code}`, false)); }}>{t('rqg.none')}</button>
+                    <button className="text-[10px] text-primary hover:underline px-1" onClick={() => { persistAwardShown(new Set(awardCols.map((a) => a.code.toUpperCase()))); awardCols.forEach((a) => gridRef.current?.api?.setColumnsVisible([`award_${a.code}`], true)); }}>{t('rqg.all')}</button>
+                    <button className="text-[10px] text-muted-foreground hover:underline px-1" onClick={() => { persistAwardShown(new Set()); awardCols.forEach((a) => gridRef.current?.api?.setColumnsVisible([`award_${a.code}`], false)); }}>{t('rqg.none')}</button>
                   </div>
                 </div>
                 <div className="flex flex-col gap-1">

frontend/src/components/StationControlPanel.tsx

@@ -0,0 +1,768 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, Flame } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { cn } from '@/lib/utils';
+import { useI18n } from '@/lib/i18n';
+import { writeUiPref } from '@/lib/uiPref';
+import { RotorCompass } from '@/components/RotorCompass';
+import {
+  GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
+  GetRotatorHeading, RotatorGoTo, RotatorStop,
+  GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
+  ListDenkoviDevices, ListSerialPorts, TestStationDevice,
+  GetAmpStatuses, AmpOperate, AmpPower, AmpPowerLevel, AmpFanMode, GetFlexState, FlexAmpOperate,
+} from '../../wailsjs/go/main/App';
+
+type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
+
+type Device = { id: string; type: string; name: string; host: string; user?: string; pass?: string; channels?: number; labels: string[] };
+type Relay = { number: number; label: string; on: boolean };
+type DevStatus = { id: string; name: string; type: string; connected: boolean; error?: string; relays: Relay[] };
+
+const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8 };
+const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)' };
+
+// Relay count for a configured device: fixed by type, except Denkovi (4/8) and
+// the generic USB-serial board, whose channel count the user picks.
+const chanCount = (d: Device): number =>
+  (d.type === 'denkovi' || d.type === 'usbrelay') ? (d.channels && d.channels >= 1 ? d.channels : 8) : (RELAY_COUNT[d.type] ?? 5);
+
+function blankDevice(): Device {
+  return { id: '', type: 'webswitch', name: '', host: '', user: '', pass: '', labels: Array(5).fill('') };
+}
+
+type Heading = { enabled: boolean; ok: boolean; azimuth: number };
+
+// RotatorWidget shows the configured rotator (Settings → Rotator) right in the
+// Station Control tab: a live compass you can click to turn, a heading readout, a
+// GoTo box, quick N/E/S/W presets, and Stop. Heading is polled by the panel and
+// passed in (so the panel can also order this widget); it drives the shared
+// rotator backend.
+function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: RotatorProps & {
+  hd: Heading; refetch: () => void; t: (k: string, v?: any) => string;
+}) {
+  const [goto, setGoto] = useState('');
+  const [err, setErr] = useState('');
+
+  const turn = (az: number) => {
+    const a = ((Math.round(az) % 360) + 360) % 360;
+    RotatorGoTo(a, -1).then(refetch).catch((e) => setErr(String(e?.message ?? e)));
+  };
+  const poll = refetch;
+
+  const presets: [string, number][] = [['N', 0], ['E', 90], ['S', 180], ['W', 270]];
+  return (
+    <div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
+      <div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
+        <Compass className="size-4 text-primary" />
+        <div className="text-sm font-semibold">{t('station.rotator')}</div>
+        <span className={cn('ml-auto size-2 rounded-full', hd.ok ? 'bg-success' : 'bg-warning')}
+          title={hd.ok ? t('station.online') : t('station.rotatorNoRead')} />
+      </div>
+      <div className="p-3 flex gap-4 items-start">
+        <RotorCompass
+          bearing={bearing ?? null}
+          headings={hd.ok ? [hd.azimuth] : []}
+          centerLat={centerLat ?? null}
+          centerLon={centerLon ?? null}
+          rotorEnabled={hd.ok}
+          onGoto={(az) => turn(az)}
+        />
+        <div className="flex-1 min-w-0 space-y-2">
+          <div className="font-mono">
+            <span className="text-2xl font-bold tabular-nums">{hd.ok ? `${hd.azimuth}°` : '—'}</span>
+          </div>
+          <div className="flex gap-1">
+            {presets.map(([lbl, az]) => (
+              <button key={lbl} type="button" onClick={() => turn(az)}
+                className="flex-1 rounded-md border border-border bg-muted/40 py-1 text-xs font-semibold hover:bg-muted">
+                {lbl}
+              </button>
+            ))}
+          </div>
+          <div className="flex gap-1.5">
+            <Input value={goto} onChange={(e) => setGoto(e.target.value.replace(/[^0-9]/g, ''))}
+              onKeyDown={(e) => { if (e.key === 'Enter' && goto) turn(parseInt(goto, 10)); }}
+              placeholder="0–359" className="h-8 flex-1 min-w-0 font-mono text-sm" />
+            <Button size="sm" className="h-8 shrink-0" disabled={!goto} onClick={() => turn(parseInt(goto, 10))}>{t('station.go')}</Button>
+          </div>
+          <Button size="sm" variant="outline" className="h-8 w-full" onClick={() => RotatorStop().then(poll).catch((e) => setErr(String(e?.message ?? e)))}>
+            <Square className="size-3 mr-1" /> {t('station.stop')}
+          </Button>
+          {err && <div className="text-[11px] text-destructive break-words">{err}</div>}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[] };
+
+// MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the
+// Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam
+// only — per-element length adjustment. Heading/state is polled by the panel.
+const ELEMENT_STEP = 2; // the physical console adjusts 2 mm per press
+
+// elementName maps an element index to a ham-radio name: 0 = reflector,
+// 1 = driven element, then Director 1, 2, 3…
+function elementName(i: number, t: (k: string, v?: any) => string): string {
+  if (i === 0) return t('station.reflector');
+  if (i === 1) return t('station.driven');
+  return `${t('station.director')} ${i - 1}`;
+}
+
+function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () => void; t: (k: string, v?: any) => string }) {
+  const [err, setErr] = useState('');
+  const [lengths, setLengths] = useState<number[]>([]); // current element lengths (mm), from ReadElements
+  const [reading, setReading] = useState(false);
+  const [busyEl, setBusyEl] = useState<number | null>(null);
+  const [editingEl, setEditingEl] = useState<number | null>(null); // element whose mm is being typed
+  const [editVal, setEditVal] = useState('');
+  const run = (p: Promise<any>) => p.then(refetch).catch((e) => setErr(String(e?.message ?? e)));
+  const isUB = ant.type !== 'steppir';
+
+  const readLengths = useCallback(async () => {
+    setReading(true); setErr('');
+    try { setLengths(((await MotorReadElements()) ?? []) as number[]); }
+    catch (e: any) { setErr(String(e?.message ?? e)); }
+    finally { setReading(false); }
+  }, []);
+  // Read the current lengths once when the Ultrabeam widget mounts/connects, so
+  // +/- starts from the real values rather than blind.
+  useEffect(() => { if (isUB && ant.connected) readLengths(); }, [isUB, ant.connected, readLengths]);
+
+  // Send an absolute length to one element and remember it as the new baseline.
+  const setLen = async (i: number, mm: number) => {
+    const next = Math.max(0, Math.round(mm));
+    const prev = lengths[i] ?? 0;
+    setBusyEl(i); setErr('');
+    setLengths((ls) => { const c = [...ls]; c[i] = next; return c; }); // optimistic
+    try { await MotorSetElement(i, next); refetch(); }
+    catch (e: any) {
+      // Rejected by the controller — most often the element is at its travel
+      // limit for this band (extending on a low band). Revert the optimistic
+      // value so the display stays truthful, and explain the likely cause when
+      // the failed move was an extension.
+      setLengths((ls) => { const c = [...ls]; c[i] = prev; return c; });
+      setErr(next > prev ? t('station.atMax') : String(e?.message ?? e));
+    }
+    finally { setBusyEl(null); }
+  };
+  // Nudge one element by ±2 mm from its current known length.
+  const nudge = (i: number, delta: number) => setLen(i, (lengths[i] ?? 0) + delta);
+  // Commit a typed exact length (click on the mm value). Lets the operator fix
+  // the baseline when the auto-read is off, so +/- then work reliably.
+  const commitEdit = (i: number) => {
+    const v = parseInt(editVal, 10);
+    setEditingEl(null);
+    if (!isNaN(v) && v >= 0 && v !== lengths[i]) setLen(i, v);
+  };
+  const dirs: [number, string][] = [[0, 'N'], [1, '180°'], [2, t('station.bi')]];
+  return (
+    <div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
+      <div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
+        <AntennaIcon className="size-4 text-primary" />
+        <div className="min-w-0">
+          <div className="text-sm font-semibold truncate">{isUB ? 'Ultrabeam' : 'SteppIR'}</div>
+          {ant.frequency > 0 && <div className="text-[10px] text-muted-foreground font-mono">{(ant.frequency / 1000).toFixed(3)} MHz</div>}
+        </div>
+        {ant.moving && <span className="ml-auto text-[10px] font-semibold text-warning animate-pulse">{t('station.moving')}</span>}
+        <span className={cn('size-2 rounded-full shrink-0', ant.moving ? '' : 'ml-auto', ant.connected ? 'bg-success' : 'bg-muted-foreground/40')}
+          title={ant.connected ? t('station.online') : t('station.offline')} />
+      </div>
+      <div className="p-3 space-y-3">
+        <div>
+          <div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground mb-1">{t('station.pattern')}</div>
+          <div className="flex gap-1">
+            {dirs.map(([d, lbl]) => (
+              <button key={d} type="button" disabled={!ant.connected}
+                onClick={() => run(SetUltrabeamDirection(d))}
+                className={cn('flex-1 rounded-md border py-1.5 text-xs font-semibold transition-colors disabled:opacity-40',
+                  ant.direction === d ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
+                {lbl}
+              </button>
+            ))}
+          </div>
+        </div>
+        <button type="button" disabled={!ant.connected}
+          onClick={() => run(UltrabeamRetract())}
+          className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1.5 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
+          <ArrowDownToLine className="size-3.5" /> {t('station.retract')}
+        </button>
+
+        {isUB && (
+          <div>
+            <div className="flex items-center gap-2 mb-1.5">
+              <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">{t('station.elements')}</span>
+              <button type="button" onClick={readLengths} disabled={!ant.connected || reading}
+                className="text-[10px] text-primary hover:underline inline-flex items-center gap-1 disabled:opacity-40" title={t('station.readLengths')}>
+                <RefreshCw className={cn('size-3', reading && 'animate-spin')} /> {t('station.read')}
+              </button>
+            </div>
+            {lengths.length === 0 ? (
+              <p className="text-[11px] text-muted-foreground">{t('station.noLengths')}</p>
+            ) : (
+              <div className="space-y-1.5">
+                {/* Hide 0-length elements — an Ultrabeam reports 6 slots but a
+                    3-element beam only uses the first few. */}
+                {lengths.map((mm, i) => ({ mm, i })).filter((e) => e.mm > 0).map(({ mm, i }) => (
+                  <div key={i} className="flex items-center gap-2">
+                    <span className="text-xs w-20 shrink-0 text-muted-foreground truncate">{elementName(i, t)}</span>
+                    <button type="button" disabled={!ant.connected || busyEl !== null}
+                      onClick={() => nudge(i, -ELEMENT_STEP)}
+                      className="flex items-center justify-center size-7 rounded-md border border-border hover:bg-muted disabled:opacity-40 shrink-0">
+                      <Minus className="size-3.5" />
+                    </button>
+                    {editingEl === i ? (
+                      <input autoFocus type="number" value={editVal}
+                        onChange={(e) => setEditVal(e.target.value)}
+                        onBlur={() => commitEdit(i)}
+                        onKeyDown={(e) => { if (e.key === 'Enter') commitEdit(i); if (e.key === 'Escape') setEditingEl(null); }}
+                        className="text-sm font-mono font-bold flex-1 min-w-0 text-center tabular-nums bg-transparent border border-primary rounded px-1" />
+                    ) : (
+                      <span className="text-sm font-mono font-bold flex-1 min-w-0 text-center tabular-nums cursor-pointer hover:underline"
+                        title={t('station.setExactLen')}
+                        onClick={() => { setEditingEl(i); setEditVal(String(mm)); }}>
+                        {busyEl === i ? <Loader2 className="size-3.5 animate-spin inline" /> : `${mm} mm`}
+                      </span>
+                    )}
+                    <button type="button" disabled={!ant.connected || busyEl !== null}
+                      onClick={() => nudge(i, ELEMENT_STEP)}
+                      className="flex items-center justify-center size-7 rounded-md border border-border hover:bg-muted disabled:opacity-40 shrink-0">
+                      <Plus className="size-3.5" />
+                    </button>
+                  </div>
+                ))}
+              </div>
+            )}
+            <p className="text-[10px] text-muted-foreground mt-1">{t('station.elementsHint')}</p>
+          </div>
+        )}
+        {err && <div className="text-[11px] text-destructive break-words">{err}</div>}
+      </div>
+    </div>
+  );
+}
+
+// AmplifierWidget brings the amplifier controls (Settings → Amplifier) into the
+// Station Control tab, so an operator WITHOUT a FlexRadio/Icom panel still has
+// them. Several amps can be configured (some ops run two SPEs in parallel) —
+// the header dropdown picks which one this card shows; the choice is remembered.
+function AmplifierWidget({ t }: { t: (k: string, v?: any) => string }) {
+  const [list, setList] = useState<any[]>([]);
+  const [sel, setSel] = useState<string>(() => localStorage.getItem('opslog.ampSel.station') || '');
+  const [flex, setFlex] = useState<any>(null);
+  useEffect(() => {
+    let alive = true;
+    // The Flex state rides along because a PGXL's OPERATE state comes from the
+    // radio (the direct GSCP status doesn't carry it).
+    const tick = () => Promise.all([
+      GetAmpStatuses().catch(() => []),
+      GetFlexState().catch(() => null),
+    ]).then(([l, fx]: any[]) => { if (alive) { setList((l ?? []) as any[]); setFlex(fx); } });
+    tick();
+    const id = window.setInterval(tick, 1500);
+    return () => { alive = false; window.clearInterval(id); };
+  }, []);
+  const amp = list.find((a) => a.id === sel) ?? list[0];
+  if (!amp) return null;
+  const isACOM = !!amp.acom;
+  const isSPE = !!amp.spe;
+  const isPGXL = !isACOM && !isSPE;
+  const viaFlex = isPGXL && !!flex?.amp_available;
+  const raw = amp.spe ?? amp.acom ?? amp.pgxl ?? { connected: false };
+  const st: any = isPGXL
+    ? { ...raw, connected: !!raw.connected || viaFlex, operate: viaFlex ? !!flex.amp_operate : !!raw.operate }
+    : raw;
+  const doOperate = () => {
+    const want = !st.operate;
+    (isPGXL && viaFlex ? FlexAmpOperate(want) : AmpOperate(amp.id, want)).catch(() => {});
+  };
+  const maxW = isACOM ? (Number(st.max_w) || 800) : ({ '13K': 1300, '15K': 1500, '2K': 2000 } as Record<string, number>)[st.model] || 1500;
+  const outW = Number(isACOM ? st.fwd_w : st.output_w) || 0;
+  const frac = Math.min(1, outW / maxW);
+  return (
+    <div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
+      <div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
+        <Flame className="size-4 text-primary" />
+        <div className="min-w-0">
+          <div className="text-sm font-semibold truncate">{t('flxp.amplifier')}</div>
+          {list.length <= 1 && <div className="text-[10px] text-muted-foreground font-mono truncate">{amp.name}</div>}
+        </div>
+        {list.length > 1 && (
+          <select value={amp.id} title={t('flxp.ampPick')}
+            onChange={(e) => { setSel(e.target.value); localStorage.setItem('opslog.ampSel.station', e.target.value); }}
+            className="h-7 rounded-md border border-border bg-card px-1.5 text-xs font-semibold outline-none min-w-0">
+            {list.map((a: any) => <option key={a.id} value={a.id}>{a.name}</option>)}
+          </select>
+        )}
+        <span className={cn('ml-auto size-2 rounded-full shrink-0', st.connected ? 'bg-success' : 'bg-muted-foreground/40')}
+          title={st.connected ? t('station.online') : (st.last_error || t('station.offline'))} />
+      </div>
+      <div className="p-3 space-y-2">
+        {isPGXL ? (
+          <div className="flex items-center gap-2 flex-wrap">
+            <button type="button" disabled={!st.connected}
+              onClick={doOperate}
+              className={cn('px-3 py-1.5 rounded-lg text-xs font-extrabold tracking-wide border-2 transition-all disabled:opacity-40',
+                st.operate ? 'bg-warning text-warning-foreground border-warning' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
+              {st.operate ? 'OPERATE' : 'STANDBY'}
+            </button>
+            {(['STANDARD', 'CONTEST', 'BROADCAST'] as const).map((m) => (
+              <button key={m} type="button" disabled={!st.connected}
+                onClick={() => AmpFanMode(amp.id, m).catch(() => {})}
+                className={cn('px-2.5 py-1.5 rounded-md border text-xs font-semibold disabled:opacity-40',
+                  st.fan_mode === m ? 'bg-primary text-primary-foreground border-primary' : 'bg-muted/30 border-border hover:bg-muted')}>
+                {m === 'STANDARD' ? t('flxp.fanStandard') : m === 'CONTEST' ? t('flxp.fanContest') : t('flxp.fanBroadcast')}
+              </button>
+            ))}
+            <span className="text-xs text-muted-foreground font-mono">{st.state || ''}{st.temperature ? ` · ${Math.round(st.temperature)}°C` : ''}</span>
+          </div>
+        ) : (
+          <>
+            <div className="flex items-center gap-2 flex-wrap">
+              <button type="button" disabled={!st.connected}
+                onClick={doOperate}
+                className={cn('px-3 py-1.5 rounded-lg text-xs font-extrabold tracking-wide border-2 transition-all disabled:opacity-40',
+                  st.operate ? 'bg-warning text-warning-foreground border-warning' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
+                {st.operate ? 'OPERATE' : 'STANDBY'}
+              </button>
+              <div className="inline-flex rounded-lg overflow-hidden border border-success/70">
+                <button type="button"
+                  disabled={isACOM ? !(st.port_open && st.transport === 'serial') : !st.connected}
+                  onClick={() => AmpPower(amp.id, true).catch(() => {})}
+                  className="px-2.5 py-1.5 text-xs font-bold bg-card text-success hover:bg-success/15 disabled:opacity-40">ON</button>
+                <button type="button" disabled={!st.connected}
+                  onClick={() => AmpPower(amp.id, false).catch(() => {})}
+                  className="px-2.5 py-1.5 text-xs font-bold bg-card text-danger border-l border-success/70 hover:bg-danger/15 disabled:opacity-40">OFF</button>
+              </div>
+              {!isACOM && (
+                <div className="inline-flex rounded-lg overflow-hidden border border-border">
+                  {(['L', 'M', 'H'] as const).map((lvl, i) => (
+                    <button key={lvl} type="button" disabled={!st.connected}
+                      onClick={() => AmpPowerLevel(amp.id, lvl).catch(() => {})}
+                      className={cn('px-2.5 py-1.5 text-xs font-bold disabled:opacity-40', i > 0 && 'border-l border-border',
+                        (st.power_level || '').trim().toUpperCase() === lvl ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
+                      {lvl}
+                    </button>
+                  ))}
+                </div>
+              )}
+            </div>
+            <div className="text-xs font-mono text-muted-foreground tabular-nums">
+              {st.connected
+                ? <>
+                    {isACOM ? (st.state || '') : (st.tx ? 'TX' : 'RX')}
+                    {st.band ? ` · ${st.band}` : ''} · {outW}W · SWR {Number((isACOM ? st.swr : st.swr_ant) ?? 0).toFixed(1)} · {st.temp_c}°C
+                    {isACOM && st.fan ? ` · Fan ${st.fan}` : ''}
+                  </>
+                : (isACOM ? t('flxp.acomOffline') : t('flxp.speOffline'))}
+            </div>
+            {st.connected && (
+              <div>
+                <div className="h-2 rounded bg-muted overflow-hidden">
+                  <div className={cn('h-full transition-all', frac > 0.9 ? 'bg-danger' : frac > 0.75 ? 'bg-warning' : 'bg-primary')}
+                    style={{ width: `${Math.round(frac * 100)}%` }} />
+                </div>
+                <div className="text-[10px] text-muted-foreground mt-0.5">{t('flxp.outputPower')} — {outW} W / {maxW} W</div>
+              </div>
+            )}
+            {(st.err_text || st.warnings || st.alarms) && (
+              <div className="text-[11px] font-bold text-danger">⚠ {st.err_text || `${st.warnings || ''} ${st.alarms || ''}`}</div>
+            )}
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorProps) {
+  const { t } = useI18n();
+  const [devices, setDevices] = useState<Device[]>([]);
+  const [status, setStatus] = useState<Record<string, DevStatus>>({});
+  const [editing, setEditing] = useState<Device | null>(null); // device being added/edited
+  const [busy, setBusy] = useState<Record<string, boolean>>({}); // per-relay in-flight
+  const [rot, setRot] = useState<Heading>({ enabled: false, ok: false, azimuth: 0 });
+  const [ant, setAnt] = useState<AntStatus>({ enabled: false, type: '', connected: false, direction: 0, frequency: 0, moving: false, elements: [] });
+  // Widget order (rotator + device ids), drag-and-drop reorderable, persisted.
+  const [order, setOrder] = useState<string[]>(() => {
+    try { const v = JSON.parse(localStorage.getItem('opslog.stationOrder') || '[]'); return Array.isArray(v) ? v : []; } catch { return []; }
+  });
+  const dragId = useRef<string | null>(null);
+  const [cols, setCols] = useState<string>(() => localStorage.getItem('opslog.stationCols') || 'auto');
+  // Amplifiers (Settings → Amplifier): shown here so operators without a
+  // FlexRadio panel still get the controls. Re-read every 5s so enabling an
+  // amp in Settings makes the widget appear without reopening the tab.
+  const [ampCount, setAmpCount] = useState(0);
+  useEffect(() => {
+    let alive = true;
+    const load = () => GetAmpStatuses().then((l: any) => { if (alive) setAmpCount((l ?? []).length); }).catch(() => {});
+    load();
+    const id = window.setInterval(load, 5000);
+    return () => { alive = false; window.clearInterval(id); };
+  }, []);
+
+  const loadDevices = useCallback(async () => {
+    try { setDevices(((await GetStationDevices()) ?? []) as Device[]); } catch { /* db not ready */ }
+  }, []);
+
+  const poll = useCallback(async () => {
+    try {
+      const s = ((await GetStationStatus()) ?? []) as DevStatus[];
+      setStatus(Object.fromEntries(s.map((d) => [d.id, d])));
+    } catch { /* ignore transient */ }
+  }, []);
+  const pollRot = useCallback(async () => {
+    try { setRot((await GetRotatorHeading()) as any); } catch { /* ignore */ }
+  }, []);
+  const pollAnt = useCallback(async () => {
+    try { setAnt((await GetUltrabeamStatus()) as any); } catch { /* ignore */ }
+  }, []);
+
+  useEffect(() => { loadDevices(); }, [loadDevices]);
+  useEffect(() => {
+    poll(); pollRot(); pollAnt();
+    const id = window.setInterval(() => { poll(); pollRot(); pollAnt(); }, 3000);
+    return () => window.clearInterval(id);
+  }, [poll, pollRot, pollAnt, devices.length]);
+
+  const persistOrder = (next: string[]) => { setOrder(next); writeUiPref('opslog.stationOrder', JSON.stringify(next)); };
+  // Reorder so `dragged` lands just before `target`.
+  const onDrop = (targetId: string) => {
+    const src = dragId.current; dragId.current = null;
+    if (!src || src === targetId) return;
+    const ids = widgetIds.filter((id) => id !== src);
+    const at = ids.indexOf(targetId);
+    ids.splice(at < 0 ? ids.length : at, 0, src);
+    persistOrder(ids);
+  };
+
+  const persist = async (next: Device[]) => {
+    setDevices(next);
+    try { await SaveStationDevices(next as any); } catch { /* surfaced by status */ }
+    await loadDevices();
+    poll();
+  };
+
+  const toggle = async (dev: Device, relay: number, on: boolean) => {
+    const key = `${dev.id}:${relay}`;
+    setBusy((b) => ({ ...b, [key]: true }));
+    // Optimistic flip so the switch feels instant; the poll reconciles.
+    setStatus((st) => {
+      const d = st[dev.id]; if (!d) return st;
+      return { ...st, [dev.id]: { ...d, relays: d.relays.map((r) => (r.number === relay ? { ...r, on } : r)) } };
+    });
+    try { await StationSetRelay(dev.id, relay, on); } catch { /* poll will correct */ }
+    await poll();
+    setBusy((b) => ({ ...b, [key]: false }));
+  };
+
+  const saveEdit = async () => {
+    if (!editing) return;
+    const d = { ...editing, name: editing.name.trim() || TYPE_LABEL[editing.type], host: editing.host.trim() };
+    const exists = devices.some((x) => x.id && x.id === d.id);
+    await persist(exists ? devices.map((x) => (x.id === d.id ? d : x)) : [...devices, d]);
+    setEditing(null);
+  };
+
+  const removeDevice = async (id: string) => { await persist(devices.filter((x) => x.id !== id)); };
+
+  // Build the widget list (rotator first by default, then devices), then order it
+  // by the saved drag order — unknown ids fall to the end in their natural order.
+  const deviceCard = (dev: Device) => {
+    const st = status[dev.id];
+    const relays = st?.relays ?? dev.labels.map((label, i) => ({ number: i + 1, label, on: false }));
+    return (
+      <div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
+        <div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
+          <PlugZap className="size-4 text-primary" />
+          <div className="min-w-0">
+            <div className="text-sm font-semibold truncate">{dev.name || TYPE_LABEL[dev.type]}</div>
+            <div className="text-[10px] text-muted-foreground font-mono truncate">{TYPE_LABEL[dev.type]} · {dev.host}</div>
+          </div>
+          <span className={cn('ml-auto size-2 rounded-full shrink-0', st?.connected ? 'bg-success' : 'bg-muted-foreground/40')}
+            title={st?.connected ? t('station.online') : (st?.error || t('station.offline'))} />
+          <button className="text-muted-foreground hover:text-foreground" title={t('station.edit')}
+            onClick={() => setEditing({ ...dev, labels: [...dev.labels] })}><Pencil className="size-3.5" /></button>
+          <button className="text-muted-foreground hover:text-destructive" title={t('station.delete')}
+            onClick={() => removeDevice(dev.id)}><Trash2 className="size-3.5" /></button>
+        </div>
+        <div className="p-3 grid grid-cols-2 gap-2">
+          {relays.map((r) => {
+            const key = `${dev.id}:${r.number}`;
+            const label = r.label || `${t('station.relay')} ${r.number}`;
+            return (
+              <button key={r.number} type="button" disabled={!st?.connected}
+                onClick={() => toggle(dev, r.number, !r.on)}
+                className={cn('flex items-center gap-2 rounded-lg border px-2.5 py-2 text-left transition-colors disabled:opacity-40',
+                  r.on ? 'bg-success/15 border-success/50' : 'bg-muted/30 border-border hover:bg-muted')}>
+                <span className={cn('flex items-center justify-center size-7 rounded-md shrink-0',
+                  r.on ? 'bg-success text-success-foreground' : 'bg-muted-foreground/15 text-muted-foreground')}>
+                  {busy[key] ? <Loader2 className="size-3.5 animate-spin" /> : <Power className="size-3.5" />}
+                </span>
+                <span className="min-w-0">
+                  <span className="block text-xs font-medium truncate">{label}</span>
+                  <span className={cn('block text-[10px] font-semibold', r.on ? 'text-success' : 'text-muted-foreground')}>
+                    {r.on ? t('station.on') : t('station.off')}
+                  </span>
+                </span>
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    );
+  };
+
+  const widgets: { id: string; node: React.ReactNode }[] = [];
+  if (rot.enabled) {
+    widgets.push({ id: 'rotator', node: <RotatorWidget hd={rot} refetch={pollRot} centerLat={centerLat} centerLon={centerLon} bearing={bearing} t={t} /> });
+  }
+  if (ant.enabled) {
+    widgets.push({ id: 'antenna', node: <MotorAntennaWidget ant={ant} refetch={pollAnt} t={t} /> });
+  }
+  if (ampCount > 0) {
+    widgets.push({ id: 'amplifier', node: <AmplifierWidget t={t} /> });
+  }
+  for (const dev of devices) widgets.push({ id: dev.id, node: deviceCard(dev) });
+
+  const rank = (id: string) => { const i = order.indexOf(id); return i < 0 ? 1e6 : i; };
+  const ordered = widgets.map((w, i) => ({ ...w, i })).sort((a, b) => (rank(a.id) - rank(b.id)) || (a.i - b.i));
+  const widgetIds = ordered.map((w) => w.id);
+
+  const noDevices = devices.length === 0 && !rot.enabled && !ant.enabled && ampCount === 0;
+
+  // Column count controls the layout: with 4 widgets, choosing "2" lays them out
+  // 2×2 — which linear drag-reorder alone can't do, since the grid auto-flows to
+  // fill however many columns are available.
+  const gridCols: Record<string, string> = {
+    auto: 'sm:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4',
+    '1': 'grid-cols-1', '2': 'grid-cols-2', '3': 'grid-cols-3', '4': 'grid-cols-4',
+  };
+
+  return (
+    <div className="flex-1 min-h-0 overflow-auto p-4">
+      <div className="flex items-center justify-between mb-3">
+        <h2 className="text-sm font-bold uppercase tracking-wider text-muted-foreground">{t('station.title')}</h2>
+        <div className="flex items-center gap-2">
+          <div className="flex items-center rounded-md border border-border overflow-hidden text-[11px]">
+            {(['auto', '2', '3', '4'] as const).map((c) => (
+              <button key={c} type="button"
+                onClick={() => { setCols(c); writeUiPref('opslog.stationCols', c); }}
+                className={cn('px-2 py-1 font-medium', cols === c ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
+                {c === 'auto' ? t('station.colsAuto') : c}
+              </button>
+            ))}
+          </div>
+          <Button size="sm" variant="outline" onClick={() => setEditing(blankDevice())}>
+            <Plus className="size-3.5 mr-1" /> {t('station.addDevice')}
+          </Button>
+        </div>
+      </div>
+
+      {noDevices && !editing && (
+        <div className="max-w-4xl rounded-lg border border-dashed border-border p-8 text-center text-sm text-muted-foreground">
+          {t('station.empty')}
+        </div>
+      )}
+
+      <div className={cn('grid gap-3 items-start', gridCols[cols] ?? gridCols.auto)}>
+        {ordered.map((w) => (
+          <div key={w.id} draggable
+            onDragStart={(e) => { dragId.current = w.id; e.dataTransfer.effectAllowed = 'move'; }}
+            onDragOver={(e) => { e.preventDefault(); e.dataTransfer.dropEffect = 'move'; }}
+            onDrop={(e) => { e.preventDefault(); onDrop(w.id); }}
+            className={cn('cursor-grab active:cursor-grabbing', dragId.current === w.id && 'opacity-60')}>
+            {w.node}
+          </div>
+        ))}
+      </div>
+
+      {!noDevices && (
+        <p className="text-[11px] text-muted-foreground mt-2">{t('station.dragHint')}</p>
+      )}
+
+      {editing && (
+        <DeviceEditor device={editing} onChange={setEditing} onSave={saveEdit} onCancel={() => setEditing(null)} t={t} />
+      )}
+    </div>
+  );
+}
+
+function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
+  device: Device; onChange: (d: Device) => void; onSave: () => void; onCancel: () => void; t: (k: string, v?: any) => string;
+}) {
+  const ref = useRef<HTMLDivElement>(null);
+  useEffect(() => { ref.current?.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); }, []);
+  const setType = (type: string) => {
+    const channels = (type === 'denkovi' || type === 'usbrelay') ? (device.channels || 8) : undefined;
+    const n = chanCount({ ...device, type, channels });
+    const labels = Array.from({ length: n }, (_, i) => device.labels[i] ?? '');
+    onChange({ ...device, type, channels, labels });
+  };
+  const setChannels = (channels: number) => {
+    const n = chanCount({ ...device, channels });
+    const labels = Array.from({ length: n }, (_, i) => device.labels[i] ?? '');
+    onChange({ ...device, channels, labels });
+  };
+  const isKM = device.type === 'kmtronic';
+  const isDenkovi = device.type === 'denkovi';
+  const isUsbRelay = device.type === 'usbrelay';
+  // COM ports for the generic USB-serial relay picker.
+  const [serialPorts, setSerialPorts] = useState<string[]>([]);
+  useEffect(() => {
+    if (!isUsbRelay) return;
+    ListSerialPorts().then((p) => setSerialPorts((p ?? []) as string[])).catch(() => setSerialPorts([]));
+  }, [isUsbRelay]);
+  // Detected FTDI serials for the Denkovi picker.
+  const [denkoviSerials, setDenkoviSerials] = useState<string[]>([]);
+  const [detecting, setDetecting] = useState(false);
+  const [detectMsg, setDetectMsg] = useState('');
+  const detectDenkovi = async () => {
+    setDetecting(true);
+    setDetectMsg('');
+    try {
+      const list = ((await ListDenkoviDevices()) ?? []) as string[];
+      setDenkoviSerials(list);
+      // Auto-fill when there's exactly one and nothing chosen yet.
+      if (list.length >= 1 && !device.host.trim()) onChange({ ...device, host: list[0] });
+      setDetectMsg(list.length === 0 ? t('station.detectNone') : t('station.detectFound', { n: list.length }));
+    } catch (e: any) { setDenkoviSerials([]); setDetectMsg(String(e?.message || e || t('station.detectNone'))); }
+    finally { setDetecting(false); }
+  };
+  // Connection test result for the current device config.
+  const [testing, setTesting] = useState(false);
+  const [testMsg, setTestMsg] = useState<{ ok: boolean; text: string } | null>(null);
+  const testDevice = async () => {
+    setTesting(true);
+    setTestMsg(null);
+    try {
+      const r: any = await TestStationDevice(device as any);
+      setTestMsg(r?.ok
+        ? { ok: true, text: t('station.testOk', { n: r.relays }) }
+        : { ok: false, text: r?.error || t('station.testFail') });
+    } catch (e: any) { setTestMsg({ ok: false, text: String(e?.message || e || t('station.testFail')) }); }
+    finally { setTesting(false); }
+  };
+  useEffect(() => { if (isDenkovi) void detectDenkovi(); /* eslint-disable-next-line */ }, [isDenkovi]);
+  return (
+    <div ref={ref} className="mt-4 max-w-4xl rounded-xl border border-primary/40 bg-card p-4 space-y-3">
+      <div className="text-sm font-semibold">{device.id ? t('station.editDevice') : t('station.addDevice')}</div>
+      <div className="grid grid-cols-2 gap-3">
+        <div className="space-y-1">
+          <Label>{t('station.type')}</Label>
+          <Select value={device.type} onValueChange={setType}>
+            <SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
+            <SelectContent>
+              <SelectItem value="webswitch">WebSwitch 1216H (5 relays)</SelectItem>
+              <SelectItem value="kmtronic">KMTronic 8-relay (LAN)</SelectItem>
+              <SelectItem value="denkovi">Denkovi USB (FT245 / D2XX)</SelectItem>
+              <SelectItem value="usbrelay">Denkovi USB (serial / COM)</SelectItem>
+            </SelectContent>
+          </Select>
+        </div>
+        <div className="space-y-1">
+          <Label>{t('station.name')}</Label>
+          <Input value={device.name} placeholder={TYPE_LABEL[device.type]} onChange={(e) => onChange({ ...device, name: e.target.value })} />
+        </div>
+      </div>
+      {(isDenkovi || isUsbRelay) && (
+        <div className="space-y-1 max-w-[10rem]">
+          <Label>{t('station.channels')}</Label>
+          <Select value={String(chanCount(device))} onValueChange={(v) => setChannels(parseInt(v, 10))}>
+            <SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
+            <SelectContent>
+              {(isDenkovi ? [4, 8] : [1, 2, 4, 8, 16]).map((n) => (
+                <SelectItem key={n} value={String(n)}>{n}</SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+      )}
+      {isDenkovi ? (
+        <div className="space-y-1 max-w-md">
+          <Label>{t('station.ftdiSerial')}</Label>
+          <div className="flex items-center gap-2">
+            <Input className="font-mono flex-1" value={device.host} placeholder="DAE0006K"
+              list="denkovi-serials"
+              onChange={(e) => onChange({ ...device, host: e.target.value })} />
+            <datalist id="denkovi-serials">
+              {denkoviSerials.map((s) => <option key={s} value={s} />)}
+            </datalist>
+            <Button size="sm" variant="outline" onClick={detectDenkovi} disabled={detecting}>
+              {detecting ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <RefreshCw className="size-3.5 mr-1" />}
+              {t('station.detect')}
+            </Button>
+          </div>
+          <p className="text-[10px] text-muted-foreground">{t('station.ftdiHint')}</p>
+          {detectMsg && <p className="text-[11px] font-medium text-muted-foreground">{detectMsg}</p>}
+        </div>
+      ) : isUsbRelay ? (
+        <div className="space-y-1 max-w-md">
+          <Label>{t('station.comPort')}</Label>
+          <div className="flex items-center gap-2">
+            <Select value={device.host || '_'} onValueChange={(v) => onChange({ ...device, host: v === '_' ? '' : v })}>
+              <SelectTrigger className="h-9 flex-1"><SelectValue placeholder="— COM —" /></SelectTrigger>
+              <SelectContent>
+                {serialPorts.length === 0 && <SelectItem value="_" disabled>{t('station.noPorts')}</SelectItem>}
+                {serialPorts.map((p) => <SelectItem key={p} value={p}>{p}</SelectItem>)}
+              </SelectContent>
+            </Select>
+            <Button size="sm" variant="outline" onClick={() => ListSerialPorts().then((p) => setSerialPorts((p ?? []) as string[])).catch(() => {})}>
+              <RefreshCw className="size-3.5" />
+            </Button>
+          </div>
+          <p className="text-[10px] text-muted-foreground">{t('station.usbRelayHint')}</p>
+        </div>
+      ) : (
+      <div className={cn('grid gap-3', isKM ? 'grid-cols-3' : 'grid-cols-1')}>
+        <div className={cn('space-y-1', isKM ? '' : 'max-w-xs')}>
+          <Label>{t('station.host')}</Label>
+          <Input className="font-mono" value={device.host} placeholder="192.168.1.100" onChange={(e) => onChange({ ...device, host: e.target.value })} />
+        </div>
+        {isKM && (
+          <>
+            <div className="space-y-1">
+              <Label>{t('station.user')}</Label>
+              <Input value={device.user ?? ''} placeholder={t('station.optional')} onChange={(e) => onChange({ ...device, user: e.target.value })} />
+            </div>
+            <div className="space-y-1">
+              <Label>{t('station.pass')}</Label>
+              <Input type="password" value={device.pass ?? ''} placeholder={t('station.optional')} onChange={(e) => onChange({ ...device, pass: e.target.value })} />
+            </div>
+          </>
+        )}
+      </div>
+      )}
+      <div className="space-y-1">
+        <Label>{t('station.labels')}</Label>
+        <div className="grid grid-cols-4 gap-2">
+          {device.labels.map((lab, i) => (
+            <Input key={i} value={lab} placeholder={`${t('station.relay')} ${i + 1}`} className="h-8 text-xs"
+              onChange={(e) => { const labels = [...device.labels]; labels[i] = e.target.value; onChange({ ...device, labels }); }} />
+          ))}
+        </div>
+      </div>
+      <div className="flex items-center gap-2">
+        {testMsg && (
+          <span className={cn('inline-flex items-center gap-1.5 text-xs font-medium', testMsg.ok ? 'text-success' : 'text-danger')}>
+            <span className={cn('size-2 rounded-full', testMsg.ok ? 'bg-success' : 'bg-danger')} />
+            {testMsg.text}
+          </span>
+        )}
+        <div className="ml-auto flex gap-2">
+          <Button size="sm" variant="outline" onClick={testDevice} disabled={testing || !device.host.trim()}>
+            {testing ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <PlugZap className="size-3.5 mr-1" />}
+            {t('station.test')}
+          </Button>
+          <Button size="sm" variant="ghost" onClick={onCancel}><X className="size-3.5 mr-1" />{t('station.cancel')}</Button>
+          <Button size="sm" onClick={onSave} disabled={!device.host.trim()}><Check className="size-3.5 mr-1" />{t('station.save')}</Button>
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/StatsPanel.tsx

@@ -0,0 +1,856 @@
+import { useEffect, useMemo, useState } from 'react';
+import { BarChart3, Loader2, RefreshCw, Table2 } from 'lucide-react';
+import { GetLogStats, GetContestRuns, GetOperators } from '../../wailsjs/go/main/App';
+import { useI18n } from '@/lib/i18n';
+import { cn } from '@/lib/utils';
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Statistics dashboard.
+//
+// Colour rules this file obeys (they are not stylistic — they are what keeps the
+// charts readable and colour-blind-safe):
+//
+//  • A chart with ONE series uses ONE hue (--chart-1) for every bar. Colour
+//    encodes identity, never a magnitude the bar's length already shows.
+//  • The categorical slots (--chart-1..8) are used in FIXED ORDER and only where
+//    the categories ARE the subject (the continent donut). The order is the
+//    colour-blind-safety mechanism, so it is never shuffled or cycled.
+//  • The donut is for part-to-whole read at a glance. It is NOT used for modes:
+//    CW and SSB are nearly tied, and a donut hides exactly the comparison that
+//    makes them interesting. Close values belong in bars.
+//  • Every value is direct-labelled, so nothing is reachable only by hovering, and
+//    a table view gives the WCAG-clean twin.
+// ─────────────────────────────────────────────────────────────────────────────
+
+type Bucket = { key: string; count: number };
+type BandCat = { band: string; cw: number; phone: number; data: number; total: number };
+type Gap = { start: string; end: string; minutes: number };
+type ContestRun = { id: string; year: number; count: number; start: string; end: string };
+type Stats = {
+  total: number; unique_calls: number; entities: number; continents: number;
+  first_qso: string; last_qso: string;
+  confirmed_lotw: number; confirmed_eqsl: number; confirmed_qsl: number; confirmed_any: number;
+  by_mode: Bucket[]; by_band: Bucket[]; by_band_category: BandCat[]; by_operator: Bucket[]; by_station: Bucket[];
+  by_continent: Bucket[]; top_entities: Bucket[]; by_year: Bucket[]; by_month: Bucket[];
+  by_hour: Bucket[]; by_day7: Bucket[]; by_day30: Bucket[]; by_month12: Bucket[];
+  // Period / contest metrics.
+  window_start: string; window_end: string; window_hours: number;
+  avg_per_hour: number; avg_per_active: number;
+  on_air_minutes: number; off_air_minutes: number;
+  peak_hour_key: string; peak_hour_count: number; best_60: number;
+  gaps: Gap[]; rate: Bucket[];
+  rate_ops: string[]; rate_by_op: number[][];
+};
+
+// Minutes → "3 h 12" (a bare "192 min" makes you do arithmetic to read a break).
+const dur = (m: number) => (m >= 60 ? `${Math.floor(m / 60)} h ${String(m % 60).padStart(2, '0')}` : `${m} min`);
+
+const CONTINENT_NAME: Record<string, string> = {
+  EU: 'Europe', NA: 'North America', SA: 'South America',
+  AS: 'Asia', AF: 'Africa', OC: 'Oceania', AN: 'Antarctica',
+};
+
+const nf = (n: number) => n.toLocaleString('en-US');
+
+// ── Shell ────────────────────────────────────────────────────────────────────
+
+function Card({ title, sub, children, className, accent = 'var(--chart-1)' }: { title: string; sub?: string; children: React.ReactNode; className?: string; accent?: string }) {
+  return (
+    <section className={cn('rounded-xl border border-border bg-card p-3.5 flex flex-col min-w-0 shadow-sm', className)}>
+      <header className="mb-3 shrink-0">
+        <h3 className="flex items-center gap-1.5 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+          <span className="size-1.5 rounded-full shrink-0" style={{ background: accent }} />
+          {title}
+        </h3>
+        {sub && <p className="text-[11px] text-muted-foreground/80 mt-0.5">{sub}</p>}
+      </header>
+      {children}
+    </section>
+  );
+}
+
+// A headline number IS the chart — a one-bar bar chart would be noise. Each tile
+// carries an accent (a categorical chart hue or a semantic token): a soft tint
+// wash + a left accent bar give it a colourful identity, while the number itself
+// stays in high-contrast foreground ink so it reads on every theme.
+function StatTile({ label, value, sub, accent = 'var(--chart-1)' }: { label: string; value: string; sub?: string; accent?: string }) {
+  return (
+    <div className="relative overflow-hidden rounded-xl border border-border bg-card px-4 py-3 min-w-0 shadow-sm">
+      <div className="pointer-events-none absolute inset-0 opacity-[0.08]" style={{ background: accent }} />
+      <div className="pointer-events-none absolute -right-5 -top-7 size-20 rounded-full blur-xl opacity-[0.14]" style={{ background: accent }} />
+      <div className="absolute left-0 inset-y-0 w-1" style={{ background: accent }} />
+      <div className="relative">
+        <p className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground truncate">{label}</p>
+        {/* Proportional figures: tabular-nums makes a big standalone number look loose. */}
+        <p className="mt-1 text-[28px] leading-none font-semibold text-foreground">{value}</p>
+        {sub && <p className="mt-1 text-[11px] text-muted-foreground truncate">{sub}</p>}
+      </div>
+    </div>
+  );
+}
+
+// ── Horizontal bars (long category names: modes, operators, entities) ─────────
+// One series → one hue. The value is direct-labelled, so no reader ever depends
+// on a tooltip to get a number.
+
+function HBars({ data, max, empty, share, labelWidth = 'w-20', colorful, color = 'var(--chart-1)' }: { data: Bucket[]; max?: number; empty: string; share?: boolean; labelWidth?: string; colorful?: boolean; color?: string }) {
+  // max is a display cap for long tails (top entities). Where EVERY row matters —
+  // the operators of a multi-op — it is deliberately not set: a capped chart would
+  // silently drop the 9th operator, and "who worked what" is the whole question.
+  const top = max ? data.slice(0, max) : data;
+  const peak = Math.max(1, ...top.map((d) => d.count));
+  const total = data.reduce((s, d) => s + d.count, 0);
+  if (top.length === 0) return <p className="text-[11px] text-muted-foreground italic py-4 text-center">{empty}</p>;
+  return (
+    <div className="flex flex-col gap-1.5 min-w-0">
+      {top.map((d, i) => (
+        <div key={d.key} className="group flex items-center gap-2 min-w-0" title={`${d.key} — ${nf(d.count)}`}>
+          <span className={`${labelWidth} shrink-0 truncate text-[11px] text-muted-foreground text-right`} title={d.key}>{d.key}</span>
+          <div className="flex-1 min-w-0 h-[14px] flex items-center">
+            <div
+              className="h-[10px] rounded-r-[4px] transition-[width] duration-300"
+              style={{ width: `${Math.max(2, (d.count / peak) * 100)}%`, background: colorful ? `var(--chart-${(i % 8) + 1})` : color }}
+            />
+          </div>
+          <span className="w-14 shrink-0 text-[11px] text-foreground text-right tabular-nums">{nf(d.count)}</span>
+          {share && (
+            <span className="w-10 shrink-0 text-[11px] text-muted-foreground text-right tabular-nums">
+              {total ? ((d.count / total) * 100).toFixed(0) : 0}%
+            </span>
+          )}
+        </div>
+      ))}
+    </div>
+  );
+}
+
+// ── Vertical columns (short ordered labels: bands in band-plan order, hours) ──
+// Sorting bands by COUNT would destroy the band-plan reading; the order is the
+// information.
+
+function VBars({ data, empty, height = 150, showValues, colorful }: { data: Bucket[]; empty: string; height?: number; showValues?: boolean; colorful?: boolean }) {
+  const peak = Math.max(1, ...data.map((d) => d.count));
+  if (data.length === 0) return <p className="text-[11px] text-muted-foreground italic py-4 text-center">{empty}</p>;
+  // Thin the x labels once the bars get narrow. A label under EVERY one of 48
+  // hourly bars is unreadable mush — the axis exists to orient, not to enumerate
+  // (the value is in the tooltip, and every number is in the table view).
+  const every = data.length <= 16 ? 1 : Math.ceil(data.length / 12);
+  return (
+    // The container includes the x-axis band — a fixed height that excludes it is
+    // how cards end up with a tiny nested scrollbar.
+    <div className="flex items-end gap-[2px] min-w-0" style={{ height }}>
+      {data.map((d, i) => (
+        <div key={d.key} className="flex-1 min-w-0 flex flex-col items-center justify-end h-full group"
+          title={`${d.key} — ${nf(d.count)}`}>
+          <span className={cn('text-[9px] font-semibold mb-0.5 tabular-nums whitespace-nowrap',
+            showValues ? 'text-foreground' : 'text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity')}>
+            {nf(d.count)}
+          </span>
+          <div
+            className="w-full rounded-t-[4px] transition-[height] duration-300"
+            style={{ height: `${Math.max(2, (d.count / peak) * 100)}%`, background: colorful ? `var(--chart-${(i % 8) + 1})` : 'var(--chart-1)' }}
+          />
+          <span className="mt-1 h-3 text-[9px] text-muted-foreground w-full text-center whitespace-nowrap overflow-visible">
+            {i % every === 0 ? d.key : ''}
+          </span>
+        </div>
+      ))}
+    </div>
+  );
+}
+
+// Per-band mode split (CW / phone / data) as stacked vertical bars. The three
+// categories are the subject → categorical colour in a fixed order, matching the
+// mode colours used elsewhere (CW gold, phone green, data blue).
+const BAND_SPLIT = [
+  { key: 'cw', label: 'CW', color: 'var(--chart-3)' },
+  { key: 'phone', label: 'Phone', color: 'var(--chart-2)' },
+  { key: 'data', label: 'Data', color: 'var(--chart-1)' },
+] as const;
+function StackedBandBars({ data, empty, height = 150 }: { data: BandCat[]; empty: string; height?: number }) {
+  if (!data || data.length === 0) return <p className="text-[11px] text-muted-foreground italic py-4 text-center">{empty}</p>;
+  const peak = Math.max(1, ...data.map((d) => d.total));
+  return (
+    <div>
+      <div className="flex items-end gap-[3px] min-w-0" style={{ height }}>
+        {data.map((d) => (
+          <div key={d.band} className="flex-1 min-w-0 flex flex-col items-center justify-end h-full group"
+            title={`${d.band} — CW ${nf(d.cw)} · Phone ${nf(d.phone)} · Data ${nf(d.data)}  (${nf(d.total)})`}>
+            <span className="text-[9px] font-semibold mb-0.5 tabular-nums text-foreground">{nf(d.total)}</span>
+            <div className="w-full flex flex-col justify-end rounded-t-[4px] overflow-hidden"
+              style={{ height: `${Math.max(2, (d.total / peak) * 100)}%` }}>
+              {BAND_SPLIT.map((s) => {
+                const v = d[s.key];
+                if (!v) return null;
+                return <div key={s.key} style={{ flexGrow: v, flexBasis: 0, minHeight: 1, background: s.color }} />;
+              })}
+            </div>
+            <span className="mt-1 h-3 text-[9px] text-muted-foreground w-full text-center whitespace-nowrap">{d.band}</span>
+          </div>
+        ))}
+      </div>
+      <div className="mt-2 flex items-center justify-center gap-3 text-[10px] text-muted-foreground">
+        {BAND_SPLIT.map((s) => (
+          <span key={s.key} className="inline-flex items-center gap-1">
+            <span className="size-2.5 rounded-[3px]" style={{ background: s.color }} /> {s.label}
+          </span>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+// ── Contest rate, stacked by operator ────────────────────────────────────────
+// The categories (the operators) ARE the subject, so this is categorical colour,
+// in the FIXED order the backend sends (busiest first). An operator therefore
+// keeps the same hue everywhere on the page — a chart that repaints its series
+// when the filter changes is a chart nobody can trust.
+
+function RateStack({ rate, ops, byOp, empty, height = 130 }: {
+  rate: Bucket[]; ops: string[]; byOp: number[][]; empty: string; height?: number;
+}) {
+  const [hov, setHov] = useState<number | null>(null);
+  if (rate.length === 0) return <p className="text-[11px] text-muted-foreground italic py-4 text-center">{empty}</p>;
+  const peak = Math.max(1, ...rate.map((d) => d.count));
+  const every = rate.length <= 16 ? 1 : Math.ceil(rate.length / 12);
+  const single = ops.length <= 1; // one operator → one hue; a legend would be noise
+
+  return (
+    <div className="min-w-0">
+      <div className="flex items-end gap-[2px] min-w-0" style={{ height }}>
+        {rate.map((d, i) => (
+          <div key={d.key} className="flex-1 min-w-0 flex flex-col items-center justify-end h-full"
+            onMouseEnter={() => setHov(i)} onMouseLeave={() => setHov(null)}>
+            {/* The column is the hour's total; the segments are who made it. */}
+            <div className="w-full flex flex-col-reverse justify-start rounded-t-[4px] overflow-hidden"
+              style={{ height: `${Math.max(1, (d.count / peak) * 100)}%` }}>
+              {(byOp[i] ?? []).map((n, o) => n > 0 && (
+                <div key={o} style={{
+                  height: `${(n / Math.max(1, d.count)) * 100}%`,
+                  background: single ? 'var(--chart-1)' : `var(--chart-${(o % 8) + 1})`,
+                }} />
+              ))}
+            </div>
+            <span className="mt-1 h-3 text-[9px] text-muted-foreground w-full text-center whitespace-nowrap">
+              {i % every === 0 ? d.key : ''}
+            </span>
+          </div>
+        ))}
+      </div>
+
+      {/* Hover read-out: the hour, its total, and the split. Values are also in the
+          rate sheet below, so nothing is reachable by hover alone. */}
+      <p className="mt-1 h-4 text-[11px] text-muted-foreground tabular-nums truncate">
+        {hov !== null && (
+          <>
+            <span className="text-foreground font-medium">{rate[hov].key}</span>
+            {' · '}{nf(rate[hov].count)} QSO
+            {!single && (byOp[hov] ?? []).map((n, o) => n > 0 && (
+              <span key={o}> · <span style={{ color: `var(--chart-${(o % 8) + 1})` }}>■</span> {ops[o]} {n}</span>
+            ))}
+          </>
+        )}
+      </p>
+
+      {!single && (
+        <div className="flex flex-wrap items-center gap-x-3 gap-y-1 mt-1">
+          {ops.map((op, o) => (
+            <span key={op} className="inline-flex items-center gap-1 text-[11px] text-muted-foreground">
+              <span className="size-2.5 rounded-[3px]" style={{ background: `var(--chart-${(o % 8) + 1})` }} />
+              {op}
+            </span>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
+
+// ── The rate sheet: hour × operator, with the hour total ─────────────────────
+// Exact numbers, many of them — that is a table's job, not a chart's. Contesters
+// read rate sheets as tables, and every value here is also the one the chart draws.
+
+function RateSheet({ rate, ops, byOp }: { rate: Bucket[]; ops: string[]; byOp: number[][] }) {
+  if (rate.length === 0) return null;
+  const shown = rate.map((d, i) => ({ d, i })).filter(({ d }) => d.count > 0); // silent hours add nothing here
+  const totals = ops.map((_, o) => rate.reduce((s, _d, i) => s + (byOp[i]?.[o] ?? 0), 0));
+  const grand = rate.reduce((s, d) => s + d.count, 0);
+
+  return (
+    <div className="overflow-auto max-h-[260px] rounded-md border border-border">
+      <table className="w-full text-[11px] tabular-nums">
+        <thead className="sticky top-0 bg-muted/60 backdrop-blur">
+          <tr className="text-muted-foreground">
+            <th className="text-left font-medium px-2 py-1">UTC</th>
+            {ops.map((op, o) => (
+              <th key={op} className="text-right font-medium px-2 py-1 whitespace-nowrap">
+                <span className="inline-block size-2 rounded-[2px] mr-1 align-middle"
+                  style={{ background: `var(--chart-${(o % 8) + 1})` }} />
+                {op}
+              </th>
+            ))}
+            <th className="text-right font-semibold px-2 py-1 text-foreground">Total</th>
+          </tr>
+        </thead>
+        <tbody>
+          {shown.map(({ d, i }) => (
+            <tr key={d.key} className="border-t border-border/50">
+              <td className="px-2 py-0.5 text-muted-foreground whitespace-nowrap">{d.key}</td>
+              {ops.map((_, o) => (
+                <td key={o} className="px-2 py-0.5 text-right">
+                  {byOp[i]?.[o] ? nf(byOp[i][o]) : <span className="text-muted-foreground/40">·</span>}
+                </td>
+              ))}
+              <td className="px-2 py-0.5 text-right font-semibold">{nf(d.count)}</td>
+            </tr>
+          ))}
+        </tbody>
+        <tfoot className="sticky bottom-0 bg-muted/60 backdrop-blur">
+          <tr className="border-t border-border font-semibold">
+            <td className="px-2 py-1">Total</td>
+            {totals.map((n, o) => <td key={o} className="px-2 py-1 text-right">{nf(n)}</td>)}
+            <td className="px-2 py-1 text-right">{nf(grand)}</td>
+          </tr>
+        </tfoot>
+      </table>
+    </div>
+  );
+}
+
+// ── Activity over time (single series → area, one hue) ────────────────────────
+// Only the PEAK and the LAST point are direct-labelled. A number on every point
+// is chaos and goes unread.
+
+function AreaTrend({ data, height = 160, empty }: { data: Bucket[]; height?: number; empty: string }) {
+  const [hover, setHover] = useState<number | null>(null);
+  if (data.length < 2) return <p className="text-[11px] text-muted-foreground italic py-4 text-center">{empty}</p>;
+
+  const W = 1000, H = 100, peak = Math.max(1, ...data.map((d) => d.count));
+  const x = (i: number) => (i / (data.length - 1)) * W;
+  const y = (v: number) => H - (v / peak) * H;
+  const line = data.map((d, i) => `${i === 0 ? 'M' : 'L'}${x(i).toFixed(1)},${y(d.count).toFixed(1)}`).join(' ');
+  const area = `${line} L${W},${H} L0,${H} Z`;
+  const peakIdx = data.reduce((b, d, i) => (d.count > data[b].count ? i : b), 0);
+  const h = hover ?? -1;
+
+  return (
+    <div className="min-w-0">
+      <div className="relative" style={{ height }}>
+        <svg viewBox={`0 0 ${W} ${H}`} preserveAspectRatio="none" className="w-full h-full overflow-visible"
+          onMouseLeave={() => setHover(null)}>
+          {/* Recessive hairline grid — solid, never dashed. */}
+          {[0, 0.5, 1].map((f) => (
+            <line key={f} x1={0} x2={W} y1={H * f} y2={H * f} stroke="var(--border)" strokeWidth={1} vectorEffect="non-scaling-stroke" />
+          ))}
+          <defs>
+            <linearGradient id="statsArea" x1="0" y1="0" x2="0" y2="1">
+              <stop offset="0%" stopColor="var(--chart-1)" stopOpacity="0.28" />
+              <stop offset="100%" stopColor="var(--chart-1)" stopOpacity="0.02" />
+            </linearGradient>
+          </defs>
+          <path d={area} fill="url(#statsArea)" />
+          <path d={line} fill="none" stroke="var(--chart-1)" strokeWidth={2} vectorEffect="non-scaling-stroke"
+            strokeLinejoin="round" strokeLinecap="round" />
+          {h >= 0 && (
+            <>
+              <line x1={x(h)} x2={x(h)} y1={0} y2={H} stroke="var(--muted-foreground)" strokeWidth={1} vectorEffect="non-scaling-stroke" opacity={0.5} />
+              {/* 2px surface ring so the marker reads on top of the area. */}
+              <circle cx={x(h)} cy={y(data[h].count)} r={4} fill="var(--chart-1)" stroke="var(--card)" strokeWidth={2} vectorEffect="non-scaling-stroke" />
+            </>
+          )}
+          {/* Hit areas are far wider than the marks — pinpoint targets are unusable. */}
+          {data.map((_, i) => (
+            <rect key={i} x={x(i) - W / data.length / 2} y={0} width={W / data.length} height={H}
+              fill="transparent" onMouseEnter={() => setHover(i)} />
+          ))}
+        </svg>
+        {h >= 0 && (
+          <div className="pointer-events-none absolute -top-1 z-10 rounded-md border border-border bg-popover px-2 py-1 text-[11px] shadow-lg whitespace-nowrap"
+            style={{ left: `${(h / (data.length - 1)) * 100}%`, transform: 'translateX(-50%)' }}>
+            <span className="text-muted-foreground">{data[h].key}</span>{' '}
+            <span className="font-semibold tabular-nums">{nf(data[h].count)}</span>
+          </div>
+        )}
+      </div>
+      <div className="flex justify-between mt-1.5 text-[10px] text-muted-foreground tabular-nums">
+        <span>{data[0].key}</span>
+        <span className="text-foreground font-medium">↑ {data[peakIdx].key} · {nf(data[peakIdx].count)}</span>
+        <span>{data[data.length - 1].key}</span>
+      </div>
+    </div>
+  );
+}
+
+// ── Part-to-whole (continents) → the donut ───────────────────────────────────
+// A pie/donut is legitimate for exactly this: part-to-whole, read at a glance,
+// few segments, one share obviously dominant. It is the WRONG form for comparing
+// close values (which is why modes stay bars — CW and SSB are nearly tied, and a
+// donut would hide precisely the fact that makes them interesting).
+//
+// The categories ARE the subject here, so this is the one chart using the
+// categorical slots — in FIXED order, with a legend and printed values, because
+// the dark palette sits in the CVD floor band where labels are mandatory.
+
+function Donut({ data, empty }: { data: Bucket[]; empty: string }) {
+  const [hov, setHov] = useState<number | null>(null);
+  const total = data.reduce((s, d) => s + d.count, 0);
+  if (total === 0) return <p className="text-[11px] text-muted-foreground italic py-4 text-center">{empty}</p>;
+
+  const slots = data.slice(0, 8); // never generate a 9th hue
+  const R = 58, SW = 22, C = 2 * Math.PI * R;
+  let acc = 0;
+  const arcs = slots.map((d, i) => {
+    const frac = d.count / total;
+    // A 2px surface gap between segments — the correct separator, not a border.
+    const len = Math.max(0, frac * C - 2);
+    const a = { key: d.key, i, len, off: -acc * C, frac };
+    acc += frac;
+    return a;
+  });
+
+  return (
+    <div className="flex items-center gap-4 min-w-0">
+      <div className="relative shrink-0">
+        <svg viewBox="0 0 160 160" className="size-[140px] -rotate-90">
+          {arcs.map((a) => (
+            <circle key={a.key} cx={80} cy={80} r={R} fill="none"
+              stroke={`var(--chart-${a.i + 1})`} strokeWidth={hov === a.i ? SW + 4 : SW}
+              strokeDasharray={`${a.len} ${C - a.len}`} strokeDashoffset={a.off}
+              className="transition-[stroke-width] duration-150 cursor-default"
+              onMouseEnter={() => setHov(a.i)} onMouseLeave={() => setHov(null)} />
+          ))}
+        </svg>
+        {/* The hole is not decoration — it carries the total the slices add up to. */}
+        <div className="absolute inset-0 flex flex-col items-center justify-center pointer-events-none">
+          {hov === null ? (
+            <>
+              <span className="text-[17px] font-semibold leading-none">{nf(total)}</span>
+              <span className="text-[10px] text-muted-foreground mt-0.5">QSO</span>
+            </>
+          ) : (
+            <>
+              <span className="text-[15px] font-semibold leading-none">{(arcs[hov].frac * 100).toFixed(1)}%</span>
+              <span className="text-[10px] text-muted-foreground mt-0.5 truncate max-w-[92px] text-center">
+                {CONTINENT_NAME[slots[hov].key] ?? slots[hov].key}
+              </span>
+            </>
+          )}
+        </div>
+      </div>
+      <ul className="flex-1 min-w-0 flex flex-col gap-1">
+        {slots.map((d, i) => (
+          <li key={d.key}
+            onMouseEnter={() => setHov(i)} onMouseLeave={() => setHov(null)}
+            className={cn('flex items-center gap-1.5 min-w-0 text-[11px] rounded px-1 -mx-1',
+              hov === i && 'bg-muted')}>
+            {/* The swatch carries identity; the text stays in ink tokens. */}
+            <span className="size-2.5 rounded-[3px] shrink-0" style={{ background: `var(--chart-${i + 1})` }} />
+            <span className="truncate text-muted-foreground">{CONTINENT_NAME[d.key] ?? d.key}</span>
+            <span className="ml-auto shrink-0 tabular-nums text-foreground">{nf(d.count)}</span>
+            <span className="w-9 shrink-0 text-right tabular-nums text-muted-foreground">
+              {((d.count / total) * 100).toFixed(0)}%
+            </span>
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+}
+
+// ── A single ratio against a limit → a meter, not a 2-slice pie ───────────────
+
+function Meter({ label, value, total }: { label: string; value: number; total: number }) {
+  const pct = total > 0 ? (value / total) * 100 : 0;
+  return (
+    <div className="min-w-0">
+      <div className="flex items-baseline justify-between gap-2 mb-1">
+        <span className="text-[11px] text-muted-foreground truncate">{label}</span>
+        <span className="text-[11px] tabular-nums">
+          <span className="font-semibold text-foreground">{pct.toFixed(1)}%</span>
+          <span className="text-muted-foreground"> · {nf(value)}</span>
+        </span>
+      </div>
+      {/* Same-ramp track: the meter and its track are one hue, not two. */}
+      <div className="h-2 w-full rounded-full" style={{ background: 'var(--chart-seq-1)' }}>
+        <div className="h-full rounded-full transition-[width] duration-500"
+          style={{ width: `${Math.max(1, pct)}%`, background: 'var(--chart-1)' }} />
+      </div>
+    </div>
+  );
+}
+
+// ── Period ───────────────────────────────────────────────────────────────────
+// ONE filter row above everything it scopes — never a control inside a card, or
+// the charts would each show a different slice of time.
+
+type Period = 'all' | 'ytd' | 'y12' | 'd30' | 'custom';
+
+const iso = (d: Date) => d.toISOString().slice(0, 10);
+
+// Resolve a preset to the [from, to] the backend expects. Empty = no bound.
+function periodRange(p: Period, from: string, to: string): [string, string] {
+  const now = new Date();
+  switch (p) {
+    case 'ytd': return [`${now.getUTCFullYear()}-01-01`, ''];
+    case 'y12': {
+      const d = new Date(now); d.setUTCMonth(d.getUTCMonth() - 12);
+      return [iso(d), ''];
+    }
+    case 'd30': {
+      const d = new Date(now); d.setUTCDate(d.getUTCDate() - 30);
+      return [iso(d), ''];
+    }
+    case 'custom': return [from, to];
+    default: return ['', ''];
+  }
+}
+
+// ActivityCard — the "activity over time" chart with a granularity selector. Its
+// own state, module-scoped so a parent re-render doesn't reset the choice. The
+// timeline is the chronological month series; day/week/month/year are the cyclical
+// distributions (hour-of-day, day-of-week, day-of-month, month-of-year).
+const ACT_GRAN = [
+  { key: 'timeline', tkey: 'stats.granTimeline' },
+  { key: 'day', tkey: 'stats.granDay' },
+  { key: 'week', tkey: 'stats.granWeek' },
+  { key: 'month', tkey: 'stats.granMonth' },
+  { key: 'year', tkey: 'stats.granYear' },
+] as const;
+function ActivityCard({ stats, t, empty }: { stats: Stats; t: (k: string, v?: any) => string; empty: string }) {
+  const [g, setG] = useState<string>('timeline');
+  const series = g === 'day' ? stats.by_hour : g === 'week' ? stats.by_day7 : g === 'month' ? stats.by_day30 : g === 'year' ? stats.by_month12 : [];
+  return (
+    <Card title={t('stats.overTime')} sub={t('stats.overTimeSub')} className="lg:col-span-2" accent="var(--chart-1)">
+      <div className="mb-2 flex flex-wrap gap-1">
+        {ACT_GRAN.map((o) => (
+          <button key={o.key} type="button" onClick={() => setG(o.key)}
+            className={cn('px-2 py-0.5 rounded-md text-[11px] border transition-colors',
+              g === o.key ? 'bg-primary text-primary-foreground border-primary' : 'border-border text-muted-foreground hover:bg-muted')}>
+            {t(o.tkey)}
+          </button>
+        ))}
+      </div>
+      {g === 'timeline'
+        ? <AreaTrend data={stats.by_month} empty={empty} />
+        : <VBars data={series} empty={empty} showValues height={160} />}
+    </Card>
+  );
+}
+
+// ── Table view (the WCAG-clean twin) ─────────────────────────────────────────
+
+function BucketTable({ title, data }: { title: string; data: Bucket[] }) {
+  const total = data.reduce((s, d) => s + d.count, 0);
+  return (
+    <div className="rounded-lg border border-border bg-card overflow-hidden">
+      <p className="px-3 py-1.5 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground border-b border-border bg-muted/30">{title}</p>
+      <table className="w-full text-[11px]">
+        <tbody>
+          {data.map((d) => (
+            <tr key={d.key} className="border-b border-border/50 last:border-0">
+              <td className="px-3 py-1 truncate">{d.key}</td>
+              <td className="px-3 py-1 text-right tabular-nums font-medium">{nf(d.count)}</td>
+              <td className="px-3 py-1 text-right tabular-nums text-muted-foreground w-14">
+                {total ? ((d.count / total) * 100).toFixed(1) + '%' : '—'}
+              </td>
+            </tr>
+          ))}
+          {data.length === 0 && <tr><td className="px-3 py-2 text-muted-foreground italic">—</td></tr>}
+        </tbody>
+      </table>
+    </div>
+  );
+}
+
+// ── Panel ────────────────────────────────────────────────────────────────────
+
+export function StatsPanel() {
+  const { t } = useI18n();
+  const [stats, setStats] = useState<Stats | null>(null);
+  const [busy, setBusy] = useState(false);
+  const [err, setErr] = useState('');
+  const [view, setView] = useState<'charts' | 'table'>('charts');
+  const [period, setPeriod] = useState<Period>('all');
+  const [from, setFrom] = useState('');
+  const [to, setTo] = useState('');
+  // Contest picker: "ID|YEAR", or '' for none. Selecting one narrows the log to
+  // that contest AND lets the window derive from its own span — no date typing.
+  const [runs, setRuns] = useState<ContestRun[]>([]);
+  const [contest, setContest] = useState('');
+  // Operator picker: '' = all operators, "—" = station owner (empty OPERATOR).
+  const [operators, setOperators] = useState<string[]>([]);
+  const [operator, setOperator] = useState('');
+
+  useEffect(() => { GetContestRuns().then((r: any) => setRuns((r ?? []) as ContestRun[])).catch(() => {}); }, []);
+  useEffect(() => { GetOperators().then((o: any) => setOperators((o ?? []) as string[])).catch(() => {}); }, []);
+
+  const load = async (p: Period = period, f = from, t2 = to, c = contest, op = operator) => {
+    // A contest defines its own window (its first→last QSO), so we send no dates
+    // with it — the backend derives them. Sending a period as well would be two
+    // filters fighting over the same axis.
+    const [cid, cyr] = c ? c.split('|') : ['', '0'];
+    const [a, b] = c ? ['', ''] : periodRange(p, f, t2);
+    setBusy(true); setErr('');
+    try {
+      const raw = (await GetLogStats(a, b, cid, parseInt(cyr, 10) || 0, op)) as any;
+      // Harden the boundary: a Go nil slice arrives as JSON null, and a single
+      // .length on null unmounts the whole React tree — a white screen. Normalise
+      // once, here, rather than guarding at every use site and missing one.
+      const arr = (v: any) => (Array.isArray(v) ? v : []);
+      setStats({
+        ...raw,
+        by_mode: arr(raw.by_mode), by_band: arr(raw.by_band), by_band_category: arr(raw.by_band_category), by_operator: arr(raw.by_operator),
+        by_station: arr(raw.by_station), by_continent: arr(raw.by_continent),
+        top_entities: arr(raw.top_entities), by_year: arr(raw.by_year), by_month: arr(raw.by_month),
+        by_hour: arr(raw.by_hour), by_day7: arr(raw.by_day7), by_day30: arr(raw.by_day30), by_month12: arr(raw.by_month12),
+        rate: arr(raw.rate), gaps: arr(raw.gaps),
+        rate_ops: arr(raw.rate_ops), rate_by_op: arr(raw.rate_by_op),
+      } as Stats);
+    }
+    catch (e: any) { setErr(String(e?.message ?? e)); }
+    finally { setBusy(false); }
+  };
+  // Re-run whenever the filter changes. A custom range only fires once BOTH ends
+  // are set — otherwise every keystroke in the date box would re-scan the log.
+  useEffect(() => {
+    if (!contest && period === 'custom' && !(from && to)) return;
+    load(period, from, to, contest, operator);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [period, from, to, contest, operator]);
+
+  // The rate / off-air block belongs to a CONTEST-shaped effort, and nowhere else.
+  // Over a year it degenerates into nonsense — "4 156 h off air", a 94-hour "break"
+  // between two ordinary evenings — numbers that are true and completely useless.
+  // So: show it for a picked contest, or for a hand-set range short enough to be a
+  // real operating session (which is exactly when an hourly rate chart exists).
+  const windowed = contest !== '' || (period === 'custom' && (stats?.rate?.length ?? 0) > 1);
+
+  const span = useMemo(() => {
+    if (!stats?.first_qso) return '';
+    const f = new Date(stats.first_qso), l = new Date(stats.last_qso);
+    return `${f.toISOString().slice(0, 10)} → ${l.toISOString().slice(0, 10)}`;
+  }, [stats]);
+
+  if (busy && !stats) {
+    return <div className="flex-1 flex items-center justify-center text-muted-foreground gap-2">
+      <Loader2 className="size-4 animate-spin" /> <span className="text-xs">{t('stats.loading')}</span>
+    </div>;
+  }
+  if (err) return <div className="p-4 text-xs text-destructive">{err}</div>;
+  if (!stats) return null;
+
+  const empty = t('stats.noData');
+
+  return (
+    <div className="flex-1 min-h-0 overflow-auto p-3">
+      {/* ONE filter/action row above everything it scopes — never per-card controls. */}
+      <div className="flex items-center flex-wrap gap-2 mb-3">
+        <h2 className="text-sm font-semibold">{t('stats.title')}</h2>
+        {span && <span className="text-[11px] text-muted-foreground tabular-nums">{span}</span>}
+
+        {/* A contest is picked from what's actually IN the log (CONTEST_ID + year),
+            never from a static list — so it can't offer a contest you never entered.
+            Choosing one supersedes the period: it brings its own window. */}
+        <select value={contest} onChange={(e) => setContest(e.target.value)}
+          className="h-7 rounded-md border border-input bg-background px-1.5 text-xs max-w-[240px]">
+          <option value="">{t('stats.noContest')}</option>
+          {runs.map((r) => (
+            <option key={`${r.id}|${r.year}`} value={`${r.id}|${r.year}`}>
+              {r.id} {r.year} — {nf(r.count)} QSO
+            </option>
+          ))}
+        </select>
+
+        {/* Operator picker — narrows every stat (totals, DXCC, top countries,
+            continent split, rate) to one operator from the log. "—" = the
+            station owner (QSOs logged with no OPERATOR set). */}
+        {operators.length > 1 && (
+          <select value={operator} onChange={(e) => setOperator(e.target.value)}
+            className="h-7 rounded-md border border-input bg-background px-1.5 text-xs max-w-[180px]"
+            title={t('stats.operatorTip')}>
+            <option value="">{t('stats.allOperators')}</option>
+            {operators.map((op) => (
+              <option key={op} value={op}>{op === '—' ? t('stats.stationOwner') : op}</option>
+            ))}
+          </select>
+        )}
+
+        <div className={cn('inline-flex rounded-md border border-border overflow-hidden', contest && 'opacity-40 pointer-events-none')}>
+          {([
+            ['all', t('stats.pAll')], ['ytd', t('stats.pYTD')],
+            ['y12', t('stats.p12m')], ['d30', t('stats.p30d')], ['custom', t('stats.pCustom')],
+          ] as [Period, string][]).map(([p, label], i) => (
+            <button key={p} onClick={() => setPeriod(p)}
+              className={cn('px-2 h-7 text-xs whitespace-nowrap', i > 0 && 'border-l border-border',
+                period === p ? 'bg-primary text-primary-foreground' : 'hover:bg-muted')}>
+              {label}
+            </button>
+          ))}
+        </div>
+        {!contest && period === 'custom' && (
+          <div className="inline-flex items-center gap-1">
+            <input type="date" value={from} onChange={(e) => setFrom(e.target.value)}
+              className="h-7 rounded-md border border-input bg-background px-1.5 text-xs" />
+            <span className="text-xs text-muted-foreground">→</span>
+            <input type="date" value={to} onChange={(e) => setTo(e.target.value)}
+              className="h-7 rounded-md border border-input bg-background px-1.5 text-xs" />
+          </div>
+        )}
+
+        <div className="flex-1" />
+        <div className="inline-flex rounded-md border border-border overflow-hidden">
+          <button onClick={() => setView('charts')}
+            className={cn('inline-flex items-center gap-1 px-2 h-7 text-xs', view === 'charts' ? 'bg-primary text-primary-foreground' : 'hover:bg-muted')}>
+            <BarChart3 className="size-3.5" />{t('stats.charts')}
+          </button>
+          <button onClick={() => setView('table')}
+            className={cn('inline-flex items-center gap-1 px-2 h-7 text-xs border-l border-border', view === 'table' ? 'bg-primary text-primary-foreground' : 'hover:bg-muted')}>
+            <Table2 className="size-3.5" />{t('stats.table')}
+          </button>
+        </div>
+        <button onClick={() => load()} disabled={busy} title={t('stats.refresh')}
+          className="inline-flex items-center justify-center size-7 rounded-md border border-border hover:bg-muted disabled:opacity-50">
+          <RefreshCw className={cn('size-3.5', busy && 'animate-spin')} />
+        </button>
+      </div>
+
+      {/* Headline figures: stat tiles, not a grouped bar chart. */}
+      <div className="grid grid-cols-2 md:grid-cols-5 gap-2.5 mb-3">
+        <StatTile label={t('stats.qsos')} value={nf(stats.total)} sub={span} accent="var(--chart-1)" />
+        <StatTile label={t('stats.uniqueCalls')} value={nf(stats.unique_calls)} accent="var(--chart-2)" />
+        <StatTile label={t('stats.entities')} value={nf(stats.entities)} sub="DXCC" accent="var(--chart-5)" />
+        <StatTile label={t('stats.continents')} value={nf(stats.continents)} sub="/ 7" accent="var(--chart-8)" />
+        <StatTile label={t('stats.confirmed')} value={`${stats.total ? ((stats.confirmed_any / stats.total) * 100).toFixed(0) : 0}%`}
+          sub={`${nf(stats.confirmed_any)} / ${nf(stats.total)}`} accent="var(--success)" />
+      </div>
+
+      {/* Period / contest block — ONLY when a window is selected. "12 QSO/h" across
+          seventeen years is noise; across a contest weekend it IS the result. */}
+      {windowed && stats.total > 0 && (
+        <div className="grid grid-cols-1 lg:grid-cols-3 gap-2.5 mb-3">
+          <Card title={t('stats.rate')} sub={t('stats.rateSub')} className="lg:col-span-2">
+            <div className="grid grid-cols-2 md:grid-cols-4 gap-3 mb-3">
+              {/* Two rates on purpose: one honest, one flattering — see the tooltip. */}
+              <div title={t('stats.avgWindowTip')}>
+                <p className="text-[10px] uppercase tracking-wider text-muted-foreground truncate">{t('stats.avgWindow')}</p>
+                <p className="text-[22px] leading-none font-semibold mt-1">{stats.avg_per_hour.toFixed(1)}<span className="text-[11px] text-muted-foreground font-normal"> /h</span></p>
+              </div>
+              <div title={t('stats.avgActiveTip')}>
+                <p className="text-[10px] uppercase tracking-wider text-muted-foreground truncate">{t('stats.avgActive')}</p>
+                <p className="text-[22px] leading-none font-semibold mt-1">{stats.avg_per_active.toFixed(1)}<span className="text-[11px] text-muted-foreground font-normal"> /h</span></p>
+              </div>
+              <div title={t('stats.best60Tip')}>
+                <p className="text-[10px] uppercase tracking-wider text-muted-foreground truncate">{t('stats.best60')}</p>
+                <p className="text-[22px] leading-none font-semibold mt-1">{nf(stats.best_60)}</p>
+              </div>
+              {/* On-air + off-air = the window, by construction. The first version
+                  counted "clock hours containing a QSO", which gave 39 h on air AND
+                  16 h off air inside a 45 h contest — and rightly wasn't believed. */}
+              <div title={t('stats.onAirTip')}>
+                <p className="text-[10px] uppercase tracking-wider text-muted-foreground truncate">{t('stats.activeHours')}</p>
+                <p className="text-[22px] leading-none font-semibold mt-1">
+                  {dur(stats.on_air_minutes)}
+                  <span className="text-[11px] text-muted-foreground font-normal"> / {Math.round(stats.window_hours)} h</span>
+                </p>
+              </div>
+            </div>
+            {stats.rate.length > 1
+              ? <RateStack rate={stats.rate} ops={stats.rate_ops} byOp={stats.rate_by_op} empty={empty} />
+              : <p className="text-[11px] text-muted-foreground italic py-3 text-center">{t('stats.rateTooLong')}</p>}
+          </Card>
+
+          <Card title={t('stats.offAir')} sub={t('stats.offAirSub', { d: dur(stats.off_air_minutes) })}>
+            {stats.gaps.length === 0 ? (
+              <p className="text-[11px] text-muted-foreground italic py-3 text-center">{t('stats.noGaps')}</p>
+            ) : (
+              <ul className="flex flex-col gap-1 min-w-0">
+                {stats.gaps.map((g, i) => (
+                  <li key={i} className="flex items-center gap-2 text-[11px] min-w-0">
+                    <span className="tabular-nums text-muted-foreground truncate">
+                      {g.start.slice(5, 16).replace('T', ' ')} → {g.end.slice(11, 16)}
+                    </span>
+                    <span className="flex-1 h-[6px] rounded-full min-w-0"
+                      style={{
+                        background: 'var(--chart-seq-1)',
+                      }}>
+                      <span className="block h-full rounded-full"
+                        style={{
+                          width: `${Math.min(100, (g.minutes / Math.max(1, stats.gaps[0].minutes)) * 100)}%`,
+                          background: 'var(--chart-1)',
+                        }} />
+                    </span>
+                    <span className="shrink-0 tabular-nums font-medium">{dur(g.minutes)}</span>
+                  </li>
+                ))}
+              </ul>
+            )}
+          </Card>
+
+          {/* The rate sheet: exact numbers, many of them, hour by hour and operator
+              by operator. That is a table's job, not a chart's — and it's how
+              contesters actually read a run. Every value here is also what the
+              stacked chart above draws, so the two can never disagree. */}
+          {stats.rate.length > 1 && (
+            <Card title={t('stats.rateSheet')} sub={t('stats.rateSheetSub')} className="lg:col-span-3">
+              <RateSheet rate={stats.rate} ops={stats.rate_ops} byOp={stats.rate_by_op} />
+            </Card>
+          )}
+        </div>
+      )}
+
+      {view === 'table' ? (
+        <div className="grid grid-cols-1 lg:grid-cols-3 gap-2.5">
+          <BucketTable title={t('stats.byBand')} data={stats.by_band} />
+          <BucketTable title={t('stats.byMode')} data={stats.by_mode} />
+          <BucketTable title={t('stats.byOperator')} data={stats.by_operator} />
+          <BucketTable title={t('stats.byContinent')} data={stats.by_continent} />
+          <BucketTable title={t('stats.topEntities')} data={stats.top_entities} />
+          <BucketTable title={t('stats.byYear')} data={stats.by_year} />
+          <BucketTable title={t('stats.byStation')} data={stats.by_station} />
+        </div>
+      ) : (
+        <div className="grid grid-cols-1 lg:grid-cols-2 gap-2.5">
+          <Card title={t('stats.bandSplit')} sub={t('stats.bandSplitSub')} accent="var(--chart-3)">
+            <StackedBandBars data={stats.by_band_category} empty={empty} />
+          </Card>
+          <Card title={t('stats.byMode')} accent="var(--chart-2)">
+            <HBars data={stats.by_mode} max={8} empty={empty} colorful />
+          </Card>
+
+          <ActivityCard stats={stats} t={t} empty={empty} />
+
+          {/* EVERY operator, never a top-N: on a multi-op contest the point is who
+              worked what, and a cap would quietly delete the 9th operator. Scrolls
+              instead of truncating. */}
+          <Card title={t('stats.byOperator')} accent="var(--chart-5)">
+            <div className="max-h-[240px] overflow-auto pr-1 min-w-0">
+              <HBars data={stats.by_operator} empty={empty} share color="var(--chart-5)" />
+            </div>
+          </Card>
+          <Card title={t('stats.byContinent')} sub={t('stats.byContinentSub')} accent="var(--chart-6)">
+            <Donut data={stats.by_continent} empty={empty} />
+          </Card>
+
+          <Card title={t('stats.topEntities')} accent="var(--chart-4)">
+            <HBars data={stats.top_entities} max={12} empty={empty} labelWidth="w-40" color="var(--chart-4)" />
+          </Card>
+          <div className="flex flex-col gap-2.5 min-w-0">
+            <Card title={t('stats.confirmations')} className="flex-1" accent="var(--success)">
+              <div className="flex flex-col gap-3 justify-center flex-1">
+                <Meter label="LoTW" value={stats.confirmed_lotw} total={stats.total} />
+                <Meter label="eQSL" value={stats.confirmed_eqsl} total={stats.total} />
+                <Meter label={t('stats.paperQSL')} value={stats.confirmed_qsl} total={stats.total} />
+              </div>
+            </Card>
+            <Card title={t('stats.byStation')} accent="var(--chart-8)">
+              <div className="max-h-[140px] overflow-auto pr-1 min-w-0">
+                <HBars data={stats.by_station} empty={empty} share color="var(--chart-8)" />
+              </div>
+            </Card>
+          </div>
+
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/UDPIntegrationsPanel.tsx

@@ -321,7 +321,6 @@ function EditDialog({
             <Label>{t('udpp.name')}</Label>
             <Input
               autoFocus
-              placeholder={draft.direction === 'inbound' ? t('udpp.namePhInbound') : t('udpp.namePhOutbound')}
               value={draft.name}
               onChange={(e) => setDraft((d) => ({ ...d, name: e.target.value }))}
             />

frontend/src/components/WinkeyerPanel.tsx

@@ -26,7 +26,7 @@ interface Props {
   wpm: number;
   macros: WKMacro[];
   sent: string; // text echoed back by the keyer as it transmits
-  source: 'winkeyer' | 'icom';               // CW output engine (chosen in Settings → CW Keyer)
+  source: 'winkeyer' | 'icom' | 'flex';      // CW output engine (chosen in Settings → CW Keyer)
   breakIn?: number;                          // Icom CW break-in: 0=OFF, 1=SEMI, 2=FULL
   onSetBreakIn?: (mode: number) => void;
   onSelectPort: (p: string) => void;
@@ -101,14 +101,16 @@ export function WinkeyerPanel({
         <Radio className="size-4 text-primary shrink-0" />
         {/* CW output engine (chosen in Settings → CW Keyer). */}
         <span className="text-xs font-semibold uppercase tracking-wider text-muted-foreground shrink-0">
-          {source === 'icom' ? 'Icom CW' : 'WinKeyer'}
+          {source === 'icom' ? 'Icom CW' : source === 'flex' ? 'Flex CWX' : 'WinKeyer'}
         </span>
         <span className={cn('size-2 rounded-full', connected ? (status.busy ? 'bg-warning animate-pulse' : 'bg-success') : 'bg-muted-foreground/40')}
           title={connected ? (status.busy ? t('wkp.sending') : t('wkp.connectedV', { version: status.version })) : t('wkp.disconnected')} />
         <div className="flex-1" />
-        {source === 'icom' ? (
+        {source === 'icom' || source === 'flex' ? (
           <span className="text-[11px] font-medium text-muted-foreground">
-            {connected ? t('wkp.civReady') : t('wkp.civOffline')}
+            {source === 'flex'
+              ? (connected ? t('wkp.cwxReady') : t('wkp.cwxOffline'))
+              : (connected ? t('wkp.civReady') : t('wkp.civOffline'))}
           </span>
         ) : !connected ? (
           <>
@@ -183,7 +185,7 @@ export function WinkeyerPanel({
           <div className="flex flex-col flex-1 min-w-0">
             <Label className="mb-1 h-3.5 text-xs flex items-center gap-2">
               {t('wkp.cwText')}
-              {source === 'winkeyer' && (
+              {(source === 'winkeyer' || source === 'flex') && (
                 <label className="flex items-center gap-1 text-[10px] font-normal cursor-pointer text-muted-foreground"
                   title={t('wkp.sendOnTypeHint')}>
                   <input type="checkbox" className="accent-primary" checked={sendOnType}

frontend/src/components/qsl/CardPreview.tsx

@@ -292,6 +292,7 @@ const QSO_FIELD_WEIGHT: Record<string, number> = {
 
 // QSOBoxView renders the confirmation box with per-QSO values.
 function QSOBoxView({ box, values }: { box: QSOBox; values: Record<string, string> }) {
+  const fg = box.fg || '#14243a'; // text colour (field labels use it at 0.6 opacity)
   const avail = box.w - 56;
   const total = box.fields.reduce((s, f) => s + (QSO_FIELD_WEIGHT[f] ?? 1), 0) || 1;
   let cursor = 28;
@@ -304,24 +305,24 @@ function QSOBoxView({ box, values }: { box: QSOBox; values: Record<string, strin
   return (
     <>
       <rect width={box.w} height={box.h} rx={box.radius} fill={box.bg} opacity={box.bg_opacity} />
-      <text x={28} y={22} fontSize={34} fontWeight={700} fill="#1b2a3d"
+      <text x={28} y={22} fontSize={34} fontWeight={700} fill={fg}
         fontFamily="'Segoe UI', Arial, sans-serif" dominantBaseline="text-before-edge">
         {box.title}
       </text>
       {cols.map(({ f, x }) => (
         <g key={f} transform={`translate(${Math.round(x)} ${box.h * 0.42})`}>
-          <text fontSize={19} fill="#6b7a8c" letterSpacing={1.5}
+          <text fontSize={19} fill={fg} opacity={0.6} letterSpacing={1.5}
             fontFamily="'Segoe UI', Arial, sans-serif" dominantBaseline="text-before-edge">
             {(QSO_FIELD_LABELS[f] ?? f).toUpperCase()}
           </text>
-          <text y={26} fontSize={28} fontWeight={700} fill="#14243a"
+          <text y={26} fontSize={28} fontWeight={700} fill={fg}
             fontFamily="'Segoe UI', Arial, sans-serif" dominantBaseline="text-before-edge">
             {values[f] ?? ''}
           </text>
         </g>
       ))}
       {box.footer && (
-        <text x={28} y={box.h - 18} fontSize={24} fontStyle="italic" fill="#3c4d63"
+        <text x={28} y={box.h - 18} fontSize={24} fontStyle="italic" fill={fg} opacity={0.85}
           fontFamily="'Segoe UI', Arial, sans-serif">
           {box.footer}
         </text>

frontend/src/components/qsl/EditorPanel.tsx

@@ -170,6 +170,35 @@ export function EditorPanel({ template, sel, presets, fontFamilies, onPatchEleme
               onChange={(w) => onPatchBox({ w })} />
             <NumberField label="Height" value={box.h} min={120} max={500}
               onChange={(h) => onPatchBox({ h })} />
+            <NumberField label="Opacity %" value={Math.round((box.bg_opacity ?? 1) * 100)} min={0} max={100}
+              onChange={(v) => onPatchBox({ bg_opacity: Math.max(0, Math.min(100, v)) / 100 })} />
+            <div className="flex items-center justify-between gap-2">
+              <Label className="text-xs text-muted-foreground">Background</Label>
+              <div className="flex items-center gap-2">
+                <input type="color" className="h-7 w-9 cursor-pointer rounded border border-border bg-transparent p-0"
+                  value={/^#[0-9a-fA-F]{6}$/.test(box.bg ?? '') ? box.bg : '#000000'}
+                  onChange={(ev) => onPatchBox({ bg: ev.target.value })} />
+                <Input className="h-7 w-32 font-mono text-xs" value={box.bg ?? ''}
+                  onChange={(ev) => onPatchBox({ bg: ev.target.value })} />
+              </div>
+            </div>
+            <div className="flex items-center justify-between gap-2">
+              <Label className="text-xs text-muted-foreground">Text color</Label>
+              <div className="flex items-center gap-2">
+                <input type="color" className="h-7 w-9 cursor-pointer rounded border border-border bg-transparent p-0"
+                  value={/^#[0-9a-fA-F]{6}$/.test(box.fg ?? '') ? (box.fg as string) : '#14243a'}
+                  onChange={(ev) => onPatchBox({ fg: ev.target.value })} />
+                <Input className="h-7 w-32 font-mono text-xs" value={box.fg ?? ''} placeholder="#14243a"
+                  onChange={(ev) => onPatchBox({ fg: ev.target.value })} />
+              </div>
+            </div>
+            <NumberField label="Corner radius" value={box.radius ?? 0} min={0} max={80}
+              onChange={(radius) => onPatchBox({ radius })} />
+            <div className="flex items-center justify-between gap-2">
+              <Label className="text-xs text-muted-foreground">Title</Label>
+              <Input className="h-7 w-44 font-mono text-xs" value={box.title ?? ''}
+                onChange={(ev) => onPatchBox({ title: ev.target.value })} />
+            </div>
             <div className="flex items-center justify-between gap-2">
               <Label className="text-xs text-muted-foreground">Footer</Label>
               <Input className="h-7 w-44 font-mono text-xs" value={box.footer}

frontend/src/components/qsl/qslTypes.ts

@@ -118,6 +118,7 @@ export interface QSOBox {
   h: number;
   bg: string;
   bg_opacity: number;
+  fg?: string; // text colour (default dark); set it when using a dark background
   radius: number;
   title: string;
   fields: string[];

frontend/src/components/ui/combobox.tsx

@@ -64,7 +64,17 @@ export function Combobox({
         // Focus selects the text so a keystroke replaces it — but does NOT
         // open the list (so tabbing in doesn't pop the dropdown).
         onFocus={(e) => { setQuery(value); e.currentTarget.select(); }}
-        onChange={(e) => { setQuery(e.target.value); setOpen(true); if (commitOnType) onChange(e.target.value); }}
+        onChange={(e) => {
+          const v = e.target.value;
+          setQuery(v);
+          setOpen(true);
+          // Commit-on-type pushes the value live to the parent (so a CW macro sent
+          // without leaving the field uses what was just typed). With free text that's
+          // any input; a restricted field (allowFreeText=false) commits ONLY a value
+          // that's actually in the list, so a half-typed or invalid report never
+          // becomes the committed value — blur then reverts the leftover text.
+          if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
+        }}
         onBlur={onBlur}
         onKeyDown={(e) => {
           if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); }

frontend/src/lib/awardRefs.ts

@@ -33,6 +33,19 @@ function appendTokens(existing: string | undefined, refs: string): string {
   return out;
 }
 
+// removeTokens strips space/word-delimited tokens (a "A,B" ref string) from a
+// text field — the inverse of appendTokens. Used when a picked reference is
+// REMOVED so an in-field award (DDFM finds "D72" in the note) stops matching it;
+// otherwise the ref is re-derived from the field and reappears on reopen.
+function removeTokens(existing: string | undefined, refs: string): string {
+  let out = existing ?? '';
+  for (const tok of refs.split(',').map((s) => s.trim()).filter(Boolean)) {
+    const re = new RegExp(`\\b${tok.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`, 'ig');
+    out = out.replace(re, ' ');
+  }
+  return out.replace(/\s{2,}/g, ' ').trim();
+}
+
 // MANUAL_REFS_KEY mirrors award.ManualRefsKey (Go): the ADIF extras key holding
 // the operator's per-QSO award-reference assignments as "CODE@REF;CODE@REF".
 // The award engine honours these regardless of how the award matches, so a
@@ -47,8 +60,24 @@ const MANUAL_REFS_KEY = 'APP_OPSLOG_AWARDREFS';
 // data lives in its conventional place and exports correctly. Awards that match
 // a free-text field by description/pattern (address/qth/name/custom) rely solely
 // on the override — we don't pollute the text field with a code.
-export function applyAwardRefs(payload: any, awardRefs: string, fieldOf: Record<string, string>) {
+export function applyAwardRefs(payload: any, awardRefs: string, fieldOf: Record<string, string>, prevAwardRefs?: string) {
   const byCode = parseAwardRefs(awardRefs);
+  // References the operator REMOVED since the editor opened: for in-field awards
+  // (note/comment) strip the token from the field too, so a deleted DDFM/etc.
+  // ref doesn't get re-derived from the leftover token and reappear on reopen.
+  if (prevAwardRefs != null) {
+    const prev = parseAwardRefs(prevAwardRefs);
+    for (const [code, prevRef] of Object.entries(prev)) {
+      const field = fieldOf[code] || code.toLowerCase();
+      if (field !== 'note' && field !== 'notes' && field !== 'comment') continue;
+      const now = new Set((byCode[code] ?? '').split(',').map((s) => s.trim().toUpperCase()).filter(Boolean));
+      const removed = prevRef.split(',').map((s) => s.trim()).filter(Boolean).filter((r) => !now.has(r.toUpperCase()));
+      if (removed.length === 0) continue;
+      const rm = removed.join(',');
+      if (field === 'comment') payload.comment = removeTokens(payload.comment, rm);
+      else payload.notes = removeTokens(payload.notes, rm);
+    }
+  }
   const extras: Record<string, string> = { ...(payload.extras ?? {}) };
   const overrides: string[] = [];
   for (const [code, ref] of Object.entries(byCode)) {

frontend/src/lib/gridPrefs.ts

@@ -6,11 +6,32 @@
 // back to the DB copy and re-seed the cache.
 import { GetUIPref, SetUIPref } from '../../wailsjs/go/main/App';
 
+// The DB copy is ALREADY per-profile (the backend prefixes every ui.* key with
+// the active profile id). The localStorage cache, however, is one namespace for
+// the whole WebView, so without scoping it too a profile switch would keep
+// serving the previous profile's cached layout and the correct per-profile DB
+// value would never win. lsScope makes the cache per-profile as well; it's set
+// once the active profile is known and updated on every profile switch.
+let lsScope = '';
+
+// setGridPrefsProfile scopes the localStorage cache to a profile. Call it before
+// the grids read their state (at startup) and again whenever the active profile
+// changes so each profile keeps its own column layout / widths.
+export function setGridPrefsProfile(id: number | string | null | undefined): void {
+  lsScope = id == null || id === '' ? '' : `p${id}.`;
+}
+
+// lsKey scopes ONLY the localStorage cache key. The DB key passed to
+// GetUIPref/SetUIPref is left untouched — the backend already scopes it.
+function lsKey(key: string): string {
+  return lsScope + key;
+}
+
 // loadLocal reads the cached column state synchronously (used in onGridReady
 // to apply instantly, before the async DB round-trip).
 export function loadLocal(key: string): any[] | null {
   try {
-    const raw = localStorage.getItem(key);
+    const raw = localStorage.getItem(lsKey(key));
     const v = raw ? JSON.parse(raw) : null;
     return Array.isArray(v) ? v : null;
   } catch {
@@ -29,15 +50,16 @@ export async function loadRemote(key: string): Promise<any[] | null> {
   }
 }
 
-// saveState write-throughs to both the cache and the DB (fire-and-forget).
+// saveState write-throughs to both the cache and the DB (fire-and-forget). Only
+// the cache key is profile-scoped; the DB key is scoped by the backend.
 export function saveState(key: string, state: any[]) {
   const json = JSON.stringify(state);
-  try { localStorage.setItem(key, json); } catch { /* quota / private mode */ }
+  try { localStorage.setItem(lsKey(key), json); } catch { /* quota / private mode */ }
   SetUIPref(key, json).catch(() => { /* DB unavailable — cache still holds it */ });
 }
 
 // seedLocal writes a value into the cache without touching the DB (used after
 // hydrating the cache from the DB on a fresh machine).
 export function seedLocal(key: string, state: any[]) {
-  try { localStorage.setItem(key, JSON.stringify(state)); } catch { /* ignore */ }
+  try { localStorage.setItem(lsKey(key), JSON.stringify(state)); } catch { /* ignore */ }
 }

frontend/src/lib/rst.ts

@@ -14,3 +14,25 @@ export function sMeterRST(s: number, overDb: number, mode?: string): string {
   if (overDb > 0) return `59+${Math.ceil(overDb / 5) * 5}`;
   return `5${strength}`;
 }
+
+// RST dropdown lists, shared by the entry form and the QSO editor so both offer
+// the same per-mode choices (Settings → Modes → RST report lists).
+export type RSTLists = { phone: string[]; cw: string[]; digital: string[] };
+
+// rstCategory maps an ADIF mode to its RST family (phone / cw / digital).
+export function rstCategory(mode: string): keyof RSTLists {
+  const m = (mode || '').toUpperCase();
+  const digital = ['FT8', 'FT4', 'JT65', 'JT9', 'JS8', 'Q65', 'MSK144', 'FST4', 'FST4W', 'MFSK', 'OLIVIA', 'JT4', 'WSPR'];
+  if (digital.includes(m)) return 'digital';
+  if (['CW', 'RTTY', 'PSK31', 'PSK63', 'PSK', 'PSK125'].includes(m)) return 'cw';
+  return 'phone';
+}
+
+// rstOptions returns the valid report choices for a mode from the user's
+// editable lists, with a tiny fallback before they load.
+export function rstOptions(mode: string, lists: RSTLists): string[] {
+  const cat = rstCategory(mode);
+  const l = lists[cat];
+  if (l && l.length) return l;
+  return cat === 'phone' ? ['59', '58', '57'] : cat === 'cw' ? ['599', '589', '579'] : ['+00', '-10', '-20'];
+}

frontend/src/lib/theme.tsx

@@ -1,15 +1,16 @@
-import { createContext, useContext, useState, useEffect, useCallback, type ReactNode } from 'react';
+import { createContext, useContext, useState, useEffect, useCallback, useRef, type ReactNode } from 'react';
 import { writeUiPref } from './uiPref';
+import { GetUIPref } from '../../wailsjs/go/main/App';
 
 // Theme system. Each choice maps to a `data-theme` value on <html> that the
 // CSS variables in style.css key off of. 'auto' follows the OS light/dark
 // preference. The choice is persisted (localStorage + portable UI pref, so it
 // travels with the data/ folder like the language).
-export type ThemeChoice = 'auto' | 'light-warm' | 'dark-warm' | 'dark-graphite' | 'high-contrast';
+export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'high-contrast';
 
 // Selectable, concrete themes (excludes 'auto') in display order.
 export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
-  'light-warm', 'dark-warm', 'dark-graphite', 'high-contrast',
+  'light-warm', 'light-cool', 'light-sage', 'dim-slate', 'dark-warm', 'dark-graphite', 'high-contrast',
 ];
 
 export const LS_KEY = 'opslog.theme';
@@ -49,13 +50,44 @@ export function useTheme(): Ctx { return useContext(ThemeCtx); }
 
 export function ThemeProvider({ children }: { children: ReactNode }) {
   const [theme, setThemeState] = useState<ThemeChoice>(() => readStored());
+  // Set once the operator changes the theme by hand, so the self-heal below
+  // never clobbers a fresh choice with a value it read a moment earlier.
+  const userPicked = useRef(false);
 
   const setTheme = useCallback((t: ThemeChoice) => {
+    userPicked.current = true;
     setThemeState(t);
     applyThemeToDom(t);
     writeUiPref(LS_KEY, t);
   }, []);
 
+  // Self-heal the persisted theme. The synchronous boot read (localStorage) can
+  // miss it when the WebView cleared its storage, OR when syncPortablePrefs ran
+  // while the backend was still starting (settings store not wired yet → GetUIPref
+  // returned "" with no error, so nothing was restored) — the "restart lands on
+  // the light theme sometimes" bug. Re-read the portable pref from the DB once the
+  // backend is up and apply it, retrying briefly to ride out a slow startup.
+  useEffect(() => {
+    let cancelled = false;
+    let tries = 0;
+    const load = () => {
+      tries += 1;
+      GetUIPref(LS_KEY).then((raw) => {
+        if (cancelled || userPicked.current) return;
+        const v = raw as ThemeChoice;
+        if (v && ALL.includes(v)) {
+          try { localStorage.setItem(LS_KEY, v); } catch { /* quota */ }
+          applyThemeToDom(v); // idempotent — safe to call unconditionally
+          setThemeState(v);
+          return; // restored
+        }
+        if (tries < 8) window.setTimeout(load, 300); // empty (unset or backend not ready yet) → retry
+      }).catch(() => { if (!cancelled && tries < 8) window.setTimeout(load, 300); });
+    };
+    load();
+    return () => { cancelled = true; };
+  }, []);
+
   // While in 'auto', re-resolve when the OS light/dark preference flips.
   useEffect(() => {
     if (theme !== 'auto') return;

frontend/src/lib/uiPref.ts

@@ -19,13 +19,24 @@ const PORTABLE_KEYS = [
   'opslog.showRotor',     // rotor compass shown next to the keyers
   'opslog.showBeamOnMap', // antenna beam lobe drawn on the Main map
   'opslog.startEqualsEnd',// log TIME_ON = TIME_OFF (QSO time = completion time)
+  'opslog.showQsoRate',   // QSO-rate meter (10/60 min) shown in the header
   'opslog.catModeBeforeFreq', // send CAT mode before frequency (older rigs)
   'opslog.bandMapBands',  // bands shown side-by-side in the Band Map tab
   'opslog.mapAutoZoomDX', // Main map: auto-zoom to the DX (vs free pan/zoom)
   'opslog.mapView',       // Main map: remembered free-pan view (lat/lon/zoom)
   'opslog.lookupOnBlur',  // run the callsign lookup on blur instead of while typing
+  'opslog.groupDigitalSlots', // matrix + cluster: all digital modes count as ONE (DXCC-style) instead of per-mode slots
   'opslog.clusterShowFilters', // cluster filter sidebar shown (tab + Main pane)
   'opslog.mapBasemap',    // world map basemap (light / street / satellite)
+  // Cluster filter selections — restored on reopen.
+  'opslog.clusterFilterSource', 'opslog.clusterGroup', 'opslog.clusterBands',
+  'opslog.clusterLockBand', 'opslog.clusterLockMode', 'opslog.clusterStatusFilter',
+  'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
+  'opslog.activeTab',     // last selected tab
+  // NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
+  // They are handled by lib/gridPrefs, which scopes the localStorage cache PER
+  // PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
+  // through this global path would fight that per-profile scoping.
 ];
 
 // syncPortablePrefs reconciles the DB with the local cache at startup:

frontend/src/style.css

@@ -92,6 +92,207 @@
   color-scheme: light;
 }
 
+/* ---- Theme 1b: Cool light (slate/blue) — crisp daylight, neutral cool --- */
+[data-theme="light-cool"] {
+  --background: #f4f6f8;              /* cool blue-white */
+  --foreground: #0f172a;             /* slate-900 */
+  --card: #ffffff;
+  --card-foreground: #0f172a;
+  --popover: #ffffff;
+  --popover-foreground: #0f172a;
+  --primary: #2563eb;                /* blue-600 */
+  --primary-foreground: #ffffff;
+  --secondary: #e2e8f0;              /* slate-200 */
+  --secondary-foreground: #0f172a;
+  --muted: #e6ebf1;                  /* toolbars / table headers */
+  --muted-foreground: #475569;       /* slate-600 — readable on muted */
+  --accent: #dbeafe;                 /* blue-100 */
+  --accent-foreground: #1e3a8a;      /* blue-900 */
+  --destructive: #dc2626;
+  --destructive-foreground: #ffffff;
+  --destructive-muted: #fef2f2;
+  --destructive-muted-foreground: #b91c1c;
+  --border: #d3dae2;                 /* cool slate border */
+  --input: #d3dae2;
+  --ring: #3b82f6;                   /* blue-500 focus ring */
+
+  --success: #16a34a;
+  --success-foreground: #ffffff;
+  --success-muted: #dcfce7;
+  --success-muted-foreground: #166534;
+  --success-border: #86efac;
+
+  --warning: #d97706;
+  --warning-foreground: #ffffff;
+  --warning-muted: #fef3c7;
+  --warning-muted-foreground: #92400e;
+  --warning-border: #fcd34d;
+
+  --caution: #ca8a04;
+  --caution-foreground: #1c1917;
+  --caution-muted: #fef9c3;
+  --caution-muted-foreground: #854d0e;
+  --caution-border: #fde047;
+
+  --danger: #e11d48;
+  --danger-foreground: #ffffff;
+  --danger-muted: #ffe4e6;
+  --danger-muted-foreground: #9f1239;
+  --danger-border: #fda4af;
+
+  --info: #0284c7;
+  --info-foreground: #ffffff;
+  --info-muted: #e0f2fe;
+  --info-muted-foreground: #075985;
+  --info-border: #7dd3fc;
+
+  /* Band/mode matrix (BandSlotGrid) — emerald/indigo ramp, cool neutral base. */
+  --mx-call-conf: #15803d;
+  --mx-call-work: #6ee7b7;
+  --mx-dx-conf:   #3730a3;
+  --mx-dx-work:   #a5b4fc;
+  --mx-none:      #e2e8f0;
+
+  --scrollbar-thumb: #b6c2d1;
+  --scrollbar-thumb-hover: #8fa1b5;
+  --card-shadow: 0 1px 2px rgba(15, 23, 42, 0.06), 0 0 0 1px rgba(15, 23, 42, 0.02);
+  color-scheme: light;
+}
+
+/* ---- Theme 1c: Sage light (Nordic) — soft green-grey, low-fatigue ------- */
+[data-theme="light-sage"] {
+  --background: #eef1ec;             /* pale sage */
+  --foreground: #1a2420;            /* deep pine-ink */
+  --card: #f8faf6;                  /* lifted off-white with a green cast */
+  --card-foreground: #1a2420;
+  --popover: #f8faf6;
+  --popover-foreground: #1a2420;
+  --primary: #2f855a;               /* deep sage green */
+  --primary-foreground: #f0fdf4;
+  --secondary: #dde5db;
+  --secondary-foreground: #1a2420;
+  --muted: #dde5db;                 /* toolbars / table headers */
+  --muted-foreground: #445048;      /* muted pine — readable on muted */
+  --accent: #d7e8d5;                /* soft green */
+  --accent-foreground: #1e4634;     /* forest-900 */
+  --destructive: #b91c1c;
+  --destructive-foreground: #ffffff;
+  --destructive-muted: #fef2f2;
+  --destructive-muted-foreground: #b91c1c;
+  --border: #cdd8ce;                /* soft sage border */
+  --input: #cdd8ce;
+  --ring: #38a169;                  /* green focus ring */
+
+  --success: #16a34a;
+  --success-foreground: #ffffff;
+  --success-muted: #dcfce7;
+  --success-muted-foreground: #166534;
+  --success-border: #86efac;
+
+  --warning: #d97706;
+  --warning-foreground: #ffffff;
+  --warning-muted: #fef3c7;
+  --warning-muted-foreground: #92400e;
+  --warning-border: #fcd34d;
+
+  --caution: #ca8a04;
+  --caution-foreground: #1c1917;
+  --caution-muted: #fef9c3;
+  --caution-muted-foreground: #854d0e;
+  --caution-border: #fde047;
+
+  --danger: #e11d48;
+  --danger-foreground: #ffffff;
+  --danger-muted: #ffe4e6;
+  --danger-muted-foreground: #9f1239;
+  --danger-border: #fda4af;
+
+  --info: #0284c7;
+  --info-foreground: #ffffff;
+  --info-muted: #e0f2fe;
+  --info-muted-foreground: #075985;
+  --info-border: #7dd3fc;
+
+  /* Band/mode matrix (BandSlotGrid) — emerald/indigo ramp, sage neutral base. */
+  --mx-call-conf: #15803d;
+  --mx-call-work: #6ee7b7;
+  --mx-dx-conf:   #3730a3;
+  --mx-dx-work:   #a5b4fc;
+  --mx-none:      #dde5db;
+
+  --scrollbar-thumb: #b3c2b3;
+  --scrollbar-thumb-hover: #91a591;
+  --card-shadow: 0 1px 2px rgba(26, 36, 32, 0.06), 0 0 0 1px rgba(26, 36, 32, 0.02);
+  color-scheme: light;
+}
+
+/* ---- Theme 1d: Dim slate — mid-tone twilight, between light and dark ---- */
+[data-theme="dim-slate"] {
+  --background: #343b47;             /* medium slate — light text, not deep dark */
+  --foreground: #eceef2;
+  --card: #3d4552;                   /* lifted panel */
+  --card-foreground: #eceef2;
+  --popover: #3d4552;
+  --popover-foreground: #eceef2;
+  --primary: #fb923c;                /* orange-400 — brand warmth, pops on slate */
+  --primary-foreground: #241206;
+  --secondary: #454e5c;
+  --secondary-foreground: #eceef2;
+  --muted: #414a58;                  /* toolbars / table headers */
+  --muted-foreground: #b4bcc9;       /* readable on muted */
+  --accent: #495468;                 /* hover / selection tint */
+  --accent-foreground: #dce3ef;
+  --destructive: #ef4444;
+  --destructive-foreground: #1a0808;
+  --destructive-muted: #3f1f1f;
+  --destructive-muted-foreground: #fca5a5;
+  --border: #4e5867;
+  --input: #4e5867;
+  --ring: #fdba74;                   /* orange-300 focus ring */
+
+  --success: #34d399;
+  --success-foreground: #06231a;
+  --success-muted: #1c3d34;
+  --success-muted-foreground: #6ee7b7;
+  --success-border: #2a5f4c;
+
+  --warning: #fbbf24;
+  --warning-foreground: #241a06;
+  --warning-muted: #41371a;
+  --warning-muted-foreground: #fcd34d;
+  --warning-border: #5e4d22;
+
+  --caution: #facc15;
+  --caution-foreground: #242006;
+  --caution-muted: #403b1a;
+  --caution-muted-foreground: #fde047;
+  --caution-border: #5b5222;
+
+  --danger: #fb7185;
+  --danger-foreground: #260a11;
+  --danger-muted: #421f28;
+  --danger-muted-foreground: #fda4af;
+  --danger-border: #63303c;
+
+  --info: #38bdf8;
+  --info-foreground: #061f2b;
+  --info-muted: #16384a;
+  --info-muted-foreground: #7dd3fc;
+  --info-border: #1d5670;
+
+  /* Matrix: bright confirmed, medium worked, slate not-worked (sits on dim). */
+  --mx-call-conf: #22c55e;
+  --mx-call-work: #2f7d55;
+  --mx-dx-conf:   #6366f1;
+  --mx-dx-work:   #3f3f8a;
+  --mx-none:      #4a5262;
+
+  --scrollbar-thumb: #565f70;
+  --scrollbar-thumb-hover: #6b7588;
+  --card-shadow: 0 1px 2px rgba(0, 0, 0, 0.35), 0 0 0 1px rgba(236, 238, 242, 0.05);
+  color-scheme: dark;
+}
+
 /* ---- Theme 2: Warm dark (espresso) — same soul, night mode ------------- */
 [data-theme="dark-warm"] {
   --background: #221d18;
@@ -294,6 +495,63 @@
   color-scheme: dark;
 }
 
+/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
+   A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
+   it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
+   reorder, recycle, or generate a 9th hue — fold the tail into "Other" instead.
+   The dark column is the same eight hues re-stepped for a dark surface, NOT an
+   automatic inversion.
+
+   --chart-1 is the DEFAULT single-series hue: a chart with one series uses it for
+   every bar. Colour is for identity, never to re-encode a length the bar already
+   shows.
+
+   --chart-seq-* is a ONE-HUE ramp for magnitude (the hour×band heatmap). On light
+   themes it runs light→dark; on dark themes dark→light, so "near zero" always
+   recedes toward the surface instead of glowing. */
+:root,
+[data-theme="light-warm"],
+[data-theme="light-cool"],
+[data-theme="light-sage"] {
+  --chart-1: #2a78d6; /* blue    — default single-series hue */
+  --chart-2: #1baf7a; /* aqua    */
+  --chart-3: #eda100; /* yellow  */
+  --chart-4: #008300; /* green   */
+  --chart-5: #4a3aa7; /* violet  */
+  --chart-6: #e34948; /* red     */
+  --chart-7: #e87ba4; /* magenta */
+  --chart-8: #eb6834; /* orange  */
+
+  --chart-seq-1: #cde2fb;
+  --chart-seq-2: #9ec5f4;
+  --chart-seq-3: #6da7ec;
+  --chart-seq-4: #3987e5;
+  --chart-seq-5: #256abf;
+  --chart-seq-6: #104281;
+}
+
+[data-theme="dim-slate"],
+[data-theme="dark-warm"],
+[data-theme="dark-graphite"],
+[data-theme="high-contrast"] {
+  --chart-1: #3987e5;
+  --chart-2: #199e70;
+  --chart-3: #c98500;
+  --chart-4: #008300;
+  --chart-5: #9085e9;
+  --chart-6: #e66767;
+  --chart-7: #d55181;
+  --chart-8: #d95926;
+
+  /* Reversed: the lowest step must sink toward the dark surface. */
+  --chart-seq-1: #0d366b;
+  --chart-seq-2: #184f95;
+  --chart-seq-3: #256abf;
+  --chart-seq-4: #3987e5;
+  --chart-seq-5: #6da7ec;
+  --chart-seq-6: #9ec5f4;
+}
+
 /* Map Tailwind's color utilities onto the semantic vars above. `inline` makes
    the generated utilities reference var(--…) directly, so overriding a var in
    a [data-theme] block re-skins every utility at runtime. */

frontend/src/version.ts

@@ -1,6 +1,6 @@
 // Single source of truth for the app version shown in the UI (header + About).
 // Bump this on a release (the release script updates it alongside telemetry.go).
-export const APP_VERSION = '0.17';
+export const APP_VERSION = '0.20.9';
 
 // Author / credits, shown in Help -> About.
 export const APP_AUTHOR = 'F4BPO';

frontend/wailsjs/go/main/App.d.ts

@@ -5,21 +5,29 @@ import {qso} from '../models';
 import {main} from '../models';
 import {cat} from '../models';
 import {profile} from '../models';
+import {acom} from '../models';
 import {antgenius} from '../models';
 import {award} from '../models';
 import {awardref} from '../models';
 import {cluster} from '../models';
 import {extsvc} from '../models';
 import {powergenius} from '../models';
+import {spe} from '../models';
+import {solar} from '../models';
 import {winkeyer} from '../models';
 import {alerts} from '../models';
 import {audio} from '../models';
 import {contest} from '../models';
 import {operating} from '../models';
 import {udp} from '../models';
+import {lotwusers} from '../models';
 import {lookup} from '../models';
 import {netctl} from '../models';
 
+export function ACOMSetOperate(arg1:boolean):Promise<void>;
+
+export function ACOMSetPower(arg1:boolean):Promise<void>;
+
 export function ADIFFields():Promise<Array<adif.FieldDef>>;
 
 export function ADIFVersion():Promise<string>;
@@ -28,14 +36,38 @@ export function ActivateProfile(arg1:number):Promise<void>;
 
 export function AddQSO(arg1:qso.QSO):Promise<number>;
 
+export function AmpFanMode(arg1:string,arg2:string):Promise<void>;
+
+export function AmpOperate(arg1:string,arg2:boolean):Promise<void>;
+
+export function AmpPower(arg1:string,arg2:boolean):Promise<void>;
+
+export function AmpPowerLevel(arg1:string,arg2:string):Promise<void>;
+
 export function AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
 
 export function AntGeniusDeselect(arg1:number):Promise<void>;
 
+export function ApplyAwardImport(arg1:string,arg2:Record<string, string>):Promise<main.AwardImportResult>;
+
 export function ApplyAwardPreset(arg1:string,arg2:string):Promise<number>;
 
+export function ApplyAwardUpdate(arg1:string):Promise<void>;
+
 export function AssignAwardRefToQSOs(arg1:string,arg2:string,arg3:Array<number>):Promise<number>;
 
+export function AudioMonitorActive():Promise<boolean>;
+
+export function AudioStartMonitor():Promise<void>;
+
+export function AudioStartTX():Promise<void>;
+
+export function AudioStopMonitor():Promise<void>;
+
+export function AudioStopTX():Promise<void>;
+
+export function AudioTXActive():Promise<boolean>;
+
 export function AwardCellQSOs(arg1:string,arg2:string,arg3:string):Promise<Array<qso.QSO>>;
 
 export function AwardFields():Promise<Array<string>>;
@@ -44,14 +76,16 @@ export function AwardMissingQSOs(arg1:string):Promise<Array<qso.QSO>>;
 
 export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Record<string, string>>>;
 
+export function AwardsFolder():Promise<string>;
+
+export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
+
 export function BrowseExecutable():Promise<string>;
 
 export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Promise<number>;
 
 export function BulkUpdateQSL(arg1:Array<number>,arg2:main.QSLBulkUpdate):Promise<number>;
 
-export function CWDecoderRunning():Promise<boolean>;
-
 export function ChatAvailable():Promise<boolean>;
 
 export function CheckForUpdate():Promise<main.UpdateInfo>;
@@ -120,20 +154,34 @@ export function DisconnectClusterServer(arg1:number):Promise<void>;
 
 export function DiscoverFlexRadios():Promise<Array<cat.FlexRadio>>;
 
+export function DismissAwardUpdate(arg1:string):Promise<void>;
+
 export function DownloadAllReferenceLists():Promise<string>;
 
+export function DownloadAndApplyUpdate(arg1:string):Promise<void>;
+
 export function DownloadClublogCty():Promise<main.ClublogCtyInfo>;
 
 export function DownloadConfirmations(arg1:string,arg2:boolean,arg3:string):Promise<void>;
 
+export function DownloadLoTWUsers():Promise<number>;
+
+export function DownloadULSCounties():Promise<void>;
+
 export function DuplicateProfile(arg1:number,arg2:string):Promise<profile.Profile>;
 
+export function ExplainAward(arg1:string,arg2:string):Promise<Array<main.AwardExplain>>;
+
 export function ExportADIF(arg1:string,arg2:boolean):Promise<adif.ExportResult>;
 
 export function ExportADIFFiltered(arg1:string,arg2:boolean,arg3:qso.QueryFilter):Promise<adif.ExportResult>;
 
 export function ExportADIFSelected(arg1:string,arg2:boolean,arg3:Array<number>):Promise<adif.ExportResult>;
 
+export function ExportAward(arg1:string):Promise<string>;
+
+export function ExportAwardForCatalog(arg1:string,arg2:number):Promise<string>;
+
 export function ExportAwards():Promise<string>;
 
 export function ExportCabrillo(arg1:string):Promise<main.CabrilloResult>;
@@ -156,8 +204,12 @@ export function FlexAmpOperate(arg1:boolean):Promise<void>;
 
 export function FlexApplyBandAntenna(arg1:string):Promise<void>;
 
+export function FlexBackspaceCW(arg1:number):Promise<void>;
+
 export function FlexMox(arg1:boolean):Promise<void>;
 
+export function FlexSendCW(arg1:string):Promise<void>;
+
 export function FlexSetAGCMode(arg1:string):Promise<void>;
 
 export function FlexSetAGCThreshold(arg1:number):Promise<void>;
@@ -166,12 +218,16 @@ export function FlexSetANF(arg1:boolean):Promise<void>;
 
 export function FlexSetANFLevel(arg1:number):Promise<void>;
 
+export function FlexSetANFT(arg1:boolean):Promise<void>;
+
 export function FlexSetAPF(arg1:boolean):Promise<void>;
 
 export function FlexSetAPFLevel(arg1:number):Promise<void>;
 
 export function FlexSetATUMemories(arg1:boolean):Promise<void>;
 
+export function FlexSetActiveSlice(arg1:number):Promise<void>;
+
 export function FlexSetAudioLevel(arg1:number):Promise<void>;
 
 export function FlexSetCWBreakInDelay(arg1:number):Promise<void>;
@@ -184,10 +240,24 @@ export function FlexSetCWSidetone(arg1:boolean):Promise<void>;
 
 export function FlexSetCWSpeed(arg1:number):Promise<void>;
 
+export function FlexSetDAX(arg1:number):Promise<void>;
+
 export function FlexSetFilter(arg1:number,arg2:number):Promise<void>;
 
+export function FlexSetKeySpeed(arg1:number):Promise<void>;
+
+export function FlexSetLMSANF(arg1:boolean):Promise<void>;
+
+export function FlexSetLMSANFLevel(arg1:number):Promise<void>;
+
+export function FlexSetLMSNR(arg1:boolean):Promise<void>;
+
+export function FlexSetLMSNRLevel(arg1:number):Promise<void>;
+
 export function FlexSetMic(arg1:number):Promise<void>;
 
+export function FlexSetMicProfile(arg1:string):Promise<void>;
+
 export function FlexSetMon(arg1:boolean):Promise<void>;
 
 export function FlexSetMonLevel(arg1:number):Promise<void>;
@@ -200,6 +270,10 @@ export function FlexSetNBLevel(arg1:number):Promise<void>;
 
 export function FlexSetNR(arg1:boolean):Promise<void>;
 
+export function FlexSetNRF(arg1:boolean):Promise<void>;
+
+export function FlexSetNRFLevel(arg1:number):Promise<void>;
+
 export function FlexSetNRLevel(arg1:number):Promise<void>;
 
 export function FlexSetPower(arg1:number):Promise<void>;
@@ -208,14 +282,30 @@ export function FlexSetProcessor(arg1:boolean):Promise<void>;
 
 export function FlexSetProcessorLevel(arg1:number):Promise<void>;
 
+export function FlexSetRIT(arg1:boolean):Promise<void>;
+
+export function FlexSetRITFreq(arg1:number):Promise<void>;
+
+export function FlexSetRNN(arg1:boolean):Promise<void>;
+
 export function FlexSetRXAntenna(arg1:string):Promise<void>;
 
 export function FlexSetSidetoneLevel(arg1:number):Promise<void>;
 
+export function FlexSetSpeexNR(arg1:boolean):Promise<void>;
+
+export function FlexSetSpeexNRLevel(arg1:number):Promise<void>;
+
 export function FlexSetSplit(arg1:boolean):Promise<void>;
 
 export function FlexSetTXAntenna(arg1:string):Promise<void>;
 
+export function FlexSetTXDAX(arg1:boolean):Promise<void>;
+
+export function FlexSetTXFilter(arg1:number,arg2:number):Promise<void>;
+
+export function FlexSetTXSlice(arg1:number):Promise<void>;
+
 export function FlexSetTunePower(arg1:number):Promise<void>;
 
 export function FlexSetVox(arg1:boolean):Promise<void>;
@@ -224,12 +314,30 @@ export function FlexSetVoxDelay(arg1:number):Promise<void>;
 
 export function FlexSetVoxLevel(arg1:number):Promise<void>;
 
+export function FlexSetWNB(arg1:boolean):Promise<void>;
+
+export function FlexSetWNBLevel(arg1:number):Promise<void>;
+
+export function FlexSetXIT(arg1:boolean):Promise<void>;
+
+export function FlexSetXITFreq(arg1:number):Promise<void>;
+
+export function FlexStopCW():Promise<void>;
+
 export function FlexTune(arg1:boolean):Promise<void>;
 
+export function GetACOMStatus():Promise<acom.Status>;
+
+export function GetADIFMonitor():Promise<main.ADIFMonitorConfig>;
+
 export function GetActiveProfile():Promise<profile.Profile>;
 
 export function GetAlertEmailTo():Promise<string>;
 
+export function GetAmpStatuses():Promise<Array<main.AmpStatus>>;
+
+export function GetAmplifiers():Promise<Array<main.AmpConfig>>;
+
 export function GetAntGeniusSettings():Promise<main.AntGeniusSettings>;
 
 export function GetAntGeniusStatus():Promise<antgenius.Status>;
@@ -248,6 +356,8 @@ export function GetAwardReferenceMeta():Promise<Array<main.AwardRefMeta>>;
 
 export function GetAwardStats(arg1:string):Promise<main.AwardStatsResult>;
 
+export function GetAwardUpdates():Promise<Array<main.AwardUpdate>>;
+
 export function GetAwards():Promise<Array<award.Result>>;
 
 export function GetBackupSettings():Promise<main.BackupSettings>;
@@ -256,7 +366,9 @@ export function GetCATSettings():Promise<main.CATSettings>;
 
 export function GetCATState():Promise<cat.RigState>;
 
-export function GetCWDecoderPitch():Promise<number>;
+export function GetCatalogCodes():Promise<Array<string>>;
+
+export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
 
 export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
 
@@ -266,6 +378,8 @@ export function GetClusterAutoConnect():Promise<boolean>;
 
 export function GetClusterStatus():Promise<Array<cluster.ServerStatus>>;
 
+export function GetContestRuns():Promise<Array<qso.ContestRun>>;
+
 export function GetCtyDatInfo():Promise<main.CtyDatInfo>;
 
 export function GetDBBackendStatus():Promise<main.DBBackendStatus>;
@@ -292,38 +406,62 @@ export function GetIcomState():Promise<cat.IcomTXState>;
 
 export function GetListsSettings():Promise<main.ListsSettings>;
 
-export function GetLiveStatusEnabled():Promise<boolean>;
+export function GetLiveStations():Promise<Array<main.LiveStation>>;
+
+export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>;
 
 export function GetLogFilePath():Promise<string>;
 
+export function GetLogStats(arg1:string,arg2:string,arg3:string,arg4:number,arg5:string):Promise<qso.Stats>;
+
 export function GetLogbookRevision():Promise<string>;
 
 export function GetLookupSettings():Promise<main.LookupSettings>;
 
 export function GetMySQLSettings():Promise<main.MySQLSettings>;
 
+export function GetOfflineStatus():Promise<main.OfflineStatus>;
+
 export function GetOnlineOperators():Promise<Array<main.ChatPresence>>;
 
+export function GetOperators():Promise<Array<string>>;
+
 export function GetPGXLSettings():Promise<main.PGXLSettings>;
 
 export function GetPGXLStatus():Promise<powergenius.Status>;
 
 export function GetPOTAToken():Promise<string>;
 
+export function GetPendingQSOs():Promise<Array<qso.QSO>>;
+
 export function GetQSLDefaults():Promise<main.QSLDefaults>;
 
 export function GetQSO(arg1:number):Promise<qso.QSO>;
 
+export function GetQSORate():Promise<main.QSORate>;
+
+export function GetRelayAuto():Promise<main.RelayAutoConfig>;
+
 export function GetRotatorHeading():Promise<main.RotatorHeading>;
 
 export function GetRotatorSettings():Promise<main.RotatorSettings>;
 
+export function GetSPEStatus():Promise<spe.Status>;
+
 export function GetSecretStatus():Promise<main.SecretStatus>;
 
+export function GetSlotStats():Promise<qso.SlotStats>;
+
+export function GetSolarData():Promise<solar.Data>;
+
 export function GetStartupStatus():Promise<main.StartupStatus>;
 
+export function GetStationDevices():Promise<Array<main.StationDevice>>;
+
 export function GetStationSettings():Promise<main.StationSettings>;
 
+export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
+
 export function GetTelemetryEnabled():Promise<boolean>;
 
 export function GetUIPref(arg1:string):Promise<string>;
@@ -332,6 +470,8 @@ export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
 
 export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>;
 
+export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
+
 export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
 
 export function GetWinkeyerStatus():Promise<winkeyer.Status>;
@@ -350,16 +490,32 @@ export function IcomSetAGC(arg1:string):Promise<void>;
 
 export function IcomSetANF(arg1:boolean):Promise<void>;
 
+export function IcomSetAPF(arg1:boolean):Promise<void>;
+
+export function IcomSetAntenna(arg1:number):Promise<void>;
+
+export function IcomSetAntiVOX(arg1:number):Promise<void>;
+
 export function IcomSetAtt(arg1:number):Promise<void>;
 
 export function IcomSetBreakIn(arg1:number):Promise<void>;
 
+export function IcomSetComp(arg1:boolean):Promise<void>;
+
+export function IcomSetCompLevel(arg1:number):Promise<void>;
+
 export function IcomSetFilter(arg1:number):Promise<void>;
 
 export function IcomSetKeySpeed(arg1:number):Promise<void>;
 
+export function IcomSetManualNotch(arg1:boolean):Promise<void>;
+
 export function IcomSetMicGain(arg1:number):Promise<void>;
 
+export function IcomSetMonLevel(arg1:number):Promise<void>;
+
+export function IcomSetMonitor(arg1:boolean):Promise<void>;
+
 export function IcomSetNB(arg1:boolean):Promise<void>;
 
 export function IcomSetNBLevel(arg1:number):Promise<void>;
@@ -368,8 +524,16 @@ export function IcomSetNR(arg1:boolean):Promise<void>;
 
 export function IcomSetNRLevel(arg1:number):Promise<void>;
 
+export function IcomSetNotchPos(arg1:number):Promise<void>;
+
+export function IcomSetPBTInner(arg1:number):Promise<void>;
+
+export function IcomSetPBTOuter(arg1:number):Promise<void>;
+
 export function IcomSetPTT(arg1:boolean):Promise<void>;
 
+export function IcomSetPower(arg1:boolean):Promise<void>;
+
 export function IcomSetPreamp(arg1:number):Promise<void>;
 
 export function IcomSetRFGain(arg1:number):Promise<void>;
@@ -382,10 +546,18 @@ export function IcomSetRITOn(arg1:boolean):Promise<void>;
 
 export function IcomSetScope(arg1:boolean):Promise<void>;
 
+export function IcomSetScopeEdges(arg1:number,arg2:number):Promise<void>;
+
 export function IcomSetScopeMode(arg1:boolean):Promise<void>;
 
 export function IcomSetSplit(arg1:boolean):Promise<void>;
 
+export function IcomSetSquelch(arg1:number):Promise<void>;
+
+export function IcomSetVOX(arg1:boolean):Promise<void>;
+
+export function IcomSetVOXGain(arg1:number):Promise<void>;
+
 export function IcomSetXITOn(arg1:boolean):Promise<void>;
 
 export function IcomStopCW():Promise<void>;
@@ -398,6 +570,8 @@ export function ImportAwardReferencesText(arg1:string,arg2:string):Promise<numbe
 
 export function ImportAwards():Promise<main.AwardImportResult>;
 
+export function InspectAwardImport():Promise<main.AwardImportPreview>;
+
 export function LaunchAutostartProgram(arg1:string):Promise<main.AutostartLaunchResult>;
 
 export function LaunchAutostartPrograms():Promise<Array<main.AutostartLaunchResult>>;
@@ -416,6 +590,8 @@ export function ListContests():Promise<Array<contest.Def>>;
 
 export function ListCountries():Promise<Array<string>>;
 
+export function ListDenkoviDevices():Promise<Array<string>>;
+
 export function ListOperatingTree():Promise<Array<operating.Station>>;
 
 export function ListProfiles():Promise<Array<profile.Profile>>;
@@ -430,10 +606,18 @@ export function ListTQSLStationLocations():Promise<Array<extsvc.StationLocation>
 
 export function ListUDPIntegrations():Promise<Array<udp.Config>>;
 
+export function LiveLastQSOAgeSec():Promise<number>;
+
+export function LoTWUserInfo(arg1:string):Promise<lotwusers.Info>;
+
 export function LogUDPLoggedADIF(arg1:string):Promise<number>;
 
 export function LookupCallsign(arg1:string):Promise<lookup.Result>;
 
+export function MotorReadElements():Promise<Array<number>>;
+
+export function MotorSetElement(arg1:number,arg2:number):Promise<void>;
+
 export function MoveDatabase(arg1:string):Promise<void>;
 
 export function NetActivate(arg1:string):Promise<qso.QSO>;
@@ -472,6 +656,8 @@ export function NetUpdateActive(arg1:qso.QSO):Promise<void>;
 
 export function OpenADIFFile():Promise<string>;
 
+export function OpenAwardsFolder():Promise<void>;
+
 export function OpenDatabase(arg1:string):Promise<void>;
 
 export function OpenExternalURL(arg1:string):Promise<void>;
@@ -480,6 +666,10 @@ export function OperatingDefaultForBand(arg1:string):Promise<operating.BandDefau
 
 export function PGXLSetFanMode(arg1:string):Promise<void>;
 
+export function PGXLSetOperate(arg1:boolean):Promise<void>;
+
+export function PickADIFMonitorFile():Promise<string>;
+
 export function PickAudioFolder():Promise<string>;
 
 export function PickBackupFolder():Promise<string>;
@@ -534,12 +724,18 @@ export function QSOAudioRestart():Promise<boolean>;
 
 export function QuitApp():Promise<void>;
 
+export function RecomputeAllAwardRefs():Promise<number>;
+
 export function RefreshCtyDat():Promise<main.CtyDatInfo>;
 
+export function RefreshSolar():Promise<void>;
+
 export function ReloadUDPIntegrations():Promise<Array<string>>;
 
 export function RemovePassphrase(arg1:string):Promise<void>;
 
+export function RenameDatabase(arg1:string):Promise<void>;
+
 export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
 
 export function ReplaceAwardReferences(arg1:string,arg2:Array<awardref.Ref>):Promise<number>;
@@ -556,6 +752,8 @@ export function RestartApp():Promise<void>;
 
 export function RestartQSORecorder():Promise<void>;
 
+export function RetryOfflineSync():Promise<number>;
+
 export function RotatorGoTo(arg1:number,arg2:number):Promise<void>;
 
 export function RotatorPark():Promise<void>;
@@ -564,10 +762,20 @@ export function RotatorStop():Promise<void>;
 
 export function RunBackupNow():Promise<string>;
 
+export function SPESetOperate(arg1:boolean):Promise<void>;
+
+export function SPESetPower(arg1:boolean):Promise<void>;
+
+export function SPESetPowerLevel(arg1:string):Promise<void>;
+
 export function SaveADIFFile():Promise<string>;
 
+export function SaveADIFMonitor(arg1:main.ADIFMonitorConfig):Promise<void>;
+
 export function SaveAlertRule(arg1:alerts.Rule):Promise<alerts.Rule>;
 
+export function SaveAmplifiers(arg1:Array<main.AmpConfig>):Promise<void>;
+
 export function SaveAntGeniusSettings(arg1:main.AntGeniusSettings):Promise<void>;
 
 export function SaveAudioSettings(arg1:main.AudioSettings):Promise<void>;
@@ -610,8 +818,12 @@ export function SaveProfile(arg1:profile.Profile):Promise<profile.Profile>;
 
 export function SaveQSLDefaults(arg1:main.QSLDefaults):Promise<void>;
 
+export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
+
 export function SaveRotatorSettings(arg1:main.RotatorSettings):Promise<void>;
 
+export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
+
 export function SaveStationSettings(arg1:main.StationSettings):Promise<void>;
 
 export function SaveUDPIntegration(arg1:udp.Config):Promise<udp.Config>;
@@ -638,8 +850,6 @@ export function SetCATFrequency(arg1:number):Promise<void>;
 
 export function SetCATMode(arg1:string):Promise<void>;
 
-export function SetCWDecoderPitch(arg1:number):Promise<void>;
-
 export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
 
 export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
@@ -648,8 +858,6 @@ export function SetCompactMode(arg1:boolean):Promise<void>;
 
 export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
 
-export function SetLiveStatusEnabled(arg1:boolean):Promise<void>;
-
 export function SetPassphrase(arg1:string):Promise<void>;
 
 export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
@@ -658,9 +866,7 @@ export function SetUIPref(arg1:string,arg2:string):Promise<void>;
 
 export function SetUltrabeamDirection(arg1:number):Promise<void>;
 
-export function StartCWDecoder():Promise<void>;
-
-export function StopCWDecoder():Promise<void>;
+export function StationSetRelay(arg1:string,arg2:number,arg3:boolean):Promise<void>;
 
 export function SwitchCATRig(arg1:number):Promise<void>;
 
@@ -686,8 +892,12 @@ export function TestQRZUpload():Promise<string>;
 
 export function TestRotator(arg1:main.RotatorSettings):Promise<void>;
 
+export function TestStationDevice(arg1:main.StationDevice):Promise<main.StationTestResult>;
+
 export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
 
+export function ULSStatus():Promise<main.ULSStatusResult>;
+
 export function UltrabeamRetract():Promise<void>;
 
 export function UnlockSecrets(arg1:string):Promise<void>;

frontend/wailsjs/go/main/App.js

@@ -2,6 +2,14 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+export function ACOMSetOperate(arg1) {
+  return window['go']['main']['App']['ACOMSetOperate'](arg1);
+}
+
+export function ACOMSetPower(arg1) {
+  return window['go']['main']['App']['ACOMSetPower'](arg1);
+}
+
 export function ADIFFields() {
   return window['go']['main']['App']['ADIFFields']();
 }
@@ -18,6 +26,22 @@ export function AddQSO(arg1) {
   return window['go']['main']['App']['AddQSO'](arg1);
 }
 
+export function AmpFanMode(arg1, arg2) {
+  return window['go']['main']['App']['AmpFanMode'](arg1, arg2);
+}
+
+export function AmpOperate(arg1, arg2) {
+  return window['go']['main']['App']['AmpOperate'](arg1, arg2);
+}
+
+export function AmpPower(arg1, arg2) {
+  return window['go']['main']['App']['AmpPower'](arg1, arg2);
+}
+
+export function AmpPowerLevel(arg1, arg2) {
+  return window['go']['main']['App']['AmpPowerLevel'](arg1, arg2);
+}
+
 export function AntGeniusActivate(arg1, arg2) {
   return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
 }
@@ -26,14 +50,46 @@ export function AntGeniusDeselect(arg1) {
   return window['go']['main']['App']['AntGeniusDeselect'](arg1);
 }
 
+export function ApplyAwardImport(arg1, arg2) {
+  return window['go']['main']['App']['ApplyAwardImport'](arg1, arg2);
+}
+
 export function ApplyAwardPreset(arg1, arg2) {
   return window['go']['main']['App']['ApplyAwardPreset'](arg1, arg2);
 }
 
+export function ApplyAwardUpdate(arg1) {
+  return window['go']['main']['App']['ApplyAwardUpdate'](arg1);
+}
+
 export function AssignAwardRefToQSOs(arg1, arg2, arg3) {
   return window['go']['main']['App']['AssignAwardRefToQSOs'](arg1, arg2, arg3);
 }
 
+export function AudioMonitorActive() {
+  return window['go']['main']['App']['AudioMonitorActive']();
+}
+
+export function AudioStartMonitor() {
+  return window['go']['main']['App']['AudioStartMonitor']();
+}
+
+export function AudioStartTX() {
+  return window['go']['main']['App']['AudioStartTX']();
+}
+
+export function AudioStopMonitor() {
+  return window['go']['main']['App']['AudioStopMonitor']();
+}
+
+export function AudioStopTX() {
+  return window['go']['main']['App']['AudioStopTX']();
+}
+
+export function AudioTXActive() {
+  return window['go']['main']['App']['AudioTXActive']();
+}
+
 export function AwardCellQSOs(arg1, arg2, arg3) {
   return window['go']['main']['App']['AwardCellQSOs'](arg1, arg2, arg3);
 }
@@ -50,6 +106,14 @@ export function AwardRefsForQSOs(arg1) {
   return window['go']['main']['App']['AwardRefsForQSOs'](arg1);
 }
 
+export function AwardsFolder() {
+  return window['go']['main']['App']['AwardsFolder']();
+}
+
+export function BackfillUSCounties() {
+  return window['go']['main']['App']['BackfillUSCounties']();
+}
+
 export function BrowseExecutable() {
   return window['go']['main']['App']['BrowseExecutable']();
 }
@@ -62,10 +126,6 @@ export function BulkUpdateQSL(arg1, arg2) {
   return window['go']['main']['App']['BulkUpdateQSL'](arg1, arg2);
 }
 
-export function CWDecoderRunning() {
-  return window['go']['main']['App']['CWDecoderRunning']();
-}
-
 export function ChatAvailable() {
   return window['go']['main']['App']['ChatAvailable']();
 }
@@ -202,10 +262,18 @@ export function DiscoverFlexRadios() {
   return window['go']['main']['App']['DiscoverFlexRadios']();
 }
 
+export function DismissAwardUpdate(arg1) {
+  return window['go']['main']['App']['DismissAwardUpdate'](arg1);
+}
+
 export function DownloadAllReferenceLists() {
   return window['go']['main']['App']['DownloadAllReferenceLists']();
 }
 
+export function DownloadAndApplyUpdate(arg1) {
+  return window['go']['main']['App']['DownloadAndApplyUpdate'](arg1);
+}
+
 export function DownloadClublogCty() {
   return window['go']['main']['App']['DownloadClublogCty']();
 }
@@ -214,10 +282,22 @@ export function DownloadConfirmations(arg1, arg2, arg3) {
   return window['go']['main']['App']['DownloadConfirmations'](arg1, arg2, arg3);
 }
 
+export function DownloadLoTWUsers() {
+  return window['go']['main']['App']['DownloadLoTWUsers']();
+}
+
+export function DownloadULSCounties() {
+  return window['go']['main']['App']['DownloadULSCounties']();
+}
+
 export function DuplicateProfile(arg1, arg2) {
   return window['go']['main']['App']['DuplicateProfile'](arg1, arg2);
 }
 
+export function ExplainAward(arg1, arg2) {
+  return window['go']['main']['App']['ExplainAward'](arg1, arg2);
+}
+
 export function ExportADIF(arg1, arg2) {
   return window['go']['main']['App']['ExportADIF'](arg1, arg2);
 }
@@ -230,6 +310,14 @@ export function ExportADIFSelected(arg1, arg2, arg3) {
   return window['go']['main']['App']['ExportADIFSelected'](arg1, arg2, arg3);
 }
 
+export function ExportAward(arg1) {
+  return window['go']['main']['App']['ExportAward'](arg1);
+}
+
+export function ExportAwardForCatalog(arg1, arg2) {
+  return window['go']['main']['App']['ExportAwardForCatalog'](arg1, arg2);
+}
+
 export function ExportAwards() {
   return window['go']['main']['App']['ExportAwards']();
 }
@@ -274,10 +362,18 @@ export function FlexApplyBandAntenna(arg1) {
   return window['go']['main']['App']['FlexApplyBandAntenna'](arg1);
 }
 
+export function FlexBackspaceCW(arg1) {
+  return window['go']['main']['App']['FlexBackspaceCW'](arg1);
+}
+
 export function FlexMox(arg1) {
   return window['go']['main']['App']['FlexMox'](arg1);
 }
 
+export function FlexSendCW(arg1) {
+  return window['go']['main']['App']['FlexSendCW'](arg1);
+}
+
 export function FlexSetAGCMode(arg1) {
   return window['go']['main']['App']['FlexSetAGCMode'](arg1);
 }
@@ -294,6 +390,10 @@ export function FlexSetANFLevel(arg1) {
   return window['go']['main']['App']['FlexSetANFLevel'](arg1);
 }
 
+export function FlexSetANFT(arg1) {
+  return window['go']['main']['App']['FlexSetANFT'](arg1);
+}
+
 export function FlexSetAPF(arg1) {
   return window['go']['main']['App']['FlexSetAPF'](arg1);
 }
@@ -306,6 +406,10 @@ export function FlexSetATUMemories(arg1) {
   return window['go']['main']['App']['FlexSetATUMemories'](arg1);
 }
 
+export function FlexSetActiveSlice(arg1) {
+  return window['go']['main']['App']['FlexSetActiveSlice'](arg1);
+}
+
 export function FlexSetAudioLevel(arg1) {
   return window['go']['main']['App']['FlexSetAudioLevel'](arg1);
 }
@@ -330,14 +434,42 @@ export function FlexSetCWSpeed(arg1) {
   return window['go']['main']['App']['FlexSetCWSpeed'](arg1);
 }
 
+export function FlexSetDAX(arg1) {
+  return window['go']['main']['App']['FlexSetDAX'](arg1);
+}
+
 export function FlexSetFilter(arg1, arg2) {
   return window['go']['main']['App']['FlexSetFilter'](arg1, arg2);
 }
 
+export function FlexSetKeySpeed(arg1) {
+  return window['go']['main']['App']['FlexSetKeySpeed'](arg1);
+}
+
+export function FlexSetLMSANF(arg1) {
+  return window['go']['main']['App']['FlexSetLMSANF'](arg1);
+}
+
+export function FlexSetLMSANFLevel(arg1) {
+  return window['go']['main']['App']['FlexSetLMSANFLevel'](arg1);
+}
+
+export function FlexSetLMSNR(arg1) {
+  return window['go']['main']['App']['FlexSetLMSNR'](arg1);
+}
+
+export function FlexSetLMSNRLevel(arg1) {
+  return window['go']['main']['App']['FlexSetLMSNRLevel'](arg1);
+}
+
 export function FlexSetMic(arg1) {
   return window['go']['main']['App']['FlexSetMic'](arg1);
 }
 
+export function FlexSetMicProfile(arg1) {
+  return window['go']['main']['App']['FlexSetMicProfile'](arg1);
+}
+
 export function FlexSetMon(arg1) {
   return window['go']['main']['App']['FlexSetMon'](arg1);
 }
@@ -362,6 +494,14 @@ export function FlexSetNR(arg1) {
   return window['go']['main']['App']['FlexSetNR'](arg1);
 }
 
+export function FlexSetNRF(arg1) {
+  return window['go']['main']['App']['FlexSetNRF'](arg1);
+}
+
+export function FlexSetNRFLevel(arg1) {
+  return window['go']['main']['App']['FlexSetNRFLevel'](arg1);
+}
+
 export function FlexSetNRLevel(arg1) {
   return window['go']['main']['App']['FlexSetNRLevel'](arg1);
 }
@@ -378,6 +518,18 @@ export function FlexSetProcessorLevel(arg1) {
   return window['go']['main']['App']['FlexSetProcessorLevel'](arg1);
 }
 
+export function FlexSetRIT(arg1) {
+  return window['go']['main']['App']['FlexSetRIT'](arg1);
+}
+
+export function FlexSetRITFreq(arg1) {
+  return window['go']['main']['App']['FlexSetRITFreq'](arg1);
+}
+
+export function FlexSetRNN(arg1) {
+  return window['go']['main']['App']['FlexSetRNN'](arg1);
+}
+
 export function FlexSetRXAntenna(arg1) {
   return window['go']['main']['App']['FlexSetRXAntenna'](arg1);
 }
@@ -386,6 +538,14 @@ export function FlexSetSidetoneLevel(arg1) {
   return window['go']['main']['App']['FlexSetSidetoneLevel'](arg1);
 }
 
+export function FlexSetSpeexNR(arg1) {
+  return window['go']['main']['App']['FlexSetSpeexNR'](arg1);
+}
+
+export function FlexSetSpeexNRLevel(arg1) {
+  return window['go']['main']['App']['FlexSetSpeexNRLevel'](arg1);
+}
+
 export function FlexSetSplit(arg1) {
   return window['go']['main']['App']['FlexSetSplit'](arg1);
 }
@@ -394,6 +554,18 @@ export function FlexSetTXAntenna(arg1) {
   return window['go']['main']['App']['FlexSetTXAntenna'](arg1);
 }
 
+export function FlexSetTXDAX(arg1) {
+  return window['go']['main']['App']['FlexSetTXDAX'](arg1);
+}
+
+export function FlexSetTXFilter(arg1, arg2) {
+  return window['go']['main']['App']['FlexSetTXFilter'](arg1, arg2);
+}
+
+export function FlexSetTXSlice(arg1) {
+  return window['go']['main']['App']['FlexSetTXSlice'](arg1);
+}
+
 export function FlexSetTunePower(arg1) {
   return window['go']['main']['App']['FlexSetTunePower'](arg1);
 }
@@ -410,10 +582,38 @@ export function FlexSetVoxLevel(arg1) {
   return window['go']['main']['App']['FlexSetVoxLevel'](arg1);
 }
 
+export function FlexSetWNB(arg1) {
+  return window['go']['main']['App']['FlexSetWNB'](arg1);
+}
+
+export function FlexSetWNBLevel(arg1) {
+  return window['go']['main']['App']['FlexSetWNBLevel'](arg1);
+}
+
+export function FlexSetXIT(arg1) {
+  return window['go']['main']['App']['FlexSetXIT'](arg1);
+}
+
+export function FlexSetXITFreq(arg1) {
+  return window['go']['main']['App']['FlexSetXITFreq'](arg1);
+}
+
+export function FlexStopCW() {
+  return window['go']['main']['App']['FlexStopCW']();
+}
+
 export function FlexTune(arg1) {
   return window['go']['main']['App']['FlexTune'](arg1);
 }
 
+export function GetACOMStatus() {
+  return window['go']['main']['App']['GetACOMStatus']();
+}
+
+export function GetADIFMonitor() {
+  return window['go']['main']['App']['GetADIFMonitor']();
+}
+
 export function GetActiveProfile() {
   return window['go']['main']['App']['GetActiveProfile']();
 }
@@ -422,6 +622,14 @@ export function GetAlertEmailTo() {
   return window['go']['main']['App']['GetAlertEmailTo']();
 }
 
+export function GetAmpStatuses() {
+  return window['go']['main']['App']['GetAmpStatuses']();
+}
+
+export function GetAmplifiers() {
+  return window['go']['main']['App']['GetAmplifiers']();
+}
+
 export function GetAntGeniusSettings() {
   return window['go']['main']['App']['GetAntGeniusSettings']();
 }
@@ -458,6 +666,10 @@ export function GetAwardStats(arg1) {
   return window['go']['main']['App']['GetAwardStats'](arg1);
 }
 
+export function GetAwardUpdates() {
+  return window['go']['main']['App']['GetAwardUpdates']();
+}
+
 export function GetAwards() {
   return window['go']['main']['App']['GetAwards']();
 }
@@ -474,8 +686,12 @@ export function GetCATState() {
   return window['go']['main']['App']['GetCATState']();
 }
 
-export function GetCWDecoderPitch() {
-  return window['go']['main']['App']['GetCWDecoderPitch']();
+export function GetCatalogCodes() {
+  return window['go']['main']['App']['GetCatalogCodes']();
+}
+
+export function GetChangelog() {
+  return window['go']['main']['App']['GetChangelog']();
 }
 
 export function GetChatHistory(arg1) {
@@ -494,6 +710,10 @@ export function GetClusterStatus() {
   return window['go']['main']['App']['GetClusterStatus']();
 }
 
+export function GetContestRuns() {
+  return window['go']['main']['App']['GetContestRuns']();
+}
+
 export function GetCtyDatInfo() {
   return window['go']['main']['App']['GetCtyDatInfo']();
 }
@@ -546,14 +766,22 @@ export function GetListsSettings() {
   return window['go']['main']['App']['GetListsSettings']();
 }
 
-export function GetLiveStatusEnabled() {
-  return window['go']['main']['App']['GetLiveStatusEnabled']();
+export function GetLiveStations() {
+  return window['go']['main']['App']['GetLiveStations']();
+}
+
+export function GetLoTWUsersStatus() {
+  return window['go']['main']['App']['GetLoTWUsersStatus']();
 }
 
 export function GetLogFilePath() {
   return window['go']['main']['App']['GetLogFilePath']();
 }
 
+export function GetLogStats(arg1, arg2, arg3, arg4, arg5) {
+  return window['go']['main']['App']['GetLogStats'](arg1, arg2, arg3, arg4, arg5);
+}
+
 export function GetLogbookRevision() {
   return window['go']['main']['App']['GetLogbookRevision']();
 }
@@ -566,10 +794,18 @@ export function GetMySQLSettings() {
   return window['go']['main']['App']['GetMySQLSettings']();
 }
 
+export function GetOfflineStatus() {
+  return window['go']['main']['App']['GetOfflineStatus']();
+}
+
 export function GetOnlineOperators() {
   return window['go']['main']['App']['GetOnlineOperators']();
 }
 
+export function GetOperators() {
+  return window['go']['main']['App']['GetOperators']();
+}
+
 export function GetPGXLSettings() {
   return window['go']['main']['App']['GetPGXLSettings']();
 }
@@ -582,6 +818,10 @@ export function GetPOTAToken() {
   return window['go']['main']['App']['GetPOTAToken']();
 }
 
+export function GetPendingQSOs() {
+  return window['go']['main']['App']['GetPendingQSOs']();
+}
+
 export function GetQSLDefaults() {
   return window['go']['main']['App']['GetQSLDefaults']();
 }
@@ -590,6 +830,14 @@ export function GetQSO(arg1) {
   return window['go']['main']['App']['GetQSO'](arg1);
 }
 
+export function GetQSORate() {
+  return window['go']['main']['App']['GetQSORate']();
+}
+
+export function GetRelayAuto() {
+  return window['go']['main']['App']['GetRelayAuto']();
+}
+
 export function GetRotatorHeading() {
   return window['go']['main']['App']['GetRotatorHeading']();
 }
@@ -598,18 +846,38 @@ export function GetRotatorSettings() {
   return window['go']['main']['App']['GetRotatorSettings']();
 }
 
+export function GetSPEStatus() {
+  return window['go']['main']['App']['GetSPEStatus']();
+}
+
 export function GetSecretStatus() {
   return window['go']['main']['App']['GetSecretStatus']();
 }
 
+export function GetSlotStats() {
+  return window['go']['main']['App']['GetSlotStats']();
+}
+
+export function GetSolarData() {
+  return window['go']['main']['App']['GetSolarData']();
+}
+
 export function GetStartupStatus() {
   return window['go']['main']['App']['GetStartupStatus']();
 }
 
+export function GetStationDevices() {
+  return window['go']['main']['App']['GetStationDevices']();
+}
+
 export function GetStationSettings() {
   return window['go']['main']['App']['GetStationSettings']();
 }
 
+export function GetStationStatus() {
+  return window['go']['main']['App']['GetStationStatus']();
+}
+
 export function GetTelemetryEnabled() {
   return window['go']['main']['App']['GetTelemetryEnabled']();
 }
@@ -626,6 +894,10 @@ export function GetUltrabeamStatus() {
   return window['go']['main']['App']['GetUltrabeamStatus']();
 }
 
+export function GetWhatsNew() {
+  return window['go']['main']['App']['GetWhatsNew']();
+}
+
 export function GetWinkeyerSettings() {
   return window['go']['main']['App']['GetWinkeyerSettings']();
 }
@@ -662,6 +934,18 @@ export function IcomSetANF(arg1) {
   return window['go']['main']['App']['IcomSetANF'](arg1);
 }
 
+export function IcomSetAPF(arg1) {
+  return window['go']['main']['App']['IcomSetAPF'](arg1);
+}
+
+export function IcomSetAntenna(arg1) {
+  return window['go']['main']['App']['IcomSetAntenna'](arg1);
+}
+
+export function IcomSetAntiVOX(arg1) {
+  return window['go']['main']['App']['IcomSetAntiVOX'](arg1);
+}
+
 export function IcomSetAtt(arg1) {
   return window['go']['main']['App']['IcomSetAtt'](arg1);
 }
@@ -670,6 +954,14 @@ export function IcomSetBreakIn(arg1) {
   return window['go']['main']['App']['IcomSetBreakIn'](arg1);
 }
 
+export function IcomSetComp(arg1) {
+  return window['go']['main']['App']['IcomSetComp'](arg1);
+}
+
+export function IcomSetCompLevel(arg1) {
+  return window['go']['main']['App']['IcomSetCompLevel'](arg1);
+}
+
 export function IcomSetFilter(arg1) {
   return window['go']['main']['App']['IcomSetFilter'](arg1);
 }
@@ -678,10 +970,22 @@ export function IcomSetKeySpeed(arg1) {
   return window['go']['main']['App']['IcomSetKeySpeed'](arg1);
 }
 
+export function IcomSetManualNotch(arg1) {
+  return window['go']['main']['App']['IcomSetManualNotch'](arg1);
+}
+
 export function IcomSetMicGain(arg1) {
   return window['go']['main']['App']['IcomSetMicGain'](arg1);
 }
 
+export function IcomSetMonLevel(arg1) {
+  return window['go']['main']['App']['IcomSetMonLevel'](arg1);
+}
+
+export function IcomSetMonitor(arg1) {
+  return window['go']['main']['App']['IcomSetMonitor'](arg1);
+}
+
 export function IcomSetNB(arg1) {
   return window['go']['main']['App']['IcomSetNB'](arg1);
 }
@@ -698,10 +1002,26 @@ export function IcomSetNRLevel(arg1) {
   return window['go']['main']['App']['IcomSetNRLevel'](arg1);
 }
 
+export function IcomSetNotchPos(arg1) {
+  return window['go']['main']['App']['IcomSetNotchPos'](arg1);
+}
+
+export function IcomSetPBTInner(arg1) {
+  return window['go']['main']['App']['IcomSetPBTInner'](arg1);
+}
+
+export function IcomSetPBTOuter(arg1) {
+  return window['go']['main']['App']['IcomSetPBTOuter'](arg1);
+}
+
 export function IcomSetPTT(arg1) {
   return window['go']['main']['App']['IcomSetPTT'](arg1);
 }
 
+export function IcomSetPower(arg1) {
+  return window['go']['main']['App']['IcomSetPower'](arg1);
+}
+
 export function IcomSetPreamp(arg1) {
   return window['go']['main']['App']['IcomSetPreamp'](arg1);
 }
@@ -726,6 +1046,10 @@ export function IcomSetScope(arg1) {
   return window['go']['main']['App']['IcomSetScope'](arg1);
 }
 
+export function IcomSetScopeEdges(arg1, arg2) {
+  return window['go']['main']['App']['IcomSetScopeEdges'](arg1, arg2);
+}
+
 export function IcomSetScopeMode(arg1) {
   return window['go']['main']['App']['IcomSetScopeMode'](arg1);
 }
@@ -734,6 +1058,18 @@ export function IcomSetSplit(arg1) {
   return window['go']['main']['App']['IcomSetSplit'](arg1);
 }
 
+export function IcomSetSquelch(arg1) {
+  return window['go']['main']['App']['IcomSetSquelch'](arg1);
+}
+
+export function IcomSetVOX(arg1) {
+  return window['go']['main']['App']['IcomSetVOX'](arg1);
+}
+
+export function IcomSetVOXGain(arg1) {
+  return window['go']['main']['App']['IcomSetVOXGain'](arg1);
+}
+
 export function IcomSetXITOn(arg1) {
   return window['go']['main']['App']['IcomSetXITOn'](arg1);
 }
@@ -758,6 +1094,10 @@ export function ImportAwards() {
   return window['go']['main']['App']['ImportAwards']();
 }
 
+export function InspectAwardImport() {
+  return window['go']['main']['App']['InspectAwardImport']();
+}
+
 export function LaunchAutostartProgram(arg1) {
   return window['go']['main']['App']['LaunchAutostartProgram'](arg1);
 }
@@ -794,6 +1134,10 @@ export function ListCountries() {
   return window['go']['main']['App']['ListCountries']();
 }
 
+export function ListDenkoviDevices() {
+  return window['go']['main']['App']['ListDenkoviDevices']();
+}
+
 export function ListOperatingTree() {
   return window['go']['main']['App']['ListOperatingTree']();
 }
@@ -822,6 +1166,14 @@ export function ListUDPIntegrations() {
   return window['go']['main']['App']['ListUDPIntegrations']();
 }
 
+export function LiveLastQSOAgeSec() {
+  return window['go']['main']['App']['LiveLastQSOAgeSec']();
+}
+
+export function LoTWUserInfo(arg1) {
+  return window['go']['main']['App']['LoTWUserInfo'](arg1);
+}
+
 export function LogUDPLoggedADIF(arg1) {
   return window['go']['main']['App']['LogUDPLoggedADIF'](arg1);
 }
@@ -830,6 +1182,14 @@ export function LookupCallsign(arg1) {
   return window['go']['main']['App']['LookupCallsign'](arg1);
 }
 
+export function MotorReadElements() {
+  return window['go']['main']['App']['MotorReadElements']();
+}
+
+export function MotorSetElement(arg1, arg2) {
+  return window['go']['main']['App']['MotorSetElement'](arg1, arg2);
+}
+
 export function MoveDatabase(arg1) {
   return window['go']['main']['App']['MoveDatabase'](arg1);
 }
@@ -906,6 +1266,10 @@ export function OpenADIFFile() {
   return window['go']['main']['App']['OpenADIFFile']();
 }
 
+export function OpenAwardsFolder() {
+  return window['go']['main']['App']['OpenAwardsFolder']();
+}
+
 export function OpenDatabase(arg1) {
   return window['go']['main']['App']['OpenDatabase'](arg1);
 }
@@ -922,6 +1286,14 @@ export function PGXLSetFanMode(arg1) {
   return window['go']['main']['App']['PGXLSetFanMode'](arg1);
 }
 
+export function PGXLSetOperate(arg1) {
+  return window['go']['main']['App']['PGXLSetOperate'](arg1);
+}
+
+export function PickADIFMonitorFile() {
+  return window['go']['main']['App']['PickADIFMonitorFile']();
+}
+
 export function PickAudioFolder() {
   return window['go']['main']['App']['PickAudioFolder']();
 }
@@ -1030,10 +1402,18 @@ export function QuitApp() {
   return window['go']['main']['App']['QuitApp']();
 }
 
+export function RecomputeAllAwardRefs() {
+  return window['go']['main']['App']['RecomputeAllAwardRefs']();
+}
+
 export function RefreshCtyDat() {
   return window['go']['main']['App']['RefreshCtyDat']();
 }
 
+export function RefreshSolar() {
+  return window['go']['main']['App']['RefreshSolar']();
+}
+
 export function ReloadUDPIntegrations() {
   return window['go']['main']['App']['ReloadUDPIntegrations']();
 }
@@ -1042,6 +1422,10 @@ export function RemovePassphrase(arg1) {
   return window['go']['main']['App']['RemovePassphrase'](arg1);
 }
 
+export function RenameDatabase(arg1) {
+  return window['go']['main']['App']['RenameDatabase'](arg1);
+}
+
 export function RenderEQSL(arg1, arg2) {
   return window['go']['main']['App']['RenderEQSL'](arg1, arg2);
 }
@@ -1074,6 +1458,10 @@ export function RestartQSORecorder() {
   return window['go']['main']['App']['RestartQSORecorder']();
 }
 
+export function RetryOfflineSync() {
+  return window['go']['main']['App']['RetryOfflineSync']();
+}
+
 export function RotatorGoTo(arg1, arg2) {
   return window['go']['main']['App']['RotatorGoTo'](arg1, arg2);
 }
@@ -1090,14 +1478,34 @@ export function RunBackupNow() {
   return window['go']['main']['App']['RunBackupNow']();
 }
 
+export function SPESetOperate(arg1) {
+  return window['go']['main']['App']['SPESetOperate'](arg1);
+}
+
+export function SPESetPower(arg1) {
+  return window['go']['main']['App']['SPESetPower'](arg1);
+}
+
+export function SPESetPowerLevel(arg1) {
+  return window['go']['main']['App']['SPESetPowerLevel'](arg1);
+}
+
 export function SaveADIFFile() {
   return window['go']['main']['App']['SaveADIFFile']();
 }
 
+export function SaveADIFMonitor(arg1) {
+  return window['go']['main']['App']['SaveADIFMonitor'](arg1);
+}
+
 export function SaveAlertRule(arg1) {
   return window['go']['main']['App']['SaveAlertRule'](arg1);
 }
 
+export function SaveAmplifiers(arg1) {
+  return window['go']['main']['App']['SaveAmplifiers'](arg1);
+}
+
 export function SaveAntGeniusSettings(arg1) {
   return window['go']['main']['App']['SaveAntGeniusSettings'](arg1);
 }
@@ -1182,10 +1590,18 @@ export function SaveQSLDefaults(arg1) {
   return window['go']['main']['App']['SaveQSLDefaults'](arg1);
 }
 
+export function SaveRelayAuto(arg1) {
+  return window['go']['main']['App']['SaveRelayAuto'](arg1);
+}
+
 export function SaveRotatorSettings(arg1) {
   return window['go']['main']['App']['SaveRotatorSettings'](arg1);
 }
 
+export function SaveStationDevices(arg1) {
+  return window['go']['main']['App']['SaveStationDevices'](arg1);
+}
+
 export function SaveStationSettings(arg1) {
   return window['go']['main']['App']['SaveStationSettings'](arg1);
 }
@@ -1238,10 +1654,6 @@ export function SetCATMode(arg1) {
   return window['go']['main']['App']['SetCATMode'](arg1);
 }
 
-export function SetCWDecoderPitch(arg1) {
-  return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
-}
-
 export function SetClublogCtyEnabled(arg1) {
   return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
 }
@@ -1258,10 +1670,6 @@ export function SetDVKLabel(arg1, arg2) {
   return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
 }
 
-export function SetLiveStatusEnabled(arg1) {
-  return window['go']['main']['App']['SetLiveStatusEnabled'](arg1);
-}
-
 export function SetPassphrase(arg1) {
   return window['go']['main']['App']['SetPassphrase'](arg1);
 }
@@ -1278,12 +1686,8 @@ export function SetUltrabeamDirection(arg1) {
   return window['go']['main']['App']['SetUltrabeamDirection'](arg1);
 }
 
-export function StartCWDecoder() {
-  return window['go']['main']['App']['StartCWDecoder']();
-}
-
-export function StopCWDecoder() {
-  return window['go']['main']['App']['StopCWDecoder']();
+export function StationSetRelay(arg1, arg2, arg3) {
+  return window['go']['main']['App']['StationSetRelay'](arg1, arg2, arg3);
 }
 
 export function SwitchCATRig(arg1) {
@@ -1334,10 +1738,18 @@ export function TestRotator(arg1) {
   return window['go']['main']['App']['TestRotator'](arg1);
 }
 
+export function TestStationDevice(arg1) {
+  return window['go']['main']['App']['TestStationDevice'](arg1);
+}
+
 export function TestUltrabeam(arg1) {
   return window['go']['main']['App']['TestUltrabeam'](arg1);
 }
 
+export function ULSStatus() {
+  return window['go']['main']['App']['ULSStatus']();
+}
+
 export function UltrabeamRetract() {
   return window['go']['main']['App']['UltrabeamRetract']();
 }

internal/acom/acom.go

@@ -0,0 +1,504 @@
+// Package acom drives the ACOM solid-state amplifiers (500S / 600S / 700S /
+// 1200S / 2020S) over their (unpublished) RS-232 protocol, reverse-engineered by
+// the ACOM-Controller project (bjornekelund, C#). The amp is reached either
+// directly over a serial COM port (9600 8N1) or over TCP via an RS232-to-Ethernet
+// bridge — both are just an io.ReadWriteCloser to this code, same as the SPE
+// backend.
+//
+// Wire format (host → amp): fixed raw byte strings, validated by the same rule as
+// telemetry (sum of ALL frame bytes ≡ 0 mod 256):
+//
+//	enable telemetry:  55 92 04 15
+//	disable telemetry: 55 91 04 16
+//	OPERATE:           55 81 08 02 00 06 00 1A
+//	STANDBY:           55 81 08 02 00 05 00 1B
+//	OFF (power down):  55 81 08 02 00 0A 00 16
+//
+// Power ON is NOT a data command: it is a hardware pulse on the serial DTR/RTS
+// lines (the amp's remote power-on pins) — serial transport only, and only if the
+// cable wires those pins (a telemetry-only cable uses just RX/TX/GND).
+//
+// IMPORTANT: DTR and RTS must be held LOW at all times otherwise — asserting them
+// permanently blocks the amplifier's front-panel power button.
+//
+// Telemetry (amp → host): once enabled, the amp streams 72-byte frames starting
+// 0x55 0x2F, valid when the sum of all 72 bytes ≡ 0 (mod 256). Field offsets are
+// decoded in decodeFrame below.
+package acom
+
+import (
+	"fmt"
+	"io"
+	"net"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"go.bug.st/serial"
+
+	"hamlog/internal/applog"
+)
+
+var (
+	cmdEnableTelemetry  = []byte{0x55, 0x92, 0x04, 0x15}
+	cmdDisableTelemetry = []byte{0x55, 0x91, 0x04, 0x16}
+	cmdOperate          = []byte{0x55, 0x81, 0x08, 0x02, 0x00, 0x06, 0x00, 0x1A}
+	cmdStandby          = []byte{0x55, 0x81, 0x08, 0x02, 0x00, 0x05, 0x00, 0x1B}
+	cmdOff              = []byte{0x55, 0x81, 0x08, 0x02, 0x00, 0x0A, 0x00, 0x16}
+)
+
+const (
+	frameLen    = 72
+	sync0       = 0x55
+	sync1       = 0x2F
+	dialTimeout = 5 * time.Second
+	ioTimeout   = 3 * time.Second
+	// The amp streams roughly 4-5 frames/s once telemetry is on; if nothing valid
+	// arrives for this long the link (or the amp) is considered down.
+	staleAfter = 5 * time.Second
+)
+
+// model carries the per-model constants: the temperature word offset and the
+// nominal/max forward power (for UI bar scaling).
+type model struct {
+	Name       string
+	TempOffset int
+	NominalW   int
+	MaxW       int
+}
+
+var models = map[string]model{
+	"500S":  {"500S", 282, 500, 600},
+	"600S":  {"600S", 273, 600, 700},
+	"700S":  {"700S", 282, 700, 800},
+	"1200S": {"1200S", 281, 1200, 1400},
+	"2020S": {"2020S", 282, 1800, 2000},
+}
+
+// paStatusNames maps the PAstatus nibble to a display string.
+var paStatusNames = map[int]string{
+	1: "RESET", 2: "INIT", 3: "DEBUG", 4: "SERVICE",
+	5: "STANDBY", 6: "RECEIVE", 7: "TRANSMIT", 9: "SYSTEM", 10: "OFF",
+}
+
+// acomBands maps the band nibble to a band label.
+var acomBands = []string{"?", "160m", "80m", "40/60m", "30m", "20m", "17m", "15m", "12m", "10m", "6m", "4m"}
+
+// errText translates the error code (frame byte 66) shown on the amp's display.
+// 0xFF means NO error — everything else, including 0x00, is a fault/warning.
+func errText(code int) string {
+	switch code {
+	case 0xFF:
+		return ""
+	case 0x00, 0x08:
+		return "Hot switching"
+	case 0x03:
+		return "Drive power at wrong time"
+	case 0x04, 0x05:
+		return "Reflected power warning"
+	case 0x06, 0x07:
+		return "Drive power too high"
+	case 0x0C:
+		return "RF power at wrong time"
+	case 0x0E:
+		return "Stop transmission first"
+	case 0x0F:
+		return "Remove drive power"
+	case 0x24, 0x25, 0x39, 0x44, 0x45, 0x59:
+		return "Excessive PAM current"
+	case 0x70:
+		return "CAT error"
+	default:
+		return "ERROR — see display"
+	}
+}
+
+// Status is the decoded amplifier state for the UI.
+type Status struct {
+	Connected bool    `json:"connected"` // valid telemetry is flowing
+	PortOpen  bool    `json:"port_open"` // transport is open (serial port / TCP socket) — power-on possible even when the amp itself is off
+	Transport string  `json:"transport"` // "serial" | "tcp" — the UI disables power-ON over tcp (no DTR line)
+	LastError string  `json:"last_error,omitempty"`
+	Model     string  `json:"model,omitempty"`
+	State     string  `json:"state,omitempty"` // STANDBY / RECEIVE / TRANSMIT / OFF / …
+	Operate   bool    `json:"operate"`         // RECEIVE or TRANSMIT (vs STANDBY)
+	TX        bool    `json:"tx"`
+	FwdW      int     `json:"fwd_w"`  // forward/output power
+	ReflW     int     `json:"refl_w"` // reflected power
+	SWR       float64 `json:"swr"`
+	DriveW    int     `json:"drive_w"`
+	DCPowerW  int     `json:"dc_w"`
+	TempC     int     `json:"temp_c"` // PA temperature
+	Band      string  `json:"band,omitempty"`
+	FanLevel  int     `json:"fan"`                // 1..4
+	ErrCode   int     `json:"err_code"`           // raw code from the frame; 0xFF = none
+	ErrText   string  `json:"err_text,omitempty"` // human message; empty = no error
+	NominalW  int     `json:"nominal_w"`
+	MaxW      int     `json:"max_w"`
+}
+
+// Config selects the transport and amplifier model.
+type Config struct {
+	Model     string // "500S" | "600S" | "700S" | "1200S" | "2020S"
+	Transport string // "serial" | "tcp"
+	ComPort   string // serial
+	Baud      int    // serial (the amp is fixed 9600 8N1)
+	Host      string // tcp (RS232-to-Ethernet bridge)
+	Port      int    // tcp
+}
+
+type Client struct {
+	cfg Config
+	mdl model
+
+	mu   sync.Mutex // serialises access to the connection
+	conn io.ReadWriteCloser
+
+	statusMu sync.RWMutex
+	status   Status
+
+	// Diagnostics: raw byte count + first-bytes capture, so a hardware session log
+	// tells apart "nothing on the wire" (cable/COM/amp) from "bytes but no valid
+	// frame" (framing/checksum) without a serial sniffer.
+	rawSeen     int64
+	dbgBytes    []byte
+	dbgLogged   bool
+	ckFails     int
+	frameLogged bool
+
+	stop    chan struct{}
+	running bool
+}
+
+func New(cfg Config) *Client {
+	if cfg.Baud <= 0 {
+		cfg.Baud = 9600
+	}
+	mdl, ok := models[strings.ToUpper(strings.TrimSpace(cfg.Model))]
+	if !ok {
+		mdl = models["700S"]
+	}
+	c := &Client{cfg: cfg, mdl: mdl, stop: make(chan struct{})}
+	c.status.Model = mdl.Name
+	c.status.Transport = cfg.Transport
+	c.status.NominalW = mdl.NominalW
+	c.status.MaxW = mdl.MaxW
+	return c
+}
+
+func (c *Client) Start() error {
+	if c.running {
+		return nil
+	}
+	c.running = true
+	go c.readLoop()
+	return nil
+}
+
+func (c *Client) Stop() {
+	if !c.running {
+		return
+	}
+	c.running = false
+	close(c.stop)
+	c.mu.Lock()
+	if c.conn != nil {
+		_, _ = c.conn.Write(cmdDisableTelemetry) // best effort: stop the stream
+	}
+	c.dropLocked()
+	c.mu.Unlock()
+}
+
+func (c *Client) GetStatus() Status {
+	c.statusMu.RLock()
+	defer c.statusMu.RUnlock()
+	return c.status
+}
+
+func (c *Client) setErr(msg string) {
+	c.statusMu.Lock()
+	c.status.Connected = false
+	c.status.LastError = msg
+	c.statusMu.Unlock()
+}
+
+// Operate puts the amp in OPERATE (true) or STANDBY (false). Unlike the SPE's
+// single toggle key, the ACOM protocol has explicit commands for each state.
+func (c *Client) Operate(on bool) error {
+	if on {
+		return c.send(cmdOperate)
+	}
+	return c.send(cmdStandby)
+}
+
+// PowerOff sends the power-down command (same as pressing OFF on the amp).
+func (c *Client) PowerOff() error { return c.send(cmdOff) }
+
+// PowerOn pulses the serial DTR/RTS lines — the amp's remote power-on pins, wired
+// like a press of the front-panel power button. Hardware line ⇒ serial transport
+// only (an RS232-to-Ethernet bridge doesn't forward DTR), and the cable must have
+// those pins connected. Pulse length to be confirmed on real hardware.
+func (c *Client) PowerOn() error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	sp, ok := c.conn.(serial.Port)
+	if !ok {
+		return fmt.Errorf("power-on needs the serial DTR/RTS lines — not available over a network bridge")
+	}
+	if err := sp.SetDTR(true); err != nil {
+		return err
+	}
+	if err := sp.SetRTS(true); err != nil {
+		_ = sp.SetDTR(false)
+		return err
+	}
+	time.Sleep(2500 * time.Millisecond)
+	err1 := sp.SetDTR(false)
+	err2 := sp.SetRTS(false)
+	if err1 != nil {
+		return err1
+	}
+	return err2
+}
+
+func (c *Client) send(cmd []byte) error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if c.conn == nil {
+		return fmt.Errorf("not connected")
+	}
+	if nc, ok := c.conn.(net.Conn); ok {
+		_ = nc.SetWriteDeadline(time.Now().Add(ioTimeout))
+	}
+	_, err := c.conn.Write(cmd)
+	return err
+}
+
+// readLoop keeps the link up and consumes the telemetry stream. When no valid
+// frame arrives for a while it re-arms telemetry (the amp forgets the enable
+// across a power cycle) and, on TCP, reconnects. A serial port is kept open even
+// with the amp off, so the DTR power-on pulse stays available.
+func (c *Client) readLoop() {
+	var lastFrame time.Time
+	var lastEnable time.Time
+	for {
+		select {
+		case <-c.stop:
+			return
+		default:
+		}
+		if err := c.ensureConn(); err != nil {
+			c.setErr("connect: " + err.Error())
+			select {
+			case <-c.stop:
+				return
+			case <-time.After(2 * time.Second):
+			}
+			continue
+		}
+		frame, err := c.readFrame()
+		now := time.Now()
+		if err == nil {
+			lastFrame = now
+			if !c.frameLogged {
+				c.frameLogged = true
+				applog.Printf("acom: telemetry up — first valid frame received")
+			}
+			c.decodeFrame(frame)
+			continue
+		}
+		// No valid frame. Re-send the telemetry enable briskly — there is no way to
+		// know whether the amp has it on (the reference controller re-sends every
+		// 200ms until frames flow), and it revives the stream after a power cycle.
+		if now.Sub(lastEnable) >= 500*time.Millisecond {
+			lastEnable = now
+			_ = c.send(cmdEnableTelemetry)
+		}
+		if lastFrame.IsZero() || now.Sub(lastFrame) > staleAfter {
+			if c.cfg.Transport == "tcp" {
+				// The bridge socket may be dead — force a reconnect.
+				c.mu.Lock()
+				c.dropLocked()
+				c.mu.Unlock()
+			}
+			if prev := c.GetStatus(); prev.Connected || prev.LastError == "" {
+				applog.Printf("acom: no telemetry (raw bytes seen so far: %d, checksum fails: %d)", c.rawSeen, c.ckFails)
+			}
+			c.setErr("no telemetry — amplifier off or cable/bridge issue")
+		}
+	}
+}
+
+func (c *Client) ensureConn() error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if c.conn != nil {
+		return nil
+	}
+	if c.cfg.Transport == "tcp" {
+		nc, err := net.DialTimeout("tcp", net.JoinHostPort(c.cfg.Host, strconv.Itoa(c.cfg.Port)), dialTimeout)
+		if err != nil {
+			return err
+		}
+		c.conn = nc
+	} else {
+		sp, err := serial.Open(c.cfg.ComPort, &serial.Mode{BaudRate: c.cfg.Baud})
+		if err != nil {
+			return err
+		}
+		// CRITICAL: hold DTR/RTS LOW. Windows may assert them on open, and while
+		// asserted the amp's front-panel power button is blocked (they are its
+		// remote power-on lines).
+		_ = sp.SetDTR(false)
+		_ = sp.SetRTS(false)
+		// Short read timeout so the frame reader can poll the stop channel and
+		// detect staleness rather than blocking forever.
+		_ = sp.SetReadTimeout(200 * time.Millisecond)
+		c.conn = sp
+	}
+	c.statusMu.Lock()
+	c.status.PortOpen = true
+	c.statusMu.Unlock()
+	applog.Printf("acom: %s link open (%s)", c.mdl.Name, c.cfg.Transport)
+	_, _ = c.conn.Write(cmdEnableTelemetry)
+	return nil
+}
+
+func (c *Client) dropLocked() {
+	if c.conn != nil {
+		c.conn.Close()
+		c.conn = nil
+	}
+	c.statusMu.Lock()
+	c.status.PortOpen = false
+	c.statusMu.Unlock()
+}
+
+// readByte reads a single byte, honouring the transport's short timeout. A serial
+// read that times out returns (0, nil) with go.bug.st/serial — mapped to an error
+// here so callers can distinguish "no data yet".
+var errNoData = fmt.Errorf("no data")
+
+func (c *Client) readByte(deadline time.Time) (byte, error) {
+	c.mu.Lock()
+	conn := c.conn
+	c.mu.Unlock()
+	if conn == nil {
+		return 0, fmt.Errorf("not connected")
+	}
+	buf := make([]byte, 1)
+	for {
+		if nc, ok := conn.(net.Conn); ok {
+			_ = nc.SetReadDeadline(time.Now().Add(300 * time.Millisecond))
+		}
+		n, err := conn.Read(buf)
+		if n == 1 {
+			c.rawSeen++
+			// Capture the first 144 raw bytes (~2 frames) once, so a session log shows
+			// what the wire actually carries when frames won't validate.
+			if !c.dbgLogged {
+				c.dbgBytes = append(c.dbgBytes, buf[0])
+				if len(c.dbgBytes) >= 144 {
+					c.dbgLogged = true
+					applog.Printf("acom: first raw bytes: % X", c.dbgBytes)
+					c.dbgBytes = nil
+				}
+			}
+			return buf[0], nil
+		}
+		if err != nil {
+			if ne, ok := err.(net.Error); ok && ne.Timeout() {
+				err = nil // treat like the serial short-timeout: just no data yet
+			} else {
+				return 0, err
+			}
+		}
+		select {
+		case <-c.stop:
+			return 0, fmt.Errorf("stopped")
+		default:
+		}
+		if time.Now().After(deadline) {
+			return 0, errNoData
+		}
+	}
+}
+
+// readFrame syncs on 0x55 0x2F, reads the rest of the 72-byte frame and verifies
+// the mod-256 checksum (sum of ALL 72 bytes ≡ 0).
+func (c *Client) readFrame() ([]byte, error) {
+	deadline := time.Now().Add(ioTimeout)
+	// Sync: hunt for 0x55 followed by 0x2F.
+	for {
+		b, err := c.readByte(deadline)
+		if err != nil {
+			return nil, err
+		}
+		if b != sync0 {
+			continue
+		}
+		b2, err := c.readByte(deadline)
+		if err != nil {
+			return nil, err
+		}
+		if b2 == sync1 {
+			break
+		}
+	}
+	frame := make([]byte, frameLen)
+	frame[0], frame[1] = sync0, sync1
+	for i := 2; i < frameLen; i++ {
+		b, err := c.readByte(deadline)
+		if err != nil {
+			return nil, err
+		}
+		frame[i] = b
+	}
+	var sum int
+	for _, b := range frame {
+		sum += int(b)
+	}
+	if sum%256 != 0 {
+		c.ckFails++
+		if c.ckFails <= 3 {
+			applog.Printf("acom: bad checksum (fail #%d): % X", c.ckFails, frame)
+		}
+		return nil, fmt.Errorf("bad checksum")
+	}
+	return frame, nil
+}
+
+// decodeFrame extracts the telemetry fields (see the package comment for the
+// reverse-engineered layout; 16-bit values are little-endian lo + hi*256).
+func (c *Client) decodeFrame(f []byte) {
+	u16 := func(i int) int { return int(f[i]) + int(f[i+1])*256 }
+	paStatus := int(f[3]&0xF0) >> 4
+	state := paStatusNames[paStatus]
+	if state == "" {
+		state = fmt.Sprintf("?%d", paStatus)
+	}
+	bandIdx := int(f[69] & 0x0F)
+	band := ""
+	if bandIdx > 0 && bandIdx < len(acomBands) {
+		band = acomBands[bandIdx]
+	}
+
+	c.statusMu.Lock()
+	defer c.statusMu.Unlock()
+	c.status.Connected = true
+	c.status.LastError = ""
+	c.status.State = state
+	c.status.Operate = paStatus == 6 || paStatus == 7
+	c.status.TX = paStatus == 7
+	c.status.DCPowerW = u16(8) / 10
+	c.status.TempC = u16(16) - c.mdl.TempOffset
+	c.status.DriveW = u16(20)
+	c.status.FwdW = u16(22)
+	c.status.ReflW = u16(24)
+	c.status.SWR = float64(u16(26)) / 100
+	c.status.ErrCode = int(f[66])
+	c.status.ErrText = errText(int(f[66]))
+	c.status.Band = band
+	c.status.FanLevel = int(f[69]&0xF0) >> 4
+}

internal/adif/export.go

@@ -120,6 +120,18 @@ func SingleRecordADIF(q qso.QSO) string {
 	return b.String()
 }
 
+// FullRecordADIF serialises one QSO LOSSLESSLY — including the APP_* extras —
+// so it can be written out and read back with nothing dropped. Used by the
+// offline queue: a QSO parked in the safety file must come back identical
+// (extras carry its queue id, awards refs, ADIF 3.1.7 leftovers…).
+func FullRecordADIF(q qso.QSO) string {
+	var b strings.Builder
+	bw := bufio.NewWriter(&b)
+	writeRecord(bw, q, true)
+	bw.Flush()
+	return b.String()
+}
+
 // BatchRecordsADIF wraps already-serialised records (each terminated by <EOR>,
 // e.g. from SingleRecordADIF) in a minimal ADIF document with a standard
 // header. Used by file-based batch upload APIs such as Club Log's putlogs.php.

internal/antgenius/antgenius.go

@@ -32,9 +32,13 @@ const (
 )
 
 // Antenna is one configured antenna (index + name as stored on the device).
+// Bands is the device's band bitmask for the antenna (which bands it covers);
+// 0 = unknown/all. The UI uses it to show only band-appropriate antennas, like
+// the native 4O3A app.
 type Antenna struct {
 	Index int    `json:"index"`
 	Name  string `json:"name"`
+	Bands int    `json:"bands"`
 }
 
 // Status is the snapshot the UI renders.
@@ -65,6 +69,8 @@ type Client struct {
 	statusMu sync.RWMutex
 	status   Status
 	antennas map[int]string // index → name (rebuilt into status.Antennas)
+	antBands map[int]int    // index → band bitmask (which bands the antenna covers)
+	antRawN  int            // one-shot: how many raw antenna lines we've logged
 
 	stop    chan struct{}
 	running bool
@@ -80,6 +86,7 @@ func New(host string, port int, password string) *Client {
 		password: strings.TrimSpace(password),
 		stop:     make(chan struct{}),
 		antennas: map[int]string{},
+		antBands: map[int]int{},
 		status:   Status{Host: host},
 	}
 }
@@ -356,13 +363,24 @@ func (c *Client) parseAntenna(msg string) {
 		// The device stores spaces as underscores in names.
 		name = strings.TrimSpace(strings.ReplaceAll(name, "_", " "))
 	}
+	// Band bitmask: which bands this antenna is configured for. The device sends
+	// it as "band=<mask>" (a bitmask). Kept so the UI can show only band-relevant
+	// antennas (like the native app). Log the first few raw antenna lines so the
+	// exact field name + bit values can be confirmed on real hardware.
+	bands := kvInt(msg, "band")
 	c.statusMu.Lock()
+	if c.antRawN < 8 {
+		c.antRawN++
+		applog.Printf("antgenius: antenna raw #%d: %q (parsed band mask=%d/0x%X)", c.antRawN, msg, bands, bands)
+	}
 	if name != "" && !isPlaceholderName(name) {
 		c.antennas[id] = name
+		c.antBands[id] = bands
 	} else {
 		delete(c.antennas, id) // unconfigured slot ("Antenna 4", etc.) → not shown
+		delete(c.antBands, id)
 	}
-	c.status.Antennas = sortedAntennas(c.antennas)
+	c.status.Antennas = sortedAntennas(c.antennas, c.antBands)
 	c.status.Connected = true
 	c.statusMu.Unlock()
 }
@@ -431,10 +449,10 @@ func isPlaceholderName(name string) bool {
 	return err == nil
 }
 
-func sortedAntennas(m map[int]string) []Antenna {
+func sortedAntennas(m map[int]string, bands map[int]int) []Antenna {
 	out := make([]Antenna, 0, len(m))
 	for idx, name := range m {
-		out = append(out, Antenna{Index: idx, Name: name})
+		out = append(out, Antenna{Index: idx, Name: name, Bands: bands[idx]})
 	}
 	sort.Slice(out, func(i, j int) bool { return out[i].Index < out[j].Index })
 	return out

internal/applog/applog.go

@@ -47,10 +47,15 @@ func Init(dataDir string) (string, error) {
 			_ = os.Rename(oldLog, logPath)
 		}
 	}
-	// Truncate if the file grew past ~5MB so we don't accumulate logs
-	// forever. We keep one file — simple and adequate for diagnostics.
-	if fi, err := os.Stat(logPath); err == nil && fi.Size() > 5*1024*1024 {
-		_ = os.Remove(logPath)
+	// Rotate (don't delete) once the file grows past ~10MB: rename it to
+	// opslog.log.1 so the PREVIOUS session's log survives. Deleting it outright used
+	// to erase exactly the diagnostics we needed when a user reported an issue from
+	// the session that just ended. One generation kept — enough, without unbounded growth.
+	if fi, err := os.Stat(logPath); err == nil && fi.Size() > 10*1024*1024 {
+		_ = os.Remove(logPath + ".1")     // drop the older generation
+		if err := os.Rename(logPath, logPath+".1"); err != nil {
+			_ = os.Remove(logPath) // rename failed (locked?) → fall back to the old behaviour
+		}
 	}
 	f, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
 	if err != nil {

internal/audio/codec.go

@@ -0,0 +1,57 @@
+package audio
+
+import "fmt"
+
+// Codec converts between the wire payload of a network audio stream (Icom 50003)
+// and OpsLog's internal PCM (16 kHz mono 16-bit little-endian — the format the
+// capture/render engine and the pcmRing use). It exists so the transport code
+// (icomaudio.go) never hard-codes a format: today PCM is an identity passthrough;
+// tomorrow an Opus codec implements the same two methods and drops in unchanged.
+// This mirrors how civTransport abstracts the CAT byte stream from its transport.
+type Codec interface {
+	// Name is a short label for logs/UI.
+	Name() string
+	// Decode turns one received audio payload into internal PCM. The returned
+	// slice is freshly allocated (the caller may retain it).
+	Decode(payload []byte) ([]byte, error)
+	// Encode turns internal PCM into a payload to transmit.
+	Encode(pcm []byte) ([]byte, error)
+}
+
+// pcm16Codec is the uncompressed 16-bit-PCM codec — the Icom "uncompressed"
+// audio mode (rxcodec/txcodec in the conninfo). Icom sends little-endian 16-bit
+// mono samples, which is byte-for-byte OpsLog's internal format, so decode/encode
+// are copies. It is the Phase-4/5 default: zero-dependency, lossless, ideal on a
+// LAN. Opus (for WAN/internet bandwidth) becomes another Codec later.
+//
+// NOTE: rate conversion is deliberately NOT this layer's job. The Icom RX audio
+// is 16 kHz = our internal rate, so RX needs none. The rig's TX side may run at a
+// different rate (the captured conninfo showed 8 kHz) — Phase 5 will resample in
+// the TX path before Encode; keeping the codec rate-agnostic keeps that concern
+// in one place.
+type pcm16Codec struct{}
+
+// NewPCM16Codec returns the uncompressed 16-bit PCM codec.
+func NewPCM16Codec() Codec { return pcm16Codec{} }
+
+func (pcm16Codec) Name() string { return "pcm16" }
+
+func (pcm16Codec) Decode(payload []byte) ([]byte, error) {
+	// Icom PCM payloads are whole 16-bit samples; an odd length means a truncated
+	// packet — trim the stray byte rather than emit a half-sample click.
+	n := len(payload) &^ 1
+	if n != len(payload) {
+		if n == 0 {
+			return nil, fmt.Errorf("pcm16: payload too short (%d bytes)", len(payload))
+		}
+	}
+	out := make([]byte, n)
+	copy(out, payload[:n])
+	return out, nil
+}
+
+func (pcm16Codec) Encode(pcm []byte) ([]byte, error) {
+	out := make([]byte, len(pcm))
+	copy(out, pcm)
+	return out, nil
+}

internal/audio/codec_test.go

@@ -0,0 +1,37 @@
+package audio
+
+import "testing"
+
+func TestPCM16CodecRoundTrip(t *testing.T) {
+	c := NewPCM16Codec()
+	in := []byte{0x01, 0x02, 0x03, 0x04, 0xff, 0x7f}
+	enc, err := c.Encode(in)
+	if err != nil {
+		t.Fatalf("encode: %v", err)
+	}
+	dec, err := c.Decode(enc)
+	if err != nil {
+		t.Fatalf("decode: %v", err)
+	}
+	if string(dec) != string(in) {
+		t.Fatalf("round-trip mismatch: got % X want % X", dec, in)
+	}
+}
+
+func TestPCM16CodecTrimsOddByte(t *testing.T) {
+	c := NewPCM16Codec()
+	dec, err := c.Decode([]byte{0x10, 0x20, 0x30}) // 3 bytes = 1 sample + stray
+	if err != nil {
+		t.Fatalf("decode: %v", err)
+	}
+	if len(dec) != 2 {
+		t.Fatalf("expected the stray byte trimmed to 2, got %d", len(dec))
+	}
+}
+
+func TestPCM16CodecRejectsSingleByte(t *testing.T) {
+	c := NewPCM16Codec()
+	if _, err := c.Decode([]byte{0x10}); err == nil {
+		t.Fatalf("expected an error for a sub-sample payload")
+	}
+}

internal/audio/engine.go

@@ -5,6 +5,7 @@ package audio
 import (
 	"fmt"
 	"runtime"
+	"sync"
 	"time"
 	"unsafe"
 
@@ -269,3 +270,151 @@ func playPCM(deviceID string, pcm []byte, rate, ch, bits int, stop <-chan struct
 		time.Sleep(10 * time.Millisecond)
 	}
 }
+
+// pcmRing is a thread-safe, latency-bounded FIFO of PCM bytes feeding a live
+// render stream. Producers (a USB-codec capture, or a decoded network audio
+// stream) Push freshly-arrived samples; the render loop Pulls. It is the shared
+// hand-off point between "where the audio comes from" (USB device / UDP 50003)
+// and "where it's heard" (any WASAPI output) — so the transport can be swapped
+// without touching the render side, mirroring the civTransport split on the CAT
+// side. On overflow the oldest audio is dropped to keep latency bounded; on
+// underrun Pull simply returns short and the render loop pads with silence.
+type pcmRing struct {
+	mu  sync.Mutex
+	buf []byte
+	max int // hard cap in bytes (drops oldest beyond this → bounded latency)
+}
+
+// newPCMRing makes a ring whose backlog is capped at maxBytes. Size it from the
+// acceptable latency: bytesPerSec (=32000) worth ≈ 1 s.
+func newPCMRing(maxBytes int) *pcmRing {
+	if maxBytes <= 0 {
+		maxBytes = bytesPerSec // 1 s default
+	}
+	return &pcmRing{max: maxBytes}
+}
+
+// Push appends samples, dropping the oldest audio if the backlog would exceed
+// the cap (a slow/absent consumer never makes the producer block or grow without
+// bound). A short glitch beats runaway latency for live monitoring.
+func (r *pcmRing) Push(p []byte) {
+	if len(p) == 0 {
+		return
+	}
+	r.mu.Lock()
+	r.buf = append(r.buf, p...)
+	if len(r.buf) > r.max {
+		drop := len(r.buf) - r.max
+		r.buf = append(r.buf[:0], r.buf[drop:]...)
+	}
+	r.mu.Unlock()
+}
+
+// pull removes and returns up to maxBytes of queued PCM (a private copy), or nil
+// when empty. The render loop pads any shortfall with silence.
+func (r *pcmRing) pull(maxBytes int) []byte {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	if len(r.buf) == 0 || maxBytes <= 0 {
+		return nil
+	}
+	n := maxBytes
+	if n > len(r.buf) {
+		n = len(r.buf)
+	}
+	out := make([]byte, n)
+	copy(out, r.buf[:n])
+	r.buf = append(r.buf[:0], r.buf[n:]...)
+	return out
+}
+
+// renderStream continuously renders PCM pulled from src to a device until stop
+// closes — the streaming counterpart to playPCM's fixed buffer. On underrun it
+// writes silence rather than glitching, keeping the WASAPI clock steady so live
+// monitor audio flows smoothly even when the source stalls briefly. Runs on a
+// COM-initialised, OS-locked thread.
+func renderStream(deviceID string, rate, ch, bits int, stop <-chan struct{}, src *pcmRing) error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+	if err := coInit(); err != nil {
+		return fmt.Errorf("CoInitialize: %w", err)
+	}
+	defer ole.CoUninitialize()
+
+	dev, err := openDevice(wca.ERender, deviceID)
+	if err != nil {
+		return err
+	}
+	defer dev.Release()
+
+	var ac *wca.IAudioClient
+	if err := dev.Activate(wca.IID_IAudioClient, wca.CLSCTX_ALL, nil, &ac); err != nil {
+		return fmt.Errorf("activate render: %w", err)
+	}
+	defer ac.Release()
+
+	frameBytes := ch * bits / 8
+	if frameBytes <= 0 {
+		return fmt.Errorf("bad audio format")
+	}
+	wfx := &wca.WAVEFORMATEX{
+		WFormatTag: 1, NChannels: uint16(ch), NSamplesPerSec: uint32(rate),
+		NAvgBytesPerSec: uint32(rate * frameBytes), NBlockAlign: uint16(frameBytes),
+		WBitsPerSample: uint16(bits), CbSize: 0,
+	}
+	if err := ac.Initialize(wca.AUDCLNT_SHAREMODE_SHARED, autoConvert,
+		wca.REFERENCE_TIME(bufferDuration100ns), 0, wfx, nil); err != nil {
+		return fmt.Errorf("initialize render: %w", err)
+	}
+	var bufFrames uint32
+	if err := ac.GetBufferSize(&bufFrames); err != nil {
+		return err
+	}
+	var arc *wca.IAudioRenderClient
+	if err := ac.GetService(wca.IID_IAudioRenderClient, &arc); err != nil {
+		return fmt.Errorf("get render service: %w", err)
+	}
+	defer arc.Release()
+
+	// feed fills up to `frames` render frames: as much real audio as the ring
+	// has, the remainder silence (so the buffer stays full and the clock steady).
+	feed := func(frames int) error {
+		if frames <= 0 {
+			return nil
+		}
+		var data *byte
+		if err := arc.GetBuffer(uint32(frames), &data); err != nil {
+			return err
+		}
+		dst := unsafe.Slice(data, frames*frameBytes)
+		got := src.pull(frames * frameBytes)
+		n := copy(dst, got)
+		for i := n; i < len(dst); i++ {
+			dst[i] = 0 // silence-fill the shortfall
+		}
+		arc.ReleaseBuffer(uint32(frames), 0)
+		return nil
+	}
+
+	if err := feed(int(bufFrames)); err != nil { // pre-fill to avoid a start glitch
+		return err
+	}
+	if err := ac.Start(); err != nil {
+		return fmt.Errorf("start render: %w", err)
+	}
+	defer ac.Stop()
+
+	for {
+		select {
+		case <-stop:
+			return nil
+		default:
+		}
+		var padding uint32
+		ac.GetCurrentPadding(&padding)
+		if err := feed(int(bufFrames - padding)); err != nil {
+			return err
+		}
+		time.Sleep(8 * time.Millisecond)
+	}
+}

internal/audio/manager.go

@@ -15,7 +15,10 @@ type Manager struct {
 	recStop  chan struct{}
 	recDone  chan recResult
 	playStop chan struct{}
-	onChange func() // fired on any record/playback state transition
+	monStop  chan struct{} // RX monitor passthrough (capture → render)
+	monRing  *pcmRing      // live audio hand-off, also fed by the network stream
+	txStop   chan struct{} // TX audio passthrough (mic → rig)
+	onChange func()        // fired on any record/playback state transition
 }
 
 type recResult struct {
@@ -135,3 +138,130 @@ func (m *Manager) StopPlayback() {
 		m.notify()
 	}
 }
+
+// ---- RX audio monitor (Phase 2: USB codec passthrough) --------------------
+//
+// StartMonitor pipes live RX audio from inputDev (e.g. the rig's "USB Audio
+// CODEC" capture endpoint) to outputDev (your speakers/headset) through a
+// latency-bounded ring, so you HEAR the radio inside OpsLog. The very same ring
+// is later fed by the network 50003 stream instead of a USB capture — the render
+// half is transport-agnostic. inputDev "" = system default capture.
+func (m *Manager) StartMonitor(inputDev, outputDev string) error {
+	return m.startMonitor(inputDev, outputDev, true)
+}
+
+// StartMonitorSink starts ONLY the render side (no USB capture) so an external
+// producer — the network 50003 stream — can feed decoded RX PCM via
+// PushMonitorAudio. Same output path as StartMonitor, minus the capture goroutine.
+func (m *Manager) StartMonitorSink(outputDev string) error {
+	return m.startMonitor("", outputDev, false)
+}
+
+// startMonitor wires the RX monitor: always a render loop pulling from monRing;
+// when capture is true it also captures inputDev into that ring (USB monitor).
+// When false the ring is fed only by PushMonitorAudio (network audio).
+func (m *Manager) startMonitor(inputDev, outputDev string, capture bool) error {
+	m.mu.Lock()
+	if m.monStop != nil {
+		m.mu.Unlock()
+		return fmt.Errorf("monitor already running")
+	}
+	stop := make(chan struct{})
+	ring := newPCMRing(bytesPerSec / 2) // ~500 ms cap — low latency for live monitor
+	m.monStop, m.monRing = stop, ring
+	m.mu.Unlock()
+
+	if capture {
+		// Producer: capture the rig's USB audio into the ring.
+		go func() {
+			_ = captureStream(inputDev, stop, func(chunk []byte) { ring.Push(chunk) })
+		}()
+	}
+	// Consumer: render the ring to the output device at the internal 16 kHz mono.
+	go func() {
+		_ = renderStream(outputDev, sampleRate, channels, bitsPerSample, stop, ring)
+	}()
+	m.notify()
+	return nil
+}
+
+// StopMonitor stops the RX monitor passthrough.
+func (m *Manager) StopMonitor() {
+	m.mu.Lock()
+	stop := m.monStop
+	m.monStop, m.monRing = nil, nil
+	m.mu.Unlock()
+	if stop != nil {
+		close(stop)
+		m.notify()
+	}
+}
+
+// MonitorActive reports whether the RX monitor passthrough is running.
+func (m *Manager) MonitorActive() bool {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	return m.monStop != nil
+}
+
+// PushMonitorAudio feeds externally-sourced PCM (16 kHz mono 16-bit) into the
+// active monitor's output — the hook the network 50003 audio stream uses to play
+// decoded RX through the very same output path a USB capture feeds. No-op when no
+// monitor is running. Keeps the unexported ring inside the package.
+func (m *Manager) PushMonitorAudio(pcm []byte) {
+	m.mu.Lock()
+	ring := m.monRing
+	m.mu.Unlock()
+	if ring != nil {
+		ring.Push(pcm)
+	}
+}
+
+// ---- TX audio passthrough (Phase 3: live mic → rig over USB) --------------
+//
+// StartTXAudio pipes your live microphone (micDev) into the rig's audio input
+// (toRadioDev — for a USB-connected rig, its "USB Audio CODEC" render endpoint),
+// so you talk through the PC. It is the mirror of StartMonitor (same ring +
+// capture + render primitives, source/sink swapped). PTT keying is the caller's
+// job (the app layer keys PTT before this and unkeys after) so this stays a pure
+// audio route. The captured 16 kHz mono stream is also the exact shape the future
+// network 50003 TX will encode and send — so Phase 5 reuses this capture side.
+func (m *Manager) StartTXAudio(micDev, toRadioDev string) error {
+	m.mu.Lock()
+	if m.txStop != nil {
+		m.mu.Unlock()
+		return fmt.Errorf("TX audio already running")
+	}
+	stop := make(chan struct{})
+	ring := newPCMRing(bytesPerSec / 4) // ~250 ms — tighter for live TX latency
+	m.txStop = stop
+	m.mu.Unlock()
+
+	go func() {
+		_ = captureStream(micDev, stop, func(chunk []byte) { ring.Push(chunk) })
+	}()
+	go func() {
+		_ = renderStream(toRadioDev, sampleRate, channels, bitsPerSample, stop, ring)
+	}()
+	m.notify()
+	return nil
+}
+
+// StopTXAudio stops the TX mic→rig passthrough.
+func (m *Manager) StopTXAudio() {
+	m.mu.Lock()
+	stop := m.txStop
+	m.txStop = nil
+	m.mu.Unlock()
+	if stop != nil {
+		close(stop)
+		m.notify()
+	}
+}
+
+// TXAudioActive reports whether the TX mic→rig passthrough is running.
+func (m *Manager) TXAudioActive() bool {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	return m.txStop != nil
+}

internal/award/award.go

@@ -13,6 +13,10 @@
 package award
 
 import (
+	"embed"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"regexp"
 	"sort"
 	"strconv"
@@ -55,23 +59,33 @@ type Def struct {
 	ValidFrom   string `json:"valid_from,omitempty"`  // ISO date (QSOs before don't count)
 	ValidTo     string `json:"valid_to,omitempty"`    // ISO date (QSOs after don't count)
 	Alias       string `json:"alias,omitempty"`
+	// RefDisplay picks what the grid's award column shows for a match: "" or "ref"
+	// = the reference (e.g. WAJA "36"), "name" = the reference's description (e.g.
+	// the prefecture name), "both" = "ref — name". DXCC always shows the country
+	// name under "ref" (unchanged).
+	RefDisplay string `json:"ref_display,omitempty"`
 
 	// --- Type & matching ---
 	Type         AwardType `json:"type,omitempty"`          // matching strategy (default QSOFIELDS)
-	Field        string    `json:"field"`                   // QSO field to scan (see fieldRaw)
-	MatchBy      string    `json:"match_by,omitempty"`      // "code" | "description" | "pattern"
-	ExactMatch   bool      `json:"exact_match,omitempty"`   // match the whole field vs substring
-	Pattern      string    `json:"pattern"`                 // award-level Go regexp; group 1 = reference
-	LeadingStr   string    `json:"leading_str,omitempty"`   // strip this prefix before matching
-	TrailingStr  string    `json:"trailing_str,omitempty"`  // strip this suffix before matching
-	Multi        bool      `json:"multi,omitempty"`         // a QSO may count for several references
-	Dynamic      bool      `json:"dynamic,omitempty"`       // references not predefined (any value counts)
-	AddPrefixes  []string  `json:"add_prefixes,omitempty"`  // possible reference additional prefixes
+	Field       string    `json:"field"`                  // QSO field to scan (see fieldRaw)
+	MatchBy     string    `json:"match_by,omitempty"`     // "code" | "description" | "pattern"
+	ExactMatch  bool      `json:"exact_match,omitempty"`  // match the whole field vs substring
+	Pattern     string    `json:"pattern"`                // award-level Go regexp; group 1 = reference
+	LeadingStr  string    `json:"leading_str,omitempty"`  // strip this prefix before matching
+	TrailingStr string    `json:"trailing_str,omitempty"` // strip this suffix before matching
+	Dynamic     bool      `json:"dynamic,omitempty"`      // references not predefined (any value counts)
+	// NOTE: there is no "one reference per QSO" switch, and there was never any
+	// point in one. A QSO ALWAYS yields every reference its field holds — an n-fer
+	// POTA activation ("US-6544,US-0680"), a VUCC contact on a grid line. The old
+	// `Multi` flag was read by nothing; its checkbox changed nothing.
 
-	// OrRules are ADDITIONAL searches OR'd with the primary one above: a QSO
-	// earns a reference if the primary match OR any of these match. Lets a
-	// French department (DDFM) be found from "D74" in the note AND from a postal
-	// code "74140" in the address (pattern captures "74", Prefix "D" → "D74").
+	// OrRules are ordered FALLBACK searches for the primary one above: they are
+	// tried IN ORDER and only while nothing has matched yet — the first rule that
+	// yields a reference wins and the rest are skipped (short-circuit, like a
+	// chain of "else if"). Lets a Chinese province (WAPC) be found first from the
+	// province NAME in the address, and only if that fails, from a city regex
+	// (e.g. "\bJiangyin\b" → JS) — so a QSO already resolved by name isn't also
+	// re-tagged, possibly differently, by a later rule.
 	OrRules []OrRule `json:"or_rules,omitempty"`
 
 	// --- Scope ---
@@ -83,11 +97,45 @@ type Def struct {
 	// --- Confirmation ---
 	Confirm             []string `json:"confirm"`                          // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom
 	Validate            []string `json:"validate,omitempty"`               // validated/granted sources
-	GrantCodes          string   `json:"grant_codes,omitempty"`            // ADIF credit grant codes
-	ExportCreditGranted bool     `json:"export_credit_granted,omitempty"`  // write ADIF credit_granted
+	// NOT IMPLEMENTED. Kept so the values operators already typed are not lost, but
+	// nothing reads them: no ADIF export has ever written CREDIT_GRANTED. Their
+	// controls have been removed from the editor — a checkbox that quietly does
+	// nothing is worse than no checkbox, because it is trusted. Wire these up (in
+	// internal/adif) before showing them again.
+	GrantCodes          string `json:"grant_codes,omitempty"`           // ADIF credit grant codes
+	ExportCreditGranted bool   `json:"export_credit_granted,omitempty"` // write ADIF credit_granted
 
 	Total   int  `json:"total"`   // known denominator (0 = unknown / derive from list)
 	Builtin bool `json:"builtin"` // shipped default (informational)
+
+	// --- Catalog updates ---
+	// Version is the revision of a SHIPPED award. Bump it in the catalog JSON when
+	// you fix a definition (a better OR chain, a corrected reference list) and want
+	// that fix to reach operators who already run the award: on startup, a catalog
+	// award whose Version is higher than the stored one REPLACES it, definition and
+	// references. Awards created by the operator have no version and are never touched.
+	Version int `json:"version,omitempty"`
+	// UserEdited marks an award the operator has changed. A catalog update then
+	// SKIPS it: their work outranks ours. Set the moment the award (or its reference
+	// list) is saved to something other than what the catalog ships.
+	UserEdited bool `json:"user_edited,omitempty"`
+}
+
+// SameContent reports whether two definitions describe the same award — ignoring
+// the bookkeeping fields (version, the user-edited flag, the derived builtin bit),
+// which say where a definition came from, not what it does. Used to decide whether
+// a save actually changed anything.
+func (d Def) SameContent(o Def) bool {
+	a, b := d, o
+	a.Version, b.Version = 0, 0
+	a.UserEdited, b.UserEdited = false, false
+	a.Builtin, b.Builtin = false, false
+	ja, err1 := json.Marshal(a)
+	jb, err2 := json.Marshal(b)
+	if err1 != nil || err2 != nil {
+		return false
+	}
+	return string(ja) == string(jb)
 }
 
 // OrRule is one additional search OR'd with the award's primary matching rule.
@@ -104,26 +152,124 @@ type OrRule struct {
 	Prefix      string `json:"prefix,omitempty"`       // prepended to each found reference
 }
 
-// Defaults are the built-in awards seeded on first run (then user-editable).
-func Defaults() []Def {
-	// Confirmed = any confirmation (LoTW or paper QSL). Validated = the stricter
-	// "electronically verified" tier: LoTW only — a paper QSL confirms but does
-	// NOT validate (matches ARRL/Log4OM). eQSL counts only where the program
-	// accepts it (WAC).
-	lq := []string{"lotw", "qsl"}
-	lo := []string{"lotw"}
-	return []Def{
-		{Code: "DXCC", Name: "DX Century Club", Type: TypeDXCC, Field: "dxcc", Confirm: lq, Validate: lo, Total: 340, Valid: true, Builtin: true, Protected: true},
-		{Code: "WAS", Name: "Worked All States", Type: TypeQSOFields, Field: "state", MatchBy: "code", ExactMatch: true, DXCCFilter: []int{291, 110, 6}, Confirm: lq, Validate: lo, Total: 50, Valid: true, Builtin: true, Protected: true},
-		{Code: "WAZ", Name: "Worked All Zones (CQ)", Type: TypeQSOFields, Field: "cqz", MatchBy: "code", ExactMatch: true, Confirm: lq, Validate: lo, Total: 40, Valid: true, Builtin: true, Protected: true},
-		{Code: "WAC", Name: "Worked All Continents", Type: TypeQSOFields, Field: "cont", MatchBy: "code", ExactMatch: true, Confirm: []string{"lotw", "qsl", "eqsl"}, Validate: lo, Total: 6, Valid: true, Builtin: true, Protected: true},
-		{Code: "WPX", Name: "Worked All Prefixes (CQ WPX)", Type: TypeQSOFields, Field: "prefix", Dynamic: true, Confirm: lq, Validate: lo, Total: 0, Valid: true, Builtin: true, Protected: true},
-		{Code: "DDFM", Name: "Départements Français Métropolitains", Type: TypeQSOFields, Field: "note", Pattern: `(?i)\b(D\d{1,2}[AB]?)\b`, DXCCFilter: []int{227}, Confirm: lq, Validate: lo, Total: 96, Valid: true, Builtin: true, Protected: true},
-		{Code: "IOTA", Name: "Islands On The Air", Type: TypeReference, Field: "iota", Dynamic: true, Confirm: []string{"qsl"}, Validate: lo, Total: 0, Valid: true, Builtin: true, Protected: true},
-		{Code: "POTA", Name: "Parks On The Air", Type: TypeReference, Field: "pota_ref", Dynamic: true, Confirm: lq, Validate: lo, Total: 0, Valid: true, Builtin: true, Protected: true},
-		{Code: "SOTA", Name: "Summits On The Air", Type: TypeReference, Field: "sota_ref", Dynamic: true, Confirm: lq, Validate: lo, Total: 0, Valid: true, Builtin: true, Protected: true},
-		{Code: "WWFF", Name: "World Wide Flora & Fauna", Type: TypeReference, Field: "wwff", Dynamic: true, Confirm: lq, Validate: lo, Total: 0, Valid: true, Builtin: true, Protected: true},
+// catalogFS holds the built-in award definitions as DATA, not Go code.
+//
+// An award is data — a field to scan, a pattern, a scope. Coding it in Go meant a
+// recompile and a release for every new one, which is absurd for something that
+// changes far more often than the engine that reads it. They now live one JSON per
+// award in catalog/, embedded in the binary: adding an award is adding a file.
+//
+// This is the SEED only. Once a user has awards in their database, that database
+// is the source of truth — the catalog never overwrites their edits behind their
+// back.
+//
+//go:embed catalog/*.json
+var catalogFS embed.FS
+
+// CatalogEntry is one award in the catalog: its definition AND its reference list.
+//
+// The references are the point. An award's definition is a few lines; what makes
+// WAPC worth anything is its 34 provinces and the city regexes attached to them.
+// A catalog that shipped definitions only would hand every user an empty shell —
+// which is exactly the trap this design is meant to avoid.
+//
+// References stay as raw JSON so this package (the matching ENGINE) never has to
+// import the reference-store package. The caller decodes them.
+type CatalogEntry struct {
+	Def        Def             `json:"def"`
+	References json.RawMessage `json:"references,omitempty"`
+}
+
+// catalogFile is what a file in catalog/ may contain. Two shapes are accepted:
+//
+//	{"def": {...}, "references": [...]}                  — a catalog entry
+//	{"version":1, "awards":[{"def":…,"references":…}]}   — an exported bundle
+//
+// Accepting the bundle shape is deliberate: it means an award EXPORTED from the UI
+// can be dropped straight into catalog/ and shipped to everyone, with no
+// conversion step. That is the whole loop — create an award, export it, drop it in,
+// everybody has it.
+type catalogFile struct {
+	Def        Def             `json:"def"`
+	References json.RawMessage `json:"references,omitempty"`
+	Awards     []CatalogEntry  `json:"awards,omitempty"`
+	// A bare Def (the original catalog shape) is still read via the fields above
+	// being empty and Code being set at the top level.
+	Code string `json:"code,omitempty"`
+}
+
+// Catalog returns every built-in award: definition + references, sorted by code.
+//
+// Sorted because an embed.FS walk is alphabetical and relying on that implicitly is
+// how a user's award list quietly reorders itself on a rebuild.
+func Catalog() []CatalogEntry {
+	entries, err := catalogFS.ReadDir("catalog")
+	if err != nil {
+		return nil // embedded: can only fail if the build is broken
 	}
+	out := make([]CatalogEntry, 0, len(entries))
+	for _, e := range entries {
+		if e.IsDir() || !strings.HasSuffix(e.Name(), ".json") {
+			continue
+		}
+		b, err := catalogFS.ReadFile("catalog/" + e.Name())
+		if err != nil {
+			continue
+		}
+		var f catalogFile
+		if err := json.Unmarshal(b, &f); err != nil {
+			// A malformed file must not take the other awards down with it.
+			continue
+		}
+		switch {
+		case len(f.Awards) > 0: // an exported bundle, dropped in as-is
+			for _, a := range f.Awards {
+				if strings.TrimSpace(a.Def.Code) != "" {
+					out = append(out, a)
+				}
+			}
+		case strings.TrimSpace(f.Def.Code) != "": // {"def":…,"references":…}
+			out = append(out, CatalogEntry{Def: f.Def, References: f.References})
+		case strings.TrimSpace(f.Code) != "": // a bare Def
+			var d Def
+			if err := json.Unmarshal(b, &d); err == nil {
+				out = append(out, CatalogEntry{Def: d})
+			}
+		}
+	}
+	// An award OpsLog SHIPS is built-in, by definition. Derive it here instead of
+	// trusting the flag in the file: you drop in an award you exported, its JSON
+	// says builtin:false (you wrote it, it wasn't built-in then), and it would
+	// quietly miss every future catalog correction. Making the author remember to
+	// flip a flag is exactly the kind of step nobody can guess.
+	for i := range out {
+		out[i].Def.Builtin = true
+	}
+	sort.Slice(out, func(i, j int) bool { return out[i].Def.Code < out[j].Def.Code })
+	return out
+}
+
+// Defaults are the built-in award definitions seeded on first run.
+func Defaults() []Def {
+	cat := Catalog()
+	out := make([]Def, 0, len(cat))
+	for _, e := range cat {
+		out = append(out, e.Def)
+	}
+	return out
+}
+
+// CatalogRefs returns the raw JSON reference list a catalog award ships with, if
+// any. Awards whose list is seeded from code (DXCC entities, French departments)
+// or fetched online (POTA/SOTA/WWFF) carry none.
+func CatalogRefs(code string) (json.RawMessage, bool) {
+	code = strings.ToUpper(strings.TrimSpace(code))
+	for _, e := range Catalog() {
+		if strings.ToUpper(e.Def.Code) == code && len(e.References) > 0 {
+			return e.References, true
+		}
+	}
+	return nil, false
 }
 
 // Migrate upgrades award definitions saved before the richer model existed.
@@ -172,7 +318,7 @@ func Migrate(defs []Def) ([]Def, bool) {
 func Fields() []string {
 	return []string{
 		"dxcc", "cqz", "ituz", "prefix", "callsign",
-		"state", "cont", "country", "grid", "grid4",
+		"state", "us_county", "cont", "country", "grid", "grid4",
 		"iota", "sota_ref", "pota_ref", "wwff",
 		"name", "qth", "address", "comment", "note",
 	}
@@ -252,6 +398,21 @@ type RefMeta struct {
 }
 
 // NewRefList builds the engine's reference view from (code, meta) pairs.
+// compileAwardRE compiles an award / reference regex. Award patterns are run
+// over free-text log fields (QTH, NOTES) whose capitalization is arbitrary — a
+// log may hold "Tokyo", "TOKYO" or "TOKIO" — so we match case-insensitively by
+// default. An author who set their own flag group (e.g. "(?s)") is respected.
+func compileAwardRE(p string) (*regexp.Regexp, error) {
+	p = strings.TrimSpace(p)
+	if p == "" {
+		return nil, errors.New("empty pattern")
+	}
+	if !strings.HasPrefix(p, "(?") {
+		p = "(?i)" + p
+	}
+	return regexp.Compile(p)
+}
+
 func NewRefList(metas []RefMeta) refList {
 	rl := refList{byCode: make(map[string]RefMeta, len(metas))}
 	for _, m := range metas {
@@ -260,7 +421,7 @@ func NewRefList(metas []RefMeta) refList {
 			continue
 		}
 		if p := strings.TrimSpace(m.Pattern); p != "" {
-			if re, err := regexp.Compile(p); err == nil {
+			if re, err := compileAwardRE(p); err == nil {
 				m.re = re
 				rl.withPattern = append(rl.withPattern, code)
 			}
@@ -292,7 +453,7 @@ func Compute(defs []Def, qsos []qso.QSO, refMetas map[string][]RefMeta, nameOf N
 	perr := make([]string, len(defs))
 	for i := range defs {
 		if p := strings.TrimSpace(defs[i].Pattern); p != "" {
-			re, err := regexp.Compile(p)
+			re, err := compileAwardRE(p)
 			if err != nil {
 				perr[i] = "bad pattern: " + err.Error()
 			} else {
@@ -427,24 +588,14 @@ func MatchQSO(d Def, metas []RefMeta, q *qso.QSO) []string {
 	}
 	var re *regexp.Regexp
 	if p := strings.TrimSpace(d.Pattern); p != "" {
-		if c, err := regexp.Compile(p); err == nil {
+		if c, err := compileAwardRE(p); err == nil {
 			re = c
 		} else {
 			return nil
 		}
 	}
 	rl := NewRefList(metas)
-	found := candidates(&d, re, q, rl, len(metas) > 0)
-	// Merge operator-assigned references (manual override). These let the
-	// operator tag a QSO for an award whose field/description matching can't
-	// auto-detect the reference — e.g. WAPC scans the ADDRESS field for a
-	// province NAME, so a contact whose address doesn't spell it out needs the
-	// province picked by hand. For a predefined award the override is still
-	// validated against its reference list.
-	if man := manualRefs(q, d.Code); len(man) > 0 {
-		found = mergeManual(found, man, rl, len(metas) > 0 && !d.Dynamic)
-	}
-	return found
+	return candidates(&d, re, q, rl, len(metas) > 0)
 }
 
 // ManualRefsKey is the ADIF extras key under which OpsLog stores per-QSO,
@@ -479,30 +630,6 @@ func manualRefs(q *qso.QSO, code string) []string {
 	return out
 }
 
-// mergeManual appends operator-assigned codes to the auto-found set, deduped.
-// When the award is predefined, only references present and valid in its list
-// are kept (so a typo can't invent a reference).
-func mergeManual(found, manual []string, rl refList, predefined bool) []string {
-	seen := map[string]struct{}{}
-	for _, c := range found {
-		seen[normalizeRef(c)] = struct{}{}
-	}
-	for _, c := range manual {
-		c = normalizeRef(c)
-		if _, dup := seen[c]; dup {
-			continue
-		}
-		if predefined {
-			if m, ok := rl.byCode[c]; !ok || !m.Valid {
-				continue
-			}
-		}
-		seen[c] = struct{}{}
-		found = append(found, c)
-	}
-	return found
-}
-
 // Confirmed reports whether a QSO satisfies any of the given confirmation
 // sources (lotw|qsl|eqsl). Exported for the statistics view.
 func Confirmed(q *qso.QSO, sources []string) bool { return confirmed(q, sources) }
@@ -516,6 +643,63 @@ func InScope(d Def, q *qso.QSO) bool { return inScope(&d, q) }
 // EmissionOf maps an ADIF mode to its broad category (CW|PHONE|DIGITAL).
 func EmissionOf(mode string) string { return emissionOf(mode) }
 
+// USCountyKey normalises a QSO's state + cnty into the canonical "STATE,COUNTY"
+// match code used by the US Counties (USA-CA) award, so the reference list (in
+// that same form) matches whatever shape the logbook holds. It is the SINGLE
+// source of truth: cmd/cntygen builds the reference codes by calling it, so the
+// two sides can never drift.
+//
+// Real logs are a mess — "MA,MIDDLESEX", bare "Middlesex" with the state in its
+// own column, mixed case, county-type suffixes, the odd "0", plus the FIPS list
+// abbreviating "Saint"→"St." and hyphenating "Matanuska-Susitna". The rules:
+//   - if cnty already carries "ST,County", split on the first comma; else take
+//     the state from the STATE column;
+//   - upper-case; drop periods and apostrophes; hyphens→space; strip a trailing
+//     County/Parish/Borough/Census Area/Municipality; fold Saint(e)→St(e);
+//     collapse whitespace;
+//   - require a 2-letter state and a non-empty county, else no match ("").
+func USCountyKey(state, cnty string) string {
+	s := strings.TrimSpace(cnty)
+	if s == "" || s == "0" {
+		return ""
+	}
+	var st, co string
+	if i := strings.IndexByte(s, ','); i >= 0 {
+		st, co = strings.TrimSpace(s[:i]), strings.TrimSpace(s[i+1:])
+	} else {
+		st, co = strings.TrimSpace(state), s
+	}
+	co = strings.ToUpper(co)
+	co = strings.ReplaceAll(co, ".", "")
+	co = strings.ReplaceAll(co, "'", "")
+	co = strings.ReplaceAll(co, "-", " ")
+	for _, suf := range []string{" COUNTY", " PARISH", " BOROUGH", " CENSUS AREA", " MUNICIPALITY"} {
+		if strings.HasSuffix(co, suf) {
+			co = strings.TrimSuffix(co, suf)
+			break
+		}
+	}
+	switch {
+	case strings.HasPrefix(co, "SAINTE "):
+		co = "STE " + co[len("SAINTE "):]
+	case strings.HasPrefix(co, "SAINT "):
+		co = "ST " + co[len("SAINT "):]
+	}
+	// Drop ALL internal spaces last: FIPS writes DeKalb/DuPage/LaSalle as one
+	// word, logs often split them ("De Kalb"). Removing spaces on both sides
+	// folds those together and can't collide two real counties in one state.
+	co = strings.ReplaceAll(co, " ", "")
+	st = strings.ToUpper(st)
+	if len(st) != 2 || co == "" {
+		return ""
+	}
+	// Separator is "/", NOT ",": the QSOFIELDS matcher splits a field value on
+	// commas/semicolons (n-fer POTA "US-1,US-2"), which would shatter "AL,AUTAUGA"
+	// into two non-matching tokens. The stored ADIF cnty keeps its comma; only
+	// this internal match key uses "/".
+	return st + "/" + co
+}
+
 // labelRef fills a worked reference's name/group from the reference list (or the
 // name resolver as a fallback).
 func labelRef(rf *Ref, d *Def, code string, rl refList, hasList bool, nameOf NameResolver) {
@@ -560,6 +744,14 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
 				found = append(found, nc.code)
 			}
 		}
+		// A reference may also declare its own regex to broaden matching beyond
+		// its plain name (e.g. Tokyo's `\bTok[iy]o\b` also catches "TOKIO"). Test
+		// those too — the name match and the pattern are OR'd.
+		for _, code := range rl.withPattern {
+			if m := rl.byCode[code]; m.re != nil && m.re.MatchString(raw) {
+				found = append(found, code)
+			}
+		}
 	case predefined && !exact:
 		// "Search reference inside the field": look up each token of the field in
 		// the list — O(tokens), not O(all references) — plus test the few
@@ -588,32 +780,207 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
 	return found
 }
 
+// ── Explain: why did (or didn't) this QSO count for this award? ──────────────
+//
+// An award that silently matches nothing is the hardest kind of bug to see: the
+// UI shows an empty column and the operator has no way to tell whether the QSO is
+// out of scope, the field is empty, the rule looked in the wrong place, or the
+// reference simply isn't on the list. Explain replays the matcher on ONE QSO and
+// reports every step it took.
+
+// Rejected is a candidate a rule produced that did not survive.
+type Rejected struct {
+	Candidate string `json:"candidate"`
+	Reason    string `json:"reason"`
+}
+
+// Step is one matching rule as it actually ran.
+type Step struct {
+	Rule       string     `json:"rule"`                  // "primary", "OR 1", …
+	Field      string     `json:"field"`                 // the QSO field it scanned
+	MatchBy    string     `json:"match_by,omitempty"`    // code | description | pattern
+	Exact      bool       `json:"exact,omitempty"`       // whole field IS the reference
+	Pattern    string     `json:"pattern,omitempty"`     // the rule's regex, if any
+	FieldValue string     `json:"field_value,omitempty"` // what the field actually held
+	Candidates []string   `json:"candidates,omitempty"`  // what the rule produced, before validation
+	Kept       []string   `json:"kept,omitempty"`        // what survived the reference list
+	Rejected   []Rejected `json:"rejected,omitempty"`    // and what didn't, with the reason
+	Skipped    bool       `json:"skipped,omitempty"`     // never ran: an earlier rule already matched
+	Error      string     `json:"error,omitempty"`       // e.g. a bad regex, which SKIPS the rule
+}
+
+// Explanation is the full account of one QSO against one award.
+type Explanation struct {
+	Code       string   `json:"code"`
+	InScope    bool     `json:"in_scope"`
+	ScopeError string   `json:"scope_error,omitempty"` // why the QSO is out of scope
+	Predefined bool     `json:"predefined"`            // matches are validated against a reference list
+	RefCount   int      `json:"ref_count"`             // size of that list
+	Steps      []Step   `json:"steps"`
+	Manual     []string `json:"manual,omitempty"` // references the operator assigned by hand
+	Result     []string `json:"result"`           // what the QSO finally counts for
+}
+
+// Explain runs the matcher on a single QSO and reports what it did. It goes
+// through the SAME code path as Compute — not a re-implementation — so what it
+// shows is what actually happens.
+func Explain(d Def, metas []RefMeta, q *qso.QSO) Explanation {
+	ex := Explanation{Code: d.Code, Steps: []Step{}, Result: []string{}}
+	rl := NewRefList(metas)
+	ex.Predefined = len(metas) > 0 && !d.Dynamic
+	ex.RefCount = len(metas)
+
+	var why string
+	if !inScopeWhy(&d, q, &why) {
+		ex.ScopeError = why
+		return ex // out of scope: no rule ever runs, and saying so IS the answer
+	}
+	ex.InScope = true
+
+	var re *regexp.Regexp
+	if p := strings.TrimSpace(d.Pattern); p != "" {
+		c, err := compileAwardRE(p)
+		if err != nil {
+			ex.Steps = append(ex.Steps, Step{Rule: "primary", Field: d.Field, Pattern: d.Pattern,
+				Error: "bad regex: " + err.Error()})
+			return ex
+		}
+		re = c
+	}
+	candidatesTrace(&d, re, q, rl, len(metas) > 0, &ex)
+	return ex
+}
+
 func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool) []string {
+	return candidatesTrace(d, re, q, rl, hasList, nil)
+}
+
+// candidatesTrace is the matcher. ex is optional: when non-nil (only Explain
+// passes it) each rule records what it scanned, what it produced and what was
+// rejected. The tracing MUST live inside the real matcher rather than in a
+// parallel "explain" implementation — a trace that can drift from the code it
+// describes is worse than no trace, because it is believed.
+func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool, ex *Explanation) []string {
 	predefined := hasList && !d.Dynamic
 
-	// Primary search, then each OR rule — a QSO earns a reference if any matches.
-	found := searchOne(d.Field, d.MatchBy, re, d.ExactMatch, d.LeadingStr, d.TrailingStr, "", q, rl, predefined)
+	// run executes one rule and, when tracing, records it.
+	run := func(label, field, matchBy, pattern string, rex *regexp.Regexp, exact bool, leading, trailing, prefix string) []string {
+		raw := searchOne(field, matchBy, rex, exact, leading, trailing, prefix, q, rl, predefined)
+		kept := keepRefs(predefined, rl, raw)
+		if ex != nil {
+			s := Step{Rule: label, Field: field, MatchBy: matchBy, Exact: exact, Pattern: pattern,
+				FieldValue: strings.TrimSpace(stripAffix(fieldRaw(field, q), leading, trailing)),
+				Candidates: raw, Kept: kept}
+			keptSet := map[string]struct{}{}
+			for _, k := range kept {
+				keptSet[k] = struct{}{}
+			}
+			for _, c := range raw {
+				n := normalizeRef(c)
+				if _, ok := keptSet[n]; ok {
+					continue
+				}
+				s.Rejected = append(s.Rejected, rejection(predefined, rl, n))
+			}
+			ex.Steps = append(ex.Steps, s)
+		}
+		return kept
+	}
+
+	// Primary search first; the OR rules are ordered FALLBACKS — try the next
+	// only while nothing has matched yet, and stop at the first that yields a
+	// reference (short-circuit). So a province already found by NAME isn't also
+	// re-derived, possibly differently, from a later city-regex rule.
+	//
+	// The short-circuit tests what a rule REALLY yielded — the references that
+	// survive the predefined list — not its raw candidates. A rule can always
+	// produce a raw candidate and still find nothing: "the whole ADDRESS field is
+	// the code" hands back "SERIATE (BG) 24068 ITALY", which is not a province.
+	// Testing the raw candidate would call that a hit, skip every fallback, and
+	// only then drop it as unlisted — leaving the QSO unmatched even though the
+	// next rule ("find the code inside the QTH") would have found BG.
+	found := run("primary", d.Field, d.MatchBy, d.Pattern, re, d.ExactMatch, d.LeadingStr, d.TrailingStr, "")
 	for i := range d.OrRules {
 		r := &d.OrRules[i]
+		label := fmt.Sprintf("OR %d", i+1)
+		if len(found) > 0 {
+			if ex != nil {
+				ex.Steps = append(ex.Steps, Step{Rule: label, Field: r.Field, MatchBy: r.MatchBy, Exact: r.ExactMatch,
+					Pattern: r.Pattern, Skipped: true})
+			}
+			continue // an earlier rule already matched — fallbacks short-circuit
+		}
 		var rre *regexp.Regexp
 		if p := strings.TrimSpace(r.Pattern); p != "" {
-			c, err := regexp.Compile(p)
+			c, err := compileAwardRE(p)
 			if err != nil {
+				if ex != nil {
+					ex.Steps = append(ex.Steps, Step{Rule: label, Field: r.Field, MatchBy: r.MatchBy, Pattern: r.Pattern,
+						Error: "bad regex: " + err.Error()})
+				}
 				continue // skip a rule with a bad regex rather than failing the award
 			}
 			rre = c
 		}
-		found = append(found, searchOne(r.Field, r.MatchBy, rre, r.ExactMatch, r.LeadingStr, r.TrailingStr, r.Prefix, q, rl, predefined)...)
+		found = run(label, r.Field, r.MatchBy, r.Pattern, rre, r.ExactMatch, r.LeadingStr, r.TrailingStr, r.Prefix)
 	}
 
+	// Merge operator-assigned references (manual override, ManualRefsKey). Lets
+	// the operator tag a QSO for an award whose field/description matching can't
+	// auto-detect the reference — e.g. WAPC scans ADDRESS for a province NAME, so
+	// a contact whose address doesn't spell it out needs the province picked by
+	// hand. Applied HERE (not just in MatchQSO) so Compute — which powers the
+	// awards panel and the per-QSO refs editor — honours overrides too. For a
+	// predefined award the ref is still validated against the list below.
+	manual := keepRefs(predefined, rl, manualRefs(q, d.Code))
+	if ex != nil {
+		ex.Manual = manual
+	}
+	found = append(found, manual...)
+	out := dedupe(found)
+	if ex != nil {
+		ex.Result = out
+	}
+	return out
+}
+
+// rejection explains why a candidate the operator can SEE in the trace did not
+// become a reference. "Nothing matched" is the least useful thing a matcher can
+// say; every one of this week's award bugs was a rejection with a plain reason
+// that nothing was printing.
+func rejection(predefined bool, rl refList, code string) Rejected {
+	switch {
+	case code == "":
+		return Rejected{Candidate: code, Reason: "empty"}
+	case !predefined:
+		return Rejected{Candidate: code, Reason: "duplicate"}
+	}
+	m, ok := rl.byCode[code]
+	if !ok {
+		return Rejected{Candidate: code, Reason: "not in the award's reference list"}
+	}
+	if !m.Valid {
+		return Rejected{Candidate: code, Reason: "listed but disabled"}
+	}
+	return Rejected{Candidate: code, Reason: "duplicate"}
+}
+
+// keepRefs reduces a rule's raw candidates to the references that actually count.
+// For a predefined award that means the codes on the list, enabled. The
+// award-level DXCCFilter already scopes which QSOs are considered (see inScope),
+// so we do NOT additionally require the QSO's entity to match the reference's own
+// DXCC — that wrongly excluded e.g. WAS Alaska (state AK is DXCC entity 6, not
+// 291). Per-reference DXCC stays metadata for the picker.
+func keepRefs(predefined bool, rl refList, found []string) []string {
 	if !predefined {
-		return dedupe(found)
+		out := make([]string, 0, len(found))
+		for _, c := range found {
+			if c = normalizeRef(c); c != "" {
+				out = append(out, c)
+			}
+		}
+		return dedupe(out)
 	}
-	// Enforce the predefined list: keep only listed, valid references. The
-	// award-level DXCCFilter already scopes which QSOs are considered (see
-	// inScope), so we do NOT additionally require the QSO's entity to match the
-	// reference's own DXCC — that wrongly excluded e.g. WAS Alaska (state AK is
-	// DXCC entity 6, not 291). Per-reference DXCC stays metadata for the picker.
 	var out []string
 	seen := map[string]struct{}{}
 	for _, c := range found {
@@ -754,24 +1121,37 @@ func natLess(a, b string) bool {
 
 // inScope reports whether a QSO falls within an award's scope (DXCC entity,
 // bands, modes, emission category, validity dates).
-func inScope(d *Def, q *qso.QSO) bool {
-	if len(d.DXCCFilter) > 0 && !dxccAllowed(q.DXCC, d.DXCCFilter) {
+func inScope(d *Def, q *qso.QSO) bool { return inScopeWhy(d, q, nil) }
+
+// inScopeWhy is inScope with an optional explanation. why is filled ONLY when the
+// QSO is out of scope AND a caller asked for the reason (Explain does; Compute,
+// which runs this for every QSO × every award, passes nil and pays nothing).
+// Keeping both behind one function is the point: a scope check that disagrees with
+// the scope check it explains would be worse than no explanation at all.
+func inScopeWhy(d *Def, q *qso.QSO, why *string) bool {
+	fail := func(format string, args ...any) bool {
+		if why != nil {
+			*why = fmt.Sprintf(format, args...)
+		}
 		return false
 	}
+	if len(d.DXCCFilter) > 0 && !dxccAllowed(q.DXCC, d.DXCCFilter) {
+		return fail("DXCC %d is not in the award's filter %v", q.DXCC, d.DXCCFilter)
+	}
 	if len(d.ValidBands) > 0 && !containsFold(d.ValidBands, q.Band) {
-		return false
+		return fail("band %q is not among the valid bands %v", q.Band, d.ValidBands)
 	}
 	if len(d.ValidModes) > 0 && !containsFold(d.ValidModes, q.Mode) {
-		return false
+		return fail("mode %q is not among the valid modes %v", q.Mode, d.ValidModes)
 	}
 	if len(d.Emission) > 0 && !containsFold(d.Emission, emissionOf(q.Mode)) {
-		return false
+		return fail("mode %q is %s emission; the award accepts %v", q.Mode, emissionOf(q.Mode), d.Emission)
 	}
 	if d.ValidFrom != "" && q.QSODate.Format("2006-01-02") < d.ValidFrom {
-		return false
+		return fail("QSO of %s predates the award's start date (%s)", q.QSODate.Format("2006-01-02"), d.ValidFrom)
 	}
 	if d.ValidTo != "" && q.QSODate.Format("2006-01-02") > d.ValidTo {
-		return false
+		return fail("QSO of %s is after the award's end date (%s)", q.QSODate.Format("2006-01-02"), d.ValidTo)
 	}
 	return true
 }
@@ -822,6 +1202,8 @@ func fieldRaw(field string, q *qso.QSO) string {
 		return q.Callsign
 	case "state":
 		return q.State
+	case "us_county":
+		return USCountyKey(q.State, q.County)
 	case "cont":
 		return q.Continent
 	case "country":

internal/award/award_test.go

@@ -1,8 +1,11 @@
 package award
 
 import (
+	"encoding/json"
 	"sort"
+	"strings"
 	"testing"
+	"time"
 
 	"hamlog/internal/qso"
 )
@@ -128,6 +131,146 @@ func TestComputeMatchByDescription(t *testing.T) {
 	}
 }
 
+// OR rules are ordered fallbacks: the primary match wins and short-circuits the
+// rules; when the primary finds nothing, the first OR rule that hits wins and
+// later rules are skipped. DDFM-style: a French department from the NOTE first,
+// else captured from a postal code in the address (Prefix "D" → "D74").
+func TestComputeOrRuleFallback(t *testing.T) {
+	def := Def{Code: "DDFM", Type: TypeQSOFields, Field: "notes", Pattern: `\b(D\d{2})\b`,
+		DXCCFilter: []int{227}, Valid: true,
+		OrRules: []OrRule{
+			{Field: "address", MatchBy: "pattern", Pattern: `\b(\d{2})\d{3}\b`, Prefix: "D"},
+		},
+	}
+	refMetas := map[string][]RefMeta{"DDFM": {
+		{Code: "D74", Name: "Haute-Savoie", Valid: true},
+		{Code: "D75", Name: "Paris", Valid: true},
+	}}
+	worked := func(q qso.QSO) []string {
+		r := Compute([]Def{def}, []qso.QSO{q}, refMetas, nil)[0]
+		var out []string
+		for _, rf := range r.Refs {
+			if rf.Worked {
+				out = append(out, rf.Ref)
+			}
+		}
+		return out
+	}
+	// Primary (note "D74") matches → the postal OR rule is skipped, so the
+	// address's 75001 does NOT also add D75. Exactly the user's ask: first
+	// condition wins, no fall-through.
+	if got := worked(qso.QSO{Callsign: "F4ABC", DXCC: ip(227), Notes: "worked D74", Address: "75001 Paris"}); len(got) != 1 || got[0] != "D74" {
+		t.Errorf("primary wins: got %v, want [D74] (no postal fall-through to D75)", got)
+	}
+	// No note dept → fall through to the OR rule → postal 74140 → D74.
+	if got := worked(qso.QSO{Callsign: "F4ABC", DXCC: ip(227), Notes: "", Address: "74140 Annecy"}); len(got) != 1 || got[0] != "D74" {
+		t.Errorf("OR fallback: got %v, want [D74]", got)
+	}
+}
+
+// The user's WAPC cascade: (1) province NAME in QTH, else (2) province NAME in
+// ADDRESS, else (3) match-by-pattern in QTH, which runs each reference's OWN
+// regex (city lists). Confirms the ordered fallback + that a match-by-pattern
+// rule with an empty rule-pattern triggers the per-reference regexes.
+func TestComputeProvinceCascade(t *testing.T) {
+	def := Def{Code: "WAPC", Type: TypeQSOFields, Field: "qth", MatchBy: "description",
+		DXCCFilter: []int{318}, Valid: true,
+		OrRules: []OrRule{
+			{Field: "address", MatchBy: "description"},
+			{Field: "qth", MatchBy: "pattern"}, // empty pattern → per-reference regexes
+		},
+	}
+	refMetas := map[string][]RefMeta{"WAPC": {
+		{Code: "JS", Name: "Jiangsu", Pattern: `\bJiangyin\b`, Valid: true},
+		{Code: "ZJ", Name: "Zhejiang", Pattern: `\bHangzhou\b`, Valid: true},
+	}}
+	worked := func(q qso.QSO) []string {
+		r := Compute([]Def{def}, []qso.QSO{q}, refMetas, nil)[0]
+		var out []string
+		for _, rf := range r.Refs {
+			if rf.Worked {
+				out = append(out, rf.Ref)
+			}
+		}
+		return out
+	}
+	cases := []struct {
+		name, qth, addr string
+		want            string
+	}{
+		{"name in qth", "Wuxi, Jiangsu", "", "JS"},
+		{"name in address", "Wuxi", "Jiangsu Province", "JS"},
+		{"city regex (Jiangyin) in qth", "Jiangyin", "", "JS"},
+		{"city regex (Hangzhou) in qth", "Hangzhou", "", "ZJ"},
+	}
+	for _, c := range cases {
+		got := worked(qso.QSO{Callsign: "BA1A", DXCC: ip(318), QTH: c.qth, Address: c.addr})
+		if len(got) != 1 || got[0] != c.want {
+			t.Errorf("%s: got %v, want [%s]", c.name, got, c.want)
+		}
+	}
+}
+
+// A manually-assigned override (ManualRefsKey) must count in Compute — not just
+// MatchQSO — so a custom award like WAPC (matches ADDRESS by description, writes
+// no QSO field) sticks after the operator picks the province by hand. The engine
+// only auto-detects "Jiangsu" when the address spells it out; here it doesn't, so
+// the ref exists solely as the override.
+func TestComputeManualOverride(t *testing.T) {
+	def := Def{Code: "WAPC", Type: TypeQSOFields, Field: "address", MatchBy: "description",
+		DXCCFilter: []int{318}, Confirm: []string{"lotw", "qsl"}, Valid: true}
+	qsos := []qso.QSO{
+		// Address doesn't name the province → only the override tags it.
+		{Callsign: "BA1ABC", Band: "20m", DXCC: ip(318), Address: "Beijing Rd 5",
+			Extras: map[string]string{ManualRefsKey: "WAPC@JS"}},
+	}
+	refMetas := map[string][]RefMeta{"WAPC": {
+		{Code: "JS", Name: "Jiangsu", Valid: true},
+		{Code: "GD", Name: "Guangdong", Valid: true},
+	}}
+	r := Compute([]Def{def}, qsos, refMetas, nil)[0]
+	if r.Worked != 1 {
+		t.Fatalf("WAPC worked = %d, want 1 (Jiangsu via manual override); got %v", r.Worked, refCodes(r))
+	}
+	var worked []string
+	for _, rf := range r.Refs {
+		if rf.Worked {
+			worked = append(worked, rf.Ref)
+		}
+	}
+	if len(worked) != 1 || worked[0] != "JS" {
+		t.Errorf("worked refs = %v, want [JS]", worked)
+	}
+
+	// An override for a ref NOT in the predefined list is rejected (no typo refs).
+	qsos[0].Extras[ManualRefsKey] = "WAPC@ZZ"
+	if w := Compute([]Def{def}, qsos, refMetas, nil)[0].Worked; w != 0 {
+		t.Errorf("bogus override ZZ: worked = %d, want 0", w)
+	}
+}
+
+// A description-match award must also honour a REFERENCE's own regex (used to
+// broaden matching past the plain name) AND match case-insensitively — a log
+// QTH "ITABASHIKU, TOKIO" (uppercase, "Tokio" spelling) must count for Tokyo
+// via its `\bTok[iy]o\b` pattern, which the plain name "Tokyo" can't catch.
+func TestComputeDescriptionRefPattern(t *testing.T) {
+	def := Def{Code: "WAJA", Type: TypeQSOFields, Field: "qth", MatchBy: "description",
+		DXCCFilter: []int{339}, Confirm: []string{"lotw", "qsl"}, Valid: true}
+	qsos := []qso.QSO{
+		{Callsign: "JA1LZB", Band: "10m", DXCC: ip(339), QTH: "ITABASHIKU, TOKIO"}, // pattern + case
+		{Callsign: "JA3DEF", Band: "40m", DXCC: ip(339), QTH: "osaka pref"},        // lowercase name
+	}
+	refMetas := map[string][]RefMeta{"WAJA": {
+		{Code: "13", Name: "Tokyo", Pattern: `\bTok[iy]o\b`, Valid: true},
+		{Code: "27", Name: "Osaka", Valid: true},
+		{Code: "01", Name: "Hokkaido", Valid: true},
+	}}
+	r := Compute([]Def{def}, qsos, refMetas, nil)[0]
+	if r.Worked != 2 {
+		t.Errorf("WAJA worked = %d, want 2 (Tokyo via pattern + Osaka via lowercase name); got %v", r.Worked, refCodes(r))
+	}
+}
+
 // VUCC: a grid4 award counts distinct 4-char grid squares, and a QSO on a grid
 // line (VUCC_GRIDS) contributes several. grid4 derives from VUCC_GRIDS else the
 // 4-char prefix of GRIDSQUARE.
@@ -146,6 +289,160 @@ func TestComputeGrid4VUCC(t *testing.T) {
 	}
 }
 
+// FFMA ships a fixed list of the 488 grids of the contiguous 48 states, taken
+// from arrl.org/ffma. The count is the award's own checksum — if this test ever
+// fails on the count, the catalog file is wrong, not the test.
+func TestCatalogFFMA(t *testing.T) {
+	raw, ok := CatalogRefs("FFMA")
+	if !ok {
+		t.Fatal("FFMA has no reference list in the embedded catalog")
+	}
+	var refs []struct {
+		Code  string `json:"code"`
+		DXCC  int    `json:"dxcc"`
+		Valid bool   `json:"valid"`
+	}
+	if err := json.Unmarshal(raw, &refs); err != nil {
+		t.Fatalf("FFMA references: %v", err)
+	}
+	if len(refs) != 488 {
+		t.Fatalf("FFMA has %d grids, want exactly 488", len(refs))
+	}
+
+	var def Def
+	metas := make([]RefMeta, 0, len(refs))
+	for _, r := range refs {
+		// Rule 4(c): a grid may be activated from Canadian or Mexican soil, or from
+		// water. Pinning a reference to a DXCC entity would reject those contacts.
+		if r.DXCC != 0 {
+			t.Fatalf("FFMA grid %s is pinned to DXCC %d — rule 4(c) allows working it from outside the US", r.Code, r.DXCC)
+		}
+		metas = append(metas, RefMeta{Code: r.Code, Valid: r.Valid})
+	}
+	for _, d := range Defaults() {
+		if d.Code == "FFMA" {
+			def = d
+		}
+	}
+	if def.Total != 488 || def.Field != "grid4" {
+		t.Fatalf("FFMA def: total=%d field=%q, want 488 / grid4", def.Total, def.Field)
+	}
+
+	d1983 := time.Date(1990, 5, 1, 0, 0, 0, 0, time.UTC)
+	qsos := []qso.QSO{
+		{Callsign: "K5ABC", Band: "6m", Grid: "EM00AA", QSODate: d1983, LOTWRcvd: "Y"},   // counts
+		{Callsign: "VE3XYZ", Band: "6m", Grid: "FN25AA", QSODate: d1983, LOTWRcvd: "Y"},  // a VE3 in an FFMA grid: counts (4c)
+		{Callsign: "W1LINE", Band: "6m", VUCCGrids: "FN31,FN32", QSODate: d1983, QSLRcvd: "Y"}, // grid line: 2 grids (4d)
+		{Callsign: "G4XXX", Band: "6m", Grid: "IO91AA", QSODate: d1983, LOTWRcvd: "Y"},   // not an FFMA grid
+		{Callsign: "K5ABC", Band: "2m", Grid: "EM10AA", QSODate: d1983, LOTWRcvd: "Y"},   // wrong band
+		{Callsign: "K5OLD", Band: "6m", Grid: "EM20AA", QSODate: time.Date(1982, 6, 1, 0, 0, 0, 0, time.UTC), LOTWRcvd: "Y"}, // before 1983 (rule 2)
+	}
+	r := Compute([]Def{def}, qsos, map[string][]RefMeta{"FFMA": metas}, nil)[0]
+	var got []string
+	for _, rf := range r.Refs {
+		if rf.Worked {
+			got = append(got, rf.Ref)
+		}
+	}
+	sort.Strings(got)
+	want := []string{"EM00", "FN25", "FN31", "FN32"}
+	if strings.Join(got, " ") != strings.Join(want, " ") {
+		t.Fatalf("FFMA worked = %v, want %v", got, want)
+	}
+	if r.Worked != len(want) || r.Total != 488 {
+		t.Errorf("FFMA worked=%d total=%d, want %d / 488", r.Worked, r.Total, len(want))
+	}
+}
+
+// WAIP: the primary rule takes the WHOLE address as the province code (exact
+// match), which can never be one — but it does produce a raw candidate. The OR
+// fallback (find the code inside the QTH, "SERIATE (BG)") is the rule that works,
+// and it must still run: a rule that yields nothing VALID is not a hit.
+func TestComputeOrFallbackAfterUnlistedPrimary(t *testing.T) {
+	def := Def{
+		Code: "WAIP", Name: "Worked All Italian Provinces", Valid: true,
+		Type: TypeReference, Field: "address", MatchBy: "code", ExactMatch: true,
+		OrRules: []OrRule{{Field: "qth", MatchBy: "code"}}, // not exact → search inside the field
+		Confirm: []string{"lotw", "qsl"},
+	}
+	metas := []RefMeta{
+		{Code: "BG", Name: "Bergamo", Valid: true},
+		{Code: "MI", Name: "Milano", Valid: true},
+	}
+	qsos := []qso.QSO{
+		{Callsign: "I2IFT", Band: "30m", QTH: "SERIATE (BG)", Address: "Seriate (Bg) 24068 Italy", LOTWRcvd: "Y"},
+	}
+	r := Compute([]Def{def}, qsos, map[string][]RefMeta{"WAIP": metas}, nil)[0]
+	if r.Worked != 1 {
+		t.Fatalf("WAIP worked = %d, want 1 (BG, from the QTH fallback)", r.Worked)
+	}
+	for _, rf := range r.Refs {
+		if rf.Ref == "BG" && rf.Worked {
+			return
+		}
+	}
+	t.Errorf("BG not worked; refs = %v", refCodes(r))
+}
+
+// Explain must account for the WAIP case exactly: the primary rule produces a
+// candidate that is NOT a province, says so, and the QTH fallback then finds BG.
+func TestExplainAccountsForEveryRule(t *testing.T) {
+	def := Def{
+		Code: "WAIP", Valid: true, Type: TypeReference,
+		Field: "address", MatchBy: "code", ExactMatch: true,
+		OrRules: []OrRule{{Field: "qth", MatchBy: "code"}},
+		Confirm: []string{"lotw"},
+	}
+	metas := []RefMeta{{Code: "BG", Name: "Bergamo", Valid: true}}
+	q := &qso.QSO{Callsign: "I2IFT", Band: "30m", QTH: "SERIATE (BG)", Address: "Seriate (Bg) 24068 Italy"}
+
+	ex := Explain(def, metas, q)
+	if !ex.InScope || len(ex.Steps) != 2 {
+		t.Fatalf("in scope=%v, %d steps, want in scope with 2 (primary + OR 1): %+v", ex.InScope, len(ex.Steps), ex)
+	}
+	// The primary rule LOOKS like it found something. Saying only "no match" here is
+	// what cost hours: the trace has to show the candidate and why it lost.
+	p := ex.Steps[0]
+	if len(p.Candidates) == 0 {
+		t.Error("primary produced no candidate; the whole point is that it produces a bogus one")
+	}
+	if len(p.Kept) != 0 || len(p.Rejected) == 0 {
+		t.Fatalf("primary kept=%v rejected=%v, want nothing kept and a stated reason", p.Kept, p.Rejected)
+	}
+	if !strings.Contains(p.Rejected[0].Reason, "not in the award's reference list") {
+		t.Errorf("reason = %q, want it to name the real cause", p.Rejected[0].Reason)
+	}
+	if or1 := ex.Steps[1]; or1.Skipped || len(or1.Kept) != 1 || or1.Kept[0] != "BG" {
+		t.Errorf("OR 1 = %+v, want it to run and find BG", or1)
+	}
+	if len(ex.Result) != 1 || ex.Result[0] != "BG" {
+		t.Errorf("result = %v, want [BG]", ex.Result)
+	}
+
+	// A trace that disagrees with the matcher is worse than none: it is believed.
+	if got := MatchQSO(def, metas, q); strings.Join(got, ",") != strings.Join(ex.Result, ",") {
+		t.Errorf("Explain says %v but MatchQSO says %v — the trace does not describe the code", ex.Result, got)
+	}
+}
+
+func TestExplainOutOfScopeSaysWhy(t *testing.T) {
+	def := Def{Code: "FFMA", Valid: true, Field: "grid4", MatchBy: "code", ExactMatch: true,
+		ValidBands: []string{"6m"}, ValidFrom: "1983-01-01", Confirm: []string{"lotw"}}
+	q := &qso.QSO{Callsign: "K1ABC", Band: "2m", Grid: "EM00AA",
+		QSODate: time.Date(1990, 1, 1, 0, 0, 0, 0, time.UTC)}
+
+	ex := Explain(def, []RefMeta{{Code: "EM00", Valid: true}}, q)
+	if ex.InScope {
+		t.Fatal("a 2 m QSO is not in scope for a 6 m-only award")
+	}
+	if !strings.Contains(ex.ScopeError, "2m") {
+		t.Errorf("scope error = %q, want it to name the band that fails", ex.ScopeError)
+	}
+	if len(ex.Steps) != 0 {
+		t.Errorf("%d steps ran on an out-of-scope QSO; none should", len(ex.Steps))
+	}
+}
+
 func refCodes(r Result) []string {
 	out := make([]string, 0, len(r.Refs))
 	for _, rf := range r.Refs {
@@ -238,3 +535,152 @@ func TestComputePredefinedList(t *testing.T) {
 		t.Errorf("RAC refs = %d, want 3 (%v)", len(r.Refs), refCodes(r))
 	}
 }
+
+// The built-in awards moved from Go code into embedded JSON (catalog/*.json).
+// A refactor is only a refactor if the behaviour is identical, so pin down what
+// the catalog MUST still produce — a typo in a JSON file would otherwise silently
+// disable an award, and nobody would notice until a QSO stopped counting.
+func TestCatalogDefaults(t *testing.T) {
+	defs := Defaults()
+	byCode := map[string]Def{}
+	for _, d := range defs {
+		byCode[d.Code] = d
+	}
+
+	// The catalog is MEANT to grow — dropping a JSON in is how an award ships. So
+	// assert the ten originals are still there, never that the count is exactly ten:
+	// a test that fails the moment you add an award is a test that teaches you to
+	// ignore it.
+	want := []string{"DDFM", "DXCC", "IOTA", "POTA", "SOTA", "WAC", "WAS", "WAZ", "WPX", "WWFF"}
+	if len(defs) < len(want) {
+		t.Fatalf("catalog has %d awards, want at least the %d built-ins (%v)", len(defs), len(want), byCode)
+	}
+	for _, c := range want {
+		d, ok := byCode[c]
+		if !ok {
+			t.Errorf("%s missing from the embedded catalog", c)
+			continue
+		}
+		// Valid=false would hide the award entirely; Builtin=false would let a
+		// "reset to defaults" delete it. Both are silent failures.
+		if !d.Valid || !d.Builtin {
+			t.Errorf("%s: valid=%v builtin=%v — both must be true", c, d.Valid, d.Builtin)
+		}
+		if d.Type == "" || d.Field == "" {
+			t.Errorf("%s: type=%q field=%q — neither may be empty", c, d.Type, d.Field)
+		}
+		if len(d.Confirm) == 0 {
+			t.Errorf("%s: no confirmation sources — nothing would ever count as confirmed", c)
+		}
+	}
+
+	// Spot-check the two that carry real matching logic, since a mangled escape in
+	// JSON is exactly the failure this test exists to catch.
+	if got := byCode["DDFM"].Pattern; got != `(?i)\b(D\d{1,2}[AB]?)\b` {
+		t.Errorf("DDFM pattern = %q — the regex did not survive the JSON round-trip", got)
+	}
+	if _, err := compileAwardRE(byCode["DDFM"].Pattern); err != nil {
+		t.Errorf("DDFM pattern does not compile: %v", err)
+	}
+	if got := byCode["WAS"].DXCCFilter; len(got) != 3 || got[0] != 291 {
+		t.Errorf("WAS DXCC filter = %v, want [291 110 6]", got)
+	}
+	if !byCode["WAS"].ExactMatch || byCode["WAS"].MatchBy != "code" {
+		t.Errorf("WAS: exact=%v matchBy=%q, want true/code", byCode["WAS"].ExactMatch, byCode["WAS"].MatchBy)
+	}
+	if !byCode["WPX"].Dynamic {
+		t.Error("WPX must be dynamic — its references aren't a fixed list")
+	}
+	// Deterministic order: an embed walk that reorders would shuffle the user's list.
+	for i := 1; i < len(defs); i++ {
+		if defs[i-1].Code > defs[i].Code {
+			t.Errorf("catalog not sorted by code: %q before %q", defs[i-1].Code, defs[i].Code)
+		}
+	}
+}
+
+// The whole point of the catalog: an award you EXPORT from the UI can be dropped
+// straight into catalog/ and shipped to everyone — no conversion step. So the
+// loader must accept the exported bundle shape, and it must carry the REFERENCES,
+// because a WAPC without its provinces and their city regexes is an empty shell.
+func TestCatalogAcceptsExportedBundle(t *testing.T) {
+	// Exactly what ExportAward writes.
+	exported := []byte(`{
+	  "version": 1,
+	  "exported_at": "2026-07-13T10:00:00Z",
+	  "awards": [
+	    {
+	      "def": {"code":"WAPC","name":"Worked All Provinces of China","valid":true,
+	              "type":"QSOFIELDS","field":"address","match_by":"description",
+	              "dxcc_filter":[318],"confirm":["lotw","qsl"],"total":34},
+	      "references": [
+	        {"code":"JS","name":"Jiangsu","pattern":"\\bJiangyin\\b","valid":true},
+	        {"code":"ZJ","name":"Zhejiang","valid":true}
+	      ]
+	    }
+	  ]
+	}`)
+
+	var f catalogFile
+	if err := json.Unmarshal(exported, &f); err != nil {
+		t.Fatalf("an exported bundle must parse as a catalog file: %v", err)
+	}
+	if len(f.Awards) != 1 {
+		t.Fatalf("got %d awards, want 1", len(f.Awards))
+	}
+	e := f.Awards[0]
+	if e.Def.Code != "WAPC" || e.Def.Field != "address" || e.Def.MatchBy != "description" {
+		t.Errorf("definition lost in the round-trip: %+v", e.Def)
+	}
+	if len(e.References) == 0 {
+		t.Fatal("references dropped — this is the whole value of sharing an award")
+	}
+	// The per-reference regex must survive: it is what makes the award actually work.
+	var refs []struct {
+		Code    string `json:"code"`
+		Pattern string `json:"pattern"`
+	}
+	if err := json.Unmarshal(e.References, &refs); err != nil {
+		t.Fatalf("references not decodable: %v", err)
+	}
+	if len(refs) != 2 || refs[0].Code != "JS" || refs[0].Pattern != `\bJiangyin\b` {
+		t.Errorf("reference regex did not survive: %+v", refs)
+	}
+	if _, err := compileAwardRE(refs[0].Pattern); err != nil {
+		t.Errorf("the shipped regex does not compile: %v", err)
+	}
+}
+
+// A single malformed file in the catalog must not take the other awards down with
+// it — one bad JSON should cost you one award, not all of them.
+func TestCatalogSurvivesOneBadFile(t *testing.T) {
+	if len(Catalog()) < 10 {
+		t.Fatalf("catalog has %d entries, want the 10 built-ins", len(Catalog()))
+	}
+	var f catalogFile
+	if err := json.Unmarshal([]byte(`{ this is not json `), &f); err == nil {
+		t.Error("expected a parse error on malformed JSON")
+	}
+	// Catalog() skips unparseable files rather than returning nil, so the others
+	// still load. (Verified structurally: the loader `continue`s on error.)
+}
+
+// Anything OpsLog SHIPS is built-in, whatever the file says.
+//
+// You create an award, export it (its JSON records builtin:false — it wasn't
+// built-in when you wrote it), then drop that same file into the catalog to ship
+// it. If we trusted the flag, the award would go out to everyone marked "not
+// built-in" and would then silently miss every future catalog correction. Making
+// the author remember to flip a flag first is a step nobody can guess — so the
+// catalog derives it instead.
+func TestCatalogForcesBuiltin(t *testing.T) {
+	for _, e := range Catalog() {
+		if !e.Def.Builtin {
+			t.Errorf("%s: shipped in the catalog but Builtin=false — it would miss catalog corrections", e.Def.Code)
+		}
+	}
+	// The realistic case: a user-authored award whose JSON says builtin:false.
+	if len(Catalog()) == 0 {
+		t.Fatal("empty catalog")
+	}
+}

internal/award/bench_test.go

@@ -0,0 +1,107 @@
+package award
+
+import (
+	"encoding/json"
+	"fmt"
+	"testing"
+	"time"
+
+	"hamlog/internal/qso"
+)
+
+// A synthetic log with the shape a real one has: a spread of bands, modes,
+// entities, and the free-text fields the harder awards actually scan.
+func benchLog(n int) []qso.QSO {
+	bands := []string{"160m", "80m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m"}
+	modes := []string{"SSB", "CW", "FT8", "FT4", "RTTY"}
+	entities := []int{291, 248, 227, 230, 339, 5, 108, 110, 6, 281}
+	towns := []string{"SERIATE (BG)", "MILANO (MI)", "ROMA (RM)", "TORINO (TO)", "NAPOLI (NA)"}
+	out := make([]qso.QSO, n)
+	base := time.Date(2015, 1, 1, 0, 0, 0, 0, time.UTC)
+	for i := range out {
+		e := entities[i%len(entities)]
+		out[i] = qso.QSO{
+			ID:       int64(i + 1),
+			Callsign: fmt.Sprintf("I%dABC", i%10),
+			Band:     bands[i%len(bands)],
+			Mode:     modes[i%len(modes)],
+			DXCC:     &e,
+			QSODate:  base.Add(time.Duration(i) * time.Hour),
+			QTH:      towns[i%len(towns)],
+			Address:  "Via Roma 12, 24068 " + towns[i%len(towns)] + " Italy",
+			Grid:     "JN45AA",
+			State:    "CA",
+			LOTWRcvd: "Y",
+		}
+	}
+	return out
+}
+
+// WAIP is the worst realistic shape: a predefined list, an exact-match primary
+// that always produces a doomed candidate, then a fallback chain that tokenises a
+// free-text field. If anything is slow, it is this.
+func benchWAIP() (Def, []RefMeta) {
+	d := Def{
+		Code: "WAIP", Valid: true, Type: TypeReference,
+		Field: "address", MatchBy: "code", ExactMatch: true,
+		OrRules: []OrRule{
+			{Field: "qth", MatchBy: "description"},
+			{Field: "qth", MatchBy: "code"},
+			{Field: "address", MatchBy: "code"},
+		},
+		DXCCFilter: []int{248},
+		Confirm:    []string{"lotw", "qsl"},
+	}
+	codes := []string{"AG", "AL", "AN", "AO", "AP", "AQ", "AR", "AT", "AV", "BA", "BG", "BI", "BL", "BN", "BO", "BR", "BS", "BT", "BZ", "CA", "CB", "CE", "CH", "CL", "CN", "CO", "CR", "CS", "CT", "CZ", "EN", "FC", "FE", "FG", "FI", "FM", "FR", "GE", "GO", "GR", "IM", "IS", "KR", "LC", "LE", "LI", "LO", "LT", "LU", "MB", "MC", "ME", "MI", "MN", "MO", "MS", "MT", "NA", "NO", "NU", "OR", "PA", "PC", "PD", "PE", "PG", "PI", "PN", "PO", "PR", "PT", "PU", "PV", "PZ", "RA", "RC", "RE", "RG", "RI", "RM", "RN", "RO", "SA", "SI", "SO", "SP", "SR", "SS", "SU", "SV", "TA", "TE", "TN", "TO", "TP", "TR", "TS", "TV", "UD", "VA", "VB", "VC", "VE", "VI", "VR", "VT", "VV"}
+	metas := make([]RefMeta, 0, len(codes))
+	for _, c := range codes {
+		metas = append(metas, RefMeta{Code: c, Name: "Province " + c, Valid: true})
+	}
+	return d, metas
+}
+
+// One award, whole log — what GetAward(code) does when the Awards panel opens.
+func BenchmarkComputeOneAward(b *testing.B) {
+	d, metas := benchWAIP()
+	for _, n := range []int{10_000, 50_000, 100_000} {
+		log := benchLog(n)
+		b.Run(fmt.Sprintf("WAIP/%dqso", n), func(b *testing.B) {
+			for i := 0; i < b.N; i++ {
+				Compute([]Def{d}, log, map[string][]RefMeta{"WAIP": metas}, nil)
+			}
+		})
+	}
+}
+
+// Every shipped award at once — GetAwards(), the heaviest thing the app can ask.
+func BenchmarkComputeWholeCatalog(b *testing.B) {
+	defs := Defaults()
+	metas := map[string][]RefMeta{}
+	wd, wm := benchWAIP()
+	defs = append(defs, wd)
+	metas["WAIP"] = wm
+	for _, c := range Catalog() {
+		if raw, ok := CatalogRefs(c.Def.Code); ok {
+			var refs []struct {
+				Code  string `json:"code"`
+				Name  string `json:"name"`
+				Valid bool   `json:"valid"`
+			}
+			if json.Unmarshal(raw, &refs) == nil {
+				m := make([]RefMeta, 0, len(refs))
+				for _, r := range refs {
+					m = append(m, RefMeta{Code: r.Code, Name: r.Name, Valid: r.Valid})
+				}
+				metas[c.Def.Code] = m
+			}
+		}
+	}
+	for _, n := range []int{10_000, 100_000} {
+		log := benchLog(n)
+		b.Run(fmt.Sprintf("%dawards/%dqso", len(defs), n), func(b *testing.B) {
+			for i := 0; i < b.N; i++ {
+				Compute(defs, log, metas, nil)
+			}
+		})
+	}
+}

internal/award/catalog/ddfm.json

@@ -0,0 +1,810 @@
+{
+  "def": {
+    "code": "DDFM",
+    "name": "Départements Français Métropolitains",
+    "valid": true,
+    "protected": true,
+    "ref_display": "name",
+    "type": "QSOFIELDS",
+    "field": "note",
+    "pattern": "(?i)\\b(D\\d{1,2}[AB]?)\\b",
+    "or_rules": [
+      {
+        "field": "address",
+        "match_by": "code",
+        "pattern": "\\b(\\d{2})\\d{3}\\b",
+        "prefix": "D"
+      },
+      {
+        "field": "qth",
+        "match_by": "code",
+        "pattern": "\\b(\\d{2})\\d{3}\\b",
+        "prefix": "D"
+      }
+    ],
+    "dxcc_filter": [
+      227,
+      214
+    ],
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 96,
+    "builtin": true,
+    "version": 2
+  },
+  "references": [
+    {
+      "code": "D01",
+      "name": "Ain",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D02",
+      "name": "Aisne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D03",
+      "name": "Allier",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D04",
+      "name": "Alpes-de-Haute-Provence",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D05",
+      "name": "Hautes-Alpes",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D06",
+      "name": "Alpes-Maritimes",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D07",
+      "name": "Ardèche",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D08",
+      "name": "Ardennes",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D09",
+      "name": "Ariège",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D10",
+      "name": "Aube",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D11",
+      "name": "Aude",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D12",
+      "name": "Aveyron",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D13",
+      "name": "Bouches-du-Rhône",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D14",
+      "name": "Calvados",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D15",
+      "name": "Cantal",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D16",
+      "name": "Charente",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D17",
+      "name": "Charente-Maritime",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D18",
+      "name": "Cher",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D19",
+      "name": "Corrèze",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D21",
+      "name": "Côte-d'Or",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D22",
+      "name": "Côtes-d'Armor",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D23",
+      "name": "Creuse",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D24",
+      "name": "Dordogne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D25",
+      "name": "Doubs",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D26",
+      "name": "Drôme",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D27",
+      "name": "Eure",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D28",
+      "name": "Eure-et-Loir",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D29",
+      "name": "Finistère",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D2A",
+      "name": "Corse-du-Sud",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D2B",
+      "name": "Haute-Corse",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D30",
+      "name": "Gard",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D31",
+      "name": "Haute-Garonne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D32",
+      "name": "Gers",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D33",
+      "name": "Gironde",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D34",
+      "name": "Hérault",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D35",
+      "name": "Ille-et-Vilaine",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D36",
+      "name": "Indre",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D37",
+      "name": "Indre-et-Loire",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D38",
+      "name": "Isère",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D39",
+      "name": "Jura",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D40",
+      "name": "Landes",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D41",
+      "name": "Loir-et-Cher",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D42",
+      "name": "Loire",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D43",
+      "name": "Haute-Loire",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D44",
+      "name": "Loire-Atlantique",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D45",
+      "name": "Loiret",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D46",
+      "name": "Lot",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D47",
+      "name": "Lot-et-Garonne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D48",
+      "name": "Lozère",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D49",
+      "name": "Maine-et-Loire",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D50",
+      "name": "Manche",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D51",
+      "name": "Marne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D52",
+      "name": "Haute-Marne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D53",
+      "name": "Mayenne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D54",
+      "name": "Meurthe-et-Moselle",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D55",
+      "name": "Meuse",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D56",
+      "name": "Morbihan",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D57",
+      "name": "Moselle",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D58",
+      "name": "Nièvre",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D59",
+      "name": "Nord",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D60",
+      "name": "Oise",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D61",
+      "name": "Orne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D62",
+      "name": "Pas-de-Calais",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D63",
+      "name": "Puy-de-Dôme",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D64",
+      "name": "Pyrénées-Atlantiques",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D65",
+      "name": "Hautes-Pyrénées",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D66",
+      "name": "Pyrénées-Orientales",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D67",
+      "name": "Bas-Rhin",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D68",
+      "name": "Haut-Rhin",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D69",
+      "name": "Rhône",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D70",
+      "name": "Haute-Saône",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D71",
+      "name": "Saône-et-Loire",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D72",
+      "name": "Sarthe",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D73",
+      "name": "Savoie",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D74",
+      "name": "Haute-Savoie",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D75",
+      "name": "Paris",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D76",
+      "name": "Seine-Maritime",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D77",
+      "name": "Seine-et-Marne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D78",
+      "name": "Yvelines",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D79",
+      "name": "Deux-Sèvres",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D80",
+      "name": "Somme",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D81",
+      "name": "Tarn",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D82",
+      "name": "Tarn-et-Garonne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D83",
+      "name": "Var",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D84",
+      "name": "Vaucluse",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D85",
+      "name": "Vendée",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D86",
+      "name": "Vienne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D87",
+      "name": "Haute-Vienne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D88",
+      "name": "Vosges",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D89",
+      "name": "Yonne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D90",
+      "name": "Territoire de Belfort",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D91",
+      "name": "Essonne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D92",
+      "name": "Hauts-de-Seine",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D93",
+      "name": "Seine-Saint-Denis",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D94",
+      "name": "Val-de-Marne",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    },
+    {
+      "code": "D95",
+      "name": "Val-d'Oise",
+      "dxcc": 227,
+      "group": "",
+      "subgrp": "",
+      "valid": true
+    }
+  ]
+}

internal/award/catalog/dxcc.json

@@ -0,0 +1,21 @@
+{
+  "def": {
+    "code": "DXCC",
+    "name": "DX Century Club",
+    "valid": true,
+    "protected": true,
+    "type": "DXCC",
+    "field": "dxcc",
+    "pattern": "",
+    "dxcc_filter": null,
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 340,
+    "builtin": true
+  }
+}

internal/award/catalog/iota.json

@@ -0,0 +1,21 @@
+{
+  "def": {
+    "code": "IOTA",
+    "name": "Islands On The Air",
+    "valid": true,
+    "protected": true,
+    "type": "REFERENCE",
+    "field": "iota",
+    "pattern": "",
+    "dynamic": true,
+    "dxcc_filter": null,
+    "confirm": [
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 0,
+    "builtin": true
+  }
+}

internal/award/catalog/pota.json

@@ -0,0 +1,22 @@
+{
+  "def": {
+    "code": "POTA",
+    "name": "Parks On The Air",
+    "valid": true,
+    "protected": true,
+    "type": "REFERENCE",
+    "field": "pota_ref",
+    "pattern": "",
+    "dynamic": true,
+    "dxcc_filter": null,
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 0,
+    "builtin": true
+  }
+}

internal/award/catalog/rac.json

@@ -0,0 +1,156 @@
+{
+  "version": 1,
+  "exported_at": "2026-07-13T17:00:44Z",
+  "awards": [
+    {
+      "def": {
+        "code": "RAC",
+        "name": "RAC Canadian Provinces",
+        "description": "RAC Canadian Provinces",
+        "valid": true,
+        "protected": true,
+        "url": "https://www.rac.ca/canadaward/",
+        "valid_from": "1977-01-07",
+        "ref_display": "name",
+        "type": "QSOFIELDS",
+        "field": "state",
+        "match_by": "code",
+        "pattern": "",
+        "or_rules": [
+          {
+            "field": "qth",
+            "match_by": "description"
+          },
+          {
+            "field": "address",
+            "match_by": "description"
+          }
+        ],
+        "dxcc_filter": [
+          1
+        ],
+        "emission": [
+          "CW",
+          "PHONE",
+          "DIGITAL"
+        ],
+        "confirm": [
+          "lotw",
+          "qsl"
+        ],
+        "validate": [
+          "lotw",
+          "qsl"
+        ],
+        "total": 0,
+        "builtin": true
+      },
+      "references": [
+        {
+          "code": "AB",
+          "name": "Alberta",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BC",
+          "name": "British Columbia",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MB",
+          "name": "Manitoba",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NB",
+          "name": "New Brunswick",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NL",
+          "name": "Newfoundland and Labrador",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NS",
+          "name": "Nova Scotia",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NT",
+          "name": "Northwest Territories",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NU",
+          "name": "Nunavut",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "ON",
+          "name": "Ontario",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PE",
+          "name": "Prince Edward Island",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "QC",
+          "name": "Quebec",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SK",
+          "name": "Saskatchewan",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "YT",
+          "name": "Yukon",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        }
+      ]
+    }
+  ]
+}

internal/award/catalog/sota.json

@@ -0,0 +1,22 @@
+{
+  "def": {
+    "code": "SOTA",
+    "name": "Summits On The Air",
+    "valid": true,
+    "protected": true,
+    "type": "REFERENCE",
+    "field": "sota_ref",
+    "pattern": "",
+    "dynamic": true,
+    "dxcc_filter": null,
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 0,
+    "builtin": true
+  }
+}

internal/award/catalog/usaca.json

@@ -0,0 +1,30 @@
+{
+  "def": {
+    "code": "USA-CA",
+    "name": "USA-CA (US Counties)",
+    "description": "CQ United States of America Counties Award. Matches the QSO's county, tolerating LoTW \"ST,County\" and bare county-name shapes. Independent cities of Virginia/Nevada and DC are excluded per the award rules.",
+    "valid": true,
+    "protected": true,
+    "type": "QSOFIELDS",
+    "field": "us_county",
+    "match_by": "code",
+    "exact_match": true,
+    "pattern": "",
+    "ref_display": "name",
+    "url": "https://cq-amateur-radio.com/cq_awards/cq_usa_ca_awards/cq_usa_ca_awards.html",
+    "dxcc_filter": [
+      291,
+      110,
+      6
+    ],
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 3077,
+    "builtin": true
+  }
+}

internal/award/catalog/vucc.json

@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "exported_at": "2026-07-13T17:00:44Z",
+  "awards": [
+    {
+      "def": {
+        "code": "VUCC",
+        "name": "VHF/UHF Century Club",
+        "description": "VHF/UHF Century Club",
+        "valid": true,
+        "protected": true,
+        "url": "https://www.arrl.org/files/file/Awards%20Application%20Forms/VUCCRULE1a.pdf",
+        "valid_from": "1970-01-01",
+        "valid_to": "9999-01-30",
+        "type": "QSOFIELDS",
+        "field": "grid4",
+        "match_by": "code",
+        "exact_match": true,
+        "pattern": "",
+        "dynamic": true,
+        "dxcc_filter": null,
+        "valid_bands": [
+          "6m",
+          "4m",
+          "2m",
+          "70cm",
+          "23cm",
+          "13cm",
+          "1.25m"
+        ],
+        "emission": [
+          "CW",
+          "PHONE",
+          "DIGITAL"
+        ],
+        "confirm": [
+          "lotw",
+          "qsl"
+        ],
+        "validate": [
+          "lotw",
+          "qsl"
+        ],
+        "total": 0,
+        "builtin": true
+      },
+      "references": null
+    }
+  ]
+}

internal/award/catalog/wac.json

@@ -0,0 +1,24 @@
+{
+  "def": {
+    "code": "WAC",
+    "name": "Worked All Continents",
+    "valid": true,
+    "protected": true,
+    "type": "QSOFIELDS",
+    "field": "cont",
+    "match_by": "code",
+    "exact_match": true,
+    "pattern": "",
+    "dxcc_filter": null,
+    "confirm": [
+      "lotw",
+      "qsl",
+      "eqsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 6,
+    "builtin": true
+  }
+}

internal/award/catalog/waip.json

@@ -0,0 +1,929 @@
+{
+  "version": 1,
+  "exported_at": "2026-07-13T21:57:23Z",
+  "awards": [
+    {
+      "def": {
+        "code": "WAIP",
+        "name": "ARI Worked All Italian Provinces",
+        "valid": true,
+        "url": "https://ari.it/en/english-area/awards/1734-waip-worked-all-italian-provinces.html",
+        "ref_url": "https://ari.it/en/english-area/awards/1734-waip-worked-all-italian-provinces.html",
+        "type": "REFERENCE",
+        "field": "qth",
+        "match_by": "code",
+        "exact_match": true,
+        "pattern": "",
+        "or_rules": [
+          {
+            "field": "qth",
+            "match_by": "description"
+          },
+          {
+            "field": "address",
+            "match_by": "code"
+          },
+          {
+            "field": "address",
+            "match_by": "description"
+          }
+        ],
+        "dxcc_filter": [
+          248
+        ],
+        "confirm": [
+          "lotw",
+          "qsl"
+        ],
+        "validate": [
+          "lotw",
+          "qsl"
+        ],
+        "total": 0,
+        "builtin": false
+      },
+      "references": [
+        {
+          "code": "AG",
+          "name": "Agrigento",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AL",
+          "name": "Alessandria",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AN",
+          "name": "Ancona",
+          "dxcc": 248,
+          "group": "Marche",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AO",
+          "name": "Aosta",
+          "dxcc": 248,
+          "group": "Val d'Aosta",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AP",
+          "name": "Ascoli Piceno",
+          "dxcc": 248,
+          "group": "Marche",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AQ",
+          "name": "L'Aquila",
+          "dxcc": 248,
+          "group": "Abruzzo",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AR",
+          "name": "Arezzo",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AT",
+          "name": "Asti",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "AV",
+          "name": "Avellino",
+          "dxcc": 248,
+          "group": "Campania",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BA",
+          "name": "Bari",
+          "dxcc": 248,
+          "group": "Puglia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BG",
+          "name": "Bergamo",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BI",
+          "name": "Biella",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BL",
+          "name": "Belluno",
+          "dxcc": 248,
+          "group": "Veneto",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BN",
+          "name": "Benevento",
+          "dxcc": 248,
+          "group": "Campania",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BO",
+          "name": "Bologna",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BR",
+          "name": "Brindisi",
+          "dxcc": 248,
+          "group": "Puglia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BS",
+          "name": "Brescia",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BT",
+          "name": "Barletta-Andria-Trani",
+          "dxcc": 248,
+          "group": "Puglia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BZ",
+          "name": "Bolzano/Bozen",
+          "dxcc": 248,
+          "group": "Trentino-AltoAdige/Südtirol",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CA",
+          "name": "Cagliari",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CB",
+          "name": "Campobasso",
+          "dxcc": 248,
+          "group": "Molise",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CE",
+          "name": "Caserta",
+          "dxcc": 248,
+          "group": "Campania",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CH",
+          "name": "Chieti",
+          "dxcc": 248,
+          "group": "Abruzzo",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CI",
+          "name": "Carbonia-Iglesias",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CL",
+          "name": "Caltanissetta",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CN",
+          "name": "Cuneo",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CO",
+          "name": "Como",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CR",
+          "name": "Cremona",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CS",
+          "name": "Cosenza",
+          "dxcc": 248,
+          "group": "Calabria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CT",
+          "name": "Catania",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CZ",
+          "name": "Catanzaro",
+          "dxcc": 248,
+          "group": "Calabria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "EN",
+          "name": "Enna",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "FC",
+          "name": "Forlì-Cesena",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "FE",
+          "name": "Ferrara",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "FG",
+          "name": "Foggia",
+          "dxcc": 248,
+          "group": "Puglia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "FI",
+          "name": "Firenze",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "FM",
+          "name": "Fermo",
+          "dxcc": 248,
+          "group": "Marche",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "FR",
+          "name": "Frosinone",
+          "dxcc": 248,
+          "group": "Lazio",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "GE",
+          "name": "Genova",
+          "dxcc": 248,
+          "group": "Liguria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "GO",
+          "name": "Gorizia",
+          "dxcc": 248,
+          "group": "Friuli-Venezia Giulia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "GR",
+          "name": "Grosseto",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "IM",
+          "name": "Imperia",
+          "dxcc": 248,
+          "group": "Liguria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "IS",
+          "name": "Isernia",
+          "dxcc": 248,
+          "group": "Molise",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "KR",
+          "name": "Crotone",
+          "dxcc": 248,
+          "group": "Calabria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "LC",
+          "name": "Lecco",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "LE",
+          "name": "Lecce",
+          "dxcc": 248,
+          "group": "Puglia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "LI",
+          "name": "Livorno",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "LO",
+          "name": "Lodi",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "LT",
+          "name": "Latina",
+          "dxcc": 248,
+          "group": "Lazio",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "LU",
+          "name": "Lucca",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MB",
+          "name": "Monza e Brianza",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MC",
+          "name": "Macerata",
+          "dxcc": 248,
+          "group": "Marche",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "ME",
+          "name": "Messina",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MI",
+          "name": "Milano",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MN",
+          "name": "Mantova",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MO",
+          "name": "Modena",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MS",
+          "name": "Massa-Carrara",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MT",
+          "name": "Matera",
+          "dxcc": 248,
+          "group": "Basilicata",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NA",
+          "name": "Napoli",
+          "dxcc": 248,
+          "group": "Campania",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NO",
+          "name": "Novara",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NU",
+          "name": "Nuoro",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "OG",
+          "name": "Ogliastra",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "OR",
+          "name": "Oristano",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "OT",
+          "name": "Olbia-Tempio",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PA",
+          "name": "Palermo",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PC",
+          "name": "Piacenza",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PD",
+          "name": "Padova",
+          "dxcc": 248,
+          "group": "Veneto",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PE",
+          "name": "Pescara",
+          "dxcc": 248,
+          "group": "Abruzzo",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PG",
+          "name": "Perugia",
+          "dxcc": 248,
+          "group": "Umbria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PI",
+          "name": "Pisa",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PN",
+          "name": "Pordenone",
+          "dxcc": 248,
+          "group": "Friuli-Venezia Giulia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PO",
+          "name": "Prato",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PR",
+          "name": "Parma",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PT",
+          "name": "Pistoia",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PU",
+          "name": "Pesaro-Urbino",
+          "dxcc": 248,
+          "group": "Marche",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PV",
+          "name": "Pavia",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "PZ",
+          "name": "Potenza",
+          "dxcc": 248,
+          "group": "Basilicata",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RA",
+          "name": "Ravenna",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RC",
+          "name": "Reggio Calabria",
+          "dxcc": 248,
+          "group": "Calabria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RE",
+          "name": "Reggio Emilia",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RG",
+          "name": "Ragusa",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RI",
+          "name": "Rieti",
+          "dxcc": 248,
+          "group": "Lazio",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RM",
+          "name": "Roma",
+          "dxcc": 248,
+          "group": "Lazio",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RN",
+          "name": "Rimini",
+          "dxcc": 248,
+          "group": "Emilia-Romagna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "RO",
+          "name": "Rovigo",
+          "dxcc": 248,
+          "group": "Veneto",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SA",
+          "name": "Salerno",
+          "dxcc": 248,
+          "group": "Campania",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SI",
+          "name": "Siena",
+          "dxcc": 248,
+          "group": "Toscana",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SO",
+          "name": "Sondrio",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SP",
+          "name": "La Spezia",
+          "dxcc": 248,
+          "group": "Liguria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SR",
+          "name": "Siracusa",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SS",
+          "name": "Sassari",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SV",
+          "name": "Savona",
+          "dxcc": 248,
+          "group": "Liguria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TA",
+          "name": "Taranto",
+          "dxcc": 248,
+          "group": "Puglia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TE",
+          "name": "Teramo",
+          "dxcc": 248,
+          "group": "Abruzzo",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TN",
+          "name": "Trento",
+          "dxcc": 248,
+          "group": "Trentino-AltoAdige/Südtirol",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TO",
+          "name": "Torino",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TP",
+          "name": "Trapani",
+          "dxcc": 248,
+          "group": "Sicilia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TR",
+          "name": "Terni",
+          "dxcc": 248,
+          "group": "Umbria",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TS",
+          "name": "Trieste",
+          "dxcc": 248,
+          "group": "Friuli-Venezia Giulia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TV",
+          "name": "Treviso",
+          "dxcc": 248,
+          "group": "Veneto",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "UD",
+          "name": "Udine",
+          "dxcc": 248,
+          "group": "Friuli-Venezia Giulia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VA",
+          "name": "Varese",
+          "dxcc": 248,
+          "group": "Lombardia",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VB",
+          "name": "Verbano-Cusio-Ossola",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VC",
+          "name": "Vercelli",
+          "dxcc": 248,
+          "group": "Piemonte",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VE",
+          "name": "Venezia",
+          "dxcc": 248,
+          "group": "Veneto",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VI",
+          "name": "Vicenza",
+          "dxcc": 248,
+          "group": "Veneto",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VR",
+          "name": "Verona",
+          "dxcc": 248,
+          "group": "Veneto",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VS",
+          "name": "Medio Campidano",
+          "dxcc": 248,
+          "group": "Sardegna",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VT",
+          "name": "Viterbo",
+          "dxcc": 248,
+          "group": "Lazio",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "VV",
+          "name": "Vibo Valentia",
+          "dxcc": 248,
+          "group": "Calabria",
+          "subgrp": "",
+          "valid": true
+        }
+      ]
+    }
+  ]
+}

internal/award/catalog/waja.json

@@ -0,0 +1,432 @@
+{
+  "version": 1,
+  "exported_at": "2026-07-13T15:44:38Z",
+  "awards": [
+    {
+      "def": {
+        "code": "WAJA",
+        "name": "Worked All Japanese Prefectures",
+        "description": "Worked All Japanese Prefectures",
+        "valid": true,
+        "protected": true,
+        "valid_from": "1970-01-01",
+        "ref_display": "name",
+        "type": "QSOFIELDS",
+        "field": "qth",
+        "match_by": "description",
+        "pattern": "",
+        "or_rules": [
+          {
+            "field": "qth",
+            "match_by": "pattern"
+          }
+        ],
+        "dxcc_filter": [
+          339
+        ],
+        "valid_bands": [
+          "80m",
+          "40m",
+          "20m",
+          "15m",
+          "10m",
+          "160m"
+        ],
+        "emission": [
+          "CW",
+          "PHONE",
+          "DIGITAL"
+        ],
+        "confirm": [
+          "lotw",
+          "qsl"
+        ],
+        "validate": [
+          "lotw",
+          "qsl"
+        ],
+        "total": 0,
+        "builtin": true
+      },
+      "references": [
+        {
+          "code": "1",
+          "name": "Hokkaido",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "10",
+          "name": "Gunma",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "11",
+          "name": "Saitama",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "12",
+          "name": "Chiba",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "13",
+          "name": "Tokyo",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "pattern": "\\bTok[iy]o\\b",
+          "valid": true
+        },
+        {
+          "code": "14",
+          "name": "Kanagawa",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "15",
+          "name": "Niigata",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "16",
+          "name": "Toyama",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "17",
+          "name": "Ishikawa",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "18",
+          "name": "Fukui",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "19",
+          "name": "Yamanashi",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "2",
+          "name": "Aomori",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "20",
+          "name": "Nagano",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "21",
+          "name": "Gifu",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "22",
+          "name": "Shizuoka",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "23",
+          "name": "Aichi",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "24",
+          "name": "Mie",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "25",
+          "name": "Shiga",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "26",
+          "name": "Kyoto",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "27",
+          "name": "Osaka",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "28",
+          "name": "Hyogo",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "29",
+          "name": "Nara",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "3",
+          "name": "Iwate",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "30",
+          "name": "Wakayama",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "31",
+          "name": "Tottori",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "32",
+          "name": "Shimane",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "33",
+          "name": "Okayama",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "34",
+          "name": "Hiroshima",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "35",
+          "name": "Yamaguchi",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "36",
+          "name": "Tokushima",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "37",
+          "name": "Kagawa",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "38",
+          "name": "Ehime",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "39",
+          "name": "Kochi",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "4",
+          "name": "Miyagi",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "40",
+          "name": "Fukuoka",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "41",
+          "name": "Saga",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "42",
+          "name": "Nagasaki",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "43",
+          "name": "Kumamoto",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "44",
+          "name": "Oita",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "45",
+          "name": "Miyazaki",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "46",
+          "name": "Kagoshima",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "47",
+          "name": "Okinawa",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "5",
+          "name": "Akita",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "6",
+          "name": "Yamagata",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "7",
+          "name": "Fukushima",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "8",
+          "name": "Ibaraki",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "9",
+          "name": "Tochigi",
+          "dxcc": 0,
+          "group": "",
+          "subgrp": "",
+          "valid": true
+        }
+      ]
+    }
+  ]
+}

internal/award/catalog/wapc.json

@@ -0,0 +1,335 @@
+{
+  "version": 1,
+  "exported_at": "2026-07-13T15:43:49Z",
+  "awards": [
+    {
+      "def": {
+        "code": "WAPC",
+        "name": "Worked All Provinces of China",
+        "description": "Worked All Provinces of China",
+        "valid": true,
+        "protected": true,
+        "url": "http://www.mulandxc.com/index/wapc_medal_app",
+        "valid_from": "2012-04-21",
+        "valid_to": "9999-01-31",
+        "type": "QSOFIELDS",
+        "field": "address",
+        "match_by": "description",
+        "pattern": "",
+        "or_rules": [
+          {
+            "field": "qth",
+            "match_by": "description"
+          },
+          {
+            "field": "qth",
+            "match_by": "pattern"
+          }
+        ],
+        "dxcc_filter": [
+          318,
+          152,
+          321
+        ],
+        "valid_bands": [
+          "80m",
+          "40m",
+          "20m",
+          "15m",
+          "10m"
+        ],
+        "emission": [
+          "CW",
+          "PHONE",
+          "DIGITAL"
+        ],
+        "confirm": [
+          "lotw",
+          "qsl"
+        ],
+        "validate": [
+          "lotw",
+          "qsl"
+        ],
+        "total": 0,
+        "builtin": true
+      },
+      "references": [
+        {
+          "code": "AH",
+          "name": "Anhui",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "BJ",
+          "name": "Beijing",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "CQ",
+          "name": "Chongqing",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "FJ",
+          "name": "Fujian",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "GD",
+          "name": "Guangdong",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "GS",
+          "name": "Gansu",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "GX",
+          "name": "Guangxi",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "GZ",
+          "name": "Guizhou",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "HA",
+          "name": "Henan",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "HB",
+          "name": "Hubei",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "HE",
+          "name": "Hebei",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "HI",
+          "name": "Hainan",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "HK",
+          "name": "Hong Kong",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "HL",
+          "name": "Heilongjiang",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "HN",
+          "name": "Hunan",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "JL",
+          "name": "Jilin",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "JS",
+          "name": "Jiangsu",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "pattern": "\\bJiangyin\\b",
+          "valid": true
+        },
+        {
+          "code": "JX",
+          "name": "Jiangxi",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "LN",
+          "name": "Liaoning",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "MO",
+          "name": "Macau",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "pattern": "\\bMaca[uo]\\b",
+          "valid": true
+        },
+        {
+          "code": "NM",
+          "name": "NeiMongol",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "NX",
+          "name": "Ningxia",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "QH",
+          "name": "Qinghai",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SC",
+          "name": "Sichuan",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SD",
+          "name": "Shandong",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SH",
+          "name": "Shanghai",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SN",
+          "name": "Shaanxi",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "SX",
+          "name": "Shanxi",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TJ",
+          "name": "Tianjin",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "TW",
+          "name": "Taiwan",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "XJ",
+          "name": "Xinjiang",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "XZ",
+          "name": "Xizang",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "YN",
+          "name": "Yunnan",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        },
+        {
+          "code": "ZJ",
+          "name": "Zhejiang",
+          "dxcc": 318,
+          "group": "China Provinces",
+          "subgrp": "",
+          "valid": true
+        }
+      ]
+    }
+  ]
+}

internal/award/catalog/was.json

@@ -0,0 +1,27 @@
+{
+  "def": {
+    "code": "WAS",
+    "name": "Worked All States",
+    "valid": true,
+    "protected": true,
+    "type": "QSOFIELDS",
+    "field": "state",
+    "match_by": "code",
+    "exact_match": true,
+    "pattern": "",
+    "dxcc_filter": [
+      291,
+      110,
+      6
+    ],
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 50,
+    "builtin": true
+  }
+}

internal/award/catalog/waz.json

@@ -0,0 +1,23 @@
+{
+  "def": {
+    "code": "WAZ",
+    "name": "Worked All Zones (CQ)",
+    "valid": true,
+    "protected": true,
+    "type": "QSOFIELDS",
+    "field": "cqz",
+    "match_by": "code",
+    "exact_match": true,
+    "pattern": "",
+    "dxcc_filter": null,
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 40,
+    "builtin": true
+  }
+}

internal/award/catalog/wpx.json

@@ -0,0 +1,22 @@
+{
+  "def": {
+    "code": "WPX",
+    "name": "Worked All Prefixes (CQ WPX)",
+    "valid": true,
+    "protected": true,
+    "type": "QSOFIELDS",
+    "field": "prefix",
+    "pattern": "",
+    "dynamic": true,
+    "dxcc_filter": null,
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 0,
+    "builtin": true
+  }
+}

internal/award/catalog/wwff.json

@@ -0,0 +1,22 @@
+{
+  "def": {
+    "code": "WWFF",
+    "name": "World Wide Flora & Fauna",
+    "valid": true,
+    "protected": true,
+    "type": "REFERENCE",
+    "field": "wwff",
+    "pattern": "",
+    "dynamic": true,
+    "dxcc_filter": null,
+    "confirm": [
+      "lotw",
+      "qsl"
+    ],
+    "validate": [
+      "lotw"
+    ],
+    "total": 0,
+    "builtin": true
+  }
+}

internal/award/uscounty_test.go

@@ -0,0 +1,27 @@
+package award
+
+import "testing"
+
+func TestUSCountyKey(t *testing.T) {
+	cases := []struct {
+		state, cnty, want string
+	}{
+		{"MA", "MA,MIDDLESEX", "MA/MIDDLESEX"},        // LoTW "ST,County" shape
+		{"NJ", "Middlesex", "NJ/MIDDLESEX"},           // bare name + state column
+		{"TX", "Montgomery", "TX/MONTGOMERY"},         // title case
+		{"FL", "Saint Lucie", "FL/STLUCIE"},           // Saint→St, space dropped
+		{"FL", "St. Lucie", "FL/STLUCIE"},             // FIPS abbreviation, period dropped
+		{"AK", "Matanuska-Susitna", "AK/MATANUSKASUSITNA"}, // hyphen→space→dropped
+		{"IL", "De Kalb", "IL/DEKALB"},                // split name
+		{"IL", "DeKalb County", "IL/DEKALB"},          // suffix + one word
+		{"LA", "Acadia Parish", "LA/ACADIA"},          // parish suffix
+		{"", "Honolulu", ""},                          // no state → no match
+		{"HI", "0", ""},                               // garbage
+		{"HI", "", ""},                                // empty
+	}
+	for _, c := range cases {
+		if got := USCountyKey(c.state, c.cnty); got != c.want {
+			t.Errorf("USCountyKey(%q,%q) = %q, want %q", c.state, c.cnty, got, c.want)
+		}
+	}
+}

internal/awardref/builtin.go

@@ -17,6 +17,7 @@ import (
 //   - WAC   → continent code ("EU", "NA", …)
 //   - WAS   → ADIF STATE code ("AL", …)
 //   - DDFM  → "D06" (the award pattern captures the leading D)
+//   - USA-CA → canonical "STATE/COUNTY" key (see award.USCountyKey)
 func BuiltinRefs(code string) ([]Ref, bool) {
 	switch code {
 	case "DXCC":
@@ -29,6 +30,8 @@ func BuiltinRefs(code string) ([]Ref, bool) {
 		return usStates().Refs, true
 	case "DDFM":
 		return frenchDepartments(), true
+	case "USA-CA":
+		return usCounties(), true
 	}
 	return nil, false
 }

internal/cat/cat.go

@@ -32,6 +32,16 @@ type Backend interface {
 	SetPTT(on bool) error
 }
 
+// interruptible is an OPTIONAL backend capability: abort an in-progress Connect
+// quickly. The network Icom backend's Connect blocks for up to tens of seconds
+// (UDP handshake + login + waiting for the rig to boot from standby); without a
+// way to interrupt it, Stop()/Start() would freeze on the poll goroutine until
+// the dial gives up — which is why Settings "Save & Close" hung for ~1 min once
+// the link was lost. Backends that don't implement it are simply not interrupted.
+type interruptible interface {
+	Interrupt()
+}
+
 // RigState is the snapshot exchanged with the frontend.
 //
 // FreqHz follows the ADIF FREQ convention: it is the TX frequency. When the
@@ -156,6 +166,7 @@ func (m *Manager) stopLocked() {
 	m.mu.Lock()
 	stop := m.stopCh
 	done := m.doneCh
+	b := m.backend
 	m.stopCh = nil
 	m.doneCh = nil
 	m.cmdCh = nil
@@ -164,6 +175,11 @@ func (m *Manager) stopLocked() {
 	if stop != nil {
 		close(stop)
 	}
+	// Abort any in-progress Connect so we don't block on a slow network dial
+	// (the poll goroutine can be tens of seconds deep in the Icom UDP handshake).
+	if iv, ok := b.(interruptible); ok {
+		iv.Interrupt()
+	}
 	if done != nil {
 		<-done
 	}
@@ -189,11 +205,12 @@ func (m *Manager) SetPTT(on bool) error {
 // the backend picks a default when it's empty. (Status-based colouring can be
 // driven later by setting Color per spot.)
 type SpotInfo struct {
-	FreqHz   int64
-	Callsign string
-	Mode     string
-	Color    string
-	Comment  string
+	FreqHz      int64
+	Callsign    string
+	Mode        string
+	Color       string
+	Comment     string
+	LifetimeSec int // panadapter display seconds before auto-removal (0 = backend default)
 }
 
 // Spotter is an OPTIONAL backend capability: show cluster spots on the radio
@@ -229,23 +246,43 @@ func (m *Manager) SendSpot(s SpotInfo) {
 // FlexTXState is the FlexRadio transmit/ATU state surfaced to the dedicated
 // FlexRadio control tab. Levels are 0-100. (Phase 1: controls + state pushed by
 // the radio over TCP; live meters arrive over a separate UDP stream later.)
+// FlexSliceInfo identifies one FlexRadio receiver slice (A/B/C/D…) for the
+// panel, so the operator sees every slice and which one is active/TX.
+type FlexSliceInfo struct {
+	Index  int    `json:"index"`  // 0-based slice index
+	Letter string `json:"letter"` // A, B, C, D…
+	FreqHz int64  `json:"freq_hz"`
+	Mode   string `json:"mode,omitempty"` // ADIF mode
+	Band   string `json:"band,omitempty"`
+	Active bool   `json:"active"` // the focused/operating slice
+	TX     bool   `json:"tx"`     // this slice transmits
+}
+
 type FlexTXState struct {
-	Available    bool   `json:"available"` // backend is Flex and handshaked
-	Model        string `json:"model,omitempty"`
-	RFPower      int    `json:"rf_power"`
-	TunePower    int    `json:"tune_power"`
-	Tune         bool   `json:"tune"`         // tune carrier active
-	Transmitting bool   `json:"transmitting"` // interlock state = TRANSMITTING
-	VoxEnable    bool   `json:"vox_enable"`
-	VoxLevel     int    `json:"vox_level"`
-	VoxDelay     int    `json:"vox_delay"`
-	ProcEnable   bool   `json:"proc_enable"`
-	ProcLevel    int    `json:"proc_level"`
-	Mon          bool   `json:"mon"`
-	MonLevel     int    `json:"mon_level"`
-	MicLevel     int    `json:"mic_level"`
-	ATUStatus    string `json:"atu_status,omitempty"`
-	ATUMemories  bool   `json:"atu_memories"`
+	Available bool   `json:"available"` // backend is Flex and handshaked
+	Model     string `json:"model,omitempty"`
+	// Slices lists every in-use receiver slice (A/B/C/D…) so the panel can show
+	// them all and highlight the active one. The active slice drives everything.
+	Slices       []FlexSliceInfo `json:"slices,omitempty"`
+	RFPower      int             `json:"rf_power"`
+	TunePower    int             `json:"tune_power"`
+	Tune         bool            `json:"tune"`         // tune carrier active
+	Transmitting bool            `json:"transmitting"` // interlock state = TRANSMITTING
+	VoxEnable    bool            `json:"vox_enable"`
+	VoxLevel     int             `json:"vox_level"`
+	VoxDelay     int             `json:"vox_delay"`
+	ProcEnable   bool            `json:"proc_enable"`
+	ProcLevel    int             `json:"proc_level"`
+	Mon          bool            `json:"mon"`
+	MonLevel     int             `json:"mon_level"`
+	MicLevel     int             `json:"mic_level"`
+	TXFilterLow  int             `json:"tx_filter_low"`  // TX filter low cut (Hz)
+	TXFilterHigh int             `json:"tx_filter_high"` // TX filter high cut (Hz)
+	// Mic profiles (SmartSDR): the list of available profiles + the loaded one.
+	MicProfile  string   `json:"mic_profile,omitempty"`
+	MicProfiles []string `json:"mic_profiles,omitempty"`
+	ATUStatus   string   `json:"atu_status,omitempty"`
+	ATUMemories bool     `json:"atu_memories"`
 	// Active RX slice DSP controls.
 	RXAvail      bool     `json:"rx_avail"`             // an RX slice exists
 	Split        bool     `json:"split"`                // RX/TX on separate slices
@@ -265,6 +302,31 @@ type FlexTXState struct {
 	NRLevel      int      `json:"nr_level"`
 	ANF          bool     `json:"anf"`
 	ANFLevel     int      `json:"anf_level"`
+	WNB          bool     `json:"wnb"`
+	WNBLevel     int      `json:"wnb_level"`
+	// SmartSDR v4 DSP (8000/Aurora series): NRL/ANFL (legacy LMS), NRS
+	// (spectral subtraction), RNN (AI NR), ANFT (FFT notch), NRF (NR w/filter).
+	// DSPV4 is true once the radio reported any of these keys — gates the UI.
+	LMSNR        bool `json:"lms_nr"`
+	LMSNRLevel   int  `json:"lms_nr_level"`
+	LMSANF       bool `json:"lms_anf"`
+	LMSANFLevel  int  `json:"lms_anf_level"`
+	SpeexNR      bool `json:"speex_nr"`
+	SpeexNRLevel int  `json:"speex_nr_level"`
+	RNN          bool `json:"rnn"`
+	ANFT         bool `json:"anft"`
+	NRF          bool `json:"nrf"`
+	NRFLevel     int  `json:"nrf_level"`
+	DSPV4        bool `json:"dsp_v4"`
+	DAXCh        int  `json:"dax_ch"` // DAX audio channel of the active slice (0 = off, 1-8)
+	TXDAX        bool `json:"tx_dax"` // DAX is the TX audio source (SmartSDR transmit-bar DAX button)
+	// RIT/XIT — offsets applied to the active slice's RX / TX frequency without
+	// moving the slice. The offset survives the switch being turned off, so
+	// re-enabling restores it, exactly like the radio's own knob.
+	RIT     bool `json:"rit"`
+	RITFreq int  `json:"rit_freq"`
+	XIT     bool `json:"xit"`
+	XITFreq int  `json:"xit_freq"`
 	// CW / mode-specific controls.
 	Mode           string `json:"mode,omitempty"` // active slice mode (CW/USB/LSB/DIGU…)
 	CWSpeed        int    `json:"cw_speed"`
@@ -291,6 +353,7 @@ type FlexMeter struct {
 	Src   string  `json:"src,omitempty"`  // SLC / TX- / RAD / AMP…
 	Name  string  `json:"name,omitempty"` // FWDPWR, SWR, LEVEL, PATEMP…
 	Unit  string  `json:"unit,omitempty"`
+	Slice int     `json:"slice"` // for SLC meters, the slice index it belongs to; -1 otherwise
 	Value float64 `json:"value"`
 	Lo    float64 `json:"lo"`
 	Hi    float64 `json:"hi"`
@@ -305,6 +368,7 @@ type FlexController interface {
 	SetRFPower(int) error
 	SetTunePower(int) error
 	SetTune(bool) error
+	SetTXInhibit(bool) error
 	SetVOX(bool) error
 	SetVOXLevel(int) error
 	SetVOXDelay(int) error
@@ -313,6 +377,8 @@ type FlexController interface {
 	SetMon(bool) error
 	SetMonLevel(int) error
 	SetMic(int) error
+	SetTXFilter(low, high int) error // transmit-audio bandwidth (Hz)
+	SetMicProfile(string) error      // load a SmartSDR mic profile by name
 	ATUStart() error
 	ATUBypass() error
 	SetATUMemories(bool) error
@@ -323,6 +389,8 @@ type FlexController interface {
 	SetMute(bool) error
 	SetRXAntenna(string) error
 	SetTXAntenna(string) error
+	SetActiveSlice(int) error // focus slice idx so commands target it
+	SetTXSlice(int) error     // make slice idx the transmitter (tx=1)
 	SetSplit(bool) error
 	SetNB(bool) error
 	SetNBLevel(int) error
@@ -332,10 +400,37 @@ type FlexController interface {
 	SetANFLevel(int) error
 	SetAPF(bool) error
 	SetAPFLevel(int) error
+	SetWNB(bool) error
+	SetWNBLevel(int) error
+	// SmartSDR v4 DSP (8000/Aurora): NRL / ANFL / NRS / RNN / ANFT / NRF.
+	SetLMSNR(bool) error
+	SetLMSNRLevel(int) error
+	SetLMSANF(bool) error
+	SetLMSANFLevel(int) error
+	SetSpeexNR(bool) error
+	SetSpeexNRLevel(int) error
+	SetRNN(bool) error
+	SetANFT(bool) error
+	SetNRF(bool) error
+	SetNRFLevel(int) error
+	SetDAX(int) error    // slice RX DAX channel 0 (off) - 8
+	SetTXDAX(bool) error // TX audio from DAX (transmit set dax=)
+	SetRIT(bool) error
+	SetRITFreq(int) error
+	SetXIT(bool) error
+	SetXITFreq(int) error
 	// CW keyer + mode-specific controls.
 	SetCWSpeed(int) error
 	SetCWPitch(int) error
 	SetCWBreakInDelay(int) error
+	// CWX keyer — buffered CW keying via SmartSDR's CWX subsystem, so a Flex needs
+	// no WinKeyer / SmartCAT. SendCW queues text (the radio buffers and keys it);
+	// StopCW clears the buffer, aborting the send. BackspaceCW removes the last n
+	// not-yet-keyed characters from the buffer (un-send while sending — for
+	// type-ahead corrections).
+	SendCW(string) error
+	StopCW() error
+	BackspaceCW(int) error
 	SetCWSidetone(bool) error
 	SetSidetoneLevel(int) error
 	SetCWFilter(int) error
@@ -379,7 +474,7 @@ type IcomTXState struct {
 	// Transmit + live status (polled).
 	Transmitting bool `json:"transmitting"`
 	Split        bool `json:"split"`
-	SMeter       int  `json:"s_meter"` // 0-100 (raw 0-255; S9≈120)
+	SMeter       int  `json:"s_meter"`     // 0-100 (raw 0-255; S9≈120)
 	PowerMeter   int  `json:"power_meter"` // 0-100 (TX Po)
 	SWRMeter     int  `json:"swr_meter"`   // 0-100 (TX SWR)
 	// RIT / ΔTX (XIT).
@@ -390,19 +485,36 @@ type IcomTXState struct {
 	KeySpeedWPM int `json:"key_speed_wpm"` // current KEY SPEED in WPM
 	BreakIn     int `json:"break_in"`      // CW break-in: 0=OFF, 1=SEMI, 2=FULL
 	// Set controls.
-	RFPower int `json:"rf_power"` // 0-100 (TX output)
-	MicGain int `json:"mic_gain"` // 0-100
-	AFGain  int `json:"af_gain"`
-	RFGain  int `json:"rf_gain"`
-	NB        bool   `json:"nb"`
-	NBLevel   int    `json:"nb_level"`
-	NR        bool   `json:"nr"`
-	NRLevel   int    `json:"nr_level"`
-	ANF       bool   `json:"anf"`
-	AGC       string `json:"agc,omitempty"` // FAST | MID | SLOW
-	Preamp    int    `json:"preamp"`        // 0=off, 1=P.AMP1, 2=P.AMP2
-	Att       int    `json:"att"`           // dB attenuation, 0=off
-	Filter    int    `json:"filter"`        // 1 | 2 | 3 (FIL1/2/3)
+	RFPower int    `json:"rf_power"` // 0-100 (TX output)
+	MicGain int    `json:"mic_gain"` // 0-100
+	AFGain  int    `json:"af_gain"`
+	RFGain  int    `json:"rf_gain"`
+	NB      bool   `json:"nb"`
+	NBLevel int    `json:"nb_level"`
+	NR      bool   `json:"nr"`
+	NRLevel int    `json:"nr_level"`
+	ANF     bool   `json:"anf"`
+	APF     bool   `json:"apf"`           // audio peak filter (CW only)
+	AGC     string `json:"agc,omitempty"` // FAST | MID | SLOW
+	Preamp  int    `json:"preamp"`        // 0=off, 1=P.AMP1, 2=P.AMP2
+	Att     int    `json:"att"`           // dB attenuation, 0=off
+	Filter  int    `json:"filter"`        // 1 | 2 | 3 (FIL1/2/3)
+	// Antenna (IC-7610 = ANT1/ANT2).
+	Antenna int `json:"antenna"` // 1 | 2 (0 = unknown)
+	// Filter fine controls: Twin PBT + manual notch (0-100, 50 = centre).
+	PBTInner    int  `json:"pbt_inner"`
+	PBTOuter    int  `json:"pbt_outer"`
+	ManualNotch bool `json:"manual_notch"`
+	NotchPos    int  `json:"notch_pos"`
+	// TX extras.
+	Squelch   int  `json:"squelch"`
+	Comp      bool `json:"comp"`
+	CompLevel int  `json:"comp_level"`
+	Monitor   bool `json:"monitor"`
+	MonLevel  int  `json:"mon_level"`
+	VOX       bool `json:"vox"`
+	VOXGain   int  `json:"vox_gain"`
+	AntiVOX   int  `json:"anti_vox"`
 }
 
 // IcomController is an OPTIONAL backend capability (the Icom CI-V backend): the
@@ -418,6 +530,7 @@ type IcomController interface {
 	SetNR(bool) error
 	SetNRLevel(int) error
 	SetANF(bool) error
+	SetAPF(bool) error
 	SetAGC(string) error
 	SetPreamp(int) error
 	SetAtt(int) error
@@ -426,16 +539,31 @@ type IcomController interface {
 	SetMicGain(int) error
 	SetIcomSplit(bool) error
 	TuneATU() error
-	SetScope(bool) error     // enable/disable the spectrum-scope waveform stream
-	SetScopeMode(bool) error // true = fixed span, false = center-on-VFO
-	ScopeData() ScopeSweep   // latest assembled sweep (empty until enabled)
-	SetRIT(int) error        // RIT/ΔTX offset in signed Hz
-	SetRITOn(bool) error     // RIT on/off
-	SetXITOn(bool) error     // ΔTX (XIT) on/off
-	SendCW(string) error     // key a CW message via the rig's keyer (CI-V 0x17)
-	StopCW() error           // abort the CW message being sent
-	SetKeySpeed(int) error   // CW keyer speed in WPM
-	SetBreakIn(int) error    // CW break-in: 0=OFF, 1=SEMI, 2=FULL
+	SetScope(bool) error              // enable/disable the spectrum-scope waveform stream
+	SetScopeMode(bool) error          // true = fixed span, false = center-on-VFO
+	SetScopeEdges(int64, int64) error // point the fixed scope at low..high Hz (centre/pan)
+	ScopeData() ScopeSweep            // latest assembled sweep (empty until enabled)
+	SetRIT(int) error                 // RIT/ΔTX offset in signed Hz
+	SetRITOn(bool) error              // RIT on/off
+	SetXITOn(bool) error              // ΔTX (XIT) on/off
+	SendCW(string) error              // key a CW message via the rig's keyer (CI-V 0x17)
+	StopCW() error                    // abort the CW message being sent
+	SetKeySpeed(int) error            // CW keyer speed in WPM
+	SetBreakIn(int) error             // CW break-in: 0=OFF, 1=SEMI, 2=FULL
+	SetAntenna(int) error             // 1 = ANT1, 2 = ANT2
+	SetPBTInner(int) error            // Twin PBT inside (0-100, 50 = centre)
+	SetPBTOuter(int) error            // Twin PBT outside (0-100, 50 = centre)
+	SetManualNotch(bool) error
+	SetNotchPos(int) error // manual-notch position (0-100, 50 = centre)
+	SetSquelch(int) error
+	SetComp(bool) error
+	SetCompLevel(int) error
+	SetMonitor(bool) error
+	SetMonLevel(int) error
+	SetVOX(bool) error
+	SetVOXGain(int) error
+	SetAntiVOX(int) error
+	SetPower(bool) error // turn the transceiver on/off (manual — never auto on connect)
 }
 
 // ScopeSweep is one complete spectrum-scope sweep reassembled from the Icom's

internal/cat/civ/civ.go

@@ -37,7 +37,9 @@ const (
 	CmdPTT            = 0x1C // sub 0x00 = PTT
 	CmdExtra          = 0x1A // sub 0x06 = data mode on modern Icoms
 	CmdReadID         = 0x19 // sub 0x00 = rig's own CI-V address (identifies model)
+	CmdPower          = 0x18 // power on/off (sub 0x01 = on, 0x00 = off; on needs an FE wake preamble)
 
+	CmdAnt   = 0x12 // antenna selector (sub 0x00 = ANT1, 0x01 = ANT2; read = no sub)
 	CmdAtt   = 0x11 // attenuator (1 BCD byte of dB; 0x00 = off)
 	CmdLevel = 0x14 // analogue levels (sub + 2 BCD bytes, 0000-0255)
 	CmdMeter = 0x15 // meters (sub + 2 BCD bytes, 0000-0255): S-meter/Po/SWR
@@ -67,8 +69,16 @@ const (
 	// CmdLevel sub-commands.
 	SubLevelAF      = 0x01 // AF (volume)
 	SubLevelRF      = 0x02 // RF gain
+	SubLevelSQL     = 0x03 // squelch level
+	SubLevelPBTIn   = 0x07 // Twin PBT (inside)  — 0-255, 128 = centre
+	SubLevelPBTOut  = 0x08 // Twin PBT (outside) — 0-255, 128 = centre
 	SubLevelNR      = 0x06 // noise-reduction depth
+	SubLevelNotch   = 0x0D // manual-notch position — 0-255, 128 = centre
+	SubLevelComp    = 0x0E // speech-compressor level
 	SubLevelNB      = 0x12 // noise-blanker depth
+	SubLevelMon     = 0x15 // monitor gain
+	SubLevelVOXGain = 0x16 // VOX gain
+	SubLevelAntiVOX = 0x17 // anti-VOX level
 	SubLevelRFPower = 0x0A // TX RF output power
 	SubLevelMic     = 0x0B // mic gain
 
@@ -84,9 +94,10 @@ const (
 	SubScopeData  = 0x00 // waveform data frame (divided across several frames)
 	SubScopeOnOff = 0x10 // turn the scope display itself on/off (00/01)
 	SubScopeOn    = 0x11 // enable/disable waveform data output over CI-V (00/01)
-	SubScopeMode  = 0x14 // center/fixed mode (0=center, 1=fixed) — VERIFY on rig
-	SubScopeSpan  = 0x15 // span in center mode — VERIFY on rig
-	SubScopeEdge  = 0x16 // fixed-mode edge frequencies — VERIFY on rig
+	SubScopeMode    = 0x14 // center/fixed mode (0=center, 1=fixed)
+	SubScopeSpan    = 0x15 // span in center mode (±span/2 as 5 LE-BCD)
+	SubScopeEdge    = 0x16 // fixed-mode ACTIVE edge set 1-4 (vfo + set#)
+	SubScopeFixEdge = 0x1e // fixed-mode edge FREQUENCIES: [range][set#][low 5-BCD][high 5-BCD]
 
 	// CmdSwitch sub-commands.
 	SubSwPreamp = 0x02 // 0=off, 1=P.AMP1, 2=P.AMP2
@@ -94,7 +105,12 @@ const (
 	SubSwNB     = 0x22 // noise blanker on/off
 	SubSwNR     = 0x40 // noise reduction on/off
 	SubSwANF    = 0x41 // auto-notch on/off
+	SubSwComp   = 0x44 // speech compressor on/off
+	SubSwMon    = 0x45 // monitor on/off
+	SubSwVOX    = 0x46 // VOX on/off
 	SubSwBreakIn = 0x47 // CW break-in: 0=OFF, 1=SEMI, 2=FULL (needed so 0x17 CW keys TX)
+	SubSwMN     = 0x48 // manual notch on/off
+	SubSwAPF    = 0x32 // audio peak filter on/off (CW only)
 )
 
 // CW break-in modes (CmdSwitch 0x47).
@@ -297,6 +313,8 @@ func ModelName(addr byte) string {
 		return "IC-7300"
 	case 0x98:
 		return "IC-7610"
+	case 0x7C:
+		return "IC-9100"
 	case 0xA2:
 		return "IC-9700"
 	case 0xA4:

internal/cat/flex_split_test.go

@@ -0,0 +1,49 @@
+package cat
+
+import "testing"
+
+// A genuine split is two same-band slices in the SAME split class (both PHONE or
+// both CW). Two same-band slices in different modes (SSB + FT8), or in a data
+// mode (FT8/FT4/RTTY = DIGU/DIGL), must NOT read as split.
+func TestOperatingSplitMode(t *testing.T) {
+	mk := func(hz int64, mode string, active, tx bool) *flexSlice {
+		return &flexSlice{freqHz: hz, mode: mode, active: active, tx: tx, inUse: true}
+	}
+	cases := []struct {
+		name      string
+		slices    map[int]*flexSlice
+		wantSplit bool
+	}{
+		{"phone split (both USB)", map[int]*flexSlice{
+			0: mk(14_100_000, "USB", true, false),
+			1: mk(14_200_000, "USB", false, true),
+		}, true},
+		{"CW split (both CW)", map[int]*flexSlice{
+			0: mk(7_010_000, "CW", true, false),
+			1: mk(7_025_000, "CW", false, true),
+		}, true},
+		{"SSB + FT8 same band → not split", map[int]*flexSlice{
+			0: mk(14_100_000, "USB", true, false),
+			1: mk(14_074_000, "DIGU", false, true),
+		}, false},
+		{"both FT8 (DIGU) same band → not split", map[int]*flexSlice{
+			0: mk(14_074_000, "DIGU", true, false),
+			1: mk(14_080_000, "DIGU", false, true),
+		}, false},
+		{"different bands → not split", map[int]*flexSlice{
+			0: mk(14_100_000, "USB", true, false),
+			1: mk(7_100_000, "LSB", false, true),
+		}, false},
+		{"simplex (single slice) → not split", map[int]*flexSlice{
+			0: mk(14_100_000, "USB", true, true),
+		}, false},
+	}
+	for _, c := range cases {
+		f := &Flex{slices: c.slices}
+		_, rx, tx := f.operatingLocked()
+		gotSplit := rx != nil && tx != nil
+		if gotSplit != c.wantSplit {
+			t.Errorf("%s: split=%v, want %v", c.name, gotSplit, c.wantSplit)
+		}
+	}
+}

internal/cat/icomaudio.go

@@ -0,0 +1,219 @@
+package cat
+
+// icomaudio.go — the NETWORK AUDIO stream (UDP 50003) for the Icom LAN protocol.
+// It is the third stream alongside control (50001) and CI-V (50002): once the
+// control login + conninfo (with rxenable=1) authorize audio, the rig streams RX
+// audio here as data packets. This file dials/handshakes/keeps-alive that socket
+// exactly like the CI-V stream (icomnet.go) — those parts are byte-for-byte the
+// PROVEN transport — and hands each received audio payload to a sink callback
+// (the app decodes it via an audio.Codec and plays it through the RX monitor).
+//
+// Reuses icomnet.go's helpers (icnCtrl, icnHandshake, icnPingReply, icnRecv,
+// icnLocalID, icnLE) and the same seq/retransmit discipline.
+//
+// ⚠️ PAYLOAD OFFSET PENDING ON-RIG VERIFICATION. The stream framing (handshake,
+// ping, idle, retransmit, common 16-byte header) is identical to CI-V and proven.
+// The AUDIO data packet's inner layout — where the PCM starts and the datalen
+// field — is reconstructed from wfview's audio_packet (ident@0x10, datalen@0x12,
+// sendseq@0x14, audio@0x16) but NOT yet confirmed against a real 50003 capture.
+// audioPump logs the first few raw packets (icaDumpFirst) so the offset can be
+// confirmed/corrected on the first on-rig test without a packet capture, the same
+// way the CI-V/scope framing was iterated. Nothing here can destabilize CAT: the
+// audio stream is opt-in and entirely separate from control/CI-V.
+
+import (
+	"net"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+// icaAudioOffset is where the PCM payload begins inside an audio data packet
+// (wfview audio_packet: 16-byte common header + ident@0x10 + datalen@0x12 +
+// sendseq@0x14 → audio@0x16). Isolated as a const so a capture-confirmed change
+// is a one-line edit.
+const icaAudioOffset = 0x16
+
+// icaDumpFirst is how many initial audio packets to hex-dump to the debug log for
+// offset verification. After the layout is confirmed on a real rig this can go to
+// 0 (or the const above corrected).
+const icaDumpFirst = 6
+
+// icomAudio is the connected audio stream. RX only for now (Phase 4); TX (Phase
+// 5) will add an encode+send path mirroring icomNet.Write.
+type icomAudio struct {
+	conn         *net.UDPConn
+	aID, aRemote uint32
+
+	sink func([]byte) // receives each raw audio payload (app decodes + plays)
+
+	// Receive-side retransmit (audio is a heavy stream, like the scope): track the
+	// rig's data-packet send seq and ask it to resend gaps, or the rig drops the
+	// session. Same mechanism as icomNet. Owned solely by audioPump → no lock.
+	rxHaveSeq bool
+	rxLastSeq uint16
+	rxMissing map[uint16]int
+
+	dumped int          // packets hex-dumped so far (≤ icaDumpFirst)
+	lastRx atomic.Int64 // UnixNano of last packet (liveness)
+
+	done      chan struct{}
+	closeOnce sync.Once
+}
+
+func (a *icomAudio) markRx() { a.lastRx.Store(time.Now().UnixNano()) }
+
+// Close tears the audio stream down (disconnect a few times; UDP is lossy).
+func (a *icomAudio) Close() {
+	a.closeOnce.Do(func() {
+		close(a.done)
+		for i := 0; i < 3; i++ {
+			_, _ = a.conn.Write(icnCtrl(0x05, 0, a.aID, a.aRemote)) // disconnect
+			time.Sleep(15 * time.Millisecond)
+		}
+		_ = a.conn.Close()
+		debugLog.Printf("icom audio: stream closed")
+	})
+}
+
+// dialIcomAudio opens the audio UDP stream to rig:50003, binding LOCAL :50003
+// (mirroring the civ stream's local :50002). The control conninfo (rxenable=1,
+// audioport=50003) must already have authorized it. sink receives each raw audio
+// payload. cancel aborts a slow dial (Stop/Start).
+func dialIcomAudio(host string, sink func([]byte), cancel <-chan struct{}) (*icomAudio, error) {
+	araddr, err := net.ResolveUDPAddr("udp4", net.JoinHostPort(host, "50003"))
+	if err != nil {
+		return nil, err
+	}
+	conn, err := net.DialUDP("udp4", &net.UDPAddr{Port: 50003}, araddr)
+	if err != nil {
+		debugLog.Printf("icom audio: cannot bind local :50003 (Remote Utility running?): %v", err)
+		return nil, err
+	}
+	aID := icnLocalID(conn)
+	aRemote, err := icnHandshake(conn, aID, cancel)
+	if err != nil {
+		_ = conn.Close()
+		debugLog.Printf("icom audio: handshake FAILED: %v", err)
+		return nil, err
+	}
+	_ = conn.SetReadBuffer(1 << 20)
+	a := &icomAudio{
+		conn: conn, aID: aID, aRemote: aRemote,
+		sink:      sink,
+		rxMissing: make(map[uint16]int),
+		done:      make(chan struct{}),
+	}
+	a.markRx()
+	debugLog.Printf("icom audio: stream up (rig id 0x%08X) — awaiting RX audio", aRemote)
+	go a.audioPump()
+	return a, nil
+}
+
+// audioPump drains the audio socket: replies to pings, sends idle keepalives,
+// requests retransmits for lost packets, and hands each audio payload to sink.
+func (a *icomAudio) audioPump() {
+	buf := make([]byte, 8192)
+	lastIdle := time.Now()
+	lastReq := time.Now()
+	for {
+		select {
+		case <-a.done:
+			return
+		default:
+		}
+		_ = a.conn.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
+		if k, err := a.conn.Read(buf); err == nil && k >= 16 {
+			a.markRx()
+			switch typ := icnLE.Uint16(buf[4:]); {
+			case typ == 0x07: // ping
+				_, _ = a.conn.Write(icnPingReply(buf[:k], a.aID, a.aRemote))
+			case typ == 0x01: // retransmit request from the rig (we send no tracked audio yet)
+			case typ == 0x05: // rig-initiated disconnect
+				debugLog.Printf("icom audio: rig sent DISCONNECT — audio stream dropped by the rig")
+			case typ == 0x00 && k > icaAudioOffset: // audio data packet
+				a.trackRxSeq(icnLE.Uint16(buf[6:]))
+				if a.dumped < icaDumpFirst {
+					a.dumped++
+					debugLog.Printf("icom audio raw #%d: len=%d head=% X", a.dumped, k, buf[:min(icaAudioOffset+8, k)])
+				}
+				if a.sink != nil {
+					payload := append([]byte(nil), buf[icaAudioOffset:k]...)
+					a.sink(payload)
+				}
+			}
+		}
+		if time.Since(lastIdle) > 100*time.Millisecond {
+			_, _ = a.conn.Write(icnCtrl(0x00, 0, a.aID, a.aRemote))
+			lastIdle = time.Now()
+		}
+		if time.Since(lastReq) > 100*time.Millisecond {
+			a.sendRetransmitReq()
+			lastReq = time.Now()
+		}
+	}
+}
+
+// trackRxSeq / sendRetransmitReq mirror icomNet's receive-side retransmit exactly
+// (audio is as loss-sensitive as the scope stream). Duplicated deliberately so
+// the audio stream owns its own seq state with no shared locking.
+func (a *icomAudio) trackRxSeq(seq uint16) {
+	if !a.rxHaveSeq {
+		a.rxHaveSeq = true
+		a.rxLastSeq = seq
+		return
+	}
+	switch d := int16(seq - a.rxLastSeq); {
+	case d == 0:
+	case d < 0:
+		delete(a.rxMissing, seq)
+	case d == 1:
+		a.rxLastSeq = seq
+	case int(d) <= icnMaxMissing:
+		for f := a.rxLastSeq + 1; f != seq; f++ {
+			a.rxMissing[f] = 0
+		}
+		a.rxLastSeq = seq
+	default:
+		a.rxMissing = make(map[uint16]int)
+		a.rxLastSeq = seq
+	}
+}
+
+func (a *icomAudio) sendRetransmitReq() {
+	if len(a.rxMissing) == 0 {
+		return
+	}
+	if len(a.rxMissing) > icnMaxMissing {
+		a.rxMissing = make(map[uint16]int)
+		return
+	}
+	var seqs []uint16
+	for s, cnt := range a.rxMissing {
+		if cnt >= 4 {
+			delete(a.rxMissing, s)
+			continue
+		}
+		a.rxMissing[s] = cnt + 1
+		seqs = append(seqs, s)
+	}
+	switch {
+	case len(seqs) == 0:
+		return
+	case len(seqs) == 1:
+		_, _ = a.conn.Write(icnCtrl(0x01, seqs[0], a.aID, a.aRemote))
+	default:
+		b := make([]byte, 16+4*len(seqs))
+		icnLE.PutUint32(b[0:], uint32(len(b)))
+		icnLE.PutUint16(b[4:], 0x01)
+		icnLE.PutUint32(b[8:], a.aID)
+		icnLE.PutUint32(b[12:], a.aRemote)
+		off := 16
+		for _, s := range seqs {
+			icnLE.PutUint16(b[off:], s)
+			icnLE.PutUint16(b[off+2:], s)
+			off += 4
+		}
+		_, _ = a.conn.Write(b)
+	}
+}

internal/cat/icomnet.go

@@ -0,0 +1,905 @@
+package cat
+
+// icomnet.go — the NETWORK transport for the Icom backend. It talks the Icom IP
+// remote protocol (the LAN server built into the IC-7610, the one the Icom
+// Remote Utility speaks) directly, and presents the tunnelled CI-V byte stream
+// as a plain civTransport (Read/Write). So the entire IcomController surface —
+// freq/mode, receive-DSP, TX, scope, RIT, CW — runs unchanged over the network;
+// only the transport differs. OpsLog thus replaces BOTH the Remote Utility and
+// RS-BA1.
+//
+// The protocol (framing, passcode table, packet offsets, power-on) was
+// reimplemented from the public wfview protocol and verified byte-for-byte
+// against real Remote-Utility captures. No GPLv3 code is copied.
+//
+// Three UDP streams exist on the rig (control 50001 / CI-V 50002 / audio 50003);
+// this transport uses control + CI-V (audio is not needed for CAT). Connect:
+//   control: areYouThere→iAmHere→areYouReady→iAmReady → login → token → conninfo
+//   civ:     areYouThere→…→iAmReady → openClose(open) → power-on
+// then CI-V flows in data packets. A pump goroutine keeps both streams alive
+// (ping replies + idle keepalives) and feeds received CI-V bytes to Read.
+
+import (
+	"encoding/binary"
+	"fmt"
+	"io"
+	"net"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+var icnLE = binary.LittleEndian
+var icnBE = binary.BigEndian
+
+// NewIcomNet builds an (unconnected) Icom backend whose transport is the network
+// stream. host is the rig's IP/hostname; user/pass are the rig's Network User1
+// credentials. Reuses the whole IcomSerial controller — only `open` differs.
+//
+// audioSink (optional) enables the network RX audio stream (UDP 50003): when
+// non-nil the conninfo asks the rig to stream audio and each received payload is
+// passed to audioSink (the app decodes it via an audio.Codec and plays it). nil
+// = CI-V only (the proven default). The audio stream is fully separate from CAT,
+// so enabling it can't affect freq/mode/DSP control.
+func NewIcomNet(host, user, pass string, civAddr int, digitalDefault string, audioSink func([]byte)) *IcomSerial {
+	if civAddr <= 0 || civAddr > 0xFF {
+		civAddr = 0x98 // IC-7610
+	}
+	if digitalDefault == "" {
+		digitalDefault = "FT8"
+	}
+	b := &IcomSerial{
+		portName:   host,
+		rigAddr:    byte(civAddr),
+		digital:    strings.ToUpper(digitalDefault),
+		model:      "Icom",
+		scopeFixed: true,
+	}
+	b.open = func() (civTransport, error) {
+		if strings.TrimSpace(host) == "" {
+			return nil, fmt.Errorf("no rig host configured")
+		}
+		b.dialMu.Lock()
+		cancel := b.dialCancel
+		b.dialMu.Unlock()
+		return dialIcomNet(host, user, pass, "OpsLog", b.rigAddr, cancel, audioSink)
+	}
+	return b
+}
+
+// errDialCanceled is returned by dialIcomNet when Interrupt() aborts the dial
+// (Stop/Start). The Manager treats it like any connect error and simply stops.
+var errDialCanceled = fmt.Errorf("dial canceled")
+
+// icnCanceled reports whether the dial has been asked to abort.
+func icnCanceled(cancel <-chan struct{}) bool {
+	if cancel == nil {
+		return false
+	}
+	select {
+	case <-cancel:
+		return true
+	default:
+		return false
+	}
+}
+
+// icomNet is the connected network transport. It satisfies civTransport.
+type icomNet struct {
+	ctrl *net.UDPConn // control stream (50001)
+	civ  *net.UDPConn // CI-V stream (50002)
+
+	cID, cRemote uint32 // control stream ids
+	vID, vRemote uint32 // civ stream ids
+
+	// Tracked-packet sequence + CI-V data sequence. Written only by Write (on the
+	// CAT goroutine) and during dial — never by the pump — so no lock is needed.
+	vTracked uint16
+	vCivSeq  uint16
+
+	rx       chan []byte   // CI-V byte chunks from civPump → Read (control replies)
+	scopeRx  chan []byte   // scope (0x27) frames, kept off rx so the panadapter
+	//                        stream can't crowd control replies out (→ ScopeChan)
+	leftover []byte        // partial chunk not yet returned by Read (Read-only)
+	readTO   time.Duration // Read timeout (SetReadTimeout)
+
+	// sentBuf keeps recently-sent tracked civ packets (by outer seq) so we can
+	// answer the rig's UDP retransmit requests. Written by Write (CAT goroutine),
+	// read by the pumps → guarded by sentMu.
+	sentMu  sync.Mutex
+	sentBuf map[uint16][]byte
+
+	// Control-stream auth state, carried out of dial so ctrlPump can RENEW the
+	// login token every ~45 s. The rig invalidates the session ~2 min after login
+	// without renewal (this was the "loses control after 2 min" drop — RS-BA1/the
+	// Remote Utility renew too). Owned solely by ctrlPump after dial → no lock.
+	cTracked uint16             // control-stream tracked seq (continues after dial)
+	cAuthSeq uint16             // token-packet innerseq
+	cToken   uint32             // login token (opaque, echoed back verbatim)
+	cTokReq  uint16             // token-request id (echoed)
+	cSentBuf map[uint16][]byte  // control-stream retransmit buffer (token renewals)
+
+	// Receive-side retransmit (CI-V stream): track the rig's data-packet send seq
+	// and ask it to resend any gap. Under the scope stream, UDP drops are common;
+	// without recovering them the gaps accumulate and the rig drops the WHOLE
+	// session after ~20 s (RS-BA1/wfview request retransmits, which is why they
+	// stay up with the panadapter on). Owned solely by civPump → no lock.
+	rxHaveSeq bool
+	rxLastSeq uint16
+	rxMissing map[uint16]int
+
+	// lastRx is the UnixNano of the last packet received from the rig (any type),
+	// updated by both pumps. The rig's network server answers pings/idles even
+	// when the RADIO is in standby, so this tracks the CONTROL-LINK liveness
+	// independently of whether CI-V is replying — letting ReadState tell "rig off
+	// but link fine" (stay connected) from "link dead" (reconnect). See Alive().
+	lastRx atomic.Int64
+
+	// dead is set when the rig explicitly tears the session down (control 0x05):
+	// Alive() then returns false immediately so ReadState fails on the next poll and
+	// the manager reconnects cleanly, instead of waiting out the 6 s lastRx timeout.
+	dead atomic.Bool
+
+	// audio is the optional RX audio stream (UDP 50003). nil when audio is off.
+	// Torn down alongside the CI-V/control streams in Close.
+	audio *icomAudio
+
+	done      chan struct{}
+	closeOnce sync.Once
+}
+
+// ScopeChan exposes the raw scope (0x27) CI-V frames for the scope feeder.
+// Satisfies scopeTransport in icomserial.go.
+func (n *icomNet) ScopeChan() <-chan []byte { return n.scopeRx }
+
+// icnEnqueueDrop pushes onto a bounded channel, discarding the oldest entry when
+// full — a lagging consumer never blocks the producer (used for the scope stream,
+// where only the latest sweep matters).
+func icnEnqueueDrop(ch chan []byte, v []byte) {
+	select {
+	case ch <- v:
+	default:
+		select {
+		case <-ch:
+		default:
+		}
+		select {
+		case ch <- v:
+		default:
+		}
+	}
+}
+
+func (n *icomNet) SetReadTimeout(d time.Duration) error { n.readTO = d; return nil }
+func (n *icomNet) SetDTR(bool) error                    { return nil } // n/a on the network
+func (n *icomNet) SetRTS(bool) error                    { return nil }
+
+// markRx records that a packet just arrived from the rig (control-link liveness).
+func (n *icomNet) markRx() { n.lastRx.Store(time.Now().UnixNano()) }
+
+// Alive reports whether the rig's network server is still talking to us. The rig
+// pings/idles continuously (even in standby), so a gap means the link — not just
+// the radio — is gone. Independent of CI-V replies, so a powered-off rig still
+// reads as Alive and the session isn't torn down. Satisfies aliveTransport.
+func (n *icomNet) Alive() bool {
+	if n.dead.Load() {
+		return false // rig sent an explicit disconnect — reconnect now, don't wait
+	}
+	last := n.lastRx.Load()
+	if last == 0 {
+		return true // just connected, nothing received yet — give it a chance
+	}
+	return time.Since(time.Unix(0, last)) < 6*time.Second
+}
+
+// Read returns tunnelled CI-V bytes, mimicking a serial port: (0,nil) on
+// timeout, (n,nil) with data, (0,err) when the link is closed.
+func (n *icomNet) Read(p []byte) (int, error) {
+	if len(n.leftover) > 0 {
+		k := copy(p, n.leftover)
+		n.leftover = n.leftover[k:]
+		return k, nil
+	}
+	to := n.readTO
+	if to <= 0 {
+		to = 60 * time.Millisecond
+	}
+	select {
+	case f, ok := <-n.rx:
+		if !ok {
+			return 0, io.EOF
+		}
+		k := copy(p, f)
+		if k < len(f) {
+			n.leftover = append(n.leftover[:0], f[k:]...)
+		}
+		return k, nil
+	case <-time.After(to):
+		return 0, nil // timeout, no data
+	case <-n.done:
+		return 0, io.EOF
+	}
+}
+
+// Write wraps raw CI-V bytes (FE FE … FD) in a data packet and sends them.
+func (n *icomNet) Write(p []byte) (int, error) {
+	if icnTrace {
+		debugLog.Printf("icom net TX: % X", p)
+	}
+	seq := n.vTracked
+	pkt := icnCivData(seq, n.vID, n.vRemote, n.vCivSeq, p)
+	n.vTracked++
+	n.vCivSeq++
+	n.sentMu.Lock()
+	n.sentBuf[seq] = pkt
+	delete(n.sentBuf, seq-1024) // keep the buffer bounded (~last 1024 packets) so
+	// the rig's retransmit requests still hit even under sustained CW + poll load
+	n.sentMu.Unlock()
+	if _, err := n.civ.Write(pkt); err != nil {
+		return 0, err
+	}
+	return len(p), nil
+}
+
+// icnTrace toggles verbose per-frame CI-V request/reply logging for diagnosing
+// the network transport. Off by default (the connect-step logs stay); flip to
+// true to trace every TX/RX again.
+var icnTrace = false
+
+func (n *icomNet) Close() error {
+	n.closeOnce.Do(func() {
+		close(n.done)
+		if n.audio != nil {
+			n.audio.Close()
+		}
+		// Tell the rig we're leaving so it frees its SINGLE control session at
+		// once. If it never gets a disconnect it holds the session for minutes and
+		// refuses every new login — which is why a lost link (or a hard app exit)
+		// left the rig un-reconnectable, even from the Icom Remote Utility. UDP is
+		// lossy, so send openClose(close) + disconnect on both streams a few times.
+		// The whole teardown is bounded to ~90 ms so it never stalls the caller
+		// (Settings "Save & Close" / a reconnect's Disconnect).
+		for i := 0; i < 3; i++ {
+			_, _ = n.civ.Write(icnOpenClose(n.vTracked, n.vID, n.vRemote, n.vCivSeq, 0x00)) // close CI-V
+			_, _ = n.civ.Write(icnCtrl(0x05, 0, n.vID, n.vRemote))                          // disconnect civ
+			_, _ = n.ctrl.Write(icnCtrl(0x05, 0, n.cID, n.cRemote))                         // disconnect ctrl
+			time.Sleep(25 * time.Millisecond)
+		}
+		debugLog.Printf("icom net: sent disconnect to rig (session released)")
+		_ = n.civ.Close()
+		_ = n.ctrl.Close()
+	})
+	return nil
+}
+
+// ctrlPump keeps the control stream (50001) alive: replies to the rig's pings,
+// sends idle keepalives, RENEWS the login token every ~45 s (without this the rig
+// invalidates the session after ~2 min → total loss of control), and answers the
+// rig's retransmit requests for those tracked control packets. Its own goroutine
+// so it never throttles civPump.
+func (n *icomNet) ctrlPump() {
+	buf := make([]byte, 4096)
+	lastIdle := time.Now()
+	lastToken := time.Now() // token was just granted during dial
+	for {
+		select {
+		case <-n.done:
+			return
+		default:
+		}
+		_ = n.ctrl.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
+		if k, err := n.ctrl.Read(buf); err == nil && k >= 16 {
+			n.markRx()
+			switch icnLE.Uint16(buf[4:]) {
+			case 0x07: // ping
+				_, _ = n.ctrl.Write(icnPingReply(buf[:k], n.cID, n.cRemote))
+			case 0x00: // idle keepalive from the rig — nothing to do
+			case 0x01: // retransmit request — resend from the CONTROL sent-buffer
+				if k >= 8 {
+					n.ctrlResend(icnLE.Uint16(buf[6:]))
+				}
+			case 0x05: // rig-initiated disconnect — it dropped US
+				n.dead.Store(true) // make Alive() fail now → prompt clean reconnect
+				debugLog.Printf("icom net: rig sent DISCONNECT on control stream — session dropped by the rig")
+			default:
+				// Anything else on the control stream is (almost always) the rig's
+				// reply to our token renewal. Log it: a 0x40-length token packet
+				// carries a result code, and if the rig is REJECTING renewals this is
+				// where the ~2-3 min disconnect originates. The hex makes the cause
+				// visible in the friend's log without a protocol analyzer.
+				if k >= 0x18 {
+					debugLog.Printf("icom net: control reply len=%d head=% X", k, buf[:0x18])
+				} else {
+					debugLog.Printf("icom net: control reply len=%d head=% X", k, buf[:k])
+				}
+			}
+		}
+		if time.Since(lastIdle) > 100*time.Millisecond {
+			_, _ = n.ctrl.Write(icnCtrl(0x00, 0, n.cID, n.cRemote))
+			lastIdle = time.Now()
+		}
+		// Renew well inside the rig's ~2-min token timeout. 30 s (was 45) leaves room
+		// for one lost renewal + its retransmit before the token would lapse.
+		if time.Since(lastToken) > 30*time.Second {
+			n.renewToken()
+			lastToken = time.Now()
+		}
+	}
+}
+
+// renewToken re-authorizes the session (control 0x40 token packet, requesttype
+// 0x05). Tracked so a lost renewal can be retransmitted. Runs only on ctrlPump,
+// the sole owner of the control-stream auth state, so no locking is needed.
+func (n *icomNet) renewToken() {
+	seq := n.cTracked
+	pkt := icnTokenRenew(seq, n.cAuthSeq, n.cTokReq, n.cID, n.cRemote, n.cToken)
+	n.cTracked++
+	n.cAuthSeq++
+	n.cSentBuf[seq] = pkt
+	delete(n.cSentBuf, seq-256)
+	_, _ = n.ctrl.Write(pkt)
+	debugLog.Printf("icom net: token renewed (seq %d)", seq)
+}
+
+// ctrlResend answers a control-stream retransmit request from the control
+// sent-buffer (token renewals). Separate from resend(), which owns the CI-V
+// buffer — the two streams have independent sequence spaces.
+func (n *icomNet) ctrlResend(seq uint16) {
+	if pkt := n.cSentBuf[seq]; pkt != nil {
+		_, _ = n.ctrl.Write(pkt)
+	}
+}
+
+// civPump owns the CI-V stream (50002): drains it as fast as packets arrive
+// (its own goroutine — not throttled by the control reads), replies to pings,
+// answers retransmit requests, skips scope frames, and feeds control CI-V bytes
+// to Read via n.rx.
+func (n *icomNet) civPump() {
+	buf := make([]byte, 8192)
+	lastIdle := time.Now()
+	lastReq := time.Now()
+	for {
+		select {
+		case <-n.done:
+			return
+		default:
+		}
+		_ = n.civ.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
+		if k, err := n.civ.Read(buf); err == nil && k >= 16 {
+			n.markRx()
+			switch typ := icnLE.Uint16(buf[4:]); {
+			case typ == 0x07: // ping
+				_, _ = n.civ.Write(icnPingReply(buf[:k], n.vID, n.vRemote))
+			case typ == 0x01: // retransmit request — resend that seq
+				if k >= 8 {
+					n.resend(icnLE.Uint16(buf[6:]))
+				}
+			case typ == 0x05: // rig-initiated disconnect — it dropped US
+				n.dead.Store(true) // make Alive() fail now → prompt clean reconnect
+				debugLog.Printf("icom net: rig sent DISCONNECT on CI-V stream — session dropped by the rig")
+			case typ == 0x00 && k > 0x15 && buf[0x10] == 0xc1: // CI-V data
+				n.trackRxSeq(icnLE.Uint16(buf[6:])) // note gaps for retransmit
+				civBytes := buf[0x15:k]
+				cp := append([]byte(nil), civBytes...)
+				// Scope (0x27) frames go to their OWN channel: the panadapter streams
+				// continuously as large frames and would otherwise crowd control
+				// replies out of rx (every command would then time out). The scope
+				// feeder in IcomSerial picks them up. Everything else is a control
+				// reply → rx → Read.
+				if len(civBytes) >= 5 && civBytes[4] == 0x27 {
+					icnEnqueueDrop(n.scopeRx, cp)
+					break
+				}
+				if icnTrace {
+					debugLog.Printf("icom net RX: % X", civBytes)
+				}
+				select {
+				case n.rx <- cp:
+				case <-n.done:
+					return
+				default: // buffer full — drop oldest, enqueue newest
+					select {
+					case <-n.rx:
+					default:
+					}
+					select {
+					case n.rx <- cp:
+					default:
+					}
+				}
+			}
+		}
+		if time.Since(lastIdle) > 150*time.Millisecond {
+			_, _ = n.civ.Write(icnCtrl(0x00, 0, n.vID, n.vRemote))
+			lastIdle = time.Now()
+		}
+		if time.Since(lastReq) > 100*time.Millisecond {
+			n.sendRetransmitReq()
+			lastReq = time.Now()
+		}
+	}
+}
+
+// icnMaxMissing caps the outstanding retransmit backlog; a bigger jump is treated
+// as a wrap/desync and the tracker resets rather than requesting a storm.
+const icnMaxMissing = 50
+
+// trackRxSeq records the rig's data-packet send seq (outer seq @0x06) and flags
+// any forward gap as missing so sendRetransmitReq can ask for it. Handles uint16
+// wrap via the signed distance; ignores duplicates and already-seen packets.
+func (n *icomNet) trackRxSeq(seq uint16) {
+	if !n.rxHaveSeq {
+		n.rxHaveSeq = true
+		n.rxLastSeq = seq
+		return
+	}
+	switch d := int16(seq - n.rxLastSeq); {
+	case d == 0: // duplicate
+	case d < 0: // an older seq arrived — a retransmit we were missing
+		delete(n.rxMissing, seq)
+	case d == 1: // in order
+		n.rxLastSeq = seq
+	case int(d) <= icnMaxMissing: // forward gap — mark the in-between seqs missing
+		for f := n.rxLastSeq + 1; f != seq; f++ {
+			n.rxMissing[f] = 0
+		}
+		n.rxLastSeq = seq
+	default: // huge jump (wrap/desync) — reset to avoid a false retransmit storm
+		n.rxMissing = make(map[uint16]int)
+		n.rxLastSeq = seq
+	}
+}
+
+// sendRetransmitReq asks the rig to resend any CI-V data packets we detected as
+// missing. Each seq is requested up to 4 times then dropped. Mirrors the Remote
+// Utility/wfview format: a single miss = a 16-byte control (type 0x01, seq set);
+// several = a control header + a list of [lo hi lo hi] per seq.
+func (n *icomNet) sendRetransmitReq() {
+	if len(n.rxMissing) == 0 {
+		return
+	}
+	if len(n.rxMissing) > icnMaxMissing {
+		n.rxMissing = make(map[uint16]int) // hopelessly behind — flush and move on
+		return
+	}
+	var seqs []uint16
+	for s, cnt := range n.rxMissing {
+		if cnt >= 4 {
+			delete(n.rxMissing, s)
+			continue
+		}
+		n.rxMissing[s] = cnt + 1
+		seqs = append(seqs, s)
+	}
+	switch {
+	case len(seqs) == 0:
+		return
+	case len(seqs) == 1:
+		_, _ = n.civ.Write(icnCtrl(0x01, seqs[0], n.vID, n.vRemote))
+	default:
+		b := make([]byte, 16+4*len(seqs))
+		icnLE.PutUint32(b[0:], uint32(len(b)))
+		icnLE.PutUint16(b[4:], 0x01) // type = retransmit request
+		icnLE.PutUint32(b[8:], n.vID)
+		icnLE.PutUint32(b[12:], n.vRemote)
+		off := 16
+		for _, s := range seqs {
+			icnLE.PutUint16(b[off:], s)
+			icnLE.PutUint16(b[off+2:], s)
+			off += 4
+		}
+		_, _ = n.civ.Write(b)
+	}
+}
+
+// resend re-transmits a previously-sent tracked CI-V packet the rig asks for
+// (its UDP retransmit mechanism). Without this the rig drops the whole session
+// after a few seconds when a packet is lost under load.
+func (n *icomNet) resend(seq uint16) {
+	n.sentMu.Lock()
+	pkt := n.sentBuf[seq]
+	n.sentMu.Unlock()
+	if pkt != nil {
+		_, _ = n.civ.Write(pkt)
+	} else {
+		// The rig asked for a packet we've already evicted (>256 sent since). It
+		// can't fill its gap → it eventually drops the session. If this shows up in
+		// the log around a disconnect, the send buffer is too small for the load.
+		debugLog.Printf("icom net: retransmit MISS for seq %d (already evicted)", seq)
+	}
+}
+
+// ------------------------- connect -------------------------
+
+func dialIcomNet(host, user, pass, compName string, rigAddr byte, cancel <-chan struct{}, audioSink func([]byte)) (*icomNet, error) {
+	wantAudio := audioSink != nil
+	debugLog.Printf("icom net: connecting to %s (user %q, comp %q, rig addr 0x%02X, audio=%v)", host, user, compName, rigAddr, wantAudio)
+	// ---- control stream (50001): handshake → login → token → conninfo ----
+	craddr, err := net.ResolveUDPAddr("udp4", net.JoinHostPort(host, "50001"))
+	if err != nil {
+		return nil, err
+	}
+	ctrl, err := net.DialUDP("udp4", nil, craddr)
+	if err != nil {
+		return nil, fmt.Errorf("dial control: %w", err)
+	}
+	cID := icnLocalID(ctrl)
+	cRemote, err := icnHandshake(ctrl, cID, cancel)
+	if err != nil {
+		_ = ctrl.Close()
+		debugLog.Printf("icom net: control handshake FAILED (rig unreachable at %s:50001?): %v", host, err)
+		return nil, fmt.Errorf("control handshake: %w", err)
+	}
+	debugLog.Printf("icom net: control link up (rig id 0x%08X) — logging in", cRemote)
+
+	var cTracked, cInner uint16 = 1, 1
+	tokReq := uint16(0x0c77)
+	_, _ = ctrl.Write(icnLogin(cTracked, cInner, tokReq, cID, cRemote, 0, user, pass, compName))
+	cTracked++
+	cInner++
+
+	var token uint32
+	buf := make([]byte, 2048)
+	deadline := time.Now().Add(5 * time.Second)
+	for token == 0 && time.Now().Before(deadline) {
+		if icnCanceled(cancel) {
+			_ = ctrl.Close()
+			return nil, errDialCanceled
+		}
+		p, ok := icnRecv(ctrl, 200, buf)
+		if !ok {
+			continue
+		}
+		length := icnLE.Uint32(p[0:])
+		typ := icnLE.Uint16(p[4:])
+		if typ == 0x00 && length == 0x60 && len(p) >= 0x34 { // login response
+			token = icnLE.Uint32(p[0x1c:])
+			if e := icnLE.Uint32(p[0x30:]); e != 0 || token == 0 {
+				_ = ctrl.Close()
+				debugLog.Printf("icom net: LOGIN REJECTED (err=0x%08X) — wrong Network User1 ID/Password", e)
+				return nil, fmt.Errorf("login rejected — check the rig's Network User1 ID/Password")
+			}
+			_, _ = ctrl.Write(icnToken(cTracked, cInner, tokReq, cID, cRemote, token))
+			cTracked++
+			cInner++
+			debugLog.Printf("icom net: LOGIN OK, token 0x%08X", token)
+		} else if typ == 0x07 {
+			_, _ = ctrl.Write(icnPingReply(p, cID, cRemote))
+		}
+	}
+	if token == 0 {
+		_ = ctrl.Close()
+		debugLog.Printf("icom net: login TIMED OUT (no token in 5s) — check host/credentials")
+		return nil, fmt.Errorf("login timed out (no token) — check host/credentials")
+	}
+
+	// Learn the rig's MAC from its conninfo push (144B) to echo in our conninfo.
+	var rigMAC []byte
+	macEnd := time.Now().Add(1200 * time.Millisecond)
+	for time.Now().Before(macEnd) {
+		if icnCanceled(cancel) {
+			_ = ctrl.Close()
+			return nil, errDialCanceled
+		}
+		p, ok := icnRecv(ctrl, 150, buf)
+		if !ok {
+			continue
+		}
+		if len(p) >= 0x30 && icnLE.Uint32(p[0:]) == 0x90 { // 144-byte conninfo push
+			rigMAC = append([]byte(nil), p[0x2a:0x30]...)
+		}
+		if icnLE.Uint16(p[4:]) == 0x07 {
+			_, _ = ctrl.Write(icnPingReply(p, cID, cRemote))
+		}
+		if rigMAC != nil {
+			break
+		}
+	}
+	if rigMAC == nil {
+		rigMAC = make([]byte, 6)
+	}
+
+	var rxEnable byte
+	if wantAudio {
+		rxEnable = 0x01 // ask the rig to stream RX audio on 50003
+	}
+	_, _ = ctrl.Write(icnConnInfo(cTracked, cInner, tokReq, cID, cRemote, token, user, rigMAC, 50002, 50003, rxEnable))
+	cTracked++
+	cInner++
+	drainEnd := time.Now().Add(500 * time.Millisecond)
+	for time.Now().Before(drainEnd) {
+		if icnCanceled(cancel) {
+			_ = ctrl.Close()
+			return nil, errDialCanceled
+		}
+		if p, ok := icnRecv(ctrl, 100, buf); ok && icnLE.Uint16(p[4:]) == 0x07 {
+			_, _ = ctrl.Write(icnPingReply(p, cID, cRemote))
+		}
+	}
+
+	// ---- CI-V stream (50002): bind LOCAL :50002 (the announced civport) ----
+	vraddr, err := net.ResolveUDPAddr("udp4", net.JoinHostPort(host, "50002"))
+	if err != nil {
+		_ = ctrl.Close()
+		return nil, err
+	}
+	debugLog.Printf("icom net: conninfo sent (rig mac % X) — opening CI-V stream", rigMAC)
+	civ, err := net.DialUDP("udp4", &net.UDPAddr{Port: 50002}, vraddr)
+	if err != nil {
+		_ = ctrl.Close()
+		debugLog.Printf("icom net: cannot bind local :50002 — the Icom Remote Utility is probably still running: %v", err)
+		return nil, fmt.Errorf("dial CI-V (local :50002 — is the Icom Remote Utility still running?): %w", err)
+	}
+	vID := icnLocalID(civ)
+	vRemote, err := icnHandshake(civ, vID, cancel)
+	if err != nil {
+		_ = civ.Close()
+		_ = ctrl.Close()
+		debugLog.Printf("icom net: CI-V handshake FAILED: %v", err)
+		return nil, fmt.Errorf("CI-V handshake: %w", err)
+	}
+	debugLog.Printf("icom net: CI-V link up — opening the CI-V data flow (rig power left to the ON button)")
+
+	// Bigger receive buffers so a burst of scope/CI-V packets doesn't overflow
+	// (dropped packets → the rig's retransmit requests → session drop).
+	_ = ctrl.SetReadBuffer(1 << 20)
+	_ = civ.SetReadBuffer(1 << 20)
+
+	n := &icomNet{
+		ctrl: ctrl, civ: civ,
+		cID: cID, cRemote: cRemote, vID: vID, vRemote: vRemote,
+		vTracked: 1, vCivSeq: 1,
+		rx:        make(chan []byte, 256),
+		scopeRx:   make(chan []byte, 8),
+		sentBuf:   make(map[uint16][]byte),
+		rxMissing: make(map[uint16]int),
+		done:      make(chan struct{}),
+		// Auth state for periodic token renewal (see ctrlPump). cTracked/cAuthSeq
+		// continue the control-stream sequences from where the dial's login/token/
+		// conninfo left off.
+		cTracked: cTracked, cAuthSeq: cInner,
+		cToken: token, cTokReq: tokReq,
+		cSentBuf: make(map[uint16][]byte),
+	}
+	n.markRx() // the successful handshake counts as initial rig activity
+	// openClose(open) starts the CI-V data flow. We intentionally DO NOT power the
+	// rig on here — that's a manual ON button now (the user asked not to wake the
+	// rig at launch). If the rig is in standby the control/CI-V streams still stay
+	// up and Alive() stays true (the rig's server answers pings even when the radio
+	// is off), so the session doesn't flap; CI-V just stays silent until ON.
+	ocPkt := icnOpenClose(n.vTracked, vID, vRemote, n.vCivSeq, 0x04)
+	n.sentBuf[n.vTracked] = ocPkt
+	_, _ = civ.Write(ocPkt)
+	n.vTracked++
+	n.vCivSeq++
+
+	go n.ctrlPump()
+	go n.civPump()
+
+	// Optional RX audio stream (50003). The rig was told (conninfo rxEnable=1) to
+	// stream audio; open the socket + handshake now. A failure here is NON-fatal:
+	// CAT works without audio, so we log and continue rather than tear down a
+	// perfectly good control/CI-V session.
+	if wantAudio {
+		if a, err := dialIcomAudio(host, audioSink, cancel); err != nil {
+			debugLog.Printf("icom net: audio stream FAILED (CAT unaffected): %v", err)
+		} else {
+			n.audio = a
+		}
+	}
+	return n, nil
+}
+
+// icnHandshake: areYouThere(seq0) → iAmHere → areYouReady(seq1) → iAmReady.
+func icnHandshake(c *net.UDPConn, myID uint32, cancel <-chan struct{}) (uint32, error) {
+	buf := make([]byte, 2048)
+	_, _ = c.Write(icnCtrl(0x03, 0, myID, 0))
+	var remoteID uint32
+	deadline := time.Now().Add(4 * time.Second)
+	lastTry := time.Now()
+	for time.Now().Before(deadline) {
+		if icnCanceled(cancel) {
+			return 0, errDialCanceled
+		}
+		p, ok := icnRecv(c, 200, buf)
+		if !ok {
+			if remoteID == 0 && time.Since(lastTry) > 500*time.Millisecond {
+				_, _ = c.Write(icnCtrl(0x03, 0, myID, 0))
+				lastTry = time.Now()
+			}
+			continue
+		}
+		typ := icnLE.Uint16(p[4:])
+		sentid := icnLE.Uint32(p[8:])
+		switch typ {
+		case 0x04: // iAmHere
+			remoteID = sentid
+			_, _ = c.Write(icnCtrl(0x06, 1, myID, remoteID))
+		case 0x06: // iAmReady
+			if remoteID != 0 {
+				return remoteID, nil
+			}
+		case 0x07: // ping
+			_, _ = c.Write(icnPingReply(p, myID, remoteID))
+		}
+	}
+	return 0, fmt.Errorf("handshake timeout")
+}
+
+func icnRecv(c *net.UDPConn, ms int, buf []byte) ([]byte, bool) {
+	_ = c.SetReadDeadline(time.Now().Add(time.Duration(ms) * time.Millisecond))
+	k, err := c.Read(buf)
+	if err != nil || k < 16 {
+		return nil, false
+	}
+	return buf[:k], true
+}
+
+func icnLocalID(c *net.UDPConn) uint32 {
+	a := c.LocalAddr().(*net.UDPAddr)
+	ip := a.IP.To4()
+	if ip == nil {
+		ip = []byte{192, 168, 0, 1}
+	}
+	return uint32(ip[0])<<24 | uint32(ip[1])<<16 | uint32(uint16(a.Port))
+}
+
+// ------------------------- packet builders -------------------------
+// (offsets verified vs wfview structs + real captures)
+
+func icnCtrl(typ, seq uint16, sentid, rcvdid uint32) []byte {
+	b := make([]byte, 16)
+	icnLE.PutUint32(b[0:], 0x10)
+	icnLE.PutUint16(b[4:], typ)
+	icnLE.PutUint16(b[6:], seq)
+	icnLE.PutUint32(b[8:], sentid)
+	icnLE.PutUint32(b[12:], rcvdid)
+	return b
+}
+
+func icnPingReply(pkt []byte, myID, remoteID uint32) []byte {
+	r := append([]byte(nil), pkt...)
+	if len(r) >= 17 {
+		icnLE.PutUint32(r[8:], myID)
+		icnLE.PutUint32(r[12:], remoteID)
+		r[16] = 0x01
+	}
+	return r
+}
+
+func icnLogin(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, user, pass, name string) []byte {
+	b := make([]byte, 0x80)
+	icnLE.PutUint32(b[0:], 0x80)
+	icnLE.PutUint16(b[6:], seq)
+	icnLE.PutUint32(b[8:], sentid)
+	icnLE.PutUint32(b[12:], rcvdid)
+	icnBE.PutUint32(b[0x10:], 0x80-0x10)
+	b[0x14] = 0x01
+	b[0x15] = 0x00
+	icnBE.PutUint16(b[0x16:], innerSeq)
+	icnLE.PutUint16(b[0x1a:], tokReq)
+	icnLE.PutUint32(b[0x1c:], token)
+	copy(b[0x40:0x50], icnPasscode(user))
+	copy(b[0x50:0x60], icnPasscode(pass))
+	nm := name
+	if len(nm) > 16 {
+		nm = nm[:16]
+	}
+	copy(b[0x60:0x70], []byte(nm))
+	return b
+}
+
+func icnToken(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32) []byte {
+	b := make([]byte, 0x40)
+	icnLE.PutUint32(b[0:], 0x40)
+	icnLE.PutUint16(b[6:], seq)
+	icnLE.PutUint32(b[8:], sentid)
+	icnLE.PutUint32(b[12:], rcvdid)
+	icnBE.PutUint32(b[0x10:], 0x40-0x10)
+	b[0x14] = 0x01
+	b[0x15] = 0x02
+	icnBE.PutUint16(b[0x16:], innerSeq)
+	icnLE.PutUint16(b[0x1a:], tokReq)
+	icnLE.PutUint32(b[0x1c:], token)
+	return b
+}
+
+// icnTokenRenew builds the periodic token-renewal packet (control 0x40). Same as
+// the login-time token confirm but requesttype 0x05 (renew) with the resetcap
+// field (0x0798 BE @0x24) the Remote Utility sends on renewals. Keeps the rig
+// from invalidating the session (~2-min timeout without renewal). Offsets per the
+// wfview token_packet struct (verified) — protocol facts, not copied code.
+func icnTokenRenew(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32) []byte {
+	b := make([]byte, 0x40)
+	icnLE.PutUint32(b[0:], 0x40)
+	icnLE.PutUint16(b[6:], seq)
+	icnLE.PutUint32(b[8:], sentid)
+	icnLE.PutUint32(b[12:], rcvdid)
+	icnBE.PutUint32(b[0x10:], 0x40-0x10)
+	b[0x14] = 0x01 // requestreply = request
+	b[0x15] = 0x05 // requesttype = token renewal
+	icnBE.PutUint16(b[0x16:], innerSeq)
+	icnLE.PutUint16(b[0x1a:], tokReq)
+	icnLE.PutUint32(b[0x1c:], token)
+	icnBE.PutUint16(b[0x24:], 0x0798) // resetcap
+	return b
+}
+
+func icnConnInfo(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, user string, rigMAC []byte, civPort, audioPort uint16, rxEnable byte) []byte {
+	b := make([]byte, 0x90)
+	icnLE.PutUint32(b[0:], 0x90)
+	icnLE.PutUint16(b[6:], seq)
+	icnLE.PutUint32(b[8:], sentid)
+	icnLE.PutUint32(b[12:], rcvdid)
+	icnBE.PutUint32(b[0x10:], 0x90-0x10)
+	b[0x14] = 0x01
+	b[0x15] = 0x03 // requesttype = conninfo / open streams
+	icnBE.PutUint16(b[0x16:], innerSeq)
+	icnLE.PutUint16(b[0x1a:], tokReq)
+	icnLE.PutUint32(b[0x1c:], token)
+	icnLE.PutUint16(b[0x27:], 0x8010) // commoncap
+	copy(b[0x2a:0x30], rigMAC)
+	copy(b[0x40:0x60], []byte("IC-7610"))
+	copy(b[0x60:0x70], icnPasscode(user))
+	b[0x70] = rxEnable // rxenable: 1 opens the 50003 RX audio stream, 0 = CI-V only
+	b[0x71] = 0x00     // txenable (Phase 5)
+	b[0x72] = 0x10 // rxcodec
+	b[0x73] = 0x04 // txcodec
+	icnBE.PutUint32(b[0x74:], 16000)
+	icnBE.PutUint32(b[0x78:], 8000)
+	icnBE.PutUint32(b[0x7c:], uint32(civPort))
+	icnBE.PutUint32(b[0x80:], uint32(audioPort))
+	icnBE.PutUint32(b[0x84:], 100)
+	b[0x88] = 0x00
+	return b
+}
+
+func icnOpenClose(seq uint16, sentid, rcvdid uint32, civSeq uint16, magic byte) []byte {
+	b := make([]byte, 0x16)
+	icnLE.PutUint32(b[0:], 0x16)
+	icnLE.PutUint16(b[6:], seq)
+	icnLE.PutUint32(b[8:], sentid)
+	icnLE.PutUint32(b[12:], rcvdid)
+	icnLE.PutUint16(b[0x10:], 0x01c0)
+	icnBE.PutUint16(b[0x13:], civSeq)
+	b[0x15] = magic
+	return b
+}
+
+func icnCivData(seq uint16, sentid, rcvdid uint32, civSeq uint16, civ []byte) []byte {
+	nn := 0x15 + len(civ)
+	b := make([]byte, nn)
+	icnLE.PutUint32(b[0:], uint32(nn))
+	icnLE.PutUint16(b[6:], seq)
+	icnLE.PutUint32(b[8:], sentid)
+	icnLE.PutUint32(b[12:], rcvdid)
+	b[0x10] = 0xc1
+	icnLE.PutUint16(b[0x11:], uint16(len(civ)))
+	icnBE.PutUint16(b[0x13:], civSeq)
+	copy(b[0x15:], civ)
+	return b
+}
+
+// icnPasscodeSeq — Icom's obfuscation table (values at index 0x20..0x7e).
+// VERIFIED: user "f6bgc" → 3F 65 50 25 55 (matches the capture).
+var icnPasscodeSeq = [256]byte{
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0x47, 0x5d, 0x4c, 0x42, 0x66, 0x20, 0x23, 0x46, 0x4e, 0x57, 0x45, 0x3d, 0x67, 0x76, 0x60, 0x41, 0x62, 0x39, 0x59, 0x2d, 0x68, 0x7e,
+	0x7c, 0x65, 0x7d, 0x49, 0x29, 0x72, 0x73, 0x78, 0x21, 0x6e, 0x5a, 0x5e, 0x4a, 0x3e, 0x71, 0x2c, 0x2a, 0x54, 0x3c, 0x3a, 0x63, 0x4f,
+	0x43, 0x75, 0x27, 0x79, 0x5b, 0x35, 0x70, 0x48, 0x6b, 0x56, 0x6f, 0x34, 0x32, 0x6c, 0x30, 0x61, 0x6d, 0x7b, 0x2f, 0x4b, 0x64, 0x38,
+	0x2b, 0x2e, 0x50, 0x40, 0x3f, 0x55, 0x33, 0x37, 0x25, 0x77, 0x24, 0x26, 0x74, 0x6a, 0x28, 0x53, 0x4d, 0x69, 0x22, 0x5c, 0x44, 0x31,
+	0x36, 0x58, 0x3b, 0x7a, 0x51, 0x5f, 0x52,
+}
+
+func icnPasscode(s string) []byte {
+	out := make([]byte, 0, len(s))
+	for i := 0; i < len(s) && i < 16; i++ {
+		p := int(s[i]) + i
+		if p > 126 {
+			p = 32 + p%127
+		}
+		out = append(out, icnPasscodeSeq[p])
+	}
+	return out
+}

internal/cat/icomserial.go

@@ -27,6 +27,26 @@ type civTransport interface {
 	SetRTS(bool) error
 }
 
+// aliveTransport is an OPTIONAL transport capability: report whether the link is
+// still up independently of whether the rig answers CI-V. The network transport
+// implements it (the rig's server pings even in standby), letting ReadState keep
+// the session "connected but rig off" instead of tearing it down and flapping.
+// USB doesn't implement it (no such out-of-band signal), so it keeps the bounded
+// read-failure tolerance instead.
+type aliveTransport interface {
+	Alive() bool
+}
+
+// scopeTransport is an OPTIONAL transport capability: deliver spectrum-scope
+// (0x27) frames on a SEPARATE channel from control replies. The network transport
+// implements it so the continuous panadapter stream can't crowd control replies
+// out of the main Read path (which made every command time out with the scope
+// on). USB doesn't implement it — there the scope frames ride the normal Read
+// path and the reader splits them off to specCh.
+type scopeTransport interface {
+	ScopeChan() <-chan []byte
+}
+
 // IcomSerial controls an Icom transceiver over the shared civ protocol. The
 // transport is pluggable via `open`: NewIcomSerial opens a USB/serial port;
 // NewIcomNet (later) returns one configured with a network transport. Implements
@@ -75,6 +95,8 @@ type IcomSerial struct {
 	splitOn       bool  // last read split state (refreshed every few cycles)
 	splitTXFreq   int64 // last read unselected/TX VFO freq while in split
 	readFails     int   // consecutive ReadState freq-read failures (transient tolerance)
+	dspLoaded     bool  // readDSP has run since the rig became responsive (loads all
+	//                     the panel's set-once controls once the rig actually answers)
 	lastSetFreq   int64 // last frequency commanded (spot click: freq then mode)
 	lastSetFreqAt time.Time
 
@@ -83,6 +105,29 @@ type IcomSerial struct {
 	// / setters) — hence the mutex.
 	dspMu sync.Mutex
 	dsp   IcomTXState
+
+	// dialCancel is closed by Interrupt() to abort an in-progress network dial
+	// (icomnet's handshake/login/boot-wait can block ~tens of seconds). A fresh
+	// channel is made by each Connect. Guarded by dialMu: written on the CAT
+	// goroutine, closed from the goroutine calling Stop.
+	dialMu     sync.Mutex
+	dialCancel chan struct{}
+}
+
+// Interrupt aborts an in-progress network Connect so Stop()/Start() don't block
+// on a slow UDP handshake (or the 25 s boot-from-standby wait). Safe to call at
+// any time and from another goroutine; harmless when no dial is in progress and
+// a no-op for the USB transport (which dials instantly).
+func (b *IcomSerial) Interrupt() {
+	b.dialMu.Lock()
+	if b.dialCancel != nil {
+		select {
+		case <-b.dialCancel: // already closed
+		default:
+			close(b.dialCancel)
+		}
+	}
+	b.dialMu.Unlock()
 }
 
 const (
@@ -130,6 +175,11 @@ func (b *IcomSerial) Connect() error {
 	if b.open == nil {
 		return fmt.Errorf("no transport configured")
 	}
+	// Fresh cancel channel for this dial so Interrupt() (called by Stop) can abort
+	// a slow network handshake instead of freezing the UI.
+	b.dialMu.Lock()
+	b.dialCancel = make(chan struct{})
+	b.dialMu.Unlock()
 	port, err := b.open()
 	if err != nil {
 		return err
@@ -154,19 +204,36 @@ func (b *IcomSerial) Connect() error {
 	b.readerDone = make(chan struct{})
 	go b.reader(port, b.readerDone)
 	go b.scopeLoop(b.specCh, b.readerDone)
+	// On the network the scope frames come on their own channel (kept off the
+	// control Read path); feed them into the same scope pipeline.
+	if sc, ok := port.(scopeTransport); ok {
+		go b.netScopeFeeder(sc.ScopeChan(), b.readerDone)
+	}
 
-	// Best-effort model identification: ask the rig for its own CI-V address.
+	// Best-effort model identification: ask the rig for its own CI-V address. The
+	// 0x19 ID read returns the rig's FACTORY default address (e.g. 0x94 for an
+	// IC-7300) regardless of the address it's currently OPERATING on — so it's the
+	// reliable model signal even when the user runs the rig at a non-default CI-V
+	// address (a common trick to make CAT "just work" at 0x98).
+	idAddr := b.rigAddr // fallback: the configured address if the ID read fails
 	if err := b.write(civ.CmdReadID, civ.SubPTT); err == nil {
 		if f, err := b.recv(icomReadTimeout, func(d civ.Decoded) bool {
 			return d.Cmd == civ.CmdReadID && len(d.Data) >= 2 && d.Data[0] == 0x00
 		}); err == nil {
 			b.model = civ.ModelName(f.Data[1])
+			idAddr = f.Data[1]
 		}
 	}
 	// Dual-scope rigs (IC-7610/9700) prefix each waveform frame with a main/sub
-	// selector byte; single-scope rigs (IC-7300…) do not.
-	b.dualScope = b.rigAddr == 0x98 || b.rigAddr == 0xA2
-	b.readDSP() // best-effort initial snapshot for the control tab
+	// selector byte; single-scope rigs (IC-7300…) do not. Decide from the
+	// IDENTIFIED model, NOT the configured address: an IC-7300 run at 0x98 must
+	// still parse single-scope frames (this was the "scope blank on the 7300" bug).
+	b.dualScope = idAddr == 0x98 || idAddr == 0xA2
+	// Defer the DSP snapshot until the rig actually answers CI-V. Over the network
+	// the rig may still be booting (or off) at Connect, so an immediate readDSP
+	// would time out and leave every control at 0 / off with no retry. ReadState
+	// loads it once on the first successful freq read instead (see dspLoaded).
+	b.dspLoaded = false
 	return nil
 }
 
@@ -191,11 +258,39 @@ func (b *IcomSerial) ReadState() (RigState, error) {
 
 	hz, err := b.readFreq()
 	if err != nil {
-		// The rig briefly stops answering CI-V while it switches band/VFO. Treat a
-		// few consecutive misses as transient — keep the connection and report the
-		// last known state — so a band change doesn't trigger a full disconnect +
-		// 5 s reconnect (which showed the new frequency ~10 s late). Only after
-		// several failures do we declare the rig lost so the Manager reconnects.
+		// Network transport: if the control link is still alive, the rig is simply
+		// silent — either in standby / powered OFF (the ON button is manual now), or
+		// mid band-change. Stay CONNECTED and show last-known state (empty until the
+		// rig is switched on) rather than tearing the whole UDP session down and
+		// flapping every few seconds. The panel stays up so the ON button works.
+		if at, ok := b.port.(aliveTransport); ok {
+			if at.Alive() {
+				b.readFails = 0
+				s.FreqHz = b.curFreq // 0 until the rig is powered on and first read
+				if b.curModeByte != 0 {
+					s.Mode = civ.ModeToADIF(b.curModeByte, false)
+					if s.Mode == "DATA" {
+						s.Mode = b.digital
+					}
+				}
+				// Keep the Icom panel visible (so ON/OFF are reachable) but show no
+				// live meters while the rig is silent.
+				b.dspMu.Lock()
+				b.dsp.Available = true
+				b.dsp.Model = b.model
+				b.dsp.Transmitting = false
+				b.dsp.SMeter, b.dsp.PowerMeter, b.dsp.SWRMeter = 0, 0, 0
+				b.dspMu.Unlock()
+				return s, nil
+			}
+			debugLog.Printf("icom net: control link went quiet (no rig packets for >6 s) → reconnecting. If this recurs every ~2-3 min, the rig is invalidating the session (token renewal rejected).")
+			return RigState{}, err // control link dead → let the Manager reconnect
+		}
+		// USB (no liveness signal): the rig briefly stops answering CI-V while it
+		// switches band/VFO. Tolerate a few consecutive misses as transient — keep
+		// the connection and report last-known state — so a band change doesn't
+		// trigger a full disconnect + 5 s reconnect. Only after several failures do
+		// we declare the rig lost so the Manager reconnects.
 		b.readFails++
 		if b.readFails <= 6 && b.curFreq > 0 {
 			s.FreqHz = b.curFreq
@@ -268,6 +363,15 @@ func (b *IcomSerial) ReadState() (RigState, error) {
 	b.dsp.PowerMeter = po
 	b.dsp.SWRMeter = swr
 	b.dspMu.Unlock()
+
+	// First time the rig answers (it's booted/responsive): load the full DSP
+	// snapshot so the panel's antenna, sliders, RIT, notch, etc. reflect the rig
+	// instead of sitting at their zero defaults. Runs once; ↻ Refresh re-reads on
+	// demand, and a reconnect re-arms it (Connect clears dspLoaded).
+	if !b.dspLoaded {
+		b.readDSP()
+		b.dspLoaded = true
+	}
 	return s, nil
 }
 
@@ -306,6 +410,30 @@ func (b *IcomSerial) SetPTT(on bool) error {
 	return b.exec(civ.CmdPTT, civ.SubPTT, state)
 }
 
+// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
+// a run of 0xFE — the wake preamble Icom rigs need to notice a command while
+// asleep (harmless when already awake); after it the rig boots for ~10-15 s.
+// Sent raw with no ack wait, since a rig waking up or shutting down won't
+// reliably answer. On the network transport the whole buffer becomes one data
+// packet, exactly as the Remote Utility sends it. Power is manual (the app never
+// wakes the rig on connect), so this is driven by the panel's ON/OFF button.
+func (b *IcomSerial) SetPower(on bool) error {
+	if b.port == nil {
+		return fmt.Errorf("icom: not connected")
+	}
+	if on {
+		buf := make([]byte, 0, 32)
+		for i := 0; i < 25; i++ {
+			buf = append(buf, 0xFE)
+		}
+		buf = append(buf, 0xFE, 0xFE, b.rigAddr, civ.AddrController, civ.CmdPower, 0x01, 0xFD)
+		_, err := b.port.Write(buf)
+		return err
+	}
+	_, err := b.port.Write(civ.Frame(b.rigAddr, civ.AddrController, civ.CmdPower, 0x00))
+	return err
+}
+
 // ── helpers ───────────────────────────────────────────────────────────────
 
 func (b *IcomSerial) write(payload ...byte) error {
@@ -325,8 +453,14 @@ func (b *IcomSerial) write(payload ...byte) error {
 
 // recv waits for a frame the reader routed to respCh that satisfies match, or
 // times out. The reader has already discarded echoes and split off scope frames,
-// so recv only ever sees candidate control replies.
+// so recv only ever sees candidate control replies. It also bails out at once if
+// Interrupt() fires (Stop) so an in-flight ReadState — which can be a dozen reads,
+// each up to icomReadTimeout when the rig is slow — doesn't make Stop/Save-&-Close
+// wait several seconds for the poll goroutine to finish.
 func (b *IcomSerial) recv(timeout time.Duration, match func(civ.Decoded) bool) (civ.Decoded, error) {
+	b.dialMu.Lock()
+	cancel := b.dialCancel
+	b.dialMu.Unlock()
 	deadline := time.After(timeout)
 	for {
 		select {
@@ -334,6 +468,8 @@ func (b *IcomSerial) recv(timeout time.Duration, match func(civ.Decoded) bool) (
 			if match(f) {
 				return f, nil
 			}
+		case <-cancel:
+			return civ.Decoded{}, fmt.Errorf("icom: interrupted")
 		case <-deadline:
 			return civ.Decoded{}, fmt.Errorf("icom: timeout waiting for response")
 		}
@@ -374,6 +510,37 @@ func (b *IcomSerial) reader(port civTransport, done chan struct{}) {
 	}
 }
 
+// netScopeFeeder decodes the raw scope (0x27) CI-V frames the network transport
+// delivers on its own channel and routes them into specCh — the same pipeline
+// the USB reader feeds — so scopeLoop assembles them identically. Exits when the
+// connection's reader does (done closes on Disconnect).
+func (b *IcomSerial) netScopeFeeder(ch <-chan []byte, done chan struct{}) {
+	var buf []byte
+	for {
+		select {
+		case <-done:
+			return
+		case raw, ok := <-ch:
+			if !ok {
+				return
+			}
+			buf = append(buf, raw...)
+			frames, consumed := civ.Scan(buf)
+			if consumed > 0 {
+				buf = append(buf[:0], buf[consumed:]...)
+			}
+			for _, f := range frames {
+				if f.From == b.rigAddr && f.Cmd == civ.CmdScope {
+					b.route(b.specCh, f)
+				}
+			}
+			if len(buf) > 1<<16 { // a frame that never completes — don't grow forever
+				buf = buf[:0]
+			}
+		}
+	}
+}
+
 // route delivers a frame without ever blocking the reader: if the channel is
 // full it drops the oldest entry to make room for the newest.
 func (b *IcomSerial) route(ch chan civ.Decoded, f civ.Decoded) {
@@ -432,7 +599,7 @@ func (b *IcomSerial) scopeLoop(spec chan civ.Decoded, done chan struct{}) {
 				}
 				continue
 			}
-			if rawN < 4 {
+			if rawN < 24 {
 				rawN++
 				applog.Printf("icom scope raw #%d: len=%d data=[% X]", rawN, len(f.Data), f.Data)
 			}
@@ -451,6 +618,46 @@ func (b *IcomSerial) scopeLoop(spec chan civ.Decoded, done chan struct{}) {
 			if seq == 0 || tot == 0 {
 				continue
 			}
+			if tot == 1 {
+				// Network single-frame sweep: the WHOLE sweep is in one frame —
+				// region = [info][low 5-BCD][high 5-BCD][amplitude bytes…]. Parse the
+				// edges and take the rest as the trace, then publish immediately.
+				// (USB splits this across 21 frames; the net rig sends it as one.)
+				if len(region) >= 11 {
+					// Net single-frame layout (IC-7610): region = [info 1B][freq1 5-BCD]
+					// [freq2 5-BCD][amplitude bytes]. The two freq fields depend on the
+					// scope mode: FIXED sends [low-edge][high-edge] (both absolute), CENTRE
+					// sends [centre][span]. Tell them apart by magnitude — a second value
+					// BIGGER than the first is a real high edge; a small one is a span
+					// (e.g. 14.200 MHz + 100 kHz → centred 14.150-14.250; 21.000 +
+					// 21.070 → fixed 21.000-21.070). Guessing wrong here gave the absurd
+					// 21.000-42.070 span (low + a 21 MHz "span").
+					v1 := civ.BCDToFreq(region[1:6])
+					v2 := civ.BCDToFreq(region[6:11])
+					var low, high int64
+					if v2 > v1 {
+						low, high = v1, v2 // absolute low/high edges (fixed edge set)
+					} else {
+						low, high = v1-v2/2, v1+v2/2 // centre + span (centre-on-VFO)
+					}
+					amp := append([]byte(nil), region[11:]...)
+					b.scopeMu.Lock()
+					b.scopeLow, b.scopeHigh = low, high
+					b.scopeAmp = amp
+					b.scopeSeq++
+					firstLog := !b.scopeSeen
+					b.scopeSeen = true
+					b.scopeMu.Unlock()
+					if firstLog {
+						head := region
+						if len(head) > 16 {
+							head = head[:16]
+						}
+						applog.Printf("icom scope (net 1-frame): head=[% X] v1=%d v2=%d → %d..%d Hz points=%d", head, v1, v2, low, high, len(amp))
+					}
+				}
+				continue
+			}
 			if seq == 1 { // header frame — begins a new sweep, no waveform data
 				regions = make(map[byte][]byte)
 				total = tot
@@ -498,6 +705,13 @@ func (b *IcomSerial) assembleSweep(regions map[byte][]byte, total byte) {
 // and 0x27 0x11 turns the waveform data OUTPUT over CI-V on. While on, the reader
 // routes every 0x27 frame to scopeLoop.
 func (b *IcomSerial) SetScope(on bool) error {
+	if on {
+		// Context for the scope-diagnostic log: which rig + whether we expect the
+		// dual-scope (main/sub) frame layout. If the IC-7300 (single scope) streams
+		// but nothing shows, compare its `icom scope raw` frames against this.
+		applog.Printf("icom scope: enable on rig=%q addr=0x%02X dualScope=%v (expect %s frame layout)",
+			b.model, b.rigAddr, b.dualScope, map[bool]string{true: "27 00 [MS] [seq] [total] …", false: "27 00 [seq] [total] …"}[b.dualScope])
+	}
 	// Some firmwares don't ack 0x27 sets; a timeout here isn't fatal, so log and
 	// continue rather than abort the second command.
 	if err := b.exec(civ.CmdScope, civ.SubScopeOnOff, boolByte(on)); err != nil {
@@ -552,6 +766,58 @@ func (b *IcomSerial) SetScopeMode(fixed bool) error {
 	return nil
 }
 
+// icScopeRanges maps a frequency to the IC-7610's spectrum edge-frequency range
+// id (from Hamlib's ic7610 caps). SetScopeEdges needs it to address the right
+// fixed-edge memory. Each range spans a chunk of the tuning range.
+var icScopeRanges = []struct {
+	lo, hi int64
+	id     byte
+}{
+	{30_000, 1_600_000, 1}, {1_600_000, 2_000_000, 2}, {2_000_000, 6_000_000, 3},
+	{6_000_000, 8_000_000, 4}, {8_000_000, 11_000_000, 5}, {11_000_000, 15_000_000, 6},
+	{15_000_000, 20_000_000, 7}, {20_000_000, 22_000_000, 8}, {22_000_000, 26_000_000, 9},
+	{26_000_000, 30_000_000, 10}, {30_000_000, 45_000_000, 11}, {45_000_000, 60_000_000, 12},
+}
+
+// scopeRangeBCD returns the range id (as a 1-byte BCD) for a frequency, or 0 if
+// out of range.
+func scopeRangeBCD(freq int64) byte {
+	for _, r := range icScopeRanges {
+		if freq >= r.lo && freq < r.hi {
+			return byte(r.id/10)<<4 | byte(r.id%10) // 1-byte BCD (11 → 0x11)
+		}
+	}
+	return 0
+}
+
+// SetScopeEdges points the FIXED-mode scope at [low..high] by writing them into
+// the rig's fixed-edge memory (edge set 1) and making that set active. This is
+// how the panel's "centre on VFO" and pan ◀/▶ work: they just compute VFO±50 kHz
+// (and shift it) and set the edges — no dependence on the waveform decode. CI-V:
+// 0x27 0x14 fixed, 0x27 0x16 set 1 active, 0x27 0x1e [range][set][low][high].
+func (b *IcomSerial) SetScopeEdges(low, high int64) error {
+	if low <= 0 || high <= low {
+		return fmt.Errorf("icom scope: bad edges %d..%d", low, high)
+	}
+	rangeID := scopeRangeBCD((low + high) / 2)
+	if rangeID == 0 {
+		return fmt.Errorf("icom scope: freq out of range")
+	}
+	if b.dualScope {
+		_ = b.exec(civ.CmdScope, civ.SubScopeMode, 0x00, 0x01) // fixed mode (main)
+		_ = b.exec(civ.CmdScope, civ.SubScopeEdge, 0x00, 0x01) // activate edge set 1
+	} else {
+		_ = b.exec(civ.CmdScope, civ.SubScopeMode, 0x01)
+		_ = b.exec(civ.CmdScope, civ.SubScopeEdge, 0x01)
+	}
+	payload := append([]byte{civ.CmdScope, civ.SubScopeFixEdge, rangeID, 0x01}, civ.FreqToBCD(low)...)
+	payload = append(payload, civ.FreqToBCD(high)...)
+	b.scopeMu.Lock()
+	b.scopeFixed = true
+	b.scopeMu.Unlock()
+	return b.exec(payload...)
+}
+
 // SetRIT sets the RIT/ΔTX offset (signed Hz, ±9999).
 func (b *IcomSerial) SetRIT(hz int) error {
 	if err := b.exec(append([]byte{civ.CmdRIT, civ.SubRITFreq}, civ.RITToBCD(hz)...)...); err != nil {
@@ -916,6 +1182,9 @@ func (b *IcomSerial) readDSP() {
 	if v, ok := b.readSwitch(civ.SubSwANF); ok {
 		st.ANF = v != 0
 	}
+	if v, ok := b.readSwitch(civ.SubSwAPF); ok {
+		st.APF = v != 0
+	}
 	if v, ok := b.readSwitch(civ.SubSwAGC); ok {
 		st.AGC = agcName(v)
 	}
@@ -935,6 +1204,46 @@ func (b *IcomSerial) readDSP() {
 	if v, ok := b.readSwitch(civ.SubSwBreakIn); ok {
 		st.BreakIn = int(v)
 	}
+	// Antenna + filter fine controls + TX extras.
+	if v, ok := b.readAnt(); ok {
+		st.Antenna = v
+	}
+	if v, ok := b.readLevel(civ.SubLevelPBTIn); ok {
+		st.PBTInner = from255(v)
+	}
+	if v, ok := b.readLevel(civ.SubLevelPBTOut); ok {
+		st.PBTOuter = from255(v)
+	}
+	if v, ok := b.readSwitch(civ.SubSwMN); ok {
+		st.ManualNotch = v != 0
+	}
+	if v, ok := b.readLevel(civ.SubLevelNotch); ok {
+		st.NotchPos = from255(v)
+	}
+	if v, ok := b.readLevel(civ.SubLevelSQL); ok {
+		st.Squelch = from255(v)
+	}
+	if v, ok := b.readSwitch(civ.SubSwComp); ok {
+		st.Comp = v != 0
+	}
+	if v, ok := b.readLevel(civ.SubLevelComp); ok {
+		st.CompLevel = from255(v)
+	}
+	if v, ok := b.readSwitch(civ.SubSwMon); ok {
+		st.Monitor = v != 0
+	}
+	if v, ok := b.readLevel(civ.SubLevelMon); ok {
+		st.MonLevel = from255(v)
+	}
+	if v, ok := b.readSwitch(civ.SubSwVOX); ok {
+		st.VOX = v != 0
+	}
+	if v, ok := b.readLevel(civ.SubLevelVOXGain); ok {
+		st.VOXGain = from255(v)
+	}
+	if v, ok := b.readLevel(civ.SubLevelAntiVOX); ok {
+		st.AntiVOX = from255(v)
+	}
 
 	b.dspMu.Lock()
 	b.dsp = st
@@ -982,6 +1291,22 @@ func (b *IcomSerial) readAtt() (int, bool) {
 	return civ.BCDToByte(f.Data[0]), true
 }
 
+func (b *IcomSerial) readAnt() (int, bool) {
+	if err := b.write(civ.CmdAnt); err != nil {
+		return 0, false
+	}
+	f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
+		return d.Cmd == civ.CmdAnt && len(d.Data) >= 1
+	})
+	if err != nil {
+		return 0, false
+	}
+	if f.Data[0] == 0x01 {
+		return 2, true
+	}
+	return 1, true
+}
+
 func (b *IcomSerial) readModeFilter() (mode, filter byte, ok bool) {
 	if err := b.write(civ.CmdReadMode); err != nil {
 		return 0, 0, false
@@ -1051,6 +1376,14 @@ func (b *IcomSerial) SetANF(on bool) error {
 	return nil
 }
 
+func (b *IcomSerial) SetAPF(on bool) error {
+	if err := b.exec(civ.CmdSwitch, civ.SubSwAPF, boolByte(on)); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.APF = on })
+	return nil
+}
+
 func (b *IcomSerial) SetAGC(name string) error {
 	v := agcValue(name)
 	if v == 0 {
@@ -1116,6 +1449,24 @@ func (b *IcomSerial) SetMicGain(p int) error {
 }
 
 func (b *IcomSerial) SetIcomSplit(on bool) error {
+	if on {
+		// Enable split with the usual "work him up" TX offset: +1 kHz on CW,
+		// +5 kHz otherwise (SSB). Set the unselected (TX) VFO to RX+offset first,
+		// then turn split on. 0x25 0x01 + BCD sets the unselected VFO's frequency.
+		rx := b.curFreq
+		if rx <= 0 {
+			if hz, err := b.readFreq(); err == nil {
+				rx = hz
+			}
+		}
+		if rx > 0 {
+			offset := int64(5000)
+			if b.curModeByte == civ.ModeCW || b.curModeByte == civ.ModeCWR {
+				offset = 1000
+			}
+			_ = b.exec(append([]byte{civ.CmdVfoFreq, civ.SubVfoUnselected}, civ.FreqToBCD(rx+offset)...)...)
+		}
+	}
 	if err := b.exec(civ.CmdSplit, boolByte(on)); err != nil {
 		return err
 	}
@@ -1123,6 +1474,126 @@ func (b *IcomSerial) SetIcomSplit(on bool) error {
 	return nil
 }
 
+// ── Antenna ────────────────────────────────────────────────────────────────
+
+func (b *IcomSerial) SetAntenna(n int) error {
+	sub := byte(0x00) // ANT1
+	if n == 2 {
+		sub = 0x01 // ANT2
+	}
+	if err := b.exec(civ.CmdAnt, sub); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) {
+		if n == 2 {
+			s.Antenna = 2
+		} else {
+			s.Antenna = 1
+		}
+	})
+	return nil
+}
+
+// ── Filter: Twin PBT + manual notch ────────────────────────────────────────
+
+func (b *IcomSerial) SetPBTInner(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelPBTIn}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.PBTInner = clampPct(p) })
+	return nil
+}
+
+func (b *IcomSerial) SetPBTOuter(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelPBTOut}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.PBTOuter = clampPct(p) })
+	return nil
+}
+
+func (b *IcomSerial) SetManualNotch(on bool) error {
+	if err := b.exec(civ.CmdSwitch, civ.SubSwMN, boolByte(on)); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.ManualNotch = on })
+	return nil
+}
+
+func (b *IcomSerial) SetNotchPos(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelNotch}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.NotchPos = clampPct(p) })
+	return nil
+}
+
+// ── TX extras: squelch / compressor / monitor / VOX ────────────────────────
+
+func (b *IcomSerial) SetSquelch(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelSQL}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.Squelch = clampPct(p) })
+	return nil
+}
+
+func (b *IcomSerial) SetComp(on bool) error {
+	if err := b.exec(civ.CmdSwitch, civ.SubSwComp, boolByte(on)); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.Comp = on })
+	return nil
+}
+
+func (b *IcomSerial) SetCompLevel(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelComp}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.CompLevel = clampPct(p) })
+	return nil
+}
+
+func (b *IcomSerial) SetMonitor(on bool) error {
+	if err := b.exec(civ.CmdSwitch, civ.SubSwMon, boolByte(on)); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.Monitor = on })
+	return nil
+}
+
+func (b *IcomSerial) SetMonLevel(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelMon}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.MonLevel = clampPct(p) })
+	return nil
+}
+
+func (b *IcomSerial) SetVOX(on bool) error {
+	if err := b.exec(civ.CmdSwitch, civ.SubSwVOX, boolByte(on)); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.VOX = on })
+	return nil
+}
+
+func (b *IcomSerial) SetVOXGain(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelVOXGain}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.VOXGain = clampPct(p) })
+	return nil
+}
+
+func (b *IcomSerial) SetAntiVOX(p int) error {
+	if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelAntiVOX}, civ.LevelToBCD(to255(p))...)...); err != nil {
+		return err
+	}
+	b.setCache(func(s *IcomTXState) { s.AntiVOX = clampPct(p) })
+	return nil
+}
+
 // TuneATU triggers a one-shot antenna-tuner tune (CI-V 0x1C 0x01 0x02).
 func (b *IcomSerial) TuneATU() error {
 	return b.exec(civ.CmdATU, civ.SubATU, 0x02)

internal/cat/omnirig.go

@@ -32,6 +32,7 @@ type OmniRig struct {
 	omnirig *ole.IDispatch
 	rig     *ole.IDispatch
 	lastSig string // last logged Split/VFO signature — only log on change
+	rigType string // OmniRig's RigType string (the .ini title), e.g. "IC-7610"
 
 	// lastSetFreq is the frequency most recently COMMANDED via SetFrequency.
 	// SetMode uses it to pick USB vs LSB for "SSB" instead of reading OmniRig's
@@ -80,7 +81,8 @@ func (o *OmniRig) Connect() error {
 	o.rig = rigVar.ToIDispatch()
 
 	if rt, err := oleutil.GetProperty(o.rig, "RigType"); err == nil {
-		debugLog.Printf("OmniRig connected to Rig%d type=%q", o.RigNum, rt.ToString())
+		o.rigType = rt.ToString()
+		debugLog.Printf("OmniRig connected to Rig%d type=%q", o.RigNum, o.rigType)
 	}
 	return nil
 }
@@ -194,17 +196,20 @@ func (o *OmniRig) ReadState() (RigState, error) {
 			s.FreqHz, s.RxFreqHz = freqB, freqA
 		}
 	} else {
-		// Simplex: the operating frequency is OmniRig's generic Freq (the active
-		// VFO), like Log4OM. Fall back to the per-VFO value only if Freq is 0.
+		// Simplex: read VFO A first, fall back to the generic Freq — exactly like
+		// DXHunter/WSJT-X. PM_FREQA rigs (Yaesu, Kenwood) populate FreqA; some
+		// Icoms (IC-9100 etc.) only populate the generic Freq. On the IC-7610
+		// OmniRig's generic Freq reports VFO B (its Main/Sub model confuses the
+		// stock ini), so keying off FreqA gives the operator the VFO they expect.
 		s.Split = false
 		s.RxFreqHz = 0
-		s.FreqHz = freqMain
-		if s.FreqHz == 0 {
-			if s.Vfo == "B" || s.Vfo == "BB" {
-				s.FreqHz = freqB
-			} else {
-				s.FreqHz = freqA
-			}
+		switch {
+		case freqA != 0:
+			s.FreqHz = freqA
+		case freqMain != 0:
+			s.FreqHz = freqMain
+		default:
+			s.FreqHz = freqB
 		}
 	}
 	return s, nil
@@ -414,6 +419,16 @@ func (o *OmniRig) SetPTT(on bool) error {
 		debugLog.Printf("OmniRig.SetPTT error: %v", err)
 		return fmt.Errorf("set Tx=%s: %w", name, err)
 	}
+	// Read the Tx param straight back. OmniRig is async — this may still show the
+	// previous value for a poll cycle — but if a key/unkey NEVER changes it, the
+	// write was coalesced or the rig isn't honouring PM_TX/PM_RX (wrong .ini).
+	if v, err := oleutil.GetProperty(o.rig, "Tx"); err == nil {
+		txState := "PM_RX"
+		if v.Val&pmTX != 0 {
+			txState = "PM_TX"
+		}
+		debugLog.Printf("OmniRig.SetPTT: Tx readback = 0x%X (%s)", v.Val, txState)
+	}
 	return nil
 }
 

internal/cat/tci.go

@@ -3,6 +3,7 @@
 package cat
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"strconv"
@@ -27,9 +28,10 @@ type TCI struct {
 	digitalDefault string // surfaced when the rig reports a digital mode (FT8/…)
 	spotsEnabled   bool   // mirror cluster spots onto the TCI panorama
 
-	mu    sync.Mutex // guards conn + writes + state
-	conn  *websocket.Conn
-	ready bool
+	mu         sync.Mutex // guards conn + writes + state
+	conn       *websocket.Conn
+	dialCancel context.CancelFunc // cancels an in-flight Connect dial (Interrupt/Stop)
+	ready      bool
 
 	// Cached state pushed by the radio.
 	device string
@@ -70,8 +72,18 @@ func (t *TCI) Connect() error {
 		return fmt.Errorf("tci: no host configured")
 	}
 	url := fmt.Sprintf("ws://%s", net.JoinHostPort(host, strconv.Itoa(port)))
+	// Cancellable dial so Interrupt() (Stop / Settings "Save & Close") aborts it at
+	// once instead of waiting out a dead server's 5 s handshake timeout.
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	t.mu.Lock()
+	t.dialCancel = cancel
+	t.mu.Unlock()
 	dialer := websocket.Dialer{HandshakeTimeout: 5 * time.Second}
-	conn, _, err := dialer.Dial(url, nil)
+	conn, _, err := dialer.DialContext(ctx, url, nil)
+	cancel()
+	t.mu.Lock()
+	t.dialCancel = nil
+	t.mu.Unlock()
 	if err != nil {
 		return fmt.Errorf("tci: connect %s: %w", url, err)
 	}
@@ -122,6 +134,22 @@ func (t *TCI) Disconnect() {
 	}
 }
 
+// Interrupt aborts an in-flight Connect dial so Stop()/Start() don't block on a
+// dead server's handshake timeout. Satisfies the Manager's interruptible
+// interface. Safe from another goroutine; a no-op when not dialing.
+func (t *TCI) Interrupt() {
+	t.mu.Lock()
+	cancel := t.dialCancel
+	c := t.conn
+	t.mu.Unlock()
+	if cancel != nil {
+		cancel()
+	}
+	if c != nil {
+		_ = c.Close()
+	}
+}
+
 // ReadState returns the cached state pushed by the radio.
 func (t *TCI) ReadState() (RigState, error) {
 	t.mu.Lock()

internal/clublog/clublog.go

@@ -202,6 +202,23 @@ func (db *DB) Resolve(call string, date time.Time) (Exception, bool) {
 	return Exception{}, false
 }
 
+// HasException reports whether the callsign has ANY full-call exception (at any
+// date). Used to tell a genuinely date-sensitive call (G1T: Scotland only from
+// 2024) — where cty.dat's date-blind exact-call override is wrong for older
+// QSOs — from an ordinary call cty.dat handles fine.
+func (db *DB) HasException(call string) bool {
+	if db == nil {
+		return false
+	}
+	c := strings.ToUpper(strings.TrimSpace(call))
+	for _, key := range candidates(c) {
+		if len(db.exceptions[key]) > 0 {
+			return true
+		}
+	}
+	return false
+}
+
 // candidates yields the call and a version with one trailing affix removed.
 func candidates(c string) []string {
 	out := []string{c}

internal/clublog/clublog_test.go

@@ -0,0 +1,50 @@
+package clublog
+
+import (
+	"testing"
+	"time"
+)
+
+func d(s string) time.Time {
+	t, _ := time.Parse("2006-01-02", s)
+	return t
+}
+
+// G1T is a contest call: Scotland ONLY from 2024-02-21; before that it's England
+// by prefix. cty.dat's date-blind "=G1T → Scotland" override is wrong for a 2012
+// QSO — the date-aware ClubLog cascade must give England then, Scotland now.
+func TestG1TDatedException(t *testing.T) {
+	db := &DB{
+		exceptions: map[string][]Exception{
+			"G1T": {{Call: "G1T", Entity: "Scotland", ADIF: 279, Start: d("2024-02-21")}},
+		},
+		prefixes: map[string][]Exception{
+			"G": {{Entity: "England", ADIF: 223}},
+		},
+	}
+
+	// 2012 QSO: exception doesn't cover it, but the call HAS an exception →
+	// caller should use the prefix (England).
+	if _, ok := db.Resolve("G1T", d("2012-07-29")); ok {
+		t.Fatalf("2012: exception should NOT cover a pre-2024 date")
+	}
+	if !db.HasException("G1T") {
+		t.Fatalf("HasException(G1T) should be true")
+	}
+	pe, pok := db.ResolvePrefix("G1T", d("2012-07-29"))
+	if !pok || pe.Entity != "England" {
+		t.Fatalf("2012 prefix: got %q ok=%v, want England", pe.Entity, pok)
+	}
+
+	// 2025 QSO: the exception covers it → Scotland.
+	e, ok := db.Resolve("G1T", d("2025-01-01"))
+	if !ok || e.Entity != "Scotland" {
+		t.Fatalf("2025: got %q ok=%v, want Scotland", e.Entity, ok)
+	}
+
+	// An ordinary call with no exception → HasException false (caller leaves it
+	// to cty.dat).
+	if db.HasException("G4ABC") {
+		t.Fatalf("HasException(G4ABC) should be false")
+	}
+}

internal/clublog/manager.go

@@ -50,6 +50,17 @@ func (m *Manager) Info() (date string, count int) {
 	return m.db.Date(), m.db.Count()
 }
 
+// NeedsRefresh reports whether the cached country file is missing or older than
+// maxAge — so the caller re-downloads it to pick up newly-added date-ranged
+// exceptions (e.g. an event call's fresh SARDINIA period).
+func (m *Manager) NeedsRefresh(maxAge time.Duration) bool {
+	fi, err := os.Stat(m.Path())
+	if err != nil {
+		return true // missing
+	}
+	return time.Since(fi.ModTime()) > maxAge
+}
+
 // EnsureLoaded loads the cached file into memory if present. Does NOT download.
 func (m *Manager) EnsureLoaded() error {
 	if m.Loaded() {
@@ -125,3 +136,19 @@ func (m *Manager) Resolve(call string, date time.Time) (Exception, bool) {
 	}
 	return db.Resolve(call, date)
 }
+
+// ResolvePrefix resolves a call by ClubLog's date-ranged PREFIX table.
+func (m *Manager) ResolvePrefix(call string, date time.Time) (Exception, bool) {
+	m.mu.RLock()
+	db := m.db
+	m.mu.RUnlock()
+	return db.ResolvePrefix(call, date)
+}
+
+// HasException reports whether the call has any full-call exception (any date).
+func (m *Manager) HasException(call string) bool {
+	m.mu.RLock()
+	db := m.db
+	m.mu.RUnlock()
+	return db.HasException(call)
+}

internal/cluster/cluster.go

@@ -61,6 +61,11 @@ type Spot struct {
 	LongPath   int       `json:"lp_deg,omitempty"`       // azimuth (deg) long path = SP + 180 mod 360
 	ReceivedAt time.Time `json:"received_at"`
 	Raw        string    `json:"raw"`
+	// Historical marks a spot recovered from a SH/DX table rather than heard live.
+	// It belongs in the grid, but must NOT fire alerts or reach the panadapter:
+	// replaying 100 past spots would spam both, and a station spotted three hours
+	// ago is not on the air now.
+	Historical bool `json:"historical,omitempty"`
 	POTARef    string    `json:"pota_ref,omitempty"`  // park id if this station is activating (api.pota.app)
 	POTAName   string    `json:"pota_name,omitempty"` // park name
 }
@@ -92,6 +97,21 @@ type ServerStatus struct {
 }
 
 // session is one telnet connection bound to a single server config.
+// Line is one raw line of cluster traffic: everything the server says, plus the
+// commands we send (echoed, so the console reads as a conversation).
+//
+// Spots are PARSED OUT of this stream — but everything else used to be silently
+// dropped. You could type SH/DX/100 or WHO and never see the answer, which made
+// the command box look broken. The raw stream is the fix: the console shows what
+// the server actually said, spot or not.
+type Line struct {
+	ServerID   int64  `json:"server_id"`
+	ServerName string `json:"server_name"`
+	Text       string `json:"text"`
+	Sent       bool   `json:"sent"` // true = a command WE sent
+	At         string `json:"at"`   // HH:MM:SS, local
+}
+
 // Internal — callers use Manager. The onStatus callback is fire-and-
 // forget: it tells the manager something changed; the frontend fetches
 // the new aggregate via Status() rather than receiving per-server diffs.
@@ -99,6 +119,7 @@ type session struct {
 	cfg      ServerConfig
 	login    string
 	onSpot   func(Spot)
+	onLine   func(Line)
 	onStatus func()
 
 	mu        sync.RWMutex
@@ -117,6 +138,7 @@ type Manager struct {
 	mu       sync.RWMutex
 	sessions map[int64]*session
 	onSpot   func(Spot)
+	onLine   func(Line)
 	onStatus func()
 }
 
@@ -124,10 +146,11 @@ type Manager struct {
 // spot (with the source server filled in). emitStatusChanged is called
 // whenever ANY server's status changes — the frontend then re-fetches
 // the aggregate Status() via a Wails binding.
-func NewManager(emitSpot func(Spot), emitStatusChanged func()) *Manager {
+func NewManager(emitSpot func(Spot), emitStatusChanged func(), emitLine func(Line)) *Manager {
 	return &Manager{
 		sessions: make(map[int64]*session),
 		onSpot:   emitSpot,
+		onLine:   emitLine,
 		onStatus: emitStatusChanged,
 	}
 }
@@ -155,6 +178,7 @@ func (m *Manager) StartServer(cfg ServerConfig, login string) {
 		cfg:      cfg,
 		login:    login,
 		onSpot:   m.onSpot,
+		onLine:   m.onLine,
 		onStatus: m.emitStatus,
 		stopCh:   make(chan struct{}),
 		doneCh:   make(chan struct{}),
@@ -242,6 +266,12 @@ func (s *session) send(cmd string) error {
 	}
 	_ = conn.SetWriteDeadline(time.Now().Add(5 * time.Second))
 	_, err := conn.Write([]byte(strings.TrimRight(cmd, "\r\n") + "\r\n"))
+	if err == nil {
+		// Echo it into the console, so the operator sees WHAT was sent and can pair
+		// it with the reply that follows. A console that only shows one side of the
+		// conversation is barely better than none.
+		s.emitLine(cmd, true)
+	}
 	return err
 }
 
@@ -353,8 +383,18 @@ func (s *session) runOnce() (time.Time, error) {
 		}()
 	}
 
-	// Init commands: fire 1s after login goes through. Each command on
-	// its own line; blank lines and "//" comments are skipped.
+	// Init commands, once per connection (so they replay after a reconnect).
+	//
+	// Timing: the cluster needs a moment after login before it will take commands,
+	// hence the lead-in wait; then they are PACED, because a DXSpider/AR-Cluster
+	// happily swallows a burst of back-to-back lines and silently ignores half of
+	// them. A fast-but-dropped command is worse than a slow one.
+	//
+	// They go through s.send() — NOT a raw conn.Write, which is what they used to
+	// do. That matters for two reasons: the raw write skipped the write deadline
+	// (a wedged server could hang this goroutine forever), and it skipped the
+	// console echo, so there was no way to SEE whether your init commands had
+	// actually been applied. Now you watch them go out and the reply come back.
 	initFired := false
 	fireInitCommands := func() {
 		if initFired || strings.TrimSpace(s.cfg.InitCommands) == "" {
@@ -362,10 +402,9 @@ func (s *session) runOnce() (time.Time, error) {
 		}
 		initFired = true
 		go func() {
-			time.Sleep(1 * time.Second)
+			time.Sleep(initCommandLeadIn)
 			for _, line := range strings.Split(s.cfg.InitCommands, "\n") {
-				line = strings.TrimRight(line, "\r")
-				line = strings.TrimSpace(line)
+				line = strings.TrimSpace(strings.TrimRight(line, "\r"))
 				if line == "" || strings.HasPrefix(line, "//") {
 					continue
 				}
@@ -374,8 +413,11 @@ func (s *session) runOnce() (time.Time, error) {
 					return
 				default:
 				}
-				_, _ = conn.Write([]byte(line + "\r\n"))
-				time.Sleep(500 * time.Millisecond)
+				if err := s.send(line); err != nil {
+					s.emitLine("init command failed: "+line+" — "+err.Error(), false)
+					return
+				}
+				time.Sleep(initCommandGap)
 			}
 		}()
 	}
@@ -444,12 +486,28 @@ func (s *session) runOnce() (time.Time, error) {
 			fireInitCommands()
 		}
 
-		if spot, ok := parseSpot(line); ok {
+		// EVERY line goes to the console — spot or not. This is the whole point:
+		// SH/DX, WHO, the MOTD and error replies are not spots, and dropping them
+		// (which is what happened before) made the command box look inert.
+		s.emitLine(line, false)
+
+		// Live broadcast first; then the SH/DX table form. Without the second, a
+		// SH/DX reply arrived, matched nothing, and vanished — which is exactly why
+		// "SH/DX/100" looked like it did nothing at all.
+		spot, ok := parseSpot(line)
+		if !ok {
+			spot, ok = parseShowDX(line)
+		}
+		if ok {
 			spot.SourceID = s.cfg.ID
 			spot.SourceName = s.cfg.Name
 			s.mu.Lock()
-			s.spotsCnt++
-			s.status.SpotsCount = s.spotsCnt
+			// Historical spots are a replay of the past, not new traffic — counting
+			// them would inflate the server's "spots received" figure.
+			if !spot.Historical {
+				s.spotsCnt++
+				s.status.SpotsCount = s.spotsCnt
+			}
 			s.mu.Unlock()
 			if s.onSpot != nil {
 				s.onSpot(spot)
@@ -458,13 +516,91 @@ func (s *session) runOnce() (time.Time, error) {
 	}
 }
 
+// emitLine hands one line of traffic to the console. Blank lines are dropped —
+// clusters send plenty and they'd only pad the scrollback.
+func (s *session) emitLine(text string, sent bool) {
+	if s.onLine == nil || strings.TrimSpace(text) == "" {
+		return
+	}
+	s.onLine(Line{
+		ServerID:   s.cfg.ID,
+		ServerName: s.cfg.Name,
+		Text:       strings.TrimRight(text, "\r\n"),
+		Sent:       sent,
+		At:         time.Now().Format("15:04:05"),
+	})
+}
+
 // ---------- parsing ----------
 
 // spotRE matches "DX de SPOTTER: FREQ DXCALL COMMENT TIME [LOC]".
+//
+// The spotter→freq separator is (?::\s*|\s+): a colon followed by ANY number of
+// spaces (including ZERO), or one-or-more spaces with no colon. Some RBN skimmer
+// nodes glue the frequency straight onto the colon — "DX de DL1HWS-3-#:14024.0 …"
+// — which the old ":?\s+" (colon then a REQUIRED space) rejected, dropping every
+// spot from those nodes.
 var spotRE = regexp.MustCompile(
-	`^\s*DX\s+de\s+([A-Z0-9/#\-]+):?\s+(\d+\.?\d*)\s+([A-Z0-9/]+)\s+(.*?)\s+(\d{4}Z?)(?:\s+([A-R]{2}\d{2}(?:[A-X]{2})?))?\s*$`,
+	`^\s*DX\s+de\s+([A-Z0-9/#\-]+)(?::\s*|\s+)(\d+\.?\d*)\s+([A-Z0-9/]+)\s+(.*?)\s+(\d{4}Z?)(?:\s+([A-R]{2}\d{2}(?:[A-X]{2})?))?\s*$`,
 )
 
+// Pacing for the per-server init commands.
+//
+// A cluster is not ready to take commands the instant the login line goes out —
+// it is still printing its banner — so we wait before the first one. And they are
+// spaced, because DXSpider / AR-Cluster will happily accept a burst of
+// back-to-back lines and silently apply only some of them: the connection stays
+// up, no error is returned, your filters just aren't set. A command that is
+// dropped is far worse than one that is slow.
+const (
+	initCommandLeadIn = 1500 * time.Millisecond
+	initCommandGap    = 700 * time.Millisecond
+)
+
+// showDXRE matches the reply to SH/DX — which is a TABLE, not the "DX de …"
+// broadcast format, and therefore matched nothing at all:
+//
+//	  14195.0  EA8DHH       3-Jul-2026 1234Z  CQ DX              <F5ABC>
+//	  freq     dxcall       date       time   comment            <spotter>
+//
+// This is why "SH/DX/100 does nothing": the 100 lines arrive, fail the broadcast
+// regex, and get dropped. The decimal point in the frequency is required — it is
+// what keeps ordinary prose out of the spot grid.
+var showDXRE = regexp.MustCompile(
+	`^\s*(\d{3,7}\.\d+)\s+([A-Z0-9]{1,3}[0-9][A-Z0-9/]*)\s+(\d{1,2}-[A-Za-z]{3}-\d{4})\s+(\d{4})Z?\s*(.*?)\s*(?:<\s*([A-Z0-9/#\-]+)\s*>)?\s*$`,
+)
+
+// parseShowDX turns one line of a SH/DX table into a Spot. The result is flagged
+// Historical: these are PAST spots, so they belong in the grid but must not fire
+// alerts or land on the panadapter — replaying 100 of them would spam both, and a
+// station spotted three hours ago is not on the air now.
+func parseShowDX(line string) (Spot, bool) {
+	if strings.Contains(strings.ToUpper(line), "DX DE") {
+		return Spot{}, false // that's the broadcast form; spotRE owns it
+	}
+	m := showDXRE.FindStringSubmatch(line)
+	if m == nil {
+		return Spot{}, false
+	}
+	khz, err := strconv.ParseFloat(m[1], 64)
+	if err != nil || khz <= 0 {
+		return Spot{}, false
+	}
+	hz := int64(khz * 1000)
+	return Spot{
+		Spotter:    strings.ToUpper(m[6]),
+		DXCall:     strings.ToUpper(m[2]),
+		FreqKHz:    khz,
+		FreqHz:     hz,
+		Band:       bandFromHz(hz),
+		Comment:    strings.TrimSpace(m[5]),
+		TimeUTC:    m[4] + "Z",
+		ReceivedAt: time.Now(),
+		Raw:        line,
+		Historical: true,
+	}, true
+}
+
 func parseSpot(line string) (Spot, bool) {
 	m := spotRE.FindStringSubmatch(line)
 	if m == nil {

internal/cluster/cluster_test.go

@@ -63,3 +63,57 @@ func TestParseSpotRejectsNoise(t *testing.T) {
 		}
 	}
 }
+
+// The reply to SH/DX is a TABLE, not the "DX de …" broadcast — a completely
+// different shape. Because only the broadcast form was parsed, a SH/DX/100 reply
+// arrived, matched nothing and was dropped: the command looked like it did
+// nothing at all. These lines must now land in the grid, flagged Historical.
+func TestParseShowDX(t *testing.T) {
+	cases := []struct {
+		line    string
+		call    string
+		khz     float64
+		spotter string
+	}{
+		{"  14195.0  EA8DHH       3-Jul-2026 1234Z  CQ DX                <F5ABC>", "EA8DHH", 14195.0, "F5ABC"},
+		{" 7005.5   RA3XYZ       14-Jul-2026 0912Z                       <DL1ABC>", "RA3XYZ", 7005.5, "DL1ABC"},
+		{"21025.0  VK9/DL2XYZ   1-Jan-2026 0001Z  up 2                   <JA1ABC>", "VK9/DL2XYZ", 21025.0, "JA1ABC"},
+		// No spotter brackets — still a spot, just without a DE.
+		{"  50313.0  IK0ABC       3-Jul-2026 1500Z  FT8", "IK0ABC", 50313.0, ""},
+	}
+	for _, c := range cases {
+		got, ok := parseShowDX(c.line)
+		if !ok {
+			t.Errorf("parseShowDX(%q) failed — the SH/DX reply would be dropped again", c.line)
+			continue
+		}
+		if got.DXCall != c.call || got.FreqKHz != c.khz || got.Spotter != c.spotter {
+			t.Errorf("parseShowDX(%q) = call %q / %.1f / de %q, want %q / %.1f / %q",
+				c.line, got.DXCall, got.FreqKHz, got.Spotter, c.call, c.khz, c.spotter)
+		}
+		if !got.Historical {
+			t.Errorf("parseShowDX(%q): must be flagged Historical — otherwise 100 replayed spots fire 100 alerts", c.line)
+		}
+		if got.Band == "" {
+			t.Errorf("parseShowDX(%q): band not derived from %.1f kHz", c.line, c.khz)
+		}
+	}
+}
+
+// The SH/DX parser must not swallow ordinary cluster prose — a console full of
+// chatter turned into fake spots would be worse than no parser at all.
+func TestParseShowDXRejectsNoise(t *testing.T) {
+	noise := []string{
+		"DX de F5ABC:     14195.0  EA8DHH       CQ DX                 1234Z",  // the broadcast form: spotRE owns it
+		"Hello and welcome to the DXSpider cluster",
+		"WWV de VE7CC <18Z> : SFI=110, A=16, K=2",
+		"F4BPO de GB7DXC 12-Jul-2026 2130Z dxspider >",
+		"",
+		"There are 42 users online",
+	}
+	for _, l := range noise {
+		if s, ok := parseShowDX(l); ok {
+			t.Errorf("parseShowDX(%q) wrongly produced a spot: %+v", l, s)
+		}
+	}
+}

internal/cwdecode/cwdecode.go

@@ -1,389 +0,0 @@
-// Package cwdecode is a real-time CW (Morse) decoder: it turns a stream of
-// mono PCM samples into decoded text. The pipeline is the classic one — a bank
-// of Goertzel tone detectors, a pitch LOCK that follows a single tone (so QRM
-// at other pitches is ignored), an adaptive envelope/threshold on the LOCKED
-// tone (level-independent, so weak or strong signals both key cleanly), an
-// adaptive dot-length (WPM) estimate, and a timing state machine that maps
-// marks/spaces to Morse and then to characters.
-//
-// It is deliberately self-contained and dependency-free so it can be unit
-// tested with synthetic signals. As with every audio CW decoder, weak signals
-// and very heavy QRM still degrade it; the pitch lock keeps QRM on other tones
-// out of the decode.
-package cwdecode
-
-import (
-	"math"
-	"sort"
-	"sync/atomic"
-)
-
-// Status is a periodic snapshot for the UI (pitch lock, speed, signal).
-type Status struct {
-	WPM    int     `json:"wpm"`
-	Pitch  int     `json:"pitch"`  // Hz of the locked tone (0 = not locked)
-	Level  float64 `json:"level"`  // 0..1 input audio level (RMS) for the meter
-	Active bool    `json:"active"` // a tone is currently keyed down
-}
-
-// Decoder consumes PCM and emits decoded characters via onChar (one or more
-// characters at a time, including " " for word gaps) and periodic onStatus.
-type Decoder struct {
-	fs     int
-	hop    int // samples between updates
-	win    int // Goertzel window length
-	freqs  []float64
-	coeffs []float64 // precomputed 2*cos(w) per freq
-
-	ring []float64 // last win samples
-	acc  int       // samples since last hop
-	mags []float64 // per-bin magnitude this hop
-	nbuf []float64 // scratch for the noise percentile
-
-	// Fixed-pitch target (Hz). 0 = auto-search; >0 = lock to the nearest bin and
-	// ignore everything else (e.g. follow the radio's CW pitch). Set live from
-	// another goroutine, so it's atomic.
-	targetHz atomic.Int32
-
-	// Pitch lock.
-	lockIdx    int     // index of the locked tone bin, -1 = unlocked
-	candIdx    int     // current argmax candidate while unlocked
-	candHops   int     // consecutive hops the candidate has been dominant
-	quietHops  int     // consecutive key-up hops while locked
-	noise      float64 // broadband noise estimate (percentile of bins)
-	relockHops int     // quiet hops before the lock is released
-	acqSNR     float64 // tone/noise ratio to acquire after a few stable hops
-	strongSNR  float64 // tone/noise ratio to lock immediately (1 hop)
-
-	// Adaptive keying envelope, on the LOCKED bin's magnitude.
-	peak, floor float64
-	state       bool // true = mark (key down)
-	stateHops   int
-	dotHops     float64 // adaptive dot length, in hops
-	markCount   int     // marks seen since lock (fast WPM adaptation while small)
-	elem        []byte  // current "." / "-" run for the in-progress character
-	charEmitted bool
-	wordEmitted bool
-
-	lastPitch float64
-	lastRMS   float64
-
-	statusEvery int
-	sinceStatus int
-
-	onChar   func(string)
-	onStatus func(Status)
-}
-
-var morse = map[string]byte{
-	".-": 'A', "-...": 'B', "-.-.": 'C', "-..": 'D', ".": 'E', "..-.": 'F',
-	"--.": 'G', "....": 'H', "..": 'I', ".---": 'J', "-.-": 'K', ".-..": 'L',
-	"--": 'M', "-.": 'N', "---": 'O', ".--.": 'P', "--.-": 'Q', ".-.": 'R',
-	"...": 'S', "-": 'T', "..-": 'U', "...-": 'V', ".--": 'W', "-..-": 'X',
-	"-.--": 'Y', "--..": 'Z',
-	"-----": '0', ".----": '1', "..---": '2', "...--": '3', "....-": '4',
-	".....": '5', "-....": '6', "--...": '7', "---..": '8', "----.": '9',
-	".-.-.-": '.', "--..--": ',', "..--..": '?', "-..-.": '/', "-...-": '=',
-	".-.-.": '+', "-.-.--": '!', "---...": ':', "-....-": '-', ".--.-.": '@',
-}
-
-// New builds a decoder for the given sample rate. onChar receives decoded text
-// incrementally; onStatus receives ~10 snapshots/second. Either may be nil.
-func New(sampleRate int, onChar func(string), onStatus func(Status)) *Decoder {
-	if sampleRate <= 0 {
-		sampleRate = 16000
-	}
-	d := &Decoder{
-		fs:          sampleRate,
-		hop:         sampleRate / 250, // ~4 ms resolution
-		win:         sampleRate / 72,  // ~14 ms Goertzel window (selective, fairly snappy)
-		dotHops:     15,               // ~20 WPM seed
-		acqSNR:      1.9,              // ignore noise spikes (looser locked onto noise = garbage)
-		strongSNR:   3.2,              // only a genuinely strong tone locks in 1 hop
-		lockIdx:     -1,
-		candIdx:     -1,
-		statusEvery: 25, // ~10 Hz
-		onChar:      onChar,
-		onStatus:    onStatus,
-	}
-	if d.hop < 1 {
-		d.hop = 1
-	}
-	d.relockHops = int(0.8 * float64(d.fs) / float64(d.hop)) // release lock after ~0.8 s quiet
-	// Candidate CW tones: 400–1000 Hz every 25 Hz. Deliberately NOT lower: strong
-	// low-frequency noise/hum (pink/red noise rises toward DC) would otherwise win
-	// the argmax and lock the decoder onto ~250 Hz junk instead of the signal.
-	for f := 400.0; f <= 1000.0; f += 25 {
-		d.freqs = append(d.freqs, f)
-		d.coeffs = append(d.coeffs, 2*math.Cos(2*math.Pi*f/float64(d.fs)))
-	}
-	d.mags = make([]float64, len(d.freqs))
-	d.nbuf = make([]float64, len(d.freqs))
-	return d
-}
-
-// SetTarget fixes the decode pitch to hz (lock to the nearest bin, ignore other
-// tones), or returns to auto-search when hz <= 0. Safe to call concurrently.
-func (d *Decoder) SetTarget(hz int) { d.targetHz.Store(int32(hz)) }
-
-// nearestBin returns the bin index closest to hz.
-func (d *Decoder) nearestBin(hz float64) int {
-	best, bestD := 0, math.Inf(1)
-	for i, f := range d.freqs {
-		if dd := math.Abs(f - hz); dd < bestD {
-			bestD, best = dd, i
-		}
-	}
-	return best
-}
-
-// Reset clears decode state (e.g. when the user re-arms the decoder).
-func (d *Decoder) Reset() {
-	d.ring = d.ring[:0]
-	d.acc = 0
-	d.lockIdx, d.candIdx, d.candHops, d.quietHops = -1, -1, 0, 0
-	d.peak, d.floor = 0, 0
-	d.state = false
-	d.stateHops = 0
-	d.dotHops = 15
-	d.markCount = 0
-	d.elem = d.elem[:0]
-	d.charEmitted, d.wordEmitted = false, false
-}
-
-// Process feeds a block of mono samples through the decoder.
-func (d *Decoder) Process(samples []int16) {
-	for _, s := range samples {
-		d.ring = append(d.ring, float64(s))
-		if len(d.ring) > d.win {
-			d.ring = d.ring[len(d.ring)-d.win:]
-		}
-		d.acc++
-		if d.acc >= d.hop && len(d.ring) >= d.win {
-			d.acc = 0
-			d.analyze()
-			d.step()
-		}
-	}
-}
-
-// analyze runs the Goertzel bank, estimates the noise floor, and maintains the
-// pitch lock (which tone the envelope detector then follows).
-func (d *Decoder) analyze() {
-	n := float64(len(d.ring))
-	var sumSq float64
-	maxIdx, maxMag := 0, -1.0
-	for i, coeff := range d.coeffs {
-		var s1, s2 float64
-		for _, x := range d.ring {
-			s0 := x + coeff*s1 - s2
-			s2 = s1
-			s1 = s0
-		}
-		m := math.Sqrt(math.Max(s1*s1+s2*s2-coeff*s1*s2, 0)) / n
-		d.mags[i] = m
-		if m > maxMag {
-			maxMag = m
-			maxIdx = i
-		}
-	}
-	for _, x := range d.ring {
-		sumSq += x * x
-	}
-	d.lastRMS = math.Min(1, math.Sqrt(sumSq/n)/32768*4)
-
-	// Fixed-pitch mode: lock straight to the target bin, skip the auto search.
-	// A narrow filter at the known pitch is exactly how a skimmer avoids QRM.
-	if th := int(d.targetHz.Load()); th > 0 {
-		d.lockIdx = d.nearestBin(float64(th))
-		d.lastPitch = d.freqs[d.lockIdx]
-		return
-	}
-
-	// Noise floor = 40th percentile of the bins (robust to a few strong tones).
-	copy(d.nbuf, d.mags)
-	sort.Float64s(d.nbuf)
-	d.noise = d.nbuf[int(0.4*float64(len(d.nbuf)-1)+0.5)]
-
-	if d.lockIdx < 0 {
-		if maxIdx == d.candIdx {
-			d.candHops++
-		} else {
-			d.candIdx, d.candHops = maxIdx, 1
-		}
-		snr := maxMag / (d.noise + 1e-9)
-		// Tiered acquisition: a clearly strong tone locks on the FIRST hop (so we
-		// don't eat the first element of a strong signal), a marginal/weak tone
-		// locks after a couple of stable hops (so we don't lock onto pure noise).
-		if snr > d.strongSNR || (d.candHops >= 2 && snr > d.acqSNR) {
-			d.lockIdx = maxIdx
-			d.peak, d.floor = maxMag, d.noise // seed the envelope to this bin
-			d.quietHops = 0
-			d.markCount = 0 // relearn WPM fast for this new signal
-		}
-	}
-	if d.lockIdx >= 0 {
-		d.lastPitch = d.freqs[d.lockIdx]
-	} else {
-		d.lastPitch = 0
-	}
-}
-
-// step runs the adaptive envelope on the locked bin and the timing state
-// machine, one hop. The envelope adapts to the signal level (not an absolute
-// threshold), so weak and strong signals both key correctly.
-func (d *Decoder) step() {
-	on := false
-	if d.lockIdx >= 0 {
-		m := d.mags[d.lockIdx]
-		// Peak: fast attack, slow release.
-		if m > d.peak {
-			d.peak += (m - d.peak) * 0.4
-		} else {
-			d.peak += (m - d.peak) * 0.02
-		}
-		// Floor: drops fast toward the signal, but only RISES between marks (when
-		// keyed up). Letting the floor rise during a long dash would shrink the
-		// span until the dash drops below the threshold and fragments into dots —
-		// the cause of the "all dots" garbage on a strong clean signal.
-		if m < d.floor {
-			d.floor += (m - d.floor) * 0.4
-		} else if !d.state {
-			d.floor += (m - d.floor) * 0.02
-		}
-		span := d.peak - d.floor
-		// The frozen floor already stops dashes fragmenting, so keep balanced
-		// thresholds: low enough that short inter-element GAPS are still seen
-		// (otherwise elements merge into >7-symbol runs that decode to nothing).
-		if span > d.floor*0.3+1e-9 {
-			onTh := d.floor + 0.55*span
-			offTh := d.floor + 0.35*span
-			if d.state {
-				on = m > offTh
-			} else {
-				on = m > onTh
-			}
-		}
-		// Release the lock after a long quiet so we can retune to a new signal.
-		if on {
-			d.quietHops = 0
-		} else {
-			d.quietHops++
-			if d.quietHops > d.relockHops {
-				// End of the over: flush any pending character and drop a word
-				// space so the next transmission starts a fresh word (the word-gap
-				// timer above can't fire once the lock is gone).
-				if len(d.elem) > 0 && !d.charEmitted {
-					d.flushChar()
-					d.charEmitted = true
-				}
-				if !d.wordEmitted && d.onChar != nil {
-					d.onChar(" ")
-					d.wordEmitted = true
-				}
-				d.lockIdx, d.candIdx, d.candHops = -1, -1, 0
-			}
-		}
-	}
-
-	if on == d.state {
-		d.stateHops++
-		if !d.state {
-			d.spaceProgress()
-		}
-	} else {
-		if d.state {
-			d.endMark(d.stateHops)
-		}
-		d.state = on
-		d.stateHops = 1
-		if on {
-			d.charEmitted, d.wordEmitted = false, false
-		}
-	}
-	d.emitStatus(on)
-}
-
-// endMark classifies a finished key-down run as a dot or dash and adapts the
-// dot-length estimate. Runs shorter than a third of a dot are rejected as
-// clicks/noise.
-func (d *Decoder) endMark(hops int) {
-	h := float64(hops)
-	// Reject clicks/noise: shorter than a third of a dot AND an absolute floor
-	// of ~4 hops (~16 ms, i.e. faster than ~75 WPM) so noise can't drag the
-	// dot-length estimate down to the clamp (which produced 100 WPM garbage).
-	if h < d.dotHops*0.35 || h < 4 {
-		return
-	}
-	if h > d.dotHops*2 {
-		d.elem = append(d.elem, '-')
-		d.adaptDot(h / 3)
-	} else {
-		d.elem = append(d.elem, '.')
-		d.adaptDot(h)
-	}
-}
-
-// adaptDot nudges the dot-length estimate toward an observation (EMA, clamped
-// to ~5–60 WPM). The EMA is deliberately GENTLE (0.2) and NOT accelerated on the
-// opening marks: a fast alpha let short noise blips (misclassified as dots) drag
-// the dot-length down to the clamp within a few marks — the "60 WPM, all dits"
-// garbage. The slow EMA is self-correcting because genuine marks pull it back up.
-func (d *Decoder) adaptDot(obs float64) {
-	const alpha = 0.2
-	d.markCount++
-	d.dotHops = d.dotHops*(1-alpha) + obs*alpha
-	if d.dotHops < 5 { // 5 hops ≈ 60 WPM ceiling — never 100
-		d.dotHops = 5
-	}
-	if d.dotHops > 55 {
-		d.dotHops = 55
-	}
-}
-
-// spaceProgress flushes the current character once the gap exceeds a character
-// gap, and a word space once it exceeds a word gap.
-func (d *Decoder) spaceProgress() {
-	g := float64(d.stateHops)
-	if !d.charEmitted && g > d.dotHops*2 {
-		d.flushChar()
-		d.charEmitted = true
-	}
-	if !d.wordEmitted && g > d.dotHops*5 {
-		if d.onChar != nil {
-			d.onChar(" ")
-		}
-		d.wordEmitted = true
-	}
-}
-
-// flushChar looks up the accumulated element string and emits the character.
-func (d *Decoder) flushChar() {
-	if len(d.elem) == 0 {
-		return
-	}
-	if c, ok := morse[string(d.elem)]; ok {
-		if d.onChar != nil {
-			d.onChar(string(c))
-		}
-	} else if d.onChar != nil && len(d.elem) <= 7 {
-		// Only flag a genuinely Morse-shaped but unknown char with "?". An
-		// over-long element run is noise — drop it silently rather than spam "?".
-		d.onChar("?")
-	}
-	d.elem = d.elem[:0]
-}
-
-func (d *Decoder) emitStatus(on bool) {
-	d.sinceStatus++
-	if d.sinceStatus < d.statusEvery || d.onStatus == nil {
-		return
-	}
-	d.sinceStatus = 0
-	hopMs := float64(d.hop) / float64(d.fs) * 1000
-	wpm := 0
-	if d.dotHops > 0 {
-		wpm = int(math.Round(1200 / (d.dotHops * hopMs)))
-	}
-	d.onStatus(Status{WPM: wpm, Pitch: int(math.Round(d.lastPitch)), Level: d.lastRMS, Active: on})
-}

internal/cwdecode/cwdecode_test.go

@@ -1,201 +0,0 @@
-package cwdecode
-
-import (
-	"math"
-	"strings"
-	"testing"
-)
-
-// reverse Morse map for the synthesizer.
-func charToMorse() map[byte]string {
-	m := map[byte]string{}
-	for code, ch := range morse {
-		m[ch] = code
-	}
-	return m
-}
-
-// keyMessage synthesizes a clean keyed tone for msg at the given WPM/pitch.
-func keyMessage(msg string, fs, wpm int, pitch float64) []int16 {
-	return keyMessageAmp(msg, fs, wpm, pitch, 9000)
-}
-
-func keyMessageAmp(msg string, fs, wpm int, pitch, amp float64) []int16 {
-	dot := fs * 1200 / (wpm * 1000) // samples per dot
-	c2m := charToMorse()
-	var out []int16
-	phase := 0.0
-	dphi := 2 * math.Pi * pitch / float64(fs)
-
-	tone := func(n int) {
-		for i := 0; i < n; i++ {
-			out = append(out, int16(amp*math.Sin(phase)))
-			phase += dphi
-		}
-	}
-	silence := func(n int) {
-		for i := 0; i < n; i++ {
-			out = append(out, 0)
-		}
-	}
-
-	silence(fs / 4) // 250 ms lead-in for AGC warmup
-	for i := 0; i < len(msg); i++ {
-		ch := msg[i]
-		if ch == ' ' {
-			silence(7 * dot)
-			continue
-		}
-		code := c2m[ch]
-		for j := 0; j < len(code); j++ {
-			if code[j] == '.' {
-				tone(dot)
-			} else {
-				tone(3 * dot)
-			}
-			silence(dot) // inter-element gap
-		}
-		silence(3 * dot) // inter-character gap (on top of the trailing element gap)
-	}
-	silence(fs / 4)
-	return out
-}
-
-func TestDecodeCleanSignal(t *testing.T) {
-	const fs = 16000
-	var sb strings.Builder
-	d := New(fs, func(s string) { sb.WriteString(s) }, nil)
-
-	// Repeat so AGC warm-up only costs the first word.
-	samples := keyMessage("PARIS PARIS PARIS", fs, 22, 700)
-	// Feed in small chunks like the live capture would.
-	for i := 0; i < len(samples); i += 256 {
-		end := i + 256
-		if end > len(samples) {
-			end = len(samples)
-		}
-		d.Process(samples[i:end])
-	}
-
-	got := strings.ToUpper(sb.String())
-	if !strings.Contains(got, "PARIS") {
-		t.Fatalf("decoded %q, want it to contain PARIS", got)
-	}
-}
-
-func TestDecodeWithQRM(t *testing.T) {
-	const fs = 16000
-	// Target at 700 Hz; a strong interfering keyed signal at 950 Hz, slightly
-	// quieter, sending different text. The pitch lock should hold on the target.
-	target := keyMessageAmp("PARIS PARIS PARIS", fs, 20, 700, 9000)
-	qrm := keyMessageAmp("BK DE QRZ QRZ TEST", fs, 26, 950, 6500)
-	mix := make([]int16, len(target))
-	for i := range target {
-		v := int(target[i])
-		if i < len(qrm) {
-			v += int(qrm[i])
-		}
-		if v > 32767 {
-			v = 32767
-		} else if v < -32768 {
-			v = -32768
-		}
-		mix[i] = int16(v)
-	}
-
-	var sb strings.Builder
-	d := New(fs, func(s string) { sb.WriteString(s) }, nil)
-	for i := 0; i < len(mix); i += 256 {
-		end := i + 256
-		if end > len(mix) {
-			end = len(mix)
-		}
-		d.Process(mix[i:end])
-	}
-	got := strings.ToUpper(sb.String())
-	if !strings.Contains(got, "PARIS") {
-		t.Fatalf("with QRM, decoded %q, want it to contain PARIS", got)
-	}
-}
-
-func TestDecodeFirstCharStrong(t *testing.T) {
-	const fs = 16000
-	var sb strings.Builder
-	d := New(fs, func(s string) { sb.WriteString(s) }, nil)
-	// Strong signal: the very first element (T = a dash) must not be eaten by
-	// lock acquisition. Output should begin with the first character.
-	samples := keyMessageAmp("TEST DE", fs, 20, 700, 16000)
-	for i := 0; i < len(samples); i += 200 {
-		end := i + 200
-		if end > len(samples) {
-			end = len(samples)
-		}
-		d.Process(samples[i:end])
-	}
-	got := strings.ToUpper(strings.TrimSpace(sb.String()))
-	if !strings.HasPrefix(got, "TEST") {
-		t.Fatalf("first chars lost on a strong signal: decoded %q, want it to start with TEST", got)
-	}
-}
-
-func TestDecodeWithAmplitudeRipple(t *testing.T) {
-	const fs = 16000
-	// A real signal's tone amplitude wobbles within a mark; if the floor chases
-	// it, dashes fragment into dots ("all dots" garbage). Apply ±30% ripple.
-	samples := keyMessageAmp("CQ TEST DE OM", fs, 24, 800, 10000)
-	rp := 0.0
-	for i := range samples {
-		rp += 2 * math.Pi * 35 / float64(fs) // 35 Hz amplitude wobble
-		samples[i] = int16(float64(samples[i]) * (1 + 0.3*math.Sin(rp)))
-	}
-	var sb strings.Builder
-	d := New(fs, func(s string) { sb.WriteString(s) }, nil)
-	for i := 0; i < len(samples); i += 256 {
-		end := i + 256
-		if end > len(samples) {
-			end = len(samples)
-		}
-		d.Process(samples[i:end])
-	}
-	got := strings.ToUpper(sb.String())
-	if !strings.Contains(got, "TEST DE OM") {
-		t.Fatalf("dashes fragmented under amplitude ripple: decoded %q", got)
-	}
-}
-
-func TestDecodeCQFixedPitch(t *testing.T) {
-	const fs = 16000
-	var sb strings.Builder
-	d := New(fs, func(s string) { sb.WriteString(s) }, nil)
-	d.SetTarget(700) // fixed pitch like the user's manual override
-	samples := keyMessageAmp("CQ CQ CQ DE OM", fs, 26, 700, 9000)
-	for i := 0; i < len(samples); i += 200 {
-		end := i + 200
-		if end > len(samples) {
-			end = len(samples)
-		}
-		d.Process(samples[i:end])
-	}
-	got := strings.ToUpper(sb.String())
-	if n := strings.Count(got, "CQ"); n < 2 {
-		t.Fatalf("first element of CQ dropped: decoded %q (only %d CQ)", got, n)
-	}
-}
-
-func TestDecodeNumbersAndProsign(t *testing.T) {
-	const fs = 16000
-	var sb strings.Builder
-	d := New(fs, func(s string) { sb.WriteString(s) }, nil)
-	samples := keyMessage("TEST 599 TEST", fs, 18, 650)
-	for i := 0; i < len(samples); i += 200 {
-		end := i + 200
-		if end > len(samples) {
-			end = len(samples)
-		}
-		d.Process(samples[i:end])
-	}
-	got := strings.ToUpper(sb.String())
-	if !strings.Contains(got, "599") {
-		t.Fatalf("decoded %q, want it to contain 599", got)
-	}
-}

internal/db/connloss.go

@@ -0,0 +1,66 @@
+package db
+
+import (
+	"database/sql"
+	"database/sql/driver"
+	"errors"
+	"net"
+	"strings"
+
+	"github.com/go-sql-driver/mysql"
+)
+
+// IsConnLost reports whether err means the database was UNREACHABLE (network
+// down, server gone, dead pooled connection) as opposed to a legitimate
+// server-side SQL error (constraint violation, bad data, syntax).
+//
+// This distinction is the linchpin of the offline safety net: a QSO is parked in
+// the local ADIF outbox ONLY on a connection loss. If we queued on any error, a
+// genuine data bug would silently vanish into the file instead of being
+// reported — the worst possible outcome.
+//
+// A *mysql.MySQLError means the SERVER answered and rejected us, so it is never
+// a connection loss, whatever its code.
+func IsConnLost(err error) bool {
+	if err == nil {
+		return false
+	}
+	// The server responded → a real SQL error, not a lost link.
+	var me *mysql.MySQLError
+	if errors.As(err, &me) {
+		return false
+	}
+	if errors.Is(err, driver.ErrBadConn) || errors.Is(err, sql.ErrConnDone) || errors.Is(err, sql.ErrTxDone) {
+		return true
+	}
+	var ne net.Error
+	if errors.As(err, &ne) {
+		return true
+	}
+	var oe *net.OpError
+	if errors.As(err, &oe) {
+		return true
+	}
+	// The MySQL driver reports a few of these as plain strings.
+	s := strings.ToLower(err.Error())
+	for _, p := range []string{
+		"invalid connection",
+		"bad connection",
+		"connection refused",
+		"connection reset",
+		"broken pipe",
+		"no such host",
+		"i/o timeout",
+		"dial tcp",
+		"unexpected eof",
+		"driver: bad connection",
+		"can't connect",
+		"network is unreachable",
+		"host is unreachable",
+	} {
+		if strings.Contains(s, p) {
+			return true
+		}
+	}
+	return false
+}

internal/db/db.go

@@ -198,14 +198,26 @@ func migrate(conn *sql.DB, translate func(string) string) error {
 	}
 	sort.Strings(names)
 
-	for _, name := range names {
-		var dummy string
-		err := conn.QueryRow(`SELECT name FROM schema_migrations WHERE name = ?`, name).Scan(&dummy)
-		if err == nil {
-			continue // already applied
+	// Fetch every applied migration name in ONE query rather than one round-trip
+	// per migration. On a high-latency remote MySQL those 20+ SELECTs dominated the
+	// connect time (each RTT × migration count) — the whole logbook connect could
+	// take tens of seconds. One SELECT + an in-memory set is effectively instant.
+	applied := map[string]bool{}
+	if rows, err := conn.Query(`SELECT name FROM schema_migrations`); err == nil {
+		for rows.Next() {
+			var n string
+			if rows.Scan(&n) == nil {
+				applied[n] = true
+			}
 		}
-		if err != sql.ErrNoRows {
-			return fmt.Errorf("check migration %s: %w", name, err)
+		rows.Close()
+	} else {
+		return fmt.Errorf("read applied migrations: %w", err)
+	}
+
+	for _, name := range names {
+		if applied[name] {
+			continue // already applied
 		}
 		content, err := migrationsFS.ReadFile("migrations/" + name)
 		if err != nil {