chore: release v0.23.6

The Ctrl+↑/↓ keyboard-nav useEffect sat AFTER `if (!range) return`, so on a band
with no range — e.g. a spurious 33 cm frequency briefly reported by an Icom over
CAT — the component returned before that hook and the hook count changed between
renders, crashing the whole window with React #300. Moved the effect above the
early return; lo/hi already fall back to [0,1] when there's no range.

app.go

@@ -2400,6 +2400,19 @@ func (a *App) groupDigitalSlots() bool {
 	return v == "1"
 }
 
+// clusterWorkedSameSlot reports the "consider a call already worked only if
+// worked on the SAME band+mode slot" cluster preference (Settings → DX Cluster).
+// Off (default) → a call worked on any band/mode reads as already worked. On →
+// the WORKED-call flag needs the same band and mode (digital-grouped when that
+// option is also on).
+func (a *App) clusterWorkedSameSlot() bool {
+	if a.settings == nil {
+		return false
+	}
+	v, _ := a.settings.Get(a.ctx, "ui.opslog.clusterWorkedSameSlot")
+	return v == "1"
+}
+
 func (a *App) GetUIPref(key string) (string, error) {
 	if a.settings == nil || !a.settingsScoped.Load() {
 		// Distinct from a genuinely-empty pref: the (LOCAL SQLite) settings store
@@ -3629,6 +3642,29 @@ func (a *App) computeAwardsForMode(defs []award.Def, modeClass string) ([]award.
 	}
 	refMetas := a.awardRefMetas(defs)
 	results := award.Compute(defs, all, refMetas, nameOf)
+	// DXCC: fill each reference's Group with the entity's primary prefix (XE,
+	// DL, F…). Sorting/searching a 340-row list by bare entity number is
+	// hopeless — the prefix is how operators actually identify an entity.
+	// Derived from the live cty.dat rather than stored on the reference row, so
+	// it needs no re-seed of an existing installation.
+	if a.dxcc != nil {
+		var pfx map[int]string
+		for i := range results {
+			if !strings.EqualFold(results[i].Code, "DXCC") {
+				continue
+			}
+			if pfx == nil {
+				if pfx = a.dxcc.PrefixByDXCC(); pfx == nil {
+					break
+				}
+			}
+			for j := range results[i].Refs {
+				if n, err := strconv.Atoi(results[i].Refs[j].Ref); err == nil {
+					results[i].Refs[j].Group = pfx[n]
+				}
+			}
+		}
+	}
 	// Dynamic awards (POTA/SOTA/…) aren't fully loaded into the engine — their
 	// list can be huge. Enrich them after the fact: real Total from the stored
 	// count, and reference names for the worked references only.
@@ -6054,6 +6090,38 @@ func (a *App) WorkedBefore(callsign string, dxccHint int) (qso.WorkedBefore, err
 	return wb, err
 }
 
+// BandSlotQSOs lists the contacts behind ONE cell of the entry Stats (F1)
+// matrix — "everything I have on 20m CW with this entity". Same drill-down the
+// Awards grid offers, for the panel an operator actually stares at while
+// working a station.
+//
+// modeClass is the matrix column class ("PH", "CW", "DIG"); empty means all.
+// Both the exact callsign and the entity are returned: a cell is amber for the
+// entity and green for the call, and the useful answer to "who gave me this
+// slot?" is the whole list.
+func (a *App) BandSlotQSOs(callsign string, dxccNum int, band, modeClass string) ([]qso.QSO, error) {
+	if a.qso == nil {
+		return nil, fmt.Errorf("db not initialized")
+	}
+	all, err := a.qso.BandSlotQSOs(a.ctx, callsign, dxccNum, band)
+	if err != nil {
+		return nil, err
+	}
+	// "PH"/"DIG" are the matrix's column labels; award.ModeClass speaks
+	// "PHONE"/"DIGI". Translate rather than teach one of them the other's names.
+	want := map[string]string{"PH": "PHONE", "CW": "CW", "DIG": "DIGI"}[strings.ToUpper(strings.TrimSpace(modeClass))]
+	if want == "" {
+		return all, nil
+	}
+	out := make([]qso.QSO, 0, len(all))
+	for _, q := range all {
+		if award.ModeClass(q.Mode) == want {
+			out = append(out, q)
+		}
+	}
+	return out, nil
+}
+
 // SetCompactMode toggles a tiny always-on-top window that exposes just the
 // QSO entry — useful when running on a single screen alongside WSJT-X,
 // JT-Alert or the cluster.
@@ -15870,6 +15938,14 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
 	// "I've already QSO'd this exact station" even when the band/mode
 	// makes the entity check say "new-band" or "new-slot".
 	workedCalls, _ := a.qso.WorkedCallsigns(a.ctx)
+	// "Already worked only on the same slot" option (Settings → DX Cluster): the
+	// WORKED-call flag then needs the SAME band and mode (digital-grouped through
+	// the same normMode when that option is on) rather than the call anywhere.
+	sameSlot := a.clusterWorkedSameSlot()
+	var workedCallSlots map[string]struct{}
+	if sameSlot {
+		workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, normMode)
+	}
 	// Orthogonal dimensions: worked US counties (for the ULS callsign→county
 	// lookup) and worked POTA parks. Both built once per batch.
 	workedCounties, _ := a.qso.WorkedCountyKeys(a.ctx, award.USCountyKey)
@@ -15890,7 +15966,21 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
 			Band: strings.ToLower(q.Band),
 			Mode: strings.ToUpper(q.Mode),
 		}
