[fix](trx-frontend-http): show one rig at a time on the digital modes page

A client connected to several rigs decodes all of them at once, and the decode stream carries every rig's traffic to every browser. The decoder panels listed all of it: a station a background rig copied on another band appeared in the APRS list next to the selected rig's, the vessel counts and the "latest seen" lines counted both, the status lines said "Receiving" because some other rig was, and the CW pane interleaved two rigs into one stream of text that read as neither. The page is about the rig the operator selected — the one whose spectrum is on screen and whose audio is playing — so each panel now shows what that rig heard: rows, counts, latest-seen, status, the live picture a WEFAX or SSTV frame is painting, and the CW pane. Nothing is dropped on the way in. The map is the whole station's view, has its own rig filter, and would empty out if the plugins stopped feeding it, so the histories still hold every rig and the map still plots them. That also means a switch loses nothing: the runtime gained a rerender hook, which the rig switch calls, and switching back brings the other rig's traffic up again. The CW pane is the exception — a running stream of text cannot be unpicked after the fact — so it starts empty on the rig switched to. 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>
2026-08-07 08:11:13 +02:00
parent 86dd36312e
commit bf3bcc8a84
30 changed files with 516 additions and 124 deletions
@@ -1,6 +1,7 @@
 import {
+  forActiveRig,
  isActiveRigDecode
-} from "./chunk-BQQXSNLC.js";
+} from "./chunk-S57W63QN.js";
 import {
  hostCore,
  hostState
@@ -143,18 +144,22 @@ function aisLatestByVessel(messages) {
  }
  return Array.from(byMmsi.values());
 }
