[fix](trx-frontend-http): keep the mini views to the rig on screen

The decode SSE stream and the history behind it are not rig-scoped: every
rig's decodes reach the browser, each carrying the rig that heard it.  The
panels on the decoder tabs want that — they aggregate the whole station —
but the mini views over the waterfall caption the spectrum underneath, and
they were reading the same unfiltered histories.  A background rig copying
APRS on another band put its frames over the active rig's waterfall.  The
mode gate did not help: it reads the mode of the rig on screen, so those
frames appeared whenever that rig happened to be in PKT.

Filter each overlay on the rig it belongs to, through one shared predicate
that compares a decode's rig_id with the per-tab active rig already driving
the spectrum and the audio.  A decode that names no rig, and a session that
has not learnt its rig list yet, still show everything.

The FTx normalizer was dropping rig_id on the floor, so it now keeps it.
CW needed more than a filter: its lines accumulate character by character,
so two rigs copying at once braided their text into one unreadable line.
Lines in progress are now kept per rig.

The bar repaints in render() move into refreshDecodeBars(), which the rig
switch calls as well — otherwise the outgoing rig's frames stayed on screen
until the next state update — and which finally includes the CW bar.

Closes #49

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SyX26FCpMQxiBoC7r5K1A7
Signed-off-by: Stan Grams <sjg@haxx.space>

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/ais.js