-		if _, ok := workedCalls[strings.ToUpper(q.Call)]; ok {
+		if sameSlot {
+			// Already worked ONLY when this exact band+mode slot was worked. With no
+			// inferable mode, fall back to same-band (better than claiming the whole
+			// call is fresh). Digital grouping folds through the same normMode.
+			upCall := strings.ToUpper(q.Call)
+			if out[i].Mode == "" {
+				_, out[i].WorkedCall = workedCallSlots[upCall+"|"+out[i].Band]
+			} else {
+				cm := out[i].Mode
+				if normMode != nil {
+					cm = normMode(cm)
+				}
+				_, out[i].WorkedCall = workedCallSlots[upCall+"|"+out[i].Band+"|"+cm]
+			}
+		} else if _, ok := workedCalls[strings.ToUpper(q.Call)]; ok {
 			out[i].WorkedCall = true
 		}
 		// NEW PFX: the spot's CQ WPX prefix, never worked before.

app_gate.go

@@ -15,6 +15,7 @@ import (
 var deniedCallHashes = map[string]struct{}{
 	"2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {},
 	"0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {},
+	"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
 }
 
 // callDenied reports whether a callsign is on deniedCallHashes. The call is

changelog.json

@@ -1,4 +1,46 @@
 [
+  {
+    "version": "0.23.6",
+    "date": "",
+    "en": [
+      "Log viewer: the window now keeps twice as much history (512 KB instead of 256 KB, ~3200 lines). During a busy trace the oldest lines used to scroll out of the buffer while you were still reading them; the larger window holds them.",
+      "Ultrabeam over a remote link: fixed intermittent connection drops, phantom frequency jumps and wrong element-length readings. On a slow link a command that timed out left its late reply in the stream, and the next command read it as its own — crossing a status query with an element-length one, for instance. The stream is now flushed of any stale reply before each command, keeping the exchange in step.",
+      "Ultrabeam: the 'moving' indicator and the Flex TX-inhibit now react the instant you click a band or pattern, instead of up to a status poll (~2 s) later. A commanded move reports motion immediately; the real motor state takes over once the next poll reads it.",
+      "CAT sharing (FT8): JTDX/WSJT-X transmit correctly again through OpsLog's shared rig. get_ptt now echoes the PTT state the client last commanded — clients poll it DURING transmit to confirm the rig is keyed, and OpsLog always answering 'receiving' made them give up and drop the over after a second or two. The 0.23.5 'Fake It' anti-drift tweak was also reverted (it had made this total — no transmit at all); the small dial creep in 'Fake It' split can return, and JTDX's 'Split Operation: None' avoids it.",
+      "CAT settings: trimmed the long help text under the Kenwood and CAT-sharing fields down to the essentials — less clutter.",
+      "Entry form: fixed two ways a stray QSO could sneak in. Pressing Enter in the TX/RX frequency field now only tunes the radio — it was also submitting the contact. And a bare number with no letter (JTDX/WSJT-X sometimes broadcasts \"1\" as the DX call) is no longer accepted into the callsign field, where it could get logged as callsign \"1\".",
+      "SPE amplifier: switching the amp off in OpsLog now shows \"off\" straight away and lets you switch it back on without restarting. The already-open connection kept reading as connected after the off keystroke, so the panel stayed \"on\" and the ON button did nothing until a restart. OpsLog now drops the link on power-off, exactly as a fresh start would — the ON button's RTS/DTR wake then works.",
+      "Alt+W clears the QSO entry, the shortcut used by most other loggers. Unlike Esc it always works, even when the CW keyer has Esc reserved.",
+      "The Grid box no longer pops outside the QSO entry panel when the window is narrowed — it wraps to its own line instead.",
+      "Selecting a QSO in the Recent QSOs list now shows that station in the Stats (F1) matrix, instead of leaving it blank.",
+      "Stats (F1): click any coloured band/mode square to list the contacts behind it.",
+      "Awards: the DXCC list now shows each entity’s main prefix (XE, DL, F…) in its own sortable, searchable column.",
+      "DX Cluster: new option \"Already worked only on the same slot\" (Settings → DX Cluster). With it on, a spot reads \"worked\" only when you worked that callsign on the SAME band and mode — not just anywhere. It respects the digital-mode grouping (Settings → General): grouped, a 20m FT8 contact also marks a 20m FT4 spot as worked; ungrouped, FT8 and FT4 are separate slots.",
+      "DX Cluster: added a WORKED status-filter chip, so you can show — or, with the other chips off, isolate — already-worked spots, not only hide them with the \"Hide worked\" checkbox.",
+      "DX Cluster: spots that represent nothing — entity/band/mode already worked, the callsign not in your log, no POTA/county/prefix novelty — are now dimmed, so your eye skips them and the spots worth working stand out. What counts as \"nothing\" follows the \"same slot\" option and the digital-mode grouping.",
+      "Ultrabeam: an older controller (seen over an RS232-to-Ethernet bridge) answers with an 11-byte status frame instead of 12. OpsLog rejected it as \"too short\" and reconnect-looped; it now accepts a shorter checksum-valid frame and defaults the missing tail field.",
+      "Fixed a crash (React #300) that could take down the whole window when the rig briefly reported an unusual band — for example a spurious 33 cm reading from an Icom. The Band Map had a keyboard-navigation hook after its early return for unknown bands, so the number of hooks changed between renders. The hook now always runs."
+    ],
+    "fr": [
+      "Visionneuse de log : la fenêtre conserve deux fois plus d'historique (512 Ko au lieu de 256 Ko, ~3200 lignes). Lors d'une trace chargée, les plus vieilles lignes défilaient hors du buffer pendant qu'on les lisait encore ; la fenêtre agrandie les garde.",
+      "Ultrabeam en remote : coupures de connexion intermittentes, sauts de fréquence fantômes et longueurs d'éléments erronées corrigés. Sur un lien lent, une commande qui expirait laissait sa réponse tardive dans le flux, et la commande suivante la lisait comme la sienne — croisant par exemple une requête de statut avec une requête de longueurs d'éléments. Le flux est désormais vidé de toute réponse périmée avant chaque commande, gardant l'échange synchronisé.",
+      "Ultrabeam : l'indicateur « en mouvement » et l'inhibition d'émission Flex réagissent désormais dès que vous cliquez sur une bande ou un diagramme, au lieu d'attendre jusqu'à un poll de statut (~2 s). Un mouvement commandé signale le déplacement immédiatement ; l'état réel des moteurs prend le relais dès le poll suivant.",
+      "Partage CAT (FT8) : JTDX/WSJT-X émettent de nouveau correctement via la radio partagée d'OpsLog. get_ptt renvoie désormais l'état PTT commandé en dernier par le client — les clients l'interrogent PENDANT l'émission pour confirmer que la radio est en émission, et comme OpsLog répondait toujours « réception », ils abandonnaient et coupaient l'émission au bout d'une seconde ou deux. L'ajustement anti-drift « Fake It » de la 0.23.5 a aussi été annulé (il rendait le problème total — aucune émission) ; le léger glissement du VFO en split « Fake It » peut réapparaître, et « Split Operation : None » dans JTDX l'évite.",
+      "Réglages CAT : textes d'aide raccourcis sous les champs Kenwood et partage CAT — moins de fouillis.",
+      "Formulaire de saisie : deux façons de logguer un QSO parasite corrigées. Appuyer sur Entrée dans le champ fréquence TX/RX ne fait plus que syntoniser la radio — cela validait aussi le contact. Et un nombre nu sans lettre (JTDX/WSJT-X diffuse parfois « 1 » comme DX call) n'est plus accepté dans le champ indicatif, où il pouvait être loggué comme indicatif « 1 ».",
+      "Ampli SPE : éteindre l'ampli depuis OpsLog affiche désormais « off » tout de suite et permet de le rallumer sans redémarrer. La connexion déjà ouverte continuait d'être vue comme connectée après la touche d'extinction, le panneau restait donc « on » et le bouton ON ne faisait rien jusqu'à un redémarrage. OpsLog largue maintenant le lien à l'extinction, exactement comme un démarrage à neuf — le réveil RTS/DTR du bouton ON fonctionne alors.",
+      "Alt+W efface la saisie du QSO, le raccourci utilisé par la plupart des autres logiciels. Contrairement à Échap, il fonctionne toujours, même quand Échap est réservé au manipulateur CW.",
+      "Le champ Locator ne déborde plus du panneau de saisie quand la fenêtre est rétrécie — il passe à la ligne.",
+      "Sélectionner un QSO dans la liste des QSO récents affiche désormais cette station dans la matrice Stats (F1), au lieu de la laisser vide.",
+      "Stats (F1) : cliquer sur une case bande/mode colorée liste les contacts correspondants.",
+      "Diplômes : la liste DXCC affiche le préfixe principal de chaque entité (XE, DL, F…) dans une colonne triable et cherchable.",
+      "DX Cluster : nouvelle option « Déjà contacté seulement sur le même slot » (Réglages → DX Cluster). Activée, un spot n'affiche « contacté » que si vous avez contacté cet indicatif sur la MÊME bande et le MÊME mode — pas juste n'importe où. Elle respecte le groupage des modes numériques (Réglages → Général) : groupé, un contact 20m FT8 marque aussi un spot 20m FT4 comme contacté ; dégroupé, FT8 et FT4 sont des slots distincts.",
+      "DX Cluster : ajout d'un filtre de statut WORKED, pour afficher — ou, en désactivant les autres, isoler — les spots déjà contactés, pas seulement les masquer avec la case « Masquer les contactés ».",
+      "DX Cluster : les spots qui ne représentent rien — entité/bande/mode déjà faite, indicatif absent du journal, aucune nouveauté POTA/comté/préfixe — sont désormais atténués, pour que l'œil les ignore et que les spots à travailler ressortent. Ce qui compte comme « rien » suit l'option « même slot » et le groupage des modes numériques.",
+      "Ultrabeam : un contrôleur plus ancien (vu derrière un pont RS232-Ethernet) répond avec une trame de statut de 11 octets au lieu de 12. OpsLog la rejetait comme « trop courte » et bouclait en reconnexion ; il accepte désormais une trame valide plus courte et met par défaut le champ de fin manquant.",
+      "Correction d'un plantage (React #300) qui pouvait faire tomber toute la fenêtre quand la radio rapportait brièvement une bande inhabituelle — par exemple une lecture 33 cm parasite d'un Icom. La Band Map avait un hook de navigation clavier après son retour anticipé pour les bandes inconnues, changeant le nombre de hooks entre deux rendus. Le hook est désormais toujours exécuté."
+    ]
+  },
   {
     "version": "0.23.5",
     "date": "",

frontend/src/App.tsx

@@ -1512,6 +1512,11 @@ export default function App() {
   const [deletingIds, setDeletingIds] = useState<number[]>([]);
   const [selectedId, setSelectedId] = useState<number | null>(null);
   const [selectedIds, setSelectedIds] = useState<number[]>([]);
+  // Call/band/mode of the QSO highlighted in the Recent-QSOs grid. Drives the
+  // Stats (F1) matrix whenever the entry form is empty — clicking a past contact
+  // is the natural way to ask "what else have I got with this one?", and until
+  // now the panel just sat blank.
+  const [selQso, setSelQso] = useState<{ call: string; band: string; mode: string } | null>(null);
   const [bulkEditIds, setBulkEditIds] = useState<number[]>([]);
   const [bulkEditOpen, setBulkEditOpen] = useState(false);
   const [showSettings, setShowSettings] = useState(false);
@@ -2607,6 +2612,11 @@ export default function App() {
     const applyUdpCall = (raw: string, force = false): boolean => {
       const call = String(raw ?? '').trim();
       if (!call) return false;
+      // A callsign always has at least one letter. WSJT-X/JTDX (and relayed spot
+      // clicks) sometimes broadcast a bare number in the DX-call field — famously
+      // "1" — which would land in the entry and, on the next Enter, log a QSO
+      // with callsign "1". Reject anything with no letter.
+      if (!/[a-z]/i.test(call)) return false;
       const upper = call.toUpperCase();
       const current = callsignValRef.current.trim().toUpperCase();
       const prev = lastUdpCallRef.current;
@@ -3310,6 +3320,24 @@ export default function App() {
     finally { setDeletingAll(false); }
   }
 
+  // Worked-before for the QSO highlighted in the grid. Deliberately NOT
+  // runWorkedBefore: that one owns the entry form's wbRef and can trigger a
+  // field backfill, which browsing the log must never do.
+  const [selWb, setSelWb] = useState<WB | null>(null);
+  const [selWbBusy, setSelWbBusy] = useState(false);
+  useEffect(() => {
+    const call = (selQso?.call ?? '').trim().toUpperCase();
+    // The entry form wins whenever it has a call — it's the live QSO.
+    if (!call || callsign.trim()) { setSelWb(null); return; }
+    let dead = false;
+    setSelWbBusy(true);
+    WorkedBefore(call, 0)
+      .then((w: any) => { if (!dead) setSelWb(w); })
+      .catch(() => { if (!dead) setSelWb(null); })
+      .finally(() => { if (!dead) setSelWbBusy(false); });
+    return () => { dead = true; };
+  }, [selQso, callsign]);
+
   async function runWorkedBefore(call: string, dxccHint: number = 0) {
     setWbBusy(true);
     try {
@@ -3854,6 +3882,16 @@ export default function App() {
       if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'o') {
         e.preventDefault(); importAdif(); return;
       }
+      // Alt+W: wipe the entry. The near-universal logger convention (N1MM,
+      // Log4OM, DXLog), and unlike ESC it is never swallowed by the CW keyer —
+      // so there is always one key that clears, whatever else is running.
+      // Alt-combos carry no character on Windows, so this is safe while typing.
+      if (e.altKey && !e.ctrlKey && !e.metaKey && e.key.toLowerCase() === 'w') {
+        e.preventDefault();
+        resetEntry();
+        callsignRef.current?.focus();
+        return;
+      }
       if (typing) return;
       if (selectedId !== null) {
         if (e.key === 'Delete') { e.preventDefault(); askDeleteSelected(); return; }
@@ -4126,7 +4164,7 @@ export default function App() {
       </div>
     </>
   ) : (
-    <div className="flex flex-col flex-1 min-w-[130px]"><Label className="mb-1 h-3.5">{t('field.qth')}</Label>
+    <div className="flex flex-col flex-1 min-w-[80px]"><Label className="mb-1 h-3.5">{t('field.qth')}</Label>
       <Input value={qth} onChange={(e) => { setQth(e.target.value); markEdited('qth'); }} />
     </div>
   );
@@ -4355,7 +4393,7 @@ export default function App() {
         title={catState.connected ? t('field.freqTuneHint') : undefined}
         onFocus={() => setFreqFocused(true)}
         onBlur={() => setFreqFocused(false)}
-        onKeyDown={(e) => { if (e.key === 'Enter') tuneRadioTo(freqMhz); }}
+        onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); tuneRadioTo(freqMhz); } }}
         onChange={(e) => { setFreqMhz(e.target.value); noteManualEdit(); const b = bandForMHz(parseFloat(e.target.value)); if (b) setBand(b); }}
       />
     </div>
@@ -4370,7 +4408,7 @@ export default function App() {
         title={catState.connected ? t('field.freqTuneHint') : undefined}
         onFocus={() => setFreqFocused(true)}
         onBlur={() => setFreqFocused(false)}
-        onKeyDown={(e) => { if (e.key === 'Enter') tuneRadioTo(rxFreqMhz); }}
+        onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); tuneRadioTo(rxFreqMhz); } }}
         onChange={(e) => { setRxFreqMhz(e.target.value); noteManualEdit(); const rb = bandForMHz(parseFloat(e.target.value)); if (rb) setBandRx(rb); }}
         className={cn('font-mono', catState.split && 'bg-danger-muted/40 border-danger-border focus:bg-card')}
       />
@@ -4407,7 +4445,7 @@ export default function App() {
           </Button>
         )}
         <Button type="button" size="sm" variant="outline" onClick={() => { resetEntry(); callsignRef.current?.focus(); }} className="h-8 px-2.5 text-xs"
-          title="Clear the QSO entry (always — unlike Esc which may be reserved for the CW keyer)">
+          title="Clear the QSO entry — Alt+W (always works, unlike Esc which may be reserved for the CW keyer)">
           <Eraser className="size-3.5" />
           {t('btn.clear')}
         </Button>
@@ -4452,11 +4490,14 @@ export default function App() {
         const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
         const e = spotStatus[k];
         const st = (e?.status || '') as SpotStatusKey;
-        // A previously-worked call counts as WORKED for filtering even when its
-        // entity status is still new-band/new-slot (the grid flags it WKD CALL),
-        // matching the "Hide worked" toggle. Additive: it still matches its own
-        // entity status too, so it stays visible under NEW BAND / NEW SLOT.
-        const matches = clusterStatusFilter.has(st)
+        // WORKED means "I've worked THIS callsign" — the blue WKD-CALL flag —
+        // NOT the entity status 'worked' (entity/band/mode already worked, which
+        // the grid shows as a plain "—"). So the 'worked' key is matched ONLY via
+        // worked_call below; exclude the entity status 'worked' from the generic
+        // match, or every "already-worked-entity" spot would slip through. A
+        // worked call still matches its own entity status too (new-band/new-slot),
+        // so it stays visible under those chips.
+        const matches = (st !== 'worked' && clusterStatusFilter.has(st))
           || (!!e?.worked_call && clusterStatusFilter.has('worked'))
           || (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
           || (!!e?.new_county && clusterStatusFilter.has('new-county'))
@@ -4581,7 +4622,10 @@ export default function App() {
               { k: 'new-pota'   as SpotFilterKey, label: 'NEW POTA',   cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
               { k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
               { k: 'new-pfx'    as SpotFilterKey, label: 'NEW PFX',    cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
-              // (no WORKED chip — use the "Hide worked" checkbox to drop dupes.)
+              // Blue, like the already-worked call in the grid. Selecting it keeps
+              // worked spots; the separate "Hide worked" checkbox drops them — they
+              // are opposite controls, so don't use both at once.
+              { k: 'worked'   as SpotFilterKey, label: 'WORKED',   cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
             ]).map((s) => {
               const on = clusterStatusFilter.has(s.k);
               return (
@@ -4741,6 +4785,7 @@ export default function App() {
               onExportFiltered={exportFilteredADIF}
               onDelete={(ids) => setDeletingIds(ids)}
               onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
+              onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? "") } : null)}
             />
           </div>
         );
@@ -5478,7 +5523,10 @@ export default function App() {
             {/* Row 2: Name fixed to the Band/Mode/Country column width (300px) so
                 its right edge lines up with that column below; QTH grows to fill.
                 gap-4 matches Row 3 so QTH's left edge aligns with Comment/Note. */}
-            <div className="flex gap-4 items-end">
+            {/* flex-wrap, not overflow: at the narrowest window the Grid box used
+                to be pushed outside the entry panel and clipped. Wrapping drops
+                it to its own line instead, which stays readable. */}
+            <div className="flex gap-4 items-end flex-wrap">
               <div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
                 <Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }} />
               </div>
@@ -5544,6 +5592,10 @@ export default function App() {
             band={band}
             mode={mode}
             bands={bands}
+            {...(!callsign.trim() && selQso ? {
+              slotCall: selQso.call, slotBand: selQso.band, slotMode: selQso.mode,
+              slotWb: selWb, slotWbBusy: selWbBusy,
+            } : {})}
             tab={detailTab}
             onTab={setDetailTab}
             keyerActive={(wkEnabled && wkStatus.connected) || dvkEnabled}
@@ -5994,6 +6046,7 @@ export default function App() {
                 onExportCabrilloFiltered={exportFilteredCabrillo}
                 onDelete={(ids) => setDeletingIds(ids)}
                 onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
+              onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? "") } : null)}
               />
               <div className="px-3 py-1.5 border-t border-border/60 text-[11px] text-muted-foreground flex items-center justify-between gap-3 bg-muted/30">
                 <div className="flex items-center gap-3">

frontend/src/components/AwardsPanel.tsx

@@ -211,11 +211,14 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
   // Alicante" — which reference order scatters across the whole table.
   // Remembered through writeUiPref rather than localStorage, so the choice
   // travels with a copied data/ folder like every other UI preference here.
-  const [refSort, setRefSort] = useState<'ref' | 'name'>(
-    () => (localStorage.getItem('opslog.awardRefSort') === 'name' ? 'name' : 'ref'));
+  const [refSort, setRefSort] = useState<'ref' | 'name' | 'group'>(
+    () => {
+      const v = localStorage.getItem('opslog.awardRefSort');
+      return v === 'name' || v === 'group' ? v : 'ref';
+    });
   const [refSortDir, setRefSortDir] = useState<'asc' | 'desc'>(
     () => (localStorage.getItem('opslog.awardRefSortDir') === 'desc' ? 'desc' : 'asc'));
-  const toggleRefSort = (k: 'ref' | 'name') => {
+  const toggleRefSort = (k: 'ref' | 'name' | 'group') => {
     if (k === refSort) {
       const d = refSortDir === 'asc' ? 'desc' : 'asc';
       setRefSortDir(d);
@@ -258,10 +261,26 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
         if (c !== 0) return c * dir;
         return a.ref.localeCompare(b.ref) * dir; // stable tie-break
       }
+      if (refSort === 'group') {
+        // Prefix order (XE, YV, ZL…) — how a DX operator actually thinks about
+        // entities. Blank prefixes sink to the bottom regardless of direction,
+        // so an unresolved entity never heads the list.
+        const ag = a.group ?? '', bg = b.group ?? '';
+        if (!ag !== !bg) return ag ? -1 : 1;
+        const c = ag.localeCompare(bg, undefined, { sensitivity: 'base' });
+        if (c !== 0) return c * dir;
+        return a.ref.localeCompare(b.ref, undefined, { numeric: true }) * dir;
+      }
       return a.ref.localeCompare(b.ref, undefined, { numeric: true }) * dir;
     });
   }, [current, refSearch, refFilter, modeFilter, refSort, refSortDir]);
 
+  // The group column earns its width only when the list actually carries one
+  // (DXCC prefixes, POTA locations); most custom lists have none. For DXCC the
+  // value IS the primary prefix, so it is labelled as such.
+  const hasGroup = useMemo(() => filteredRefs.some((r) => !!r.group), [filteredRefs]);
+  const groupColLabel = current && current.code.toUpperCase() === 'DXCC' ? t('awp.prefixCol') : t('awp.groupCol');
+
   return (
     <div className="flex h-full min-h-0">
       {/* Award list */}
@@ -459,6 +478,14 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
                           {refSort === 'ref' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
                         </button>
                       </th>
+                      {hasGroup && (
+                        <th className="text-left py-1.5 pr-3 font-medium border-b border-border w-20">
+                          <button type="button" onClick={() => toggleRefSort('group')} className="inline-flex items-center gap-1 hover:text-foreground">
+                            {groupColLabel}
+                            {refSort === 'group' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
+                          </button>
+                        </th>
+                      )}
                       <th className="text-left py-1.5 pr-3 font-medium border-b border-border">
                         <button type="button" onClick={() => toggleRefSort('name')} className="inline-flex items-center gap-1 hover:text-foreground">
                           {t('awp.description')}
@@ -474,9 +501,10 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
                     {filteredRefs.map((r) => (
                       <tr key={r.ref} className={cn('hover:bg-accent/20', !r.worked && 'opacity-60')}>
                         <td className="sticky left-0 bg-card hover:bg-accent/20 py-1 pr-2 font-mono font-semibold border-b border-border/30">{r.ref}</td>
-                        <td className="py-1 pr-3 text-muted-foreground truncate max-w-[360px] border-b border-border/30">
-                          {r.name}{r.group ? <span className="text-muted-foreground/60"> · {r.group}</span> : ''}
-                        </td>
+                        {hasGroup && (
+                          <td className="py-1 pr-3 font-mono font-semibold border-b border-border/30">{r.group}</td>
+                        )}
+                        <td className="py-1 pr-3 text-muted-foreground truncate max-w-[360px] border-b border-border/30">{r.name}</td>
                         {gridBands.map((b) => {
                           const s = cellStatus(r, b);
                           return (
@@ -513,7 +541,12 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
                           {refSort === 'name' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
                         </button>
                       </th>
-                      <th className="py-1.5 pr-2 font-medium w-40">{t('awp.groupCol')}</th>
+                      <th className="py-1.5 pr-2 font-medium w-40">
+                        <button type="button" onClick={() => toggleRefSort('group')} className="inline-flex items-center gap-1 hover:text-foreground">
+                          {groupColLabel}
+                          {refSort === 'group' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
+                        </button>
+                      </th>
                       <th className="py-1.5 pr-2 font-medium w-24">{t('awp.status')}</th>
                       <th className="py-1.5 font-medium">{t('awp.bands')}</th>
                     </tr>

frontend/src/components/BandMap.tsx

@@ -358,6 +358,43 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
     return () => el.removeEventListener('wheel', onWheel);
   }, [range]);
 
+  // Ctrl+↑ / Ctrl+↓ hop to the next spot above / below the rig frequency and tune
+  // to it. Higher freq is UP on the map (see freqToY), so ↑ = next higher spot.
+  // Only active on the docked Main-view map (keyNav) and ignored while typing.
+  // MUST stay ABOVE the `if (!range)` early return below: on an unknown band
+  // (e.g. a spurious 33 cm CAT reading from an Icom) that return skipped this
+  // hook, so the hook count changed between renders and React crashed with #300
+  // ("rendered fewer hooks than expected"). lo/hi are always defined (they fall
+  // back to [0,1] when there's no range), so it's safe to run here.
+  useEffect(() => {
+    if (!keyNav) return;
+    const onKey = (e: KeyboardEvent) => {
+      if (!e.ctrlKey || e.altKey || e.metaKey) return;
+      if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return;
+      const ae = document.activeElement as HTMLElement | null;
+      const tag = (ae?.tagName || '').toLowerCase();
+      if (tag === 'input' || tag === 'textarea' || tag === 'select' || ae?.isContentEditable) return;
+      const list = spots
+        .filter((s) => (s.band ?? '') === band && s.freq_hz > 0)
+        .slice()
+        .sort((a, b) => a.freq_hz - b.freq_hz);
+      if (!list.length) return;
+      const cur = currentFreqHz || (lo + hi) * 500; // mid-band kHz→Hz when no rig freq
+      const EPS = 50; // Hz, so we don't re-pick the spot we're already sitting on
+      let target: Spot | undefined;
+      if (e.key === 'ArrowUp') {
+        target = list.find((s) => s.freq_hz > cur + EPS);
+      } else {
+        for (let i = list.length - 1; i >= 0; i--) { if (list[i].freq_hz < cur - EPS) { target = list[i]; break; } }
+      }
+      if (!target) return;
+      e.preventDefault();
+      onSpotClick(target);
+    };
+    window.addEventListener('keydown', onKey);
+    return () => window.removeEventListener('keydown', onKey);
+  }, [keyNav, spots, band, currentFreqHz, lo, hi, onSpotClick]);
+
   if (!range) {
     return (
       <div className="h-full w-full flex flex-col items-center justify-center text-xs text-muted-foreground p-3 bg-muted/20">
@@ -388,38 +425,6 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
     scrollerRef.current.scrollTop = Math.max(0, y - containerH / 2);
   }
 
-  // Ctrl+↑ / Ctrl+↓ hop to the next spot above / below the rig frequency and tune
-  // to it. Higher freq is UP on the map (see freqToY), so ↑ = next higher spot.
-  // Only active on the docked Main-view map (keyNav) and ignored while typing.
-  useEffect(() => {
-    if (!keyNav) return;
-    const onKey = (e: KeyboardEvent) => {
-      if (!e.ctrlKey || e.altKey || e.metaKey) return;
-      if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return;
-      const ae = document.activeElement as HTMLElement | null;
-      const tag = (ae?.tagName || '').toLowerCase();
-      if (tag === 'input' || tag === 'textarea' || tag === 'select' || ae?.isContentEditable) return;
-      const list = spots
-        .filter((s) => (s.band ?? '') === band && s.freq_hz > 0)
-        .slice()
-        .sort((a, b) => a.freq_hz - b.freq_hz);
-      if (!list.length) return;
-      const cur = currentFreqHz || (lo + hi) * 500; // mid-band kHz→Hz when no rig freq
-      const EPS = 50; // Hz, so we don't re-pick the spot we're already sitting on
-      let target: Spot | undefined;
-      if (e.key === 'ArrowUp') {
-        target = list.find((s) => s.freq_hz > cur + EPS);
-      } else {
-        for (let i = list.length - 1; i >= 0; i--) { if (list[i].freq_hz < cur - EPS) { target = list[i]; break; } }
-      }
-      if (!target) return;
-      e.preventDefault();
-      onSpotClick(target);
-    };
-    window.addEventListener('keydown', onKey);
-    return () => window.removeEventListener('keydown', onKey);
-  }, [keyNav, spots, band, currentFreqHz, lo, hi, onSpotClick]);
-
   const currentKHz = currentFreqHz ? currentFreqHz / 1000 : 0;
   const showRigPointer = currentKHz >= lo && currentKHz <= hi;
   const rigY = freqToY(currentKHz);

frontend/src/components/BandSlotGrid.tsx

@@ -1,8 +1,9 @@
-import { useMemo } from 'react';
-import { Star, Radio, Sunrise, Sunset } from 'lucide-react';
+import { useEffect, useMemo, useState } from 'react';
+import { Star, Radio, Sunrise, Sunset, X, Loader2 } from 'lucide-react';
 import { Badge } from '@/components/ui/badge';
 import { cn } from '@/lib/utils';
 import { sunTimes } from '@/lib/sun';
+import { BandSlotQSOs } from '../../wailsjs/go/main/App';
 import type { WorkedBeforeView } from '@/types';
 
 type WorkedBefore = WorkedBeforeView;
@@ -18,6 +19,9 @@ interface Props {
   // to an entity with no position at all, and the block simply does not appear.
   lat?: number;
   lon?: number;
+  // Set when the matrix is showing a QSO picked in the log grid rather than the
+  // entry form — labelled so the two can never be confused.
+  forCall?: string;
 }
 
 // Compact column label for a band tag: keep the classic V/U for 2m/70cm,
@@ -89,7 +93,9 @@ function cellTitle(band: string, cls: string, status: string, current: boolean):
   return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
 }
 
-export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon }: Props) {
+export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon, forCall }: Props) {
+  // Cell drill-down: which band+class the operator clicked, or null.
+  const [slot, setSlot] = useState<{ band: string; cls: string } | null>(null);
   // Columns from the operator's configured bands (so the matrix shows only the
   // bands they actually use), falling back to the built-in default set.
   const cols = useMemo(
@@ -208,6 +214,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
           </>
         ) : hasDxcc ? (
           <>
+            {/* Says WHOSE stats these are when they come from a row picked in
+                the log rather than from what's being typed. */}
+            {forCall && (
+              <Badge variant="outline" className="px-2 py-0.5 text-[10px] font-mono shrink-0"
+                title="Stats for the QSO selected in the log">
+                {forCall}
+              </Badge>
+            )}
             <Badge className="bg-primary text-primary-foreground px-3 py-1 text-xs normal-case font-semibold tracking-normal">
               {dxccName || `DXCC #${dxcc}`}
             </Badge>
@@ -282,10 +296,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
                   return (
                     <td
                       key={b.tag}
-                      title={cellTitle(b.tag, cls, st, isCurrent)}
+                      title={cellTitle(b.tag, cls, st, isCurrent) + (st ? ' — click to list the QSOs' : '')}
+                      onClick={st ? () => setSlot({ band: b.tag, cls }) : undefined}
                       className={cn(
                         'w-[28px] h-[24px] rounded transition-colors p-0',
                         st ? STATUS_CLASSES[st] : 'bg-mx-none',
+                        // Only a filled cell has anything to show — an empty one
+                        // stays inert rather than opening a "no QSOs" dialog.
+                        st && 'cursor-pointer hover:brightness-110',
                         isCurrent && 'ring-2 ring-warning ring-inset',
                       )}
                     />
@@ -313,6 +331,107 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
         ))}
       </div>
       </div>
+
+      {slot && (
+        <SlotQSOModal
+          call={wb?.callsign ?? ''}
+          dxcc={dxcc}
+          entity={dxccName}
+          band={slot.band}
+          cls={slot.cls}
+          onClose={() => setSlot(null)}
+        />
+      )}
     </section>
   );
 }
+
+// ── Cell drill-down ──────────────────────────────────────────────────────────
+// The contacts behind one band+class cell: this exact callsign AND anyone else
+// in the entity, because that is the pair of facts the cell's colour encodes.
+// The call's own QSOs are marked so the two never blur together.
+
+function SlotQSOModal({ call, dxcc, entity, band, cls, onClose }: {
+  call: string; dxcc: number; entity: string; band: string; cls: string; onClose: () => void;
+}) {
+  const [rows, setRows] = useState<any[] | null>(null);
+  const [err, setErr] = useState('');
+
+  useEffect(() => {
+    let dead = false;
+    BandSlotQSOs(call, dxcc, band, cls)
+      .then((r: any) => { if (!dead) setRows((r ?? []) as any[]); })
+      .catch((e: any) => { if (!dead) { setErr(String(e?.message ?? e)); setRows([]); } });
+    return () => { dead = true; };
+  }, [call, dxcc, band, cls]);
+
+  useEffect(() => {
+    // Capture phase: the app's global ESC handler resets the entry form, and
+    // closing a dialog must not also wipe what the operator was typing.
+    function onKey(e: KeyboardEvent) {
+      if (e.key === 'Escape') { e.stopImmediatePropagation(); e.preventDefault(); onClose(); }
+    }
+    window.addEventListener('keydown', onKey, true);
+    return () => window.removeEventListener('keydown', onKey, true);
+  }, [onClose]);
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50" onClick={onClose}>
+      <div className="bg-card border border-border rounded-lg shadow-xl w-[720px] max-w-[92vw] max-h-[70vh] flex flex-col"
+        onClick={(e) => e.stopPropagation()}>
+        <div className="flex items-center gap-2 px-3 py-2 border-b border-border">
+          <span className="font-semibold text-sm">
+            {band} · {cls}
+            {entity && <span className="text-muted-foreground font-normal"> — {entity}</span>}
+          </span>
+          <span className="ml-auto text-xs text-muted-foreground tabular-nums">
+            {rows ? `${rows.length} QSO` : ''}
+          </span>
+          <button type="button" onClick={onClose} className="text-muted-foreground hover:text-foreground">
+            <X className="size-4" />
+          </button>
+        </div>
+        <div className="flex-1 overflow-auto">
+          {err && <p className="p-3 text-xs text-destructive">{err}</p>}
+          {!rows ? (
+            <p className="p-4 text-xs text-muted-foreground flex items-center gap-2">
+              <Loader2 className="size-3.5 animate-spin" /> Loading…
+            </p>
+          ) : rows.length === 0 ? (
+            <p className="p-4 text-xs text-muted-foreground italic">No QSOs.</p>
+          ) : (
+            <table className="w-full text-xs">
+              <thead className="sticky top-0 bg-muted/60 backdrop-blur text-muted-foreground">
+                <tr>
+                  <th className="text-left font-medium px-2 py-1">Date UTC</th>
+                  <th className="text-left font-medium px-2 py-1">Callsign</th>
+                  <th className="text-left font-medium px-2 py-1">Mode</th>
+                  <th className="text-left font-medium px-2 py-1">Freq</th>
+                  <th className="text-left font-medium px-2 py-1">Name</th>
+                  <th className="text-left font-medium px-2 py-1">Cfm</th>
+                </tr>
+              </thead>
+              <tbody>
+                {rows.map((q, i) => {
+                  const cfm = q.lotw_rcvd === 'Y' || q.eqsl_rcvd === 'Y' || q.qsl_rcvd === 'Y';
+                  return (
+                    <tr key={q.id ?? i} className="border-t border-border/40">
+                      <td className="px-2 py-1 tabular-nums text-muted-foreground whitespace-nowrap">
+                        {String(q.qso_date ?? '').slice(0, 16).replace('T', ' ')}
+                      </td>
+                      <td className={cn('px-2 py-1 font-mono', q.callsign === call && 'font-bold text-primary')}>{q.callsign}</td>
+                      <td className="px-2 py-1">{q.mode}</td>
+                      <td className="px-2 py-1 tabular-nums text-muted-foreground">{q.freq_hz ? (q.freq_hz / 1e6).toFixed(3) : ''}</td>
+                      <td className="px-2 py-1 text-muted-foreground truncate max-w-[160px]">{q.name}</td>
+                      <td className="px-2 py-1">{cfm ? <span className="text-success">✓</span> : ''}</td>
+                    </tr>
+                  );
+                })}
+              </tbody>
+            </table>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/ClusterGrid.tsx

@@ -140,6 +140,19 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
   }
 }
 
+// isDull reports a spot that "represents nothing" under the current worked/slot
+// rules: the entity/band/mode is already worked (status resolved, not new in any
+// dimension), the callsign itself isn't in the log, and there's no POTA / county
+// / prefix novelty. Such rows are dimmed so the eye skips them. Because the
+// status obeys the DX-cluster "same slot" option and the digital-mode grouping,
+// what counts as dull follows those settings automatically. Unresolved statuses
+// (still loading, or entity unknown) are NOT dimmed — that would flicker.
+function isDull(s: SpotStatusEntry | undefined): boolean {
+  if (!s || !s.status) return false;
+  if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot') return false;
+  return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx);
+}
+
 const makeColCatalog = (t: TFn): ColEntry[] => [
   {
     group: 'Spot', label: t('clg2.c.time'),  colId: 'time',
@@ -410,7 +423,9 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
   // won't re-render those cells on its own — force a refresh so e.g. a worked call
   // turns blue once its status loads.
   useEffect(() => {
-    gridRef.current?.api?.refreshCells({ force: true });
+    // redrawRows (not refreshCells) so getRowStyle re-runs too — the whole-row
+    // dimming of "represents nothing" spots depends on the status that lands here.
+    gridRef.current?.api?.redrawRows();
   }, [spotStatus]);
 
   // Restore AFTER the profile scope is known — this grid has no key= remount to
@@ -496,6 +511,7 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
             onColumnVisible={saveColumnState}
             onSortChanged={saveColumnState}
             onRowClicked={handleRowClicked}
+            getRowStyle={(p: any) => (isDull(statusFor(p)) ? { opacity: 0.4 } : undefined)}
             animateRows={false}
             suppressCellFocus
             getRowId={(p) => `${(p.data as any).received_at}-${(p.data as any).dx_call}-${(p.data as any).source_id}`}

frontend/src/components/DetailsPanel.tsx

@@ -69,6 +69,14 @@ interface Props {
   band: string;
   mode: string;
   bands?: string[]; // configured bands for the worked-before matrix columns
+  // When the entry form is empty and a QSO is selected in the log grid, the
+  // Stats (F1) matrix shows THAT contact's entity instead of sitting blank.
+  // Only the matrix is redirected — every other tab still edits the live entry.
+  slotCall?: string;
+  slotBand?: string;
+  slotMode?: string;
+  slotWb?: any;
+  slotWbBusy?: boolean;
   imageUrl?: string;
   onOpenImage?: () => void;
   // Optional controlled active tab (so the app can switch it via keyboard).
@@ -139,7 +147,7 @@ function Field({ label, span = 1, className, children }: { label: string; span?:
   );
 }
 
-export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, tab, onTab, keyerActive }: Props) {
+export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, slotCall, slotBand, slotMode, slotWb, slotWbBusy, tab, onTab, keyerActive }: Props) {
   const { t } = useI18n();
   const [internalOpen, setInternalOpen] = useState<TabName>('stats');
   const open = tab ?? internalOpen; // controlled when `tab` is provided
@@ -272,7 +280,14 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
       <div className={cn('flex-1 min-h-0', open === 'stats' ? 'overflow-hidden' : 'overflow-y-auto')}>
       {open === 'stats' && (
         <div className="px-3 py-2.5">
-          <BandSlotGrid wb={wb} busy={!!wbBusy} currentBand={band} currentMode={mode} bands={bands} hasCall={callsign.trim() !== ''}
+          <BandSlotGrid
+            wb={slotCall ? slotWb : wb}
+            busy={slotCall ? !!slotWbBusy : !!wbBusy}
+            currentBand={slotCall ? (slotBand ?? '') : band}
+            currentMode={slotCall ? (slotMode ?? '') : mode}
+            bands={bands}
+            hasCall={slotCall ? true : callsign.trim() !== ''}
+            forCall={slotCall}
             lat={dxLL?.lat} lon={dxLL?.lon} />
         </div>
       )}

frontend/src/components/LogViewer.tsx

@@ -21,7 +21,13 @@ import { TailLogFile, GetLogFilePath } from '../../wailsjs/go/main/App';
 //     256 KB blob: with "cluster" or "acom" typed in, the window becomes exactly
 //     the subsystem trace you would have grepped for.
 //   • It polls only while open. A closed dialog costs nothing.
-const TAIL_BYTES = 256 * 1024;
+// 512 KB ≈ 3200 lines. The window is a sliding tail: once new lines push past it
+// the oldest fall out of the fetched text entirely, so a small buffer dropped
+// lines the operator was still reading during a busy trace (CAT/cluster/antenna
+// polling). This is double the old 256 KB — 1 MB was tried but the per-second
+// fetch + split + re-render of ~6500 lines made the window lag. 512 KB keeps a
+// useful backlog while staying smooth. The backend caps this at 4 MB.
+const TAIL_BYTES = 512 * 1024;
 const POLL_MS = 1000;
 
 export function LogViewer({ open, onOpenChange }: { open: boolean; onOpenChange: (v: boolean) => void }) {

frontend/src/components/RecentQSOsGrid.tsx

@@ -56,6 +56,10 @@ type Props = {
   onRowDoubleClicked?: (q: QSOForm) => void;
   onRowClicked?: (q: QSOForm) => void;
   onRowSelected?: (ids: number[]) => void;
+  // The full first selected row — the Stats (F1) panel shows its entity when the
+  // entry form is empty, so browsing the log answers "what have I got with this
+  // one?" without retyping the call.
+  onRowSelectedQso?: (row: QSOForm | null) => void;
   onUpdateFromCty?: (ids: number[]) => void;
   onUpdateFromQRZ?: (ids: number[]) => void;
   onUpdateFromClublog?: (ids: number[]) => void;
@@ -283,7 +287,7 @@ export const groupLabel = (t: TFn, g: string): string => t(GRP_KEYS[g] ?? g);
 const stripAwardCols = (st: any[] | null | undefined): any[] =>
   (st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_'));
 
-export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
+export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
   const { t } = useI18n();
   const gridRef = useRef<any>(null);
   const [pickerOpen, setPickerOpen] = useState(false);
@@ -542,6 +546,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
     setSelCount(sel.length);
     setDispCount(api?.getDisplayedRowCount?.() ?? 0);
     onRowSelected?.(sel.map((r) => r.id as number).filter((id) => id != null));
+    onRowSelectedQso?.(sel[0] ?? null);
   }
   // Select every row when the caller bumps selectAllSignal (QSL Manager search).
   useEffect(() => {

frontend/src/components/SettingsModal.tsx

@@ -1246,6 +1246,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
   const [startEqEnd, setStartEqEnd] = useState(() => localStorage.getItem('opslog.startEqualsEnd') === '1');
   const [lookupOnBlur, setLookupOnBlur] = useState(() => localStorage.getItem('opslog.lookupOnBlur') === '1');
   const [groupDigital, setGroupDigital] = useState(() => localStorage.getItem('opslog.groupDigitalSlots') === '1');
+  const [clusterWorkedSameSlot, setClusterWorkedSameSlot] = useState(() => localStorage.getItem('opslog.clusterWorkedSameSlot') === '1');
   const [showQsoRate, setShowQsoRate] = useState(() => localStorage.getItem('opslog.showQsoRate') === '1');
   const [catModeBeforeFreq, setCatModeBeforeFreq] = useState(() => localStorage.getItem('opslog.catModeBeforeFreq') === '1');
   // Password-encryption (secret vault) state.
@@ -2595,9 +2596,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
                 <label className="flex items-center gap-2 text-sm cursor-pointer">
                   <Checkbox checked={civTrace} onCheckedChange={(c) => { setCivTrace(!!c); SetCIVTrace(!!c); }} />
                   {t('cat.civTrace')}
-                </label>
-                <p className="text-[10px] text-muted-foreground mt-1">{t('cat.civTraceHint')}</p>
-              </div>
+                </label>              </div>
             )}
             {catCfg.backend === 'kenwood' && (
             <>
@@ -2613,9 +2612,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
                   </Select>
                   <Button type="button" variant="outline" size="sm"
                     onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>↻</Button>
-                </div>
-                <span className="text-xs text-muted-foreground">{t('cat.kenwoodPortHint')}</span>
-              </div>
+                </div>              </div>
               <div className="space-y-1">
                 <Label>{t('cat.baud')}</Label>
                 <Select value={String(catCfg.kenwood_baud || 9600)} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_baud: parseInt(v) || 9600 }))}>
@@ -2623,18 +2620,14 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
                   <SelectContent>
                     {[4800, 9600, 19200, 38400, 57600, 115200].map((r) => <SelectItem key={r} value={String(r)}>{r}</SelectItem>)}
                   </SelectContent>
-                </Select>
-                <span className="text-xs text-muted-foreground">{t('cat.kenwoodBaudHint')}</span>
-              </div>
+                </Select>              </div>
               <div className="space-y-1">
                 <Label>{t('cat.kenwoodHost')}</Label>
                 <Input
                   value={catCfg.kenwood_host || ''}
                   placeholder="192.168.1.50:4532"
                   onChange={(e) => setCatCfg((s) => ({ ...s, kenwood_host: e.target.value }))}
-                />
-                <span className="text-xs text-muted-foreground">{t('cat.kenwoodHostHint')}</span>
-              </div>
+                />              </div>
               <div className="space-y-1">
                 <label className="flex items-center gap-2 text-xs cursor-pointer">
                   <Checkbox checked={!!catCfg.kenwood_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, kenwood_low_lines: !!c }))} />
@@ -2651,9 +2644,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
                     <SelectItem value="data">{t('cat.kwDataMd6')}</SelectItem>
                     <SelectItem value="keep">{t('cat.kwDataKeep')}</SelectItem>
                   </SelectContent>
-                </Select>
-                <span className="text-xs text-muted-foreground">{t('cat.kwDataHint')}</span>
-              </div>
+                </Select>              </div>
             </>
             )}
             {catCfg.backend === 'icom' && (
@@ -2867,9 +2858,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
                     onCheckedChange={(c) => setCatCfg((s) => ({ ...s, ptt_hotkey_toggle: !!c } as any))}
                   />
                   {t('cat.pttKeyToggle')}
-                </label>
-                <p className="text-[11px] text-muted-foreground">{t('cat.pttKeyHint')}</p>
-              </>
+                </label>              </>
             )}
           </div>
           {catCfg.backend === 'omnirig' && (
@@ -4012,6 +4001,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
             <span className="font-mono">dx.maritimecontestclub.net:7300</span>,{' '}
             <span className="font-mono">w8avi.net:7300</span>.
           </p>
+          <label className="flex items-start gap-2 text-sm cursor-pointer border-t border-border/60 pt-3">
+            <Checkbox checked={clusterWorkedSameSlot} className="mt-0.5"
+              onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
+            <span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
+          </label>
         </div>
 
         {editingServer && (

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.23.5';
+export const APP_VERSION = '0.23.6';
 
 // Author / credits, shown in Help -> About.
 export const APP_AUTHOR = 'F4BPO';

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

@@ -87,6 +87,8 @@ export function AwardsFolder():Promise<string>;
 
 export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
 
+export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
+
 export function BrowseExecutable():Promise<string>;
 
 export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Promise<number>;

frontend/wailsjs/go/main/App.js

@@ -122,6 +122,10 @@ export function BackfillUSCounties() {
   return window['go']['main']['App']['BackfillUSCounties']();
 }
 
+export function BandSlotQSOs(arg1, arg2, arg3, arg4) {
+  return window['go']['main']['App']['BandSlotQSOs'](arg1, arg2, arg3, arg4);
+}
+
 export function BrowseExecutable() {
   return window['go']['main']['App']['BrowseExecutable']();
 }

internal/dxcc/manager.go

@@ -173,6 +173,39 @@ func (m *Manager) EntityNames() []string {
 	return out
 }
 
+// PrefixByDXCC maps ADIF DXCC entity number → canonical primary prefix (F, DL,
+// XE…) from the loaded cty.dat. cty.dat is keyed by entity NAME, so the join
+// goes through EntityDXCC; entries whose name doesn't resolve are skipped
+// rather than guessed. Empty until cty.dat has loaded.
+func (m *Manager) PrefixByDXCC() map[int]string {
+	m.mu.RLock()
+	db := m.db
+	m.mu.RUnlock()
+	if db == nil {
+		return nil
+	}
+	out := make(map[int]string, 400)
+	for _, e := range db.Entities() {
+		p := strings.TrimSpace(e.Primary)
+		if p == "" {
+			continue
+		}
+		// cty.dat marks non-DXCC sub-entities with a leading '*' — they report
+		// under a parent entity and must not overwrite the parent's prefix.
+		if strings.HasPrefix(p, "*") {
+			continue
+		}
+		if n := EntityDXCC(e.Name); n > 0 {
+			if _, dup := out[n]; !dup {
+				// DXCC prefixes are conventionally upper-case; cty.dat spells some
+				// sub-entity suffixes in lower case (3D2/c → 3D2/C).
+				out[n] = strings.ToUpper(p)
+			}
+		}
+	}
+	return out
+}
+
 // Info returns metadata about the currently-loaded cty.dat (or zero value
 // if nothing loaded).
 func (m *Manager) Info() ctySource {

internal/qso/qso.go

@@ -1461,6 +1461,51 @@ func (r *Repo) IterateByIDs(ctx context.Context, ids []int64, fn func(QSO) error
 	return rows.Err()
 }
 
+// BandSlotQSOs returns every contact on one band that belongs to a slot of the
+// entry matrix: the exact callsign, or any callsign in the same DXCC entity.
+// Mode is NOT filtered here — the class (phone / CW / digital) is a derived
+// notion the caller owns, so it filters the (small) band-scoped result itself.
+//
+// The DXCC arm matches the stored dxcc column only. A QSO logged before the
+// entity was resolved has a NULL there and is genuinely unattributed; guessing
+// it back from the callsign here would disagree with the matrix above, which is
+// built from the same column.
+func (r *Repo) BandSlotQSOs(ctx context.Context, callsign string, dxccNum int, band string) ([]QSO, error) {
+	call := upperTrim(callsign)
+	b := strings.TrimSpace(band)
+	if b == "" || (call == "" && dxccNum <= 0) {
+		return []QSO{}, nil
+	}
+	where := "band = ?"
+	args := []any{b}
+	switch {
+	case call != "" && dxccNum > 0:
+		where += " AND (callsign = ? OR dxcc = ?)"
+		args = append(args, call, dxccNum)
+	case call != "":
+		where += " AND callsign = ?"
+		args = append(args, call)
+	default:
+		where += " AND dxcc = ?"
+		args = append(args, dxccNum)
+	}
+	rows, err := r.db.QueryContext(ctx,
+		`SELECT `+selectCols+` FROM qso WHERE `+where+` ORDER BY qso_date DESC, id DESC LIMIT 500`, args...)
+	if err != nil {
+		return nil, fmt.Errorf("query band slot: %w", err)
+	}
+	defer rows.Close()
+	out := []QSO{}
+	for rows.Next() {
+		q, err := scanQSO(rows)
+		if err != nil {
+			return nil, err
+		}
+		out = append(out, q)
+	}
+	return out, rows.Err()
+}
+
 // WorkedBefore summarises prior contacts at two granularities:
 //   - by exact callsign  → shown as "this call worked N×"
 //   - by DXCC entity     → drives NEW ONE / NEW BAND / NEW MODE / NEW SLOT
@@ -2118,6 +2163,36 @@ func (r *Repo) WorkedCallBandModeKeys(ctx context.Context) (map[string]struct{},
 	return out, rows.Err()
 }
 
+// WorkedCallSlotKeys backs the cluster "already worked only on the same slot"
+// option. It returns each worked slot keyed BOTH as "CALL|band" (mode-agnostic,
+// for a spot whose mode couldn't be inferred) and "CALL|band|MODE" with the mode
+// run through normMode — so when digital grouping is on, FT8/FT4/RTTY fold into
+// one "DIG" and a call worked on 20m FT8 also matches a 20m FT4 spot. Call is
+// upper-cased and band lower-cased to match the spot keys ClusterSpotStatuses
+// builds. normMode may be nil (no grouping).
+func (r *Repo) WorkedCallSlotKeys(ctx context.Context, normMode func(string) string) (map[string]struct{}, error) {
+	rows, err := r.db.QueryContext(ctx,
+		`SELECT upper(callsign), lower(band), upper(mode) FROM qso
+		 WHERE callsign != '' AND band IS NOT NULL AND band != '' AND mode IS NOT NULL AND mode != ''`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := make(map[string]struct{}, 4096)
+	for rows.Next() {
+		var c, b, m string
+		if err := rows.Scan(&c, &b, &m); err != nil {
+			return nil, err
+		}
+		if normMode != nil {
+			m = normMode(m)
+		}
+		out[c+"|"+b] = struct{}{}
+		out[c+"|"+b+"|"+m] = struct{}{}
+	}
+	return out, rows.Err()
+}
+
 // WorkedPOTARefs returns the set of POTA park references already worked
 // (upper-cased). A QSO's pota_ref may hold several comma-separated parks
 // (an n-fer); each is added separately.

internal/rigctld/rigctld.go

@@ -36,6 +36,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 )
 
@@ -60,27 +61,14 @@ type Server struct {
 	conns  map[net.Conn]struct{}
 	closed bool
 
-	// Optimistic frequency echo. A sharing client that follows our dial by
-	// polling get_freq (WSJT-X / JTDX in "Fake It" split) shifts the frequency on
-	// TX and restores it on RX. Freq() is the last value POLLED from the rig, and
-	// it lags a set_freq by up to a poll cycle (~100-200 ms). In that window the
-	// client — no longer transmitting — reads back the still-shifted frequency,
-	// mistakes it for a manual QSY and adopts it, so every over creeps the dial by
-	// the shift amount and it never comes back. Echoing the last commanded
-	// frequency until the rig confirms it (or a short deadline passes) closes the
-	// window: the client always reads exactly what it just set.
-	echoMu   sync.Mutex
-	echoHz   int64
-	echoAt   time.Time
-	echoWant bool
+	// ptt mirrors the last PTT state a client commanded via set_ptt. WSJT-X/JTDX
+	// poll get_ptt DURING transmit to confirm the rig is keyed; if get_ptt reads
+	// RX they conclude PTT failed and abort the over after a second or two. We
+	// don't read PTT back from every backend, so echo what the client last set —
+	// always consistent with its own command, and enough to satisfy the check.
+	ptt atomic.Bool
 }
 
-// freqEchoTTL caps how long a commanded frequency is echoed when the rig never
-// reports it back (e.g. it rounded to a coarser step). Long enough to cover a
-// poll cycle with margin, short enough that a genuine knob turn during the
-// window surfaces quickly.
-const freqEchoTTL = 2 * time.Second
-
 func New(port int, rig Rig, logf func(string, ...any)) *Server {
 	if port <= 0 || port > 65535 {
 		port = 4532 // the rigctld default every client pre-fills
@@ -213,7 +201,7 @@ func (s *Server) handle(line string) (resp string, quit bool) {
 		return "", true
 
 	case "f", "\\get_freq":
-		return fmt.Sprintf("%d\n", s.reportedFreq()), false
+		return fmt.Sprintf("%d\n", s.rig.Freq()), false
 	case "F", "\\set_freq":
 		if len(args) < 1 {
 			return rprt(-1), false
@@ -230,7 +218,6 @@ func (s *Server) handle(line string) (resp string, quit bool) {
 			s.log("rigctld: set_freq %d failed: %v", hz, err)
 			return rprt(-9), false
 		}
-		s.noteSetFreq(hz)
 		return rprt(0), false
 
 	case "m", "\\get_mode":
@@ -249,10 +236,12 @@ func (s *Server) handle(line string) (resp string, quit bool) {
 		return rprt(0), false
 
 	case "t", "\\get_ptt":
-		// We do not read PTT back from every backend, and answering "transmitting"
-		// wrongly would make a client hold off for ever. Reporting RX is the safe
-		// direction: the worst case is a client that transmits when we said it
-		// could, which is what it was going to do anyway.
+		// Echo the last commanded PTT state. WSJT-X/JTDX poll this WHILE
+		// transmitting to confirm the rig is keyed; answering a blanket "0" (RX)
+		// made them decide PTT had failed and abort the over after ~1-2 s.
+		if s.ptt.Load() {
+			return "1\n", false
+		}
 		return "0\n", false
 	case "T", "\\set_ptt":
 		if len(args) < 1 {
@@ -263,6 +252,7 @@ func (s *Server) handle(line string) (resp string, quit bool) {
 			s.log("rigctld: set_ptt %v failed: %v", on, err)
 			return rprt(-9), false
 		}
+		s.ptt.Store(on)
 		return rprt(0), false
 
 	case "v", "\\get_vfo":
@@ -284,7 +274,7 @@ func (s *Server) handle(line string) (resp string, quit bool) {
 	case "i", "\\get_split_freq":
 		_, tx := s.rig.Split()
 		if tx <= 0 {
-			tx = s.reportedFreq()
+			tx = s.rig.Freq()
 		}
 		return fmt.Sprintf("%d\n", tx), false
 	case "I", "\\set_split_freq":
@@ -300,30 +290,6 @@ func (s *Server) handle(line string) (resp string, quit bool) {
 
 func rprt(code int) string { return fmt.Sprintf("RPRT %d\n", code) }
 
-// noteSetFreq records a frequency a client just commanded, so the next reads
-// echo it back until the rig confirms the tune.
-func (s *Server) noteSetFreq(hz int64) {
-	s.echoMu.Lock()
-	s.echoHz, s.echoAt, s.echoWant = hz, time.Now(), true
-	s.echoMu.Unlock()
-}
-
-// reportedFreq is what get_freq answers: the last commanded frequency while the
-// rig is still catching up to it, otherwise the live polled value. See echoWant.
-func (s *Server) reportedFreq() int64 {
-	live := s.rig.Freq()
-	s.echoMu.Lock()
-	defer s.echoMu.Unlock()
-	if s.echoWant {
-		if live == s.echoHz || time.Since(s.echoAt) > freqEchoTTL {
-			s.echoWant = false // rig confirmed the tune, or we waited long enough
-			return live
-		}
-		return s.echoHz
-	}
-	return live
-}
-
 // stripVFOArg drops a leading VFO name from a command's arguments.
 //
 // Hamlib has two dialects. In the plain one a client sends "F 14074000"; in VFO

internal/rigctld/rigctld_test.go

@@ -20,7 +20,6 @@ type fakeRig struct {
 	setFreqs []int64
 	setModes []string
 	failSet  bool
-	lagSet   bool // record the command but do not move freq — simulate poll lag
 }
 
 func (f *fakeRig) Freq() int64          { f.mu.Lock(); defer f.mu.Unlock(); return f.freq }
@@ -32,10 +31,8 @@ func (f *fakeRig) SetFreq(hz int64) error {
 	if f.failSet {
 		return fmt.Errorf("rig refused")
 	}
+	f.freq = hz
 	f.setFreqs = append(f.setFreqs, hz)
-	if !f.lagSet {
-		f.freq = hz
-	}
 	return nil
 }
 func (f *fakeRig) SetMode(m string) error {
@@ -141,57 +138,25 @@ func TestHandleReportsBackendFailure(t *testing.T) {
 	}
 }
 
-// The FT8 "Fake It" drift. JTDX/WSJT-X shift the dial down on TX and restore it
-// on RX, and they follow the dial by polling get_freq. Our Freq() is the last
-// POLLED value and lags a set_freq by a poll cycle, so right after the restore
-// the client used to read the still-shifted frequency, take it for a manual QSY
-// and adopt it — the dial crept down every over and never came back. get_freq
-// now echoes the last commanded frequency until the rig confirms it.
-func TestFakeItSplitDoesNotDriftTheDial(t *testing.T) {
-	// lagSet: SetFreq only records the command; we drive the poll catch-up by hand
-	// to land inside the exact window the drift lived in.
-	rig := &fakeRig{freq: 14074000, lagSet: true}
-	s := New(0, rig, nil)
-
-	if got, _ := s.handle("f"); got != "14074000\n" {
-		t.Fatalf("baseline get_freq = %q, want 14074000", got)
+// get_ptt must echo the last commanded PTT state. WSJT-X/JTDX poll get_ptt while
+// transmitting to confirm the rig is keyed; a blanket "0" made them decide PTT
+// had failed and abort the over after a second or two.
+func TestGetPTTEchoesSetPTT(t *testing.T) {
+	s := New(0, &fakeRig{}, nil)
+	if got, _ := s.handle("t"); got != "0\n" {
+		t.Fatalf("initial get_ptt = %q, want 0", got)
 	}
-	setFreq := func(hz int64) { rig.mu.Lock(); rig.freq = hz; rig.mu.Unlock() }
-
-	for cycle := 0; cycle < 5; cycle++ {
-		// TX: the client shifts the dial down for the over.
-		if got, _ := s.handle("F 14073500"); got != "RPRT 0\n" {
-			t.Fatalf("cycle %d TX set_freq = %q", cycle, got)
-		}
-		// Mid-TX, before the rig reports the move, the client reads back exactly
-		// what it commanded — not the stale 14074000.
-		if got, _ := s.handle("f"); got != "14073500\n" {
-			t.Fatalf("cycle %d TX get_freq = %q, want commanded 14073500", cycle, got)
-		}
-		setFreq(14073500) // poll catches up to the shifted dial
-
-		// RX: the client restores the dial.
-		if got, _ := s.handle("F 14074000"); got != "RPRT 0\n" {
-			t.Fatalf("cycle %d RX set_freq = %q", cycle, got)
-		}
-		// The rig has not yet reported the restore (still 14073500). Before the fix
-		// this returned 14073500 and JTDX adopted it — the cumulative drift. Now it
-		// echoes the restore, so the dial holds.
-		if got, _ := s.handle("f"); got != "14074000\n" {
-			t.Fatalf("cycle %d RX get_freq = %q, want restored 14074000 — dial drifted", cycle, got)
-		}
-		setFreq(14074000) // poll catches up to the restored dial
+	if got, _ := s.handle("T 1"); got != "RPRT 0\n" {
+		t.Fatalf("set_ptt 1 = %q, want RPRT 0", got)
 	}
-
-	// Once a poll confirms the commanded dial, the echo is released (in the field
-	// the client polls continuously, so this happens within a cycle).
-	if got, _ := s.handle("f"); got != "14074000\n" {
-		t.Fatalf("confirming get_freq = %q, want 14074000", got)
+	if got, _ := s.handle("t"); got != "1\n" {
+		t.Fatalf("get_ptt after T 1 = %q, want 1 — client would abort TX", got)
 	}
-	// A genuine knob turn now surfaces at once.
-	setFreq(14075000)
-	if got, _ := s.handle("f"); got != "14075000\n" {
-		t.Errorf("manual QSY get_freq = %q, want 14075000 — echo hid a real move", got)
+	if got, _ := s.handle("T 0"); got != "RPRT 0\n" {
+		t.Fatalf("set_ptt 0 = %q, want RPRT 0", got)
+	}
+	if got, _ := s.handle("t"); got != "0\n" {
+		t.Fatalf("get_ptt after T 0 = %q, want 0", got)
 	}
 }
 

internal/spe/spe.go

@@ -228,6 +228,18 @@ func (c *Client) PowerOn() error {
 func (c *Client) PowerOff() error {
 	err := c.sendCmd(cmdOff)
 	applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
+	// Drop the link and mark the amp offline at once, exactly as a fresh start
+	// would see it. The amp stops answering its UART once off, but the connection
+	// that was already open BEFORE the off keystroke kept reading as "connected"
+	// (stale/queued frames), so the UI never showed OFF and PowerOn — which only
+	// wakes a DISCONNECTED amp — did nothing until the operator restarted OpsLog.
+	// The poll loop reopens the port on its next tick; a plain reopen never wakes a
+	// switched-off amp (only PowerOn's RTS/DTR edge does), so it stays offline.
+	time.Sleep(100 * time.Millisecond) // let the 6-byte OFF command flush before we close
+	c.mu.Lock()
+	c.dropLocked()
+	c.mu.Unlock()
+	c.setErr(fmt.Errorf("switched off"))
 	return err
 }
 

internal/ultrabeam/ultrabeam.go

@@ -88,8 +88,22 @@ type Client struct {
 	// yet (Frequency==0) — otherwise the deadband is bypassed and every small QSY
 	// re-tunes the motors.
 	lastSetKHz int
+
+	// moveCmdAt is when a move (frequency or direction) was last COMMANDED. The
+	// status poll runs every couple of seconds, so without this the "moving" flag
+	// — which drives the UI indicator and the Flex TX-inhibit — appeared up to a
+	// poll late even though the elements start moving at once. GetStatus reports
+	// motion during a short window after a command so both react immediately.
+	moveCmdAt time.Time
 }
 
+// ubMoveOptimisticWindow is how long after a commanded move GetStatus reports
+// "moving" before the status poll has had a chance to read the real motor state.
+// It only needs to bridge one poll interval; once a poll sees real motion, that
+// takes over. Bounded, so if the antenna never reports motion the flag still
+// clears rather than latching the TX-inhibit on for ever.
+const ubMoveOptimisticWindow = 3 * time.Second
+
 // LastSetKHz returns the frequency (kHz) most recently commanded to the antenna,
 // or 0 if none yet.
 func (c *Client) LastSetKHz() int {
@@ -270,7 +284,19 @@ func (c *Client) GetStatus() (*Status, error) {
 		return &Status{Connected: false}, nil
 	}
 
-	return c.lastStatus, nil
+	// Copy so the optimistic-motion tweak below never mutates the cached status
+	// the poll goroutine owns.
+	st := *c.lastStatus
+	// Optimistic motion: right after a commanded move, report "moving" until a
+	// status poll can read the real motor state (~one poll interval). The elements
+	// start moving the instant the operator clicks a band/pattern, so this makes
+	// the UI indicator and the Flex TX-inhibit react immediately instead of a poll
+	// later. Real polled motion takes over once seen; the window is bounded so the
+	// flag can't latch the inhibit on for ever.
+	if st.Connected && st.MotorsMoving == 0 && !c.moveCmdAt.IsZero() && time.Since(c.moveCmdAt) < ubMoveOptimisticWindow {
+		st.MotorsMoving = 1 // sentinel: optimistically moving (read only as != 0)
+	}
+	return &st, nil
 }
 
 // getNextSeq returns the next sequence number
@@ -301,10 +327,9 @@ func quoteByte(b byte) []byte {
 	return []byte{b}
 }
 
-// buildPacket creates a complete packet with checksum and escaping
-func (c *Client) buildPacket(cmd byte, data []byte) []byte {
-	seq := c.getNextSeq()
-
+// buildPacket creates a complete packet with checksum and escaping. The seq is
+// supplied by the caller so sendCommand can match the reply against it.
+func (c *Client) buildPacket(seq, cmd byte, data []byte) []byte {
 	// Calculate checksum on unquoted data
 	payload := append([]byte{seq, cmd}, data...)
 	chk := calculateChecksum(payload)
@@ -389,39 +414,27 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
 		return nil, fmt.Errorf("not connected")
 	}
 
-	// Build and send packet
-	packet := c.buildPacket(cmd, data)
+	// Flush anything already sitting in the stream before we send. The antenna
+	// does NOT echo our sequence number — its replies carry their own counter — so
+	// a reply cannot be matched to its request. Instead we keep the exchange 1:1:
+	// a reply left behind by an earlier timed-out command is discarded here, so
+	// the reply we read next belongs to THIS command. Reading a stale reply as the
+	// current one crossed STATUS with READ_BANDS/PROGRESS — phantom frequencies (a
+	// spurious follow-loop re-tune), dropped connections and wrong element lengths.
+	c.drainStale()
 
-	_, err := c.conn.Write(packet)
-	if err != nil {
+	seq := c.getNextSeq()
+	packet := c.buildPacket(seq, cmd, data)
+	if _, err := c.conn.Write(packet); err != nil {
 		return nil, fmt.Errorf("failed to write: %w", err)
 	}
 
-	// Read reply with timeout (generous — tolerates remote-link latency).
+	// Read the reply with a timeout generous enough for a remote link.
 	c.conn.SetReadDeadline(time.Now().Add(ubReadTimeout))
-
-	// Read until we get a complete packet
-	var buffer []byte
-	for {
-		b, err := c.reader.ReadByte()
-		if err != nil {
-			return nil, fmt.Errorf("failed to read: %w", err)
-		}
-
-		buffer = append(buffer, b)
-
-		// Check if we have a complete packet
-		if b == ETX && len(buffer) > 0 && buffer[0] == STX {
-			break
-		}
-
-		// Prevent infinite loop
-		if len(buffer) > 256 {
-			return nil, fmt.Errorf("packet too long")
-		}
+	buffer, err := c.readPacket()
+	if err != nil {
+		return nil, err
 	}
-
-	// Parse reply
 	_, replyCmd, payload, err := parsePacket(buffer)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse reply: %w", err)
@@ -450,6 +463,45 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
 	}
 }
 
+// drainStale discards any bytes already waiting in the stream — a reply left
+// behind by a command that timed out. A short read deadline lets it consume what
+// is there and stop quickly when the stream is clean. Caller holds connMu.
+func (c *Client) drainStale() {
+	c.conn.SetReadDeadline(time.Now().Add(5 * time.Millisecond))
+	buf := make([]byte, 256)
+	for {
+		n, err := c.reader.Read(buf)
+		if n == 0 || err != nil {
+			return
+		}
+	}
+}
+
+// readPacket reads one complete STX…ETX frame, skipping any leading bytes until
+// an STX so a partial/garbage remnant left in the stream can't derail the parse.
+// STX/ETX/DLE are all high-bit (0xF5/0xFA/0xF6) and the escaping clears the MSB,
+// so a raw ETX only ever appears as the real terminator. Caller holds connMu and
+// has set a read deadline.
+func (c *Client) readPacket() ([]byte, error) {
+	var buffer []byte
+	for {
+		b, err := c.reader.ReadByte()
+		if err != nil {
+			return nil, fmt.Errorf("failed to read: %w", err)
+		}
+		if len(buffer) == 0 && b != STX {
+			continue // resync to the start of a frame
+		}
+		buffer = append(buffer, b)
+		if b == ETX {
+			return buffer, nil
+		}
+		if len(buffer) > 256 {
+			return nil, fmt.Errorf("packet too long")
+		}
+	}
+}
+
 // queryStatus queries general status (command 1)
 func (c *Client) queryStatus() (*Status, error) {
 	reply, err := c.sendCommand(CMD_STATUS, nil)
@@ -457,7 +509,13 @@ func (c *Client) queryStatus() (*Status, error) {
 		return nil, err
 	}
 
-	if len(reply) < 12 {
+	// An older controller — seen behind an RS232-to-Ethernet bridge — answers with
+	// an 11-byte status frame: the standard one WITHOUT the trailing FreqMax byte.
+	// The packet checksum was already verified, so a short-but-valid frame is real,
+	// not a fragment. Accept it and default the missing tail fields instead of
+	// reconnect-looping on "reply too short". reply[9]/[10] (MotorsMoving, FreqMin)
+	// are the last we truly need, so 10 bytes is the floor.
+	if len(reply) < 10 {
 		return nil, fmt.Errorf("status reply too short: %d bytes", len(reply))
 	}
 
@@ -470,8 +528,12 @@ func (c *Client) queryStatus() (*Status, error) {
 		Direction:        int(reply[6] & 0x0F),
 		OffState:         (reply[7] & 0x02) != 0,
 		MotorsMoving:     int(reply[9]),
-		FreqMin:          int(reply[10]),
-		FreqMax:          int(reply[11]),
+	}
+	if len(reply) > 10 {
+		status.FreqMin = int(reply[10])
+	}
+	if len(reply) > 11 {
+		status.FreqMax = int(reply[11])
 	}
 
 	return status, nil
@@ -537,6 +599,7 @@ func (c *Client) SetFrequency(freqKhz int, direction int) error {
 		c.statusMu.Lock()
 		c.pendingDir, c.pendingDirAt, c.pendingDirSet = direction, time.Now(), true
 		c.lastSetKHz = freqKhz
+		c.moveCmdAt = time.Now() // start reporting motion at once — see ubMoveOptimisticWindow
 		if c.lastStatus != nil {
 			c.lastStatus.Direction = direction // reflect immediately
 		}

internal/ultrabeam/ultrabeam_test.go

@@ -0,0 +1,94 @@
+package ultrabeam
+
+import (
+	"bufio"
+	"bytes"
+	"net"
+	"testing"
+	"time"
+)
+
+// sendCommand must flush any bytes already in the stream (a reply left by an
+// earlier timed-out command) before reading, then return the reply to THIS
+// command. The antenna does not echo our sequence number, so keeping the stream
+// clean is the only way to stay in sync.
+func TestSendCommandFlushesStaleThenReadsReply(t *testing.T) {
+	srvConn, cliConn := net.Pipe()
+	defer srvConn.Close()
+	defer cliConn.Close()
+
+	c := &Client{conn: cliConn, reader: bufio.NewReader(cliConn)}
+	srv := &Client{reader: bufio.NewReader(srvConn)}
+
+	errc := make(chan error, 1)
+	go func() {
+		// Leftover from a "previous" command still sitting in the stream. The Write
+		// blocks until drainStale consumes it, so it is guaranteed flushed before
+		// the real exchange.
+		if _, err := srvConn.Write(c.buildPacket(9, UB_OK, []byte{0xDE, 0xAD})); err != nil {
+			errc <- err
+			return
+		}
+		// Now serve the actual request.
+		req, err := srv.readPacket()
+		if err != nil {
+			errc <- err
+			return
+		}
+		seq, _, _, err := parsePacket(req)
+		if err != nil {
+			errc <- err
+			return
+		}
+		_, err = srvConn.Write(c.buildPacket(seq, UB_OK, []byte{0x11, 0x22, 0x33}))
+		errc <- err
+	}()
+
+	payload, err := c.sendCommand(CMD_STATUS, nil)
+	if err != nil {
+		t.Fatalf("sendCommand: %v", err)
+	}
+	if !bytes.Equal(payload, []byte{0x11, 0x22, 0x33}) {
+		t.Fatalf("payload = % X, want 11 22 33 — stale reply not flushed", payload)
+	}
+	if err := <-errc; err != nil {
+		t.Fatalf("server: %v", err)
+	}
+}
+
+// readPacket must resynchronise to the next STX, dropping any partial/garbage
+// bytes left in the stream, so one corrupt frame can't misalign every frame
+// after it.
+func TestReadPacketResyncsToSTX(t *testing.T) {
+	frame := (&Client{}).buildPacket(5, UB_OK, []byte{0x01, 0x02})
+	stream := append([]byte{0x11, 0x22, 0x33}, frame...) // leading garbage, then a real frame
+	c := &Client{reader: bufio.NewReader(bytes.NewReader(stream))}
+
+	got, err := c.readPacket()
+	if err != nil {
+		t.Fatalf("readPacket: %v", err)
+	}
+	seq, cmd, payload, err := parsePacket(got)
+	if err != nil {
+		t.Fatalf("parsePacket: %v", err)
+	}
+	if seq != 5 || cmd != UB_OK || !bytes.Equal(payload, []byte{0x01, 0x02}) {
+		t.Fatalf("seq=%d cmd=%d payload=% X, want 5 / OK / 01 02", seq, cmd, payload)
+	}
+}
+
+// A commanded move must report motion immediately (before the next status poll),
+// then fall back to the real motor state once the window elapses.
+func TestOptimisticMotionAfterCommand(t *testing.T) {
+	c := &Client{lastStatus: &Status{Connected: true, MotorsMoving: 0}}
+
+	c.moveCmdAt = time.Now()
+	if st, _ := c.GetStatus(); st.MotorsMoving == 0 {
+		t.Fatal("just after a move command, GetStatus should report motion")
+	}
+
+	c.moveCmdAt = time.Now().Add(-ubMoveOptimisticWindow - time.Second)
+	if st, _ := c.GetStatus(); st.MotorsMoving != 0 {
+		t.Fatal("past the window with motors idle, GetStatus must report no motion")
+	}
+}

telemetry.go

@@ -21,7 +21,7 @@ import (
 
 const (
 	// appVersion is stamped on every heartbeat (and could feed the About box).
-	appVersion = "0.23.5"
+	appVersion = "0.23.6"
 
 	// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
 	// to https://us.i.posthog.com for a US project.