+function aisRigMessages() {
+  return forActiveRig(aisMessageHistory);
+}
 function updateAisSummary() {
  const plan = currentAisChannelPlan();
  if (aisChannelSummaryEl) {
    aisChannelSummaryEl.textContent = `A ${formatAisMhz(plan.aHz)} · B ${formatAisMhz(plan.bHz)}`;
  }
-  const vessels = aisLatestByVessel(aisMessageHistory);
+  const rigMessages = aisRigMessages();
+  const vessels = aisLatestByVessel(rigMessages);
  if (aisVesselCountEl) {
    const count = vessels.length;
    aisVesselCountEl.textContent = `${count} vessel${count === 1 ? "" : "s"}`;
  }
  if (aisLatestSeenEl) {
-    const latest = aisMessageHistory[0];
+    const latest = rigMessages[0];
    if (!latest) {
      aisLatestSeenEl.textContent = "No traffic yet";
    } else {
@@ -272,7 +277,7 @@ function renderAisHistory() {
    return;
  }
  const fragment = document.createDocumentFragment();
-  for (const message of aisMessageHistory) {
+  for (const message of aisRigMessages()) {
    fragment.appendChild(renderAisRow(message));
  }
  aisMessagesEl.replaceChildren(fragment);
@@ -304,10 +309,10 @@ function normalizeServerAisMessage(msg) {
 }
 function onServerAisBatch(messages) {
  if (!Array.isArray(messages) || messages.length === 0) return;
-  if (aisStatus) aisStatus.textContent = "Receiving";
  const normalized = [];
  for (const msg of messages) {
    const next = normalizeServerAisMessage(msg);
+    if (aisStatus && isActiveRigDecode(next.rig_id)) aisStatus.textContent = "Receiving";
    const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
    next._tsMs = tsMs;
    next._ts = new Date(tsMs).toLocaleTimeString([], {
@@ -347,8 +352,9 @@ if (aisFilterInput) {
  });
 }
 function onServerAis(msg) {
-  if (aisStatus) aisStatus.textContent = "Receiving";
-  addAisMessage(normalizeServerAisMessage(msg));
+  const message = normalizeServerAisMessage(msg);
+  if (aisStatus && isActiveRigDecode(message.rig_id)) aisStatus.textContent = "Receiving";
+  addAisMessage(message);
 }
 updateAisSummary();
 window.trxPluginRuntime.registerDecoder({
@@ -358,6 +364,10 @@ window.trxPluginRuntime.registerDecoder({
  restore: onServerAisBatch,
  reset: resetAisHistoryView,
  prune: pruneAisHistoryView,
+  rerender: () => {
+    updateAisBar();
+    renderAisHistory();
+  },
  // Oldest first, so vessel tracks are rebuilt in the order they happened.
  syncMap: () => {
    for (const entry of [...aisMessageHistory].reverse()) plotAisMessage(entry);
@@ -1065,6 +1065,9 @@ var runtime = {
    plugin.prune();
    return true;
  },
+  rerenderAll() {
+    for (const plugin of decoders.values()) plugin.rerender?.();
+  },
  syncMapAll() {
    for (const plugin of decoders.values()) plugin.syncMap?.();
  },
@@ -3577,6 +3580,7 @@ function resetDecoderStateOnRigSwitch() {
    if (el) el.textContent = "--";
  });
  refreshDecodeBars();
+  window.trxPluginRuntime.rerenderAll();
 }
 function resetWfmStereoIndicator() {
  if (!wfmStFlagEl) return;
@@ -6,8 +6,9 @@ import {
  renderAprsPacketRow
 } from "./chunk-OPEIVJGD.js";
 import {
+  forActiveRig,
  isActiveRigDecode
-} from "./chunk-BQQXSNLC.js";
+} from "./chunk-S57W63QN.js";
 import {
  hostCore,
  hostState
@@ -85,20 +86,25 @@ function aprsFilterMatch(pkt) {
  ].filter(Boolean).join(" ").toUpperCase();
  return haystack.includes(aprsFilterText);
 }
+function aprsRigPackets() {
+  return forActiveRig(aprsPacketHistory);
+}
 function aprsVisiblePackets() {
-  const packets = aprsCollapseDup ? collapseAprsDuplicates(aprsPacketHistory) : aprsPacketHistory;
+  const rigPackets = aprsRigPackets();
+  const packets = aprsCollapseDup ? collapseAprsDuplicates(rigPackets) : rigPackets;
  return packets.filter(aprsFilterMatch);
 }
 function updateAprsSummary() {
+  const rigPackets = aprsRigPackets();
  const visible = aprsVisiblePackets();
  if (aprsTotalCountEl) {
-    aprsTotalCountEl.textContent = `${aprsPacketHistory.length} total`;
+    aprsTotalCountEl.textContent = `${rigPackets.length} total`;
  }
  if (aprsVisibleCountEl) {
    aprsVisibleCountEl.textContent = `${visible.length} shown`;
  }
  if (aprsLatestSeenEl) {
-    const latest = aprsPacketHistory[0];
+    const latest = rigPackets[0];
    if (!latest) {
      aprsLatestSeenEl.textContent = "No packets yet";
    } else {
@@ -220,11 +226,11 @@ function normalizeServerAprsPacket(pkt) {
 }
 function onServerAprsBatch(packets) {
  if (!Array.isArray(packets) || packets.length === 0) return;
-  if (aprsStatus) aprsStatus.textContent = "Receiving";
  const normalized = [];
  let hasCrcOk = false;
  for (const pkt of packets) {
    const next = normalizeServerAprsPacket(pkt);
+    if (aprsStatus && isActiveRigDecode(next.rig_id)) aprsStatus.textContent = "Receiving";
    const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
    next._tsMs = tsMs;
    next._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
@@ -282,8 +288,9 @@ if (aprsFilterInput) {
  });
 }
 function onServerAprs(pkt) {
-  if (aprsStatus) aprsStatus.textContent = "Receiving";
-  addAprsPacket(normalizeServerAprsPacket(pkt));
+  const packet = normalizeServerAprsPacket(pkt);
+  if (aprsStatus && isActiveRigDecode(packet.rig_id)) aprsStatus.textContent = "Receiving";
+  addAprsPacket(packet);
 }
 renderAprsHistory();
 window.trxPluginRuntime.registerDecoder({
@@ -293,6 +300,10 @@ window.trxPluginRuntime.registerDecoder({
  restore: onServerAprsBatch,
  reset: resetAprsHistoryView,
  prune: pruneAprsHistoryView,
+  rerender: () => {
+    updateAprsBar();
+    renderAprsHistory();
+  },
  // Oldest first, so station tracks are rebuilt in the order they happened.
  syncMap: () => {
    for (const entry of [...aprsPacketHistory].reverse()) plotAprsPacket(entry);
@@ -1,6 +1,7 @@
 import {
+  forActiveRig,
  isActiveRigDecode
-} from "./chunk-BQQXSNLC.js";
+} from "./chunk-S57W63QN.js";
 import {
  hostCore
 } from "./chunk-KL66PICH.js";
@@ -156,9 +157,10 @@ function initializeFtxDecoder(config) {
  const render = () => {
    prune();
    if (!messagesElement) return;
+    const rigMessages = forActiveRig(history);
    const fragment = document.createDocumentFragment();
    let count = 0;
-    for (const message of history) {
+    for (const message of rigMessages) {
      if (count >= 200) break;
      if (filterText && !(message.message ?? "").toUpperCase().includes(filterText)) continue;
      fragment.appendChild(renderRow(message));
@@ -194,7 +196,9 @@ function initializeFtxDecoder(config) {
  };
  const receiveBatch = (messages) => {
    if (messages.length === 0) return;
-    if (status) status.textContent = "Receiving";
+    if (status && messages.some((message) => isActiveRigDecode(message.rig_id))) {
+      status.textContent = "Receiving";
+    }
    history = messages.map(normalize).reverse().concat(history);
    prune();
    bridge.setFt8FamilyBarDecoder?.(id);
@@ -232,7 +236,11 @@ function initializeFtxDecoder(config) {
      prune();
      render();
    },
-    reset
+    reset,
+    rerender: () => {
+      bridge.updateFt8Bar?.();
+      render();
+    }
  });
  bridge.registerFt8FamilyBarRenderer?.(id, barFrames);
  const updatePeriod = () => {
@@ -8,7 +8,11 @@ function isActiveRigDecode(rigId) {
  if (!activeRigId || !rigId) return true;
  return rigId === activeRigId;
 }
+function forActiveRig(items) {
+  return items.filter((item) => isActiveRigDecode(item.rig_id));
+}

 export {
-  isActiveRigDecode
+  isActiveRigDecode,
+  forActiveRig
 };
@@ -1,6 +1,6 @@
 import {
  isActiveRigDecode
-} from "./chunk-BQQXSNLC.js";
+} from "./chunk-S57W63QN.js";
 import {
  hostCore
 } from "./chunk-KL66PICH.js";
@@ -329,8 +329,9 @@ document.getElementById("settings-clear-cw-history")?.addEventListener("click",
  })();
 });
 function onServerCw(evt) {
-  if (cwStatusEl) cwStatusEl.textContent = "Receiving";
-  if (evt.text && cwOutputEl) {
+  const forSelectedRig = isActiveRigDecode(evt.rig_id ?? null);
+  if (cwStatusEl && forSelectedRig) cwStatusEl.textContent = "Receiving";
+  if (evt.text && cwOutputEl && forSelectedRig) {
    const now = Date.now();
    if (!cwOutputEl.lastElementChild || now - cwLastAppendTime > 1e4 || evt.text === "\n") {
      const line = document.createElement("div");
@@ -370,10 +371,10 @@ function onServerCw(evt) {
    }
    updateCwBar();
  }
-  if (cwSignalIndicator) {
+  if (cwSignalIndicator && forSelectedRig) {
    cwSignalIndicator.className = evt.signal_on ? "cw-signal-on" : "cw-signal-off";
  }
-  if (!cwAutoInput || cwAutoInput.checked) {
+  if (forSelectedRig && (!cwAutoInput || cwAutoInput.checked)) {
    if (cwWpmInput && Number.isFinite(Number(evt.wpm))) {
      cwWpmInput.value = String(clampCwWpm(evt.wpm));
    }
@@ -398,7 +399,14 @@ cwWindow.trxPluginRuntime.registerDecoder({
  id: "cw",
  onMessage: onServerCw,
  restore: restoreCwHistory,
-  reset: resetCwHistoryView
+  reset: resetCwHistoryView,
+  // The copied text of a rig that is no longer on screen cannot be unpicked
+  // from the pane, so the switch starts the new rig's stream from empty.
+  rerender: () => {
+    if (cwOutputEl) cwOutputEl.innerHTML = "";
+    cwLastAppendTime = 0;
+    updateCwBar();
+  }
 });
 cwWindow.refreshCwTonePicker = function refreshCwTonePicker() {
  ensureCwToneCanvasResolution();
@@ -1,7 +1,7 @@
 import {
  initializeFtxDecoder
-} from "./chunk-K3D6FOP5.js";
-import "./chunk-BQQXSNLC.js";
+} from "./chunk-PAKFJPA2.js";
+import "./chunk-S57W63QN.js";
 import "./chunk-KL66PICH.js";

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

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

 // src/plugins/ft8.ts
@@ -5,6 +5,10 @@ import {
  normalizeAprsPacket,
  renderAprsPacketRow
 } from "./chunk-OPEIVJGD.js";
+import {
+  forActiveRig,
+  isActiveRigDecode
+} from "./chunk-S57W63QN.js";
 import {
  hostCore,
  hostState
@@ -67,21 +71,26 @@ function hfAprsFilterMatch(pkt) {
  ].filter(Boolean).join(" ").toUpperCase();
  return haystack.includes(hfAprsFilterText);
 }
+function hfAprsRigPackets() {
+  return forActiveRig(hfAprsPacketHistory);
+}
 function hfAprsVisiblePackets() {
-  const packets = hfAprsCollapseDup ? collapseHfAprsDuplicates(hfAprsPacketHistory) : hfAprsPacketHistory;
+  const rigPackets = hfAprsRigPackets();
+  const packets = hfAprsCollapseDup ? collapseHfAprsDuplicates(rigPackets) : rigPackets;
  return packets.filter(hfAprsFilterMatch);
 }
 var collapseHfAprsDuplicates = collapseAprsDuplicates;
 function updateHfAprsSummary() {
+  const rigPackets = hfAprsRigPackets();
  const visible = hfAprsVisiblePackets();
  if (hfAprsTotalCountEl) {
-    hfAprsTotalCountEl.textContent = `${hfAprsPacketHistory.length} total`;
+    hfAprsTotalCountEl.textContent = `${rigPackets.length} total`;
  }
  if (hfAprsVisibleCountEl) {
    hfAprsVisibleCountEl.textContent = `${visible.length} shown`;
  }
  if (hfAprsLatestSeenEl) {
-    const latest = hfAprsPacketHistory[0];
+    const latest = rigPackets[0];
    if (!latest) {
      hfAprsLatestSeenEl.textContent = "No packets yet";
    } else {
@@ -158,10 +167,10 @@ function normalizeServerHfAprsPacket(pkt) {
 }
 function onServerHfAprsBatch(packets) {
  if (!Array.isArray(packets) || packets.length === 0) return;
-  if (hfAprsStatus) hfAprsStatus.textContent = "Receiving";
  const normalized = [];
  for (const pkt of packets) {
    const next = normalizeServerHfAprsPacket(pkt);
+    if (hfAprsStatus && isActiveRigDecode(next.rig_id)) hfAprsStatus.textContent = "Receiving";
    const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
    next._tsMs = tsMs;
    next._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
@@ -227,8 +236,9 @@ if (hfAprsFilterInput) {
  });
 }
 function onServerHfAprs(pkt) {
-  if (hfAprsStatus) hfAprsStatus.textContent = "Receiving";
-  addHfAprsPacket(normalizeServerHfAprsPacket(pkt));
+  const packet = normalizeServerHfAprsPacket(pkt);
+  if (hfAprsStatus && isActiveRigDecode(packet.rig_id)) hfAprsStatus.textContent = "Receiving";
+  addHfAprsPacket(packet);
 }
 renderHfAprsHistory();
 window.trxPluginRuntime.registerDecoder({
@@ -237,5 +247,6 @@ window.trxPluginRuntime.registerDecoder({
  onBatch: onServerHfAprsBatch,
  restore: onServerHfAprsBatch,
  reset: resetHfAprsHistoryView,
-  prune: pruneHfAprsHistoryView
+  prune: pruneHfAprsHistoryView,
+  rerender: renderHfAprsHistory
 });
@@ -1,3 +1,7 @@
+import {
+  forActiveRig,
+  isActiveRigDecode
+} from "./chunk-S57W63QN.js";
 import {
  hostCore
 } from "./chunk-KL66PICH.js";
@@ -111,6 +115,7 @@ function paintRow(line, rgb) {
  liveRows = Math.max(liveRows, line + 1);
 }
 function onProgress(msg) {
+  if (!isActiveRigDecode(msg.rig_id)) return;
  if (msg.state) {
    if (sstvDom.status) sstvDom.status.textContent = msg.state;
    beginPicture(msg.mode || "", msg.width || 0, msg.height || 0);
@@ -131,15 +136,20 @@ function onImage(msg) {
  sstvHistory.push(image);
  if (sstvHistory.length > SSTV_MAX_IMAGES) sstvHistory.shift();
  pruneHistory();
+  if (!isActiveRigDecode(image.rig_id)) return;
  if (sstvDom.status) {
    sstvDom.status.textContent = image.complete ? `Received ${image.mode ?? "picture"}` : `Partial ${image.mode ?? "picture"} — ${image.lines ?? 0} lines`;
  }
  scheduleUi("sstv-latest", renderLatestCard);
  if (activeView === "history") scheduleUi("sstv-history", renderHistoryTable);
 }
+function sstvRigImages() {
+  return forActiveRig(sstvHistory);
+}
 function renderLatestCard() {
  if (!sstvDom.liveLatest) return;
-  const latest = sstvHistory[sstvHistory.length - 1];
+  const rigImages = sstvRigImages();
+  const latest = rigImages[rigImages.length - 1];
  if (!latest) {
    sstvDom.liveLatest.innerHTML = "";
    return;
@@ -160,8 +170,9 @@ function renderLatestCard() {
    </div>`;
 }
 function filteredHistory() {
+  const rigImages = sstvRigImages();
  const text = filterText.trim().toLowerCase();
-  const matching = text ? sstvHistory.filter((image) => (image.mode ?? "").toLowerCase().includes(text)) : sstvHistory.slice();
+  const matching = text ? rigImages.filter((image) => (image.mode ?? "").toLowerCase().includes(text)) : rigImages;
  const newestFirst = (sstvDom.sortSelect?.value ?? "newest") === "newest";
  matching.sort((a, b) => (newestFirst ? 1 : -1) * ((b._tsMs ?? 0) - (a._tsMs ?? 0)));
  return matching;
@@ -241,7 +252,11 @@ sstvWindow.trxPluginRuntime.registerDecoder({
  onMessage: onImage,
  restore: restoreHistory,
  prune: renderHistoryTable,
-  reset: resetHistoryView
+  reset: resetHistoryView,
+  rerender: () => {
+    renderLatestCard();
+    renderHistoryTable();
+  }
 });
 sstvWindow.trxPluginRuntime.registerDecoder({
  id: "sstv_progress",
@@ -1,6 +1,7 @@
 import {
+  forActiveRig,
  isActiveRigDecode
-} from "./chunk-BQQXSNLC.js";
+} from "./chunk-S57W63QN.js";
 import {
  hostCore
 } from "./chunk-KL66PICH.js";
@@ -63,17 +64,21 @@ function vdesHexPreview(rawBytes) {
  if (!Array.isArray(rawBytes) || rawBytes.length === 0) return "--";
  return rawBytes.slice(0, 20).map((value) => value.toString(16).padStart(2, "0")).join(" ").toUpperCase();
 }
+function vdesRigMessages() {
+  return forActiveRig(vdesMessageHistory);
+}
 function updateVdesSummary() {
  pruneVdesMessageHistory();
  if (vdesChannelSummaryEl) {
    vdesChannelSummaryEl.textContent = currentVdesCenterText();
  }
+  const rigMessages = vdesRigMessages();
  if (vdesFrameCountEl) {
-    const count = vdesMessageHistory.length;
+    const count = rigMessages.length;
    vdesFrameCountEl.textContent = `${count} burst${count === 1 ? "" : "s"}`;
  }
  if (vdesLatestSeenEl) {
-    const latest = vdesMessageHistory[0];
+    const latest = rigMessages[0];
    vdesLatestSeenEl.textContent = latest ? vdesAgeText(latest._tsMs) : "No traffic yet";
  }
 }
@@ -185,7 +190,7 @@ function renderVdesHistory() {
    return;
  }
  const fragment = document.createDocumentFragment();
-  for (const message of vdesMessageHistory) {
+  for (const message of vdesRigMessages()) {
    fragment.appendChild(renderVdesRow(message));
  }
  vdesMessagesEl.replaceChildren(fragment);
@@ -212,10 +217,10 @@ function normalizeServerVdesMessage(msg) {
 }
 function onServerVdesBatch(messages) {
  if (!Array.isArray(messages) || messages.length === 0) return;
-  if (vdesStatus) vdesStatus.textContent = "Receiving";
  const normalized = [];
  for (const msg of messages) {
    const next = normalizeServerVdesMessage(msg);
+    if (vdesStatus && isActiveRigDecode(next.rig_id)) vdesStatus.textContent = "Receiving";
    const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
    next._tsMs = tsMs;
    next._ts = new Date(tsMs).toLocaleTimeString([], {
@@ -254,8 +259,8 @@ function plotVdesMessage(msg) {
  vdesWindow.vdesMapAddPoint(msg);
 }
 function onServerVdes(msg) {
-  if (vdesStatus) vdesStatus.textContent = "Receiving";
  const next = normalizeServerVdesMessage(msg);
+  if (vdesStatus && isActiveRigDecode(next.rig_id)) vdesStatus.textContent = "Receiving";
  addVdesMessage(next);
  plotVdesMessage(next);
 }
@@ -272,6 +277,10 @@ window.trxPluginRuntime.registerDecoder({
  restore: onServerVdesBatch,
  reset: resetVdesHistoryView,
  prune: pruneVdesHistoryView,
+  rerender: () => {
+    updateVdesBar();
+    renderVdesHistory();
+  },
  // Oldest first, so tracks are rebuilt in the order they happened.
  syncMap: () => {
    for (const entry of [...vdesMessageHistory].reverse()) plotVdesMessage(entry);
@@ -1,3 +1,7 @@
+import {
+  forActiveRig,
+  isActiveRigDecode
+} from "./chunk-S57W63QN.js";
 import {
  hostCore
 } from "./chunk-KL66PICH.js";
@@ -102,13 +106,17 @@ function paintLine(lineBytes) {
  wefaxLiveCtx.putImageData(imgData, 0, y);
  wefaxLiveLineCount++;
 }
+function wefaxRigImages() {
+  return forActiveRig(wefaxImageHistory);
+}
 function renderWefaxLatestCard() {
  if (!wefaxDom.liveLatest) return;
-  if (wefaxImageHistory.length === 0) {
+  const rigImages = wefaxRigImages();
+  if (rigImages.length === 0) {
    wefaxDom.liveLatest.innerHTML = '<div style="color:var(--text-muted);font-size:0.82rem;">No images decoded yet. Enable the decoder and tune to a WEFAX station.</div>';
    return;
  }
-  const img = wefaxImageHistory[0];
+  const img = rigImages[0];
  if (!img) return;
  const ts = img._ts || "--";
  const date = img._tsMs ? new Date(img._tsMs).toLocaleDateString() : "";
@@ -129,7 +137,7 @@ function renderWefaxLatestCard() {
  wefaxDom.liveLatest.innerHTML = html;
 }
 function getWefaxFilteredHistory() {
-  let items = wefaxImageHistory;
+  let items = wefaxRigImages();
  if (wefaxFilterText) {
    items = items.filter(function(i) {
      const haystack = [
@@ -173,7 +181,7 @@ function renderWefaxHistoryTable() {
  }
  wefaxDom.historyList.replaceChildren(fragment);
  if (wefaxDom.historyCount) {
-    const total = wefaxImageHistory.length;
+    const total = wefaxRigImages().length;
    const shown = items.length;
    wefaxDom.historyCount.textContent = total === 0 ? "No images yet" : shown === total ? `${String(total)} image${total === 1 ? "" : "s"}` : `${String(shown)} of ${String(total)} images`;
  }
@@ -208,6 +216,7 @@ function addWefaxImage(msg) {
  }
 }
 function onServerWefaxProgress(msg) {
+  if (!isActiveRigDecode(msg.rig_id)) return;
  if (msg.state && !msg.line_data) {
    if (wefaxDom.status) {
      wefaxDom.status.textContent = msg.state;
@@ -234,6 +243,7 @@ function onServerWefaxProgress(msg) {
 }
 function onServerWefax(msg) {
  addWefaxImage(msg);
+  if (!isActiveRigDecode(msg.rig_id)) return;
  if (wefaxDom.liveContainer) wefaxDom.liveContainer.style.display = "none";
  if (wefaxDom.status) {
    wefaxDom.status.textContent = `Complete — ${String(msg.line_count ?? 0)} lines`;
@@ -328,7 +338,11 @@ wefaxWindow.trxPluginRuntime.registerDecoder({
  onMessage: onServerWefax,
  restore: restoreWefaxHistory,
  prune: pruneWefaxHistoryView,
-  reset: resetWefaxHistoryView
+  reset: resetWefaxHistoryView,
+  rerender: () => {
+    renderWefaxLatestCard();
+    renderWefaxHistoryTable();
+  }
 });
 wefaxWindow.trxPluginRuntime.registerDecoder({
  id: "wefax_progress",
@@ -1,3 +1,7 @@
+import {
+  forActiveRig,
+  isActiveRigDecode
+} from "./chunk-S57W63QN.js";
 import {
  hostCore
 } from "./chunk-KL66PICH.js";
@@ -64,10 +68,10 @@ function renderWsprRow(msg) {
 function renderWsprHistory() {
  pruneWsprMessageHistory();
  if (!wsprMessagesEl) return;
+  const rigMessages = forActiveRig(wsprMessageHistory);
  const fragment = document.createDocumentFragment();
-  for (let i = 0; i < wsprMessageHistory.length; i += 1) {
-    const message = wsprMessageHistory[i];
-    if (message) fragment.appendChild(renderWsprRow(message));
+  for (const message of rigMessages) {
+    fragment.appendChild(renderWsprRow(message));
  }
  wsprMessagesEl.replaceChildren(fragment);
 }
@@ -90,6 +94,7 @@ function normalizeServerWsprMessage(msg) {
    station,
    rfHz,
    history: {
+      rig_id: msg.rig_id ?? null,
      receiver: wsprWindow.getDecodeRigMeta ? wsprWindow.getDecodeRigMeta() : null,
      ts_ms: msg.ts_ms,
      snr_db: msg.snr_db,
@@ -101,10 +106,10 @@ function normalizeServerWsprMessage(msg) {
 }
 function onServerWsprBatch(messages) {
  if (!Array.isArray(messages) || messages.length === 0) return;
-  if (wsprStatus) wsprStatus.textContent = "Receiving";
  const normalized = [];
  for (const msg of messages) {
    const next = normalizeServerWsprMessage(msg);
+    if (wsprStatus && isActiveRigDecode(msg.rig_id)) wsprStatus.textContent = "Receiving";
    if (next.grids.length > 0 && wsprWindow.mapAddLocator) {
      wsprWindow.mapAddLocator(next.raw, next.grids, "wspr", next.station, {
        ...msg,
@@ -251,7 +256,7 @@ document.getElementById("settings-clear-wspr-history")?.addEventListener("click"
  })();
 });
 function onServerWspr(msg) {
-  if (wsprStatus) wsprStatus.textContent = "Receiving";
+  if (wsprStatus && isActiveRigDecode(msg.rig_id)) wsprStatus.textContent = "Receiving";
  const next = normalizeServerWsprMessage(msg);
  if (next.grids.length > 0 && wsprWindow.mapAddLocator) {
    wsprWindow.mapAddLocator(next.raw, next.grids, "wspr", next.station, {
@@ -267,5 +272,6 @@ wsprWindow.trxPluginRuntime.registerDecoder({
  onBatch: onServerWsprBatch,
  restore: onServerWsprBatch,
  prune: pruneWsprHistoryView,
-  reset: resetWsprHistoryView
+  reset: resetWsprHistoryView,
+  rerender: renderWsprHistory
 });