@@ -1,3 +1,6 @@
+import {
+  isActiveRigDecode
+} from "./chunk-BQQXSNLC.js";
 import {
   hostCore,
   hostState
@@ -222,7 +225,9 @@ function updateAisBar() {
   updateAisSummary();
   const isAis = (document.getElementById("mode")?.value || "").toUpperCase() === "AIS";
   const cutoffMs = Date.now() - AIS_BAR_WINDOW_MS;
-  const recent = aisMessageHistory.filter((msg) => (msg._tsMs ?? 0) >= cutoffMs);
+  const recent = aisMessageHistory.filter(
+    (msg) => (msg._tsMs ?? 0) >= cutoffMs && isActiveRigDecode(msg.rig_id)
+  );
   const messages = aisLatestByVessel(recent).slice(0, 8);
   if (!isAis || messages.length === 0) {
     aisBarOverlay.style.display = "none";

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/app.js

@@ -3555,6 +3555,13 @@ function positionRdsPsOverlay() {
 function resetRdsDisplay() {
   updateRdsPsOverlay(primaryRds);
 }
+function refreshDecodeBars() {
+  window.updateAisBar?.();
+  window.updateVdesBar?.();
+  window.updateAprsBar?.();
+  window.updateFt8Bar?.();
+  window.updateCwBar?.();
+}
 function resetDecoderStateOnRigSwitch() {
   primaryRds = null;
   vchanRdsById = /* @__PURE__ */ new Map();
@@ -3569,6 +3576,7 @@ function resetDecoderStateOnRigSwitch() {
     const el = document.getElementById(id);
     if (el) el.textContent = "--";
   });
+  refreshDecodeBars();
 }
 function resetWfmStereoIndicator() {
   if (!wfmStFlagEl) return;
@@ -4788,10 +4796,7 @@ function render(update) {
     const connText = _decodeConnectedText[d.id] || "Connected, listening for packets";
     setModeBoundDecodeStatus(el, d.active_modes, "Select " + d.active_modes[0] + " mode to decode", connText);
   }
-  if (window.updateAisBar) window.updateAisBar();
-  if (window.updateVdesBar) window.updateVdesBar();
-  if (window.updateAprsBar) window.updateAprsBar();
-  if (window.updateFt8Bar) window.updateFt8Bar();
+  refreshDecodeBars();
   for (const d of decoderRegistry) {
     if (d.activation !== "toggle") continue;
     const key = d.id.replace(/-/g, "_") + "_decode_enabled";

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/aprs.js

@@ -5,6 +5,9 @@ import {
   normalizeAprsPacket,
   renderAprsPacketRow
 } from "./chunk-OPEIVJGD.js";
+import {
+  isActiveRigDecode
+} from "./chunk-BQQXSNLC.js";
 import {
   hostCore,
   hostState
@@ -153,7 +156,9 @@ function updateAprsBar() {
   if (!aprsBarOverlay) return;
   const isPkt = (document.getElementById("mode")?.value || "").toUpperCase() === "PKT";
   const cutoffMs = Date.now() - APRS_BAR_WINDOW_MS;
-  const okFrames = aprsPacketHistory.filter((p) => p.crcOk && (p._tsMs ?? 0) >= cutoffMs);
+  const okFrames = aprsPacketHistory.filter(
+    (p) => p.crcOk && (p._tsMs ?? 0) >= cutoffMs && isActiveRigDecode(p.rig_id)
+  );
   const frames = collapseAprsDuplicates(okFrames).slice(0, 8);
   const newestTsMs = frames.reduce((latest, pkt) => Math.max(latest, Number(pkt._tsMs) || 0), 0);
   if (!isPkt || frames.length === 0 || newestTsMs <= aprsBarDismissedAtMs) {

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/chunk-BQQXSNLC.js

@@ -0,0 +1,14 @@
+import {
+  hostState
+} from "./chunk-KL66PICH.js";
+
+// src/plugins/active-rig.ts
+function isActiveRigDecode(rigId) {
+  const activeRigId = hostState.lastActiveRigId;
+  if (!activeRigId || !rigId) return true;
+  return rigId === activeRigId;
+}
+
+export {
+  isActiveRigDecode
+};

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/chunk-K3D6FOP5.js

@@ -1,3 +1,6 @@
+import {
+  isActiveRigDecode
+} from "./chunk-BQQXSNLC.js";
 import {
   hostCore
 } from "./chunk-KL66PICH.js";
@@ -177,6 +180,9 @@ function initializeFtxDecoder(config) {
       });
     }
     return {
+      // The rig that heard it, kept so the mini view can tell a decode of the
+      // rig on screen from one a background rig made on another band.
+      rig_id: message.rig_id ?? null,
       receiver: bridge.getDecodeRigMeta?.() ?? null,
       ts_ms: message.ts_ms,
       snr_db: message.snr_db,
@@ -202,7 +208,7 @@ function initializeFtxDecoder(config) {
     bridge.clearMapMarkersByType?.(id);
   };
   const barFrames = () => {
-    const recent = history.filter((message) => (finiteNumber(message._tsMs ?? message.ts_ms) ?? 0) >= Date.now() - 9e5).slice(0, 8);
+    const recent = history.filter((message) => (finiteNumber(message._tsMs ?? message.ts_ms) ?? 0) >= Date.now() - 9e5 && isActiveRigDecode(message.rig_id)).slice(0, 8);
     let html = "";
     for (const message of recent) {
       const timestamp = finiteNumber(message._tsMs ?? message.ts_ms);

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/cw.js

@@ -1,3 +1,6 @@
+import {
+  isActiveRigDecode
+} from "./chunk-BQQXSNLC.js";
 import {
   hostCore
 } from "./chunk-KL66PICH.js";
@@ -25,7 +28,7 @@ var CW_BAR_LINE_GAP_MS = 5e3;
 var cwLastAppendTime = 0;
 var cwTonePickerRaf = null;
 var cwBarHistory = [];
-var cwBarCurrentLine = null;
+var cwBarCurrentLines = /* @__PURE__ */ new Map();
 var cwBarDismissedAtMs = 0;
 var cwAutoLocalOverride = null;
 function escapeCwHtml(input) {
@@ -50,20 +53,22 @@ cwWindow.applyCwAutoUiFromServer = function(enabled) {
   if (cwAutoLocalOverride !== null) return;
   applyCwAutoUi(enabled);
 };
-function cwBarFlushCurrentLine() {
-  if (cwBarCurrentLine && cwBarCurrentLine.text.trim()) {
-    cwBarHistory.unshift(cwBarCurrentLine);
+function cwBarFlushCurrentLine(key) {
+  const line = cwBarCurrentLines.get(key);
+  cwBarCurrentLines.delete(key);
+  if (line?.text.trim()) {
+    cwBarHistory.unshift(line);
     if (cwBarHistory.length > 50) cwBarHistory.length = 50;
   }
-  cwBarCurrentLine = null;
 }
 function updateCwBar() {
   if (!cwBarOverlay) return;
   const mode = (document.getElementById("mode")?.value || "").toUpperCase();
   const isCw = mode === "CW" || mode === "CWR";
   const cutoffMs = Date.now() - CW_BAR_WINDOW_MS;
-  const recent = cwBarHistory.filter((l) => l.tsMs >= cutoffMs);
-  const liveLines = cwBarCurrentLine && cwBarCurrentLine.text ? [cwBarCurrentLine, ...recent] : recent;
+  const recent = cwBarHistory.filter((l) => l.tsMs >= cutoffMs && isActiveRigDecode(l.rigId));
+  const inProgress = [...cwBarCurrentLines.values()].filter((l) => l.text && isActiveRigDecode(l.rigId)).sort((a, b) => b.tsMs - a.tsMs);
+  const liveLines = [...inProgress, ...recent];
   const newestTsMs = liveLines.reduce((latest, line) => Math.max(latest, line.tsMs || 0), 0);
   if (!isCw || liveLines.length === 0 || newestTsMs <= cwBarDismissedAtMs) {
     cwBarOverlay.style.display = "none";
@@ -308,7 +313,7 @@ function resetCwHistoryView() {
   if (cwOutputEl) cwOutputEl.innerHTML = "";
   cwLastAppendTime = 0;
   cwBarHistory = [];
-  cwBarCurrentLine = null;
+  cwBarCurrentLines.clear();
   updateCwBar();
   drawCwTonePicker();
 }
@@ -346,18 +351,22 @@ function onServerCw(evt) {
   }
   if (evt.text) {
     const now = Date.now();
+    const rigId = evt.rig_id ?? null;
+    const key = rigId ?? "";
     if (evt.text === "\n") {
-      cwBarFlushCurrentLine();
+      cwBarFlushCurrentLine(key);
     } else {
-      if (!cwBarCurrentLine || now - cwBarCurrentLine.lastMs > CW_BAR_LINE_GAP_MS) {
-        cwBarFlushCurrentLine();
+      let line = cwBarCurrentLines.get(key);
+      if (!line || now - line.lastMs > CW_BAR_LINE_GAP_MS) {
+        cwBarFlushCurrentLine(key);
         const ts = new Date(now).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
-        cwBarCurrentLine = { tsMs: now, ts, text: "", wpm: null, tone_hz: null, lastMs: now };
+        line = { rigId, tsMs: now, ts, text: "", wpm: null, tone_hz: null, lastMs: now };
+        cwBarCurrentLines.set(key, line);
       }
-      cwBarCurrentLine.text += evt.text;
-      cwBarCurrentLine.lastMs = now;
-      if (Number.isFinite(Number(evt.wpm))) cwBarCurrentLine.wpm = clampCwWpm(evt.wpm);
-      if (Number.isFinite(Number(evt.tone_hz))) cwBarCurrentLine.tone_hz = Math.round(Number(evt.tone_hz));
+      line.text += evt.text;
+      line.lastMs = now;
+      if (Number.isFinite(Number(evt.wpm))) line.wpm = clampCwWpm(evt.wpm);
+      if (Number.isFinite(Number(evt.tone_hz))) line.tone_hz = Math.round(Number(evt.tone_hz));
     }
     updateCwBar();
   }

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/ft2.js

@@ -1,6 +1,7 @@
 import {
   initializeFtxDecoder
-} from "./chunk-O2Y7YEVQ.js";
+} from "./chunk-K3D6FOP5.js";
+import "./chunk-BQQXSNLC.js";
 import "./chunk-KL66PICH.js";
 
 // src/plugins/ft2.ts

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/ft4.js

@@ -1,6 +1,7 @@
 import {
   initializeFtxDecoder
-} from "./chunk-O2Y7YEVQ.js";
+} from "./chunk-K3D6FOP5.js";
+import "./chunk-BQQXSNLC.js";
 import "./chunk-KL66PICH.js";
 
 // src/plugins/ft4.ts

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/ft8.js

@@ -2,7 +2,8 @@ import {
   initializeFt8FamilyBar,
   initializeFtxDecoder,
   installFtxCompatibilityHelpers
-} from "./chunk-O2Y7YEVQ.js";
+} from "./chunk-K3D6FOP5.js";
+import "./chunk-BQQXSNLC.js";
 import "./chunk-KL66PICH.js";
 
 // src/plugins/ft8.ts

src/trx-client/trx-frontend/trx-frontend-http/assets/web/generated/vdes.js

@@ -1,3 +1,6 @@
+import {
+  isActiveRigDecode
+} from "./chunk-BQQXSNLC.js";
 import {
   hostCore
 } from "./chunk-KL66PICH.js";
@@ -137,7 +140,7 @@ function updateVdesBar() {
   updateVdesSummary();
   const isVdes = (document.getElementById("mode")?.value || "").toUpperCase() === "VDES";
   const cutoffMs = Date.now() - VDES_BAR_WINDOW_MS;
-  const messages = vdesMessageHistory.filter((msg) => (msg._tsMs ?? 0) >= cutoffMs).slice(0, 6);
+  const messages = vdesMessageHistory.filter((msg) => (msg._tsMs ?? 0) >= cutoffMs && isActiveRigDecode(msg.rig_id)).slice(0, 6);
   if (!isVdes || messages.length === 0) {
     vdesBarOverlay.style.display = "none";
     vdesBarOverlay.innerHTML = "";