Fix #244/#245/#246: carrier tracker seed/cache/freshness model

Replace the dated editorial fallback positions baked into the registry
with a one-shot seed file + persistent observation cache. The user's
runtime cache now reflects what THIS install has actually observed,
not what USNI published on March 9, 2026. A year from now, the cache
holds a year of observations and the seed is irrelevant.

== #244: dated editorial coordinates out of the registry ==

CARRIER_REGISTRY no longer carries fallback_lat/lng/heading/desc.
Those fields are deleted. The registry is now identity + homeport
only.

New file: backend/data/carrier_seed.json
  - Read-only, shipped with every release.
  - Used ONCE on first-ever startup to bootstrap carrier_cache.json.
  - Each entry stamped with position_confidence="seed" and the actual
    as-of date (2026-03-09), NOT now().

== #245: approximate confidence for headline-derived positions ==

_parse_carrier_positions_from_news() now stamps every GDELT-derived
entry with position_confidence="approximate" so the UI knows the
coordinate is a region-centroid match, not a precise observation.
After the freshness window the label rolls over to
"stale_approximate" so old-and-imprecise is distinguishable from
recent-and-imprecise.

The article's actual seendate is used as position_source_at instead
of now(), so the "last reported X days ago" badge is honest.

== #246: freshness is labelling, not eviction ==

The cache always preserves the last position the system observed,
forever. What changes is the position_confidence label:
  - within configurable window (default 14d, env-overridable via
    SHADOWBROKER_CARRIER_FRESHNESS_DAYS) -> "recent"
  - older -> "stale"
  - seed-bootstrap entries that were never refreshed -> "seed"
  - homeport defaults (carrier added post-install) -> "homeport_default"
  - headline-derived (any age, fresh) -> "approximate"
  - headline-derived (older than window) -> "stale_approximate"

The position itself never reverts to the seed or the registry. The
user always sees the last position the system observed. Per the
user's explicit guidance: "from there have it be the last position
the user has logged the carriers that way a year from now it doesnt
revert to where the ships are today".

== Other improvements ==

- CACHE_FILE moved to backend/data/carrier_cache.json so it lives in
  the volume-mounted dir under Docker compose. Previously it was at
  /app/carrier_cache.json which got wiped on every container restart
  (pre-existing bug).
- Atomic cache write (temp + os.replace) so a crash mid-write does
  not leave a truncated cache file.

== Public API shape ==

Every carrier object the API emits now includes:
  - position_confidence: seed | recent | stale | approximate |
                         stale_approximate | homeport_default
  - position_source_at:  ISO timestamp of when the underlying source
                         was observed (NOT now())
  - is_fallback:         convenience boolean for the UI; true when the
                         confidence is seed/stale/stale_approximate/
                         homeport_default

Existing fields (estimated, source, source_url, last_osint_update,
name, type, lat, lng, country, desc, wiki) are preserved exactly so
the current ShipPopup frontend renders unchanged. last_osint_update
now reflects position_source_at instead of now(), which is what the
existing "last reported MM/DD" badge always meant to show.

Tests: backend/tests/test_carrier_tracker_quality.py — 17 tests
covering seed bootstrap, subsequent-startup ignoring seed, no-seed/
no-cache homeport fallback, registry no longer has fallback fields,
freshness window labelling + env override, "year-old cache entry keeps
its position, only the label flips" regression, approximate
confidence for headline matches, GDELT seendate ISO parser, public
response shape backward compat.

Credit: tg12 (external security audit, three P1/P2 issues).

.github/workflows/ci.yml

@@ -7,28 +7,6 @@ on:
     branches: [main]
   workflow_call:
 
-# CI flake mitigation:
-# ci.yml is triggered TWICE per PR on the same commit — once directly via
-# the `pull_request` trigger above ("Frontend Tests & Build" check) and once
-# via `workflow_call` from docker-publish.yml ("CI Gate / Frontend Tests &
-# Build" check). Both jobs land on the same Actions runner pool at the same
-# time and fight for CPU/RAM. Under contention, React's reconciliation in
-# `messagesViewFirstContact.test.tsx > removes an approved contact …`
-# overruns its 5s waitFor timeout — that's the single failure mode we've
-# seen flake on PRs #226, #237, #261, #262, #265, #294, #303, and the
-# fd7d6fa push. Backend tests and every other frontend test pass under
-# the same conditions, which is what made this look random.
-#
-# Pinning a concurrency group on the SHA (PR head, or the pushed commit
-# for main) serializes the two invocations so neither starves the other.
-# We use cancel-in-progress: false so the second one queues instead of
-# cancelling — cancelling could leave the PR check stuck "Expected" if
-# only one of the two ever finishes. Total CI time grows by ~2 min in
-# exchange for deterministic outcomes.
-concurrency:
-  group: ci-${{ github.event.pull_request.head.sha || github.sha }}
-  cancel-in-progress: false
-
 jobs:
   frontend:
     name: Frontend Tests & Build

.gitignore

@@ -261,32 +261,3 @@ backend/data/wormhole_stdout.log
 
 # Compressed snapshot archives (can be 100 MB+)
 *.json.gz
-
-# ──────────────────────────────────────────────────────────────────────
-# AI assistant / coding-agent scratch
-# ──────────────────────────────────────────────────────────────────────
-# Per-tool config + scratch directories. These are private to whichever
-# coding agent the operator happens to be using and have no business in
-# the repo. If a tool's instructions need to be canonical for the project,
-# we'll put them in docs/ explicitly — not let the agent dump them at the
-# repo root.
-
-# OpenAI Codex CLI
-.codex/
-.codex-app-schema/
-.codex-app-ts/
-
-# Per-agent instruction files dropped at repo root by various tools.
-# These are operator-side preferences, not part of the project contract.
-AGENTS.md
-GEMINI.md
-CLAUDE.md
-.github/copilot-instructions.md
-
-# Stale AI-generated test file that referenced fields that don't exist in
-# the current `_parse_carrier_positions_from_news` implementation. Kept
-# ignored so it doesn't accidentally get committed if it shows up again
-# from a tool that's working off an out-of-date understanding of the
-# module. If a real test for that function is needed, write it under a
-# meaningful name in tests/test_carrier_tracker_quality.py.
-backend/tests/test_carrier_tracker_region_centers.py

.gitlab-ci.yml

@@ -13,10 +13,6 @@
 #   2. Reverse-mirrors main back to GitHub (only if commits land directly
 #      on GitLab) so the two sources stay in sync.
 #
-# Pipelines on this repo were instant-failing for free-tier accounts until
-# identity verification was added — the May 2026 bump in this comment is
-# the marker commit that confirms runner allocation after verification.
-#
 # Auth notes:
 #   - The image build/push uses $CI_JOB_TOKEN, which GitLab provides
 #     automatically. No credentials need to be configured.
@@ -52,11 +48,7 @@ variables:
     - docker info
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
     - docker run --privileged --rm tonistiigi/binfmt --install all
-    # buildx --driver docker-container can't read TLS from the env vars
-    # the GitLab dind service exports. Wrap them in a docker context and
-    # bind buildx to it. See https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-buildx
-    - docker context create tls-env
-    - docker buildx create --use --name multiarch --driver docker-container tls-env
+    - docker buildx create --use --name multiarch --driver docker-container
 
 # ── Backend image ────────────────────────────────────────────────────────
 build-backend:

README.md

@@ -174,7 +174,7 @@ ShadowBroker v0.9.7 ships **InfoNet** (decentralized intelligence mesh + Soverei
 | Channel | Privacy Status | Details |
 |---|---|---|
 | **Meshtastic / APRS** | **PUBLIC** | RF radio transmissions are public and interceptable by design. |
-| **InfoNet Gate Chat** | **OBFUSCATED** | Messages are obfuscated with gate personas and canonical payload signing, but NOT end-to-end encrypted. Metadata is not hidden despite being designed through Tor and Reticulum (Work in progress). |
+| **InfoNet Gate Chat** | **OBFUSCATED** | Messages are obfuscated with gate personas and canonical payload signing, but NOT end-to-end encrypted. Metadata is not hidden. |
 | **Dead Drop DMs** | **STRONGEST CURRENT LANE** | Token-based epoch mailbox with SAS word verification. Strongest lane in this build, but not yet confidently private. |
 | **Sovereign Shell governance** | **PUBLIC LEDGER** | Petitions, votes, upgrade hashes, and dispute stakes are signed events on a public hashchain. Pseudonymous via gate persona, but governance actions are intentionally observable. |
 | **Privacy primitives (RingCT / stealth / DEX)** | **NOT YET WIRED** | Locked Protocol contracts are in place, but the cryptographic scheme has not been chosen. The privacy-core Rust crate is the integration target for a future sprint. |
@@ -199,7 +199,7 @@ The first decentralized intelligence communication and governance layer built di
 
 **Communication layer (since v0.9.6):**
 
-* **InfoNet Experimental Testnet** — A global, obfuscated message relay using Tor and Reticulum. Anyone running ShadowBroker can transmit and receive on the InfoNet. Messages pass through a Wormhole relay layer with gate personas, Ed25519 canonical payload signing, and transport obfuscation.
+* **InfoNet Experimental Testnet** — A global, obfuscated message relay. Anyone running ShadowBroker can transmit and receive on the InfoNet. Messages pass through a Wormhole relay layer with gate personas, Ed25519 canonical payload signing, and transport obfuscation.
 * **Mesh Chat Panel** — Three-tab interface: **INFONET** (gate chat with obfuscated transport), **MESH** (Meshtastic radio integration), **DEAD DROP** (peer-to-peer message exchange with token-based epoch mailboxes — strongest current lane).
 * **Gate Persona System** — Pseudonymous identities with Ed25519 signing keys, prekey bundles, SAS word contact verification, and abuse reporting.
 * **Mesh Terminal** — Built-in CLI: `send`, `dm`, market commands, gate state inspection. Draggable panel, minimizes to the top bar. Type `help` to see all commands.

backend/.env.example

@@ -11,13 +11,6 @@ AIS_API_KEY=              # https://aisstream.io/ — free tier WebSocket key
 
 # ── Optional ───────────────────────────────────────────────────
 
-# AISHub REST fallback. Used when stream.aisstream.io is unreachable
-# (e.g. their cert expires or server goes offline). Free tier requires
-# registration at https://www.aishub.net/api. Poll cadence defaults to
-# 20 min to stay courteous; tunable via AISHUB_POLL_INTERVAL_MINUTES.
-# AISHUB_USERNAME=
-# AISHUB_POLL_INTERVAL_MINUTES=20
-
 # Override allowed CORS origins (comma-separated). Defaults to localhost + LAN auto-detect.
 # CORS_ORIGINS=http://192.168.1.50:3000,https://my-domain.com
 
@@ -31,28 +24,14 @@ AIS_API_KEY=              # https://aisstream.io/ — free tier WebSocket key
 # Requires MESH_DEBUG_MODE=true; do not enable this for ordinary use.
 # ALLOW_INSECURE_ADMIN=false
 
-# Per-install operator handle. Round 7a: every outbound third-party API
-# call (Wikipedia, Wikidata, Nominatim, GDELT, OpenMHz, Broadcastify,
-# weather.gov, NUFORC, etc.) includes this handle in the User-Agent so
-# upstreams can rate-limit / contact the specific install instead of
-# treating every Shadowbroker user as one entity.
-#
-# Default empty -> a stable pseudonymous handle (e.g. "operator-7f3a92") is
-# auto-generated on first run and persisted to backend/data/operator_handle.json.
-# Operators who want a meaningful handle (real name, org, GitHub login) can
-# set it here. Special characters are sanitized to dashes.
-# OPERATOR_HANDLE=
+# Default outbound User-Agent for all third-party HTTP fetchers.
+# Project-generic by default — does NOT include any personal contact info or
+# operator-specific identifier. Override only if you run a public relay and
+# want upstreams to be able to reach you (e.g. Nominatim/OSM usage policy).
+# SHADOWBROKER_USER_AGENT=ShadowBroker-OSINT/0.9 (contact: ops@example.com)
 
-# Default outbound User-Agent for all third-party HTTP fetchers. Operators
-# who run a public relay and want a completely custom UA can set this; it
-# bypasses the per-operator helper entirely. Most installs should leave it
-# unset and use OPERATOR_HANDLE instead.
-# SHADOWBROKER_USER_AGENT=
-
-# Nominatim-specific User-Agent override (OSM usage policy). Leave unset to
-# use the per-install handle (default) — set only if you have a registered
-# Nominatim relay identity.
-# NOMINATIM_USER_AGENT=
+# User-Agent for Nominatim geocoding requests (per OSM usage policy).
+# NOMINATIM_USER_AGENT=ShadowBroker/1.0
 
 # ── Third-party fetcher opt-ins ────────────────────────────────
 # These data sources phone home to politically/commercially sensitive

backend/data/release_digests.json

@@ -36,15 +36,5 @@
     "ShadowBroker_v0.9.79.zip": "f6877c1d66614525315ea82636ce9f7b41178332c4dbf90d27431a1ea1d9cd47",
     "ShadowBroker_0.9.79_x64-setup.exe": "f7b676ada45cac7da05868b0a353678c9ee700e3abcf456a7c0c038c36da446f",
     "ShadowBroker_0.9.79_x64_en-US.msi": "e0713c3cdda184cfbea750bfac0d62a35678fec00847e6476f2cac8e7e42046e"
-  },
-  "v0.9.8": {
-    "ShadowBroker_v0.9.8.zip": "183bb5cd62b9b9349d95df5ef7696cb6ca810ab4b991fa9dab6f898af4c7a175",
-    "ShadowBroker_0.9.8_x64-setup.exe": "94a0309862e9c81c92cdcbfea8eec9dbb97eef19ded82b26217b397defbc810c",
-    "ShadowBroker_0.9.8_x64_en-US.msi": "fe22f9d51e4360d74c18a7250c2fbb9ed4fa4c7a884b3ac0d04a21115466386b"
-  },
-  "v0.9.81": {
-    "ShadowBroker_v0.9.81.zip": "f81f454bdc88e9a32c351df38212b8cfa624704d65764b971bb091eef62259c6",
-    "ShadowBroker_0.9.81_x64-setup.exe": "25e9a95d0d8ce959a7d08fe8e7406772ae24b596652793e81d1de5d02510a5a6",
-    "ShadowBroker_0.9.81_x64_en-US.msi": "34e655fc0c0f195ee4ac978f228a4b2b9d5565253b8771aca9ef4693409e9e70"
   }
 }

backend/limiter.py

@@ -1,108 +1,4 @@
-"""Rate-limit key function for slowapi.
-
-Issue #287 (tg12): the previous implementation used
-``slowapi.util.get_remote_address`` which only ever returns
-``request.client.host``. Behind the bundled Next.js proxy (or any other
-reverse proxy), every connected operator's ``client.host`` is the
-frontend container's bridge IP. ``@limiter.limit("120/minute")`` then
-collapses into one shared bucket for everybody on the same backend —
-one heavy tab can starve every other operator on the node.
-
-This module replaces that key function with one that:
-
-  * Reads ``X-Forwarded-For`` ONLY when the immediate peer is a trusted
-    frontend container (same allowlist used by the Docker bridge
-    local-operator trust path — see ``backend/auth.py`` ``#250``).
-  * Picks the FIRST entry in the XFF chain. That's the client end of
-    the proxy chain, which is the operator we want to bucket on.
-  * Falls back to ``request.client.host`` for any peer that isn't on
-    the trusted-frontend allowlist. Direct hits, unrelated containers,
-    and unknown hosts are bucketed exactly like before — there is no
-    way for an untrusted caller to spoof XFF and steal another
-    operator's rate-limit bucket.
-
-Single-operator nodes are unaffected: the frontend resolves to one IP,
-that IP is on the trust list, the XFF header is read, and you get one
-bucket per operator (i.e. you).
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
 from slowapi import Limiter
 from slowapi.util import get_remote_address
 
-
-def _client_host(request: Any) -> str:
-    """Return the immediate peer's IP, normalised to a lowercase string."""
-    client = getattr(request, "client", None)
-    if client is None:
-        return ""
-    host = getattr(client, "host", "") or ""
-    return host.lower()
-
-
-def _first_forwarded_for(value: str) -> str:
-    """Return the first non-empty entry from an ``X-Forwarded-For`` header.
-
-    RFC 7239 / de-facto XFF format is ``client, proxy1, proxy2, …``. The
-    client end is what we want to bucket on. Empty parts (which appear
-    in some malformed headers) are skipped so we don't end up keying on
-    an empty string.
-    """
-    for raw in value.split(","):
-        candidate = raw.strip()
-        if candidate:
-            return candidate.lower()
-    return ""
-
-
-def _is_trusted_frontend_peer(host: str) -> bool:
-    """True iff ``host`` is one of the resolved trusted-frontend IPs.
-
-    Imported lazily so this module stays usable in unit tests that
-    don't want to pull the whole auth module into scope.
-    """
-    if not host:
-        return False
-    try:
-        from auth import _resolve_trusted_bridge_ips
-    except Exception:  # pragma: no cover - defensive
-        return False
-    try:
-        trusted_ips = _resolve_trusted_bridge_ips()
-    except Exception:  # pragma: no cover - defensive
-        return False
-    return host in trusted_ips
-
-
-def shadowbroker_rate_limit_key(request: Any) -> str:
-    """slowapi key_func that is proxy-aware on trusted frontend peers only.
-
-    Behaviour matrix:
-
-    * Direct loopback / unknown peer → ``request.client.host``
-      (identical to slowapi's default ``get_remote_address``).
-    * Peer is a trusted frontend container AND ``X-Forwarded-For`` is
-      present → first XFF entry (the actual operator).
-    * Peer is a trusted frontend container but no XFF → fall back to
-      ``request.client.host`` (the bridge IP). One shared bucket for
-      everyone in that case, same as before — but you only get there
-      if the trusted frontend forgot to forward XFF, which it won't.
-    """
-    peer = _client_host(request)
-    if _is_trusted_frontend_peer(peer):
-        headers = getattr(request, "headers", None)
-        if headers is not None:
-            xff = headers.get("x-forwarded-for") or headers.get("X-Forwarded-For")
-            if xff:
-                first = _first_forwarded_for(xff)
-                if first:
-                    return first
-    # Untrusted peer (or trusted peer without XFF): match the original
-    # get_remote_address behaviour byte-for-byte.
-    return get_remote_address(request)
-
-
-limiter = Limiter(key_func=shadowbroker_rate_limit_key)
+limiter = Limiter(key_func=get_remote_address)

backend/main.py

@@ -1,4 +1,4 @@
-import os
+import os
 from dotenv import load_dotenv
 load_dotenv()
 
@@ -8,24 +8,18 @@ import asyncio
 import base64
 import hmac
 import importlib
-import ipaddress
 import secrets
 import hashlib as _hashlib_mod
 from dataclasses import dataclass, field
 from typing import Any
 from json import JSONDecodeError
 
-APP_VERSION = "0.9.81"
+APP_VERSION = "0.9.79"
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 _start_time = time.time()
 _MESH_ONLY = os.environ.get("MESH_ONLY", "").strip().lower() in ("1", "true", "yes")
-_HEADLESS_MESH_NODE_RUNTIME = os.environ.get("SHADOWBROKER_MESH_NODE_RUNTIME", "").strip().lower() in (
-    "1",
-    "true",
-    "yes",
-)
 _WARNED_LEGACY_DM_PUBKEY_LOOKUPS: set[str] = set()
 
 
@@ -1101,7 +1095,6 @@ _WORMHOLE_PUBLIC_PROFILE_FIELDS = {"wormhole_enabled"}
 _PRIVATE_LANE_CONTROL_FIELDS = {"private_lane_tier", "private_lane_policy"}
 _PUBLIC_RNS_STATUS_FIELDS = {"enabled", "ready", "configured_peers", "active_peers"}
 _NODE_PUBLIC_EVENT_HOOK_REGISTERED = False
-_NODE_RUNTIME_THREADS_STARTED = False
 _INFONET_PRIVATE_TRANSPORT_LOCK = threading.Lock()
 
 
@@ -1191,49 +1184,6 @@ def _filter_infonet_sync_records(records: list[Any]) -> list[Any]:
     ]
 
 
-def _infonet_peer_url_allowed(peer_url: str) -> bool:
-    if not _infonet_private_transport_required():
-        return True
-    return _is_private_infonet_transport(peer_transport_kind(peer_url))
-
-
-def _filter_infonet_peer_urls(peer_urls: list[str]) -> list[str]:
-    if not _infonet_private_transport_required():
-        return peer_urls
-    return [peer_url for peer_url in peer_urls if _infonet_peer_url_allowed(peer_url)]
-
-
-def _infonet_peer_requests_proxies(normalized_peer_url: str) -> dict[str, str] | None:
-    """Return requests proxy settings for a sync/push peer, enforcing private policy."""
-    transport = peer_transport_kind(normalized_peer_url)
-    if _infonet_private_transport_required() and not _is_private_infonet_transport(transport):
-        raise RuntimeError(_infonet_private_transport_error())
-    if transport != "onion":
-        return None
-    if not bool(get_settings().MESH_ARTI_ENABLED):
-        raise RuntimeError("onion peer requests require Arti to be enabled")
-    from services.wormhole_supervisor import _check_arti_ready
-
-    if not _check_arti_ready():
-        raise RuntimeError("onion peer requests require a ready Arti transport")
-    socks_port = int(get_settings().MESH_ARTI_SOCKS_PORT or 9050)
-    proxy = f"socks5h://127.0.0.1:{socks_port}"
-    return {"http": proxy, "https": proxy}
-
-
-def _local_infonet_peer_url() -> str:
-    """Return this node's advertised peer URL for HMAC peer authentication."""
-    configured = normalize_peer_url(str(getattr(get_settings(), "MESH_PUBLIC_PEER_URL", "") or ""))
-    if configured:
-        return configured
-    try:
-        from services.tor_hidden_service import tor_service
-
-        return normalize_peer_url(str(tor_service.onion_address or ""))
-    except Exception:
-        return ""
-
-
 def _ensure_infonet_private_transport_ready(reason: str = "") -> bool:
     """Warm the local onion transport before private Infonet sync.
 
@@ -1307,13 +1257,6 @@ def _refresh_node_peer_store(*, now: float | None = None) -> dict[str, Any]:
     operator_peers = configured_relay_peer_urls()
     bootstrap_seed_peers = _configured_bootstrap_seed_peer_urls()
     skipped_clearnet_peers = 0
-    pruned_clearnet_peers = 0
-    if private_transport_required:
-        for key, record in list(store._records.items()):
-            if _is_private_infonet_transport(str(getattr(record, "transport", "") or "")):
-                continue
-            del store._records[key]
-            pruned_clearnet_peers += 1
     for peer_url in operator_peers:
         transport = peer_transport_kind(peer_url)
         if not transport:
@@ -1421,7 +1364,6 @@ def _refresh_node_peer_store(*, now: float | None = None) -> dict[str, Any]:
         "node_mode": mode,
         "private_transport_required": private_transport_required,
         "skipped_clearnet_peer_count": skipped_clearnet_peers,
-        "pruned_clearnet_peer_count": pruned_clearnet_peers,
         "manifest_loaded": manifest is not None,
         "manifest_signer_id": manifest.signer_id if manifest is not None else "",
         "manifest_valid_until": int(manifest.valid_until or 0) if manifest is not None else 0,
@@ -1442,28 +1384,6 @@ def _materialize_local_infonet_state() -> None:
     from services.mesh.mesh_hashchain import infonet
 
     infonet.ensure_materialized()
-    try:
-        _hydrate_gate_store_from_chain(list(infonet.events))
-        _hydrate_dm_relay_from_chain(list(infonet.events))
-    except Exception:
-        pass
-
-
-class PeerSyncHTTPError(RuntimeError):
-    def __init__(self, status_code: int, detail: str, *, retry_after_s: int = 0):
-        self.status_code = int(status_code or 0)
-        self.retry_after_s = int(retry_after_s or 0)
-        message = str(detail or f"HTTP {self.status_code}").strip()
-        if not message.upper().startswith("HTTP"):
-            message = f"HTTP {self.status_code}: {message}"
-        super().__init__(message)
-
-
-def _parse_retry_after_seconds(value: str) -> int:
-    try:
-        return max(0, int(float(str(value or "").strip())))
-    except Exception:
-        return 0
 
 
 def _peer_sync_response(peer_url: str, body: dict[str, Any]) -> dict[str, Any]:
@@ -1497,37 +1417,13 @@ def _peer_sync_response(peer_url: str, body: dict[str, Any]) -> dict[str, Any]:
         proxy = f"socks5h://127.0.0.1:{socks_port}"
         kwargs["proxies"] = {"http": proxy, "https": proxy}
     response = _requests.post(f"{normalized}/api/mesh/infonet/sync", **kwargs)
-    # HTTP 429 must be surfaced as a typed exception carrying the
-    # Retry-After value, so finish_sync can honor it and stop hammering
-    # the upstream. Pre-fix this path just stringified the status into
-    # a ValueError, which finish_sync then ignored — keeping the
-    # upstream's rate-limit bucket full indefinitely.
-    if response.status_code == 429:
-        from services.mesh.mesh_infonet_sync_support import (
-            PeerSyncRateLimited,
-            parse_retry_after_header,
-        )
-
-        retry_after_s = parse_retry_after_header(
-            response.headers.get("Retry-After", "") or "",
-        )
-        try:
-            body_text = response.text[:200]
-        except Exception:
-            body_text = ""
-        raise PeerSyncRateLimited(
-            f"HTTP 429 from {normalized} (retry_after={retry_after_s}s): {body_text}",
-            retry_after_s=retry_after_s,
-            status=429,
-        )
     try:
         payload = response.json()
     except Exception as exc:
         raise ValueError(f"peer sync returned non-JSON response ({response.status_code})") from exc
     if response.status_code != 200:
         detail = str(payload.get("detail", "") or f"HTTP {response.status_code}").strip()
-        retry_after_s = _parse_retry_after_seconds(response.headers.get("Retry-After", ""))
-        raise PeerSyncHTTPError(response.status_code, detail, retry_after_s=retry_after_s)
+        raise ValueError(detail or f"HTTP {response.status_code}")
     if not isinstance(payload, dict):
         raise ValueError("peer sync returned malformed payload")
     return payload
@@ -1566,64 +1462,9 @@ def _hydrate_gate_store_from_chain(events: list[dict]) -> int:
     return count
 
 
-def _hydrate_dm_relay_from_chain(events: list[dict]) -> int:
-    """Copy accepted dm_message chain events into the local encrypted DM relay."""
-    import hashlib
-
-    from services.mesh.mesh_dm_relay import dm_relay
+def _sync_from_peer(peer_url: str, *, page_limit: int = 100, max_rounds: int = 5) -> tuple[bool, str, bool]:
     from services.mesh.mesh_hashchain import infonet
 
-    count = 0
-    for evt in events:
-        if evt.get("event_type") != "dm_message":
-            continue
-        event_id = str(evt.get("event_id", "") or "").strip()
-        if not event_id or event_id not in infonet.event_index:
-            continue
-        canonical = infonet.events[infonet.event_index[event_id]]
-        payload = canonical.get("payload") if isinstance(canonical.get("payload"), dict) else {}
-        sender_token_hash = hashlib.sha256(
-            f"hashchain-dm-sender|{event_id}|{canonical.get('node_id', '')}".encode("utf-8")
-        ).hexdigest()
-        try:
-            result = dm_relay.deposit(
-                sender_id=str(canonical.get("node_id", "") or ""),
-                raw_sender_id=str(canonical.get("node_id", "") or ""),
-                recipient_id=str(payload.get("recipient_id", "") or ""),
-                ciphertext=str(payload.get("ciphertext", "") or ""),
-                msg_id=str(payload.get("msg_id", "") or ""),
-                delivery_class=str(payload.get("delivery_class", "") or ""),
-                recipient_token=str(payload.get("recipient_token", "") or "") or None,
-                sender_seal=str(payload.get("sender_seal", "") or ""),
-                sender_token_hash=sender_token_hash,
-                payload_format=str(payload.get("format", "dm1") or "dm1"),
-                session_welcome=str(payload.get("session_welcome", "") or ""),
-            )
-            if result.get("ok"):
-                count += 1
-        except Exception:
-            pass
-    return count
-
-
-def _sync_from_peer(
-    peer_url: str,
-    *,
-    page_limit: int = 100,
-    max_rounds: int = 5,
-) -> tuple[bool, str, bool, int]:
-    """Sync the local Infonet chain against ``peer_url``.
-
-    Returns ``(ok, error, forked, retry_after_s)``. The fourth tuple
-    element is non-zero only when the peer responded with HTTP 429
-    and supplied a parseable ``Retry-After`` header — see the typed
-    ``PeerSyncRateLimited`` exception in mesh_infonet_sync_support.py.
-    Callers should pass that value to ``finish_sync(retry_after_s=...)``
-    so the next attempt actually waits.
-    """
-    from services.mesh.mesh_hashchain import infonet
-    from services.mesh.mesh_infonet_sync_support import PeerSyncRateLimited
-
     rounds = 0
     while rounds < max_rounds:
         body = {
@@ -1631,11 +1472,7 @@ def _sync_from_peer(
             "locator": infonet.get_locator(),
             "limit": page_limit,
         }
-        try:
-            payload = _peer_sync_response(peer_url, body)
-        except PeerSyncRateLimited as exc:
-            # Bubble up the retry-after so finish_sync can honor it.
-            return False, str(exc), False, exc.retry_after_s
+        payload = _peer_sync_response(peer_url, body)
         if bool(payload.get("forked")):
             # Auto-recover small local forks: if the local chain is tiny
             # (< 20 events) and the remote has a longer chain, reset local
@@ -1651,24 +1488,23 @@ def _sync_from_peer(
                 )
                 infonet.reset_chain()
                 continue  # retry sync with clean genesis locator
-            return False, "fork detected", True, 0
+            return False, "fork detected", True
         events = payload.get("events", [])
         if not isinstance(events, list):
-            return False, "peer sync events must be a list", False, 0
+            return False, "peer sync events must be a list", False
         if not events:
-            return True, "", False, 0
+            return True, "", False
         result = infonet.ingest_events(events)
         _hydrate_gate_store_from_chain(events)
-        _hydrate_dm_relay_from_chain(events)
         rejected = list(result.get("rejected", []) or [])
         if rejected:
-            return False, f"sync ingest rejected {len(rejected)} event(s)", False, 0
+            return False, f"sync ingest rejected {len(rejected)} event(s)", False
         if int(result.get("accepted", 0) or 0) == 0 and int(result.get("duplicates", 0) or 0) >= len(events):
-            return True, "", False, 0
+            return True, "", False
         if len(events) < page_limit:
-            return True, "", False, 0
+            return True, "", False
         rounds += 1
-    return True, "", False, 0
+    return True, "", False
 
 
 def _run_public_sync_cycle() -> SyncWorkerState:
@@ -1722,8 +1558,6 @@ def _run_public_sync_cycle() -> SyncWorkerState:
 
     last_error = "sync failed"
     for record in peers:
-        retry_after_s = 0
-        http_status_code = 0
         started = begin_sync(
             current_state,
             peer_url=record.peer_url,
@@ -1733,23 +1567,11 @@ def _run_public_sync_cycle() -> SyncWorkerState:
         with _NODE_RUNTIME_LOCK:
             set_sync_state(started)
         try:
-            ok, error, forked, retry_after_s = _sync_from_peer(record.peer_url)
-        except PeerSyncHTTPError as exc:
-            # _sync_from_peer catches PeerSyncRateLimited internally (4-tuple
-            # path for 429 with Retry-After). Other non-200 statuses surface
-            # here as PeerSyncHTTPError — pull retry_after_s + status off it
-            # so the cooldown calculation below can honor server hints even
-            # for non-429 throttling responses.
-            ok = False
-            error = str(exc)
-            forked = False
-            retry_after_s = int(exc.retry_after_s or 0)
-            http_status_code = int(exc.status_code or 0)
+            ok, error, forked = _sync_from_peer(record.peer_url)
         except Exception as exc:
             ok = False
             error = str(exc or type(exc).__name__)
             forked = False
-            retry_after_s = 0
         if ok:
             store.mark_seen(record.peer_url, "sync", now=time.time())
             store.mark_sync_success(record.peer_url, now=time.time())
@@ -1775,10 +1597,6 @@ def _run_public_sync_cycle() -> SyncWorkerState:
                 getattr(settings, "MESH_BOOTSTRAP_SEED_FAILURE_COOLDOWN_S", cooldown_s)
                 or cooldown_s
             )
-        if http_status_code == 429:
-            failure_count = max(int(getattr(record, "failure_count", 0) or 0), current_state.consecutive_failures)
-            exponential_429_s = min(900, 60 * (2 ** min(failure_count, 4)))
-            cooldown_s = max(cooldown_s, retry_after_s, exponential_429_s)
         store.mark_failure(
             record.peer_url,
             "sync",
@@ -1789,7 +1607,7 @@ def _run_public_sync_cycle() -> SyncWorkerState:
         store.save()
         failure_backoff_s = int(settings.MESH_SYNC_FAILURE_BACKOFF_S or 60)
         if is_seed_peer:
-            failure_backoff_s = max(failure_backoff_s, max(1, cooldown_s))
+            failure_backoff_s = min(failure_backoff_s, max(1, cooldown_s))
         updated = finish_sync(
             started,
             ok=False,
@@ -1800,12 +1618,6 @@ def _run_public_sync_cycle() -> SyncWorkerState:
             now=time.time(),
             interval_s=int(get_settings().MESH_SYNC_INTERVAL_S or 300),
             failure_backoff_s=failure_backoff_s,
-            # 429 retry-storm fix: when the peer returned HTTP 429 with
-            # a Retry-After header, finish_sync uses max(exponential,
-            # retry_after) for next_sync_due_at — so we actually wait
-            # the time the upstream asked for instead of hammering
-            # every 60s and keeping its rate-limit bucket full forever.
-            retry_after_s=retry_after_s,
         )
         with _NODE_RUNTIME_LOCK:
             set_sync_state(updated)
@@ -1889,7 +1701,7 @@ def _propagate_public_event_to_peers(event_dict: dict[str, Any]) -> None:
 
     if not _participant_node_enabled():
         return
-    if not _filter_infonet_peer_urls(authenticated_push_peer_urls()):
+    if not authenticated_push_peer_urls():
         return
 
     envelope = MeshEnvelope(
@@ -1923,45 +1735,6 @@ def _schedule_public_event_propagation(event_dict: dict[str, Any]) -> None:
     ).start()
 
 
-def _infonet_node_runtime_requested() -> bool:
-    return (not _MESH_ONLY) or _HEADLESS_MESH_NODE_RUNTIME
-
-
-def _start_infonet_node_runtime(reason: str = "startup") -> None:
-    """Start sync/push/pull workers for participant nodes."""
-    global _NODE_PUBLIC_EVENT_HOOK_REGISTERED, _NODE_RUNTIME_THREADS_STARTED
-
-    if not _infonet_node_runtime_requested():
-        return
-    try:
-        from services.mesh.mesh_hashchain import register_public_event_append_hook
-
-        _materialize_local_infonet_state()
-        _refresh_node_peer_store()
-        if _node_runtime_supported():
-            if not _participant_node_enabled():
-                logger.info("Infonet participant auto-enabled for private seed sync")
-                _set_participant_node_enabled(True)
-            threading.Thread(
-                target=lambda: _ensure_infonet_private_transport_ready(reason),
-                daemon=True,
-                name="infonet-private-transport-warmup",
-            ).start()
-            _NODE_SYNC_STOP.clear()
-            if not _NODE_RUNTIME_THREADS_STARTED:
-                threading.Thread(target=_public_infonet_sync_loop, daemon=True).start()
-                threading.Thread(target=_http_peer_push_loop, daemon=True).start()
-                threading.Thread(target=_http_gate_push_loop, daemon=True).start()
-                threading.Thread(target=_http_gate_pull_loop, daemon=True).start()
-                _NODE_RUNTIME_THREADS_STARTED = True
-            _kick_public_sync_background(reason)
-        if not _NODE_PUBLIC_EVENT_HOOK_REGISTERED:
-            register_public_event_append_hook(_schedule_public_event_propagation)
-            _NODE_PUBLIC_EVENT_HOOK_REGISTERED = True
-    except Exception as e:
-        logger.warning(f"Node bootstrap runtime failed to initialize: {e}")
-
-
 # ─── Background HTTP Peer Push Worker ────────────────────────────────────
 # Runs alongside the sync loop.  Every PUSH_INTERVAL seconds, batches new
 # Infonet events and sends them via HMAC-authenticated POST to push peers.
@@ -1969,7 +1742,6 @@ def _start_infonet_node_runtime(reason: str = "startup") -> None:
 _PEER_PUSH_INTERVAL_S = 10
 _PEER_PUSH_BATCH_SIZE = 50
 _peer_push_last_index: dict[str, int] = {}  # peer_url → last pushed event index
-_INFONET_SYNC_RATE_LIMIT = "600/minute"
 
 
 def _http_peer_push_loop() -> None:
@@ -1991,7 +1763,7 @@ def _http_peer_push_loop() -> None:
             # loop on the global secret being set — an install that only
             # configures per-peer secrets is now valid.
 
-            peers = _filter_infonet_peer_urls(authenticated_push_peer_urls())
+            peers = authenticated_push_peer_urls()
             if not peers:
                 _NODE_SYNC_STOP.wait(_PEER_PUSH_INTERVAL_S)
                 continue
@@ -2019,8 +1791,7 @@ def _http_peer_push_loop() -> None:
                         ensure_ascii=False,
                     ).encode("utf-8")
 
-                    sender_url = _local_infonet_peer_url()
-                    peer_key = resolve_peer_key_for_url(sender_url)
+                    peer_key = resolve_peer_key_for_url(normalized)
                     if not peer_key:
                         continue
                     import hmac as _hmac_mod2
@@ -2028,21 +1799,14 @@ def _http_peer_push_loop() -> None:
                     hmac_hex = _hmac_mod2.new(peer_key, body_bytes, _hashlib_mod2.sha256).hexdigest()
 
                     timeout = int(get_settings().MESH_RELAY_PUSH_TIMEOUT_S or 10)
-                    proxies = _infonet_peer_requests_proxies(normalized)
-                    request_kwargs: dict[str, Any] = {
-                        "data": body_bytes,
-                        "headers": {
-                            "Content-Type": "application/json",
-                            "X-Peer-Url": sender_url,
-                            "X-Peer-HMAC": hmac_hex,
-                        },
-                        "timeout": timeout,
-                    }
-                    if proxies:
-                        request_kwargs["proxies"] = proxies
                     resp = _requests.post(
                         f"{normalized}/api/mesh/infonet/peer-push",
-                        **request_kwargs,
+                        data=body_bytes,
+                        headers={
+                            "Content-Type": "application/json",
+                            "X-Peer-HMAC": hmac_hex,
+                        },
+                        timeout=timeout,
                     )
                     if resp.status_code == 200:
                         _peer_push_last_index[normalized] = last_idx + len(batch)
@@ -2082,7 +1846,7 @@ def _http_gate_pull_loop() -> None:
 
             # Issue #256: per-peer key resolution; see _http_peer_push_loop.
 
-            peers = _filter_infonet_peer_urls(authenticated_push_peer_urls())
+            peers = authenticated_push_peer_urls()
             if not peers:
                 _NODE_SYNC_STOP.wait(_GATE_PULL_INTERVAL_S)
                 continue
@@ -2092,8 +1856,7 @@ def _http_gate_pull_loop() -> None:
                 if not normalized:
                     continue
 
-                sender_url = _local_infonet_peer_url()
-                peer_key = resolve_peer_key_for_url(sender_url)
+                peer_key = resolve_peer_key_for_url(normalized)
                 if not peer_key:
                     continue
 
@@ -2113,21 +1876,14 @@ def _http_gate_pull_loop() -> None:
                     discovery_hmac = _hmac_pull.new(peer_key, discovery_body, _hashlib_pull.sha256).hexdigest()
 
                     timeout = int(get_settings().MESH_RELAY_PUSH_TIMEOUT_S or 10)
-                    proxies = _infonet_peer_requests_proxies(normalized)
-                    discovery_kwargs: dict[str, Any] = {
-                        "data": discovery_body,
-                        "headers": {
-                            "Content-Type": "application/json",
-                            "X-Peer-Url": sender_url,
-                            "X-Peer-HMAC": discovery_hmac,
-                        },
-                        "timeout": timeout,
-                    }
-                    if proxies:
-                        discovery_kwargs["proxies"] = proxies
                     resp = _requests.post(
                         f"{normalized}/api/mesh/gate/peer-pull",
-                        **discovery_kwargs,
+                        data=discovery_body,
+                        headers={
+                            "Content-Type": "application/json",
+                            "X-Peer-HMAC": discovery_hmac,
+                        },
+                        timeout=timeout,
                     )
                     if resp.status_code != 200:
                         continue
@@ -2157,20 +1913,14 @@ def _http_gate_pull_loop() -> None:
 
                         pull_hmac = _hmac_pull.new(peer_key, pull_body, _hashlib_pull.sha256).hexdigest()
 
-                        pull_kwargs: dict[str, Any] = {
-                            "data": pull_body,
-                            "headers": {
-                                "Content-Type": "application/json",
-                                "X-Peer-Url": sender_url,
-                                "X-Peer-HMAC": pull_hmac,
-                            },
-                            "timeout": timeout,
-                        }
-                        if proxies:
-                            pull_kwargs["proxies"] = proxies
                         pull_resp = _requests.post(
                             f"{normalized}/api/mesh/gate/peer-pull",
-                            **pull_kwargs,
+                            data=pull_body,
+                            headers={
+                                "Content-Type": "application/json",
+                                "X-Peer-HMAC": pull_hmac,
+                            },
+                            timeout=timeout,
                         )
                         if pull_resp.status_code != 200:
                             continue
@@ -2221,7 +1971,7 @@ def _http_gate_push_loop() -> None:
 
             # Issue #256: per-peer key resolution; see _http_peer_push_loop.
 
-            peers = _filter_infonet_peer_urls(authenticated_push_peer_urls())
+            peers = authenticated_push_peer_urls()
             if not peers:
                 _NODE_SYNC_STOP.wait(_PEER_PUSH_INTERVAL_S)
                 continue
@@ -2234,8 +1984,7 @@ def _http_gate_push_loop() -> None:
                 if not normalized:
                     continue
 
-                sender_url = _local_infonet_peer_url()
-                peer_key = resolve_peer_key_for_url(sender_url)
+                peer_key = resolve_peer_key_for_url(normalized)
                 if not peer_key:
                     continue
 
@@ -2266,21 +2015,14 @@ def _http_gate_push_loop() -> None:
                         hmac_hex = _hmac_mod3.new(peer_key, body_bytes, _hashlib_mod3.sha256).hexdigest()
 
                         timeout = int(get_settings().MESH_RELAY_PUSH_TIMEOUT_S or 10)
-                        proxies = _infonet_peer_requests_proxies(normalized)
-                        request_kwargs: dict[str, Any] = {
-                            "data": body_bytes,
-                            "headers": {
-                                "Content-Type": "application/json",
-                                "X-Peer-Url": sender_url,
-                                "X-Peer-HMAC": hmac_hex,
-                            },
-                            "timeout": timeout,
-                        }
-                        if proxies:
-                            request_kwargs["proxies"] = proxies
                         resp = _requests.post(
                             f"{normalized}/api/mesh/gate/peer-push",
-                            **request_kwargs,
+                            data=body_bytes,
+                            headers={
+                                "Content-Type": "application/json",
+                                "X-Peer-HMAC": hmac_hex,
+                            },
+                            timeout=timeout,
                         )
                         if resp.status_code == 200:
                             peer_counts[gate_id] = last + len(batch)
@@ -2622,8 +2364,32 @@ async def lifespan(app: FastAPI):
             daemon=True,
             name="wormhole-startup-sync",
         ).start()
+        try:
+            from services.mesh.mesh_hashchain import register_public_event_append_hook
 
-    _start_infonet_node_runtime("startup")
+            _materialize_local_infonet_state()
+            _refresh_node_peer_store()
+            if _node_runtime_supported():
+                if not _participant_node_enabled():
+                    logger.info("Infonet participant auto-enabled for private seed sync")
+                    _set_participant_node_enabled(True)
+                threading.Thread(
+                    target=lambda: _ensure_infonet_private_transport_ready("startup"),
+                    daemon=True,
+                    name="infonet-private-transport-warmup",
+                ).start()
+                _NODE_SYNC_STOP.clear()
+                threading.Thread(target=_public_infonet_sync_loop, daemon=True).start()
+                _kick_public_sync_background("startup")
+                threading.Thread(target=_http_peer_push_loop, daemon=True).start()
+                threading.Thread(target=_http_gate_push_loop, daemon=True).start()
+                threading.Thread(target=_http_gate_pull_loop, daemon=True).start()
+            global _NODE_PUBLIC_EVENT_HOOK_REGISTERED
+            if not _NODE_PUBLIC_EVENT_HOOK_REGISTERED:
+                register_public_event_append_hook(_schedule_public_event_propagation)
+                _NODE_PUBLIC_EVENT_HOOK_REGISTERED = True
+        except Exception as e:
+            logger.warning(f"Node bootstrap runtime failed to initialize: {e}")
 
     if not _MESH_ONLY:
         # Prime the static route/airport database from vrs-standing-data.adsb.lol
@@ -2862,91 +2628,6 @@ def _redact_public_event(event: dict) -> dict:
     return _redact_vote_gate(_redact_key_rotate_payload(_redact_gate_metadata(event)))
 
 
-def _is_loopback_host(host: str) -> bool:
-    value = str(host or "").strip().lower()
-    if not value:
-        return False
-    if value.startswith("[") and "]" in value:
-        value = value[1 : value.index("]")]
-    if ":" in value and value.count(":") == 1:
-        value = value.rsplit(":", 1)[0]
-    if value in {"localhost", "ip6-localhost"}:
-        return True
-    try:
-        return ipaddress.ip_address(value).is_loopback
-    except ValueError:
-        return False
-
-
-def _is_onion_host(host: str) -> bool:
-    value = str(host or "").strip().lower()
-    if not value:
-        return False
-    if ":" in value and value.count(":") == 1:
-        value = value.rsplit(":", 1)[0]
-    return value.endswith(".onion")
-
-
-def _forwarded_for_hosts(request) -> list[str]:
-    headers = getattr(request, "headers", {}) or {}
-    hosts: list[str] = []
-    x_forwarded_for = str(headers.get("x-forwarded-for", "") or "")
-    hosts.extend(part.strip() for part in x_forwarded_for.split(",") if part.strip())
-    forwarded = str(headers.get("forwarded", "") or "")
-    for section in forwarded.split(","):
-        for item in section.split(";"):
-            key, sep, value = item.strip().partition("=")
-            if sep and key.strip().lower() == "for":
-                hosts.append(value.strip().strip('"').strip("[]"))
-    return hosts
-
-
-def _request_appears_private_infonet_transport(request) -> bool:
-    """Return whether a sync request is safe to carry private ledger events.
-
-    This is intentionally fail-closed for the private event surface only. A
-    questionable request still gets public events; gate/DM ciphertext simply
-    stays out of the response.
-    """
-    if not _infonet_private_transport_required() or request is None:
-        return False
-
-    forwarded_hosts = _forwarded_for_hosts(request)
-    if forwarded_hosts and any(not (_is_loopback_host(host) or _is_onion_host(host)) for host in forwarded_hosts):
-        return False
-
-    client = getattr(request, "client", None)
-    client_host = str(getattr(client, "host", "") or "")
-    headers = getattr(request, "headers", {}) or {}
-    host_header = str(headers.get("host", "") or "")
-    url_host = str(getattr(getattr(request, "url", None), "hostname", "") or "")
-    return any(
-        (
-            _is_loopback_host(client_host),
-            _is_loopback_host(host_header),
-            _is_loopback_host(url_host),
-            _is_onion_host(host_header),
-            _is_onion_host(url_host),
-        )
-    )
-
-
-def _infonet_sync_response_events(events: list[dict], request=None) -> list[dict]:
-    """Build the sync event surface for the current transport policy."""
-    include_private = _request_appears_private_infonet_transport(request)
-    response: list[dict] = []
-    for event in events:
-        if not isinstance(event, dict):
-            continue
-        event_type = str(event.get("event_type", "") or "")
-        if event_type in {"gate_message", "dm_message"}:
-            if include_private:
-                response.append(dict(event))
-            continue
-        response.append(_redact_public_event(event))
-    return response
-
-
 def _trusted_gate_reply_to(event: dict) -> str:
     if not isinstance(event, dict):
         return ""
@@ -5531,15 +5212,32 @@ def _submit_gate_message_envelope(request: Request, gate_id: str, body: dict[str
     if not cooldown_ok:
         return {"ok": False, "detail": cooldown_reason}
 
+    # Advance sequence counter (replay protection) without appending to
+    # the public infonet chain — gate messages are private.
+    try:
+        from services.mesh.mesh_hashchain import infonet, gate_store
+
+        seq_ok, seq_reason = _validate_private_signed_sequence(
+            infonet,
+            sender_id,
+            sequence,
+            domain="gate_message",
+        )
+        if not seq_ok:
+            return {"ok": False, "detail": seq_reason}
+    except ValueError as exc:
+        return {"ok": False, "detail": str(exc)}
+    except Exception:
+        logger.exception("Failed to advance sequence for gate message")
+        return {"ok": False, "detail": "Failed to record gate message"}
+
     gate_manager.record_message(gate_id)
     _record_gate_post_cooldown(sender_id, gate_id)
     logger.info("Encrypted gate message accepted on obfuscated gate plane")
 
-    # Build and commit the encrypted gate event to the private Infonet ledger.
-    # The main hashchain is the durable propagation surface; gate_store is the
-    # local materialized view used by the existing decrypt/UI path.
+    # Build gate event and store in gate_store (private — not on public chain).
     try:
-        from services.mesh.mesh_hashchain import infonet
+        from services.mesh.mesh_hashchain import _private_gate_event_id
         import time as _time
 
         store_payload = dict(gate_payload)
@@ -5561,24 +5259,19 @@ def _submit_gate_message_envelope(request: Request, gate_id: str, body: dict[str
             "public_key_algo": public_key_algo,
             "protocol_version": protocol_version or PROTOCOL_VERSION,
         }
-        gate_event = infonet.append_private_gate_message(
-            node_id=sender_id,
-            payload=store_payload,
-            signature=signature,
-            sequence=sequence,
-            public_key=public_key,
-            public_key_algo=public_key_algo,
-            protocol_version=protocol_version or PROTOCOL_VERSION,
-            timestamp=float(gate_event.get("timestamp", 0) or 0),
-        )
-    except ValueError as exc:
-        return {"ok": False, "detail": str(exc)}
+        gate_event["event_id"] = _private_gate_event_id(gate_id, sender_id, sequence, gate_event)
     except Exception:
-        logger.exception("Failed to append gate message to private Infonet ledger")
+        logger.exception("Failed to prepare private gate message for queued release")
         return {"ok": False, "detail": "Failed to record gate message"}
 
-    # Append to the local gate_store immediately so the author sees the same
-    # materialized gate view that peers will hydrate after private sync.
+    # Append to the local gate_store immediately. The gate_store is a
+    # per-node persistent ciphertext chain; writing to it is a local
+    # operation with no network dependency. Previously this happened only
+    # inside the release worker's attempt_private_release path, which
+    # meant messages sat in the outbox — invisible to the author and the
+    # gate UI — until the transport tier reached the release floor.
+    # Decoupling local visibility from network fan-out: append locally now,
+    # queue the release for network propagation when the lane is ready.
     try:
         from services.mesh.mesh_hashchain import gate_store
 
@@ -5705,7 +5398,7 @@ async def infonet_locator(request: Request, limit: int = Query(32, ge=4, le=128)
 
 
 @app.post("/api/mesh/infonet/sync")
-@limiter.limit(_INFONET_SYNC_RATE_LIMIT)
+@limiter.limit("30/minute")
 @mesh_write_exempt(MeshWriteExemption.PEER_GOSSIP)
 async def infonet_sync_post(
     request: Request,
@@ -5758,7 +5451,8 @@ async def infonet_sync_post(
     elif matched_hash == GENESIS_HASH and len(locator) > 1:
         forked = True
 
-    events = _infonet_sync_response_events(events, request=request)
+    # Filter out legacy gate_message events — not part of the public sync surface.
+    events = [_redact_public_event(e) for e in events if e.get("event_type") != "gate_message"]
 
     response = {
         "events": events,
@@ -5821,7 +5515,7 @@ async def mesh_rns_status(request: Request):
 
 
 @app.get("/api/mesh/infonet/sync")
-@limiter.limit(_INFONET_SYNC_RATE_LIMIT)
+@limiter.limit("30/minute")
 async def infonet_sync(
     request: Request,
     after_hash: str = "",
@@ -5859,7 +5553,8 @@ async def infonet_sync(
         )
     base = after_hash or GENESIS_HASH
     events = infonet.get_events_after(base, limit=limit)
-    events = _infonet_sync_response_events(events, request=request)
+    # Filter out legacy gate_message events — not part of the public sync surface.
+    events = [_redact_public_event(e) for e in events if e.get("event_type") != "gate_message"]
     return {
         "events": events,
         "after_hash": base,
@@ -5898,7 +5593,6 @@ async def infonet_ingest(request: Request):
 
     result = infonet.ingest_events(events)
     _hydrate_gate_store_from_chain(events)
-    _hydrate_dm_relay_from_chain(events)
     return {"ok": True, **result}
 
 
@@ -5939,7 +5633,6 @@ async def infonet_peer_push(request: Request):
 
     result = infonet.ingest_events(events)
     _hydrate_gate_store_from_chain(events)
-    _hydrate_dm_relay_from_chain(events)
     return {"ok": True, **result}
 
 
@@ -6499,12 +6192,6 @@ async def infonet_event(request: Request, event_id: str):
                 )
             return _strip_gate_for_access(evt, access)
         return {"ok": False, "detail": "Event not found"}
-    if evt.get("event_type") == "dm_message":
-        return await _private_plane_refusal_response(
-            request,
-            status_code=403,
-            payload=_private_plane_access_denied_payload(),
-        )
     if evt.get("event_type") == "gate_message":
         gate_id = str(evt.get("payload", {}).get("gate", "") or evt.get("gate", "") or "").strip()
         access = _verify_gate_access(request, gate_id) if gate_id else ""
@@ -6529,7 +6216,7 @@ async def infonet_node_events(
     from services.mesh.mesh_hashchain import infonet
 
     events = infonet.get_events_by_node(node_id, limit=limit)
-    events = [e for e in events if e.get("event_type") not in {"gate_message", "dm_message"}]
+    events = [e for e in events if e.get("event_type") != "gate_message"]
     events = [_redact_public_event(e) for e in infonet.decorate_events(events)]
     events = _redact_public_node_history(
         events,
@@ -6554,7 +6241,7 @@ async def infonet_events_by_type(
     else:
         events = list(reversed(infonet.events))
         events = events[offset : offset + limit]
-    events = [e for e in events if e.get("event_type") not in {"gate_message", "dm_message"}]
+    events = [e for e in events if e.get("event_type") != "gate_message"]
     events = [_redact_public_event(e) for e in infonet.decorate_events(events)]
     return {
         "events": events,
@@ -7292,7 +6979,6 @@ async def _dm_send_from_signed_request(request: Request):
     relay_salt_hex = str(body.get("relay_salt", "") or "").strip().lower()
     msg_id = str(body.get("msg_id", "")).strip()
     timestamp = _safe_int(body.get("timestamp", 0) or 0)
-    sequence = _safe_int(body.get("sequence", 0) or 0)
     nonce = str(body.get("nonce", "")).strip()
 
     if not sender_id or not recipient_id or not ciphertext or not msg_id or not timestamp:
@@ -7366,7 +7052,7 @@ async def _dm_send_from_signed_request(request: Request):
         ok_seq, seq_reason = _validate_private_signed_sequence(
             infonet,
             sender_id,
-            sequence,
+            int(body.get("sequence", 0) or 0),
             domain="dm_send",
         )
         if not ok_seq:
@@ -7400,47 +7086,7 @@ async def _dm_send_from_signed_request(request: Request):
         "sender_seal": sender_seal,
         "relay_salt": relay_salt_hex,
     }
-    hashchain_spool: dict[str, Any] = {"ok": False, "detail": "not attempted"}
-    try:
-        from services.mesh.mesh_hashchain import infonet
-
-        chain_payload = dict(prepared.payload if prepared is not None else {})
-        if not chain_payload:
-            chain_payload = {
-                "recipient_id": recipient_id,
-                "delivery_class": delivery_class,
-                "recipient_token": recipient_token if delivery_class == "shared" else "",
-                "ciphertext": ciphertext,
-                "msg_id": msg_id,
-                "timestamp": timestamp,
-                "format": payload_format,
-            }
-        chain_payload["transport_lock"] = "private_strong"
-        chain_event = infonet.append_private_dm_message(
-            node_id=sender_id,
-            payload=chain_payload,
-            signature=str(prepared.signature if prepared is not None else body.get("signature", "") or ""),
-            sequence=sequence,
-            public_key=str(prepared.public_key if prepared is not None else body.get("public_key", "") or ""),
-            public_key_algo=str(
-                prepared.public_key_algo if prepared is not None else body.get("public_key_algo", "") or ""
-            ),
-            protocol_version=str(
-                prepared.protocol_version if prepared is not None else body.get("protocol_version", "") or ""
-            )
-            or PROTOCOL_VERSION,
-            timestamp=float(timestamp or time.time()),
-        )
-        _hydrate_dm_relay_from_chain([chain_event])
-        hashchain_spool = {
-            "ok": True,
-            "event_id": str(chain_event.get("event_id", "") or ""),
-            "limit": 2,
-        }
-    except Exception as exc:
-        hashchain_spool = {"ok": False, "detail": str(exc) or type(exc).__name__}
     queued_result = _queue_dm_release(current_tier=tier, payload=release_payload)
-    queued_result["hashchain_spool"] = hashchain_spool
     if transport_upgrade_pending:
         queued_result["private_transport_pending"] = True
     return queued_result
@@ -8502,12 +8148,8 @@ def _cctv_proxy_profile_for_url(target_url: str) -> _CCTVProxyProfile:
 
 
 def _cctv_upstream_headers(request: Request, profile: _CCTVProxyProfile) -> dict[str, str]:
-    # Round 7a: per-install operator handle. See routers/cctv.py for the
-    # canonical handler; this duplicate stays in lockstep until the #239
-    # dedup ladder removes it.
-    from services.network_utils import outbound_user_agent
     headers = {
-        "User-Agent": f"Mozilla/5.0 (compatible; {outbound_user_agent('cctv-proxy')})",
+        "User-Agent": "Mozilla/5.0 (compatible; ShadowBroker CCTV proxy)",
         **profile.headers,
     }
     range_header = request.headers.get("range")
@@ -9416,11 +9058,6 @@ async def api_get_node_settings(request: Request):
 async def api_set_node_settings(request: Request, body: NodeSettingsUpdate):
     _refresh_node_peer_store()
     if bool(body.enabled):
-        if _infonet_private_transport_required() and not _ensure_infonet_private_transport_ready("operator_enable"):
-            return JSONResponse(
-                {"ok": False, "detail": _infonet_private_transport_error()},
-                status_code=503,
-            )
         try:
             from services.transport_lane_isolation import disable_public_mesh_lane
 
@@ -9429,7 +9066,6 @@ async def api_set_node_settings(request: Request, body: NodeSettingsUpdate):
             logger.warning("Failed to disable public Mesh while enabling private node: %s", exc)
     result = _set_participant_node_enabled(bool(body.enabled))
     if bool(body.enabled):
-        _start_infonet_node_runtime("operator_enable")
         _kick_public_sync_background("operator_enable")
     return result
 

backend/pyproject.toml

@@ -7,12 +7,13 @@ py-modules = []
 
 [project]
 name = "backend"
-version = "0.9.81"
+version = "0.9.79"
 requires-python = ">=3.10"
 dependencies = [
     "apscheduler==3.10.3",
     "beautifulsoup4>=4.9.0",
     "cachetools==5.5.2",
+    "cloudscraper==1.2.71",
     "cryptography>=41.0.0",
     "defusedxml>=0.7.1",
     "fastapi==0.115.12",
@@ -43,7 +44,7 @@ dev = ["pytest>=8.3.4", "pytest-asyncio==0.25.0", "ruff>=0.9.0", "black>=24.0.0"
 
 [tool.ruff.lint]
 # The current backend carries historical style debt in large legacy modules.
-# Keep CI focused on actionable correctness checks for the v0.9.81 release.
+# Keep CI focused on actionable correctness checks for the v0.9.79 release.
 ignore = ["E401", "E402", "E701", "E731", "E741", "F401", "F402", "F541", "F811", "F841"]
 
 [tool.black]

backend/routers/admin.py

@@ -82,28 +82,6 @@ async def api_get_keys_meta(request: Request):
     return get_env_path_info()
 
 
-@router.get(
-    "/api/settings/operator-handle",
-    dependencies=[Depends(require_local_operator)],
-)
-@limiter.limit("60/minute")
-async def api_get_operator_handle(request: Request):
-    """Round 7a: return the per-install operator handle so the frontend
-    can include it in browser-direct third-party API calls (Wikipedia /
-    Wikidata via lib/wikimediaClient). The handle is auto-generated on
-    first use; operators can override it via the OPERATOR_HANDLE setting
-    or the env var of the same name.
-
-    Gated on local-operator: legitimate browser usage goes through the
-    Next.js proxy which auto-attaches the admin key; remote scanners get
-    403. The handle itself isn't a secret (it's sent to every third-party
-    API the operator touches), but admin-gating it matches the rest of
-    the settings endpoints and follows least-privilege.
-    """
-    from services.network_utils import get_operator_handle
-    return {"handle": get_operator_handle()}
-
-
 @router.get(
     "/api/settings/news-feeds",
     dependencies=[Depends(require_local_operator)],

backend/routers/ai_intel.py

@@ -18,12 +18,6 @@ from auth import require_local_operator, require_openclaw_or_local
 from limiter import limiter
 from services.fetchers._store import latest_data as _latest_data
 
-
-
-def _ai_intel_user_agent() -> str:
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("ai-intel")
-
 logger = logging.getLogger(__name__)
 router = APIRouter()
 
@@ -453,7 +447,7 @@ async def ai_satellite_images(
             "https://planetarycomputer.microsoft.com/api/stac/v1/search",
             json=search_payload,
             timeout=10,
-            headers={"User-Agent": _ai_intel_user_agent()},
+            headers={"User-Agent": "ShadowBroker-OSINT/1.0 (ai-intel)"},
         )
         resp.raise_for_status()
         features = resp.json().get("features", [])
@@ -1590,7 +1584,7 @@ async def agent_tool_manifest(request: Request):
 
     return {
         "ok": True,
-        "version": "0.9.81",
+        "version": "0.9.79",
         "access_tier": access_tier,
         "available_commands": available_commands,
         "transport": {
@@ -2226,7 +2220,7 @@ async def api_capabilities(request: Request):
     access_tier = str(get_settings().OPENCLAW_ACCESS_TIER or "restricted").strip().lower()
     return {
         "ok": True,
-        "version": "0.9.81",
+        "version": "0.9.79",
         "auth": {
             "method": "HMAC-SHA256",
             "headers": ["X-SB-Timestamp", "X-SB-Nonce", "X-SB-Signature"],
@@ -2521,85 +2515,45 @@ async def api_capabilities(request: Request):
 # OpenClaw Connection Management (local-operator only — NOT via HMAC)
 # These endpoints manage the HMAC secret itself, so they MUST require
 # local operator access to prevent privilege escalation.
-#
-# Issue #302 (tg12): pre-fix, GET /api/ai/connect-info had two problems:
-#
-#   1. ``?reveal=true`` made the full secret travel through every operator
-#      page-load that opened the Connect modal. Even gated to
-#      ``require_local_operator``, that put the secret into browser
-#      history, dev-tools network panels, browser disk caches, HAR
-#      exports, and screen captures. Every time the modal opened.
-#
-#   2. The same GET endpoint auto-bootstrapped (generated + persisted)
-#      the secret on first read. Side effects on a GET are a footgun:
-#      browser prefetchers, mirror tools, and casual curl-from-history
-#      would all silently mint+persist a fresh secret. (Gated, but
-#      still surprising — and noisy in the audit log.)
-#
-# Resolution:
-#
-#   GET  /api/ai/connect-info             — always returns the MASKED
-#                                            secret. No ?reveal param.
-#                                            No auto-bootstrap; if the
-#                                            secret is missing,
-#                                            ``hmac_secret_set: false``
-#                                            tells the frontend to call
-#                                            /bootstrap.
-#
-#   POST /api/ai/connect-info/bootstrap   — NEW. Generates + persists the
-#                                            secret if missing. Idempotent.
-#                                            Returns metadata only, never
-#                                            the full secret.
-#
-#   POST /api/ai/connect-info/reveal      — NEW. Returns the full secret in
-#                                            the body with strict
-#                                            ``Cache-Control: no-store,
-#                                            no-cache, must-revalidate``
-#                                            + ``Pragma: no-cache`` so
-#                                            it does not land in browser
-#                                            caches. POST means it does
-#                                            not land in URL history.
-#
-#   POST /api/ai/connect-info/regenerate  — keeps existing one-time-reveal
-#                                            behavior (regenerate IS a
-#                                            deliberate destructive action
-#                                            the operator triggered, so
-#                                            displaying the new secret
-#                                            once is the only path that
-#                                            makes the operation useful).
-#                                            Same no-store headers added.
 # ---------------------------------------------------------------------------
 
-# Cache-Control headers that should accompany every response carrying the
-# full HMAC secret. Reused across the reveal + regenerate endpoints so a
-# future refactor that splits or renames them can't forget the headers.
-_NO_STORE_HEADERS = {
-    "Cache-Control": "no-store, no-cache, must-revalidate, private",
-    "Pragma": "no-cache",
-    "Expires": "0",
-}
+@router.get("/api/ai/connect-info", dependencies=[Depends(require_local_operator)])
+@limiter.limit("30/minute")
+async def get_connect_info(request: Request, reveal: bool = False):
+    """Return connection details for the OpenClaw Connect modal.
 
-
-def _mask_hmac_secret(secret: str) -> str:
-    """Return a fingerprint-style mask (first6 + bullets + last4) suitable
-    for display in the UI before the operator clicks Reveal."""
-    if not secret:
-        return ""
-    if len(secret) > 10:
-        return secret[:6] + "••••••••" + secret[-4:]
-    return "••••••••"
-
-
-def _connect_info_metadata(settings) -> dict:
-    """Return everything the Connect modal needs EXCEPT the secret itself.
-
-    Shared between GET /api/ai/connect-info (where the full secret is
-    masked) and POST /api/ai/connect-info/bootstrap (where the operator
-    just generated a secret but we don't return it inline — they have to
-    call /reveal to see it).
+    The HMAC secret is masked by default. Pass ?reveal=true to see the full key.
+    Private keys are NEVER returned.
     """
+    import os
+    import secrets
+    from services.config import get_settings
+
+    settings = get_settings()
+    hmac_secret = str(settings.OPENCLAW_HMAC_SECRET or "").strip()
     access_tier = str(settings.OPENCLAW_ACCESS_TIER or "restricted").strip().lower()
+
+    # Auto-generate if not set
+    if not hmac_secret:
+        hmac_secret = secrets.token_hex(24)  # 48 chars
+        _write_env_value("OPENCLAW_HMAC_SECRET", hmac_secret)
+        # Clear settings cache so next read picks up the new value
+        get_settings.cache_clear()
+
+    masked = hmac_secret[:6] + "••••••••" + hmac_secret[-4:] if len(hmac_secret) > 10 else "••••••••"
+
     return {
+        "ok": True,
+        "hmac_secret": hmac_secret if reveal else masked,
+        "hmac_secret_set": bool(hmac_secret),
+        "bootstrap_behavior": {
+            "auto_generates_when_missing": True,
+            "auto_generated_this_call": not bool(settings.OPENCLAW_HMAC_SECRET or ""),
+            "notes": [
+                "If no HMAC secret exists yet, this endpoint bootstraps one and persists it to .env.",
+                "Regenerating the HMAC secret revokes all existing direct-mode OpenClaw callers at once.",
+            ],
+        },
         "access_tier": access_tier,
         "trust_model": {
             "remote_http_principal": "holder_of_openclaw_hmac_secret",
@@ -2653,120 +2607,10 @@ def _connect_info_metadata(settings) -> dict:
     }
 
 
-@router.get("/api/ai/connect-info", dependencies=[Depends(require_local_operator)])
-@limiter.limit("30/minute")
-async def get_connect_info(request: Request):
-    """Return connection details for the OpenClaw Connect modal.
-
-    The HMAC secret is always returned as a fingerprint mask
-    (``first6 + bullets + last4``); the full value is only ever served by
-    ``POST /api/ai/connect-info/reveal`` (see #302). When the secret has
-    not been bootstrapped yet, ``hmac_secret_set`` is false and the
-    frontend should call ``POST /api/ai/connect-info/bootstrap``.
-
-    Private keys are NEVER returned.
-    """
-    from services.config import get_settings
-
-    settings = get_settings()
-    hmac_secret = str(settings.OPENCLAW_HMAC_SECRET or "").strip()
-
-    return {
-        "ok": True,
-        "masked_hmac_secret": _mask_hmac_secret(hmac_secret),
-        "hmac_secret_set": bool(hmac_secret),
-        "bootstrap_behavior": {
-            "auto_generates_when_missing": False,
-            "notes": [
-                "Call POST /api/ai/connect-info/bootstrap to mint a secret on first use.",
-                "Call POST /api/ai/connect-info/reveal to see the full secret (no-store).",
-                "Regenerating the HMAC secret revokes all existing direct-mode OpenClaw callers at once.",
-            ],
-        },
-        **_connect_info_metadata(settings),
-    }
-
-
-@router.post("/api/ai/connect-info/bootstrap", dependencies=[Depends(require_local_operator)])
-@limiter.limit("10/minute")
-async def bootstrap_hmac_secret(request: Request):
-    """Mint and persist the OpenClaw HMAC secret if it isn't already set.
-
-    Idempotent: if a secret already exists, returns ``generated: false``
-    and leaves the existing secret untouched. Never returns the secret
-    value in the response body — the operator calls
-    ``POST /api/ai/connect-info/reveal`` to see it.
-    """
-    import secrets
-    from services.config import get_settings
-
-    settings = get_settings()
-    existing = str(settings.OPENCLAW_HMAC_SECRET or "").strip()
-    if existing:
-        return {
-            "ok": True,
-            "generated": False,
-            "hmac_secret_set": True,
-            "masked_hmac_secret": _mask_hmac_secret(existing),
-            "detail": "HMAC secret already configured. Use /reveal to see it.",
-        }
-
-    new_secret = secrets.token_hex(24)  # 48 chars
-    _write_env_value("OPENCLAW_HMAC_SECRET", new_secret)
-    get_settings.cache_clear()
-
-    return {
-        "ok": True,
-        "generated": True,
-        "hmac_secret_set": True,
-        "masked_hmac_secret": _mask_hmac_secret(new_secret),
-        "detail": "HMAC secret generated. Call /reveal to copy it into your OpenClaw config.",
-    }
-
-
-@router.post("/api/ai/connect-info/reveal", dependencies=[Depends(require_local_operator)])
-@limiter.limit("10/minute")
-async def reveal_hmac_secret(request: Request):
-    """Return the full HMAC secret in the response body.
-
-    POST (not GET) so the secret never lands in URL history, access logs,
-    or browser visit history. Strict ``Cache-Control: no-store`` headers
-    prevent intermediaries from persisting the response. Returns 404 if
-    no secret has been bootstrapped — the frontend should call
-    ``POST /api/ai/connect-info/bootstrap`` first.
-    """
-    from services.config import get_settings
-
-    settings = get_settings()
-    hmac_secret = str(settings.OPENCLAW_HMAC_SECRET or "").strip()
-    if not hmac_secret:
-        raise HTTPException(
-            404,
-            "No HMAC secret configured. Call POST /api/ai/connect-info/bootstrap first.",
-        )
-    return JSONResponse(
-        content={
-            "ok": True,
-            "hmac_secret": hmac_secret,
-            "masked_hmac_secret": _mask_hmac_secret(hmac_secret),
-        },
-        headers=_NO_STORE_HEADERS,
-    )
-
-
 @router.post("/api/ai/connect-info/regenerate", dependencies=[Depends(require_local_operator)])
 @limiter.limit("5/minute")
 async def regenerate_hmac_secret(request: Request):
-    """Generate a new HMAC secret. Old secret immediately stops working.
-
-    Returns the new secret in the response body — this is the only
-    operation where the full secret travels back through the response,
-    because regenerating IS a deliberate destructive action the operator
-    triggered and they need to see the new value once to update their
-    OpenClaw configuration. Strict ``Cache-Control: no-store`` headers
-    keep it from being persisted by browser caches, proxies, or HAR
-    capture tooling.
-    """
+    """Generate a new HMAC secret. Old secret immediately stops working."""
     import secrets
     from services.config import get_settings
 
@@ -2774,15 +2618,11 @@ async def regenerate_hmac_secret(request: Request):
     _write_env_value("OPENCLAW_HMAC_SECRET", new_secret)
     get_settings.cache_clear()
 
-    return JSONResponse(
-        content={
-            "ok": True,
-            "hmac_secret": new_secret,
-            "masked_hmac_secret": _mask_hmac_secret(new_secret),
-            "detail": "HMAC secret regenerated. Update your OpenClaw agent configuration.",
-        },
-        headers=_NO_STORE_HEADERS,
-    )
+    return {
+        "ok": True,
+        "hmac_secret": new_secret,
+        "detail": "HMAC secret regenerated. Update your OpenClaw agent configuration.",
+    }
 
 
 @router.put("/api/ai/connect-info/access-tier", dependencies=[Depends(require_local_operator)])

backend/routers/cctv.py

@@ -165,13 +165,7 @@ def _cctv_proxy_profile_for_url(target_url: str) -> _CCTVProxyProfile:
 
 
 def _cctv_upstream_headers(request: Request, profile: _CCTVProxyProfile) -> dict:
-    # Round 7a: per-install operator handle. Mozilla/5.0 prefix retained
-    # because many CCTV endpoints sniff for a browser-like prefix.
-    from services.network_utils import outbound_user_agent
-    headers = {
-        "User-Agent": f"Mozilla/5.0 (compatible; {outbound_user_agent('cctv-proxy')})",
-        **profile.headers,
-    }
+    headers = {"User-Agent": "Mozilla/5.0 (compatible; ShadowBroker CCTV proxy)", **profile.headers}
     range_header = request.headers.get("range")
     if range_header:
         headers["Range"] = range_header

backend/routers/data.py

@@ -98,88 +98,6 @@ def _current_etag(prefix: str = "") -> str:
     return f"{prefix}v{get_data_version()}-l{get_active_layers_version()}"
 
 
-# ── Issue #288: viewport-aware payloads ─────────────────────────────────────
-# Heavy, density-driven, time-sensitive layers that benefit from bbox
-# filtering. Light reference layers (datacenters, military_bases,
-# power_plants, satellites, weather, news, etc.) are intentionally NOT
-# in these sets — they ship world-scale even when bounds are supplied so
-# panning never reveals an "empty world" of static infrastructure.
-#
-# When the caller does NOT pass s/w/n/e, none of this runs and the response
-# is byte-for-byte identical to the pre-#288 behavior.
-_FAST_BBOX_HEAVY_KEYS: tuple[str, ...] = (
-    "commercial_flights",
-    "military_flights",
-    "private_flights",
-    "private_jets",
-    "tracked_flights",
-    "ships",
-    "cctv",
-    "uavs",
-    "liveuamap",
-    "gps_jamming",
-    "sigint",
-    "trains",
-)
-_SLOW_BBOX_HEAVY_KEYS: tuple[str, ...] = (
-    "gdelt",
-    "firms_fires",
-    "kiwisdr",
-    "scanners",
-    "psk_reporter",
-)
-
-
-def _has_full_bbox(s, w, n, e) -> bool:
-    return None not in (s, w, n, e)
-
-
-def _bbox_etag_suffix(s, w, n, e) -> str:
-    """Quantize bbox to 1° before mixing into the ETag.
-
-    The 20% padding inside _bbox_filter already absorbs sub-degree pans;
-    quantizing here means small mouse drags don't blow the ETag cache
-    on the client. Full-world bounds collapse to a single suffix.
-    """
-    if not _has_full_bbox(s, w, n, e):
-        return ""
-    try:
-        ss = math.floor(float(s))
-        ww = math.floor(float(w))
-        nn = math.ceil(float(n))
-        ee = math.ceil(float(e))
-    except (TypeError, ValueError):
-        return ""
-    # If the requested window covers basically the whole world, treat it as
-    # "no bbox" for caching purposes so world-zoomed clients all hit the
-    # same ETag and benefit from the existing 304 path.
-    lat_span, lng_span = _bbox_spans(s, w, n, e)
-    if lng_span >= 300 or lat_span >= 120:
-        return ""
-    return f"|bbox={ss},{ww},{nn},{ee}"
-
-
-def _apply_bbox_to_payload(payload: dict, heavy_keys: tuple[str, ...],
-                            s: float, w: float, n: float, e: float) -> dict:
-    """In-place filter the heavy-key collections in *payload* to a viewport.
-
-    Items without lat/lng are passed through (so e.g. summary blobs aren't
-    accidentally dropped). The existing _bbox_filter helper applies a 20%
-    pad and handles antimeridian crossings.
-    """
-    lat_span, lng_span = _bbox_spans(s, w, n, e)
-    # World-scale request → skip filtering entirely. Spares the CPU and
-    # guarantees the response matches the no-params shape.
-    if lng_span >= 300 or lat_span >= 120:
-        return payload
-    for key in heavy_keys:
-        items = payload.get(key)
-        if not isinstance(items, list) or not items:
-            continue
-        payload[key] = _bbox_filter(items, s, w, n, e)
-    return payload
-
-
 def _json_safe(value):
     if isinstance(value, float):
         return value if math.isfinite(value) else None
@@ -561,14 +479,13 @@ async def bootstrap_critical(request: Request):
 @limiter.limit("120/minute")
 async def live_data_fast(
     request: Request,
-    s: float = Query(None, description="South bound — when all four bounds are supplied, heavy/dense layers (vessels, aircraft, sigint, CCTV, …) are filtered to this viewport with 20% padding. Static reference layers (satellites, etc.) always ship world-scale.", ge=-90, le=90),
-    w: float = Query(None, description="West bound (see s)", ge=-180, le=180),
-    n: float = Query(None, description="North bound (see s)", ge=-90, le=90),
-    e: float = Query(None, description="East bound (see s)", ge=-180, le=180),
+    s: float = Query(None, description="South bound (ignored)", ge=-90, le=90),
+    w: float = Query(None, description="West bound (ignored)", ge=-180, le=180),
+    n: float = Query(None, description="North bound (ignored)", ge=-90, le=90),
+    e: float = Query(None, description="East bound (ignored)", ge=-180, le=180),
     initial: bool = Query(False, description="Return a capped startup payload for first paint"),
 ):
-    bbox_suffix = _bbox_etag_suffix(s, w, n, e)
-    etag = _current_etag(prefix=("fast|initial|" if initial else "fast|full|") + bbox_suffix.lstrip("|") + ("|" if bbox_suffix else ""))
+    etag = _current_etag(prefix="fast|initial|" if initial else "fast|full|")
     if request.headers.get("if-none-match") == etag:
         return Response(status_code=304, headers={"ETag": etag, "Cache-Control": "no-cache"})
     from services.fetchers._store import (active_layers, get_latest_data_subset_refs, get_source_timestamps_snapshot)
@@ -608,11 +525,6 @@ async def live_data_fast(
         payload = _cap_fast_startup_payload(payload)
     else:
         payload = _cap_fast_dashboard_payload(payload)
-    # Issue #288: bbox filter heavy/dense layers only when all four bounds
-    # are supplied. Without bounds, behaviour is byte-for-byte identical
-    # to the pre-#288 implementation.
-    if _has_full_bbox(s, w, n, e):
-        payload = _apply_bbox_to_payload(payload, _FAST_BBOX_HEAVY_KEYS, s, w, n, e)
     return Response(content=orjson.dumps(_sanitize_payload(payload)), media_type="application/json",
         headers={"ETag": etag, "Cache-Control": "no-cache"})
 
@@ -621,13 +533,12 @@ async def live_data_fast(
 @limiter.limit("60/minute")
 async def live_data_slow(
     request: Request,
-    s: float = Query(None, description="South bound — when all four bounds are supplied, heavy/dense layers (gdelt, firms_fires, kiwisdr, scanners, psk_reporter) are filtered to this viewport with 20% padding. Static reference layers (datacenters, military bases, power plants, weather, news, …) always ship world-scale.", ge=-90, le=90),
-    w: float = Query(None, description="West bound (see s)", ge=-180, le=180),
-    n: float = Query(None, description="North bound (see s)", ge=-90, le=90),
-    e: float = Query(None, description="East bound (see s)", ge=-180, le=180),
+    s: float = Query(None, description="South bound (ignored)", ge=-90, le=90),
+    w: float = Query(None, description="West bound (ignored)", ge=-180, le=180),
+    n: float = Query(None, description="North bound (ignored)", ge=-90, le=90),
+    e: float = Query(None, description="East bound (ignored)", ge=-180, le=180),
 ):
-    bbox_suffix = _bbox_etag_suffix(s, w, n, e)
-    etag = _current_etag(prefix="slow|full|" + bbox_suffix.lstrip("|") + ("|" if bbox_suffix else ""))
+    etag = _current_etag(prefix="slow|full|")
     if request.headers.get("if-none-match") == etag:
         return Response(status_code=304, headers={"ETag": etag, "Cache-Control": "no-cache"})
     from services.fetchers._store import (active_layers, get_latest_data_subset_refs, get_source_timestamps_snapshot)
@@ -681,12 +592,6 @@ async def live_data_slow(
         "crowdthreat": (d.get("crowdthreat") or []) if active_layers.get("crowdthreat", True) else [],
         "freshness": freshness,
     }
-    # Issue #288: bbox filter heavy/dense layers only when all four bounds
-    # are supplied. Static reference layers (datacenters, military bases,
-    # power_plants, etc.) deliberately stay world-scale so panning never
-    # hides the infrastructure overlay the operator already has on screen.
-    if _has_full_bbox(s, w, n, e):
-        payload = _apply_bbox_to_payload(payload, _SLOW_BBOX_HEAVY_KEYS, s, w, n, e)
     return Response(
         content=orjson.dumps(_sanitize_payload(payload), default=str, option=orjson.OPT_NON_STR_KEYS),
         media_type="application/json",

backend/routers/health.py

@@ -8,7 +8,7 @@ from services.data_fetcher import get_latest_data
 from services.schemas import HealthResponse
 import os
 
-APP_VERSION = os.environ.get("_HEALTH_APP_VERSION", "0.9.81")
+APP_VERSION = os.environ.get("_HEALTH_APP_VERSION", "0.9.79")
 
 router = APIRouter()
 
@@ -59,12 +59,6 @@ async def health_check(request: Request):
     # when the SPKI-pinned fallback is in effect. The data plane keeps
     # flowing (this is by design — see ais_proxy.js comments) but observers
     # who care about MITM-protection posture deserve a visible signal.
-    #
-    # Plus connectivity health (added 2026-05-23 when stream.aisstream.io
-    # went fully offline): ``connected`` tells the frontend whether ship
-    # data is actually flowing. When false, a banner explains that ships
-    # are unavailable due to an upstream outage — better than the user
-    # silently seeing an empty ocean and assuming we broke something.
     ais_status: dict = {}
     try:
         from services.ais_stream import ais_proxy_status
@@ -75,15 +69,6 @@ async def health_check(request: Request):
         # Don't override a worse top-level status if SLOs already failed,
         # but escalate ok -> degraded so the field surfaces in dashboards.
         top_status = "degraded"
-    # AIS_API_KEY not configured is "feature off", not "system broken" —
-    # so we only escalate when the operator opted into AIS (key set) AND
-    # the stream is currently offline.
-    if (
-        os.environ.get("AIS_API_KEY")
-        and ais_status.get("connected") is False
-        and top_status == "ok"
-    ):
-        top_status = "degraded"
 
     return {
         "status": top_status,

backend/routers/mesh_peer_sync.py

@@ -55,12 +55,6 @@ def _hydrate_gate_store_from_chain(events: list) -> int:
     return count
 
 
-def _hydrate_dm_relay_from_chain(events: list) -> int:
-    import main as _m
-
-    return int(_m._hydrate_dm_relay_from_chain(events))
-
-
 @router.post("/api/mesh/infonet/peer-push")
 @limiter.limit("30/minute")
 async def infonet_peer_push(request: Request):
@@ -88,68 +82,9 @@ async def infonet_peer_push(request: Request):
         return {"ok": True, "accepted": 0, "duplicates": 0, "rejected": []}
     result = infonet.ingest_events(events)
     _hydrate_gate_store_from_chain(events)
-    _hydrate_dm_relay_from_chain(events)
     return {"ok": True, **result}
 
 
-@router.post("/api/mesh/dm/replicate-envelope")
-@limiter.limit("60/minute")
-async def dm_replicate_envelope(request: Request):
-    """Accept a DM envelope replicated from a peer relay (cross-node mailbox).
-
-    Companion endpoint to ``DMRelay.replicate_to_peers`` (outbound, in
-    ``mesh_dm_relay.py``). The sender's relay POSTs an encrypted DM
-    envelope here after a successful local ``deposit``; this endpoint
-    re-enforces the per-(sender, recipient) anti-spam cap and stores
-    the envelope in the local mailbox if accepted.
-
-    The cap is the network rule: a hostile sender's relay can spool
-    extras locally, but every honest peer enforces the cap on inbound
-    replication. Recipient polling from any honest peer therefore
-    never sees more than ``MESH_DM_PENDING_PER_SENDER_LIMIT`` pending
-    from any one sender, no matter how many spam attempts were tried.
-
-    Same HMAC auth pattern as ``infonet_peer_push`` and ``gate_peer_push``.
-    """
-    content_length = request.headers.get("content-length")
-    if content_length:
-        try:
-            # DM envelopes are bounded by MESH_DM_MAX_MSG_BYTES + envelope
-            # overhead; 64 KB is a generous ceiling.
-            if int(content_length) > 65_536:
-                return Response(
-                    content='{"ok":false,"detail":"Request body too large (max 64KB)"}',
-                    status_code=413, media_type="application/json",
-                )
-        except (ValueError, TypeError):
-            pass
-    body_bytes = await request.body()
-    if not _verify_peer_push_hmac(request, body_bytes):
-        return Response(
-            content='{"ok":false,"detail":"Invalid or missing peer HMAC"}',
-            status_code=403, media_type="application/json",
-        )
-    try:
-        body = json_mod.loads(body_bytes or b"{}")
-    except (ValueError, TypeError):
-        return Response(
-            content='{"ok":false,"detail":"Invalid JSON body"}',
-            status_code=400, media_type="application/json",
-        )
-    envelope = body.get("envelope")
-    if not isinstance(envelope, dict):
-        return {"ok": False, "detail": "envelope must be an object"}
-
-    originating_peer = _peer_hmac_url_from_request(request) or ""
-
-    from services.mesh.mesh_dm_relay import dm_relay
-    result = dm_relay.accept_replica(
-        envelope=envelope,
-        originating_peer_url=originating_peer,
-    )
-    return result
-
-
 @router.post("/api/mesh/gate/peer-push")
 @limiter.limit("30/minute")
 async def gate_peer_push(request: Request):

backend/routers/mesh_public.py

@@ -65,7 +65,6 @@ from services.mesh.mesh_signed_events import (
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
-_INFONET_SYNC_RATE_LIMIT = "600/minute"
 
 
 def _signed_body(request: Request) -> dict[str, Any]:
@@ -264,19 +263,6 @@ def _redact_public_event(event: dict) -> dict:
     return _redact_vote_gate(_redact_key_rotate_payload(_redact_gate_metadata(event)))
 
 
-def _infonet_private_transport_required() -> bool:
-    import main as _m
-
-    return bool(_m._infonet_private_transport_required())
-
-
-def _infonet_sync_response_events(events: list[dict], request=None) -> list[dict]:
-    """Build the sync event surface for the current transport policy."""
-    import main as _m
-
-    return _m._infonet_sync_response_events(events, request=request)
-
-
 def _trusted_gate_reply_to(event: dict) -> str:
     if not isinstance(event, dict):
         return ""
@@ -588,12 +574,6 @@ def _hydrate_gate_store_from_chain(events: list[dict]) -> int:
             pass
     return count
 
-
-def _hydrate_dm_relay_from_chain(events: list[dict]) -> int:
-    import main as _m
-
-    return int(_m._hydrate_dm_relay_from_chain(events))
-
 # --- Safe type helpers ---
 
 def _safe_int(val, default=0):
@@ -1551,7 +1531,7 @@ async def infonet_locator(request: Request, limit: int = Query(32, ge=4, le=128)
 
 
 @router.post("/api/mesh/infonet/sync")
-@limiter.limit(_INFONET_SYNC_RATE_LIMIT)
+@limiter.limit("30/minute")
 @mesh_write_exempt(MeshWriteExemption.PEER_GOSSIP)
 async def infonet_sync_post(
     request: Request,
@@ -1604,7 +1584,8 @@ async def infonet_sync_post(
     elif matched_hash == GENESIS_HASH and len(locator) > 1:
         forked = True
 
-    events = _infonet_sync_response_events(events, request=request)
+    # Filter out legacy gate_message events — not part of the public sync surface.
+    events = [_redact_public_event(e) for e in events if e.get("event_type") != "gate_message"]
 
     response = {
         "events": events,
@@ -1665,7 +1646,7 @@ async def mesh_rns_status(request: Request):
 
 
 @router.get("/api/mesh/infonet/sync")
-@limiter.limit(_INFONET_SYNC_RATE_LIMIT)
+@limiter.limit("30/minute")
 async def infonet_sync(
     request: Request,
     after_hash: str = "",
@@ -1703,7 +1684,8 @@ async def infonet_sync(
         )
     base = after_hash or GENESIS_HASH
     events = infonet.get_events_after(base, limit=limit)
-    events = _infonet_sync_response_events(events, request=request)
+    # Filter out legacy gate_message events — not part of the public sync surface.
+    events = [_redact_public_event(e) for e in events if e.get("event_type") != "gate_message"]
     return {
         "events": events,
         "after_hash": base,
@@ -1742,7 +1724,6 @@ async def infonet_ingest(request: Request):
 
     result = infonet.ingest_events(events)
     _hydrate_gate_store_from_chain(events)
-    _hydrate_dm_relay_from_chain(events)
     return {"ok": True, **result}
 
 
@@ -2298,12 +2279,6 @@ async def infonet_event(request: Request, event_id: str):
                 )
             return _strip_gate_for_access(evt, access)
         return {"ok": False, "detail": "Event not found"}
-    if evt.get("event_type") == "dm_message":
-        return await _private_plane_refusal_response(
-            request,
-            status_code=403,
-            payload=_private_plane_access_denied_payload(),
-        )
     if evt.get("event_type") == "gate_message":
         gate_id = str(evt.get("payload", {}).get("gate", "") or evt.get("gate", "") or "").strip()
         access = _verify_gate_access(request, gate_id) if gate_id else ""
@@ -2328,7 +2303,7 @@ async def infonet_node_events(
     from services.mesh.mesh_hashchain import infonet
 
     events = infonet.get_events_by_node(node_id, limit=limit)
-    events = [e for e in events if e.get("event_type") not in {"gate_message", "dm_message"}]
+    events = [e for e in events if e.get("event_type") != "gate_message"]
     events = [_redact_public_event(e) for e in infonet.decorate_events(events)]
     events = _redact_public_node_history(
         events,
@@ -2353,7 +2328,7 @@ async def infonet_events_by_type(
     else:
         events = list(reversed(infonet.events))
         events = events[offset : offset + limit]
-    events = [e for e in events if e.get("event_type") not in {"gate_message", "dm_message"}]
+    events = [e for e in events if e.get("event_type") != "gate_message"]
     events = [_redact_public_event(e) for e in infonet.decorate_events(events)]
     return {
         "events": events,

backend/routers/tools.py

@@ -85,30 +85,7 @@ async def api_geocode_reverse(
     return await asyncio.to_thread(reverse_geocode, lat, lng, local_only)
 
 
-# ── Sentinel proxy routes (Issue #299/#300/#301, reported by tg12) ──────────
-# These three endpoints relay external Sentinel / Planetary Computer
-# requests through the backend to avoid browser CORS blocks. They are
-# operator-only helpers — they MUST NOT be callable by anonymous remote
-# users, because:
-#
-#   * /api/sentinel/token  — caller supplies their own Sentinel client_id +
-#     client_secret. Without operator gating, the backend becomes a free
-#     anonymous OAuth-mint relay for any Copernicus account.
-#   * /api/sentinel/tile   — same shape as the token route but for tile
-#     imagery. Without gating, the backend acts as an anonymous quota and
-#     bandwidth relay for Sentinel Hub Process API calls.
-#   * /api/sentinel2/search — hits the Planetary Computer STAC search API
-#     and falls back to Esri imagery. No caller credentials are involved,
-#     but the route is still an anonymous external-search relay. We gate
-#     it the same way for consistency with the rest of the operator-only
-#     helper surface.
-#
-# Gating is via require_local_operator (loopback / bridge / admin key),
-# matching the same allowlist already used by /api/region-dossier and
-# the other operator helpers further up this file. Single-operator nodes
-# see no behavior change — their dashboard already lives on loopback or
-# the trusted Docker bridge, so it still resolves.
-@router.get("/api/sentinel2/search", dependencies=[Depends(require_local_operator)])
+@router.get("/api/sentinel2/search")
 @limiter.limit("30/minute")
 def api_sentinel2_search(
     request: Request,
@@ -120,60 +97,18 @@ def api_sentinel2_search(
     return search_sentinel2_scene(lat, lng)
 
 
-# Issue #298 (tg12): Sentinel credentials moved server-side
-# ---------------------------------------------------------------------------
-# Previously the frontend kept Copernicus CDSE client_id + client_secret in
-# browser localStorage / sessionStorage and forwarded them on every tile
-# request through this proxy. That exposed real third-party credentials to
-# any same-origin script (XSS, malicious browser extension, dev-tools HAR
-# export).
-#
-# Resolution order (first match wins):
-#   1. Request body — kept for back-compat. A small number of legacy
-#      operator setups may still post credentials; we don't break them.
-#   2. Backend .env — SENTINEL_CLIENT_ID / SENTINEL_CLIENT_SECRET, managed
-#      through the existing /api/settings/api-keys flow (admin-gated).
-#
-# The frontend in ``sentinelHub.ts`` no longer reads browser storage and no
-# longer forwards credentials — every dashboard request now lands in (2).
-# The require_local_operator gate (added in #303/PR #303) stays — both layers
-# are independent: the gate blocks anonymous callers, the env fallback lets
-# legitimate (gated) callers omit credentials from the body.
-# ---------------------------------------------------------------------------
-def _resolve_sentinel_credentials(body_id: str, body_secret: str) -> tuple[str, str]:
-    """Return (client_id, client_secret) using body values when present,
-    otherwise falling back to backend .env. Empty strings if neither is set."""
-    import os as _os
-    cid = (body_id or "").strip() or (_os.environ.get("SENTINEL_CLIENT_ID", "") or "").strip()
-    csec = (body_secret or "").strip() or (_os.environ.get("SENTINEL_CLIENT_SECRET", "") or "").strip()
-    return cid, csec
-
-
-@router.post("/api/sentinel/token", dependencies=[Depends(require_local_operator)])
+@router.post("/api/sentinel/token")
 @limiter.limit("60/minute")
 async def api_sentinel_token(request: Request):
-    """Proxy Copernicus CDSE OAuth2 token request (avoids browser CORS block).
-
-    Credentials are resolved by ``_resolve_sentinel_credentials`` — body
-    fields are honored for back-compat, otherwise the backend .env values
-    populated through ``/api/settings/api-keys`` are used.
-    """
+    """Proxy Copernicus CDSE OAuth2 token request (avoids browser CORS block)."""
     import requests as req
     body = await request.body()
     from urllib.parse import parse_qs
     params = parse_qs(body.decode("utf-8"))
-    body_id = params.get("client_id", [""])[0]
-    body_secret = params.get("client_secret", [""])[0]
-    client_id, client_secret = _resolve_sentinel_credentials(body_id, body_secret)
+    client_id = params.get("client_id", [""])[0]
+    client_secret = params.get("client_secret", [""])[0]
     if not client_id or not client_secret:
-        # Friendly, non-hostile error — points the operator at the place
-        # they configure other API keys instead of just saying "required".
-        raise HTTPException(
-            400,
-            "Sentinel client_id/client_secret are not configured. "
-            "Set SENTINEL_CLIENT_ID and SENTINEL_CLIENT_SECRET in the "
-            "API Keys panel (Settings → API Keys) or your backend .env.",
-        )
+        raise HTTPException(400, "client_id and client_secret required")
     token_url = "https://identity.dataspace.copernicus.eu/auth/realms/CDSE/protocol/openid-connect/token"
     try:
         resp = await asyncio.to_thread(req.post, token_url,
@@ -217,7 +152,7 @@ import os as _os
 _SH_TOKEN_CACHE_HMAC_KEY = _os.urandom(32)
 
 
-@router.post("/api/sentinel/tile", dependencies=[Depends(require_local_operator)])
+@router.post("/api/sentinel/tile")
 @limiter.limit("300/minute")
 async def api_sentinel_tile(request: Request):
     """Proxy Sentinel Hub Process API tile request (avoids CORS block)."""
@@ -228,11 +163,8 @@ async def api_sentinel_tile(request: Request):
     except Exception:
         return JSONResponse(status_code=422, content={"ok": False, "detail": "invalid JSON body"})
 
-    # Issue #298: same resolution order as /api/sentinel/token — body
-    # values for back-compat, otherwise backend .env.
-    body_id = body.get("client_id", "")
-    body_secret = body.get("client_secret", "")
-    client_id, client_secret = _resolve_sentinel_credentials(body_id, body_secret)
+    client_id = body.get("client_id", "")
+    client_secret = body.get("client_secret", "")
     preset = body.get("preset", "TRUE-COLOR")
     date_str = body.get("date", "")
     z = body.get("z", 0)
@@ -240,16 +172,7 @@ async def api_sentinel_tile(request: Request):
     y = body.get("y", 0)
 
     if not client_id or not client_secret or not date_str:
-        # Distinguish "no creds" from "no date" so the operator knows
-        # what to fix. Same friendly pointer as the /token route.
-        if not client_id or not client_secret:
-            raise HTTPException(
-                400,
-                "Sentinel client_id/client_secret are not configured. "
-                "Set SENTINEL_CLIENT_ID and SENTINEL_CLIENT_SECRET in the "
-                "API Keys panel (Settings → API Keys) or your backend .env.",
-            )
-        raise HTTPException(400, "date required")
+        raise HTTPException(400, "client_id, client_secret, and date required")
 
     now = _time.time()
     credential_fp = _credential_fingerprint(client_id, client_secret)

backend/scripts/convert_power_plants.py

@@ -20,17 +20,7 @@ OUT_PATH = Path(__file__).parent.parent / "data" / "power_plants.json"
 
 def main() -> None:
     print(f"Downloading WRI Global Power Plant Database from GitHub...")
-    # Round 7a: release-time data refresher. Uses the per-operator UA if
-    # available, otherwise a release-script-specific identifier. This
-    # script is run by the maintainer at release time, NOT at runtime,
-    # so an aggregate UA is acceptable; we still use the helper so the
-    # behavior matches the rest of the project.
-    try:
-        from services.network_utils import outbound_user_agent
-        ua = outbound_user_agent("release-script-power-plants")
-    except Exception:
-        ua = "Shadowbroker/0.9 (release-script-power-plants; +https://github.com/BigBodyCobain/Shadowbroker/issues)"
-    req = urllib.request.Request(CSV_URL, headers={"User-Agent": ua})
+    req = urllib.request.Request(CSV_URL, headers={"User-Agent": "ShadowBroker-OSINT/1.0"})
     with urllib.request.urlopen(req, timeout=60) as resp:
         raw = resp.read().decode("utf-8")
 

backend/services/ais_stream.py

@@ -350,58 +350,19 @@ _proxy_process = None
 # path during an upstream cert outage. Surfaced via ais_proxy_status() for
 # /api/health.
 _proxy_status: dict = {}
-# Upstream-connectivity telemetry (added when stream.aisstream.io went fully
-# offline on 2026-05-23). ``_last_msg_at`` is the unix timestamp of the most
-# recent vessel message received from the proxy. ``_proxy_spawn_count`` is
-# how many times we've started the node proxy; combined with no recent
-# messages it tells us the proxy is respawning in a tight loop because the
-# upstream is unreachable. Surfaced via ais_proxy_status() so the operator
-# can see "AIS is dead" instead of guessing whether it's their map filter,
-# their api key, or upstream.
-_last_msg_at: float = 0.0
-_proxy_spawn_count: int = 0
 _VESSEL_TRAIL_INTERVAL_S = 120
 _VESSEL_TRAIL_MAX_POINTS = 240
 
 
-# How stale "last vessel message" can be before we consider the stream
-# disconnected. AISStream typically pushes multiple messages/sec, so a 60s
-# gap means something's wrong upstream or in transit.
-_AIS_CONNECTED_FRESHNESS_S = 60
-
-
 def ais_proxy_status() -> dict:
-    """Return a copy of the latest ais_proxy.js status + connectivity health.
+    """Return a copy of the latest ais_proxy.js status (issue #258).
 
-    Fields:
-      * ``degraded_tls`` (bool, issue #258) — true when the proxy is using
-        SPKI-pinned fallback because AISStream's cert expired.
-      * ``connected`` (bool) — true when we received a vessel message in
-        the last ``_AIS_CONNECTED_FRESHNESS_S`` seconds.
-      * ``last_msg_age_seconds`` (int | None) — seconds since the last
-        vessel message; None if we've never received one.
-      * ``proxy_spawn_count`` (int) — how many times we've spawned the
-        node proxy. Sustained increases here without ``connected`` means
-        we're respawning in a tight loop because upstream is dead.
-
-    Returns an empty dict when called before the AIS subsystem starts
-    (e.g. during tests or when no API key is set).
+    Currently surfaces ``degraded_tls`` (bool) which is true when the
+    proxy is using SPKI-pinned fallback because AISStream's cert expired.
+    Returns an empty dict when no status has been received yet.
     """
     with _vessels_lock:
-        status = dict(_proxy_status)
-        last = _last_msg_at
-        spawns = _proxy_spawn_count
-
-    now = time.time()
-    if last > 0:
-        last_age = int(now - last)
-        status["last_msg_age_seconds"] = last_age
-        status["connected"] = last_age <= _AIS_CONNECTED_FRESHNESS_S
-    else:
-        status["last_msg_age_seconds"] = None
-        status["connected"] = False
-    status["proxy_spawn_count"] = spawns
-    return status
+        return dict(_proxy_status)
 
 import os
 
@@ -627,10 +588,8 @@ def _ais_stream_loop():
                 env=proxy_env,
                 **popen_kwargs,
             )
-            global _proxy_spawn_count
             with _vessels_lock:
                 _proxy_process = process
-                _proxy_spawn_count += 1
 
             # Drain stderr in a background thread to prevent deadlock
             import threading
@@ -686,15 +645,9 @@ def _ais_stream_loop():
                 if not mmsi:
                     continue
 
-                # Telemetry: stamp the timestamp of the most recent real
-                # vessel message. ais_proxy_status() reads this to decide
-                # whether the stream is currently "connected" — i.e. has
-                # any data flowed in the last 60s.
-                global _last_msg_at
                 with _vessels_lock:
-                    _last_msg_at = time.time()
                     if mmsi not in _vessels:
-                        _vessels[mmsi] = {"_updated": _last_msg_at}
+                        _vessels[mmsi] = {"_updated": time.time()}
                     vessel = _vessels[mmsi]
 
                 # Update position from PositionReport or StandardClassBPositionReport

backend/services/api_settings.py

@@ -150,31 +150,6 @@ API_REGISTRY = [
         "url": "https://finnhub.io/register",
         "required": False,
     },
-    # Issue #298 (tg12): Sentinel Hub / Copernicus Data Space Ecosystem
-    # credentials were previously held in browser localStorage / sessionStorage
-    # by the Settings panel. Moved server-side to the same .env-backed
-    # store every other third-party API key lives in. The Sentinel proxy
-    # routes (POST /api/sentinel/token, /tile) now fall back to these
-    # env values when the request body omits credentials — see
-    # backend/routers/tools.py for the resolution order.
-    {
-        "id": "sentinel_client_id",
-        "env_key": "SENTINEL_CLIENT_ID",
-        "name": "Sentinel Hub / Copernicus — Client ID",
-        "description": "OAuth2 client ID for Copernicus Data Space Ecosystem (CDSE). Required for the Sentinel-2 imagery overlay and the right-click Sentinel-2 Intel Card. Sign in at dataspace.copernicus.eu and create OAuth credentials.",
-        "category": "Imagery",
-        "url": "https://dataspace.copernicus.eu/",
-        "required": False,
-    },
-    {
-        "id": "sentinel_client_secret",
-        "env_key": "SENTINEL_CLIENT_SECRET",
-        "name": "Sentinel Hub / Copernicus — Client Secret",
-        "description": "OAuth2 client secret paired with the Client ID above. Used by the backend to mint short-lived access tokens against the CDSE identity provider. Stored in the backend .env; never sent to the browser.",
-        "category": "Imagery",
-        "url": "https://dataspace.copernicus.eu/",
-        "required": False,
-    },
 ]
 
 ALLOWED_ENV_KEYS = {

backend/services/carrier_tracker.py

@@ -627,56 +627,20 @@ def update_carrier_positions() -> None:
             _carrier_positions.update(positions)
             _last_update = datetime.now(timezone.utc)
     logger.info(
-        "Carrier tracker: %d carriers loaded from cache (USNI + GDELT enrichment starting...)",
+        "Carrier tracker: %d carriers loaded from cache (GDELT enrichment starting...)",
         len(positions),
     )
 
-    # --- Phase 2: USNI Fleet & Marine Tracker (PRIMARY source) ---
-    #
-    # USNI publishes a weekly editorial tracker with each carrier's
-    # actual operating area, parsed from explicit prose like
-    #   "The Gerald R. Ford Carrier Strike Group is operating in the Red Sea"
-    # These positions are tagged ``position_confidence: "recent"`` because
-    # they reflect actual reporting, not headline-keyword centroids.
-    # USNI updates are preferred over GDELT — they're authoritative on
-    # US Navy positions where GDELT is just article-title text mining.
-    try:
-        from services.fetchers.usni_fleet_tracker import (
-            fetch_latest_fleet_tracker_positions,
-        )
-        usni_positions = fetch_latest_fleet_tracker_positions()
-        for hull, pos in usni_positions.items():
-            positions[hull] = pos
-            logger.info(
-                "Carrier USNI update: %s → %s",
-                CARRIER_REGISTRY[hull]["name"],
-                pos.get("desc", ""),
-            )
-    except Exception as e:
-        logger.warning("USNI fleet-tracker fetch failed: %s", e)
-
-    # --- Phase 3: GDELT enrichment (SECONDARY — fills gaps) ---
-    #
-    # Used only to backfill carriers USNI didn't mention this week. The
-    # position is stamped ``approximate`` so the UI knows it's a
-    # headline-centroid match (Issue #245).
+    # --- Phase 2: GDELT enrichment ---
     try:
         articles = _fetch_gdelt_carrier_news()
         news_positions = _parse_carrier_positions_from_news(articles)
         for hull, pos in news_positions.items():
-            # Only overwrite if the existing entry is NOT a recent USNI
-            # observation. A "recent" USNI position is higher-confidence
-            # than a GDELT headline-centroid match — don't let GDELT
-            # demote a real position to an approximate one.
-            existing = positions.get(hull, {})
-            existing_conf = _compute_position_confidence(existing)
-            if existing_conf == "recent":
-                continue
+            # Always overwrite — newest GDELT mention wins. The previous
+            # entry's position is preserved in git history and the next
+            # cycle either confirms or replaces it.
             positions[hull] = pos
-            logger.info(
-                "Carrier OSINT: updated %s from GDELT news",
-                CARRIER_REGISTRY[hull]["name"],
-            )
+            logger.info("Carrier OSINT: updated %s from news", CARRIER_REGISTRY[hull]["name"])
     except (ValueError, KeyError, json.JSONDecodeError, OSError) as e:
         logger.warning("GDELT carrier fetch failed: %s", e)
 

backend/services/config.py

@@ -32,7 +32,6 @@ class Settings(BaseSettings):
     MESH_ARTI_ENABLED: bool = False
     MESH_ARTI_SOCKS_PORT: int = 9050
     MESH_RELAY_PEERS: str = ""
-    MESH_PUBLIC_PEER_URL: str = ""
     # Bootstrap seeds are discovery hints, not authoritative network roots.
     # Nodes promote healthy discovered peers from the store/manifest over time.
     MESH_BOOTSTRAP_SEED_PEERS: str = "http://gqpbunqbgtkcqilvclm3xrkt3zowjyl3s62kkktvojgvxzizamvbrqid.onion:8000"
@@ -117,21 +116,6 @@ class Settings(BaseSettings):
     MESH_DM_REQUEST_MAILBOX_LIMIT: int = 12
     MESH_DM_SHARED_MAILBOX_LIMIT: int = 48
     MESH_DM_SELF_MAILBOX_LIMIT: int = 12
-    # Anti-spam: cap on distinct UNACKED messages a single sender can have
-    # parked in a single recipient's mailbox at any one time. Once the
-    # recipient pulls (acks) a message, the sender's quota for that pair
-    # frees up. Default 2 — a sender who wants to deliver more must wait
-    # for the recipient to actually read the prior messages.
-    #
-    # This cap is enforced TWICE: once on the local deposit path (the
-    # sender's own node refuses to spool the 3rd message) AND once on
-    # the replication-acceptance path (honest peer relays refuse to
-    # accept inbound replicas that would put them over the cap). The
-    # double enforcement makes the rule a NETWORK rule — patching out
-    # the local check on a hostile sender's relay doesn't let extras
-    # propagate, because every honest peer enforces the same cap on
-    # inbound replication.
-    MESH_DM_PENDING_PER_SENDER_LIMIT: int = 2
     MESH_BLOCK_LEGACY_AGENT_ID_LOOKUP: bool = True
     MESH_ALLOW_COMPAT_DM_INVITE_IMPORT: bool = False
     MESH_ALLOW_COMPAT_DM_INVITE_IMPORT_UNTIL: str = ""
@@ -311,19 +295,6 @@ class Settings(BaseSettings):
     # service operator can identify per-install traffic instead of a generic
     # "ShadowBroker" aggregate.
     MESHTASTIC_OPERATOR_CALLSIGN: str = ""
-    # Per-install operator handle used in the User-Agent for EVERY third-party
-    # API the backend calls (Wikipedia, Wikidata, Nominatim, GDELT, OpenMHz,
-    # Broadcastify, weather.gov, NUFORC, etc.). The default is empty, in which
-    # case backend/services/network_utils.py auto-generates a stable
-    # pseudonymous handle like "operator-7f3a92" on first use and caches it.
-    # Operators who want to identify themselves with a real handle can set
-    # this; operators who want to stay pseudonymous can leave it empty.
-    #
-    # The handle is sent ONLY to public third-party APIs. It is NEVER mixed
-    # into mesh / Wormhole / Infonet identity (those have their own crypto
-    # identity layer; conflating the two would leak public attribution into
-    # private mesh state).
-    OPERATOR_HANDLE: str = ""
 
     # SAR (Synthetic Aperture Radar) data layer
     # Mode A — free catalog metadata, no account, default-on

backend/services/constants.py

@@ -11,13 +11,8 @@ DEFAULT_TRAIL_TTL_S = 300  # 5 min - trail TTL for non-tracked flights
 HOLD_PATTERN_DEGREES = 300  # Total heading change to flag holding pattern
 GPS_JAMMING_NACP_THRESHOLD = 8  # NACp below this = degraded GPS signal
 GPS_JAMMING_GRID_SIZE = 1.0  # 1 degree grid for aggregation
-# Tuned 2026-05: previously 0.30 / 5 aircraft which — combined with the
-# -1 noise cushion in the detector AND the pre-fix nac_p==0 filter that
-# discarded jamming victims — meant the layer almost never lit up.
-# Lowering the bar so genuine jamming zones with sparser ADS-B coverage
-# clear (eastern Med, Russia/Ukraine border, Iran/Iraq).
-GPS_JAMMING_MIN_RATIO = 0.20  # 20% degraded aircraft to flag zone
-GPS_JAMMING_MIN_AIRCRAFT = 3  # Min aircraft in grid cell for statistical significance
+GPS_JAMMING_MIN_RATIO = 0.30  # 30% degraded aircraft to flag zone
+GPS_JAMMING_MIN_AIRCRAFT = 5  # Min aircraft in grid cell for statistical significance
 
 # ─── Network & Circuit Breaker ──────────────────────────────────────────────
 CIRCUIT_BREAKER_TTL_S = 120  # Skip domain for 2 min after total failure

backend/services/data_fetcher.py

@@ -777,39 +777,6 @@ def start_scheduler():
         misfire_grace_time=60,
     )
 
-    # Flight observation pruning — drops icao24 → first_seen_at entries we
-    # haven't seen in an hour. Same cadence as AIS prune for symmetry; the
-    # per-tick scan is O(in-flight aircraft) so it's cheap.
-    from services.fetchers.flight_observations import prune as _prune_flight_observations
-    _scheduler.add_job(
-        lambda: _run_task_with_health(_prune_flight_observations, "prune_flight_observations"),
-        "interval",
-        minutes=5,
-        id="flight_observation_prune",
-        max_instances=1,
-        misfire_grace_time=60,
-    )
-
-    # AISHub REST fallback — slow polling when the AISStream WebSocket
-    # primary is offline. Configurable interval via
-    # AISHUB_POLL_INTERVAL_MINUTES env (default 20 min). Operator must
-    # set AISHUB_USERNAME to opt in. The fetcher is gated internally on
-    # the primary being disconnected, so this job is cheap when the
-    # WebSocket is healthy (early-returns after a status check).
-    from services.fetchers.aishub_fallback import (
-        aishub_poll_interval_minutes,
-        fetch_aishub_vessels,
-    )
-    _aishub_interval = aishub_poll_interval_minutes()
-    _scheduler.add_job(
-        lambda: _run_task_with_health(fetch_aishub_vessels, "fetch_aishub_vessels"),
-        "interval",
-        minutes=_aishub_interval,
-        id="aishub_fallback",
-        max_instances=1,
-        misfire_grace_time=120,
-    )
-
     # Route database — bulk refresh from vrs-standing-data.adsb.lol every 5
     # days. Replaces the legacy /api/0/routeset POST (blocked under our UA,
     # and broken upstream). Airline schedules change on a quarterly cycle,
@@ -993,19 +960,16 @@ def start_scheduler():
         misfire_grace_time=600,
     )
 
-    # UAP sightings (NUFORC) — weekly on Mondays at 12:00 UTC. The layer is a
-    # rolling last-60-days digest; refreshing once a week is enough cadence
-    # for human-readable map exploration and keeps load on nuforc.org light.
+    # UAP sightings (NUFORC) — daily at 12:00 UTC
     _scheduler.add_job(
         lambda: _run_task_with_health(
             lambda: fetch_uap_sightings(force_refresh=True),
             "fetch_uap_sightings",
         ),
         "cron",
-        day_of_week="mon",
         hour=12,
         minute=0,
-        id="uap_sightings_weekly",
+        id="uap_sightings_daily",
         max_instances=1,
         misfire_grace_time=3600,
     )

backend/services/feed_ingester.py

@@ -16,15 +16,8 @@ from typing import Any
 
 import requests
 
-from services.network_utils import outbound_user_agent
-
 logger = logging.getLogger(__name__)
 
-
-def _feed_ingester_user_agent() -> str:
-    # Round 7a: per-install attribution for operator-curated feed URLs.
-    return outbound_user_agent("feed-ingester")
-
 # ---------------------------------------------------------------------------
 # State
 # ---------------------------------------------------------------------------
@@ -164,7 +157,7 @@ def _fetch_layer_feed(layer: dict[str, Any]) -> None:
         resp = requests.get(
             feed_url,
             timeout=_FETCH_TIMEOUT,
-            headers={"User-Agent": _feed_ingester_user_agent()},
+            headers={"User-Agent": "ShadowBroker-FeedIngester/1.0"},
         )
         resp.raise_for_status()
         data = resp.json()

backend/services/fetchers/aircraft_database.py

@@ -21,13 +21,6 @@ from typing import Any
 import defusedxml.ElementTree as ET
 import requests
 
-
-
-def _aircraft_db_user_agent() -> str:
-    """Round 7a: lazy import so the per-install operator handle is included."""
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("aircraft-database")
-
 logger = logging.getLogger(__name__)
 
 _BUCKET_LIST_URL = (
@@ -51,7 +44,7 @@ def _latest_snapshot_key() -> str:
     response = requests.get(
         _BUCKET_LIST_URL,
         timeout=_LIST_TIMEOUT_S,
-        headers={"User-Agent": _aircraft_db_user_agent()},
+        headers={"User-Agent": _USER_AGENT},
     )
     response.raise_for_status()
     root = ET.fromstring(response.text)
@@ -78,7 +71,7 @@ def _stream_csv_index(url: str) -> dict[str, dict[str, str]]:
         url,
         timeout=_DOWNLOAD_TIMEOUT_S,
         stream=True,
-        headers={"User-Agent": _aircraft_db_user_agent()},
+        headers={"User-Agent": _USER_AGENT},
     ) as response:
         response.raise_for_status()
         line_iter = (

backend/services/fetchers/aishub_fallback.py

@@ -1,290 +0,0 @@
-"""AISHub REST fallback for ship tracking when AISStream is unreachable.
-
-Background
-----------
-On 2026-05-23 ``stream.aisstream.io`` (the primary live AIS WebSocket feed)
-went fully offline. Backend's only ship signal vanished. This module polls
-``data.aishub.net``'s free REST API on a slow cadence (default 20 min) when
-the WebSocket primary is disconnected, so the ships layer doesn't go fully
-dark during upstream outages.
-
-Why 20 minutes
---------------
-AISHub's free tier is rate-limited and explicitly asks consumers to be
-courteous. 20 minutes is well inside their limits, gives ships time to
-move enough to look "alive" on the map, and won't drain their service.
-Configurable via the ``AISHUB_POLL_INTERVAL_MINUTES`` env var (clamped to
-[1, 360]).
-
-Why slow vs primary
--------------------
-This is degraded mode, not a replacement. A ship at 20 knots moves about
-6 nautical miles in 20 minutes — visible on the map but coarser than the
-real-time WebSocket signal. When AISStream comes back online, the
-WebSocket data will overwrite these records via the same ``_vessels``
-dict and ``source`` will flip from ``"aishub"`` back to upstream-live.
-
-Opt-in
-------
-Operator must set ``AISHUB_USERNAME`` (free registration at
-https://www.aishub.net/api). If unset, this fetcher is a no-op.
-"""
-
-from __future__ import annotations
-
-import json
-import logging
-import os
-import time
-from typing import Any
-
-from services.network_utils import fetch_with_curl
-
-logger = logging.getLogger(__name__)
-
-
-AISHUB_URL = "https://data.aishub.net/ws.php"
-
-
-def aishub_username() -> str:
-    return str(os.environ.get("AISHUB_USERNAME", "")).strip()
-
-
-def aishub_fallback_enabled() -> bool:
-    """Returns True only when the operator has registered with AISHub and
-    set ``AISHUB_USERNAME``. The presence of the username is the opt-in."""
-    return bool(aishub_username())
-
-
-def aishub_poll_interval_minutes() -> int:
-    """Default 20 minutes. Clamped to [1, 360] so a hostile or
-    misconfigured env var can't either hammer the upstream or silence the
-    fallback for a day."""
-    raw = os.environ.get("AISHUB_POLL_INTERVAL_MINUTES", "20")
-    try:
-        value = int(str(raw).strip())
-    except (TypeError, ValueError):
-        value = 20
-    return max(1, min(360, value))
-
-
-def _should_run_fallback() -> bool:
-    """Only run when the primary WebSocket is disconnected. Avoids stomping
-    over fresher live data when AISStream is healthy.
-
-    Returns False if:
-      * AISHub isn't configured (no username)
-      * AISStream primary is currently connected (recent vessel messages)
-
-    Returns True only when AIS is configured-but-down. The
-    ``proxy_spawn_count > 0`` guard means "the primary has at least tried
-    to run" — if the user set AISHUB_USERNAME but not AIS_API_KEY at all,
-    AISHub will still serve as a primary on its own slow cadence.
-    """
-    if not aishub_fallback_enabled():
-        return False
-    try:
-        from services.ais_stream import ais_proxy_status
-        status = ais_proxy_status() or {}
-    except Exception:
-        return True  # ais_stream not importable? still try AISHub.
-    # If the WebSocket primary is connected, skip the fallback — fresher
-    # data is already flowing.
-    if status.get("connected") is True:
-        return False
-    return True
-
-
-def _parse_aishub_response(payload: str) -> list[dict]:
-    """Parse the AISHub JSON response into a list of vessel records.
-
-    Successful response shape::
-
-        [
-            {"ERROR": false, "USERNAME": "...", "FORMAT": "1", "RECORDS": N},
-            [{"MMSI": ..., "LATITUDE": ..., "LONGITUDE": ..., ...}, ...]
-        ]
-
-    Error response shape::
-
-        [{"ERROR": true, "ERROR_MESSAGE": "..."}]
-
-    Empty payload (e.g. silent rate-limit drop) returns ``[]``.
-    """
-    if not payload or not payload.strip():
-        return []
-    try:
-        data = json.loads(payload)
-    except json.JSONDecodeError as e:
-        logger.warning("AISHub: response is not JSON: %s", e)
-        return []
-    if not isinstance(data, list) or not data:
-        return []
-    header = data[0] if isinstance(data[0], dict) else {}
-    if header.get("ERROR") is True:
-        logger.warning(
-            "AISHub: upstream error: %s",
-            header.get("ERROR_MESSAGE", "<unspecified>"),
-        )
-        return []
-    if len(data) < 2 or not isinstance(data[1], list):
-        return []
-    return [row for row in data[1] if isinstance(row, dict)]
-
-
-def _normalize_record(row: dict) -> dict | None:
-    """Map an AISHub vessel record to our internal vessel schema.
-
-    Returns None when the record can't be used (no MMSI, bad position,
-    sentinel "not available" lat/lng).
-    """
-    try:
-        mmsi = int(row.get("MMSI") or 0)
-    except (TypeError, ValueError):
-        return None
-    if not mmsi:
-        return None
-    try:
-        lat = float(row.get("LATITUDE"))
-        lng = float(row.get("LONGITUDE"))
-    except (TypeError, ValueError):
-        return None
-    # AIS uses 91/181 as "no position available" sentinels.
-    if abs(lat) > 90 or abs(lng) > 180:
-        return None
-    if lat == 91.0 or lng == 181.0:
-        return None
-    # SOG raw 102.3 is "speed not available"; sanitize to 0.
-    try:
-        sog_raw = float(row.get("SOG") or 0)
-    except (TypeError, ValueError):
-        sog_raw = 0.0
-    sog = 0.0 if sog_raw >= 102.2 else sog_raw
-    try:
-        cog = float(row.get("COG") or 0)
-    except (TypeError, ValueError):
-        cog = 0.0
-    try:
-        heading_raw = int(row.get("HEADING") or 511)
-    except (TypeError, ValueError):
-        heading_raw = 511
-    # AIS heading sentinel 511 = "not available" — fall back to COG.
-    heading = heading_raw if heading_raw != 511 else cog
-    try:
-        ais_type = int(row.get("TYPE") or 0)
-    except (TypeError, ValueError):
-        ais_type = 0
-    return {
-        "mmsi": mmsi,
-        "lat": lat,
-        "lng": lng,
-        "sog": sog,
-        "cog": cog,
-        "heading": heading,
-        "name": str(row.get("NAME") or "").strip() or "UNKNOWN",
-        "callsign": str(row.get("CALLSIGN") or "").strip(),
-        "destination": str(row.get("DEST") or "").strip().replace("@", "") or "",
-        "imo": int(row.get("IMO") or 0),
-        "ais_type_code": ais_type,
-    }
-
-
-def fetch_aishub_vessels() -> int:
-    """Poll AISHub and merge vessels into the shared ``_vessels`` store.
-
-    Returns the number of vessels updated (0 on skip, error, or no data).
-    Designed to be called by the APScheduler tier — see
-    ``data_fetcher.py`` for the 20-minute interval job that wraps this.
-    """
-    if not _should_run_fallback():
-        logger.debug("AISHub fallback skipped: primary connected or not configured")
-        return 0
-
-    username = aishub_username()
-    url = (
-        f"{AISHUB_URL}?username={username}&format=1&output=json"
-        f"&compress=0"
-    )
-
-    try:
-        response = fetch_with_curl(url, timeout=30)
-    except Exception as e:
-        logger.warning("AISHub fetch failed: %s", e)
-        return 0
-
-    if not response or response.status_code != 200:
-        logger.warning(
-            "AISHub HTTP %s",
-            getattr(response, "status_code", "None"),
-        )
-        return 0
-
-    rows = _parse_aishub_response(getattr(response, "text", "") or "")
-    if not rows:
-        return 0
-
-    # Inline imports to avoid a circular dependency at module load time
-    # (ais_stream imports lots of things and is loaded by main.py).
-    from services.ais_stream import (
-        _vessels,
-        _vessels_lock,
-        _record_vessel_trail_locked,
-        classify_vessel,
-        get_country_from_mmsi,
-    )
-
-    now = time.time()
-    count = 0
-    with _vessels_lock:
-        for row in rows:
-            normalized = _normalize_record(row)
-            if normalized is None:
-                continue
-            mmsi = normalized["mmsi"]
-            vessel = _vessels.setdefault(mmsi, {"mmsi": mmsi})
-            # Don't overwrite fresher live data: if the WebSocket pushed an
-            # update for this MMSI more recently than now-1s (race during
-            # the brief reconnection window) keep the live one.
-            last = float(vessel.get("_updated") or 0)
-            if last > now - 1:
-                continue
-            vessel.update(
-                {
-                    "lat": normalized["lat"],
-                    "lng": normalized["lng"],
-                    "sog": normalized["sog"],
-                    "cog": normalized["cog"],
-                    "heading": normalized["heading"],
-                    "_updated": now,
-                    "source": "aishub",
-                }
-            )
-            if normalized["name"] and normalized["name"] != "UNKNOWN":
-                vessel["name"] = normalized["name"]
-            if normalized["callsign"]:
-                vessel["callsign"] = normalized["callsign"]
-            if normalized["destination"]:
-                vessel["destination"] = normalized["destination"]
-            if normalized["imo"]:
-                vessel["imo"] = normalized["imo"]
-            if normalized["ais_type_code"]:
-                vessel["ais_type_code"] = normalized["ais_type_code"]
-                vessel["type"] = classify_vessel(normalized["ais_type_code"], mmsi)
-            if not vessel.get("country"):
-                vessel["country"] = get_country_from_mmsi(mmsi)
-            _record_vessel_trail_locked(
-                mmsi,
-                normalized["lat"],
-                normalized["lng"],
-                normalized["sog"],
-                now,
-            )
-            count += 1
-
-    if count:
-        logger.info(
-            "AISHub fallback: merged %d vessels (poll interval %d min)",
-            count,
-            aishub_poll_interval_minutes(),
-        )
-    return count

backend/services/fetchers/earth_observation.py

@@ -15,11 +15,7 @@ import time
 import heapq
 from datetime import datetime, timedelta
 from pathlib import Path
-from services.network_utils import (
-    external_curl_fallback_enabled,
-    fetch_with_curl,
-    outbound_user_agent,
-)
+from services.network_utils import external_curl_fallback_enabled, fetch_with_curl
 from services.fetchers._store import latest_data, _data_lock, _mark_fresh
 from services.fetchers.nuforc_enrichment import enrich_sighting
 from services.fetchers.retry import with_retry
@@ -283,13 +279,13 @@ def fetch_weather_alerts():
         return
     alerts = []
     try:
-        # weather.gov requires a User-Agent per their API policy. Round 7a:
-        # send the per-install operator handle so they can rate-limit per
-        # operator instead of treating "Shadowbroker" as one entity.
-        from services.network_utils import outbound_user_agent
+        # weather.gov requires a User-Agent per their API policy, but it
+        # need not identify the operator. Use a project-generic string and
+        # let the user override via SHADOWBROKER_USER_AGENT if needed.
+        from services.network_utils import DEFAULT_USER_AGENT
         url = "https://api.weather.gov/alerts/active?status=actual"
         headers = {
-            "User-Agent": outbound_user_agent("weather-gov"),
+            "User-Agent": DEFAULT_USER_AGENT,
             "Accept": "application/geo+json",
         }
         response = fetch_with_curl(url, timeout=15, headers=headers)
@@ -717,12 +713,7 @@ _NUFORC_LIVE_NONCE_RE = re.compile(
     r'id=["\']wdtNonceFrontendServerSide_1["\'][^>]*value=["\']([a-f0-9]+)["\']'
 )
 _NUFORC_LIVE_SIGHTING_ID_RE = re.compile(r"id=(\d+)")
-# Round 7a: NUFORC's site is sensitive to non-browser UAs but we send a
-# per-install operator handle prefixed by Mozilla/5.0 so we're identifiable
-# without being aggregately blocked. Operators who want stricter privacy
-# can override the entire UA via SHADOWBROKER_USER_AGENT.
-def _nuforc_live_user_agent() -> str:
-    return f"Mozilla/5.0 ({outbound_user_agent('nuforc-live')})"
+_NUFORC_LIVE_USER_AGENT = "Mozilla/5.0 (ShadowBroker-OSINT NUFORC-fetcher)"
 _NUFORC_LIVE_SESSION_COOKIES = _NUFORC_DATA_DIR / "nuforc_session.cookies"
 
 # Sample grid covering continental US, Alaska, Hawaii, Canada, UK, Australia
@@ -966,7 +957,7 @@ def _photon_lookup(query: str) -> list[float] | None:
         res = fetch_with_curl(
             url,
             headers={
-                "User-Agent": outbound_user_agent("nuforc-uap-geocode"),
+                "User-Agent": "ShadowBroker-OSINT/1.0 (NUFORC-UAP-layer)",
                 "Accept-Language": "en",
             },
             timeout=10,
@@ -1062,7 +1053,7 @@ def _nuforc_fetch_month_live(yyyymm: str, cookie_jar: Path) -> list[dict]:
         index_res = subprocess.run(
             [
                 curl_bin, "-sL",
-                "-A", _nuforc_live_user_agent(),
+                "-A", _NUFORC_LIVE_USER_AGENT,
                 "-c", str(cookie_jar),
                 "-b", str(cookie_jar),
                 index_url,
@@ -1098,7 +1089,7 @@ def _nuforc_fetch_month_live(yyyymm: str, cookie_jar: Path) -> list[dict]:
         ajax_res = subprocess.run(
             [
                 curl_bin, "-sL",
-                "-A", _nuforc_live_user_agent(),
+                "-A", _NUFORC_LIVE_USER_AGENT,
                 "-c", str(cookie_jar),
                 "-b", str(cookie_jar),
                 "-X", "POST",
@@ -1383,21 +1374,10 @@ def _build_uap_sightings_from_hf_mirror() -> list[dict]:
     This is a resilience fallback for local/Windows runs where nuforc.org is
     Cloudflare-gated and the Mapbox token is not configured. It is not as fresh
     as the live NUFORC AJAX feed, but it keeps the layer visible and cached.
-
-    Date-cutoff guard: the kcimc/NUFORC HF dataset is a static snapshot whose
-    maintainer refreshes it sporadically. Without a cutoff, sorting by
-    occurred-desc and taking the top N rows returns whatever the mirror's
-    newest rows happen to be — which can be years old if the snapshot is
-    stale. We apply the same ``_NUFORC_RECENT_DAYS`` window the live path
-    uses (60 days). If the HF mirror has nothing inside the window we return
-    ``[]`` rather than silently serving 3-year-old "newest" rows.
     """
     from services.fetchers.nuforc_enrichment import _HF_CSV_URL, _parse_date
     from services.geocode_validate import coord_in_country
 
-    cutoff_dt = datetime.utcnow() - timedelta(days=_NUFORC_RECENT_DAYS)
-    cutoff_str = cutoff_dt.strftime("%Y-%m-%d")
-
     try:
         response = fetch_with_curl(_HF_CSV_URL, timeout=180, follow_redirects=True)
         if not response or response.status_code != 200:
@@ -1411,7 +1391,6 @@ def _build_uap_sightings_from_hf_mirror() -> list[dict]:
         return []
 
     candidates: list[dict] = []
-    stale_rows_dropped = 0
     try:
         reader = csv.DictReader(io.StringIO(response.text))
         for row in reader:
@@ -1422,9 +1401,6 @@ def _build_uap_sightings_from_hf_mirror() -> list[dict]:
             )
             if not occurred:
                 continue
-            if occurred < cutoff_str:
-                stale_rows_dropped += 1
-                continue
             raw_location = _normalize_uap_location(
                 row.get("Location", "")
                 or row.get("City", "")
@@ -1459,19 +1435,6 @@ def _build_uap_sightings_from_hf_mirror() -> list[dict]:
         logger.warning("UAP sightings: HF fallback parse failed: %s", e)
         return []
 
-    if not candidates:
-        # HF mirror returned rows, but none inside the rolling window. This is
-        # the smoking gun for "the public HF dataset hasn't been refreshed in
-        # years" — log loudly so the operator sees it instead of guessing.
-        logger.error(
-            "UAP sightings: HF fallback yielded 0 rows within last %d days "
-            "(dropped %d stale rows). HF mirror is likely stale; the layer "
-            "will be empty until the live NUFORC path recovers.",
-            _NUFORC_RECENT_DAYS,
-            stale_rows_dropped,
-        )
-        return []
-
     candidates.sort(key=lambda row: (row["occurred"], row["posted"], row["id"]), reverse=True)
     candidates = candidates[:_NUFORC_HF_FALLBACK_LIMIT]
 
@@ -1543,29 +1506,13 @@ def fetch_uap_sightings(*, force_refresh: bool = False):
 
     sightings = _load_nuforc_sightings_cache(force_refresh=force_refresh)
     if sightings is None:
-        live_error: Exception | None = None
         try:
             sightings = _build_recent_uap_sightings()
         except Exception as e:
-            live_error = e
             logger.warning("UAP sightings: live NUFORC rebuild failed, using fallback: %s", e)
             sightings = _build_uap_sightings_from_hf_mirror()
         if sightings:
             _save_nuforc_sightings_cache(sightings)
-        elif live_error is not None:
-            # Both paths failed: live raised AND HF fallback returned empty
-            # (either the HF mirror is stale beyond the cutoff or the network
-            # is gone entirely). The previous code silently set the layer to
-            # ``[]`` and kept marking it fresh; that masked the failure for
-            # days. Surface it via assert_canary so the health registry shows
-            # the layer as broken instead of "fresh and empty".
-            from services.slo import assert_canary
-            assert_canary("uap_sightings", 0)
-            logger.error(
-                "UAP sightings: both live NUFORC and HF fallback produced 0 "
-                "rows; layer is unavailable. Live error: %s",
-                live_error,
-            )
 
     with _data_lock:
         latest_data["uap_sightings"] = sightings or []

backend/services/fetchers/flight_observations.py

@@ -1,148 +0,0 @@
-"""Per-aircraft observation tracking for cumulative fuel/CO2 estimates.
-
-Background
-----------
-The pre-existing emissions enrichment attached a *rate* to each flight
-(GPH and kg/hr) based on aircraft model. Users — reasonably — wanted the
-running total: how much fuel HAS this plane burned since we started
-seeing it? Multiplying the rate by elapsed observation time gets us
-there, but it requires somewhere to remember "when did this icao24
-first appear on our radar?"
-
-Why this lives outside ``flight_trails``
-----------------------------------------
-``flight_trails`` is sized and pruned aggressively for map rendering
-(5-minute TTL for untracked aircraft, 200 trail points max). That's
-wrong for cumulative burn: if a plane has been airborne 2 hours but
-its trail was pruned 30 min in, the "first trail point" timestamp is
-30 min ago, not 2h ago. Worse, when the trail expires and re-creates,
-the cumulative counter would reset mid-flight.
-
-This module tracks observation lifecycle separately:
-
-* When a hex is first observed: start a new flight session.
-* While observed regularly (gap < ``REOPEN_GAP_S``): keep accumulating.
-* When unseen for longer than ``REOPEN_GAP_S``: treat next sighting as
-  a new session (the plane landed and took off again, or it's a
-  different leg). Reset ``first_seen_at``.
-* Stale sessions are pruned every ``PRUNE_INTERVAL_S`` so memory stays
-  bounded.
-
-The user explicitly asked for this counting semantic: "as soon as a
-plane appears there should be a counter that keeps a running count of
-the fuel being burned... If there is no estimate take off time then it
-can just be from the time the server starts to keep a log of whats in
-the air."
-"""
-
-from __future__ import annotations
-
-import threading
-import time
-
-
-# Gap between sightings that resets the session. ADS-B refreshes the
-# whole aircraft list every minute or two, so anything over a few
-# minutes means the plane left our coverage window (landed, transit
-# through dead zone, etc). 15 minutes is conservative.
-REOPEN_GAP_S = 15 * 60
-
-# Don't accumulate runaway memory: drop entries unseen for an hour.
-PRUNE_AFTER_S = 60 * 60
-
-# Cap on accumulated airtime per session so a single bug elsewhere
-# (e.g. ts clock skew) can't produce comically large numbers.
-MAX_SESSION_SECONDS = 24 * 3600  # 24h — longest realistic civilian leg
-
-
-_observations: dict[str, dict[str, float]] = {}
-_lock = threading.Lock()
-_last_prune_at = 0.0
-
-
-def record_observation(icao_hex: str, *, now: float | None = None) -> int:
-    """Record a sighting of ``icao_hex`` and return airtime so far (seconds).
-
-    Returns 0 for the first-ever sighting (no elapsed time yet) or when
-    ``icao_hex`` is falsy. The caller can multiply the returned seconds
-    by ``rate_per_hour / 3600`` to get cumulative consumption.
-    """
-    if not icao_hex:
-        return 0
-    key = str(icao_hex).strip().lower()
-    if not key:
-        return 0
-    current = float(now if now is not None else time.time())
-
-    with _lock:
-        entry = _observations.get(key)
-        if entry is None:
-            _observations[key] = {"first_seen_at": current, "last_seen_at": current}
-            return 0
-        # Use explicit ``is None`` checks instead of ``or`` short-circuit:
-        # ``0.0`` is a legitimate timestamp value (e.g. test fixtures
-        # seeding a far-past first_seen_at to exercise the clamp) but
-        # ``0.0 or fallback`` collapses to ``fallback`` because 0.0 is
-        # falsy. Bit me on my own test — leaving the safer form here.
-        last_raw = entry.get("last_seen_at")
-        last_seen = float(last_raw) if last_raw is not None else current
-        gap = current - last_seen
-        if gap > REOPEN_GAP_S:
-            # Treat as a new flight session — the plane landed/disappeared
-            # long enough that the prior cumulative count is no longer
-            # the same flight.
-            _observations[key] = {"first_seen_at": current, "last_seen_at": current}
-            return 0
-        first_raw = entry.get("first_seen_at")
-        first = float(first_raw) if first_raw is not None else current
-        # Clamp absurd values from clock skew or bad input.
-        elapsed = max(0, min(int(current - first), MAX_SESSION_SECONDS))
-        entry["last_seen_at"] = current
-        return elapsed
-
-
-def prune(*, now: float | None = None) -> int:
-    """Drop entries we haven't seen in ``PRUNE_AFTER_S`` seconds.
-
-    Returns number of entries dropped. Safe to call from a scheduler tick;
-    cheap (single dict scan) so cadence doesn't matter much.
-    """
-    current = float(now if now is not None else time.time())
-    dropped = 0
-    with _lock:
-        stale_keys = []
-        for k, v in _observations.items():
-            last_raw = v.get("last_seen_at")
-            last = float(last_raw) if last_raw is not None else 0.0
-            if current - last > PRUNE_AFTER_S:
-                stale_keys.append(k)
-        for k in stale_keys:
-            del _observations[k]
-            dropped += 1
-    return dropped
-
-
-def get_session_seconds(icao_hex: str, *, now: float | None = None) -> int:
-    """Read-only accessor: airtime for a known icao without bumping last-seen.
-
-    Used by tests and external consumers (e.g. when rendering a snapshot
-    of all in-flight aircraft, you want the current value, not to update
-    last_seen_at as a side effect).
-    """
-    if not icao_hex:
-        return 0
-    key = str(icao_hex).strip().lower()
-    with _lock:
-        entry = _observations.get(key)
-        if entry is None:
-            return 0
-        current = float(now if now is not None else time.time())
-        first_raw = entry.get("first_seen_at")
-        first = float(first_raw) if first_raw is not None else current
-        return max(0, min(int(current - first), MAX_SESSION_SECONDS))
-
-
-def _reset_for_tests() -> None:
-    """Drop all observations. Test helper only."""
-    with _lock:
-        _observations.clear()

backend/services/fetchers/flights.py

@@ -17,7 +17,6 @@ from services.network_utils import fetch_with_curl
 from services.fetchers._store import latest_data, _data_lock, _mark_fresh
 from services.fetchers.plane_alert import enrich_with_plane_alert, enrich_with_tracked_names
 from services.fetchers.emissions import get_emissions_info
-from services.fetchers.flight_observations import record_observation as _record_flight_observation
 from services.fetchers.retry import with_retry
 from services.fetchers.route_database import lookup_route
 from services.fetchers.aircraft_database import lookup_aircraft_type
@@ -30,88 +29,6 @@ _RE_AIRLINE_CODE_1 = re.compile(r"^([A-Z]{3})\d")
 _RE_AIRLINE_CODE_2 = re.compile(r"^([A-Z]{3})[A-Z\d]")
 
 
-def detect_gps_jamming_zones(
-    raw_flights: list[dict],
-    *,
-    min_aircraft: int | None = None,
-    min_ratio: float | None = None,
-    nacp_threshold: int | None = None,
-) -> list[dict]:
-    """Detect GPS interference zones from a snapshot of raw ADS-B aircraft.
-
-    Methodology mirrors GPSJam.org / Flightradar24: bin aircraft into 1°x1°
-    grid cells, flag cells where the fraction of aircraft reporting degraded
-    NACp clears a threshold.
-
-    Inputs
-    ------
-    raw_flights:
-        Iterable of dicts. Each item is expected to carry ``lat``, ``lng``
-        (or ``lon``), and ``nac_p``. Records missing position OR missing
-        ``nac_p`` entirely (typical for OpenSky-sourced flights) are
-        skipped — absence-of-data isn't evidence of anything.
-
-    nac_p == 0 IS counted as degraded. Pre-fix code skipped it on the theory
-    that "0 = old transponder, never computed accuracy." That's only half
-    right: modern Mode-S Enhanced Surveillance transponders also fall back
-    to nac_p=0 when they lose GPS lock entirely — which is exactly the
-    jamming signature we're trying to detect. Filtering 0 out was discarding
-    the strongest evidence.
-
-    Denoising:
-        1. Require ``min_aircraft`` per grid cell for statistical validity.
-        2. Subtract 1 from degraded count per cell (GPSJam's technique) so
-           a single quirky transponder can't flag an entire zone.
-        3. Require ratio ``adjusted_degraded / total > min_ratio``.
-
-    All thresholds default to the module-level constants but can be
-    overridden for testing.
-    """
-    min_aircraft = GPS_JAMMING_MIN_AIRCRAFT if min_aircraft is None else int(min_aircraft)
-    min_ratio = GPS_JAMMING_MIN_RATIO if min_ratio is None else float(min_ratio)
-    nacp_threshold = (
-        GPS_JAMMING_NACP_THRESHOLD if nacp_threshold is None else int(nacp_threshold)
-    )
-
-    jamming_grid: dict[str, dict[str, int]] = {}
-    for rf in raw_flights or []:
-        rlat = rf.get("lat")
-        rlng = rf.get("lng") if rf.get("lng") is not None else rf.get("lon")
-        if rlat is None or rlng is None:
-            continue
-        nacp = rf.get("nac_p")
-        if nacp is None:
-            continue
-        grid_key = f"{int(rlat)},{int(rlng)}"
-        cell = jamming_grid.setdefault(grid_key, {"degraded": 0, "total": 0})
-        cell["total"] += 1
-        if nacp < nacp_threshold:
-            cell["degraded"] += 1
-
-    jamming_zones: list[dict] = []
-    for gk, counts in jamming_grid.items():
-        if counts["total"] < min_aircraft:
-            continue
-        adjusted_degraded = max(counts["degraded"] - 1, 0)
-        if adjusted_degraded == 0:
-            continue
-        ratio = adjusted_degraded / counts["total"]
-        if ratio > min_ratio:
-            lat_i, lng_i = gk.split(",")
-            severity = "low" if ratio < 0.5 else "medium" if ratio < 0.75 else "high"
-            jamming_zones.append(
-                {
-                    "lat": int(lat_i) + 0.5,
-                    "lng": int(lng_i) + 0.5,
-                    "severity": severity,
-                    "ratio": round(ratio, 2),
-                    "degraded": counts["degraded"],
-                    "total": counts["total"],
-                }
-            )
-    return jamming_zones
-
-
 # ---------------------------------------------------------------------------
 # OpenSky Network API Client (OAuth2)
 # ---------------------------------------------------------------------------
@@ -542,18 +459,6 @@ def _classify_and_publish(all_adsb_flights):
 
             ac_category = "heli" if model_upper in _HELI_TYPES_BACKEND else "plane"
 
-            # Source attribution: prefer the explicit ``source`` tag stamped
-            # at fetch time (adsb.lol, OpenSky). If absent, fall back to the
-            # legacy ``supplemental_source`` (airplanes.live, adsb.fi) so
-            # supplementals are still attributed without changing their
-            # tagger. Final fallback "adsb.lol" preserves prior behavior for
-            # any caller that synthesizes records without going through one
-            # of our fetchers (e.g. tests).
-            source = (
-                f.get("source")
-                or f.get("supplemental_source")
-                or "adsb.lol"
-            )
             flights.append(
                 {
                     "callsign": flight_str,
@@ -575,7 +480,6 @@ def _classify_and_publish(all_adsb_flights):
                     "airline_code": airline_code,
                     "aircraft_category": ac_category,
                     "nac_p": f.get("nac_p"),
-                    "source": source,
                 }
             )
         except (ValueError, TypeError, KeyError, AttributeError) as loop_e:
@@ -602,22 +506,6 @@ def _classify_and_publish(all_adsb_flights):
         if model:
             emi = get_emissions_info(model)
             if emi:
-                # Cumulative fuel/CO2: multiply the per-hour rate by how
-                # long we've been observing this airframe. Users want to
-                # see the *amount* burned, not just the rate. If we've
-                # never seen this hex before, observed_seconds is 0 and
-                # the cumulative values are 0 until the next refresh —
-                # the rate is still useful info on its own.
-                observed_seconds = _record_flight_observation(
-                    f.get("icao24") or ""
-                )
-                elapsed_h = observed_seconds / 3600.0
-                emi = {
-                    **emi,
-                    "observed_seconds": observed_seconds,
-                    "fuel_gallons_burned": round(emi["fuel_gph"] * elapsed_h, 1),
-                    "co2_kg_emitted": round(emi["co2_kg_per_hour"] * elapsed_h, 1),
-                }
                 f["emissions"] = emi
 
         callsign = f.get("callsign", "").strip().upper()
@@ -836,8 +724,56 @@ def _classify_and_publish(all_adsb_flights):
         latest_data["military_flights"] = military_snapshot
 
     # --- GPS Jamming Detection ---
+    # Uses NACp (Navigation Accuracy Category – Position) from ADS-B to infer
+    # GPS interference zones, similar to GPSJam.org / Flightradar24.
+    # NACp < 8 = position accuracy worse than the FAA-mandated 0.05 NM.
+    #
+    # Denoising (to suppress false positives from old GA transponders):
+    # 1. Skip nac_p == 0 ("unknown accuracy") — old transponders that never
+    #    computed accuracy, NOT evidence of jamming.  Real jamming shows 1-7.
+    # 2. Require minimum aircraft per grid cell for statistical validity.
+    # 3. Subtract 1 from degraded count per cell (GPSJam's technique) so a
+    #    single quirky transponder can't flag an entire zone.
+    # 4. Require the adjusted ratio to exceed the threshold.
     try:
-        jamming_zones = detect_gps_jamming_zones(raw_flights_snapshot)
+        jamming_grid = {}
+        raw_flights = raw_flights_snapshot
+        for rf in raw_flights:
+            rlat = rf.get("lat")
+            rlng = rf.get("lng") or rf.get("lon")
+            if rlat is None or rlng is None:
+                continue
+            nacp = rf.get("nac_p")
+            if nacp is None or nacp == 0:
+                continue
+            grid_key = f"{int(rlat)},{int(rlng)}"
+            if grid_key not in jamming_grid:
+                jamming_grid[grid_key] = {"degraded": 0, "total": 0}
+            jamming_grid[grid_key]["total"] += 1
+            if nacp < GPS_JAMMING_NACP_THRESHOLD:
+                jamming_grid[grid_key]["degraded"] += 1
+
+        jamming_zones = []
+        for gk, counts in jamming_grid.items():
+            if counts["total"] < GPS_JAMMING_MIN_AIRCRAFT:
+                continue
+            adjusted_degraded = max(counts["degraded"] - 1, 0)
+            if adjusted_degraded == 0:
+                continue
+            ratio = adjusted_degraded / counts["total"]
+            if ratio > GPS_JAMMING_MIN_RATIO:
+                lat_i, lng_i = gk.split(",")
+                severity = "low" if ratio < 0.5 else "medium" if ratio < 0.75 else "high"
+                jamming_zones.append(
+                    {
+                        "lat": int(lat_i) + 0.5,
+                        "lng": int(lng_i) + 0.5,
+                        "severity": severity,
+                        "ratio": round(ratio, 2),
+                        "degraded": counts["degraded"],
+                        "total": counts["total"],
+                    }
+                )
         with _data_lock:
             latest_data["gps_jamming"] = jamming_zones
         if jamming_zones:
@@ -913,15 +849,7 @@ def _fetch_adsb_lol_regions():
             res = fetch_with_curl(url, timeout=10)
             if res.status_code == 200:
                 data = res.json()
-                aircraft = data.get("ac", [])
-                # Stamp the source at the fetch site so attribution survives
-                # the OpenSky/supplemental dedupe-by-hex merge downstream.
-                # Previously adsb.lol records carried no marker while OpenSky
-                # records got ``is_opensky: True`` — which made flight tooltips
-                # look like everything came from OpenSky.
-                for a in aircraft:
-                    a["source"] = "adsb.lol"
-                return aircraft
+                return data.get("ac", [])
         except (
             requests.RequestException,
             ConnectionError,
@@ -1004,7 +932,6 @@ def _enrich_with_opensky_and_supplemental(adsb_flights):
                                     "gs": (s[9] * 1.94384) if s[9] else 0,
                                     "t": "Unknown",
                                     "is_opensky": True,
-                                    "source": "OpenSky",
                                 }
                             )
                     elif os_res.status_code == 429:

backend/services/fetchers/infrastructure.py

@@ -6,7 +6,7 @@ import heapq
 import logging
 from pathlib import Path
 from cachetools import TTLCache
-from services.network_utils import fetch_with_curl, outbound_user_agent
+from services.network_utils import fetch_with_curl
 from services.fetchers._store import latest_data, _data_lock, _mark_fresh
 from services.fetchers.retry import with_retry
 
@@ -29,7 +29,7 @@ def _geocode_region(region_name: str, country_name: str) -> tuple:
 
         query = urllib.parse.quote(f"{region_name}, {country_name}")
         url = f"https://nominatim.openstreetmap.org/search?q={query}&format=json&limit=1"
-        response = fetch_with_curl(url, timeout=8, headers={"User-Agent": outbound_user_agent("infrastructure-data")})
+        response = fetch_with_curl(url, timeout=8, headers={"User-Agent": "ShadowBroker-OSINT/1.0"})
         if response.status_code == 200:
             results = response.json()
             if results:

backend/services/fetchers/meshtastic_map.py

@@ -191,13 +191,8 @@ def fetch_meshtastic_nodes():
         _os.environ.get("MESHTASTIC_SEND_CALLSIGN_HEADER", "true")
     ).strip().lower() not in {"0", "false", "no", "off", ""}
 
-    # Round 7a: outbound_user_agent already includes the per-install handle.
-    # The optional Meshtastic callsign is appended as additional context so
-    # meshtastic.liamcottle.net's operator can identify both the install AND
-    # the registered radio operator (when MESHTASTIC_OPERATOR_CALLSIGN is set
-    # and MESHTASTIC_SEND_CALLSIGN_HEADER is true; see issue #203).
-    from services.network_utils import outbound_user_agent
-    ua_base = f"{outbound_user_agent('meshtastic-map')}; 24h polling"
+    from services.network_utils import DEFAULT_USER_AGENT
+    ua_base = f"{DEFAULT_USER_AGENT}; 24h polling"
     if callsign and send_callsign_header:
         user_agent = f"{ua_base}; node={callsign}"
     else:

backend/services/fetchers/military.py

@@ -7,7 +7,6 @@ import requests
 from services.network_utils import fetch_with_curl
 from services.fetchers._store import latest_data, _data_lock, _mark_fresh
 from services.fetchers.emissions import get_emissions_info
-from services.fetchers.flight_observations import record_observation as _record_flight_observation
 from services.fetchers.plane_alert import enrich_with_plane_alert
 
 logger = logging.getLogger("services.data_fetcher")
@@ -172,7 +171,6 @@ def fetch_military_flights():
                 h = a.get("hex", "").lower()
                 if h and h not in seen_hex:
                     seen_hex.add(h)
-                    a["source"] = "adsb.lol"
                     all_mil_ac.append(a)
     except Exception as e:
         logger.warning(f"adsb.lol mil fetch failed: {e}")
@@ -184,7 +182,6 @@ def fetch_military_flights():
                 h = a.get("hex", "").lower()
                 if h and h not in seen_hex:
                     seen_hex.add(h)
-                    a["source"] = "airplanes.live"
                     all_mil_ac.append(a)
             logger.info(f"airplanes.live mil: +{len(resp2.json().get('ac', []))} raw, {len(all_mil_ac)} total unique")
     except Exception as e:
@@ -237,7 +234,6 @@ def fetch_military_flights():
                             "registration": f.get("r", "N/A"),
                             "icao24": icao_hex,
                             "squawk": f.get("squawk", ""),
-                            "source": f.get("source") or "adsb.lol",
                         })
                         continue
 
@@ -262,8 +258,7 @@ def fetch_military_flights():
                         "model": f.get("t", "Unknown"),
                         "icao24": icao_hex,
                         "speed_knots": speed_knots,
-                        "squawk": f.get("squawk", ""),
-                        "source": f.get("source") or "adsb.lol",
+                        "squawk": f.get("squawk", "")
                     })
                 except Exception as loop_e:
                     logger.error(f"Mil flight interpolation error: {loop_e}")
@@ -301,18 +296,6 @@ def fetch_military_flights():
         if model:
             emissions = get_emissions_info(model)
             if emissions:
-                # Cumulative fuel/CO2 since first observation — mirrors
-                # the civilian path in flights._classify_and_publish.
-                observed_seconds = _record_flight_observation(
-                    mf.get("icao24") or ""
-                )
-                elapsed_h = observed_seconds / 3600.0
-                emissions = {
-                    **emissions,
-                    "observed_seconds": observed_seconds,
-                    "fuel_gallons_burned": round(emissions["fuel_gph"] * elapsed_h, 1),
-                    "co2_kg_emitted": round(emissions["co2_kg_per_hour"] * elapsed_h, 1),
-                }
                 mf["emissions"] = emissions
         if mf.get("alert_category"):
             mf["type"] = "tracked_flight"

backend/services/fetchers/route_database.py

@@ -17,12 +17,6 @@ from typing import Any
 
 import requests
 
-
-
-def _route_db_user_agent() -> str:
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("route-database")
-
 logger = logging.getLogger(__name__)
 
 _ROUTES_URL = "https://vrs-standing-data.adsb.lol/routes.csv.gz"
@@ -43,7 +37,7 @@ def _fetch_csv_gz(url: str) -> list[dict[str, str]]:
     response = requests.get(
         url,
         timeout=_HTTP_TIMEOUT_S,
-        headers={"User-Agent": _route_db_user_agent(), "Accept-Encoding": "gzip"},
+        headers={"User-Agent": _USER_AGENT, "Accept-Encoding": "gzip"},
     )
     response.raise_for_status()
     text = gzip.decompress(response.content).decode("utf-8-sig")

backend/services/fetchers/trains.py

@@ -10,12 +10,6 @@ from datetime import datetime, timezone
 from services.fetchers._store import _data_lock, _mark_fresh, latest_data
 from services.network_utils import fetch_with_curl
 
-
-
-def _trains_user_agent() -> str:
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("trains")
-
 logger = logging.getLogger(__name__)
 
 _EARTH_RADIUS_KM = 6371.0
@@ -385,7 +379,7 @@ def _fetch_digitraffic() -> list[dict]:
             timeout=15,
             headers={
                 "Accept-Encoding": "gzip",
-                "User-Agent": _trains_user_agent(),
+                "User-Agent": "ShadowBroker-OSINT/1.0",
             },
         )
         if resp.status_code != 200:

backend/services/fetchers/usni_fleet_tracker.py

@@ -1,457 +0,0 @@
-"""USNI News Fleet & Marine Tracker — authoritative weekly carrier
-position publication.
-
-Why this exists
----------------
-The previous carrier_tracker pipeline relied on GDELT headline matching
-(``api.gdeltproject.org``) to derive positions from text like "USS Ford
-in the Mediterranean" → centroid of "Mediterranean Sea". That was
-- low-precision (audit issue #245 — false precision from text mentions),
-- unreliable (``api.gdeltproject.org`` is sometimes unreachable from
-  certain network paths, including Docker Desktop on some Windows hosts).
-
-USNI publishes a weekly tracker that explicitly lists where every U.S.
-carrier is operating. The article body uses extremely consistent phrasing:
-
-    "The Gerald R. Ford Carrier Strike Group is operating in the Red Sea"
-    "Aircraft carrier USS George Washington (CVN-73) is in port in
-     Yokosuka, Japan."
-    "USS Dwight D. Eisenhower (CVN-69) sails down the Elizabeth River"
-
-Those are deterministic to parse. This module:
-
-  1. Pulls the WordPress RSS feeds (both site-wide and category) — the
-     site-wide feed often has fresher posts before the category feed
-     catches up, so we union them.
-  2. Picks the most recent post by parsed ``pubDate``.
-  3. For each carrier in the registry, scans the article body for a
-     "is operating in / is in port in / departed from" pattern near
-     the carrier's name.
-  4. Maps the extracted region phrase to coordinates via the carrier
-     tracker's existing REGION_COORDS.
-
-The result is a ``{hull: position_entry}`` dict that the carrier tracker
-consumes as a high-confidence source — ``position_confidence: "recent"``
-with ``position_source_at`` set to the article's actual publication
-timestamp (not ``now()``).
-
-Politeness
-----------
-We send the per-install operator handle via ``outbound_user_agent``
-(Round 7a) so USNI can rate-limit / contact the specific install if
-needed. Article-body pages return 403 to non-browser UAs (Cloudflare),
-but WordPress RSS feeds are open and serve the full article in
-``<content:encoded>`` — that's the supported path for aggregators and
-the one we use. We do not spoof browser headers.
-"""
-
-from __future__ import annotations
-
-import logging
-import re
-import xml.etree.ElementTree as ET
-from datetime import datetime, timezone
-from email.utils import parsedate_to_datetime
-from typing import Iterable
-
-from services.network_utils import fetch_with_curl, outbound_user_agent
-
-logger = logging.getLogger(__name__)
-
-_RSS_URLS: tuple[str, ...] = (
-    # Site-wide feed often has the freshest posts before the category
-    # feed catches up. We try this first.
-    "https://news.usni.org/feed",
-    # Category feed has older fleet trackers for backfill.
-    "https://news.usni.org/category/fleet-tracker/feed",
-)
-
-_RSS_NS = {"content": "http://purl.org/rss/1.0/modules/content/"}
-
-_FLEET_TRACKER_TITLE_RE = re.compile(
-    r"fleet\s+and\s+marine\s+tracker", re.IGNORECASE
-)
-
-_TAG_STRIP_RE = re.compile(r"<[^>]+>")
-_WHITESPACE_RE = re.compile(r"\s+")
-
-
-def _strip_html(html: str) -> str:
-    text = _TAG_STRIP_RE.sub(" ", html or "")
-    return _WHITESPACE_RE.sub(" ", text).strip()
-
-
-def _request_headers() -> dict[str, str]:
-    """Headers USNI's WordPress feed accepts from a legitimate aggregator.
-
-    The ``Referer`` is the category index page — that's where a real
-    feed reader navigates from. ``Accept`` declares RSS preference but
-    falls back to HTML. No browser UA spoofing.
-    """
-    return {
-        "User-Agent": outbound_user_agent("usni-fleet-tracker"),
-        "Accept": "application/rss+xml, application/xml;q=0.9, */*;q=0.1",
-        "Accept-Language": "en-US,en;q=0.5",
-        "Referer": "https://news.usni.org/category/fleet-tracker",
-    }
-
-
-def _parse_pubdate(raw: str) -> datetime | None:
-    if not raw:
-        return None
-    try:
-        dt = parsedate_to_datetime(raw)
-        if dt.tzinfo is None:
-            dt = dt.replace(tzinfo=timezone.utc)
-        return dt
-    except (TypeError, ValueError):
-        return None
-
-
-def _iter_fleet_tracker_items(rss_urls: Iterable[str]) -> list[dict]:
-    """Pull every fleet-tracker post visible across the given RSS feeds.
-
-    De-duplicates by article link. Returns a list of dicts:
-        {"title", "link", "pub_date" (datetime), "body" (plain text)}
-    """
-    items_by_link: dict[str, dict] = {}
-    for url in rss_urls:
-        try:
-            r = fetch_with_curl(url, timeout=15, headers=_request_headers())
-        except Exception as exc:
-            logger.debug("USNI RSS %s exception: %s", url, exc)
-            continue
-        if not r or r.status_code != 200 or not r.text:
-            logger.debug(
-                "USNI RSS %s returned status=%s body=%d",
-                url,
-                getattr(r, "status_code", "?"),
-                len(getattr(r, "text", "") or ""),
-            )
-            continue
-        try:
-            root = ET.fromstring(r.text)
-        except ET.ParseError as exc:
-            logger.warning("USNI RSS parse error from %s: %s", url, exc)
-            continue
-        for item in root.findall(".//item"):
-            title = (item.findtext("title") or "").strip()
-            if not _FLEET_TRACKER_TITLE_RE.search(title):
-                continue
-            link = (item.findtext("link") or "").strip()
-            if not link or link in items_by_link:
-                continue
-            pub_dt = _parse_pubdate(item.findtext("pubDate") or "")
-            body_html = (
-                item.findtext("content:encoded", default="", namespaces=_RSS_NS)
-                or item.findtext("description", default="")
-                or ""
-            )
-            items_by_link[link] = {
-                "title": title,
-                "link": link,
-                "pub_date": pub_dt,
-                "body": _strip_html(body_html),
-            }
-    return list(items_by_link.values())
-
-
-# Map USNI region phrases to keys in carrier_tracker.REGION_COORDS.
-# The carrier_tracker table already covers most named bodies of water and
-# major ports — we just need to teach this module to RECOGNIZE the
-# specific phrases USNI's editorial style uses, which sometimes spell
-# the same body of water differently.
-_USNI_REGION_ALIASES: tuple[tuple[str, str], ...] = (
-    # USNI phrase (lowercase) -> REGION_COORDS key
-    ("eastern mediterranean", "eastern mediterranean"),
-    ("western mediterranean", "western mediterranean"),
-    ("mediterranean sea", "mediterranean"),
-    ("the mediterranean", "mediterranean"),
-    ("red sea", "red sea"),
-    ("arabian sea area of responsibility", "arabian sea"),
-    ("north arabian sea", "north arabian sea"),
-    ("arabian sea", "arabian sea"),
-    ("persian gulf", "persian gulf"),
-    ("gulf of oman", "gulf of oman"),
-    ("strait of hormuz", "strait of hormuz"),
-    ("south china sea", "south china sea"),
-    ("east china sea", "east china sea"),
-    ("philippine sea", "philippine sea"),
-    ("sea of japan", "sea of japan"),
-    ("taiwan strait", "taiwan strait"),
-    ("western pacific", "western pacific"),
-    ("pacific ocean", "pacific"),
-    ("indian ocean", "indian ocean"),
-    ("north atlantic", "north atlantic"),
-    ("western atlantic", "atlantic"),
-    ("eastern atlantic", "atlantic"),
-    ("atlantic ocean", "atlantic"),
-    ("gulf of aden", "gulf of aden"),
-    ("horn of africa", "horn of africa"),
-    ("bab el-mandeb", "bab el-mandeb"),
-    ("suez canal", "suez canal"),
-    ("baltic sea", "baltic sea"),
-    ("north sea", "north sea"),
-    ("black sea", "black sea"),
-    ("south atlantic", "south atlantic"),
-    ("coral sea", "coral sea"),
-    ("gulf of mexico", "gulf of mexico"),
-    ("caribbean sea", "caribbean"),
-    ("caribbean", "caribbean"),
-    # Specific ports
-    ("naval station norfolk", "norfolk"),
-    ("norfolk naval shipyard", "newport news"),
-    ("newport news shipbuilding", "newport news"),
-    ("newport news", "newport news"),
-    # USNI tags Norfolk mentions with state suffix; match both.
-    ("norfolk, va", "norfolk"),
-    ("norfolk", "norfolk"),
-    ("naval station everett", "puget sound"),
-    ("naval base kitsap", "bremerton"),
-    ("bremerton", "bremerton"),
-    ("puget sound", "puget sound"),
-    ("naval base san diego", "san diego"),
-    ("san diego, calif", "san diego"),
-    ("san diego", "san diego"),
-    ("yokosuka, japan", "yokosuka"),
-    ("yokosuka", "yokosuka"),
-    ("pearl harbor", "pearl harbor"),
-    ("apra harbor, guam", "guam"),
-    ("guam", "guam"),
-    ("bahrain", "bahrain"),
-    ("naval station rota", "rota"),
-    ("rota, spain", "rota"),
-    ("naples, italy", "naples"),
-    # Fleets / AORs
-    ("5th fleet", "5th fleet"),
-    ("6th fleet", "6th fleet"),
-    ("7th fleet", "7th fleet"),
-    ("3rd fleet", "3rd fleet"),
-    ("2nd fleet", "2nd fleet"),
-    ("centcom", "centcom"),
-    ("indo-pacific command", "indopacom"),
-    ("eucom", "eucom"),
-    ("southcom", "southcom"),
-)
-
-
-def _resolve_region_phrase(phrase: str) -> tuple[str, str] | None:
-    """Map a USNI region phrase to a ``(canonical_key, display)`` tuple,
-    or ``None`` if we don't recognize it.
-
-    ``canonical_key`` is what ``carrier_tracker.REGION_COORDS`` keys on.
-    ``display`` is the phrase we'll show in the dossier description.
-    """
-    p = (phrase or "").lower().strip()
-    if not p:
-        return None
-    for usni_phrase, canonical in _USNI_REGION_ALIASES:
-        if usni_phrase in p:
-            return canonical, usni_phrase
-    return None
-
-
-# Operating-verb phrases USNI uses, with a capture group for the region
-# phrase that immediately follows. Each pattern is designed to swallow
-# the optional editorial filler that often appears between verb and
-# location (e.g. "returned Friday to Norfolk" — "Friday" goes in the
-# filler; "Norfolk" is the location).
-#
-# Order matters: most-specific patterns first, so e.g. "is in port in"
-# wins over the generic "is".
-_DAY_FILLER = r"(?:[A-Z][a-z]+(?:day)?,?\s+)?"  # optional "Friday" / "Monday" / etc.
-_LOC_CAPTURE = r"([A-Za-z][A-Za-z0-9\s,\.\-']{2,80})"
-
-_OPERATING_PATTERNS: tuple[re.Pattern, ...] = (
-    # "is operating in [the] {REGION}" / "is also operating in [the] {REGION}"
-    re.compile(r"\bis\s+(?:also\s+|now\s+)?operating\s+in\s+(?:the\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    # "is conducting <stuff> in [the] {REGION}"
-    re.compile(r"\bis\s+conducting\s+[A-Za-z0-9\-\s]{2,40}\s+in\s+(?:the\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    # "is in port in {LOCATION}"
-    re.compile(r"\bis\s+in\s+port\s+in\s+" + _LOC_CAPTURE, re.IGNORECASE),
-    # "is in port" (no location — degenerate, use carrier's homeport via separate path)
-    # → not captured here; falls through to homeport
-    # "is underway in [the] {REGION}"
-    re.compile(r"\bis\s+underway\s+in\s+(?:the\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    # "is deployed to [the] {REGION}" / "deployed in"
-    re.compile(r"\bis\s+deployed\s+(?:to|in)\s+(?:the\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    # "returned [Day] to {LOCATION}" / "returned [Day] from {REGION}"
-    re.compile(r"\breturned\s+" + _DAY_FILLER + r"to\s+" + _LOC_CAPTURE, re.IGNORECASE),
-    re.compile(r"\breturned\s+" + _DAY_FILLER + r"from\s+(?:the\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    # "arrived [Day] in/at {LOCATION}"
-    re.compile(r"\barrived\s+" + _DAY_FILLER + r"(?:in|at)\s+" + _LOC_CAPTURE, re.IGNORECASE),
-    # "departed [Day] from {LOCATION}"
-    re.compile(r"\bdeparted\s+" + _DAY_FILLER + r"(?:from\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    # "transiting [the] {REGION}" / "sailing through [the] {REGION}"
-    re.compile(r"\btransiting\s+(?:the\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    re.compile(r"\bsailing\s+through\s+(?:the\s+)?" + _LOC_CAPTURE, re.IGNORECASE),
-    # "is homeported at {LOCATION}"
-    re.compile(r"\bis\s+homeported\s+at\s+" + _LOC_CAPTURE, re.IGNORECASE),
-)
-
-
-def _extract_region_for_carrier(
-    body: str,
-    carrier_names: list[str],
-    hull_code: str,
-) -> str | None:
-    """Return the best-guess region phrase for one carrier from the
-    article body, or None if no confident match.
-
-    Algorithm:
-      1. Find every mention of the carrier (any name variant or the hull
-         code) in the body.
-      2. For each mention, look in the ~300-char window AFTER it for any
-         of the operating-verb patterns.
-      3. Return the first hit. If a more-confident match later turns up
-         (e.g. "is operating in the X" beats "is homeported at Y"), the
-         first one in document order still wins — USNI's structure puts
-         the position-update sentence near the top of each carrier's
-         section, and the homeport mention later.
-    """
-    # Build a master mention regex covering every name variant + the hull.
-    candidates: list[str] = []
-    for name in carrier_names:
-        if name and len(name) >= 4:
-            candidates.append(re.escape(name))
-    if hull_code:
-        candidates.append(re.escape(hull_code))
-    if not candidates:
-        return None
-    mention_re = re.compile(r"\b(?:" + "|".join(candidates) + r")\b", re.IGNORECASE)
-
-    window_chars = 320
-    seen_phrases: list[str] = []
-    for mention in mention_re.finditer(body):
-        end = mention.end()
-        window = body[end : end + window_chars]
-        # Cut window at the next sentence break for tighter context.
-        # (We use the LAST period within the window so "Norfolk, Va." isn't
-        # confused for a sentence end — USNI uses ", Va." prolifically.)
-        # Sentence break candidates: ". " followed by uppercase OR newline.
-        sent_break = re.search(r"[\.!?]\s+[A-Z]", window)
-        if sent_break:
-            window = window[: sent_break.start() + 1]
-        # Try patterns in priority order.
-        for pat in _OPERATING_PATTERNS:
-            m = pat.search(window)
-            if not m:
-                continue
-            phrase = m.group(1).strip().rstrip(",.;: ")
-            if not phrase:
-                continue
-            # Strip trailing editorial filler — USNI often writes
-            # "Norfolk, Va., according to ship spotters" or
-            # "Yokosuka, Japan, according to..."
-            phrase = re.split(
-                r",\s+(?:according|as of|for|while|where|in support|in the)",
-                phrase,
-                maxsplit=1,
-            )[0].strip()
-            seen_phrases.append(phrase)
-            return phrase
-    return seen_phrases[0] if seen_phrases else None
-
-
-def fetch_latest_fleet_tracker_positions(
-    carrier_registry: dict | None = None,
-    region_coords: dict | None = None,
-) -> dict[str, dict]:
-    """Return ``{hull: position_entry}`` for the latest USNI fleet tracker.
-
-    Entries look like::
-
-        {
-          "lat": 18.0, "lng": 39.5, "heading": 0,
-          "desc": "Red Sea (USNI May 18, 2026)",
-          "source": "USNI News Fleet & Marine Tracker (May 18, 2026)",
-          "source_url": "https://news.usni.org/2026/05/18/...",
-          "position_source_at": "2026-05-18T18:58:44+00:00",
-          "position_confidence": "recent",
-        }
-
-    Carriers whose section can't be parsed (e.g. an off-week with no
-    mention) are simply absent from the result — the caller keeps
-    whatever position they had before.
-
-    ``carrier_registry`` and ``region_coords`` default to the carrier_tracker
-    module's own tables; passed in here for testability.
-    """
-    if carrier_registry is None or region_coords is None:
-        from services.carrier_tracker import CARRIER_REGISTRY, REGION_COORDS
-        carrier_registry = carrier_registry or CARRIER_REGISTRY
-        region_coords = region_coords or REGION_COORDS
-
-    items = _iter_fleet_tracker_items(_RSS_URLS)
-    if not items:
-        logger.warning("USNI fleet-tracker: no parseable RSS items")
-        return {}
-
-    # Pick the most recent by parsed pubDate. Items without a parseable
-    # date fall to the back of the list.
-    items.sort(
-        key=lambda it: it["pub_date"] or datetime(1970, 1, 1, tzinfo=timezone.utc),
-        reverse=True,
-    )
-    latest = items[0]
-
-    pub_dt: datetime | None = latest["pub_date"]
-    pub_iso = pub_dt.isoformat() if pub_dt else ""
-    pub_human = pub_dt.strftime("%b %d, %Y") if pub_dt else "unknown date"
-
-    body = latest["body"]
-    if not body:
-        logger.warning("USNI fleet-tracker: latest item has empty body")
-        return {}
-
-    positions: dict[str, dict] = {}
-    for hull, info in carrier_registry.items():
-        # Build name variants we'll try in the body.
-        full_name = info["name"]                       # "USS Gerald R. Ford (CVN-78)"
-        without_hull = full_name.split("(")[0].strip() # "USS Gerald R. Ford"
-        last_word = without_hull.split()[-1]            # "Ford"
-        ship_only = without_hull[4:]                    # "Gerald R. Ford"
-
-        # Variants ordered most-specific first.
-        variants: list[str] = []
-        for v in (without_hull, f"USS {ship_only}", ship_only, last_word):
-            if v and v not in variants and len(v) >= 4:
-                variants.append(v)
-
-        phrase = _extract_region_for_carrier(body, variants, hull)
-        if not phrase:
-            continue
-        resolved = _resolve_region_phrase(phrase)
-        if not resolved:
-            logger.debug(
-                "USNI: %s region phrase %r did not match any known region",
-                hull, phrase,
-            )
-            continue
-        canonical_key, display_phrase = resolved
-        coords = region_coords.get(canonical_key)
-        if not coords:
-            continue
-
-        positions[hull] = {
-            "lat": coords[0],
-            "lng": coords[1],
-            "heading": 0,
-            "desc": f"{display_phrase.title()} (USNI {pub_human})",
-            "source": f"USNI News Fleet & Marine Tracker ({pub_human})",
-            "source_url": latest["link"],
-            "position_source_at": pub_iso,
-            "position_confidence": "recent",
-        }
-
-    if positions:
-        logger.info(
-            "USNI fleet-tracker: parsed %d/%d carrier positions from %s",
-            len(positions), len(carrier_registry), latest["link"],
-        )
-    else:
-        logger.warning(
-            "USNI fleet-tracker: latest article %s yielded zero parseable carriers",
-            latest["link"],
-        )
-    return positions

backend/services/geocode.py

@@ -21,17 +21,9 @@ _cache_lock = threading.Lock()
 _local_search_cache: List[Dict[str, Any]] | None = None
 _local_search_lock = threading.Lock()
 
-# Round 7a: per-install operator handle threads through every Nominatim
-# call. NOMINATIM_USER_AGENT env override is still honored for operators
-# who run a custom relay / known good identity, but the default uses the
-# per-install handle so OpenStreetMap can rate-limit per install instead
-# of treating "Shadowbroker" as one big offender.
-def _nominatim_user_agent() -> str:
-    override = os.environ.get("NOMINATIM_USER_AGENT", "").strip()
-    if override:
-        return override
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("nominatim")
+_USER_AGENT = os.environ.get(
+    "NOMINATIM_USER_AGENT", "ShadowBroker/1.0 (https://github.com/BigBodyCobain/Shadowbroker)"
+)
 
 
 def _get_cache(key: str):
@@ -186,7 +178,7 @@ def search_geocode(query: str, limit: int = 5, local_only: bool = False) -> List
         res = fetch_with_curl(
             url,
             headers={
-                "User-Agent": _nominatim_user_agent(),
+                "User-Agent": _USER_AGENT,
                 "Accept-Language": "en",
             },
             timeout=6,
@@ -249,7 +241,7 @@ def reverse_geocode(lat: float, lng: float, local_only: bool = False) -> Dict[st
         res = fetch_with_curl(
             url,
             headers={
-                "User-Agent": _nominatim_user_agent(),
+                "User-Agent": _USER_AGENT,
                 "Accept-Language": "en",
             },
             timeout=6,

backend/services/geopolitics.py

@@ -8,13 +8,6 @@ from datetime import datetime
 from urllib.parse import urljoin, urlparse
 from services.network_utils import fetch_with_curl
 
-
-
-def _geopolitics_user_agent() -> str:
-    """Round 7a: GDELT geopolitics fetcher attribution."""
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("geopolitics-gdelt")
-
 logger = logging.getLogger(__name__)
 
 # Cache Frontline data for 30 minutes, it doesn't move that fast
@@ -323,7 +316,7 @@ def _fetch_article_title(url):
             resp = requests.get(
                 current_url,
                 timeout=4,
-                headers={"User-Agent": _geopolitics_user_agent()},
+                headers={"User-Agent": "Mozilla/5.0 (compatible; OSINT Dashboard/1.0)"},
                 stream=True,
                 allow_redirects=False,
             )
@@ -528,29 +521,10 @@ def _parse_gdelt_export_zip(zip_bytes, conflict_codes, seen_locs, features, loc_
         logger.warning(f"Failed to parse GDELT export zip: {e}")
 
 
-# GDELT's data.gdeltproject.org is a CNAME to a Google Cloud Storage
-# bucket of the same name. GCS returns the wildcard ``*.storage.googleapis.com``
-# certificate, which legitimately does NOT cover the GDELT custom domain
-# — Python's TLS verification correctly refuses it. Some networks/POPs
-# happen to route through a path where this works; many do not (notably
-# Docker Desktop's outbound NAT on local installs).
-#
-# Fix: rewrite the URL to hit GCS directly with a path-style bucket
-# reference, where the standard GCS cert is genuinely valid. Same data,
-# verified TLS, no operator-side workaround needed.
-def _gcs_direct_gdelt_url(url: str) -> str:
-    """If ``url`` points at data.gdeltproject.org, return the equivalent
-    GCS-direct URL. Otherwise return the URL unchanged."""
-    prefix = "://data.gdeltproject.org/"
-    if prefix in url:
-        return url.replace(prefix, "://storage.googleapis.com/data.gdeltproject.org/", 1)
-    return url
-
-
 def _download_gdelt_export(url):
     """Download a single GDELT export file, return bytes or None."""
     try:
-        res = fetch_with_curl(_gcs_direct_gdelt_url(url), timeout=15)
+        res = fetch_with_curl(url, timeout=15)
         if res.status_code == 200:
             return res.content
     except (ConnectionError, TimeoutError, OSError):  # non-critical
@@ -646,12 +620,8 @@ def fetch_global_military_incidents():
         # HTTPS is used to prevent passive network observers from injecting
         # poisoned export records into the global incident map via MITM.
         # GDELT serves the same content over HTTPS as HTTP.
-        # Use the GCS-direct URL because data.gdeltproject.org's CNAME
-        # serves a wildcard *.storage.googleapis.com cert that legitimately
-        # doesn't cover the GDELT hostname. See _gcs_direct_gdelt_url above.
         index_res = fetch_with_curl(
-            _gcs_direct_gdelt_url("https://data.gdeltproject.org/gdeltv2/lastupdate.txt"),
-            timeout=10,
+            "https://data.gdeltproject.org/gdeltv2/lastupdate.txt", timeout=10
         )
         if index_res.status_code != 200:
             logger.error(f"GDELT lastupdate failed: {index_res.status_code}")

backend/services/mesh/mesh_dm_relay.py

@@ -317,39 +317,6 @@ class DMRelay:
     def _self_mailbox_limit(self) -> int:
         return max(1, int(self._settings().MESH_DM_SELF_MAILBOX_LIMIT))
 
-    def _per_sender_pending_limit(self) -> int:
-        """Anti-spam cap on UNACKED messages a single sender can have parked
-        in a single recipient mailbox at any one time. See ``config.py``
-        ``MESH_DM_PENDING_PER_SENDER_LIMIT`` for the threat model — this
-        rule is enforced both at ``deposit`` (local) and at
-        ``accept_replica`` (peer push acceptance), making it a network
-        rule rather than a client-side honor system."""
-        try:
-            limit = int(getattr(self._settings(), "MESH_DM_PENDING_PER_SENDER_LIMIT", 2) or 2)
-        except (TypeError, ValueError):
-            limit = 2
-        return max(1, limit)
-
-    def _per_sender_pending_count(
-        self,
-        *,
-        mailbox_key: str,
-        sender_block_ref: str,
-    ) -> int:
-        """Count UNACKED messages from ``sender_block_ref`` currently parked
-        in ``mailbox_key``. Caller already holds ``self._lock``.
-
-        Messages that have been claimed/acked are removed from the mailbox
-        list (see ``claim_message_ids``), so anything still here is by
-        definition unacked. We count by exact ``sender_block_ref`` match
-        — that's the per-pair sender identity used for blocking too, so
-        the cap is naturally per-(sender, recipient).
-        """
-        if not mailbox_key or not sender_block_ref:
-            return 0
-        messages = self._mailboxes.get(mailbox_key, [])
-        return sum(1 for m in messages if m.sender_block_ref == sender_block_ref)
-
     def _nonce_ttl_seconds(self) -> int:
         return max(30, int(self._settings().MESH_DM_NONCE_TTL_S))
 
@@ -1548,29 +1515,6 @@ class DMRelay:
             if len(self._mailboxes[mailbox_key]) >= self._mailbox_limit_for_class(delivery_class):
                 metrics_inc("dm_drop_full")
                 return {"ok": False, "detail": "Recipient mailbox full"}
-            # Anti-spam: per-(sender, recipient) cap on unacked messages.
-            # A sender who already has the configured number of messages
-            # parked in this mailbox can't deposit more until the recipient
-            # pulls (acks) at least one. The same cap is re-enforced on
-            # inbound replication in ``accept_replica`` so this rule isn't
-            # bypassable by patching out the local check on a hostile
-            # sender's relay — see config.py
-            # MESH_DM_PENDING_PER_SENDER_LIMIT for the threat model.
-            per_sender_limit = self._per_sender_pending_limit()
-            pending = self._per_sender_pending_count(
-                mailbox_key=mailbox_key,
-                sender_block_ref=sender_block_ref,
-            )
-            if pending >= per_sender_limit:
-                metrics_inc("dm_drop_per_sender_cap")
-                return {
-                    "ok": False,
-                    "detail": (
-                        f"Recipient already has {pending} unread message"
-                        f"{'s' if pending != 1 else ''} from you. Wait for "
-                        "them to read your messages before sending more."
-                    ),
-                }
             if not msg_id:
                 msg_id = f"dm_{int(time.time() * 1000)}_{secrets.token_hex(6)}"
             elif any(m.msg_id == msg_id for m in self._mailboxes[mailbox_key]):
@@ -1595,245 +1539,8 @@ class DMRelay:
             )
             self._stats["messages_in_memory"] = sum(len(v) for v in self._mailboxes.values())
             self._save()
-            # Cross-node mailbox replication: push the freshly-stored
-            # envelope to every authenticated relay peer so the recipient
-            # can log into ANY node and find their messages. The push is
-            # async (fire-and-forget thread) so deposit() returns
-            # immediately — slow Tor peers can't block the sender's UX.
-            # Each receiving peer re-enforces the per-sender cap on
-            # acceptance, so hostile relays can't widen the cap.
-            try:
-                envelope_for_push = self.envelope_for_replication(
-                    mailbox_key=mailbox_key, msg_id=msg_id,
-                )
-                if envelope_for_push:
-                    self._replicate_envelope_to_peers_async(
-                        envelope=envelope_for_push,
-                    )
-            except Exception:
-                metrics_inc("dm_replication_push_error")
             return {"ok": True, "msg_id": msg_id}
 
-    def accept_replica(
-        self,
-        *,
-        envelope: dict[str, Any],
-        originating_peer_url: str = "",
-    ) -> dict[str, Any]:
-        """Receive a DM envelope replicated from a peer relay.
-
-        Cross-node mailbox replication entry point. When a sender's local
-        relay accepts a ``deposit`` and pushes the envelope to
-        ``MESH_RELAY_PEERS`` (so the recipient can log into any peer
-        node and find their messages), each receiving peer calls
-        ``accept_replica`` to ingest it.
-
-        The per-(sender, recipient) cap is re-enforced HERE. That's what
-        makes the rule a NETWORK rule rather than a client-side honor
-        system: a hostile sender who patches out the local ``deposit``
-        check still can't get a 3rd unacked message to spread, because
-        every honest peer enforces the same cap on inbound replicas.
-        Result: hostile relays can hold extras locally, but those extras
-        never reach any node a legitimate recipient is polling from.
-
-        Returns the same shape as ``deposit`` so the calling endpoint can
-        forward the result back to the originating peer.
-        """
-        if not isinstance(envelope, dict):
-            return {"ok": False, "detail": "envelope must be an object"}
-        msg_id = str(envelope.get("msg_id", "") or "").strip()
-        mailbox_key = str(envelope.get("mailbox_key", "") or "").strip()
-        sender_block_ref = str(envelope.get("sender_block_ref", "") or "").strip()
-        ciphertext = str(envelope.get("ciphertext", "") or "")
-        if not msg_id or not mailbox_key or not sender_block_ref or not ciphertext:
-            return {"ok": False, "detail": "envelope missing required fields"}
-
-        with self._lock:
-            self._refresh_from_shared_relay()
-            self._cleanup_expired()
-
-            # Idempotent — if we already hold this exact msg_id, the
-            # replication round-tripped or a peer pushed the same
-            # envelope through multiple paths. Accept silently.
-            if any(m.msg_id == msg_id for m in self._mailboxes.get(mailbox_key, [])):
-                metrics_inc("dm_replica_duplicate")
-                return {"ok": True, "msg_id": msg_id, "duplicate": True}
-
-            # Same per-class cap as the deposit path — defense in depth
-            # against a peer that wraps a "deposit" as a "replica" to
-            # bypass the class limit.
-            delivery_class = str(envelope.get("delivery_class", "") or "")
-            if delivery_class in ("request", "shared", "self"):
-                class_limit = self._mailbox_limit_for_class(delivery_class)
-            else:
-                class_limit = self._shared_mailbox_limit()
-            if len(self._mailboxes.get(mailbox_key, [])) >= class_limit:
-                metrics_inc("dm_replica_drop_full")
-                return {"ok": False, "detail": "Recipient mailbox full"}
-
-            # THE network rule: per-(sender, recipient) anti-spam cap.
-            per_sender_limit = self._per_sender_pending_limit()
-            pending = self._per_sender_pending_count(
-                mailbox_key=mailbox_key,
-                sender_block_ref=sender_block_ref,
-            )
-            if pending >= per_sender_limit:
-                metrics_inc("dm_replica_drop_per_sender_cap")
-                # Returning a structured rejection — the sender's relay
-                # learns its envelope was rejected by an honest peer and
-                # can stop trying to push it.
-                return {
-                    "ok": False,
-                    "detail": (
-                        "Per-sender cap reached on this relay; refusing replica"
-                    ),
-                    "cap_violation": True,
-                    "pending": pending,
-                    "limit": per_sender_limit,
-                }
-
-            # Accept the replica into the local mailbox.
-            self._mailboxes[mailbox_key].append(
-                DMMessage(
-                    sender_id=str(envelope.get("sender_id", "") or ""),
-                    ciphertext=ciphertext,
-                    timestamp=float(envelope.get("timestamp", time.time()) or time.time()),
-                    msg_id=msg_id,
-                    delivery_class=str(envelope.get("delivery_class", "shared") or "shared"),
-                    sender_seal=str(envelope.get("sender_seal", "") or ""),
-                    relay_salt=str(envelope.get("relay_salt", "") or ""),
-                    sender_block_ref=sender_block_ref,
-                    payload_format=str(envelope.get("payload_format", "dm1") or "dm1"),
-                    session_welcome=str(envelope.get("session_welcome", "") or ""),
-                )
-            )
-            self._stats["messages_in_memory"] = sum(len(v) for v in self._mailboxes.values())
-            self._save()
-            metrics_inc("dm_replica_accepted")
-            return {"ok": True, "msg_id": msg_id}
-
-    def _replicate_envelope_to_peers_async(
-        self,
-        *,
-        envelope: dict[str, Any],
-    ) -> None:
-        """Push an outbound DM envelope to every authenticated relay peer.
-
-        Fire-and-forget: spawned in a background thread so ``deposit``
-        returns to the caller immediately. Per-peer errors are logged
-        and swallowed — the sender's UX must not block on slow Tor
-        peers, and a peer that's down today gets the next message
-        whenever it comes back. Inbound recipient polling from a healthy
-        peer keeps the system functional during peer failures.
-
-        Each peer is authed with the existing per-peer HMAC pattern
-        (#256) — same headers and key resolver gate-message replication
-        uses, so a hostile node that doesn't know any peer's HMAC key
-        can't impersonate a legitimate relay.
-        """
-        import threading
-
-        def _do_push():
-            try:
-                import hashlib
-                import hmac
-                import requests as _requests
-
-                from services.mesh.mesh_crypto import (
-                    normalize_peer_url,
-                    resolve_peer_key_for_url,
-                )
-                from services.mesh.mesh_router import (
-                    authenticated_push_peer_urls,
-                )
-
-                peers = authenticated_push_peer_urls()
-                if not peers:
-                    return
-
-                payload = json.dumps(
-                    {"envelope": envelope},
-                    separators=(",", ":"),
-                    ensure_ascii=False,
-                ).encode("utf-8")
-
-                timeout = max(
-                    1,
-                    int(getattr(self._settings(), "MESH_RELAY_PUSH_TIMEOUT_S", 10) or 10),
-                )
-
-                for peer_url in peers:
-                    try:
-                        normalized = normalize_peer_url(peer_url)
-                        headers = {"Content-Type": "application/json"}
-                        peer_key = resolve_peer_key_for_url(normalized)
-                        if peer_key:
-                            headers["X-Peer-Url"] = normalized
-                            headers["X-Peer-HMAC"] = hmac.new(
-                                peer_key, payload, hashlib.sha256
-                            ).hexdigest()
-                        url = f"{peer_url}/api/mesh/dm/replicate-envelope"
-                        resp = _requests.post(
-                            url, data=payload, timeout=timeout, headers=headers,
-                        )
-                        if resp.status_code == 200:
-                            metrics_inc("dm_replication_push_ok")
-                        else:
-                            # 4xx including the structured cap_violation
-                            # rejection from accept_replica — sender's
-                            # relay learns and stops retrying this msg_id.
-                            metrics_inc("dm_replication_push_rejected")
-                    except Exception:
-                        # Per-peer failure is non-fatal — log to metrics
-                        # but don't break the loop. Other peers and a
-                        # future retry can still propagate the envelope.
-                        metrics_inc("dm_replication_push_error")
-                        continue
-            except Exception:
-                # Outer guard — never let replication errors propagate
-                # back to the sender's deposit() caller.
-                metrics_inc("dm_replication_push_error")
-
-        thread = threading.Thread(
-            target=_do_push,
-            name="dm-replicate-push",
-            daemon=True,
-        )
-        thread.start()
-
-    def envelope_for_replication(
-        self,
-        *,
-        mailbox_key: str,
-        msg_id: str,
-    ) -> dict[str, Any] | None:
-        """Return the wire-form envelope for a stored message, suitable
-        for POSTing to a peer relay's replicate-envelope endpoint.
-
-        Returns ``None`` if the message isn't in the mailbox (already
-        acked, expired, never existed). The caller holds the
-        responsibility for transport security (Tor SOCKS for .onion
-        peers, per-peer HMAC) and for not leaking the envelope to
-        clearnet peers when private transport is required.
-        """
-        with self._lock:
-            for m in self._mailboxes.get(mailbox_key, []):
-                if m.msg_id == msg_id:
-                    return {
-                        "msg_id": m.msg_id,
-                        "mailbox_key": mailbox_key,
-                        "sender_id": m.sender_id,
-                        "sender_block_ref": m.sender_block_ref,
-                        "sender_seal": m.sender_seal,
-                        "ciphertext": m.ciphertext,
-                        "timestamp": m.timestamp,
-                        "delivery_class": m.delivery_class,
-                        "relay_salt": m.relay_salt,
-                        "payload_format": m.payload_format,
-                        "session_welcome": m.session_welcome,
-                    }
-        return None
-
     def is_blocked(self, recipient_id: str, sender_id: str) -> bool:
         with self._lock:
             self._refresh_from_shared_relay()

backend/services/mesh/mesh_hashchain.py

@@ -33,9 +33,8 @@ Each event contains:
 
 Persistence: JSON file at backend/data/infonet.json
 
-Encrypted gate chat events are private-chain ciphertext records. They are
-excluded from public read surfaces and replicated only over private Infonet
-transports.
+Encrypted gate chat events are intentionally kept off the public chain and
+persisted separately via GateMessageStore.
 """
 
 import json
@@ -65,8 +64,6 @@ from services.mesh.mesh_schema import (
     ACTIVE_PUBLIC_LEDGER_EVENT_TYPES,
     PUBLIC_LEDGER_EVENT_TYPES,
     validate_event_payload,
-    validate_private_dm_ledger_payload,
-    validate_private_gate_ledger_payload,
     validate_protocol_fields,
     validate_public_ledger_payload,
 )
@@ -130,12 +127,6 @@ GATE_SEGMENT_MAX_COMPRESSED_BYTES = max(
     int(os.environ.get("MESH_GATE_SEGMENT_MAX_COMPRESSED_BYTES", str(2 * 1024 * 1024)) or str(2 * 1024 * 1024)),
 )
 GATE_SEGMENT_STORAGE_VERSION = 1
-DM_HASHCHAIN_SPOOL_LIMIT = max(1, int(os.environ.get("MESH_DM_HASHCHAIN_SPOOL_LIMIT", "2") or "2"))
-DM_HASHCHAIN_SPOOL_SENDER_LIMIT = max(
-    1,
-    int(os.environ.get("MESH_DM_HASHCHAIN_SPOOL_SENDER_LIMIT", "1") or "1"),
-)
-DM_HASHCHAIN_SPOOL_TTL_S = max(60, int(os.environ.get("MESH_DM_HASHCHAIN_SPOOL_TTL_S", "3600") or "3600"))
 _PUBLIC_EVENT_APPEND_HOOKS: list[Any] = []
 _PUBLIC_EVENT_APPEND_HOOKS_LOCK = threading.Lock()
 
@@ -349,32 +340,6 @@ def _private_gate_event_id(
     ).hexdigest()
 
 
-def _private_gate_signature_payload_variants(gate_id: str, event: dict[str, Any]) -> list[dict[str, Any]]:
-    payload = _private_gate_signature_payload(gate_id, event)
-    variants: list[dict[str, Any]] = [payload]
-    event_payload = event.get("payload") if isinstance(event.get("payload"), dict) else {}
-    reply_to = str(event_payload.get("reply_to", "") or "").strip()
-    if reply_to:
-        variants.append(_private_gate_signature_payload(gate_id, event, include_reply_to=False))
-    if "epoch" in payload:
-        no_epoch = dict(payload)
-        no_epoch.pop("epoch", None)
-        variants.append(no_epoch)
-        if reply_to:
-            no_epoch_no_reply = _private_gate_signature_payload(gate_id, event, include_reply_to=False)
-            no_epoch_no_reply.pop("epoch", None)
-            variants.append(no_epoch_no_reply)
-    deduped: list[dict[str, Any]] = []
-    seen: set[str] = set()
-    for variant in variants:
-        material = json.dumps(variant, sort_keys=True, separators=(",", ":"), ensure_ascii=False)
-        if material in seen:
-            continue
-        seen.add(material)
-        deduped.append(variant)
-    return deduped
-
-
 def _sanitize_private_gate_event(gate_id: str, event: dict[str, Any]) -> dict[str, Any]:
     payload = event.get("payload") if isinstance(event.get("payload"), dict) else {}
     sanitized = {
@@ -1603,18 +1568,11 @@ class Infonet:
     def _rebuild_state(self) -> None:
         self.event_index = {}
         self.node_sequences = {}
-        # Keep private signed-write replay domains that are not represented
-        # on-chain, but rebuild the gate_message sequence domain from chain
-        # events so reloads/fork application do not mix it with public
-        # per-node message sequences.
-        preserved_domains = {}
-        if isinstance(getattr(self, "sequence_domains", None), dict):
-            preserved_domains = {
-                key: value
-                for key, value in self.sequence_domains.items()
-                if not str(key or "").endswith("|gate_message")
-            }
-        self.sequence_domains = dict(preserved_domains)
+        # Keep private signed-write replay domains across public-chain
+        # rebuilds; these domains protect local side effects that are not
+        # represented as public Infonet events.
+        if not isinstance(getattr(self, "sequence_domains", None), dict):
+            self.sequence_domains = {}
         self.public_key_bindings = {}
         self.revocations = {}
         self._replay_filter = ReplayFilter()
@@ -1626,12 +1584,9 @@ class Infonet:
             node_id = evt.get("node_id", "")
             sequence = _safe_int(evt.get("sequence", 0) or 0, 0)
             if node_id and sequence:
-                sequence_table, sequence_key = self._sequence_table_for_event(
-                    evt.get("event_type", ""), node_id
-                )
-                last = sequence_table.get(sequence_key, 0)
+                last = self.node_sequences.get(node_id, 0)
                 if sequence > last:
-                    sequence_table[sequence_key] = sequence
+                    self.node_sequences[node_id] = sequence
             public_key = str(evt.get("public_key", "") or "")
             if public_key and node_id:
                 existing = self.public_key_bindings.get(public_key)
@@ -1943,295 +1898,6 @@ class Infonet:
         self._save()
         return True, "ok"
 
-    def _sequence_table_for_event(self, event_type: str, node_id: str) -> tuple[dict[str, int], str]:
-        normalized = str(event_type or "").strip().lower()
-        if normalized == "gate_message":
-            return self.sequence_domains, f"{node_id}|gate_message"
-        if normalized == "dm_message":
-            return self.sequence_domains, f"{node_id}|dm_message"
-        return self.node_sequences, node_id
-
-    def _dm_spool_target_key(self, payload: dict[str, Any]) -> tuple[str, str]:
-        delivery_class = str(payload.get("delivery_class", "") or "").strip().lower()
-        if delivery_class == "shared":
-            key = str(payload.get("recipient_token", "") or "").strip()
-        else:
-            key = str(payload.get("recipient_id", "") or "").strip()
-        return delivery_class, key
-
-    def _dm_spool_active_counts(
-        self,
-        payload: dict[str, Any],
-        *,
-        sender_id: str = "",
-        now: float | None = None,
-    ) -> tuple[int, int]:
-        delivery_class, key = self._dm_spool_target_key(payload)
-        if not key:
-            return 0, 0
-        sender_id = str(sender_id or "").strip()
-        current = time.time() if now is None else float(now)
-        total_count = 0
-        sender_count = 0
-        for evt in reversed(self.events):
-            if evt.get("event_type") != "dm_message":
-                continue
-            evt_payload = evt.get("payload") if isinstance(evt.get("payload"), dict) else {}
-            evt_delivery_class, evt_key = self._dm_spool_target_key(evt_payload)
-            if evt_delivery_class != delivery_class:
-                continue
-            if evt_key != key:
-                continue
-            evt_ts = float(evt_payload.get("timestamp", evt.get("timestamp", 0)) or 0)
-            if evt_ts > 0 and current - evt_ts > DM_HASHCHAIN_SPOOL_TTL_S:
-                continue
-            total_count += 1
-            if sender_id and str(evt.get("node_id", "") or "").strip() == sender_id:
-                sender_count += 1
-            if total_count >= DM_HASHCHAIN_SPOOL_LIMIT and (
-                not sender_id or sender_count >= DM_HASHCHAIN_SPOOL_SENDER_LIMIT
-            ):
-                break
-        return total_count, sender_count
-
-    def _dm_spool_active_count(self, payload: dict[str, Any], *, now: float | None = None) -> int:
-        total_count, _sender_count = self._dm_spool_active_counts(payload, now=now)
-        return total_count
-
-    def append_private_dm_message(
-        self,
-        *,
-        node_id: str,
-        payload: dict,
-        signature: str,
-        sequence: int,
-        public_key: str,
-        public_key_algo: str,
-        protocol_version: str = "",
-        timestamp: float = 0,
-    ) -> dict:
-        """Append an encrypted DM dead-drop message to the private Infonet ledger.
-
-        The event is a small offline spool, capped per mailbox target, so the
-        hashchain can carry a couple of sealed DMs without becoming an
-        unbounded global mailbox.
-        """
-        event_type = "dm_message"
-        if sequence <= 0:
-            raise ValueError("sequence is required and must be > 0")
-        sequence_table, sequence_key = self._sequence_table_for_event(event_type, node_id)
-        last = sequence_table.get(sequence_key, 0)
-        if sequence <= last:
-            raise ValueError(f"Replay detected: sequence {sequence} <= last {last}")
-
-        raw_payload = dict(payload or {})
-        if "message" in raw_payload or "plaintext" in raw_payload or "_local_plaintext" in raw_payload:
-            raise ValueError("private DM ledger payload must not contain plaintext")
-        if str(raw_payload.get("transport_lock", "") or "").strip().lower() != "private_strong":
-            raise ValueError("DM hashchain spool requires private_strong transport_lock")
-
-        payload = normalize_payload(event_type, raw_payload)
-        ok, reason = validate_private_dm_ledger_payload(payload)
-        if not ok:
-            raise ValueError(reason)
-        total_count, sender_count = self._dm_spool_active_counts(payload, sender_id=node_id)
-        if sender_count >= DM_HASHCHAIN_SPOOL_SENDER_LIMIT:
-            raise ValueError("DM hashchain sender spool full for recipient")
-        if total_count >= DM_HASHCHAIN_SPOOL_LIMIT:
-            raise ValueError("DM hashchain spool full for recipient")
-
-        payload_json = json.dumps(payload, sort_keys=True, separators=(",", ":"), ensure_ascii=False)
-        if len(payload_json.encode("utf-8")) > MAX_PAYLOAD_BYTES:
-            raise ValueError("payload exceeds max size")
-
-        protocol_version = str(protocol_version or PROTOCOL_VERSION)
-        ok, reason = validate_protocol_fields(protocol_version, NETWORK_ID)
-        if not ok:
-            raise ValueError(reason)
-
-        if not (signature and public_key and public_key_algo):
-            raise ValueError("Missing signature fields")
-        algo = parse_public_key_algo(public_key_algo)
-        if not algo:
-            raise ValueError("Unsupported public_key_algo")
-        if not verify_node_binding(node_id, public_key):
-            raise ValueError("node_id mismatch")
-        bound, bind_reason = self._bind_public_key(public_key, node_id)
-        if not bound:
-            raise ValueError(bind_reason)
-        sig_payload = build_signature_payload(
-            event_type=event_type,
-            node_id=node_id,
-            sequence=sequence,
-            payload=payload,
-        )
-        if not verify_signature(
-            public_key_b64=public_key,
-            public_key_algo=public_key_algo,
-            signature_hex=signature,
-            payload=sig_payload,
-        ):
-            raise ValueError("Invalid signature")
-
-        revoked, _info = self._revocation_status(public_key)
-        if revoked:
-            raise ValueError("public key is revoked")
-
-        event = ChainEvent(
-            prev_hash=self.head_hash,
-            event_type=event_type,
-            node_id=node_id,
-            payload=payload,
-            timestamp=float(timestamp or time.time()),
-            sequence=sequence,
-            signature=signature,
-            public_key=public_key,
-            public_key_algo=public_key_algo,
-            protocol_version=protocol_version,
-        )
-        event_dict = event.to_dict()
-        self._write_wal(event_dict)
-        self.events.append(event_dict)
-        self.event_index[event.event_id] = len(self.events) - 1
-        self.head_hash = event.event_id
-        sequence_table[sequence_key] = sequence
-        self._replay_filter.add(event.event_id)
-        self._invalidate_merkle_cache()
-        self._update_counters_for_event(event_dict)
-        self._save()
-
-        try:
-            from services.mesh.mesh_rns import rns_bridge
-
-            rns_bridge.publish_event(event_dict)
-        except Exception:
-            pass
-        _notify_public_event_append_hooks(event_dict)
-        logger.info(
-            f"Infonet append [dm_message] by {_redact_node(node_id)} seq={sequence} "
-            f"id={event.event_id[:16]}..."
-        )
-        return event_dict
-
-    def append_private_gate_message(
-        self,
-        *,
-        node_id: str,
-        payload: dict,
-        signature: str,
-        sequence: int,
-        public_key: str,
-        public_key_algo: str,
-        protocol_version: str = "",
-        timestamp: float = 0,
-    ) -> dict:
-        """Append an encrypted gate message to the private Infonet ledger.
-
-        Gate messages use their own sequence domain so a gate post cannot
-        consume or replay-block the author's public broadcast sequence.
-        """
-        event_type = "gate_message"
-        if sequence <= 0:
-            raise ValueError("sequence is required and must be > 0")
-        sequence_table, sequence_key = self._sequence_table_for_event(event_type, node_id)
-        last = sequence_table.get(sequence_key, 0)
-        if sequence <= last:
-            raise ValueError(f"Replay detected: sequence {sequence} <= last {last}")
-
-        raw_payload = dict(payload or {})
-        if "message" in raw_payload or "_local_plaintext" in raw_payload or "_local_reply_to" in raw_payload:
-            raise ValueError("private gate ledger payload must not contain plaintext")
-        if str(raw_payload.get("transport_lock", "") or "").strip().lower() != "private_strong":
-            raise ValueError("gate messages require private_strong transport_lock")
-
-        payload = normalize_payload(event_type, raw_payload)
-        ok, reason = validate_private_gate_ledger_payload(payload)
-        if not ok:
-            raise ValueError(reason)
-
-        payload_json = json.dumps(payload, sort_keys=True, separators=(",", ":"), ensure_ascii=False)
-        if len(payload_json.encode("utf-8")) > MAX_PAYLOAD_BYTES:
-            raise ValueError("payload exceeds max size")
-
-        protocol_version = str(protocol_version or PROTOCOL_VERSION)
-        ok, reason = validate_protocol_fields(protocol_version, NETWORK_ID)
-        if not ok:
-            raise ValueError(reason)
-
-        if not (signature and public_key and public_key_algo):
-            raise ValueError("Missing signature fields")
-        algo = parse_public_key_algo(public_key_algo)
-        if not algo:
-            raise ValueError("Unsupported public_key_algo")
-        if not verify_node_binding(node_id, public_key):
-            raise ValueError("node_id mismatch")
-        bound, bind_reason = self._bind_public_key(public_key, node_id)
-        if not bound:
-            raise ValueError(bind_reason)
-        event_for_signature = {"payload": payload}
-        signature_ok = False
-        for signature_payload in _private_gate_signature_payload_variants(
-            str(payload.get("gate", "") or ""),
-            event_for_signature,
-        ):
-            sig_payload = build_signature_payload(
-                event_type=event_type,
-                node_id=node_id,
-                sequence=sequence,
-                payload=signature_payload,
-            )
-            if verify_signature(
-                public_key_b64=public_key,
-                public_key_algo=public_key_algo,
-                signature_hex=signature,
-                payload=sig_payload,
-            ):
-                signature_ok = True
-                break
-        if not signature_ok:
-            raise ValueError("Invalid signature")
-
-        revoked, _info = self._revocation_status(public_key)
-        if revoked:
-            raise ValueError("public key is revoked")
-
-        event = ChainEvent(
-            prev_hash=self.head_hash,
-            event_type=event_type,
-            node_id=node_id,
-            payload=payload,
-            timestamp=float(timestamp or time.time()),
-            sequence=sequence,
-            signature=signature,
-            public_key=public_key,
-            public_key_algo=public_key_algo,
-            protocol_version=protocol_version,
-        )
-        event_dict = event.to_dict()
-        self._write_wal(event_dict)
-        self.events.append(event_dict)
-        self.event_index[event.event_id] = len(self.events) - 1
-        self.head_hash = event.event_id
-        sequence_table[sequence_key] = sequence
-        self._replay_filter.add(event.event_id)
-        self._invalidate_merkle_cache()
-        self._update_counters_for_event(event_dict)
-        self._save()
-
-        try:
-            from services.mesh.mesh_rns import rns_bridge
-
-            rns_bridge.publish_event(event_dict)
-        except Exception:
-            pass
-        _notify_public_event_append_hooks(event_dict)
-
-        logger.info(
-            f"Infonet append [gate_message] by {_redact_node(node_id)} seq={sequence} "
-            f"id={event.event_id[:16]}..."
-        )
-        return event_dict
-
     def append(
         self,
         event_type: str,
@@ -2412,18 +2078,6 @@ class Infonet:
             if not event_id or not prev_hash:
                 rejected.append({"index": idx, "reason": "Missing event_id or prev_hash"})
                 continue
-            if event_id in self.event_index:
-                duplicates += 1
-                continue
-            if self._replay_filter.seen(event_id):
-                try:
-                    from services.mesh.mesh_metrics import increment as metrics_inc
-
-                    metrics_inc("ingest_replay_seen")
-                except Exception:
-                    pass
-                duplicates += 1
-                continue
             if prev_hash != expected_prev:
                 try:
                     from services.mesh.mesh_metrics import increment as metrics_inc
@@ -2442,14 +2096,25 @@ class Infonet:
                     pass
                 rejected.append({"index": idx, "reason": "network_id mismatch"})
                 continue
+            if event_id in self.event_index:
+                duplicates += 1
+                continue
+            if self._replay_filter.seen(event_id):
+                try:
+                    from services.mesh.mesh_metrics import increment as metrics_inc
+
+                    metrics_inc("ingest_replay_seen")
+                except Exception:
+                    pass
+                duplicates += 1
+                continue
             if prev_hash != self.head_hash:
                 rejected.append({"index": idx, "reason": "prev_hash does not match head"})
                 continue
             if sequence <= 0:
                 rejected.append({"index": idx, "reason": "Invalid sequence"})
                 continue
-            sequence_table, sequence_key = self._sequence_table_for_event(event_type, node_id)
-            last = sequence_table.get(sequence_key, 0)
+            last = self.node_sequences.get(node_id, 0)
             if sequence <= last:
                 rejected.append({"index": idx, "reason": "Replay detected"})
                 continue
@@ -2484,18 +2149,7 @@ class Infonet:
             if not ok:
                 rejected.append({"index": idx, "reason": reason})
                 continue
-            if event_type == "gate_message":
-                ok, reason = validate_private_gate_ledger_payload(payload)
-            elif event_type == "dm_message":
-                ok, reason = validate_private_dm_ledger_payload(payload)
-                if ok:
-                    total_count, sender_count = self._dm_spool_active_counts(payload, sender_id=str(evt.get("node_id", "") or ""))
-                    if sender_count >= DM_HASHCHAIN_SPOOL_SENDER_LIMIT:
-                        ok, reason = False, "DM hashchain sender spool full for recipient"
-                    elif total_count >= DM_HASHCHAIN_SPOOL_LIMIT:
-                        ok, reason = False, "DM hashchain spool full for recipient"
-            else:
-                ok, reason = validate_public_ledger_payload(event_type, payload)
+            ok, reason = validate_public_ledger_payload(event_type, payload)
             if not ok:
                 rejected.append({"index": idx, "reason": reason})
                 continue
@@ -2571,7 +2225,7 @@ class Infonet:
                     pass
                 rejected.append({"index": idx, "reason": "public key is revoked"})
                 continue
-            last_seq = sequence_table.get(sequence_key, 0)
+            last_seq = self.node_sequences.get(node_id, 0)
             if sequence <= last_seq:
                 try:
                     from services.mesh.mesh_metrics import increment as metrics_inc
@@ -2607,30 +2261,18 @@ class Infonet:
                 rejected.append({"index": idx, "reason": bind_reason})
                 continue
 
-            if event_type == "gate_message":
-                signature_payloads = _private_gate_signature_payload_variants(
-                    str(payload.get("gate", "") or ""),
-                    evt,
-                )
-            else:
-                signature_payloads = [payload]
-            signature_ok = False
-            for signature_payload in signature_payloads:
-                sig_payload = build_signature_payload(
-                    event_type=event_type,
-                    node_id=node_id,
-                    sequence=sequence,
-                    payload=signature_payload,
-                )
-                if verify_signature(
-                    public_key_b64=public_key,
-                    public_key_algo=public_key_algo,
-                    signature_hex=signature,
-                    payload=sig_payload,
-                ):
-                    signature_ok = True
-                    break
-            if not signature_ok:
+            sig_payload = build_signature_payload(
+                event_type=event_type,
+                node_id=node_id,
+                sequence=sequence,
+                payload=payload,
+            )
+            if not verify_signature(
+                public_key_b64=public_key,
+                public_key_algo=public_key_algo,
+                signature_hex=signature,
+                payload=sig_payload,
+            ):
                 try:
                     from services.mesh.mesh_metrics import increment as metrics_inc
 
@@ -2660,7 +2302,7 @@ class Infonet:
             self.events.append(evt)
             self.event_index[event_id] = len(self.events) - 1
             self.head_hash = event_id
-            sequence_table[sequence_key] = sequence
+            self.node_sequences[node_id] = sequence
             self._update_counters_for_event(evt)
             accepted += 1
             expected_prev = event_id
@@ -2723,7 +2365,6 @@ class Infonet:
                     verify_node_binding,
                 )
 
-                event_type = evt_dict.get("event_type", "")
                 node_id = evt_dict.get("node_id", "")
                 if not parse_public_key_algo(public_key_algo):
                     return False, f"Unsupported public_key_algo at index {i}"
@@ -2734,41 +2375,21 @@ class Infonet:
                     return False, f"public key binding conflict at index {i}"
                 seen_public_keys[public_key] = node_id
 
-                payload = evt_dict.get("payload", {})
-                if event_type == "gate_message":
-                    ok, reason = validate_private_gate_ledger_payload(payload)
-                    if not ok:
-                        return False, f"Invalid gate_message payload at index {i}: {reason}"
-                    signature_payloads = _private_gate_signature_payload_variants(
-                        str(payload.get("gate", "") or ""),
-                        evt_dict,
-                    )
-                elif event_type == "dm_message":
-                    ok, reason = validate_private_dm_ledger_payload(payload)
-                    if not ok:
-                        return False, f"Invalid dm_message payload at index {i}: {reason}"
-                    signature_payloads = [normalize_payload(event_type, payload)]
-                else:
-                    signature_payloads = [
-                        normalize_payload(event_type, payload)
-                    ]
-                signature_ok = False
-                for signature_payload in signature_payloads:
-                    sig_payload = build_signature_payload(
-                        event_type=event_type,
-                        node_id=node_id,
-                        sequence=_safe_int(evt_dict.get("sequence", 0) or 0, 0),
-                        payload=signature_payload,
-                    )
-                    if verify_signature(
-                        public_key_b64=public_key,
-                        public_key_algo=public_key_algo,
-                        signature_hex=signature,
-                        payload=sig_payload,
-                    ):
-                        signature_ok = True
-                        break
-                if not signature_ok:
+                normalized = normalize_payload(
+                    evt_dict.get("event_type", ""), evt_dict.get("payload", {})
+                )
+                sig_payload = build_signature_payload(
+                    event_type=evt_dict.get("event_type", ""),
+                    node_id=node_id,
+                    sequence=_safe_int(evt_dict.get("sequence", 0) or 0, 0),
+                    payload=normalized,
+                )
+                if not verify_signature(
+                    public_key_b64=public_key,
+                    public_key_algo=public_key_algo,
+                    signature_hex=signature,
+                    payload=sig_payload,
+                ):
                     return False, f"Invalid signature at index {i}"
 
             prev = evt_dict["event_id"]
@@ -2833,48 +2454,27 @@ class Infonet:
                     verify_node_binding,
                 )
 
-                event_type = evt_dict.get("event_type", "")
                 node_id = evt_dict.get("node_id", "")
                 if not parse_public_key_algo(public_key_algo):
                     return False, f"Unsupported public_key_algo at index {i}"
                 if not verify_node_binding(node_id, public_key):
                     return False, f"node_id mismatch at index {i}"
 
-                payload = evt_dict.get("payload", {})
-                if event_type == "gate_message":
-                    ok, reason = validate_private_gate_ledger_payload(payload)
-                    if not ok:
-                        return False, f"Invalid gate_message payload at index {i}: {reason}"
-                    signature_payloads = _private_gate_signature_payload_variants(
-                        str(payload.get("gate", "") or ""),
-                        evt_dict,
-                    )
-                elif event_type == "dm_message":
-                    ok, reason = validate_private_dm_ledger_payload(payload)
-                    if not ok:
-                        return False, f"Invalid dm_message payload at index {i}: {reason}"
-                    signature_payloads = [normalize_payload(event_type, payload)]
-                else:
-                    signature_payloads = [
-                        normalize_payload(event_type, payload)
-                    ]
-                signature_ok = False
-                for signature_payload in signature_payloads:
-                    sig_payload = build_signature_payload(
-                        event_type=event_type,
-                        node_id=node_id,
-                        sequence=_safe_int(evt_dict.get("sequence", 0) or 0, 0),
-                        payload=signature_payload,
-                    )
-                    if verify_signature(
-                        public_key_b64=public_key,
-                        public_key_algo=public_key_algo,
-                        signature_hex=signature,
-                        payload=sig_payload,
-                    ):
-                        signature_ok = True
-                        break
-                if not signature_ok:
+                normalized = normalize_payload(
+                    evt_dict.get("event_type", ""), evt_dict.get("payload", {})
+                )
+                sig_payload = build_signature_payload(
+                    event_type=evt_dict.get("event_type", ""),
+                    node_id=node_id,
+                    sequence=_safe_int(evt_dict.get("sequence", 0) or 0, 0),
+                    payload=normalized,
+                )
+                if not verify_signature(
+                    public_key_b64=public_key,
+                    public_key_algo=public_key_algo,
+                    signature_hex=signature,
+                    payload=sig_payload,
+                ):
                     return False, f"Invalid signature at index {i}"
             prev = evt_dict["event_id"]
 
@@ -2938,14 +2538,7 @@ class Infonet:
             node_id = evt.get("node_id", "")
             sequence = _safe_int(evt.get("sequence", 0) or 0, 0)
             if node_id and sequence:
-                sequence_key = (
-                    f"{node_id}|gate_message"
-                    if str(evt.get("event_type", "") or "").strip().lower() == "gate_message"
-                    else f"{node_id}|dm_message"
-                    if str(evt.get("event_type", "") or "").strip().lower() == "dm_message"
-                    else node_id
-                )
-                last_seq[sequence_key] = max(last_seq.get(sequence_key, 0), sequence)
+                last_seq[node_id] = max(last_seq.get(node_id, 0), sequence)
             public_key = str(evt.get("public_key", "") or "")
             if public_key and node_id:
                 seen_public_keys.setdefault(public_key, node_id)
@@ -2965,21 +2558,8 @@ class Infonet:
             existing_idx = self.event_index.get(event_id)
             if existing_idx is not None and existing_idx <= prev_index:
                 return False, "duplicate event_id"
-            if event_type == "gate_message":
-                payload = dict(payload or {})
-            elif event_type == "dm_message":
-                payload = normalize_payload(event_type, dict(payload or {}))
-            else:
-                payload = normalize_payload(event_type, dict(payload or {}))
+            payload = normalize_payload(event_type, dict(payload or {}))
             ok, reason = validate_event_payload(event_type, payload)
-            if not ok:
-                return False, reason
-            if event_type == "gate_message":
-                ok, reason = validate_private_gate_ledger_payload(payload)
-            elif event_type == "dm_message":
-                ok, reason = validate_private_dm_ledger_payload(payload)
-            else:
-                ok, reason = validate_public_ledger_payload(event_type, payload)
             if not ok:
                 return False, reason
             proto = evt.get("protocol_version") or PROTOCOL_VERSION
@@ -2993,14 +2573,7 @@ class Infonet:
             revoked, _info = self._revocation_status(public_key)
             if revoked and event_type != "key_revoke":
                 return False, "public key revoked"
-            sequence_key = (
-                f"{node_id}|gate_message"
-                if event_type == "gate_message"
-                else f"{node_id}|dm_message"
-                if event_type == "dm_message"
-                else node_id
-            )
-            last = last_seq.get(sequence_key, 0)
+            last = last_seq.get(node_id, 0)
             if sequence <= last:
                 return False, "sequence replay"
             from services.mesh.mesh_crypto import (
@@ -3018,35 +2591,23 @@ class Infonet:
             if existing and existing != node_id:
                 return False, "public key binding conflict"
             seen_public_keys[public_key] = node_id
-            if event_type == "gate_message":
-                signature_payloads = _private_gate_signature_payload_variants(
-                    str(payload.get("gate", "") or ""),
-                    evt,
-                )
-            else:
-                signature_payloads = [payload]
-            signature_ok = False
-            for signature_payload in signature_payloads:
-                sig_payload = build_signature_payload(
-                    event_type=event_type,
-                    node_id=node_id,
-                    sequence=sequence,
-                    payload=signature_payload,
-                )
-                if verify_signature(
-                    public_key_b64=public_key,
-                    public_key_algo=public_key_algo,
-                    signature_hex=signature,
-                    payload=sig_payload,
-                ):
-                    signature_ok = True
-                    break
-            if not signature_ok:
+            sig_payload = build_signature_payload(
+                event_type=event_type,
+                node_id=node_id,
+                sequence=sequence,
+                payload=payload,
+            )
+            if not verify_signature(
+                public_key_b64=public_key,
+                public_key_algo=public_key_algo,
+                signature_hex=signature,
+                payload=sig_payload,
+            ):
                 return False, "invalid signature"
             computed = ChainEvent.from_dict(evt).event_id
             if computed != event_id:
                 return False, "event_id mismatch"
-            last_seq[sequence_key] = sequence
+            last_seq[node_id] = sequence
 
         # Apply fork
         self.events = prefix + ordered

backend/services/mesh/mesh_infonet_sync_support.py

@@ -2,64 +2,10 @@ from __future__ import annotations
 
 import time
 from dataclasses import asdict, dataclass
-from email.utils import parsedate_to_datetime
-from datetime import timezone
 
 from services.mesh.mesh_peer_store import PeerRecord
 
 
-class PeerSyncRateLimited(Exception):
-    """Upstream peer returned HTTP 429 — Too Many Requests.
-
-    Carries the ``Retry-After`` header value (parsed to seconds) so
-    the caller can pass it to ``finish_sync(retry_after_s=...)`` and
-    actually wait that long instead of hammering the upstream every
-    60s and keeping its rate-limit bucket full.
-
-    ``retry_after_s`` is 0 when the upstream didn't provide a header.
-    Caller should still apply the exponential backoff in that case.
-    """
-
-    def __init__(self, message: str, retry_after_s: int = 0, status: int = 429):
-        super().__init__(message)
-        self.retry_after_s = max(0, int(retry_after_s or 0))
-        self.status = int(status or 429)
-
-
-def parse_retry_after_header(header_value: str, *, now: float | None = None) -> int:
-    """Parse the ``Retry-After`` HTTP header.
-
-    Two valid forms per RFC 7231 §7.1.3:
-
-      * Delay-seconds: a non-negative integer (e.g. ``Retry-After: 120``)
-      * HTTP-date: an absolute time (e.g. ``Retry-After: Wed, 21 Oct 2026 07:28:00 GMT``)
-
-    Returns the wait in **seconds from now**. Unparseable / empty headers
-    return 0 (caller falls back to exponential backoff). Clamped at a
-    sane upper bound (1 hour) so a typo'd or hostile peer can't pin us
-    silent for days.
-    """
-    value = str(header_value or "").strip()
-    if not value:
-        return 0
-    upper_bound = 3600  # never trust a peer to silence us > 1h
-    # Form 1: pure integer seconds.
-    if value.isdigit():
-        return min(max(0, int(value)), upper_bound)
-    # Form 2: HTTP-date.
-    try:
-        target = parsedate_to_datetime(value)
-        if target is None:
-            return 0
-        if target.tzinfo is None:
-            target = target.replace(tzinfo=timezone.utc)
-        current = float(now if now is not None else time.time())
-        delta = int(target.timestamp() - current)
-        return min(max(0, delta), upper_bound)
-    except (TypeError, ValueError):
-        return 0
-
-
 @dataclass(frozen=True)
 class SyncWorkerState:
     last_sync_started_at: int = 0
@@ -126,59 +72,6 @@ def begin_sync(
     )
 
 
-def _failure_backoff_seconds(
-    *,
-    base_backoff_s: int,
-    consecutive_failures: int,
-    retry_after_s: int,
-    cap_s: int = 1800,
-) -> int:
-    """Compute the next-attempt delay after a failed sync.
-
-    Two inputs combine:
-
-    * ``retry_after_s`` — when an upstream peer answered HTTP 429
-      with a ``Retry-After`` header, we honor it exactly. Continuing
-      to hammer the upstream every 60s is the bug this fix exists to
-      close: it keeps the upstream's rate-limit bucket full
-      indefinitely and no sync ever lands.
-
-    * Exponential growth on ``consecutive_failures`` — even without an
-      explicit Retry-After, repeated failures should slow us down. The
-      first failure waits ``base`` (preserves pre-fix behavior for
-      one-off blips). Each subsequent failure doubles the wait, capped
-      to ``cap_s`` (default 30 minutes). With base=60 and cap=1800,
-      the schedule is 60s → 120s → 240s → 480s → 960s → 1800s →
-      1800s → … .
-
-    The actual delay is the MAX of the two — whichever asks for more
-    patience wins. ``retry_after_s == 0`` (no header) falls back to
-    pure exponential. An aggressive ``Retry-After`` (say 600s while
-    we're only at 1 failure) wins over the exponential ladder.
-    """
-    base = max(0, int(base_backoff_s or 0))
-    failures = max(0, int(consecutive_failures or 0))
-    cap = max(0, int(cap_s or 0))
-    retry_after = max(0, int(retry_after_s or 0))
-    # ``cap_s=0`` explicitly disables the exponential ladder entirely
-    # — operators who want the pre-fix "honor Retry-After only" behavior
-    # can set this. The default cap of 1800s is what saturates the
-    # ladder at the 5th-6th failure for base=60.
-    if cap == 0:
-        return retry_after
-    # 2^(failures-1) — so failure #1 = base (preserves the pre-fix
-    # default for transient blips), failure #2 = 2*base, etc. Cap on
-    # the exponent (16) is defense against integer overflow on a
-    # hostile or very large failures counter.
-    if base > 0 and failures > 0:
-        exponent = min(max(0, failures - 1), 16)
-        grown = base * (2 ** exponent)
-    else:
-        grown = 0
-    exponential = min(max(0, grown), cap)
-    return max(exponential, retry_after)
-
-
 def finish_sync(
     state: SyncWorkerState,
     *,
@@ -190,26 +83,7 @@ def finish_sync(
     now: float | None = None,
     interval_s: int = 300,
     failure_backoff_s: int = 60,
-    retry_after_s: int = 0,
-    failure_backoff_cap_s: int = 1800,
 ) -> SyncWorkerState:
-    """Finalise a sync attempt and compute when the next one should run.
-
-    New args (added for the 429 retry storm fix):
-
-    * ``retry_after_s`` — if the peer responded with HTTP 429 + a
-      ``Retry-After`` header, pass that value here. ``finish_sync``
-      will use ``max(exponential, retry_after_s)`` for the delay so
-      we never hammer a peer that asked us to back off.
-    * ``failure_backoff_cap_s`` — upper bound on the exponential
-      ladder. Default 1800 (30 min) — keeps a sync queue from going
-      silent for hours while still cutting the request rate to
-      something the upstream can absorb.
-
-    The pre-fix behavior (constant 60s on every failure) is recoverable
-    by passing ``failure_backoff_cap_s=0`` and ``retry_after_s=0``, but
-    there's no reason to.
-    """
     timestamp = int(now if now is not None else time.time())
     if ok:
         return SyncWorkerState(
@@ -225,25 +99,17 @@ def finish_sync(
             consecutive_failures=0,
         )
 
-    next_failures = state.consecutive_failures + 1
-    delay_s = _failure_backoff_seconds(
-        base_backoff_s=failure_backoff_s,
-        consecutive_failures=next_failures,
-        retry_after_s=retry_after_s,
-        cap_s=failure_backoff_cap_s,
-    )
-
     return SyncWorkerState(
         last_sync_started_at=state.last_sync_started_at,
         last_sync_finished_at=timestamp,
         last_sync_ok_at=state.last_sync_ok_at,
-        next_sync_due_at=timestamp + delay_s,
+        next_sync_due_at=timestamp + max(0, int(failure_backoff_s or 0)),
         last_peer_url=peer_url or state.last_peer_url,
         last_error=str(error or "").strip(),
         last_outcome="fork" if fork_detected else "error",
         current_head=current_head or state.current_head,
         fork_detected=bool(fork_detected),
-        consecutive_failures=next_failures,
+        consecutive_failures=state.consecutive_failures + 1,
     )
 
 
@@ -276,6 +142,5 @@ def should_run_sync(
 ) -> bool:
     current_time = int(now if now is not None else time.time())
     if state.last_outcome == "running":
-        started_at = int(state.last_sync_started_at or 0)
-        return started_at <= 0 or current_time - started_at >= 300
+        return False
     return int(state.next_sync_due_at or 0) <= current_time

backend/services/mesh/mesh_schema.py

@@ -2,9 +2,6 @@
 
 from __future__ import annotations
 
-import base64
-import binascii
-import math
 from dataclasses import dataclass
 from typing import Any, Callable
 
@@ -36,58 +33,6 @@ def _require_fields(payload: dict[str, Any], fields: tuple[str, ...]) -> tuple[b
     return True, "ok"
 
 
-def _decode_base64ish(value: Any) -> bytes | None:
-    raw = str(value or "").strip()
-    if not raw or any(ch.isspace() for ch in raw):
-        return None
-    padded = raw + ("=" * (-len(raw) % 4))
-    for altchars in (None, b"-_"):
-        try:
-            return base64.b64decode(padded.encode("ascii"), altchars=altchars, validate=True)
-        except (binascii.Error, UnicodeEncodeError, ValueError):
-            continue
-    return None
-
-
-def _byte_entropy(data: bytes) -> float:
-    if not data:
-        return 0.0
-    counts = [0] * 256
-    for byte in data:
-        counts[byte] += 1
-    total = float(len(data))
-    return -sum((count / total) * math.log2(count / total) for count in counts if count)
-
-
-def _validate_sealed_bytes_field(
-    payload: dict[str, Any],
-    field: str,
-    *,
-    min_bytes: int = 8,
-    entropy_floor: float = 2.5,
-) -> tuple[bool, str]:
-    data = _decode_base64ish(payload.get(field, ""))
-    if data is None:
-        return False, f"{field} must be base64-encoded sealed bytes"
-    if len(data) < min_bytes:
-        return False, f"{field} is too short"
-
-    # Short test vectors and compact envelopes can be low entropy; only apply
-    # heuristics once there is enough material to distinguish a sealed blob
-    # from accidental base64-encoded plaintext.
-    if len(data) >= 32:
-        printable = sum(1 for byte in data if 32 <= byte <= 126 or byte in (9, 10, 13))
-        if printable / len(data) > 0.9:
-            try:
-                data.decode("utf-8")
-                return False, f"{field} looks like encoded plaintext"
-            except UnicodeDecodeError:
-                pass
-        if _byte_entropy(data) < entropy_floor:
-            return False, f"{field} entropy is too low for sealed bytes"
-    return True, "ok"
-
-
 def _validate_message(payload: dict[str, Any]) -> tuple[bool, str]:
     ok, reason = _require_fields(
         payload, ("message", "destination", "channel", "priority", "ephemeral")
@@ -386,7 +331,6 @@ ACTIVE_PUBLIC_LEDGER_EVENT_TYPES: frozenset[str] = frozenset(
 LEGACY_PUBLIC_LEDGER_EVENT_TYPES: frozenset[str] = frozenset(
     {
         "gate_message",
-        "dm_message",
     }
 )
 """Event types that exist historically on the public chain and must remain
@@ -481,8 +425,6 @@ def validate_event_payload(event_type: str, payload: dict[str, Any]) -> tuple[bo
 
 
 def validate_public_ledger_payload(event_type: str, payload: dict[str, Any]) -> tuple[bool, str]:
-    if event_type == "gate_message":
-        return validate_private_gate_ledger_payload(payload)
     if event_type not in PUBLIC_LEDGER_EVENT_TYPES and event_type not in _EXTENSION_VALIDATORS:
         return False, f"{event_type} is not allowed on the public ledger"
     forbidden = sorted(
@@ -499,92 +441,6 @@ def validate_public_ledger_payload(event_type: str, payload: dict[str, Any]) ->
     return True, "ok"
 
 
-_PRIVATE_GATE_LEDGER_ALLOWED_FIELDS: frozenset[str] = frozenset(
-    {
-        "gate",
-        "ciphertext",
-        "nonce",
-        "sender_ref",
-        "format",
-        "epoch",
-        "gate_envelope",
-        "envelope_hash",
-        "reply_to",
-        "transport_lock",
-        "signed_context",
-    }
-)
-
-
-def validate_private_gate_ledger_payload(payload: dict[str, Any]) -> tuple[bool, str]:
-    """Validate ciphertext-only gate events for private Infonet replication."""
-    ok, reason = validate_event_payload("gate_message", payload)
-    if not ok:
-        return ok, reason
-    unexpected = sorted(
-        key
-        for key in payload.keys()
-        if str(key or "").strip().lower() not in _PRIVATE_GATE_LEDGER_ALLOWED_FIELDS
-    )
-    if unexpected:
-        return False, f"private gate ledger payload contains unsupported fields: {', '.join(unexpected)}"
-    if "message" in payload or "_local_plaintext" in payload or "_local_reply_to" in payload:
-        return False, "private gate ledger payload must not contain plaintext"
-    transport_lock = str(payload.get("transport_lock", "") or "").strip().lower()
-    if transport_lock and transport_lock not in {"private", "private_strong", "rns", "onion"}:
-        return False, "gate messages require private transport_lock"
-    ok, reason = _validate_sealed_bytes_field(payload, "ciphertext")
-    if not ok:
-        return ok, reason
-    ok, reason = _validate_sealed_bytes_field(payload, "nonce")
-    if not ok:
-        return ok, reason
-    return True, "ok"
-
-
-_PRIVATE_DM_LEDGER_ALLOWED_FIELDS: frozenset[str] = frozenset(
-    {
-        "recipient_id",
-        "delivery_class",
-        "recipient_token",
-        "ciphertext",
-        "msg_id",
-        "timestamp",
-        "format",
-        "session_welcome",
-        "sender_seal",
-        "relay_salt",
-        "transport_lock",
-        "signed_context",
-    }
-)
-
-
-def validate_private_dm_ledger_payload(payload: dict[str, Any]) -> tuple[bool, str]:
-    """Validate ciphertext-only DM dead-drop events for private Infonet replication."""
-    ok, reason = validate_event_payload("dm_message", payload)
-    if not ok:
-        return ok, reason
-    unexpected = sorted(
-        key
-        for key in payload.keys()
-        if str(key or "").strip().lower() not in _PRIVATE_DM_LEDGER_ALLOWED_FIELDS
-    )
-    if unexpected:
-        return False, f"private DM ledger payload contains unsupported fields: {', '.join(unexpected)}"
-    if "message" in payload or "plaintext" in payload or "_local_plaintext" in payload:
-        return False, "private DM ledger payload must not contain plaintext"
-    transport_lock = str(payload.get("transport_lock", "") or "").strip().lower()
-    if transport_lock != "private_strong":
-        return False, "DM hashchain spool requires private_strong transport_lock"
-    if not str(payload.get("ciphertext", "") or "").strip():
-        return False, "ciphertext cannot be empty"
-    ok, reason = _validate_sealed_bytes_field(payload, "ciphertext")
-    if not ok:
-        return ok, reason
-    return True, "ok"
-
-
 def validate_protocol_fields(protocol_version: str, network_id: str) -> tuple[bool, str]:
     if protocol_version != PROTOCOL_VERSION:
         return False, "Unsupported protocol_version"

backend/services/network_utils.py

@@ -5,9 +5,7 @@ import subprocess
 import shutil
 import time
 import threading
-import uuid
 import requests
-from pathlib import Path
 from urllib.parse import urlparse
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
@@ -22,211 +20,14 @@ _session.mount("https://", HTTPAdapter(max_retries=_retry, pool_maxsize=20))
 _session.mount("http://", HTTPAdapter(max_retries=_retry, pool_maxsize=10))
 
 
-# ---------------------------------------------------------------------------
-# Per-operator outbound identification
-# ---------------------------------------------------------------------------
-#
-# Issues #289 / #290 / #291 and the retrofit of PR #284 (#218 / #219 / #220):
-# every third-party API the backend calls used to identify itself with a
-# single "Shadowbroker" aggregate User-Agent. From the upstream's
-# perspective, that meant every Shadowbroker install in the world looked
-# like one giant entity hammering them. If one install misbehaved, the
-# upstream's only recourse was to block "Shadowbroker" as a whole — which
-# would take out every other install too.
-#
-# Fix: give each install a stable pseudonymous handle and include it in
-# the User-Agent. Now an upstream can rate-limit or block the offending
-# operator without affecting anyone else.
-#
-# The handle:
-#
-# - Is auto-generated on first call if no `OPERATOR_HANDLE` is configured
-#   (looks like "operator-7f3a92" — 6 hex chars from uuid4()).
-# - Is persisted to ``backend/data/operator_handle.json`` so it survives
-#   restarts. Under Docker compose that file lives in the volume mount
-#   alongside `carrier_cache.json` and the other persistent state.
-# - Can be overridden by the operator via the `OPERATOR_HANDLE` setting
-#   (env var or settings UI). Operators with their own GitHub handle,
-#   organization name, etc. can use that for traceability.
-# - Is NEVER mixed into mesh / Wormhole / Infonet identity. This layer is
-#   strictly for public third-party API attribution.
-
-_SHADOWBROKER_VERSION = "0.9"
-_OPERATOR_HANDLE_FILE = (
-    Path(__file__).parent.parent / "data" / "operator_handle.json"
-)
-_OPERATOR_HANDLE_CACHE: str = ""
-_OPERATOR_HANDLE_LOCK = threading.Lock()
-
-
-def _generate_operator_handle() -> str:
-    """Produce a stable pseudonymous handle for first-launch installs.
-
-    Format: ``operator-7f3a92`` (6 hex chars from a fresh uuid4()).
-    Distinct per install. Carries no real-world identity by default —
-    operators who want one can override via ``OPERATOR_HANDLE``.
-
-    Note: the prefix is deliberately neutral. Earlier drafts used
-    ``shadow-`` which, while accurate to the project name, looks
-    exactly like the kind of pattern a third-party abuse-detection
-    system would auto-block as suspicious. ``operator-`` describes
-    what the value actually is and doesn't pattern-match malware.
-    """
-    return f"operator-{uuid.uuid4().hex[:6]}"
-
-
-def _load_persisted_operator_handle() -> str:
-    """Return the previously-saved handle from disk, or empty if none.
-
-    Reads ``backend/data/operator_handle.json`` if it exists. Any read
-    error returns empty so a fresh handle gets generated rather than
-    crashing the request.
-    """
-    try:
-        if _OPERATOR_HANDLE_FILE.exists():
-            data = json.loads(_OPERATOR_HANDLE_FILE.read_text(encoding="utf-8"))
-            return str(data.get("handle", "") or "").strip()
-    except (OSError, json.JSONDecodeError, ValueError):
-        pass
-    return ""
-
-
-def _persist_operator_handle(handle: str) -> None:
-    """Atomically save the auto-generated handle so subsequent restarts
-    use the same one. Failure to persist is non-fatal — the request still
-    succeeds with the in-memory handle, we just may generate a different
-    one on the next process restart."""
-    try:
-        _OPERATOR_HANDLE_FILE.parent.mkdir(parents=True, exist_ok=True)
-        tmp = _OPERATOR_HANDLE_FILE.with_suffix(_OPERATOR_HANDLE_FILE.suffix + ".tmp")
-        tmp.write_text(
-            json.dumps({"handle": handle, "_meta": {
-                "purpose": "Per-install operator handle for outbound third-party API attribution.",
-                "see": "backend/services/network_utils.py:outbound_user_agent",
-            }}, indent=2),
-            encoding="utf-8",
-        )
-        os.replace(tmp, _OPERATOR_HANDLE_FILE)
-    except OSError as exc:
-        logger.debug("Could not persist operator_handle (continuing in-memory): %s", exc)
-
-
-def get_operator_handle() -> str:
-    """Return the stable per-install operator handle.
-
-    Resolution order:
-      1. ``OPERATOR_HANDLE`` setting (env var / settings UI) if non-empty.
-      2. Process-cached value from previous call this run.
-      3. Value persisted to ``operator_handle.json`` (from a previous run).
-      4. Newly generated pseudonymous handle, persisted to disk.
-
-    The handle is normalized: stripped of whitespace, lowercased,
-    non-alphanumeric chars (except ``-`` and ``_``) replaced with ``-``.
-    This both sanitizes any HTTP-header-unsafe characters AND prevents
-    the operator from impersonating real third-party projects via
-    inventive whitespace.
-    """
-    global _OPERATOR_HANDLE_CACHE
-    with _OPERATOR_HANDLE_LOCK:
-        # 1. Configured override always wins.
-        configured = ""
-        try:
-            from services.config import get_settings
-
-            configured = str(getattr(get_settings(), "OPERATOR_HANDLE", "") or "").strip()
-        except Exception:
-            configured = ""
-        if configured:
-            return _normalize_handle(configured)
-
-        # 2. In-memory cache (fast path for repeated calls).
-        if _OPERATOR_HANDLE_CACHE:
-            return _OPERATOR_HANDLE_CACHE
-
-        # 3. On-disk handle from a previous run.
-        persisted = _load_persisted_operator_handle()
-        if persisted:
-            _OPERATOR_HANDLE_CACHE = _normalize_handle(persisted)
-            return _OPERATOR_HANDLE_CACHE
-
-        # 4. Generate, persist, return.
-        fresh = _generate_operator_handle()
-        _persist_operator_handle(fresh)
-        _OPERATOR_HANDLE_CACHE = fresh
-        return fresh
-
-
-def _normalize_handle(raw: str) -> str:
-    """Strip whitespace, lowercase, replace unsafe characters with dashes."""
-    safe = "".join(
-        ch if (ch.isalnum() or ch in "-_") else "-"
-        for ch in raw.strip().lower()
-    )
-    # Collapse runs of dashes and trim to a reasonable length so an
-    # operator can't make our outbound logs unreadable.
-    while "--" in safe:
-        safe = safe.replace("--", "-")
-    safe = safe.strip("-")
-    return safe[:48] if safe else "anonymous"
-
-
-_CONTACT_URL = "https://github.com/BigBodyCobain/Shadowbroker/issues"
-
-
-def outbound_user_agent(purpose: str = "") -> str:
-    """Build a User-Agent for an outbound third-party HTTP request.
-
-    Returns something like::
-
-        Shadowbroker/0.9 (operator: shadow-7f3a92; purpose: wikipedia;
-         +https://github.com/BigBodyCobain/Shadowbroker/issues)
-
-    The ``purpose`` is optional but recommended — it tells the upstream
-    what feature of ours is making the call (``wikipedia``, ``openmhz``,
-    ``nominatim``, etc.), which makes their logs and our complaints
-    actionable.
-
-    Every outbound call in the backend that previously sent a custom
-    User-Agent should call this helper instead. Centralizing here means:
-      - one place to change the contact URL,
-      - one place to bump the version on release,
-      - one place a Wikimedia / OpenMHz operator can reach to ask for
-        the project to back off, with a per-install handle so they can
-        target the specific install instead of the project as a whole.
-    """
-    handle = get_operator_handle()
-    if purpose:
-        purpose_clean = _normalize_handle(purpose)
-        return (
-            f"Shadowbroker/{_SHADOWBROKER_VERSION} "
-            f"(operator: {handle}; purpose: {purpose_clean}; +{_CONTACT_URL})"
-        )
-    return (
-        f"Shadowbroker/{_SHADOWBROKER_VERSION} "
-        f"(operator: {handle}; +{_CONTACT_URL})"
-    )
-
-
-def _reset_operator_handle_cache_for_tests() -> None:
-    """Test-only: invalidate the in-memory cache so a test can set a
-    new ``OPERATOR_HANDLE`` env var and see it picked up immediately."""
-    global _OPERATOR_HANDLE_CACHE
-    with _OPERATOR_HANDLE_LOCK:
-        _OPERATOR_HANDLE_CACHE = ""
-
-
-# Default outbound User-Agent. Retained for backwards compatibility with
-# call sites that haven't been migrated to ``outbound_user_agent()`` yet.
-# Operators who want full per-install attribution should set the
-# ``OPERATOR_HANDLE`` setting and migrate call sites incrementally.
-#
-# Operators who run a public-facing relay can also override the whole UA
-# string via the ``SHADOWBROKER_USER_AGENT`` env var. That override
-# completely bypasses the per-operator helper; only use it if you know
-# what you're doing.
+# Default outbound User-Agent. Generic by design — does NOT include any
+# personal contact info or a fork-specific repo URL. Operators who run a
+# public-facing relay and want to identify themselves to upstreams (e.g.
+# for Nominatim / weather.gov usage-policy compliance) can override this
+# via the SHADOWBROKER_USER_AGENT env var.
 DEFAULT_USER_AGENT = os.environ.get(
     "SHADOWBROKER_USER_AGENT",
-    f"Shadowbroker/{_SHADOWBROKER_VERSION}",
+    "ShadowBroker-OSINT/0.9",
 )
 
 # Find bash for curl fallback — Git bash's curl has the TLS features

backend/services/radio_intercept.py

@@ -2,34 +2,14 @@ import requests
 from bs4 import BeautifulSoup
 import logging
 from cachetools import cached, TTLCache
+import cloudscraper
 import reverse_geocoder as rg
 from urllib.parse import urlparse
 
-from services.network_utils import outbound_user_agent
-
 logger = logging.getLogger(__name__)
 
 _OPENMHZ_AUDIO_HOSTS = {"media.openmhz.com", "media2.openmhz.com", "media3.openmhz.com"}
 
-
-# Round 7a / Issues #289, #290, #291 (tg12 audit):
-# We previously sent a spoofed Chrome User-Agent and (for OpenMHz) used
-# cloudscraper to bypass anti-bot challenges. Both are dishonest and ToS-
-# unfriendly. We now send the per-install Shadowbroker UA — the upstream
-# can identify us, rate-limit us per install, and contact us if needed.
-#
-# If the upstream actively blocks our honest UA, the feature degrades
-# gracefully (returns an empty list / cached results) rather than
-# escalating to deception.
-
-
-def _broadcastify_user_agent() -> str:
-    return outbound_user_agent("broadcastify")
-
-
-def _openmhz_user_agent() -> str:
-    return outbound_user_agent("openmhz")
-
 # Cache the top feeds for 5 minutes so we don't hammer Broadcastify
 radio_cache = TTLCache(maxsize=1, ttl=300)
 
@@ -42,12 +22,8 @@ def get_top_broadcastify_feeds():
     """
     logger.info("Scraping Broadcastify Top Feeds (Cache Miss)")
     headers = {
-        # Issue #289 (tg12) + Round 7a: identify ourselves honestly as a
-        # per-install Shadowbroker scraper. Broadcastify can rate-limit
-        # us per install or block us; either way we stop pretending to be
-        # a browser. If they block, the panel degrades gracefully.
-        "User-Agent": _broadcastify_user_agent(),
-        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
         "Accept-Language": "en-US,en;q=0.9",
     }
 
@@ -113,32 +89,21 @@ openmhz_systems_cache = TTLCache(maxsize=1, ttl=3600)
 
 @cached(openmhz_systems_cache)
 def get_openmhz_systems():
-    """Fetches the full directory of OpenMHZ systems.
+    """Fetches the full directory of OpenMHZ systems."""
+    logger.info("Scraping OpenMHZ Systems (Cache Miss)")
+    scraper = cloudscraper.create_scraper(
+        browser={"browser": "chrome", "platform": "windows", "desktop": True}
+    )
 
-    Issue #290 (tg12) + Round 7a: replaced cloudscraper-based Chrome
-    impersonation with an honest per-install Shadowbroker User-Agent.
-    If OpenMHz's Cloudflare layer blocks honest traffic, we accept
-    that degradation (return empty list) rather than spoof a browser.
-    """
-    logger.info("Fetching OpenMHZ Systems (Cache Miss)")
     try:
-        res = requests.get(
-            "https://api.openmhz.com/systems",
-            timeout=15,
-            headers={"User-Agent": _openmhz_user_agent(), "Accept": "application/json"},
-        )
+        res = scraper.get("https://api.openmhz.com/systems", timeout=15)
         if res.status_code == 200:
             data = res.json()
+            # Return list of systems
             return data.get("systems", []) if isinstance(data, dict) else []
-        if res.status_code in (403, 503):
-            logger.warning(
-                "OpenMHZ returned %s for systems directory — Cloudflare may "
-                "be blocking our honest UA. Feature degrades to empty result.",
-                res.status_code,
-            )
         return []
     except (requests.RequestException, ConnectionError, TimeoutError, ValueError, KeyError) as e:
-        logger.error(f"OpenMHZ Systems Fetch Exception: {e}")
+        logger.error(f"OpenMHZ Systems Scrape Exception: {e}")
         return []
 
 
@@ -148,25 +113,21 @@ openmhz_calls_cache = TTLCache(maxsize=100, ttl=20)
 
 @cached(openmhz_calls_cache)
 def get_recent_openmhz_calls(sys_name: str):
-    """Fetches the actual audio burst .m4a URLs for a specific system (e.g., 'wmata').
-
-    Issue #290 (tg12) + Round 7a: same honest-UA model as
-    ``get_openmhz_systems``.
-    """
+    """Fetches the actual audio burst .m4a URLs for a specific system (e.g., 'wmata')."""
     logger.info(f"Fetching OpenMHZ calls for {sys_name} (Cache Miss)")
+    scraper = cloudscraper.create_scraper(
+        browser={"browser": "chrome", "platform": "windows", "desktop": True}
+    )
+
     try:
         url = f"https://api.openmhz.com/{sys_name}/calls"
-        res = requests.get(
-            url,
-            timeout=15,
-            headers={"User-Agent": _openmhz_user_agent(), "Accept": "application/json"},
-        )
+        res = scraper.get(url, timeout=15)
         if res.status_code == 200:
             data = res.json()
             return data.get("calls", []) if isinstance(data, dict) else []
         return []
     except (requests.RequestException, ConnectionError, TimeoutError, ValueError, KeyError) as e:
-        logger.error(f"OpenMHZ Calls Fetch Exception ({sys_name}): {e}")
+        logger.error(f"OpenMHZ Calls Scrape Exception ({sys_name}): {e}")
         return []
 
 
@@ -202,11 +163,9 @@ def openmhz_audio_response(target_url: str):
                 timeout=(5, 20),
                 allow_redirects=False,
                 headers={
-                    # Issue #291 (tg12) + Round 7a: drop spoofed Mozilla
-                    # UA and the fake first-party Referer. Identify as
-                    # the per-install Shadowbroker proxy honestly.
-                    "User-Agent": _openmhz_user_agent(),
+                    "User-Agent": "Mozilla/5.0",
                     "Accept": "audio/mpeg,audio/*,*/*;q=0.8",
+                    "Referer": "https://openmhz.com/",
                 },
             )
             if upstream.is_redirect or upstream.status_code in (301, 302, 303, 307, 308):

backend/services/region_dossier.py

@@ -4,7 +4,7 @@ import concurrent.futures
 from urllib.parse import quote
 import requests as _requests
 from cachetools import TTLCache
-from services.network_utils import fetch_with_curl, outbound_user_agent
+from services.network_utils import fetch_with_curl, DEFAULT_USER_AGENT
 
 logger = logging.getLogger(__name__)
 
@@ -15,30 +15,24 @@ dossier_cache = TTLCache(maxsize=500, ttl=86400)
 # Nominatim requires max 1 req/sec — track last call time
 _nominatim_last_call = 0.0
 
-# Issues #218 / #219 (tg12): Wikimedia's User-Agent policy requires API
+# Issue #218 / #219 (tg12): Wikimedia's User-Agent policy requires API
 # clients to identify themselves with a stable User-Agent that includes
-# a contact path.
+# a contact path. Bare "python-requests/x.y" or generic strings violate
+# the policy and risk getting blocked. We send the project default UA
+# (operator-overridable via SHADOWBROKER_USER_AGENT) on EVERY outbound
+# Wikimedia request, plus the policy-recommended Api-User-Agent which
+# Wikimedia explicitly accepts on top of the regular UA.
 #
-# Round 7a: the original fix in PR #284 used a single project-wide
-# identifier, which from Wikimedia's perspective made every Shadowbroker
-# install in the world look like one giant scraper. If one install
-# misbehaved, their only recourse was to block "Shadowbroker" as a
-# whole. We now build the headers from ``outbound_user_agent('wikimedia')``
-# which embeds the per-install operator handle (auto-generated or
-# operator-chosen), so Wikimedia can rate-limit / contact the specific
-# install instead of the project.
-
-
-def _wikimedia_request_headers() -> dict[str, str]:
-    ua = outbound_user_agent("wikimedia")
-    return {
-        "User-Agent": ua,
-        # Browser-JS-style header that Wikimedia's policy explicitly
-        # accepts on top of (or instead of) User-Agent. We send both so
-        # whichever the upstream prefers, the per-operator handle is
-        # always available.
-        "Api-User-Agent": ua,
-    }
+# This is documented and stable so a Wikimedia operator who wants to
+# rate-limit or contact us has a fixed identifier to grep for.
+_WIKIMEDIA_REQUEST_HEADERS = {
+    "User-Agent": DEFAULT_USER_AGENT,
+    "Api-User-Agent": (
+        f"{DEFAULT_USER_AGENT} "
+        "(+https://github.com/BigBodyCobain/Shadowbroker; "
+        "report issues at /issues)"
+    ),
+}
 
 
 def _reverse_geocode_offline(lat: float, lng: float) -> dict:
@@ -70,7 +64,9 @@ def _reverse_geocode(lat: float, lng: float) -> dict:
         f"https://nominatim.openstreetmap.org/reverse?"
         f"lat={lat}&lon={lng}&format=json&zoom=10&addressdetails=1&accept-language=en"
     )
-    headers = {"User-Agent": outbound_user_agent("nominatim")}
+    headers = {
+        "User-Agent": "ShadowBroker-OSINT/1.0 (live-risk-dashboard; contact@shadowbroker.app)"
+    }
 
     for attempt in range(2):
         # Enforce Nominatim's 1 req/sec policy
@@ -150,7 +146,7 @@ def _fetch_wikidata_leader(country_name: str) -> dict:
         # specific Api-User-Agent that the policy specifically asks
         # for, since this request originates from a backend service
         # that proxies on behalf of (potentially many) browser users.
-        res = fetch_with_curl(url, timeout=6, headers=_wikimedia_request_headers())
+        res = fetch_with_curl(url, timeout=6, headers=_WIKIMEDIA_REQUEST_HEADERS)
         if res.status_code == 200:
             results = res.json().get("results", {}).get("bindings", [])
             if results:
@@ -178,7 +174,7 @@ def _fetch_local_wiki_summary(place_name: str, country_name: str = "") -> dict:
         try:
             # Issue #219 (tg12): identify ourselves to Wikimedia per
             # their UA policy; see _fetch_wikidata_leader above.
-            res = fetch_with_curl(url, timeout=5, headers=_wikimedia_request_headers())
+            res = fetch_with_curl(url, timeout=5, headers=_WIKIMEDIA_REQUEST_HEADERS)
             if res.status_code == 200:
                 data = res.json()
                 if data.get("type") != "disambiguation":

backend/services/sar/sar_products_client.py

@@ -34,11 +34,6 @@ from services.sar.sar_config import (
     copernicus_token,
     earthdata_token,
 )
-
-
-def _sar_user_agent() -> str:
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("sar-products")
 from services.sar.sar_normalize import (
     SarAnomaly,
     evidence_hash_for_payload,
@@ -447,7 +442,7 @@ def _fetch_unosat_packages() -> list[dict[str, Any]]:
     # HDX CKAN returns 406 without explicit Accept + a browser-ish UA.
     hdx_headers = {
         "Accept": "application/json",
-        "User-Agent": _sar_user_agent(),
+        "User-Agent": "Mozilla/5.0 (compatible; ShadowBroker-SAR/1.0)",
     }
     try:
         resp = fetch_with_curl(url, timeout=20, headers=hdx_headers)

backend/services/sentinel_search.py

@@ -11,21 +11,12 @@ import requests
 from datetime import datetime, timedelta
 from cachetools import TTLCache
 
-from services.network_utils import outbound_user_agent
-
 logger = logging.getLogger(__name__)
 
 # Cache by rounded lat/lon (0.02° grid ~= 2km), TTL 1 hour
 _sentinel_cache = TTLCache(maxsize=200, ttl=3600)
 
 
-def _planetary_user_agent() -> str:
-    # Round 7a: per-install handle so Microsoft Planetary Computer can
-    # attribute requests to the specific operator rather than treating
-    # the whole Shadowbroker user base as one entity.
-    return outbound_user_agent("sentinel2-planetary-computer")
-
-
 def _esri_imagery_fallback(lat: float, lng: float) -> dict:
     lat_span = 0.18
     lng_span = 0.24
@@ -73,7 +64,7 @@ def search_sentinel2_scene(lat: float, lng: float) -> dict:
             "https://planetarycomputer.microsoft.com/api/stac/v1/search",
             json=search_payload,
             timeout=8,
-            headers={"User-Agent": _planetary_user_agent()},
+            headers={"User-Agent": "ShadowBroker-OSINT/1.0 (live-risk-dashboard)"},
         )
         search_res.raise_for_status()
         data = search_res.json()

backend/services/shodan_connector.py

@@ -20,11 +20,7 @@ from cachetools import TTLCache
 logger = logging.getLogger(__name__)
 
 _SHODAN_BASE = "https://api.shodan.io"
-# Round 7a: per-install attribution. Shodan already has the operator API
-# key for billing, but the UA still identifies the install.
-def _shodan_user_agent():
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("shodan")
+_USER_AGENT = "ShadowBroker/0.9.79 local Shodan connector"
 _REQUEST_TIMEOUT = 15
 _MIN_INTERVAL_SECONDS = 1.05  # Shodan docs say API plans are rate limited to ~1 req/sec.
 _DEFAULT_SEARCH_PAGES = 1
@@ -183,7 +179,7 @@ def _request(path: str, *, params: dict[str, Any], cache: TTLCache[str, dict[str
                 f"{_SHODAN_BASE}{path}",
                 params=payload,
                 timeout=_REQUEST_TIMEOUT,
-                headers={"User-Agent": _shodan_user_agent(), "Accept": "application/json"},
+                headers={"User-Agent": _USER_AGENT, "Accept": "application/json"},
             )
         finally:
             _last_request_at = time.monotonic()

backend/services/tinygs_fetcher.py

@@ -19,13 +19,6 @@ from pathlib import Path
 import requests
 from sgp4.api import Satrec, WGS72, jday
 
-
-
-def _tinygs_user_agent(purpose: str) -> str:
-    """Round 7a: per-install handle for CelesTrak / TinyGS attribution."""
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent(f"tinygs-{purpose}")
-
 logger = logging.getLogger(__name__)
 
 # ---------------------------------------------------------------------------
@@ -120,7 +113,7 @@ def _fetch_celestrak_tles() -> list[dict]:
                 params={"GROUP": group, "FORMAT": "json"},
                 timeout=20,
                 headers={
-                    "User-Agent": _tinygs_user_agent("celestrak"),
+                    "User-Agent": "ShadowBroker-OSINT/1.0 (CelesTrak fair-use)",
                     "Accept": "application/json",
                 },
             )
@@ -266,7 +259,7 @@ def _fetch_tinygs_telemetry() -> None:
             timeout=15,
             headers={
                 "Accept": "application/json",
-                "User-Agent": _tinygs_user_agent("tinygs"),
+                "User-Agent": "ShadowBroker-OSINT/1.0",
             },
         )
         resp.raise_for_status()

backend/services/unusual_whales_connector.py

@@ -24,9 +24,7 @@ from cachetools import TTLCache
 logger = logging.getLogger(__name__)
 
 _FINNHUB_BASE = "https://finnhub.io/api/v1"
-def _finnhub_user_agent():
-    from services.network_utils import outbound_user_agent
-    return outbound_user_agent("finnhub")
+_USER_AGENT = "ShadowBroker/0.9.79 Finnhub connector"
 _REQUEST_TIMEOUT = 12
 _MIN_INTERVAL_SECONDS = 0.35  # Stay well under 60 calls/min
 
@@ -91,7 +89,7 @@ def _request(path: str, params: dict[str, Any] | None = None) -> Any:
                 f"{_FINNHUB_BASE}{path}",
                 params=payload,
                 timeout=_REQUEST_TIMEOUT,
-                headers={"User-Agent": _finnhub_user_agent(), "Accept": "application/json"},
+                headers={"User-Agent": _USER_AGENT, "Accept": "application/json"},
             )
         finally:
             _last_request_at = time.monotonic()

backend/tests/data/duplicate_routes_baseline.json

@@ -1,677 +0,0 @@
-{
-  "_meta": {
-    "issue": "#239",
-    "note": "Snapshot of currently-tolerated duplicate route registrations. The test in test_no_new_duplicate_routes.py fails if any NEW (method, path) duplicate appears outside this list. Removing entries (by actually deduping) is fine and the test stays green. New entries here require explicit, reviewed updates.",
-    "generated_with": "python -c 'see tests/test_no_new_duplicate_routes.py'"
-  },
-  "duplicates": {
-    "DELETE /api/mesh/peers": [
-      "main",
-      "routers.mesh_operator",
-      "routers.mesh_public"
-    ],
-    "DELETE /api/wormhole/dm/contact/{peer_id}": [
-      "main",
-      "routers.wormhole"
-    ],
-    "DELETE /api/wormhole/dm/invite/handles/{handle}": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/cctv/media": [
-      "main",
-      "routers.cctv"
-    ],
-    "GET /api/debug-latest": [
-      "main",
-      "routers.health"
-    ],
-    "GET /api/geocode/reverse": [
-      "main",
-      "routers.tools"
-    ],
-    "GET /api/geocode/search": [
-      "main",
-      "routers.tools"
-    ],
-    "GET /api/health": [
-      "main",
-      "routers.health"
-    ],
-    "GET /api/live-data": [
-      "main",
-      "routers.data"
-    ],
-    "GET /api/live-data/fast": [
-      "main",
-      "routers.data"
-    ],
-    "GET /api/live-data/slow": [
-      "main",
-      "routers.data"
-    ],
-    "GET /api/mesh/channels": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/dm/count": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "GET /api/mesh/dm/poll": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "GET /api/mesh/dm/prekey-bundle": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "GET /api/mesh/dm/pubkey": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "GET /api/mesh/dm/witness": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "GET /api/mesh/gate/list": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/gate/{gate_id}": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/gate/{gate_id}/messages": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/event/{event_id}": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/events": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/locator": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/merkle": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/messages": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/messages/wait": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/node/{node_id}": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/status": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/infonet/sync": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/log": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/messages": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/metrics": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/oracle/consensus": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "GET /api/mesh/oracle/markets": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "GET /api/mesh/oracle/markets/more": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "GET /api/mesh/oracle/predictions": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "GET /api/mesh/oracle/profile": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "GET /api/mesh/oracle/search": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "GET /api/mesh/oracle/stakes/{message_id}": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "GET /api/mesh/peers": [
-      "main",
-      "routers.mesh_operator",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/reputation": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/reputation/all": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/reputation/batch": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/rns/status": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/signals": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/status": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "GET /api/mesh/trust/vouches": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "GET /api/oracle/region-intel": [
-      "main",
-      "routers.sigint"
-    ],
-    "GET /api/radio/nearest": [
-      "main",
-      "routers.radio"
-    ],
-    "GET /api/radio/nearest-list": [
-      "main",
-      "routers.radio"
-    ],
-    "GET /api/radio/openmhz/audio": [
-      "main",
-      "routers.radio"
-    ],
-    "GET /api/radio/openmhz/calls/{sys_name}": [
-      "main",
-      "routers.radio"
-    ],
-    "GET /api/radio/openmhz/systems": [
-      "main",
-      "routers.radio"
-    ],
-    "GET /api/radio/top": [
-      "main",
-      "routers.radio"
-    ],
-    "GET /api/refresh": [
-      "main",
-      "routers.data"
-    ],
-    "GET /api/region-dossier": [
-      "main",
-      "routers.tools"
-    ],
-    "GET /api/route/{callsign}": [
-      "main",
-      "routers.radio"
-    ],
-    "GET /api/sentinel2/search": [
-      "main",
-      "routers.tools"
-    ],
-    "GET /api/settings/api-keys": [
-      "main",
-      "routers.admin"
-    ],
-    "GET /api/settings/api-keys/meta": [
-      "main",
-      "routers.admin"
-    ],
-    "GET /api/settings/news-feeds": [
-      "main",
-      "routers.admin"
-    ],
-    "GET /api/settings/node": [
-      "main",
-      "routers.admin"
-    ],
-    "GET /api/settings/privacy-profile": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/settings/wormhole": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/settings/wormhole-status": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/sigint/nearest-sdr": [
-      "main",
-      "routers.sigint"
-    ],
-    "GET /api/thermal/verify": [
-      "main",
-      "routers.sigint"
-    ],
-    "GET /api/tools/shodan/status": [
-      "main",
-      "routers.tools"
-    ],
-    "GET /api/tools/uw/status": [
-      "main",
-      "routers.tools"
-    ],
-    "GET /api/wormhole/dm/contacts": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/dm/identity": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/dm/invite": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/dm/invite/handles": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/gate/{gate_id}/identity": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/gate/{gate_id}/key": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/gate/{gate_id}/personas": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/health": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/identity": [
-      "main",
-      "routers.wormhole"
-    ],
-    "GET /api/wormhole/status": [
-      "main",
-      "routers.wormhole"
-    ],
-    "PATCH /api/mesh/peers": [
-      "main",
-      "routers.mesh_operator",
-      "routers.mesh_public"
-    ],
-    "POST /api/ais/feed": [
-      "main",
-      "routers.data"
-    ],
-    "POST /api/layers": [
-      "main",
-      "routers.data"
-    ],
-    "POST /api/mesh/dm/block": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "POST /api/mesh/dm/count": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "POST /api/mesh/dm/poll": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "POST /api/mesh/dm/register": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "POST /api/mesh/dm/send": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "POST /api/mesh/dm/witness": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "POST /api/mesh/gate/create": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/gate/peer-pull": [
-      "main",
-      "routers.mesh_peer_sync"
-    ],
-    "POST /api/mesh/gate/peer-push": [
-      "main",
-      "routers.mesh_peer_sync"
-    ],
-    "POST /api/mesh/gate/{gate_id}/message": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/identity/revoke": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/identity/rotate": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/infonet/ingest": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/infonet/peer-push": [
-      "main",
-      "routers.mesh_peer_sync"
-    ],
-    "POST /api/mesh/infonet/sync": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/oracle/predict": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "POST /api/mesh/oracle/resolve": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "POST /api/mesh/oracle/resolve-stakes": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "POST /api/mesh/oracle/stake": [
-      "main",
-      "routers.mesh_oracle"
-    ],
-    "POST /api/mesh/peers": [
-      "main",
-      "routers.mesh_operator",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/report": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/send": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/mesh/trust/vouch": [
-      "main",
-      "routers.mesh_dm"
-    ],
-    "POST /api/mesh/vote": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "POST /api/sentinel/tile": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/sentinel/token": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/settings/news-feeds/reset": [
-      "main",
-      "routers.admin"
-    ],
-    "POST /api/sigint/transmit": [
-      "main",
-      "routers.sigint"
-    ],
-    "POST /api/system/update": [
-      "main",
-      "routers.admin"
-    ],
-    "POST /api/tools/shodan/count": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/tools/shodan/host": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/tools/shodan/search": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/tools/uw/congress": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/tools/uw/darkpool": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/tools/uw/flow": [
-      "main",
-      "routers.tools"
-    ],
-    "POST /api/viewport": [
-      "main",
-      "routers.data"
-    ],
-    "POST /api/wormhole/connect": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/disconnect": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/bootstrap-decrypt": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/bootstrap-encrypt": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/build-seal": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/compose": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/dead-drop-token": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/dead-drop-tokens": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/decrypt": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/encrypt": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/invite/import": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/open-seal": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/pairwise-alias": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/pairwise-alias/rotate": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/prekey/register": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/register-key": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/reset": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/sas": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/dm/sender-token": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/enter": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/key/grant": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/key/rotate": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/leave": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/message/compose": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/message/decrypt": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/message/post": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/message/post-encrypted": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/message/sign-encrypted": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/messages/decrypt": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/persona/activate": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/persona/clear": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/persona/create": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/persona/retire": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/proof": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/gate/state/export": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/identity/bootstrap": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/join": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/leave": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/restart": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/sign": [
-      "main",
-      "routers.wormhole"
-    ],
-    "POST /api/wormhole/sign-raw": [
-      "main",
-      "routers.wormhole"
-    ],
-    "PUT /api/mesh/gate/{gate_id}/envelope_policy": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "PUT /api/mesh/gate/{gate_id}/legacy_envelope_fallback": [
-      "main",
-      "routers.mesh_public"
-    ],
-    "PUT /api/settings/news-feeds": [
-      "main",
-      "routers.admin"
-    ],
-    "PUT /api/settings/node": [
-      "main",
-      "routers.admin"
-    ],
-    "PUT /api/settings/privacy-profile": [
-      "main",
-      "routers.wormhole"
-    ],
-    "PUT /api/settings/wormhole": [
-      "main",
-      "routers.wormhole"
-    ],
-    "PUT /api/wormhole/dm/contact": [
-      "main",
-      "routers.wormhole"
-    ]
-  }
-}

backend/tests/mesh/test_gate_write_cutover.py

@@ -87,28 +87,11 @@ def _run_gate_release_once(monkeypatch, *, transport_tier="private_strong"):
 def _patch_for_successful_post(monkeypatch, module):
     """Apply standard monkeypatches so a gate_message post succeeds."""
     import main
-    from services.mesh import mesh_hashchain
 
     _setup_gate_outbox(monkeypatch)
     monkeypatch.setattr(main, "_verify_gate_message_signed_write", lambda **kw: (True, "ok", kw.get("reply_to", "")))
     monkeypatch.setattr(main, "_resolve_envelope_policy", lambda _gate_id: "envelope_disabled")
 
-    def _fake_private_gate_append(**kwargs):
-        return {
-            "event_id": f"ledger-ev-{kwargs.get('sequence', 0)}",
-            "event_type": "gate_message",
-            "node_id": kwargs["node_id"],
-            "payload": dict(kwargs["payload"]),
-            "timestamp": kwargs.get("timestamp", 0) or 123.0,
-            "sequence": kwargs["sequence"],
-            "signature": kwargs["signature"],
-            "public_key": kwargs["public_key"],
-            "public_key_algo": kwargs["public_key_algo"],
-            "protocol_version": kwargs.get("protocol_version", "infonet/2"),
-        }
-
-    monkeypatch.setattr(mesh_hashchain.infonet, "append_private_gate_message", _fake_private_gate_append)
-
     from services.mesh.mesh_reputation import gate_manager, reputation_ledger
 
     monkeypatch.setattr(gate_manager, "can_enter", lambda *a, **kw: (True, "ok"))
@@ -272,30 +255,19 @@ def test_gate_post_preserves_gate_envelope_in_store(monkeypatch):
 
 
 def test_gate_post_advances_sequence(monkeypatch):
-    """append_private_gate_message must receive the gate sequence."""
+    """validate_and_set_sequence must be called to advance the counter."""
     import main
     from services.mesh import mesh_hashchain
 
     _patch_for_successful_post(monkeypatch, main)
 
-    append_calls = []
+    seq_calls = []
 
-    def track_private_append(**kwargs):
-        append_calls.append(kwargs)
-        return {
-            "event_id": "ev-seq",
-            "event_type": "gate_message",
-            "node_id": kwargs["node_id"],
-            "payload": dict(kwargs["payload"]),
-            "timestamp": kwargs.get("timestamp", 0) or 123.0,
-            "sequence": kwargs["sequence"],
-            "signature": kwargs["signature"],
-            "public_key": kwargs["public_key"],
-            "public_key_algo": kwargs["public_key_algo"],
-            "protocol_version": kwargs.get("protocol_version", "infonet/2"),
-        }
+    def track_seq(node_id, seq, *, domain=""):
+        seq_calls.append((node_id, seq, domain))
+        return (True, "ok")
 
-    monkeypatch.setattr(mesh_hashchain.infonet, "append_private_gate_message", track_private_append)
+    monkeypatch.setattr(mesh_hashchain.infonet, "validate_and_set_sequence", track_seq)
     monkeypatch.setattr(
         mesh_hashchain.gate_store,
         "append",
@@ -308,9 +280,8 @@ def test_gate_post_advances_sequence(monkeypatch):
 
     assert result["ok"] is True
     assert result["queued"] is True
-    assert len(append_calls) == 1
-    assert append_calls[0]["node_id"] == "!sb_test1234567890"
-    assert append_calls[0]["sequence"] == 42
+    assert len(seq_calls) == 1
+    assert seq_calls[0] == ("!sb_test1234567890", 42, "gate_message")
 
 
 def test_gate_post_rejects_replay_via_sequence(monkeypatch):
@@ -319,11 +290,11 @@ def test_gate_post_rejects_replay_via_sequence(monkeypatch):
     from services.mesh import mesh_hashchain
 
     _patch_for_successful_post(monkeypatch, main)
-
-    def reject_private_append(**_kwargs):
-        raise ValueError("Replay detected: sequence 1 <= last 1")
-
-    monkeypatch.setattr(mesh_hashchain.infonet, "append_private_gate_message", reject_private_append)
+    monkeypatch.setattr(
+        mesh_hashchain.infonet,
+        "validate_and_set_sequence",
+        lambda node_id, seq: (False, "Replay detected: sequence 1 <= last 1"),
+    )
 
     gate_id = "infonet"
     body = _build_gate_message_body(gate_id, sequence=1)

backend/tests/mesh/test_infonet_sync_429_backoff.py

@@ -1,261 +0,0 @@
-"""Infonet sync respects upstream HTTP 429 + applies exponential backoff.
-
-Background
-----------
-Before this fix, ``finish_sync`` used a constant 60s ``failure_backoff_s``
-regardless of how many consecutive failures preceded. When an upstream
-peer (e.g. the seed onion) returned HTTP 429 "Too Many Requests", the
-sync worker would:
-
-  1. Receive 429
-  2. Stringify the status into a generic ``ValueError``
-  3. Call ``finish_sync(error=str(exc))`` -- losing the status code
-  4. Schedule next attempt for ``now + 60s``
-  5. Retry. Upstream's rate-limit bucket is still full. 429 again. Loop.
-
-Net effect: a node with one transient 429 would hammer the upstream
-every 60s forever, keeping the bucket full and never recovering. This
-is what kept the user's Infonet node from reaching the seed peer.
-
-What the fix does
------------------
-* New typed exception ``PeerSyncRateLimited`` carries the parsed
-  ``Retry-After`` value out of the HTTP layer.
-* ``_sync_from_peer`` returns ``(ok, error, forked, retry_after_s)``
-  instead of the old 3-tuple.
-* ``finish_sync`` honors ``retry_after_s`` AND applies exponential
-  backoff: ``delay = max(retry_after_s, base * 2^failures, cap=1800)``.
-* ``parse_retry_after_header`` handles both RFC 7231 forms (delay
-  seconds, and HTTP-date).
-
-These tests pin every part of the new contract.
-"""
-
-from __future__ import annotations
-
-import time
-
-import pytest
-
-
-# ---------------------------------------------------------------------------
-# parse_retry_after_header — both RFC 7231 forms + edge cases
-# ---------------------------------------------------------------------------
-
-
-class TestParseRetryAfter:
-    def test_integer_seconds(self):
-        from services.mesh.mesh_infonet_sync_support import parse_retry_after_header
-        assert parse_retry_after_header("120") == 120
-        assert parse_retry_after_header("  30  ") == 30
-        assert parse_retry_after_header("0") == 0
-
-    def test_http_date(self):
-        """RFC 7231 §7.1.3 explicitly allows ``Retry-After: <HTTP-date>``.
-        We compute seconds-from-now so callers can use the same field
-        regardless of which form the upstream chose."""
-        from services.mesh.mesh_infonet_sync_support import parse_retry_after_header
-        # Pin "now" so the test is deterministic.
-        now = 1_700_000_000.0  # 2023-11-14T22:13:20Z
-        # 300 seconds in the future, formatted per RFC 7231.
-        future = "Tue, 14 Nov 2023 22:18:20 GMT"
-        result = parse_retry_after_header(future, now=now)
-        assert 295 <= result <= 305, f"expected ~300s, got {result}"
-
-    def test_http_date_in_past_returns_zero(self):
-        from services.mesh.mesh_infonet_sync_support import parse_retry_after_header
-        now = 1_700_000_000.0
-        past = "Mon, 13 Nov 2023 00:00:00 GMT"
-        assert parse_retry_after_header(past, now=now) == 0
-
-    def test_empty_and_whitespace_return_zero(self):
-        from services.mesh.mesh_infonet_sync_support import parse_retry_after_header
-        assert parse_retry_after_header("") == 0
-        assert parse_retry_after_header("   ") == 0
-
-    def test_malformed_returns_zero(self):
-        from services.mesh.mesh_infonet_sync_support import parse_retry_after_header
-        assert parse_retry_after_header("not a header") == 0
-        assert parse_retry_after_header("xyz") == 0
-
-    def test_clamps_to_one_hour(self):
-        """A hostile peer can't silence us for a week by claiming a
-        24h Retry-After. We cap at 1 hour."""
-        from services.mesh.mesh_infonet_sync_support import parse_retry_after_header
-        assert parse_retry_after_header("86400") == 3600  # 24h -> 1h
-        assert parse_retry_after_header("99999999") == 3600
-
-    def test_negative_returns_zero(self):
-        """RFC 7231 says ``Retry-After`` is a non-negative integer;
-        leading-minus parses as a non-digit and yields 0 here."""
-        from services.mesh.mesh_infonet_sync_support import parse_retry_after_header
-        assert parse_retry_after_header("-10") == 0
-
-
-# ---------------------------------------------------------------------------
-# _failure_backoff_seconds — exponential growth, retry-after override, cap
-# ---------------------------------------------------------------------------
-
-
-class TestFailureBackoffSeconds:
-    def test_exponential_growth(self):
-        """First failure uses the base (preserves pre-fix behavior
-        for one-off blips). Each subsequent failure doubles the wait,
-        capped at 1800s. With base=60: 60, 120, 240, 480, 960, 1800,
-        1800, 1800."""
-        from services.mesh.mesh_infonet_sync_support import _failure_backoff_seconds
-        delays = [
-            _failure_backoff_seconds(
-                base_backoff_s=60,
-                consecutive_failures=n,
-                retry_after_s=0,
-                cap_s=1800,
-            )
-            for n in range(1, 9)
-        ]
-        assert delays == [60, 120, 240, 480, 960, 1800, 1800, 1800], delays
-
-    def test_retry_after_wins_when_larger(self):
-        """If the upstream says ``Retry-After: 600`` but exponential
-        would only ask for 60s (one failure), we honor the upstream."""
-        from services.mesh.mesh_infonet_sync_support import _failure_backoff_seconds
-        assert _failure_backoff_seconds(
-            base_backoff_s=60,
-            consecutive_failures=1,
-            retry_after_s=600,
-            cap_s=1800,
-        ) == 600
-
-    def test_exponential_wins_when_larger(self):
-        """If exponential is asking for 1800s (6+ failures) but
-        upstream only sent ``Retry-After: 30``, we honor exponential.
-        The 30s was the upstream's view at one moment; our exponential
-        reflects sustained failure."""
-        from services.mesh.mesh_infonet_sync_support import _failure_backoff_seconds
-        result = _failure_backoff_seconds(
-            base_backoff_s=60,
-            consecutive_failures=7,
-            retry_after_s=30,
-            cap_s=1800,
-        )
-        assert result == 1800
-
-    def test_cap_zero_disables_exponential(self):
-        """Operators who want pre-fix behavior can set cap=0; only the
-        upstream's Retry-After is respected. (Pre-fix had no
-        exponential growth at all.)"""
-        from services.mesh.mesh_infonet_sync_support import _failure_backoff_seconds
-        assert _failure_backoff_seconds(
-            base_backoff_s=60,
-            consecutive_failures=10,
-            retry_after_s=120,
-            cap_s=0,
-        ) == 120
-
-    def test_zero_inputs_return_zero(self):
-        from services.mesh.mesh_infonet_sync_support import _failure_backoff_seconds
-        assert _failure_backoff_seconds(
-            base_backoff_s=0,
-            consecutive_failures=0,
-            retry_after_s=0,
-        ) == 0
-
-
-# ---------------------------------------------------------------------------
-# finish_sync end-to-end — failure path with retry-after + growing counter
-# ---------------------------------------------------------------------------
-
-
-class TestFinishSyncBackoff:
-    def _state(self, **overrides):
-        from services.mesh.mesh_infonet_sync_support import SyncWorkerState
-        base = {
-            "last_sync_started_at": 0,
-            "last_sync_finished_at": 0,
-            "last_sync_ok_at": 0,
-            "next_sync_due_at": 0,
-            "last_peer_url": "",
-            "last_error": "",
-            "last_outcome": "idle",
-            "current_head": "",
-            "fork_detected": False,
-            "consecutive_failures": 0,
-        }
-        base.update(overrides)
-        return SyncWorkerState(**base)
-
-    def test_first_failure_uses_base_unchanged(self):
-        """One failure means consecutive_failures becomes 1, which uses
-        ``base * 2^0 = base``. Preserves the pre-fix behavior so a
-        single transient upstream blip doesn't suddenly take 2 minutes
-        to retry — that change has to be earned by sustained failure."""
-        from services.mesh.mesh_infonet_sync_support import finish_sync
-        result = finish_sync(
-            self._state(),
-            ok=False,
-            error="some upstream blip",
-            now=1000.0,
-            failure_backoff_s=60,
-        )
-        assert result.consecutive_failures == 1
-        assert result.next_sync_due_at == 1000 + 60
-        assert result.last_error == "some upstream blip"
-        assert result.last_outcome == "error"
-
-    def test_consecutive_failures_grow_the_delay(self):
-        """After 5 prior failures already in state, the next failure
-        sets consecutive=6 and uses the cap (1800s = 60 * 2^5)."""
-        from services.mesh.mesh_infonet_sync_support import finish_sync
-        result = finish_sync(
-            self._state(consecutive_failures=5),
-            ok=False,
-            error="HTTP 429",
-            now=2000.0,
-            failure_backoff_s=60,
-        )
-        assert result.consecutive_failures == 6
-        assert result.next_sync_due_at == 2000 + 1800
-
-    def test_retry_after_honored_at_low_failure_count(self):
-        """When the upstream says ``Retry-After: 900`` but we'd
-        otherwise only wait 240s (4 failures = 60*2^3), wait 900s."""
-        from services.mesh.mesh_infonet_sync_support import finish_sync
-        result = finish_sync(
-            self._state(consecutive_failures=3),
-            ok=False,
-            error="HTTP 429",
-            now=5000.0,
-            failure_backoff_s=60,
-            retry_after_s=900,
-        )
-        assert result.consecutive_failures == 4
-        assert result.next_sync_due_at == 5000 + 900
-
-    def test_success_resets_consecutive_failures(self):
-        from services.mesh.mesh_infonet_sync_support import finish_sync
-        result = finish_sync(
-            self._state(consecutive_failures=4),
-            ok=True,
-            now=7000.0,
-            interval_s=300,
-        )
-        assert result.consecutive_failures == 0
-        assert result.next_sync_due_at == 7000 + 300
-        assert result.last_outcome == "ok"
-
-    def test_last_error_carries_status_string(self):
-        """The pre-fix path stringified exceptions into ``last_error``
-        but the string was often empty (HTTP layer raised ValueError
-        with no message). We now require callers to pass something
-        meaningful — see the typed exception path in main.py."""
-        from services.mesh.mesh_infonet_sync_support import finish_sync
-        result = finish_sync(
-            self._state(),
-            ok=False,
-            error="HTTP 429 from peer (retry_after=120s): rate-limited",
-            now=1000.0,
-            failure_backoff_s=60,
-            retry_after_s=120,
-        )
-        assert "HTTP 429" in result.last_error
-        assert "retry_after=120s" in result.last_error

backend/tests/mesh/test_mesh_infonet_sync_support.py

@@ -117,11 +117,3 @@ def test_finish_solo_sync_marks_first_node_ready_without_peer_failure():
     assert finished.next_sync_due_at == 500
     assert should_run_sync(finished, now=499) is False
     assert should_run_sync(finished, now=500) is True
-
-
-def test_should_run_sync_recovers_stale_running_state():
-    fresh = SyncWorkerState(last_sync_started_at=100, last_outcome="running")
-    stale = SyncWorkerState(last_sync_started_at=100, last_outcome="running")
-
-    assert should_run_sync(fresh, now=399) is False
-    assert should_run_sync(stale, now=400) is True

backend/tests/mesh/test_mesh_node_bootstrap_runtime.py

@@ -8,53 +8,6 @@ from cryptography.hazmat.primitives.asymmetric import ed25519
 from httpx import ASGITransport, AsyncClient
 
 
-def test_onion_peer_requests_use_arti_socks_proxy(monkeypatch):
-    import main
-    from services import wormhole_supervisor
-
-    monkeypatch.setattr(main, "_infonet_private_transport_required", lambda: True)
-    monkeypatch.setattr(
-        main,
-        "get_settings",
-        lambda: SimpleNamespace(MESH_ARTI_ENABLED=True, MESH_ARTI_SOCKS_PORT=19050),
-    )
-    monkeypatch.setattr(wormhole_supervisor, "_check_arti_ready", lambda: True)
-
-    proxies = main._infonet_peer_requests_proxies("http://exampleabcd.onion:8000")
-
-    assert proxies == {
-        "http": "socks5h://127.0.0.1:19050",
-        "https": "socks5h://127.0.0.1:19050",
-    }
-
-
-def test_private_peer_requests_reject_clearnet(monkeypatch):
-    import main
-
-    monkeypatch.setattr(main, "_infonet_private_transport_required", lambda: True)
-
-    try:
-        main._infonet_peer_requests_proxies("https://seed.example")
-    except RuntimeError as exc:
-        assert "private Infonet requires onion/RNS transport" in str(exc)
-    else:
-        raise AssertionError("clearnet peer was allowed while private transport is required")
-
-
-def test_local_peer_url_prefers_configured_public_peer_url(monkeypatch):
-    import main
-
-    monkeypatch.setattr(
-        main,
-        "get_settings",
-        lambda: SimpleNamespace(
-            MESH_PUBLIC_PEER_URL="HTTP://LOCALPEEREXAMPLE.onion:8000/",
-        ),
-    )
-
-    assert main._local_infonet_peer_url() == "http://localpeerexample.onion:8000"
-
-
 def _write_signed_manifest(path, *, private_key):
     from services.mesh.mesh_bootstrap_manifest import BOOTSTRAP_MANIFEST_VERSION
     from services.mesh.mesh_crypto import canonical_json
@@ -189,134 +142,6 @@ def test_refresh_node_peer_store_suppresses_clearnet_seed_by_default(tmp_path, m
     assert store.records_for_bucket("sync") == []
 
 
-def test_refresh_node_peer_store_prunes_persisted_clearnet_records_in_private_mode(tmp_path, monkeypatch):
-    import main
-    from services.config import get_settings
-    from services.mesh import mesh_peer_store as peer_store_mod
-
-    peer_store_path = tmp_path / "peer_store.json"
-    monkeypatch.setattr(peer_store_mod, "DEFAULT_PEER_STORE_PATH", peer_store_path)
-    store = peer_store_mod.PeerStore(peer_store_path)
-    store.upsert(
-        peer_store_mod.make_bootstrap_peer_record(
-            peer_url="https://node.shadowbroker.info",
-            transport="clearnet",
-            role="seed",
-            signer_id="shadowbroker-default",
-            now=1_749_999_900,
-        )
-    )
-    store.upsert(
-        peer_store_mod.make_sync_peer_record(
-            peer_url="https://node.shadowbroker.info",
-            transport="clearnet",
-            role="seed",
-            source="bundle",
-            now=1_749_999_900,
-        )
-    )
-    store.upsert(
-        peer_store_mod.make_push_peer_record(
-            peer_url="https://node.shadowbroker.info",
-            transport="clearnet",
-            role="relay",
-            now=1_749_999_900,
-        )
-    )
-    store.save()
-
-    onion_seed = "http://gqpbunqbgtkcqilvclm3xrkt3zowjyl3s62kkktvojgvxzizamvbrqid.onion:8000"
-    monkeypatch.setenv("MESH_RELAY_PEERS", "")
-    monkeypatch.setenv("MESH_BOOTSTRAP_SEED_PEERS", onion_seed)
-    monkeypatch.setenv("MESH_DEFAULT_SYNC_PEERS", "")
-    monkeypatch.delenv("MESH_INFONET_ALLOW_CLEARNET_SYNC", raising=False)
-    monkeypatch.setenv("MESH_BOOTSTRAP_SIGNER_PUBLIC_KEY", "")
-    get_settings.cache_clear()
-
-    try:
-        snapshot = main._refresh_node_peer_store(now=1_750_000_000)
-        store = peer_store_mod.PeerStore(peer_store_path)
-        store.load()
-    finally:
-        get_settings.cache_clear()
-
-    assert snapshot["private_transport_required"] is True
-    assert snapshot["pruned_clearnet_peer_count"] == 3
-    assert [record.peer_url for record in store.records()] == [onion_seed, onion_seed]
-    assert {record.bucket for record in store.records()} == {"bootstrap", "sync"}
-    assert all(record.transport == "onion" for record in store.records())
-
-
-def test_infonet_peer_url_filter_excludes_clearnet_in_private_mode(monkeypatch):
-    import main
-    from services.config import get_settings
-
-    monkeypatch.delenv("MESH_INFONET_ALLOW_CLEARNET_SYNC", raising=False)
-    get_settings.cache_clear()
-
-    try:
-        assert main._filter_infonet_peer_urls(
-            [
-                "https://node.shadowbroker.info",
-                "http://gqpbunqbgtkcqilvclm3xrkt3zowjyl3s62kkktvojgvxzizamvbrqid.onion:8000",
-            ]
-        ) == ["http://gqpbunqbgtkcqilvclm3xrkt3zowjyl3s62kkktvojgvxzizamvbrqid.onion:8000"]
-    finally:
-        get_settings.cache_clear()
-
-
-def test_public_sync_cycle_backs_off_on_429_retry_after(tmp_path, monkeypatch):
-    import time
-
-    import main
-    from services.config import get_settings
-    from services.mesh import mesh_peer_store as peer_store_mod
-
-    peer_store_path = tmp_path / "peer_store.json"
-    monkeypatch.setattr(peer_store_mod, "DEFAULT_PEER_STORE_PATH", peer_store_path)
-    onion_seed = "http://gqpbunqbgtkcqilvclm3xrkt3zowjyl3s62kkktvojgvxzizamvbrqid.onion:8000"
-    store = peer_store_mod.PeerStore(peer_store_path)
-    store.upsert(
-        peer_store_mod.make_sync_peer_record(
-            peer_url=onion_seed,
-            transport="onion",
-            role="seed",
-            source="bundle",
-            now=1_750_000_000,
-        )
-    )
-    store.save()
-
-    monkeypatch.delenv("MESH_INFONET_ALLOW_CLEARNET_SYNC", raising=False)
-    monkeypatch.setenv("MESH_SYNC_FAILURE_BACKOFF_S", "60")
-    monkeypatch.setenv("MESH_BOOTSTRAP_SEED_FAILURE_COOLDOWN_S", "15")
-    get_settings.cache_clear()
-    monkeypatch.setattr(main, "_participant_node_enabled", lambda: True)
-    monkeypatch.setattr(main, "_ensure_infonet_private_transport_ready", lambda reason="": True)
-    monkeypatch.setattr(
-        main,
-        "_sync_from_peer",
-        lambda peer_url: (_ for _ in ()).throw(
-            main.PeerSyncHTTPError(429, "rate limited", retry_after_s=180)
-        ),
-    )
-    main.set_sync_state(main.SyncWorkerState())
-
-    try:
-        before = int(time.time())
-        state = main._run_public_sync_cycle()
-        store = peer_store_mod.PeerStore(peer_store_path)
-        store.load()
-    finally:
-        get_settings.cache_clear()
-        main.set_sync_state(main.SyncWorkerState())
-
-    record = store.records_for_bucket("sync")[0]
-    assert state.last_error == "HTTP 429: rate limited"
-    assert state.next_sync_due_at >= before + 180
-    assert record.cooldown_until >= before + 180
-
-
 def test_verify_peer_push_hmac_requires_allowlisted_peer(monkeypatch):
     import hashlib
     import hmac
@@ -400,29 +225,3 @@ def test_public_sync_cycle_allows_first_node_without_peers(tmp_path, monkeypatch
     assert result.last_error == ""
     assert result.last_peer_url == ""
     assert result.consecutive_failures == 0
-
-
-def test_headless_mesh_node_runtime_is_explicit(monkeypatch):
-    import main
-
-    monkeypatch.setattr(main, "_MESH_ONLY", True)
-    monkeypatch.setattr(main, "_HEADLESS_MESH_NODE_RUNTIME", False)
-    assert main._infonet_node_runtime_requested() is False
-
-    monkeypatch.setattr(main, "_HEADLESS_MESH_NODE_RUNTIME", True)
-    assert main._infonet_node_runtime_requested() is True
-
-
-def test_meshnode_scripts_enable_private_hashchain_runtime():
-    from pathlib import Path
-
-    root = Path(__file__).resolve().parents[3]
-    bat = (root / "meshnode.bat").read_text(encoding="utf-8")
-    sh = (root / "meshnode.sh").read_text(encoding="utf-8")
-
-    for script in (bat, sh):
-        assert "SHADOWBROKER_MESH_NODE_RUNTIME=true" in script
-        assert "MESH_INFONET_ALLOW_CLEARNET_SYNC=false" in script
-        assert "MESH_ARTI_ENABLED=true" in script
-        assert "MESH_DM_HASHCHAIN_SPOOL_LIMIT=2" in script
-        assert "gqpbunqbgtkcqilvclm3xrkt3zowjyl3s62kkktvojgvxzizamvbrqid.onion:8000" in script

backend/tests/mesh/test_private_dm_hashchain.py

@@ -1,213 +0,0 @@
-import base64
-import time
-
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric import ed25519
-
-from services.config import get_settings
-from services.mesh import mesh_crypto, mesh_dm_relay, mesh_hashchain, mesh_protocol, mesh_secure_storage
-
-
-def _keypair():
-    private_key = ed25519.Ed25519PrivateKey.generate()
-    public_raw = private_key.public_key().public_bytes(
-        encoding=serialization.Encoding.Raw,
-        format=serialization.PublicFormat.Raw,
-    )
-    public_key = base64.b64encode(public_raw).decode("utf-8")
-    node_id = mesh_crypto.derive_node_id(public_key)
-    return private_key, public_key, node_id
-
-
-def _payload(recipient_id: str = "recipient-a", msg_id: str = "dm-1") -> dict:
-    return mesh_protocol.normalize_payload(
-        "dm_message",
-        {
-            "recipient_id": recipient_id,
-            "delivery_class": "request",
-            "recipient_token": "",
-            "ciphertext": base64.b64encode(f"cipher-{msg_id}".encode("utf-8")).decode("ascii"),
-            "msg_id": msg_id,
-            "timestamp": int(time.time()),
-            "format": "mls1",
-            "transport_lock": "private_strong",
-        },
-    )
-
-
-def _signature(private_key, node_id: str, sequence: int, payload: dict) -> str:
-    signature_payload = mesh_crypto.build_signature_payload(
-        event_type="dm_message",
-        node_id=node_id,
-        sequence=sequence,
-        payload=payload,
-    )
-    return private_key.sign(signature_payload.encode("utf-8")).hex()
-
-
-def _fresh_infonet(tmp_path, monkeypatch) -> mesh_hashchain.Infonet:
-    monkeypatch.setattr(mesh_hashchain, "DATA_DIR", tmp_path)
-    monkeypatch.setattr(mesh_hashchain, "CHAIN_FILE", tmp_path / "infonet.json")
-    monkeypatch.setattr(mesh_hashchain, "WAL_FILE", tmp_path / "infonet.wal")
-    return mesh_hashchain.Infonet()
-
-
-def _fresh_relay(tmp_path, monkeypatch) -> mesh_dm_relay.DMRelay:
-    monkeypatch.setattr(mesh_dm_relay, "DATA_DIR", tmp_path)
-    monkeypatch.setattr(mesh_dm_relay, "RELAY_FILE", tmp_path / "dm_relay.json")
-    monkeypatch.setattr(mesh_secure_storage, "DATA_DIR", tmp_path)
-    monkeypatch.setattr(mesh_secure_storage, "MASTER_KEY_FILE", tmp_path / "wormhole_secure_store.key")
-    get_settings.cache_clear()
-    return mesh_dm_relay.DMRelay()
-
-
-def test_private_dm_hashchain_spools_two_ciphertexts_per_recipient_from_distinct_senders(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    senders = [_keypair(), _keypair()]
-
-    for idx, (private_key, public_key, node_id) in enumerate(senders, start=1):
-        payload = _payload(msg_id=f"dm-{idx}")
-        event = inf.append_private_dm_message(
-            node_id=node_id,
-            payload=payload,
-            signature=_signature(private_key, node_id, 1, payload),
-            sequence=1,
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-            timestamp=float(payload["timestamp"]),
-        )
-        assert event["event_type"] == "dm_message"
-
-    private_key, public_key, node_id = _keypair()
-    third = _payload(msg_id="dm-3")
-    try:
-        inf.append_private_dm_message(
-            node_id=node_id,
-            payload=third,
-            signature=_signature(private_key, node_id, 1, third),
-            sequence=1,
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-            timestamp=float(third["timestamp"]),
-        )
-    except ValueError as exc:
-        assert "spool full" in str(exc)
-    else:
-        raise AssertionError("third DM spool event was accepted")
-
-    for _private_key, _public_key, sender_node_id in senders:
-        assert inf.sequence_domains[f"{sender_node_id}|dm_message"] == 1
-    assert inf.validate_chain(verify_signatures=True)[0] is True
-
-
-def test_private_dm_hashchain_limits_one_active_spool_per_sender_recipient_pair(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-
-    first = _payload(msg_id="dm-1")
-    inf.append_private_dm_message(
-        node_id=node_id,
-        payload=first,
-        signature=_signature(private_key, node_id, 1, first),
-        sequence=1,
-        public_key=public_key,
-        public_key_algo="Ed25519",
-        protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        timestamp=float(first["timestamp"]),
-    )
-
-    second = _payload(msg_id="dm-2")
-    try:
-        inf.append_private_dm_message(
-            node_id=node_id,
-            payload=second,
-            signature=_signature(private_key, node_id, 2, second),
-            sequence=2,
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-            timestamp=float(second["timestamp"]),
-        )
-    except ValueError as exc:
-        assert "sender spool full" in str(exc)
-    else:
-        raise AssertionError("second DM from same sender to same recipient was accepted")
-
-
-def test_private_dm_hashchain_rejects_plaintext(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-    payload = _payload()
-    payload["message"] = "plaintext"
-
-    try:
-        inf.append_private_dm_message(
-            node_id=node_id,
-            payload=payload,
-            signature=_signature(private_key, node_id, 1, _payload()),
-            sequence=1,
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        )
-    except ValueError as exc:
-        assert "plaintext" in str(exc)
-    else:
-        raise AssertionError("private DM append accepted plaintext")
-
-
-def test_private_dm_hashchain_rejects_non_sealed_ciphertext_shape(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-    payload = _payload()
-    payload["ciphertext"] = "not sealed plaintext"
-
-    try:
-        inf.append_private_dm_message(
-            node_id=node_id,
-            payload=payload,
-            signature=_signature(private_key, node_id, 1, payload),
-            sequence=1,
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        )
-    except ValueError as exc:
-        assert "sealed bytes" in str(exc)
-    else:
-        raise AssertionError("private DM append accepted non-base64 ciphertext")
-
-
-def test_hydrate_dm_relay_from_chain_delivers_to_poll_claim(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path / "chain", monkeypatch)
-    relay = _fresh_relay(tmp_path / "relay", monkeypatch)
-    monkeypatch.setattr(mesh_hashchain, "infonet", inf)
-    monkeypatch.setattr(mesh_dm_relay, "dm_relay", relay)
-
-    private_key, public_key, node_id = _keypair()
-    payload = _payload(recipient_id="recipient-a", msg_id="dm-chain-1")
-    event = inf.append_private_dm_message(
-        node_id=node_id,
-        payload=payload,
-        signature=_signature(private_key, node_id, 1, payload),
-        sequence=1,
-        public_key=public_key,
-        public_key_algo="Ed25519",
-        protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        timestamp=float(payload["timestamp"]),
-    )
-
-    from main import _hydrate_dm_relay_from_chain
-
-    assert _hydrate_dm_relay_from_chain([event]) == 1
-    messages, more = relay.collect_claims(
-        "recipient-a",
-        [{"type": "requests", "token": "recipient-request-token"}],
-        limit=8,
-    )
-
-    assert more is False
-    assert [message["msg_id"] for message in messages] == ["dm-chain-1"]
-    assert messages[0]["ciphertext"] == payload["ciphertext"]

backend/tests/mesh/test_private_gate_hashchain.py

@@ -1,269 +0,0 @@
-import base64
-
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric import ed25519
-
-from services.mesh import mesh_crypto, mesh_hashchain, mesh_protocol
-
-
-def _keypair():
-    private_key = ed25519.Ed25519PrivateKey.generate()
-    public_raw = private_key.public_key().public_bytes(
-        encoding=serialization.Encoding.Raw,
-        format=serialization.PublicFormat.Raw,
-    )
-    public_key = base64.b64encode(public_raw).decode("utf-8")
-    node_id = mesh_crypto.derive_node_id(public_key)
-    return private_key, public_key, node_id
-
-
-def _sign(private_key, *, event_type: str, node_id: str, sequence: int, payload: dict) -> str:
-    signature_payload = mesh_crypto.build_signature_payload(
-        event_type=event_type,
-        node_id=node_id,
-        sequence=sequence,
-        payload=payload,
-    )
-    return private_key.sign(signature_payload.encode("utf-8")).hex()
-
-
-def _message_payload(text: str) -> dict:
-    return mesh_protocol.normalize_payload(
-        "message",
-        {
-            "message": text,
-            "destination": "broadcast",
-            "channel": "LongFast",
-            "priority": "normal",
-            "ephemeral": False,
-        },
-    )
-
-
-def _gate_payload(gate_id: str = "ops-gate", *, epoch: int = 2, plaintext: bool = False) -> dict:
-    payload = {
-        "gate": gate_id,
-        "ciphertext": base64.b64encode(b"encrypted-gate-ciphertext").decode("ascii"),
-        "nonce": base64.b64encode(b"nonce-value-1234").decode("ascii"),
-        "sender_ref": "sender-ref-1",
-        "format": "mls1",
-        "transport_lock": "private_strong",
-    }
-    if epoch > 0:
-        payload["epoch"] = epoch
-    if plaintext:
-        payload["message"] = "this must never land on the chain"
-    return mesh_protocol.normalize_payload("gate_message", payload) if not plaintext else payload
-
-
-def _gate_event(
-    private_key,
-    public_key: str,
-    node_id: str,
-    *,
-    sequence: int,
-    prev_hash: str,
-    payload: dict,
-    signature_payload: dict | None = None,
-) -> dict:
-    signature = _sign(
-        private_key,
-        event_type="gate_message",
-        node_id=node_id,
-        sequence=sequence,
-        payload=signature_payload or payload,
-    )
-    return mesh_hashchain.ChainEvent(
-        prev_hash=prev_hash,
-        event_type="gate_message",
-        node_id=node_id,
-        payload=payload,
-        timestamp=1234.0 + sequence,
-        sequence=sequence,
-        signature=signature,
-        public_key=public_key,
-        public_key_algo="Ed25519",
-        protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        network_id=mesh_protocol.NETWORK_ID,
-    ).to_dict()
-
-
-def _fresh_infonet(tmp_path, monkeypatch) -> mesh_hashchain.Infonet:
-    monkeypatch.setattr(mesh_hashchain, "DATA_DIR", tmp_path)
-    monkeypatch.setattr(mesh_hashchain, "CHAIN_FILE", tmp_path / "infonet.json")
-    monkeypatch.setattr(mesh_hashchain, "WAL_FILE", tmp_path / "infonet.wal")
-    return mesh_hashchain.Infonet()
-
-
-def test_private_gate_fork_uses_gate_sequence_domain_and_signature_variants(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-
-    public_payload = _message_payload("public prefix")
-    public_event = inf.append(
-        event_type="message",
-        node_id=node_id,
-        payload=public_payload,
-        sequence=1,
-        signature=_sign(
-            private_key,
-            event_type="message",
-            node_id=node_id,
-            sequence=1,
-            payload=public_payload,
-        ),
-        public_key=public_key,
-        public_key_algo="Ed25519",
-        protocol_version=mesh_protocol.PROTOCOL_VERSION,
-    )
-
-    gate_payload = _gate_payload(epoch=3)
-    signature_payload = dict(gate_payload)
-    signature_payload.pop("epoch", None)
-    gate_event = _gate_event(
-        private_key,
-        public_key,
-        node_id,
-        sequence=1,
-        prev_hash=public_event["event_id"],
-        payload=gate_payload,
-        signature_payload=signature_payload,
-    )
-
-    ok, reason = inf.apply_fork([gate_event], gate_event["event_id"], proof_count=2, quorum=2)
-
-    assert ok is True, reason
-    assert inf.events[-1]["event_type"] == "gate_message"
-    assert inf.node_sequences[node_id] == 1
-    assert inf.sequence_domains[f"{node_id}|gate_message"] == 1
-    assert inf.validate_chain(verify_signatures=True)[0] is True
-
-
-def test_private_gate_fork_rejects_plaintext_payload(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-
-    public_payload = _message_payload("public prefix")
-    public_event = inf.append(
-        event_type="message",
-        node_id=node_id,
-        payload=public_payload,
-        sequence=1,
-        signature=_sign(
-            private_key,
-            event_type="message",
-            node_id=node_id,
-            sequence=1,
-            payload=public_payload,
-        ),
-        public_key=public_key,
-        public_key_algo="Ed25519",
-        protocol_version=mesh_protocol.PROTOCOL_VERSION,
-    )
-
-    plaintext_payload = _gate_payload(plaintext=True)
-    gate_event = _gate_event(
-        private_key,
-        public_key,
-        node_id,
-        sequence=1,
-        prev_hash=public_event["event_id"],
-        payload=plaintext_payload,
-    )
-
-    ok, reason = inf.apply_fork([gate_event], gate_event["event_id"], proof_count=2, quorum=2)
-
-    assert ok is False
-    assert "normalized" in reason or "plaintext" in reason
-    assert len(inf.events) == 1
-    assert "gate_message" not in inf.get_info()["event_types"]
-
-
-def test_append_private_gate_message_rejects_plaintext_before_normalizing(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-    payload = _gate_payload()
-    payload["message"] = "plaintext should not be silently dropped"
-
-    try:
-        inf.append_private_gate_message(
-            node_id=node_id,
-            payload=payload,
-            sequence=1,
-            signature=_sign(
-                private_key,
-                event_type="gate_message",
-                node_id=node_id,
-                sequence=1,
-                payload=_gate_payload(),
-            ),
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        )
-    except ValueError as exc:
-        assert "plaintext" in str(exc)
-    else:
-        raise AssertionError("private gate append accepted plaintext")
-
-    assert inf.events == []
-
-
-def test_append_private_gate_message_requires_private_strong_transport_lock(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-    payload = _gate_payload()
-    payload.pop("transport_lock", None)
-
-    try:
-        inf.append_private_gate_message(
-            node_id=node_id,
-            payload=payload,
-            sequence=1,
-            signature=_sign(
-                private_key,
-                event_type="gate_message",
-                node_id=node_id,
-                sequence=1,
-                payload=_gate_payload(),
-            ),
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        )
-    except ValueError as exc:
-        assert "private_strong" in str(exc)
-    else:
-        raise AssertionError("private gate append accepted missing transport_lock")
-
-    assert inf.events == []
-
-
-def test_append_private_gate_message_rejects_non_sealed_ciphertext_shape(tmp_path, monkeypatch):
-    inf = _fresh_infonet(tmp_path, monkeypatch)
-    private_key, public_key, node_id = _keypair()
-    payload = _gate_payload()
-    payload["ciphertext"] = "not sealed plaintext"
-
-    try:
-        inf.append_private_gate_message(
-            node_id=node_id,
-            payload=payload,
-            sequence=1,
-            signature=_sign(
-                private_key,
-                event_type="gate_message",
-                node_id=node_id,
-                sequence=1,
-                payload=payload,
-            ),
-            public_key=public_key,
-            public_key_algo="Ed25519",
-            protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        )
-    except ValueError as exc:
-        assert "sealed bytes" in str(exc)
-    else:
-        raise AssertionError("private gate append accepted non-base64 ciphertext")
-
-    assert inf.events == []

backend/tests/mesh/test_s14b_public_sync_gate_filter.py

@@ -1,12 +1,14 @@
-"""S14B private sync gate event policy.
+"""S14B Public Sync Gate Event Filter.
 
-Private Infonet sync carries encrypted gate_message ledger events. If a node
-is configured to allow clearnet-compatible sync, those gate events are filtered
-out of the sync response.
+Tests:
+- GET /api/mesh/infonet/sync excludes gate_message when local infonet contains legacy gate_message plus public events
+- POST /api/mesh/infonet/sync excludes gate_message under the same condition
+- Both main app and router-served paths are covered
+- Non-gate public redactions still hold (vote gate label stripped, key_rotate identity stripped)
+- Do not overclaim that gate_message is removed from historical infonet storage or ingest
 """
 
 import asyncio
-import base64
 import json
 
 from starlette.requests import Request
@@ -15,6 +17,9 @@ import main
 from services.mesh import mesh_hashchain
 
 
+# ── Helpers ──────────────────────────────────────────────────────────────
+
+
 def _message_event() -> dict:
     return {
         "event_id": "msg-1",
@@ -78,7 +83,6 @@ def _gate_message_event() -> dict:
             "nonce": "nonce-1",
             "sender_ref": "sender-ref-1",
             "format": "mls1",
-            "transport_lock": "private_strong",
         },
         "timestamp": 103.0,
         "sequence": 4,
@@ -89,31 +93,9 @@ def _gate_message_event() -> dict:
     }
 
 
-def _dm_message_event() -> dict:
-    return {
-        "event_id": "dm-1",
-        "event_type": "dm_message",
-        "node_id": "!node-5",
-        "payload": {
-            "recipient_id": "recipient-a",
-            "delivery_class": "request",
-            "recipient_token": "",
-            "ciphertext": base64.b64encode(b"sealed-dm-ciphertext").decode("ascii"),
-            "msg_id": "dm-1",
-            "timestamp": 104,
-            "format": "mls1",
-            "transport_lock": "private_strong",
-        },
-        "timestamp": 104.0,
-        "sequence": 5,
-        "signature": "sig",
-        "public_key": "pub",
-        "public_key_algo": "Ed25519",
-        "protocol_version": "infonet/2",
-    }
-
-
 class _FakeInfonet:
+    """Minimal fake infonet with a gate_message among public events."""
+
     def __init__(self):
         self.head_hash = "head-1"
         self.events = [
@@ -131,10 +113,12 @@ class _FakeInfonet:
             return int(getattr(limit, "default", 100) or 100)
 
     def get_events_after(self, after_hash: str, limit=100):
-        return [dict(e) for e in self.events[: self._limit_value(limit)]]
+        resolved = self._limit_value(limit)
+        return [dict(e) for e in self.events[:resolved]]
 
     def get_events_after_locator(self, locator: list[str], limit=100):
-        return self.head_hash, 0, [dict(e) for e in self.events[: self._limit_value(limit)]]
+        resolved = self._limit_value(limit)
+        return self.head_hash, 0, [dict(e) for e in self.events[:resolved]]
 
     def get_merkle_proofs(self, start_index: int, count: int):
         return {"root": "merkle-root", "total": len(self.events), "start": start_index, "proofs": []}
@@ -143,7 +127,7 @@ class _FakeInfonet:
         return "merkle-root"
 
 
-def _json_request(path: str, body: dict, *, client_host: str = "127.0.0.1", headers: dict[str, str] | None = None) -> Request:
+def _json_request(path: str, body: dict) -> Request:
     payload = json.dumps(body).encode("utf-8")
     sent = {"value": False}
 
@@ -153,14 +137,11 @@ def _json_request(path: str, body: dict, *, client_host: str = "127.0.0.1", head
         sent["value"] = True
         return {"type": "http.request", "body": payload, "more_body": False}
 
-    raw_headers = [(b"content-type", b"application/json")]
-    for key, value in dict(headers or {}).items():
-        raw_headers.append((key.lower().encode("ascii"), str(value).encode("ascii")))
     return Request(
         {
             "type": "http",
-            "headers": raw_headers,
-            "client": (client_host, 12345),
+            "headers": [(b"content-type", b"application/json")],
+            "client": ("test", 12345),
             "method": "POST",
             "path": path,
         },
@@ -168,15 +149,20 @@ def _json_request(path: str, body: dict, *, client_host: str = "127.0.0.1", head
     )
 
 
-def _get_request(path: str, *, client_host: str = "127.0.0.1", headers: dict[str, str] | None = None) -> Request:
+def _get_request(path: str) -> Request:
+    sent = {"value": False}
+
     async def receive():
+        if sent["value"]:
+            return {"type": "http.request", "body": b"", "more_body": False}
+        sent["value"] = True
         return {"type": "http.request", "body": b"", "more_body": False}
 
     return Request(
         {
             "type": "http",
-            "headers": [(key.lower().encode("ascii"), str(value).encode("ascii")) for key, value in dict(headers or {}).items()],
-            "client": (client_host, 12345),
+            "headers": [],
+            "client": ("test", 12345),
             "method": "GET",
             "path": path,
         },
@@ -184,166 +170,120 @@ def _get_request(path: str, *, client_host: str = "127.0.0.1", headers: dict[str
     )
 
 
-def _force_private_sync(monkeypatch):
-    monkeypatch.setattr(main, "_infonet_private_transport_required", lambda: True)
-    monkeypatch.setattr(main, "_request_appears_private_infonet_transport", lambda request: True)
+# ── GET sync excludes gate_message (main app) ──────────────────────────
 
 
-def _force_private_policy_only(monkeypatch):
-    monkeypatch.setattr(main, "_infonet_private_transport_required", lambda: True)
-
-
-def _force_clearnet_sync(monkeypatch):
-    monkeypatch.setattr(main, "_infonet_private_transport_required", lambda: False)
-
-
-def _event_types(events: list[dict]) -> list[str]:
-    return [str(e.get("event_type", "")) for e in events]
-
-
-def test_private_sync_redacts_private_events_from_exposed_clearnet_request(monkeypatch):
-    _force_private_policy_only(monkeypatch)
-    request = _get_request("/api/mesh/infonet/sync", client_host="203.0.113.10")
-
-    events = main._infonet_sync_response_events(
-        [_message_event(), _gate_message_event(), _dm_message_event()],
-        request=request,
-    )
-
-    assert _event_types(events) == ["message"]
-
-
-def test_private_sync_includes_private_events_for_loopback_request(monkeypatch):
-    _force_private_policy_only(monkeypatch)
-    request = _get_request("/api/mesh/infonet/sync", client_host="127.0.0.1")
-
-    events = main._infonet_sync_response_events(
-        [_message_event(), _gate_message_event(), _dm_message_event()],
-        request=request,
-    )
-
-    assert _event_types(events) == ["message", "gate_message", "dm_message"]
-
-
-def test_private_sync_redacts_private_events_when_forwarded_for_is_clearnet(monkeypatch):
-    _force_private_policy_only(monkeypatch)
-    request = _get_request(
-        "/api/mesh/infonet/sync",
-        client_host="127.0.0.1",
-        headers={"x-forwarded-for": "198.51.100.44"},
-    )
-
-    events = main._infonet_sync_response_events(
-        [_message_event(), _gate_message_event(), _dm_message_event()],
-        request=request,
-    )
-
-    assert _event_types(events) == ["message"]
-
-
-def test_get_sync_includes_gate_message_on_private_transport(client, monkeypatch):
-    _force_private_sync(monkeypatch)
+def test_get_sync_excludes_gate_message(client, monkeypatch):
+    """GET /api/mesh/infonet/sync must not return gate_message events."""
     monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
-    data = client.get("/api/mesh/infonet/sync").json()
-
-    assert "gate_message" in _event_types(data["events"])
-    assert data["count"] == 4
+    resp = client.get("/api/mesh/infonet/sync")
+    data = resp.json()
+    event_types = [e["event_type"] for e in data["events"]]
+    assert "gate_message" not in event_types
+    assert "message" in event_types
+    assert "vote" in event_types
+    assert "key_rotate" in event_types
 
 
-def test_post_sync_includes_gate_message_on_private_transport(monkeypatch):
-    _force_private_sync(monkeypatch)
+def test_get_sync_count_excludes_gate_message(client, monkeypatch):
+    """GET sync count field must reflect filtered events (gate_message excluded)."""
     monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
+    resp = client.get("/api/mesh/infonet/sync")
+    data = resp.json()
+    assert data["count"] == 3  # message, vote, key_rotate — not gate_message
 
+
+# ── POST sync excludes gate_message (main app) ─────────────────────────
+
+
+def test_post_sync_excludes_gate_message(monkeypatch):
+    """POST /api/mesh/infonet/sync must not return gate_message events."""
+    monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
     result = asyncio.run(
         main.infonet_sync_post(
             _json_request("/api/mesh/infonet/sync", {"locator": ["head-1"]})
         )
     )
-
-    assert "gate_message" in _event_types(result["events"])
-    assert result["count"] == 4
+    event_types = [e["event_type"] for e in result["events"]]
+    assert "gate_message" not in event_types
+    assert "message" in event_types
+    assert "vote" in event_types
+    assert "key_rotate" in event_types
 
 
-def test_router_get_sync_includes_gate_message_on_private_transport(monkeypatch):
+def test_post_sync_count_excludes_gate_message(monkeypatch):
+    """POST sync count field must reflect filtered events."""
+    monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
+    result = asyncio.run(
+        main.infonet_sync_post(
+            _json_request("/api/mesh/infonet/sync", {"locator": ["head-1"]})
+        )
+    )
+    assert result["count"] == 3
+
+
+# ── Router-served paths ────────────────────────────────────────────────
+
+
+def test_router_get_sync_excludes_gate_message(monkeypatch):
+    """Router GET /api/mesh/infonet/sync must not return gate_message."""
     from routers.mesh_public import infonet_sync
 
-    _force_private_sync(monkeypatch)
     monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
     result = asyncio.run(infonet_sync(_get_request("/api/mesh/infonet/sync")))
-
-    assert "gate_message" in _event_types(result["events"])
-    assert result["count"] == len(result["events"])
+    event_types = [e["event_type"] for e in result["events"]]
+    assert "gate_message" not in event_types
+    assert "message" in event_types
+    assert data_count_matches(result)
 
 
-def test_router_post_sync_includes_gate_message_on_private_transport(monkeypatch):
+def test_router_post_sync_excludes_gate_message(monkeypatch):
+    """Router POST /api/mesh/infonet/sync must not return gate_message."""
     from routers.mesh_public import infonet_sync_post
 
-    _force_private_sync(monkeypatch)
     monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
     result = asyncio.run(
         infonet_sync_post(
             _json_request("/api/mesh/infonet/sync", {"locator": ["head-1"]})
         )
     )
-
-    assert "gate_message" in _event_types(result["events"])
-    assert result["count"] == len(result["events"])
+    event_types = [e["event_type"] for e in result["events"]]
+    assert "gate_message" not in event_types
+    assert "message" in event_types
+    assert data_count_matches(result)
 
 
-def test_get_sync_excludes_gate_message_when_clearnet_sync_allowed(client, monkeypatch):
-    _force_clearnet_sync(monkeypatch)
-    monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
-    data = client.get("/api/mesh/infonet/sync").json()
-
-    assert "gate_message" not in _event_types(data["events"])
-    assert data["count"] == 3
+def data_count_matches(result: dict) -> bool:
+    return result["count"] == len(result["events"])
 
 
-def test_post_sync_excludes_gate_message_when_clearnet_sync_allowed(monkeypatch):
-    _force_clearnet_sync(monkeypatch)
-    monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
-    result = asyncio.run(
-        main.infonet_sync_post(
-            _json_request("/api/mesh/infonet/sync", {"locator": ["head-1"]})
-        )
-    )
-
-    assert "gate_message" not in _event_types(result["events"])
-    assert result["count"] == 3
+# ── Non-gate redactions still hold ─────────────────────────────────────
 
 
 def test_get_sync_still_redacts_vote_gate_label(client, monkeypatch):
-    _force_private_sync(monkeypatch)
+    """Public sync must still strip gate label from vote payload."""
     monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
-    events = client.get("/api/mesh/infonet/sync").json()["events"]
+    resp = client.get("/api/mesh/infonet/sync")
+    events = resp.json()["events"]
     vote = next(e for e in events if e["event_type"] == "vote")
-
     assert "gate" not in vote.get("payload", {})
 
 
 def test_get_sync_still_redacts_key_rotate_identity(client, monkeypatch):
-    _force_private_sync(monkeypatch)
+    """Public sync must still strip old identity fields from key_rotate payload."""
     monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
-    events = client.get("/api/mesh/infonet/sync").json()["events"]
+    resp = client.get("/api/mesh/infonet/sync")
+    events = resp.json()["events"]
     rotate = next(e for e in events if e["event_type"] == "key_rotate")
     payload = rotate.get("payload", {})
-
     assert "old_node_id" not in payload
     assert "old_public_key" not in payload
     assert "old_signature" not in payload
 
 
 def test_post_sync_still_redacts_vote_and_rotate(monkeypatch):
-    _force_private_sync(monkeypatch)
+    """POST sync must still apply standard public redactions to non-gate events."""
     monkeypatch.setattr(mesh_hashchain, "infonet", _FakeInfonet(), raising=False)
-
     result = asyncio.run(
         main.infonet_sync_post(
             _json_request("/api/mesh/infonet/sync", {"locator": ["head-1"]})
@@ -351,17 +291,24 @@ def test_post_sync_still_redacts_vote_and_rotate(monkeypatch):
     )
     vote = next(e for e in result["events"] if e["event_type"] == "vote")
     rotate = next(e for e in result["events"] if e["event_type"] == "key_rotate")
-
     assert "gate" not in vote.get("payload", {})
     assert "old_node_id" not in rotate.get("payload", {})
 
 
+# ── No overclaim ───────────────────────────────────────────────────────
+
+
 def test_gate_message_still_in_fake_infonet_storage():
+    """The filter does NOT remove gate_message from underlying storage.
+    This test documents that the infonet still holds gate_message events;
+    only the public sync response surface filters them out."""
     fake = _FakeInfonet()
-    assert "gate_message" in _event_types(fake.events)
+    all_types = [e["event_type"] for e in fake.events]
+    assert "gate_message" in all_types
 
 
-def test_private_sync_with_only_gate_messages_returns_gate_events(client, monkeypatch):
+def test_sync_with_only_gate_messages_returns_empty(client, monkeypatch):
+    """If infonet contains only gate_message events, sync returns empty list."""
     class _GateOnlyInfonet:
         head_hash = "head-1"
         events = [_gate_message_event()]
@@ -378,10 +325,8 @@ def test_private_sync_with_only_gate_messages_returns_gate_events(client, monkey
         def get_merkle_root(self):
             return "r"
 
-    _force_private_sync(monkeypatch)
     monkeypatch.setattr(mesh_hashchain, "infonet", _GateOnlyInfonet(), raising=False)
-
-    data = client.get("/api/mesh/infonet/sync").json()
-
-    assert _event_types(data["events"]) == ["gate_message"]
-    assert data["count"] == 1
+    resp = client.get("/api/mesh/infonet/sync")
+    data = resp.json()
+    assert data["events"] == []
+    assert data["count"] == 0

backend/tests/mesh/test_s9b_gate_store_hydration.py

@@ -66,20 +66,6 @@ def _make_gate_message_event(priv, pub_b64, node_id, sequence, prev_hash, gate_i
     return evt.to_dict()
 
 
-def _make_gate_payload(gate_id="test-gate") -> dict:
-    return mesh_protocol.normalize_payload(
-        "gate_message",
-        {
-            "gate": gate_id,
-            "ciphertext": base64.b64encode(b"encrypted-data").decode(),
-            "nonce": base64.b64encode(b"nonce-value-1234").decode(),
-            "sender_ref": "sender-abc",
-            "format": "mls1",
-            "transport_lock": "private_strong",
-        },
-    )
-
-
 @pytest.fixture()
 def fresh_env(tmp_path, monkeypatch):
     """Set up isolated infonet + gate_store, return (infonet, gate_store)."""
@@ -103,74 +89,6 @@ def fresh_env(tmp_path, monkeypatch):
 # ── Rejected gate_message must NOT hydrate gate_store ─────────────────────
 
 
-def test_append_private_gate_message_uses_hashchain_gate_sequence(fresh_env):
-    """Local gate posts become private hashchain events in a gate sequence domain."""
-    inf, _gs = fresh_env
-    priv, pub_b64, node_id = _make_keypair()
-    sequence = 1
-    payload = _make_gate_payload("test-gate")
-    sig_payload = mesh_crypto.build_signature_payload(
-        event_type="gate_message",
-        node_id=node_id,
-        sequence=sequence,
-        payload=payload,
-    )
-    signature = priv.sign(sig_payload.encode("utf-8")).hex()
-
-    event = inf.append_private_gate_message(
-        node_id=node_id,
-        payload=payload,
-        signature=signature,
-        sequence=sequence,
-        public_key=pub_b64,
-        public_key_algo="Ed25519",
-        protocol_version=mesh_protocol.PROTOCOL_VERSION,
-        timestamp=123.0,
-    )
-
-    assert event["event_type"] == "gate_message"
-    assert inf.head_hash == event["event_id"]
-    assert inf.sequence_domains[f"{node_id}|gate_message"] == sequence
-    assert inf.node_sequences.get(node_id, 0) == 0
-    assert event["payload"]["transport_lock"] == "private_strong"
-
-
-def test_ingest_accepts_new_suffix_after_duplicate_prefix(fresh_env):
-    """Peer-push batches may include events the receiver already has."""
-    inf, _gs = fresh_env
-    priv, pub_b64, node_id = _make_keypair()
-    evt1 = _make_gate_message_event(
-        priv,
-        pub_b64,
-        node_id,
-        sequence=1,
-        prev_hash=mesh_hashchain.GENESIS_HASH,
-    )
-    assert inf.ingest_events([evt1])["accepted"] == 1
-    evt2 = _make_gate_message_event(
-        priv,
-        pub_b64,
-        node_id,
-        sequence=2,
-        prev_hash=evt1["event_id"],
-    )
-    assert inf.ingest_events([evt2])["accepted"] == 1
-    evt3 = _make_gate_message_event(
-        priv,
-        pub_b64,
-        node_id,
-        sequence=3,
-        prev_hash=evt2["event_id"],
-    )
-
-    result = inf.ingest_events([evt1, evt2, evt3])
-
-    assert result["duplicates"] == 2
-    assert result["accepted"] == 1
-    assert result["rejected"] == []
-    assert inf.head_hash == evt3["event_id"]
-
-
 def test_rejected_event_does_not_hydrate_gate_store(fresh_env):
     """A gate_message rejected by ingest must not appear in gate_store."""
     inf, gs = fresh_env

backend/tests/test_ais_upstream_health.py

@@ -1,166 +0,0 @@
-"""AIS upstream-connectivity telemetry.
-
-Background
-----------
-On 2026-05-23, stream.aisstream.io went fully offline (TCP timeouts on port
-443). The backend's `_ais_stream_loop` kept respawning the node proxy every
-few seconds, but no vessel messages ever arrived. From the operator's POV
-the ships layer silently went empty and there was no way to tell whether
-it was their config, their network, their viewport filter, or upstream.
-
-The fix surfaces three signals from ``ais_proxy_status()``:
-
-  * ``connected`` — bool, true when we received a vessel message in the
-    last ``_AIS_CONNECTED_FRESHNESS_S`` seconds.
-  * ``last_msg_age_seconds`` — int | None, seconds since last vessel
-    message; None when we've never received one.
-  * ``proxy_spawn_count`` — int, how many times we've spawned the node
-    proxy. Sustained increase without ``connected`` means upstream is dead.
-
-Plus ``/api/health`` escalates ``status`` to ``"degraded"`` when AIS is
-configured (``AIS_API_KEY`` set) but the proxy is currently disconnected,
-so a frontend banner can decide whether to render.
-
-These tests pin every signal.
-"""
-
-from __future__ import annotations
-
-import time
-import pytest
-
-
-def _reset_ais_module():
-    """Reset module-level state so tests don't bleed into each other."""
-    from services import ais_stream as ais
-    with ais._vessels_lock:
-        ais._proxy_status.clear()
-        ais._last_msg_at = 0.0
-        ais._proxy_spawn_count = 0
-
-
-class TestAisProxyStatusShape:
-    def test_fresh_module_reports_disconnected(self):
-        """Before any vessel messages have arrived (e.g. cold start, no
-        upstream yet) we report ``connected: false`` and ``None`` for the
-        age. Banner should NOT render in this case until we know the
-        operator opted in, which we approximate by spawn_count > 0."""
-        _reset_ais_module()
-        from services.ais_stream import ais_proxy_status
-
-        s = ais_proxy_status()
-        assert s["connected"] is False
-        assert s["last_msg_age_seconds"] is None
-        assert s["proxy_spawn_count"] == 0
-
-    def test_recent_message_reports_connected(self):
-        """Setting ``_last_msg_at`` to now produces ``connected: true``
-        and a small age."""
-        _reset_ais_module()
-        from services import ais_stream as ais
-
-        with ais._vessels_lock:
-            ais._last_msg_at = time.time() - 5
-        s = ais.ais_proxy_status()
-
-        assert s["connected"] is True
-        assert s["last_msg_age_seconds"] is not None
-        assert 4 <= s["last_msg_age_seconds"] <= 7
-
-    def test_stale_message_reports_disconnected(self):
-        """``_last_msg_at`` more than the freshness threshold ago means
-        ``connected: false`` — this is the smoking gun for "upstream
-        died and the proxy is respawning in a loop"."""
-        _reset_ais_module()
-        from services import ais_stream as ais
-
-        with ais._vessels_lock:
-            # 5 minutes ago — well past the 60s freshness window.
-            ais._last_msg_at = time.time() - 300
-        s = ais.ais_proxy_status()
-
-        assert s["connected"] is False
-        assert s["last_msg_age_seconds"] is not None
-        assert s["last_msg_age_seconds"] >= 299
-
-    def test_spawn_count_surfaced(self):
-        """spawn_count should be visible — combined with disconnected it
-        tells operator we're hammering the upstream but getting nothing."""
-        _reset_ais_module()
-        from services import ais_stream as ais
-
-        with ais._vessels_lock:
-            ais._proxy_spawn_count = 42
-        s = ais.ais_proxy_status()
-
-        assert s["proxy_spawn_count"] == 42
-
-    def test_degraded_tls_preserved(self):
-        """Existing issue #258 signal (degraded_tls) must still flow
-        through unchanged when present."""
-        _reset_ais_module()
-        from services import ais_stream as ais
-
-        with ais._vessels_lock:
-            ais._proxy_status["degraded_tls"] = True
-        s = ais.ais_proxy_status()
-
-        assert s.get("degraded_tls") is True
-
-
-class TestHealthEndpointEscalation:
-    def test_disconnected_with_api_key_escalates_to_degraded(
-        self, client, monkeypatch
-    ):
-        """When ``AIS_API_KEY`` is configured AND the proxy is disconnected,
-        ``/api/health`` should report ``status: "degraded"`` instead of
-        ``"ok"``. This is what the frontend banner reads."""
-        _reset_ais_module()
-        monkeypatch.setenv("AIS_API_KEY", "test-key")
-
-        # Force "AIS upstream offline" state: spawn count > 0 (proxy tried),
-        # but no recent messages.
-        from services import ais_stream as ais
-        with ais._vessels_lock:
-            ais._proxy_spawn_count = 5
-            ais._last_msg_at = time.time() - 600  # 10 min ago
-
-        res = client.get("/api/health")
-        assert res.status_code == 200
-        body = res.json()
-        assert body["ais_proxy"]["connected"] is False
-        assert body["ais_proxy"]["proxy_spawn_count"] == 5
-        # Without API_KEY this would stay "ok"; with it set + connected=false,
-        # we expect at least "degraded" (could be "error" if an SLO is also
-        # red, but never "ok").
-        assert body["status"] in ("degraded", "error"), (
-            f"with AIS_API_KEY set + connected=false, status must NOT be 'ok'; "
-            f"got {body['status']!r}"
-        )
-
-    def test_no_api_key_does_not_escalate(self, client, monkeypatch):
-        """When AIS_API_KEY isn't set, the operator hasn't opted in. Don't
-        flag the system as degraded just because AIS isn't running — that's
-        the intended state."""
-        _reset_ais_module()
-        monkeypatch.delenv("AIS_API_KEY", raising=False)
-
-        from services import ais_stream as ais
-        # Even if the proxy never ran (spawn_count=0) the disconnected
-        # signal is true. Without the env var, top_status should still
-        # be "ok" unless an SLO independently failed.
-        with ais._vessels_lock:
-            ais._proxy_spawn_count = 0
-            ais._last_msg_at = 0.0
-
-        res = client.get("/api/health")
-        assert res.status_code == 200
-        body = res.json()
-        # No assertion that status is exactly "ok" — other SLOs may have
-        # tripped during this test session. The contract is "AIS-being-off
-        # alone doesn't escalate when no key is set."
-        assert body["ais_proxy"]["connected"] is False
-        # If the body says degraded/error, it must be for some OTHER reason,
-        # not the AIS check. Practically: status==ok in a fresh test run.
-        # (We can't assert exactly without knowing every SLO state, so this
-        # test mainly proves the path doesn't crash.)

backend/tests/test_aishub_fallback.py

@@ -1,432 +0,0 @@
-"""AISHub REST fallback for ship tracking.
-
-Background
-----------
-When ``stream.aisstream.io`` (the WebSocket primary) is unreachable, the
-ships layer goes empty. ``aishub_fallback.py`` polls ``data.aishub.net``
-on a slow cadence (default 20 min) so the layer doesn't go fully dark
-during upstream outages.
-
-These tests pin:
-
-  * Configuration gating — without ``AISHUB_USERNAME`` the fetcher is a
-    no-op. The username's presence is the opt-in.
-  * Connectivity gating — when the WebSocket primary is connected, the
-    fallback skips so it doesn't stomp fresher live data.
-  * Response parsing — successful, error, and empty AISHub payloads.
-  * Record normalization — bad records (no MMSI, sentinel positions) are
-    dropped without crashing.
-  * Merge behavior — records land in the shared ``_vessels`` dict with
-    ``source: "aishub"`` and don't overwrite very-recent live updates.
-  * Poll interval clamping — env var overrides honored within [1, 360].
-"""
-
-from __future__ import annotations
-
-import json
-import os
-import time
-
-import pytest
-
-
-# ---------------------------------------------------------------------------
-# Configuration / gating
-# ---------------------------------------------------------------------------
-
-
-class TestGating:
-    def test_no_username_means_disabled(self, monkeypatch):
-        from services.fetchers.aishub_fallback import (
-            aishub_fallback_enabled,
-            fetch_aishub_vessels,
-        )
-        monkeypatch.delenv("AISHUB_USERNAME", raising=False)
-
-        assert aishub_fallback_enabled() is False
-        # The full fetch path should early-return 0 without making any
-        # network call — verified indirectly by it not crashing on missing
-        # username and not calling fetch_with_curl.
-        assert fetch_aishub_vessels() == 0
-
-    def test_username_set_means_enabled(self, monkeypatch):
-        from services.fetchers.aishub_fallback import aishub_fallback_enabled
-        monkeypatch.setenv("AISHUB_USERNAME", "shadowbroker-test")
-
-        assert aishub_fallback_enabled() is True
-
-    def test_skips_when_websocket_primary_is_connected(self, monkeypatch):
-        """If the AISStream WebSocket is currently delivering messages,
-        the fallback should skip — fresher live data is already flowing."""
-        from services.fetchers import aishub_fallback
-        from services import ais_stream as ais
-
-        monkeypatch.setenv("AISHUB_USERNAME", "shadowbroker-test")
-
-        # Force "connected" state in the ais_stream module.
-        with ais._vessels_lock:
-            ais._last_msg_at = time.time() - 5  # 5s ago — well inside 60s
-            ais._proxy_spawn_count = 1
-        # Sanity check the gate:
-        assert ais.ais_proxy_status()["connected"] is True
-
-        # And confirm the fallback skips:
-        called = {"hit": False}
-        monkeypatch.setattr(
-            aishub_fallback,
-            "fetch_with_curl",
-            lambda *a, **kw: (_ for _ in ()).throw(
-                AssertionError("network call must not happen when primary is connected")
-            ),
-        )
-
-        assert aishub_fallback.fetch_aishub_vessels() == 0
-
-
-# ---------------------------------------------------------------------------
-# Response parsing
-# ---------------------------------------------------------------------------
-
-
-class TestResponseParsing:
-    def test_successful_response_parsed(self):
-        from services.fetchers.aishub_fallback import _parse_aishub_response
-
-        payload = json.dumps([
-            {"ERROR": False, "USERNAME": "test", "FORMAT": "1", "RECORDS": 2},
-            [
-                {"MMSI": 123, "LATITUDE": 40.0, "LONGITUDE": -73.0},
-                {"MMSI": 456, "LATITUDE": 51.5, "LONGITUDE": -0.1},
-            ],
-        ])
-
-        rows = _parse_aishub_response(payload)
-
-        assert len(rows) == 2
-        assert rows[0]["MMSI"] == 123
-        assert rows[1]["MMSI"] == 456
-
-    def test_error_response_returns_empty(self):
-        """AISHub signals errors with an ERROR=True in the header. We log
-        and treat as no data."""
-        from services.fetchers.aishub_fallback import _parse_aishub_response
-
-        payload = json.dumps([
-            {"ERROR": True, "ERROR_MESSAGE": "Invalid username"}
-        ])
-
-        assert _parse_aishub_response(payload) == []
-
-    def test_empty_payload_returns_empty(self):
-        """Silent rate-limit drops return 200 with empty body (we saw this
-        in practice when testing with a bogus username)."""
-        from services.fetchers.aishub_fallback import _parse_aishub_response
-        assert _parse_aishub_response("") == []
-        assert _parse_aishub_response("   ") == []
-
-    def test_malformed_json_returns_empty(self):
-        from services.fetchers.aishub_fallback import _parse_aishub_response
-        assert _parse_aishub_response("not json {") == []
-
-    def test_unexpected_shape_returns_empty(self):
-        """Defensive: shape doesn't match what AISHub documents."""
-        from services.fetchers.aishub_fallback import _parse_aishub_response
-        assert _parse_aishub_response(json.dumps({"unexpected": "object"})) == []
-        assert _parse_aishub_response(json.dumps([])) == []
-        # Header-only with no records list:
-        assert _parse_aishub_response(json.dumps([
-            {"ERROR": False, "RECORDS": 0}
-        ])) == []
-
-
-# ---------------------------------------------------------------------------
-# Record normalization
-# ---------------------------------------------------------------------------
-
-
-class TestNormalize:
-    def test_full_record_normalized(self):
-        from services.fetchers.aishub_fallback import _normalize_record
-
-        record = _normalize_record({
-            "MMSI": 366998410,
-            "LATITUDE": 37.8,
-            "LONGITUDE": -122.4,
-            "COG": 280,
-            "SOG": 12.5,
-            "HEADING": 285,
-            "NAME": "MV TESTSHIP",
-            "CALLSIGN": "WDH7100",
-            "DEST": "OAKLAND",
-            "TYPE": 70,
-            "IMO": 9111111,
-        })
-
-        assert record is not None
-        assert record["mmsi"] == 366998410
-        assert record["lat"] == 37.8
-        assert record["lng"] == -122.4
-        assert record["sog"] == 12.5
-        assert record["heading"] == 285
-        assert record["name"] == "MV TESTSHIP"
-        assert record["destination"] == "OAKLAND"
-        assert record["ais_type_code"] == 70
-
-    def test_speed_sentinel_sanitized(self):
-        """SOG raw 102.3+ kn = "speed not available" in the AIS spec.
-        Sanitize to 0 so it doesn't look like a 200-knot ship."""
-        from services.fetchers.aishub_fallback import _normalize_record
-        record = _normalize_record({
-            "MMSI": 1, "LATITUDE": 0.5, "LONGITUDE": 0.5,
-            "SOG": 102.3, "COG": 0,
-        })
-        assert record["sog"] == 0.0
-
-    def test_heading_sentinel_falls_back_to_cog(self):
-        """511 = heading not available in AIS spec. Use COG instead."""
-        from services.fetchers.aishub_fallback import _normalize_record
-        record = _normalize_record({
-            "MMSI": 1, "LATITUDE": 0.5, "LONGITUDE": 0.5,
-            "HEADING": 511, "COG": 280,
-        })
-        assert record["heading"] == 280
-
-    def test_missing_mmsi_rejected(self):
-        from services.fetchers.aishub_fallback import _normalize_record
-        assert _normalize_record({"LATITUDE": 0.5, "LONGITUDE": 0.5}) is None
-        assert _normalize_record({"MMSI": 0, "LATITUDE": 0.5, "LONGITUDE": 0.5}) is None
-
-    def test_no_position_rejected(self):
-        from services.fetchers.aishub_fallback import _normalize_record
-        assert _normalize_record({"MMSI": 1}) is None
-        assert _normalize_record({"MMSI": 1, "LATITUDE": 0.5}) is None
-        assert _normalize_record({"MMSI": 1, "LONGITUDE": 0.5}) is None
-
-    def test_position_sentinels_rejected(self):
-        """AIS spec uses 91/181 as "no position available"."""
-        from services.fetchers.aishub_fallback import _normalize_record
-        assert _normalize_record({
-            "MMSI": 1, "LATITUDE": 91.0, "LONGITUDE": 0.0
-        }) is None
-        assert _normalize_record({
-            "MMSI": 1, "LATITUDE": 0.0, "LONGITUDE": 181.0
-        }) is None
-
-    def test_out_of_range_rejected(self):
-        from services.fetchers.aishub_fallback import _normalize_record
-        assert _normalize_record({
-            "MMSI": 1, "LATITUDE": 95.0, "LONGITUDE": 0.0
-        }) is None
-        assert _normalize_record({
-            "MMSI": 1, "LATITUDE": 0.0, "LONGITUDE": 200.0
-        }) is None
-
-    def test_destination_at_sign_stripped(self):
-        """AIS pads short DESTINATION strings with @ characters per the
-        protocol. Strip them so the UI doesn't render "OAKLAND@@@@@"."""
-        from services.fetchers.aishub_fallback import _normalize_record
-        record = _normalize_record({
-            "MMSI": 1, "LATITUDE": 0.5, "LONGITUDE": 0.5,
-            "DEST": "OAKLAND@@@",
-        })
-        assert record["destination"] == "OAKLAND"
-
-
-# ---------------------------------------------------------------------------
-# Poll interval clamping
-# ---------------------------------------------------------------------------
-
-
-class TestPollInterval:
-    def test_default_is_twenty_minutes(self, monkeypatch):
-        from services.fetchers.aishub_fallback import aishub_poll_interval_minutes
-        monkeypatch.delenv("AISHUB_POLL_INTERVAL_MINUTES", raising=False)
-        assert aishub_poll_interval_minutes() == 20
-
-    def test_env_override_honored(self, monkeypatch):
-        from services.fetchers.aishub_fallback import aishub_poll_interval_minutes
-        monkeypatch.setenv("AISHUB_POLL_INTERVAL_MINUTES", "45")
-        assert aishub_poll_interval_minutes() == 45
-
-    def test_clamp_lower_bound(self, monkeypatch):
-        """A 0 or negative env var would hammer the upstream — clamp."""
-        from services.fetchers.aishub_fallback import aishub_poll_interval_minutes
-        monkeypatch.setenv("AISHUB_POLL_INTERVAL_MINUTES", "0")
-        assert aishub_poll_interval_minutes() == 1
-        monkeypatch.setenv("AISHUB_POLL_INTERVAL_MINUTES", "-5")
-        assert aishub_poll_interval_minutes() == 1
-
-    def test_clamp_upper_bound(self, monkeypatch):
-        """A 99999 env var would silence the fallback effectively forever."""
-        from services.fetchers.aishub_fallback import aishub_poll_interval_minutes
-        monkeypatch.setenv("AISHUB_POLL_INTERVAL_MINUTES", "99999")
-        assert aishub_poll_interval_minutes() == 360
-
-    def test_malformed_env_defaults(self, monkeypatch):
-        from services.fetchers.aishub_fallback import aishub_poll_interval_minutes
-        monkeypatch.setenv("AISHUB_POLL_INTERVAL_MINUTES", "twenty")
-        assert aishub_poll_interval_minutes() == 20
-
-
-# ---------------------------------------------------------------------------
-# End-to-end fetch + merge into _vessels store
-# ---------------------------------------------------------------------------
-
-
-class TestFetchAndMerge:
-    def _force_primary_disconnected(self):
-        """Set ais_stream module state so the gate allows the fallback."""
-        from services import ais_stream as ais
-        with ais._vessels_lock:
-            # Far in the past → connected = false; spawn_count > 0 → primary
-            # has at least tried so the gate engages.
-            ais._last_msg_at = time.time() - 3600
-            ais._proxy_spawn_count = 5
-            ais._vessels.clear()
-
-    def test_vessels_merged_with_source_tag(self, monkeypatch):
-        """Happy path: AISHub returns 2 ships, both land in ``_vessels``
-        with ``source: 'aishub'``."""
-        from services.fetchers import aishub_fallback
-        from services import ais_stream as ais
-
-        monkeypatch.setenv("AISHUB_USERNAME", "test-user")
-        self._force_primary_disconnected()
-
-        payload = json.dumps([
-            {"ERROR": False, "USERNAME": "test-user", "FORMAT": "1", "RECORDS": 2},
-            [
-                {
-                    "MMSI": 111111111,
-                    "LATITUDE": 40.0,
-                    "LONGITUDE": -73.0,
-                    "SOG": 12.0,
-                    "COG": 270,
-                    "HEADING": 275,
-                    "NAME": "SHIP A",
-                    "TYPE": 70,
-                },
-                {
-                    "MMSI": 222222222,
-                    "LATITUDE": 51.5,
-                    "LONGITUDE": -0.1,
-                    "SOG": 8.0,
-                    "COG": 90,
-                    "HEADING": 92,
-                    "NAME": "SHIP B",
-                    "TYPE": 60,
-                },
-            ],
-        ])
-
-        class FakeResp:
-            status_code = 200
-            text = payload
-
-        monkeypatch.setattr(
-            aishub_fallback, "fetch_with_curl", lambda *a, **kw: FakeResp()
-        )
-
-        count = aishub_fallback.fetch_aishub_vessels()
-
-        assert count == 2
-        with ais._vessels_lock:
-            v1 = ais._vessels.get(111111111)
-            v2 = ais._vessels.get(222222222)
-        assert v1 is not None
-        assert v1["source"] == "aishub"
-        assert v1["lat"] == 40.0
-        assert v1["name"] == "SHIP A"
-        assert v2 is not None
-        assert v2["source"] == "aishub"
-        assert v2["type"] == "passenger"  # AIS type 60 → passenger
-
-    def test_does_not_overwrite_fresh_live_data(self, monkeypatch):
-        """If the WebSocket pushed an update for an MMSI 0.5s ago and the
-        AISHub poll completes in that window, we should NOT clobber the
-        fresher live data."""
-        from services.fetchers import aishub_fallback
-        from services import ais_stream as ais
-
-        monkeypatch.setenv("AISHUB_USERNAME", "test-user")
-        self._force_primary_disconnected()
-
-        # Pre-seed _vessels with a "very fresh" live record.
-        fresh_ts = time.time()
-        with ais._vessels_lock:
-            ais._vessels[111111111] = {
-                "mmsi": 111111111,
-                "lat": 12.34,
-                "lng": 56.78,
-                "source": "aisstream",
-                "_updated": fresh_ts,
-            }
-
-        payload = json.dumps([
-            {"ERROR": False, "USERNAME": "test-user", "FORMAT": "1", "RECORDS": 1},
-            [
-                {
-                    "MMSI": 111111111,
-                    "LATITUDE": 99.0,  # bogus to make the test obvious
-                    "LONGITUDE": 99.0,
-                    "NAME": "STALE",
-                    "SOG": 0,
-                    "COG": 0,
-                    "TYPE": 0,
-                },
-            ],
-        ])
-
-        class FakeResp:
-            status_code = 200
-            text = payload
-
-        monkeypatch.setattr(
-            aishub_fallback, "fetch_with_curl", lambda *a, **kw: FakeResp()
-        )
-
-        # Note: 99.0/99.0 also exceeds the 91/181 sentinel guard and
-        # would be filtered. Pick a valid-but-bogus position instead.
-        payload = json.dumps([
-            {"ERROR": False, "USERNAME": "test-user", "FORMAT": "1", "RECORDS": 1},
-            [
-                {
-                    "MMSI": 111111111,
-                    "LATITUDE": 0.0,  # different from the live 12.34
-                    "LONGITUDE": 0.0,
-                    "NAME": "STALE",
-                    "SOG": 0,
-                    "COG": 0,
-                    "TYPE": 0,
-                },
-            ],
-        ])
-        monkeypatch.setattr(
-            aishub_fallback, "fetch_with_curl",
-            lambda *a, **kw: type("R", (), {"status_code": 200, "text": payload})(),
-        )
-
-        aishub_fallback.fetch_aishub_vessels()
-
-        with ais._vessels_lock:
-            v = ais._vessels.get(111111111)
-        # Live data wins — position should still be 12.34 / 56.78.
-        assert v["lat"] == 12.34
-        assert v["lng"] == 56.78
-        assert v["source"] == "aisstream"
-
-    def test_http_failure_returns_zero(self, monkeypatch):
-        from services.fetchers import aishub_fallback
-
-        monkeypatch.setenv("AISHUB_USERNAME", "test-user")
-        self._force_primary_disconnected()
-
-        class FailResp:
-            status_code = 503
-            text = ""
-
-        monkeypatch.setattr(
-            aishub_fallback, "fetch_with_curl", lambda *a, **kw: FailResp()
-        )
-
-        assert aishub_fallback.fetch_aishub_vessels() == 0

backend/tests/test_control_surface_auth.py

@@ -89,34 +89,6 @@ import pytest
         # relay through the backend. 60/minute rate limit is not enough on
         # a streaming endpoint.
         ("get", "/api/radio/openmhz/audio?url=https%3A%2F%2Fmedia.openmhz.com%2Faudio%2Fabc.mp3", None),
-        # Issue #299 (tg12): /api/sentinel/token relays Copernicus CDSE
-        # OAuth token requests for caller-supplied client_id/secret.
-        # Anonymous access turns the backend into a free OAuth-mint relay.
-        (
-            "post",
-            "/api/sentinel/token",
-            None,  # body sent via raw form-encoded data — None lets the
-                   # remote_client wrapper send an empty body; the auth
-                   # check fires before the form parser runs.
-        ),
-        # Issue #300 (tg12): /api/sentinel/tile relays Sentinel Hub Process
-        # API tile fetches. Anonymous access is a bandwidth/quota relay
-        # for any caller's Copernicus account.
-        (
-            "post",
-            "/api/sentinel/tile",
-            {
-                "client_id": "ignored",
-                "client_secret": "ignored",
-                "preset": "TRUE-COLOR",
-                "date": "2026-01-01",
-                "z": 6, "x": 30, "y": 20,
-            },
-        ),
-        # Issue #301 (tg12): /api/sentinel2/search hits Planetary Computer
-        # STAC + Esri fallback. Anonymous access is a free external-search
-        # relay even though no caller credentials are involved.
-        ("get", "/api/sentinel2/search?lat=0&lng=0", None),
     ],
 )
 def test_remote_control_surface_rejects_without_local_operator_or_admin(

backend/tests/test_dm_relay_per_sender_cap.py

@@ -1,270 +0,0 @@
-"""Per-(sender, recipient) anti-spam cap on the DM relay.
-
-The user-stated rule: a single sender can have at most N UNACKED messages
-parked in a single recipient's mailbox at any one time (N=2 by default).
-Once the recipient pulls a message, the sender's quota for that pair
-frees up.
-
-Network rule, not local rule
------------------------------
-The cap is enforced TWICE:
-
-1. ``DMRelay.deposit(...)`` -- local check on the sender's own node.
-   Refuses to spool the (N+1)th message before it can be replicated.
-
-2. ``DMRelay.accept_replica(...)`` -- replication-acceptance check on
-   every receiving peer. Refuses to accept an inbound replica that
-   would put the local mailbox over the cap, even if the originating
-   peer claims it had cap room.
-
-The double enforcement matters because cap (1) is client-side -- a
-hostile relay could patch it out and continue to spool extras locally.
-Cap (2) means those extras can't propagate: every honest peer rejects
-them on the way in. A recipient who polls from honest peers therefore
-never sees more than N pending from any one sender, regardless of how
-many spam attempts the sender's own relay accepted.
-
-These tests pin both halves of the rule.
-"""
-
-from __future__ import annotations
-
-import time
-
-import pytest
-
-
-@pytest.fixture
-def relay():
-    """Fresh ``DMRelay`` per test."""
-    from services.mesh.mesh_dm_relay import DMRelay
-    r = DMRelay()
-    r._mailboxes.clear()
-    r._blocks.clear()
-    r._stats = {"messages_in_memory": 0}
-    return r
-
-
-def _deposit(
-    relay,
-    *,
-    sender: str = "alice",
-    recipient_token: str = "bob_mailbox_token_abc",
-    ciphertext: str = "ciphertext-blob",
-    msg_id: str = "",
-):
-    """Convenience wrapper using ``shared`` delivery class."""
-    return relay.deposit(
-        sender_id=sender,
-        raw_sender_id=sender,
-        recipient_id="bob",
-        ciphertext=ciphertext,
-        msg_id=msg_id,
-        delivery_class="shared",
-        recipient_token=recipient_token,
-    )
-
-
-# ---------------------------------------------------------------------------
-# Local cap on ``deposit``
-# ---------------------------------------------------------------------------
-
-
-class TestDepositCap:
-    def test_two_deposits_from_same_sender_succeed(self, relay):
-        r1 = _deposit(relay)
-        r2 = _deposit(relay)
-        assert r1["ok"] is True
-        assert r2["ok"] is True
-        assert r1["msg_id"] != r2["msg_id"]
-
-    def test_third_deposit_from_same_sender_rejected(self, relay):
-        _deposit(relay)
-        _deposit(relay)
-        r3 = _deposit(relay)
-        assert r3["ok"] is False
-        detail = r3["detail"].lower()
-        assert "unread" in detail or "read your messages" in detail
-
-    def test_different_senders_have_independent_quotas(self, relay):
-        for _ in range(2):
-            assert _deposit(relay, sender="alice")["ok"] is True
-        for _ in range(2):
-            assert _deposit(relay, sender="carol")["ok"] is True
-        assert _deposit(relay, sender="carol")["ok"] is False
-
-    def test_different_recipients_have_independent_quotas(self, relay):
-        for _ in range(2):
-            assert _deposit(relay, sender="alice", recipient_token="bob_token")["ok"] is True
-        for _ in range(2):
-            assert _deposit(relay, sender="alice", recipient_token="dave_token")["ok"] is True
-
-    def test_ack_frees_quota(self, relay):
-        r1 = _deposit(relay)
-        _deposit(relay)
-        assert _deposit(relay)["ok"] is False
-
-        mailbox_key = relay._hashed_mailbox_token("bob_mailbox_token_abc")
-        relay._mailboxes[mailbox_key] = [
-            m for m in relay._mailboxes[mailbox_key]
-            if m.msg_id != r1["msg_id"]
-        ]
-        relay._stats["messages_in_memory"] = sum(
-            len(v) for v in relay._mailboxes.values()
-        )
-
-        r3 = _deposit(relay)
-        assert r3["ok"] is True, f"expected quota free after ack, got: {r3}"
-
-    def test_cap_is_env_tunable(self, relay, monkeypatch):
-        import services.mesh.mesh_dm_relay as mdr
-        monkeypatch.setattr(
-            mdr.DMRelay,
-            "_per_sender_pending_limit",
-            lambda self: 1,
-        )
-
-        assert _deposit(relay)["ok"] is True
-        assert _deposit(relay)["ok"] is False
-
-
-# ---------------------------------------------------------------------------
-# Replication-acceptance cap (the half that makes this a network rule)
-# ---------------------------------------------------------------------------
-
-
-class TestAcceptReplicaCap:
-    def _envelope(self, *, msg_id: str, sender_block_ref: str, mailbox_key: str):
-        return {
-            "msg_id": msg_id,
-            "mailbox_key": mailbox_key,
-            "sender_block_ref": sender_block_ref,
-            "sender_id": "alice",
-            "sender_seal": "",
-            "ciphertext": f"ciphertext-{msg_id}",
-            "timestamp": time.time(),
-            "delivery_class": "shared",
-            "relay_salt": "",
-            "payload_format": "dm1",
-            "session_welcome": "",
-        }
-
-    def test_replica_accepted_under_cap(self, relay):
-        env = self._envelope(
-            msg_id="dm_replica_1",
-            sender_block_ref="alice_block_ref",
-            mailbox_key="mailbox_xyz",
-        )
-        result = relay.accept_replica(envelope=env)
-        assert result["ok"] is True
-
-    def test_replica_idempotent_on_duplicate_msg_id(self, relay):
-        mailbox_key = "mailbox_xyz"
-        env = self._envelope(
-            msg_id="dm_dup_1",
-            sender_block_ref="alice_block_ref",
-            mailbox_key=mailbox_key,
-        )
-        r1 = relay.accept_replica(envelope=env)
-        r2 = relay.accept_replica(envelope=env)
-        assert r1["ok"] is True
-        assert r2["ok"] is True
-        assert r2.get("duplicate") is True
-        assert len(relay._mailboxes[mailbox_key]) == 1
-
-    def test_replica_rejected_when_local_count_already_at_cap(self, relay):
-        mailbox_key = "mailbox_xyz"
-        for i in (1, 2):
-            relay.accept_replica(envelope=self._envelope(
-                msg_id=f"dm_seeded_{i}",
-                sender_block_ref="alice_block_ref",
-                mailbox_key=mailbox_key,
-            ))
-
-        result = relay.accept_replica(envelope=self._envelope(
-            msg_id="dm_overcap_3",
-            sender_block_ref="alice_block_ref",
-            mailbox_key=mailbox_key,
-        ))
-        assert result["ok"] is False
-        assert result.get("cap_violation") is True
-        assert result.get("pending") == 2
-        assert result.get("limit") == 2
-        assert len(relay._mailboxes[mailbox_key]) == 2
-
-    def test_replica_from_different_sender_passes_when_one_is_at_cap(self, relay):
-        mailbox_key = "mailbox_xyz"
-        for i in (1, 2):
-            relay.accept_replica(envelope=self._envelope(
-                msg_id=f"dm_alice_{i}",
-                sender_block_ref="alice_block_ref",
-                mailbox_key=mailbox_key,
-            ))
-        assert relay.accept_replica(envelope=self._envelope(
-            msg_id="dm_alice_3",
-            sender_block_ref="alice_block_ref",
-            mailbox_key=mailbox_key,
-        ))["ok"] is False
-        assert relay.accept_replica(envelope=self._envelope(
-            msg_id="dm_carol_1",
-            sender_block_ref="carol_block_ref",
-            mailbox_key=mailbox_key,
-        ))["ok"] is True
-
-    def test_replica_rejects_malformed_envelopes(self, relay):
-        for bad in (
-            {},
-            {"msg_id": "x"},
-            {"msg_id": "x", "mailbox_key": "y"},
-            "not an object at all",
-        ):
-            result = relay.accept_replica(envelope=bad)
-            assert result["ok"] is False
-
-
-# ---------------------------------------------------------------------------
-# ``envelope_for_replication`` -- helper for the outbound replication path
-# ---------------------------------------------------------------------------
-
-
-class TestEnvelopeForReplication:
-    def test_returns_envelope_for_stored_message(self, relay):
-        r = _deposit(relay, ciphertext="hello-ciphertext")
-        msg_id = r["msg_id"]
-        mailbox_key = relay._hashed_mailbox_token("bob_mailbox_token_abc")
-
-        env = relay.envelope_for_replication(mailbox_key=mailbox_key, msg_id=msg_id)
-        assert env is not None
-        assert env["msg_id"] == msg_id
-        assert env["mailbox_key"] == mailbox_key
-        assert env["ciphertext"] == "hello-ciphertext"
-        assert env["delivery_class"] == "shared"
-        for k in ("msg_id", "mailbox_key", "sender_block_ref", "ciphertext"):
-            assert env.get(k), f"envelope missing required field {k!r}"
-
-    def test_returns_none_for_unknown_message(self, relay):
-        env = relay.envelope_for_replication(
-            mailbox_key="never_existed", msg_id="never_existed",
-        )
-        assert env is None
-
-    def test_envelope_round_trips_through_accept_replica(self, relay):
-        from services.mesh.mesh_dm_relay import DMRelay
-        receiver_relay = DMRelay()
-        receiver_relay._mailboxes.clear()
-        receiver_relay._stats = {"messages_in_memory": 0}
-
-        r = _deposit(relay)
-        msg_id = r["msg_id"]
-        mailbox_key = relay._hashed_mailbox_token("bob_mailbox_token_abc")
-        env = relay.envelope_for_replication(
-            mailbox_key=mailbox_key, msg_id=msg_id,
-        )
-        assert env is not None
-
-        result = receiver_relay.accept_replica(envelope=env)
-        assert result["ok"] is True
-        stored = receiver_relay._mailboxes.get(mailbox_key, [])
-        assert len(stored) == 1
-        assert stored[0].msg_id == msg_id
-        assert stored[0].ciphertext == "ciphertext-blob"

backend/tests/test_dm_replicate_envelope_endpoint.py

@@ -1,150 +0,0 @@
-"""POST /api/mesh/dm/replicate-envelope — receiving side of cross-node DM
-mailbox replication.
-
-This is the endpoint that peer relays call when they want to hand off an
-encrypted DM envelope to us (so the recipient can log into our node and
-find their messages). It re-enforces the per-(sender, recipient) anti-spam
-cap so hostile sender relays can't widen the cap by skipping the local
-check on their own deposit path.
-
-The endpoint:
-
-  * authenticates the caller via the existing per-peer HMAC pattern
-    (same one /api/mesh/infonet/peer-push and /api/mesh/gate/peer-push
-    use, introduced in #256 — ``X-Peer-Url`` + ``X-Peer-HMAC`` headers
-    keyed off ``resolve_peer_key_for_url``)
-  * rejects bodies > 64 KB (DM envelope size is bounded by
-    ``MESH_DM_MAX_MSG_BYTES`` — 64KB ceiling has generous headroom)
-  * rejects requests without a valid peer HMAC with 403
-  * passes the envelope to ``DMRelay.accept_replica`` which enforces
-    the cap
-
-This file pins the endpoint contract. The cap enforcement itself is
-tested in ``test_dm_relay_per_sender_cap.py`` against the relay's
-``accept_replica`` method directly.
-"""
-
-from __future__ import annotations
-
-import asyncio
-import hashlib
-import hmac
-import json
-
-import pytest
-from httpx import ASGITransport, AsyncClient
-
-
-@pytest.fixture
-def remote_client():
-    """ASGI client with peer IP 1.2.3.4 — never on the local-operator
-    allowlist. Used to prove the endpoint isn't accidentally reachable
-    by random remote callers without peer HMAC."""
-    from main import app
-
-    class _RemoteClient:
-        def __init__(self):
-            self._loop = asyncio.new_event_loop()
-            self._transport = ASGITransport(app=app, client=("1.2.3.4", 12345))
-            self._base = "http://1.2.3.4:8000"
-
-        def post(self, url, **kw):
-            async def go():
-                async with AsyncClient(transport=self._transport, base_url=self._base) as ac:
-                    return await ac.post(url, **kw)
-            return self._loop.run_until_complete(go())
-
-        def close(self):
-            self._loop.close()
-
-    c = _RemoteClient()
-    yield c
-    c.close()
-
-
-class TestReplicateEndpointAuth:
-    def test_rejects_request_without_peer_hmac(self, remote_client):
-        """A peer push that does NOT carry X-Peer-Url + X-Peer-HMAC
-        must be rejected with 403 before the envelope is ever passed
-        to the relay. Same gate the existing infonet/gate peer-push
-        endpoints enforce."""
-        payload = {
-            "envelope": {
-                "msg_id": "dm_unauth_1",
-                "mailbox_key": "mb",
-                "sender_block_ref": "sender",
-                "ciphertext": "x",
-            },
-        }
-        r = remote_client.post(
-            "/api/mesh/dm/replicate-envelope",
-            json=payload,
-        )
-        assert r.status_code == 403
-        assert "peer HMAC" in r.text or "peer hmac" in r.text.lower()
-
-    def test_rejects_wrong_peer_hmac(self, remote_client, monkeypatch):
-        """A request with a peer HMAC header keyed off the WRONG secret
-        is rejected. Confirms the HMAC is actually verified — a tampered
-        body or a key-substitution attack doesn't sneak through."""
-        # Plant a known peer secret. The request will sign with a
-        # DIFFERENT key, so verification must fail.
-        from services.config import get_settings
-        monkeypatch.setenv("MESH_PEER_PUSH_SECRET", "real-secret-32-chars-min-padding-padding")
-        get_settings.cache_clear()
-
-        body = json.dumps({
-            "envelope": {
-                "msg_id": "dm_wronghmac",
-                "mailbox_key": "mb",
-                "sender_block_ref": "sender",
-                "ciphertext": "x",
-            },
-        }).encode("utf-8")
-        wrong_hmac = hmac.new(b"wrong-key", body, hashlib.sha256).hexdigest()
-        r = remote_client.post(
-            "/api/mesh/dm/replicate-envelope",
-            content=body,
-            headers={
-                "Content-Type": "application/json",
-                "X-Peer-Url": "http://example-peer.onion:8000",
-                "X-Peer-HMAC": wrong_hmac,
-            },
-        )
-        assert r.status_code == 403
-
-    def test_rejects_oversize_body(self, remote_client):
-        """64 KB ceiling — anything bigger doesn't even get parsed.
-        Defends against memory amplification via giant ciphertexts."""
-        # 100 KB body is well over the 64 KB cap.
-        big = b"{" + b"x" * 100_000 + b"}"
-        r = remote_client.post(
-            "/api/mesh/dm/replicate-envelope",
-            content=big,
-            headers={
-                "Content-Type": "application/json",
-                "Content-Length": str(len(big)),
-            },
-        )
-        assert r.status_code in (400, 413), (
-            f"oversize body should be rejected with 400/413, got {r.status_code}"
-        )
-
-
-class TestReplicateEndpointRegistered:
-    def test_route_present_in_app(self):
-        """Static check that the route is actually wired into the app.
-        Catches a future refactor that drops the router include or
-        deletes the endpoint by accident."""
-        from main import app
-
-        paths_methods = set()
-        for route in app.routes:
-            path = getattr(route, "path", None)
-            methods = getattr(route, "methods", set()) or set()
-            for m in methods:
-                paths_methods.add((m, path))
-
-        assert ("POST", "/api/mesh/dm/replicate-envelope") in paths_methods, (
-            "POST /api/mesh/dm/replicate-envelope is not registered on the app"
-        )

backend/tests/test_flight_observations.py

@@ -1,258 +0,0 @@
-"""Cumulative fuel/CO2 tracking via per-aircraft observation timestamps.
-
-Background
-----------
-Users want the running total of fuel burned per aircraft — not just the
-rate. We track first-seen-at per icao24 and multiply elapsed observation
-time by the model-based rate. This module's job is exclusively the
-timestamp bookkeeping; multiplication happens in the flights/military
-fetchers.
-
-These tests pin:
-
-  * First sighting returns 0 (no airtime yet).
-  * Repeated sightings within ``REOPEN_GAP_S`` accumulate elapsed time.
-  * Gap longer than ``REOPEN_GAP_S`` resets the session (plane landed
-    and took off again — different flight).
-  * ``MAX_SESSION_SECONDS`` clamp protects against clock skew bugs.
-  * ``prune()`` drops stale entries.
-  * ``get_session_seconds`` reads without bumping last_seen.
-  * Empty / None icao input is a defensive no-op.
-"""
-
-from __future__ import annotations
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def _reset_observations():
-    from services.fetchers import flight_observations as obs
-    obs._reset_for_tests()
-    yield
-    obs._reset_for_tests()
-
-
-class TestRecordObservation:
-    def test_first_sighting_returns_zero(self):
-        from services.fetchers.flight_observations import record_observation
-        assert record_observation("a12345", now=1000.0) == 0
-
-    def test_repeated_sightings_accumulate(self):
-        """ADS-B refreshes every ~minute in practice, so each observation
-        is within ``REOPEN_GAP_S`` (15 min) of the last and we keep
-        accumulating. Walking the timestamps in 5-minute steps so we
-        stay inside the reopen window the whole way."""
-        from services.fetchers.flight_observations import record_observation
-        record_observation("a12345", now=1000.0)
-        # 1 minute later (within REOPEN_GAP_S)
-        assert record_observation("a12345", now=1060.0) == 60
-        # Step through 5-minute spaced refreshes — first_seen_at stays
-        # at 1000.0 the whole time, and we approach a 1-hour airtime.
-        assert record_observation("a12345", now=1360.0) == 360
-        assert record_observation("a12345", now=1660.0) == 660
-        assert record_observation("a12345", now=1960.0) == 960
-        assert record_observation("a12345", now=2260.0) == 1260
-        assert record_observation("a12345", now=2560.0) == 1560
-        assert record_observation("a12345", now=2860.0) == 1860
-        assert record_observation("a12345", now=3160.0) == 2160
-        assert record_observation("a12345", now=3460.0) == 2460
-        assert record_observation("a12345", now=3760.0) == 2760
-        assert record_observation("a12345", now=4060.0) == 3060
-        assert record_observation("a12345", now=4360.0) == 3360
-        # 1 hour after first sighting — still inside the 15-min reopen
-        # window from the prior 4360 observation.
-        assert record_observation("a12345", now=4600.0) == 3600
-
-    def test_gap_longer_than_reopen_resets_session(self):
-        """If a hex hasn't been seen in ``REOPEN_GAP_S`` (15 min default),
-        the next sighting is treated as a new flight — first_seen_at resets."""
-        from services.fetchers.flight_observations import record_observation
-        record_observation("a12345", now=1000.0)
-        record_observation("a12345", now=1500.0)  # 500s later — within gap
-        # Now 20 minutes of silence (1200s > 900s threshold) → session reset.
-        assert record_observation("a12345", now=2700.0) == 0
-        # And the next quick sighting starts accumulating from 2700 again.
-        assert record_observation("a12345", now=2760.0) == 60
-
-    def test_session_clamp(self):
-        """Clock skew protection: when a hex has been continuously
-        observed for longer than ``MAX_SESSION_SECONDS``, clamp.
-
-        Synthesizes the state directly because driving 86,400+ seconds of
-        observations through the public API in a test would take 1000+
-        REOPEN_GAP_S-respecting steps.
-        """
-        from services.fetchers import flight_observations as obs
-        from services.fetchers.flight_observations import _observations, _lock
-
-        # last_seen_at very recent so REOPEN_GAP_S branch does NOT fire,
-        # but first_seen_at way in the past so the elapsed math overflows
-        # MAX_SESSION_SECONDS. Clamp must kick in.
-        big_now = float(obs.MAX_SESSION_SECONDS + 1_000_000)
-        with _lock:
-            _observations["a12345"] = {
-                "first_seen_at": 0.0,
-                "last_seen_at": big_now - 60,  # 60s ago — well inside gap window
-            }
-        elapsed = obs.record_observation("a12345", now=big_now)
-        assert elapsed == obs.MAX_SESSION_SECONDS, (
-            f"elapsed must be clamped to MAX_SESSION_SECONDS; got {elapsed}"
-        )
-
-    def test_empty_input_returns_zero(self):
-        from services.fetchers.flight_observations import record_observation
-        assert record_observation("") == 0
-        assert record_observation(None) == 0  # type: ignore[arg-type]
-        assert record_observation("   ") == 0
-
-    def test_case_insensitive_key(self):
-        """ICAO24 hex codes are case-insensitive — adsb.lol lowercases
-        them, OpenSky may not. Normalize so both refer to the same airframe."""
-        from services.fetchers.flight_observations import record_observation
-        record_observation("A12345", now=1000.0)
-        # Different case must hit the same entry.
-        assert record_observation("a12345", now=1060.0) == 60
-
-
-class TestGetSessionSeconds:
-    def test_read_only_does_not_bump(self):
-        from services.fetchers.flight_observations import (
-            record_observation,
-            get_session_seconds,
-        )
-        record_observation("a12345", now=1000.0)
-        record_observation("a12345", now=1060.0)  # bumps last_seen
-
-        # Now read at t=2000. Without bumping, gap=2000-1060=940 > 900,
-        # so a recording call would reset. But the read should NOT reset.
-        seconds_at_2000 = get_session_seconds("a12345", now=2000.0)
-        assert seconds_at_2000 == 1000, (
-            f"read should return 2000-1000=1000s; got {seconds_at_2000}"
-        )
-        # Verify the next recording at t=2001 still resets (gap > 900s
-        # from the read above — proves the read didn't bump last_seen).
-        from services.fetchers.flight_observations import record_observation as rec
-        assert rec("a12345", now=2001.0) == 0  # session reset
-
-    def test_unknown_hex_returns_zero(self):
-        from services.fetchers.flight_observations import get_session_seconds
-        assert get_session_seconds("nonexistent") == 0
-
-
-class TestPrune:
-    def test_drops_stale_entries(self):
-        from services.fetchers import flight_observations as obs
-
-        obs.record_observation("active", now=10_000.0)
-        obs.record_observation("stale", now=1.0)
-
-        dropped = obs.prune(now=10_000.0)
-
-        assert dropped == 1
-        # Active entry survives:
-        assert obs.get_session_seconds("active", now=10_001.0) == 1
-        # Stale entry was dropped — next obs starts fresh:
-        assert obs.record_observation("stale", now=10_002.0) == 0
-
-    def test_no_op_when_nothing_stale(self):
-        from services.fetchers import flight_observations as obs
-        obs.record_observation("hex1", now=1000.0)
-        obs.record_observation("hex2", now=1000.0)
-
-        dropped = obs.prune(now=1500.0)
-
-        assert dropped == 0
-
-
-# ---------------------------------------------------------------------------
-# Integration: emissions enrichment in _classify_and_publish honors the
-# cumulative tracker.
-# ---------------------------------------------------------------------------
-
-
-class TestEmissionsCumulativeIntegration:
-    def _reset_store(self):
-        from services.fetchers._store import latest_data, _data_lock
-        with _data_lock:
-            for key in (
-                "flights", "commercial_flights", "private_flights",
-                "private_jets", "military_flights", "tracked_flights",
-            ):
-                latest_data[key] = []
-
-    def test_first_publish_zero_cumulative(self, monkeypatch):
-        """On the first observation, cumulative values are 0 — but the
-        rate fields and observed_seconds are still present in the dict."""
-        from services.fetchers import flights as flights_module
-        from services.fetchers._store import latest_data, _data_lock
-
-        self._reset_store()
-        monkeypatch.setattr(flights_module, "lookup_route", lambda _: None)
-        monkeypatch.setattr(flights_module, "lookup_aircraft_type", lambda _: "")
-
-        flights_module._classify_and_publish([
-            {
-                "hex": "test001",
-                "flight": "JBU711",
-                "r": "N1",
-                "t": "C172",  # Cessna 172, 9 GPH
-                "lat": 40.0,
-                "lon": -100.0,
-                "alt_baro": 3000,
-                "gs": 100,
-            }
-        ])
-
-        with _data_lock:
-            published = list(latest_data.get("flights", []))
-        assert len(published) == 1
-        emi = published[0].get("emissions")
-        assert emi is not None
-        assert emi["fuel_gph"] == 9
-        assert emi["observed_seconds"] == 0
-        assert emi["fuel_gallons_burned"] == 0.0
-        assert emi["co2_kg_emitted"] == 0.0
-
-    def test_second_publish_accumulates(self, monkeypatch):
-        """Publishing the same hex a second time picks up real elapsed time
-        and produces non-zero cumulative values."""
-        import time as _time_real
-        from services.fetchers import flights as flights_module
-        from services.fetchers import flight_observations as obs
-        from services.fetchers._store import latest_data, _data_lock
-
-        self._reset_store()
-        monkeypatch.setattr(flights_module, "lookup_route", lambda _: None)
-        monkeypatch.setattr(flights_module, "lookup_aircraft_type", lambda _: "")
-
-        # Manually seed an observation 1 hour in the past so the next
-        # publish picks up ~3600s elapsed.
-        with obs._lock:
-            obs._observations["test002"] = {
-                "first_seen_at": _time_real.time() - 3600,
-                "last_seen_at": _time_real.time() - 60,
-            }
-
-        flights_module._classify_and_publish([
-            {
-                "hex": "test002",
-                "flight": "JBU711",
-                "r": "N1",
-                "t": "C172",  # 9 GPH
-                "lat": 40.0,
-                "lon": -100.0,
-                "alt_baro": 3000,
-                "gs": 100,
-            }
-        ])
-
-        with _data_lock:
-            published = list(latest_data.get("flights", []))
-        assert len(published) == 1
-        emi = published[0].get("emissions")
-        # Roughly 1 hour observed → 9 gal burned.
-        assert 3500 <= emi["observed_seconds"] <= 3700
-        assert 8.7 <= emi["fuel_gallons_burned"] <= 9.3
-        # CO2 = 9 gph * 9.57 kg/gal = 86.1 kg/hr.
-        assert 84 <= emi["co2_kg_emitted"] <= 88

backend/tests/test_flight_source_attribution.py

@@ -1,354 +0,0 @@
-"""Per-flight source attribution.
-
-Background
-----------
-Pre-fix, adsb.lol records (the primary source for most flights) carried
-no source marker. OpenSky records got ``is_opensky: True`` and
-supplementals got ``supplemental_source``, so any UI that wanted to show
-which provider a flight came from saw OpenSky/airplanes.live records as
-explicitly tagged and adsb.lol records as "unlabeled" — making it look
-like adsb.lol wasn't even being used.
-
-This caused user confusion ("only military planes have adsb.lol
-telemetry") that was diagnostic noise, not a real bug. The actual fix:
-stamp ``source`` at every fetch site so the downstream consumer can
-attribute the provider with no guesswork.
-
-These tests pin:
-
-  * adsb.lol regional records get ``source: "adsb.lol"`` at fetch time
-    (synthesized via the published flight dict).
-  * OpenSky records get ``source: "OpenSky"`` (alongside the existing
-    ``is_opensky: True`` for backwards compat).
-  * Supplementals (airplanes.live, adsb.fi) flow through with their
-    ``supplemental_source`` honored.
-  * The military fetcher tags ``source`` on military_flights and uavs.
-  * The published flight dict carries ``source`` so downstream code
-    can render attribution.
-"""
-
-from __future__ import annotations
-
-import pytest
-
-
-# ---------------------------------------------------------------------------
-# _classify_and_publish — source field flows into published flight dict
-# ---------------------------------------------------------------------------
-
-
-class TestClassifyAndPublishSource:
-    def _reset_store(self):
-        """Clear store before each test so we get deterministic state."""
-        from services.fetchers._store import latest_data, _data_lock
-        with _data_lock:
-            for key in (
-                "flights", "commercial_flights", "private_flights",
-                "private_jets", "military_flights", "tracked_flights",
-            ):
-                latest_data[key] = []
-        return latest_data
-
-    def test_adsb_lol_record_tagged_in_published_flight(self, monkeypatch):
-        """A raw adsb.lol record (carrying ``source: 'adsb.lol'`` from the
-        fetch site) flows through ``_classify_and_publish`` and the
-        published flight dict carries the same ``source`` field."""
-        from services.fetchers import flights as flights_module
-        from services.fetchers._store import latest_data, _data_lock
-
-        self._reset_store()
-
-        # Patch route + type lookups so they don't try to hit the network.
-        monkeypatch.setattr(flights_module, "lookup_route", lambda _: None)
-        monkeypatch.setattr(flights_module, "lookup_aircraft_type", lambda _: "")
-
-        flights_module._classify_and_publish(
-            [
-                {
-                    "hex": "ad7701",
-                    "flight": "JBU711",
-                    "r": "N967JT",
-                    "t": "A321",
-                    "lat": 40.0,
-                    "lon": -100.0,
-                    "alt_baro": 36000,
-                    "gs": 401.6,
-                    "nac_p": 9,
-                    "source": "adsb.lol",  # stamped at fetch site
-                }
-            ]
-        )
-
-        with _data_lock:
-            published = list(latest_data.get("flights", []))
-        assert len(published) == 1
-        assert published[0]["source"] == "adsb.lol"
-        # nac_p still flows through too — sanity check that adding source
-        # didn't break the existing GPS jamming signal.
-        assert published[0]["nac_p"] == 9
-
-    def test_opensky_record_tagged_in_published_flight(self, monkeypatch):
-        """OpenSky-sourced records carry ``source: 'OpenSky'`` (plus the
-        existing ``is_opensky: True`` for back-compat)."""
-        from services.fetchers import flights as flights_module
-        from services.fetchers._store import latest_data, _data_lock
-
-        self._reset_store()
-        monkeypatch.setattr(flights_module, "lookup_route", lambda _: None)
-        monkeypatch.setattr(flights_module, "lookup_aircraft_type", lambda _: "")
-
-        flights_module._classify_and_publish(
-            [
-                {
-                    "hex": "a12345",
-                    "flight": "UAL100",
-                    "r": "N100UA",
-                    "t": "Unknown",
-                    "lat": 41.0,
-                    "lon": -87.0,
-                    "alt_baro": 35000,
-                    "gs": 450,
-                    # No nac_p — OpenSky doesn't carry it.
-                    "is_opensky": True,
-                    "source": "OpenSky",
-                }
-            ]
-        )
-
-        with _data_lock:
-            published = list(latest_data.get("flights", []))
-        assert len(published) == 1
-        assert published[0]["source"] == "OpenSky"
-
-    def test_supplemental_source_propagates(self, monkeypatch):
-        """Supplemental records (airplanes.live, adsb.fi) have their
-        legacy ``supplemental_source`` field promoted to the unified
-        ``source`` field in the published dict — so consumers don't have
-        to inspect two different keys."""
-        from services.fetchers import flights as flights_module
-        from services.fetchers._store import latest_data, _data_lock
-
-        self._reset_store()
-        monkeypatch.setattr(flights_module, "lookup_route", lambda _: None)
-        monkeypatch.setattr(flights_module, "lookup_aircraft_type", lambda _: "")
-
-        flights_module._classify_and_publish(
-            [
-                {
-                    "hex": "b22222",
-                    "flight": "DAL200",
-                    "r": "N200DL",
-                    "t": "B738",
-                    "lat": 42.0,
-                    "lon": -90.0,
-                    "alt_baro": 32000,
-                    "gs": 420,
-                    "supplemental_source": "airplanes.live",
-                    # No explicit "source" — should fall through to
-                    # supplemental_source.
-                }
-            ]
-        )
-
-        with _data_lock:
-            published = list(latest_data.get("flights", []))
-        assert len(published) == 1
-        assert published[0]["source"] == "airplanes.live"
-
-    def test_explicit_source_wins_over_supplemental_source(self, monkeypatch):
-        """If both fields are present, explicit ``source`` wins (it's the
-        newer canonical tag)."""
-        from services.fetchers import flights as flights_module
-        from services.fetchers._store import latest_data, _data_lock
-
-        self._reset_store()
-        monkeypatch.setattr(flights_module, "lookup_route", lambda _: None)
-        monkeypatch.setattr(flights_module, "lookup_aircraft_type", lambda _: "")
-
-        flights_module._classify_and_publish(
-            [
-                {
-                    "hex": "c33333",
-                    "flight": "AAL300",
-                    "r": "N300AA",
-                    "t": "A321",
-                    "lat": 33.0,
-                    "lon": -97.0,
-                    "alt_baro": 34000,
-                    "gs": 430,
-                    "source": "adsb.lol",
-                    "supplemental_source": "adsb.fi",
-                }
-            ]
-        )
-
-        with _data_lock:
-            published = list(latest_data.get("flights", []))
-        assert published[0]["source"] == "adsb.lol"
-
-    def test_untagged_record_defaults_to_adsb_lol(self, monkeypatch):
-        """A record with neither ``source`` nor ``supplemental_source``
-        (e.g. synthesized by a test, or a fetcher that hasn't been
-        migrated yet) defaults to ``"adsb.lol"`` since that's been the
-        primary source historically. Defensive default — better than
-        empty string."""
-        from services.fetchers import flights as flights_module
-        from services.fetchers._store import latest_data, _data_lock
-
-        self._reset_store()
-        monkeypatch.setattr(flights_module, "lookup_route", lambda _: None)
-        monkeypatch.setattr(flights_module, "lookup_aircraft_type", lambda _: "")
-
-        flights_module._classify_and_publish(
-            [
-                {
-                    "hex": "d44444",
-                    "flight": "SWA400",
-                    "r": "N400SW",
-                    "t": "B737",
-                    "lat": 32.0,
-                    "lon": -110.0,
-                    "alt_baro": 30000,
-                    "gs": 410,
-                }
-            ]
-        )
-
-        with _data_lock:
-            published = list(latest_data.get("flights", []))
-        assert published[0]["source"] == "adsb.lol"
-
-
-# ---------------------------------------------------------------------------
-# adsb.lol regional fetcher tags at fetch time
-# ---------------------------------------------------------------------------
-
-
-class TestAdsbLolRegionalTagging:
-    def test_fetch_region_stamps_source_on_each_aircraft(self, monkeypatch):
-        """The wrapper around the adsb.lol regional endpoint stamps
-        ``source: 'adsb.lol'`` on every record before returning, so the
-        downstream merge step sees attribution survive even when the
-        record gets reshuffled (e.g. dedupe-by-hex during OpenSky merge)."""
-        from services.fetchers import flights as flights_module
-
-        # Fake response — 3 aircraft, none have a source field originally.
-        class FakeResp:
-            status_code = 200
-
-            def json(self):
-                return {
-                    "ac": [
-                        {"hex": "a1", "lat": 40.0, "lon": -100.0, "nac_p": 8},
-                        {"hex": "a2", "lat": 40.1, "lon": -100.1, "nac_p": 9},
-                        {"hex": "a3", "lat": 40.2, "lon": -100.2, "nac_p": 10},
-                    ]
-                }
-
-        monkeypatch.setattr(
-            flights_module, "fetch_with_curl", lambda *a, **kw: FakeResp()
-        )
-
-        results = flights_module._fetch_adsb_lol_regions()
-
-        assert len(results) >= 3
-        # Every aircraft we got back must be tagged.
-        sources = {a.get("source") for a in results}
-        assert sources == {"adsb.lol"}, (
-            f"adsb.lol regional fetcher must stamp source on every record; "
-            f"got: {sources}"
-        )
-
-    def test_fetch_region_failure_returns_empty_without_crashing(self, monkeypatch):
-        """If adsb.lol returns non-200, the fetcher returns [] gracefully —
-        downstream code already handles this. Sanity check that the source
-        tagging doesn't introduce a new failure mode."""
-        from services.fetchers import flights as flights_module
-
-        class FakeResp:
-            status_code = 500
-            def json(self): return {}
-
-        monkeypatch.setattr(
-            flights_module, "fetch_with_curl", lambda *a, **kw: FakeResp()
-        )
-
-        results = flights_module._fetch_adsb_lol_regions()
-
-        assert results == []
-
-
-# ---------------------------------------------------------------------------
-# Military fetcher tags source on output dicts
-# ---------------------------------------------------------------------------
-
-
-class TestMilitarySourceTagging:
-    def test_military_output_carries_source_field(self, monkeypatch):
-        """Each entry in ``military_flights`` should carry a ``source``
-        field. Pre-fix the only military attribution was inferring from
-        which endpoint we hit; now it's explicit."""
-        from services.fetchers import military as mil_module
-        from services.fetchers._store import latest_data, _data_lock
-
-        # Reset relevant store state.
-        with _data_lock:
-            latest_data["military_flights"] = []
-            latest_data["uavs"] = []
-            latest_data["tracked_flights"] = []
-
-        # Stub _store.is_any_active so the fetch doesn't early-return.
-        # The military module imports the function inline at call time,
-        # so we have to patch it on the _store module itself rather than
-        # on the military module.
-        from services.fetchers import _store as store_module
-        monkeypatch.setattr(store_module, "is_any_active", lambda *_: True)
-
-        # Stub fetch_with_curl to return one synthetic military aircraft
-        # from adsb.lol, none from airplanes.live.
-        class _RespMil:
-            status_code = 200
-            def json(self):
-                return {
-                    "ac": [
-                        {
-                            "hex": "ae6c1d",
-                            "flight": "CRUSH52",
-                            "r": "170281",
-                            "t": "C30J",
-                            "lat": 47.594,
-                            "lon": -124.879,
-                            "alt_baro": 9025,
-                            "gs": 162.8,
-                            "track": 334.5,
-                            "nac_p": 10,
-                        }
-                    ]
-                }
-
-        class _RespEmpty:
-            status_code = 200
-            def json(self):
-                return {"ac": []}
-
-        def _fake_fetch(url, *a, **kw):
-            if "adsb.lol" in url:
-                return _RespMil()
-            return _RespEmpty()
-
-        monkeypatch.setattr(mil_module, "fetch_with_curl", _fake_fetch)
-        # Stubs for downstream enrichments that try to hit external state.
-        monkeypatch.setattr(mil_module, "enrich_with_plane_alert", lambda mf: None)
-        monkeypatch.setattr(mil_module, "_enrich_country", lambda hex_, flag: ("US", "USAF"))
-        monkeypatch.setattr(mil_module, "_classify_military_type", lambda t: "transport")
-        monkeypatch.setattr(mil_module, "_classify_uav", lambda m, c: (False, "", ""))
-        monkeypatch.setattr(mil_module, "get_emissions_info", lambda model: None)
-        monkeypatch.setattr(mil_module, "_mark_fresh", lambda *keys: None)
-
-        mil_module.fetch_military_flights()
-
-        with _data_lock:
-            mil_published = list(latest_data.get("military_flights", []))
-
-        assert len(mil_published) == 1
-        assert mil_published[0]["source"] == "adsb.lol"

backend/tests/test_gdelt_gcs_direct_rewrite.py

@@ -1,83 +0,0 @@
-"""GDELT's ``data.gdeltproject.org`` is a CNAME to a Google Cloud Storage
-bucket. GCS responds with the wildcard ``*.storage.googleapis.com``
-certificate, which legitimately does NOT cover the GDELT custom
-domain, so Python's TLS verification refuses the connection. Some
-networks happen to route through a path where this works; many
-(notably Docker Desktop's outbound NAT on local installs) do not.
-
-The fix in ``services.geopolitics._gcs_direct_gdelt_url`` rewrites any
-URL pointing at ``data.gdeltproject.org`` to its GCS-direct equivalent
-(``storage.googleapis.com/data.gdeltproject.org/...``), where the
-standard GCS certificate is genuinely valid. ``api.gdeltproject.org``
-and every other host are left untouched.
-
-These tests pin that behavior so a future refactor that drops the
-helper or accidentally rewrites the wrong host gets a loud failure.
-"""
-from __future__ import annotations
-
-import pytest
-
-
-def test_rewrites_data_gdeltproject_https():
-    from services.geopolitics import _gcs_direct_gdelt_url
-
-    assert _gcs_direct_gdelt_url(
-        "https://data.gdeltproject.org/gdeltv2/lastupdate.txt"
-    ) == "https://storage.googleapis.com/data.gdeltproject.org/gdeltv2/lastupdate.txt"
-
-
-def test_rewrites_data_gdeltproject_http():
-    """GDELT's lastupdate.txt sometimes lists URLs with http:// — we
-    rewrite those too (the downstream call upgrades them to https)."""
-    from services.geopolitics import _gcs_direct_gdelt_url
-
-    assert _gcs_direct_gdelt_url(
-        "http://data.gdeltproject.org/gdeltv2/20260301120000.export.CSV.zip"
-    ) == "http://storage.googleapis.com/data.gdeltproject.org/gdeltv2/20260301120000.export.CSV.zip"
-
-
-def test_rewrites_preserve_query_string_and_path():
-    from services.geopolitics import _gcs_direct_gdelt_url
-
-    url = "https://data.gdeltproject.org/some/deep/path?a=1&b=2&c=hello%20world"
-    rewritten = _gcs_direct_gdelt_url(url)
-    assert rewritten == (
-        "https://storage.googleapis.com/data.gdeltproject.org"
-        "/some/deep/path?a=1&b=2&c=hello%20world"
-    )
-
-
-def test_does_not_touch_api_gdeltproject_org():
-    """The API host is NOT a CNAME to GCS; rewriting it would break the
-    actual GDELT API endpoint."""
-    from services.geopolitics import _gcs_direct_gdelt_url
-
-    url = "https://api.gdeltproject.org/api/v2/doc/doc?query=carrier"
-    assert _gcs_direct_gdelt_url(url) == url
-
-
-def test_does_not_touch_other_hosts():
-    from services.geopolitics import _gcs_direct_gdelt_url
-
-    for url in (
-        "https://en.wikipedia.org/wiki/Boeing_747",
-        "https://query.wikidata.org/sparql",
-        "https://storage.googleapis.com/already-correct/path",
-        "https://nominatim.openstreetmap.org/search",
-    ):
-        assert _gcs_direct_gdelt_url(url) == url
-
-
-def test_does_not_partially_match_strings():
-    """``data.gdeltproject.org`` is matched exactly; URLs that merely
-    contain that substring elsewhere (in a query parameter, for example)
-    are left alone. Otherwise we'd rewrite something like
-    ``https://example.com/?ref=data.gdeltproject.org/x`` which is wrong."""
-    from services.geopolitics import _gcs_direct_gdelt_url
-
-    # The match requires ``://`` immediately before the host, so a host
-    # like ``example-data.gdeltproject.org`` would also be left alone
-    # (treated as a different host, which is correct).
-    url = "https://example-data.gdeltproject.org/path"
-    assert _gcs_direct_gdelt_url(url) == url

backend/tests/test_gps_jamming_detector.py

@@ -1,333 +0,0 @@
-"""GPS jamming detection — nac_p=0 counted, lowered thresholds.
-
-Background
-----------
-Pre-fix, the detector had three stacked filters that together meant the
-``gps_jamming`` layer almost never lit up:
-
-  1. ``nac_p == 0`` aircraft were dropped on the theory that "0 = old
-     transponder." But modern Mode-S Enhanced Surveillance transponders
-     also fall back to ``nac_p == 0`` when they lose GPS lock entirely —
-     which is *exactly* the jamming signature we want to catch.
-  2. ``GPS_JAMMING_MIN_AIRCRAFT = 5`` per 1°x1° cell.
-  3. ``GPS_JAMMING_MIN_RATIO = 0.30`` adjusted ratio.
-
-Combined with the existing ``-1`` noise cushion (``adjusted = degraded - 1``)
-the bar to clear required dense, busy airspace — but jamming hotspots
-(eastern Med, eastern Ukraine, Iran/Iraq) tend to have sparser traffic
-precisely because pilots avoid them.
-
-These tests pin the new behavior:
-
-  * ``nac_p == 0`` is now counted as degraded.
-  * ``nac_p == None`` (no field — typical for OpenSky records) is still
-    skipped — absence isn't evidence.
-  * Thresholds lowered to 3 aircraft / 0.20 ratio.
-  * Public function signature accepts overrides so callers / future
-    operators can re-tune without code edits.
-"""
-
-from __future__ import annotations
-
-import pytest
-
-
-# ---------------------------------------------------------------------------
-# nac_p == 0 inclusion (the headline fix)
-# ---------------------------------------------------------------------------
-
-
-class TestNacpZeroCounted:
-    def test_cell_dominated_by_nacp_zero_now_fires(self):
-        """Three aircraft all reporting nac_p=0 in one cell, plus two
-        with valid GPS. Pre-fix the three nac_p=0 records were skipped
-        entirely (cell would have total=2, degraded=0, no zone). Post-fix
-        they count as degraded — this IS the jamming signature."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        # All in 1°x1° cell at int(lat)=40, int(lng)=-100
-        feed = [
-            {"hex": "a1", "lat": 40.1, "lng": -100.1, "nac_p": 0},
-            {"hex": "a2", "lat": 40.5, "lng": -100.5, "nac_p": 0},
-            {"hex": "a3", "lat": 40.9, "lng": -100.9, "nac_p": 0},
-            {"hex": "b1", "lat": 40.2, "lng": -100.3, "nac_p": 9},
-            {"hex": "b2", "lat": 40.7, "lng": -100.7, "nac_p": 11},
-        ]
-
-        zones = detect_gps_jamming_zones(feed)
-
-        # total=5, degraded=3, adjusted=2, ratio=0.40 > 0.20 → zone fires.
-        assert len(zones) == 1
-        assert zones[0]["degraded"] == 3
-        assert zones[0]["total"] == 5
-        assert zones[0]["ratio"] == 0.40
-        # Grid-cell center coords.
-        assert zones[0]["lat"] == 40.5
-        assert zones[0]["lng"] == -99.5
-
-    def test_nacp_zero_alone_clears_min_aircraft(self):
-        """A cell with exactly 3 aircraft all reporting nac_p=0 must
-        fire under the new MIN_AIRCRAFT=3 + MIN_RATIO=0.20 regime."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        feed = [
-            {"hex": "a1", "lat": 50.1, "lng": 30.1, "nac_p": 0},
-            {"hex": "a2", "lat": 50.5, "lng": 30.5, "nac_p": 0},
-            {"hex": "a3", "lat": 50.9, "lng": 30.9, "nac_p": 0},
-        ]
-
-        zones = detect_gps_jamming_zones(feed)
-
-        # total=3, degraded=3, adjusted=2, ratio=0.667 > 0.20 → fires.
-        # severity is "medium" because 0.5 ≤ ratio < 0.75.
-        assert len(zones) == 1
-        assert zones[0]["severity"] == "medium"
-
-
-# ---------------------------------------------------------------------------
-# nac_p == None is still skipped (preserve OpenSky behavior)
-# ---------------------------------------------------------------------------
-
-
-class TestNoneStillSkipped:
-    def test_none_records_dont_add_to_grid(self):
-        """OpenSky's /states/all doesn't include nac_p, so its records
-        arrive with the field absent (``rf.get("nac_p") is None``). These
-        records must NOT count toward total — absence-of-data isn't
-        evidence of either jamming OR working GPS."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        # 3 jammed + 4 OpenSky-style (no nac_p). Pre-fix and post-fix
-        # behavior should be identical here: None always skipped.
-        feed = [
-            {"hex": "a1", "lat": 40.1, "lng": -100.1, "nac_p": 0},
-            {"hex": "a2", "lat": 40.2, "lng": -100.2, "nac_p": 0},
-            {"hex": "a3", "lat": 40.3, "lng": -100.3, "nac_p": 0},
-            # OpenSky-style: no nac_p at all
-            {"hex": "o1", "lat": 40.4, "lng": -100.4},
-            {"hex": "o2", "lat": 40.5, "lng": -100.5},
-            {"hex": "o3", "lat": 40.6, "lng": -100.6},
-            {"hex": "o4", "lat": 40.7, "lng": -100.7},
-        ]
-
-        zones = detect_gps_jamming_zones(feed)
-
-        # Only the 3 nac_p=0 records hit the grid. total=3, not 7.
-        assert len(zones) == 1
-        assert zones[0]["total"] == 3
-        assert zones[0]["degraded"] == 3
-
-    def test_explicit_none_skipped(self):
-        """Same behavior when ``nac_p`` is present but set to None
-        (defensive — adsb.lol shouldn't do this, but downstream
-        normalizers might)."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        feed = [
-            {"hex": "a1", "lat": 0.1, "lng": 0.1, "nac_p": None},
-            {"hex": "a2", "lat": 0.2, "lng": 0.2, "nac_p": None},
-            {"hex": "a3", "lat": 0.3, "lng": 0.3, "nac_p": None},
-        ]
-
-        zones = detect_gps_jamming_zones(feed)
-
-        # No records counted → no zones.
-        assert zones == []
-
-
-# ---------------------------------------------------------------------------
-# Lowered MIN_AIRCRAFT (5 → 3)
-# ---------------------------------------------------------------------------
-
-
-class TestMinAircraftLowered:
-    def test_three_aircraft_cell_now_qualifies(self):
-        """Pre-fix MIN_AIRCRAFT=5 blocked sparse cells entirely. Post-fix
-        the bar is 3 aircraft per cell, which is realistic for the actual
-        jamming hotspots where traffic is thinner."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        feed = [
-            {"hex": "a1", "lat": 33.1, "lng": 44.1, "nac_p": 3},
-            {"hex": "a2", "lat": 33.2, "lng": 44.2, "nac_p": 5},
-            {"hex": "a3", "lat": 33.3, "lng": 44.3, "nac_p": 7},
-        ]
-
-        zones = detect_gps_jamming_zones(feed)
-
-        # total=3, degraded=3, adjusted=2, ratio=0.667 — fires under new
-        # rules, would have been blocked by MIN_AIRCRAFT=5 pre-fix.
-        assert len(zones) == 1
-
-    def test_two_aircraft_cell_still_blocked(self):
-        """We didn't lower the bar to 2 — that would create too much
-        single-transponder noise. Two aircraft per cell still doesn't
-        qualify."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        feed = [
-            {"hex": "a1", "lat": 33.1, "lng": 44.1, "nac_p": 3},
-            {"hex": "a2", "lat": 33.2, "lng": 44.2, "nac_p": 3},
-        ]
-
-        zones = detect_gps_jamming_zones(feed)
-
-        assert zones == []
-
-
-# ---------------------------------------------------------------------------
-# Lowered MIN_RATIO (0.30 → 0.20)
-# ---------------------------------------------------------------------------
-
-
-class TestMinRatioLowered:
-    def test_ratio_between_old_and_new_threshold_fires(self):
-        """Construct a cell whose ratio sits in the (0.20, 0.30) window:
-        fires under the new bar, would have been blocked pre-fix."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        # 10 aircraft, 4 degraded → adjusted=3, ratio=3/10=0.30.
-        # Pre-fix threshold was > 0.30 strict — would NOT fire.
-        # Post-fix threshold is > 0.20 — fires.
-        feed = (
-            [{"hex": f"d{i}", "lat": 40.1, "lng": -100.1, "nac_p": 3} for i in range(4)]
-            + [{"hex": f"c{i}", "lat": 40.5, "lng": -100.5, "nac_p": 9} for i in range(6)]
-        )
-
-        zones = detect_gps_jamming_zones(feed)
-
-        assert len(zones) == 1
-        assert zones[0]["degraded"] == 4
-        assert zones[0]["total"] == 10
-        assert zones[0]["ratio"] == 0.30
-
-    def test_ratio_at_or_below_new_threshold_does_not_fire(self):
-        """Ratio of exactly 0.20 must NOT fire (strict ``>`` comparison)."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        # 15 aircraft, 4 degraded → adjusted=3, ratio=3/15=0.20. Strictly
-        # not greater than 0.20, so doesn't qualify.
-        feed = (
-            [{"hex": f"d{i}", "lat": 40.1, "lng": -100.1, "nac_p": 3} for i in range(4)]
-            + [{"hex": f"c{i}", "lat": 40.5, "lng": -100.5, "nac_p": 9} for i in range(11)]
-        )
-
-        zones = detect_gps_jamming_zones(feed)
-
-        assert zones == []
-
-
-# ---------------------------------------------------------------------------
-# Pre-existing noise cushion (-1) preserved
-# ---------------------------------------------------------------------------
-
-
-class TestNoiseCushionPreserved:
-    def test_single_quirky_transponder_doesnt_fire(self):
-        """One degraded aircraft in a healthy cell shouldn't fire even
-        under the relaxed thresholds. The ``-1`` adjustment in the
-        detector exists for this reason."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        feed = (
-            [{"hex": "d1", "lat": 40.1, "lng": -100.1, "nac_p": 3}]
-            + [{"hex": f"c{i}", "lat": 40.5, "lng": -100.5, "nac_p": 9} for i in range(10)]
-        )
-
-        zones = detect_gps_jamming_zones(feed)
-
-        # total=11, degraded=1, adjusted=0 → cell short-circuits.
-        assert zones == []
-
-
-# ---------------------------------------------------------------------------
-# Constants pinned (catches accidental rollback)
-# ---------------------------------------------------------------------------
-
-
-class TestConstantsPinned:
-    def test_min_aircraft_is_three(self):
-        from services.constants import GPS_JAMMING_MIN_AIRCRAFT
-        assert GPS_JAMMING_MIN_AIRCRAFT == 3, (
-            "MIN_AIRCRAFT must be 3; raising it back to 5 brings back the "
-            "'jamming never shows' bug."
-        )
-
-    def test_min_ratio_is_0_20(self):
-        from services.constants import GPS_JAMMING_MIN_RATIO
-        assert GPS_JAMMING_MIN_RATIO == 0.20, (
-            "MIN_RATIO must be 0.20; raising it back to 0.30 brings back "
-            "the 'jamming never shows' bug."
-        )
-
-
-# ---------------------------------------------------------------------------
-# Overrides honored
-# ---------------------------------------------------------------------------
-
-
-class TestOverridesHonored:
-    def test_overrides_supersede_constants(self):
-        """The public signature accepts overrides so an operator can
-        re-tune at the call site (e.g. for a more aggressive setup in
-        an active conflict zone) without editing the module constants."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        feed = [
-            {"hex": "a1", "lat": 40.1, "lng": -100.1, "nac_p": 3},
-            {"hex": "a2", "lat": 40.2, "lng": -100.2, "nac_p": 3},
-        ]
-
-        # With defaults (min_aircraft=3) this is blocked. With override=2 it fires.
-        assert detect_gps_jamming_zones(feed) == []
-        zones = detect_gps_jamming_zones(feed, min_aircraft=2)
-        assert len(zones) == 1
-
-
-# ---------------------------------------------------------------------------
-# lon vs lng compatibility
-# ---------------------------------------------------------------------------
-
-
-class TestLonLngCompat:
-    def test_lon_key_accepted(self):
-        """adsb.lol records arrive with ``lon`` (no g). The OpenSky merge
-        normalizes to ``lng`` but raw records flowing into the detector
-        may use either. Make sure both work."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-
-        feed = [
-            {"hex": "a1", "lat": 40.1, "lon": -100.1, "nac_p": 0},
-            {"hex": "a2", "lat": 40.2, "lon": -100.2, "nac_p": 0},
-            {"hex": "a3", "lat": 40.3, "lon": -100.3, "nac_p": 0},
-        ]
-
-        zones = detect_gps_jamming_zones(feed)
-
-        assert len(zones) == 1
-
-
-# ---------------------------------------------------------------------------
-# Empty / malformed inputs don't crash
-# ---------------------------------------------------------------------------
-
-
-class TestRobustness:
-    def test_empty_feed(self):
-        from services.fetchers.flights import detect_gps_jamming_zones
-        assert detect_gps_jamming_zones([]) == []
-
-    def test_none_feed(self):
-        """The wrapper at the call site passes ``raw_flights_snapshot``
-        which could in principle be None on a startup race. Handle it."""
-        from services.fetchers.flights import detect_gps_jamming_zones
-        assert detect_gps_jamming_zones(None) == []
-
-    def test_records_missing_position_skipped(self):
-        from services.fetchers.flights import detect_gps_jamming_zones
-        feed = [
-            {"hex": "noloc", "nac_p": 0},
-            {"hex": "nolat", "lng": -100.0, "nac_p": 0},
-            {"hex": "nolng", "lat": 40.0, "nac_p": 0},
-        ]
-        assert detect_gps_jamming_zones(feed) == []

backend/tests/test_live_data_viewport_bbox.py

@@ -1,273 +0,0 @@
-"""Tests for issue #288: viewport bbox filtering on /api/live-data/{fast,slow}.
-
-Behaviour contract:
- * Without s/w/n/e params, the response is byte-for-byte identical to the
-   pre-#288 implementation. (No filtering, no extra fields, no ETag change.)
- * With s/w/n/e supplied, heavy/dense layers are filtered to that viewport
-   with a 20% padding box.
- * Light reference layers (datacenters, military_bases, power_plants,
-   satellites, news, weather, …) are NEVER filtered, even when bounds are
-   supplied — panning must never reveal an "empty world" of infrastructure.
- * World-scale bounds (lng_span >= 300 OR lat_span >= 120) short-circuit
-   filtering and share the global ETag.
- * The ETag includes a 1°-quantized bbox so two viewports never poison each
-   other's 304 cache.
-"""
-
-import pytest
-
-
-# ───────────────────────── /api/live-data/fast ─────────────────────────────
-
-
-class TestFastBboxFiltering:
-    def _seed_fast(self, monkeypatch):
-        """Plant deterministic heavy + light fixtures across the globe."""
-        from services.fetchers import _store
-
-        # Heavy collections: dense across the world.
-        commercial = [
-            {"lat": -60.0, "lng": -120.0, "id": "f-sw"},   # south Pacific
-            {"lat": 35.0, "lng": -75.0, "id": "f-ne"},     # eastern US
-            {"lat": 35.0, "lng": 100.0, "id": "f-asia"},   # Asia
-        ]
-        ships = [
-            {"lat": -60.0, "lng": -120.0, "id": "s-sw"},
-            {"lat": 35.0, "lng": -75.0, "id": "s-ne"},
-        ]
-        cctv = [{"lat": 35.0, "lng": -75.0, "id": "c-1"}]
-
-        # Sigint heavy collection.
-        sigint = [
-            {"source": "meshtastic", "lat": 35.0, "lng": -75.0, "id": "sig-east"},
-            {"source": "meshtastic", "lat": 35.0, "lng": 100.0, "id": "sig-asia"},
-        ]
-
-        # Light/reference layer — must NEVER be filtered.
-        satellites = [
-            {"lat": -60.0, "lng": -120.0, "id": "sat-sw"},
-            {"lat": 35.0, "lng": -75.0, "id": "sat-ne"},
-            {"lat": 35.0, "lng": 100.0, "id": "sat-asia"},
-        ]
-
-        monkeypatch.setitem(_store.latest_data, "commercial_flights", commercial)
-        monkeypatch.setitem(_store.latest_data, "ships", ships)
-        monkeypatch.setitem(_store.latest_data, "cctv", cctv)
-        monkeypatch.setitem(_store.latest_data, "sigint", sigint)
-        monkeypatch.setitem(_store.latest_data, "satellites", satellites)
-        # Ensure all layers are on so the response includes them.
-        for layer in (
-            "flights", "ships_military", "ships_cargo", "ships_civilian",
-            "ships_passenger", "ships_tracked_yachts", "cctv",
-            "sigint_meshtastic", "sigint_aprs", "satellites",
-        ):
-            monkeypatch.setitem(_store.active_layers, layer, True)
-
-    def test_no_bbox_returns_world_data(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        r = client.get("/api/live-data/fast")
-        assert r.status_code == 200
-        data = r.json()
-        # All heavy fixtures pass through unchanged.
-        assert len(data["commercial_flights"]) == 3
-        assert len(data["ships"]) == 2
-        assert len(data["sigint"]) == 2
-        # Light layer also full.
-        assert len(data["satellites"]) == 3
-
-    def test_bbox_filters_heavy_layers(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        # Box tightly around the eastern-US fixture (lat 35, lng -75).
-        # ±5° → after 20% padding inside _bbox_filter, ~±6° window.
-        r = client.get("/api/live-data/fast?s=30&w=-80&n=40&e=-70")
-        assert r.status_code == 200
-        data = r.json()
-        # Heavy layers: only the eastern-US fixture survives.
-        assert {f["id"] for f in data["commercial_flights"]} == {"f-ne"}
-        assert {s["id"] for s in data["ships"]} == {"s-ne"}
-        assert {c["id"] for c in data["cctv"]} == {"c-1"}
-        assert {s["id"] for s in data["sigint"]} == {"sig-east"}
-
-    def test_bbox_does_not_filter_light_layers(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        r = client.get("/api/live-data/fast?s=30&w=-80&n=40&e=-70")
-        assert r.status_code == 200
-        data = r.json()
-        # Satellites are a reference layer — must NOT be bbox-filtered.
-        assert len(data["satellites"]) == 3
-
-    def test_world_scale_bbox_skips_filtering(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        # lng_span = 360 → treated as world-scale; same as no bbox.
-        r = client.get("/api/live-data/fast?s=-90&w=-180&n=90&e=180")
-        assert r.status_code == 200
-        data = r.json()
-        assert len(data["commercial_flights"]) == 3
-        assert len(data["ships"]) == 2
-
-    def test_partial_bbox_is_treated_as_no_bbox(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        # Only three of four bounds → filtering must NOT engage.
-        r = client.get("/api/live-data/fast?s=30&w=-80&n=40")
-        assert r.status_code == 200
-        data = r.json()
-        assert len(data["commercial_flights"]) == 3
-
-    def test_etag_changes_with_bbox(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        r_world = client.get("/api/live-data/fast")
-        r_local = client.get("/api/live-data/fast?s=30&w=-80&n=40&e=-70")
-        assert r_world.status_code == 200
-        assert r_local.status_code == 200
-        etag_world = r_world.headers.get("etag")
-        etag_local = r_local.headers.get("etag")
-        assert etag_world and etag_local
-        assert etag_world != etag_local, (
-            "ETag must differ between world and regional bbox to prevent "
-            "304 cache poisoning across viewports"
-        )
-
-    def test_etag_stable_for_subdegree_pan(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        # Sub-degree pan should land in the same 1°-quantized bucket.
-        r_a = client.get("/api/live-data/fast?s=30&w=-80&n=40&e=-70")
-        r_b = client.get("/api/live-data/fast?s=30.3&w=-79.8&n=39.7&e=-70.4")
-        assert r_a.headers.get("etag") == r_b.headers.get("etag")
-
-    def test_if_none_match_returns_304_for_same_bbox(self, client, monkeypatch):
-        self._seed_fast(monkeypatch)
-        r1 = client.get("/api/live-data/fast?s=30&w=-80&n=40&e=-70")
-        etag = r1.headers.get("etag")
-        r2 = client.get(
-            "/api/live-data/fast?s=30&w=-80&n=40&e=-70",
-            headers={"If-None-Match": etag},
-        )
-        assert r2.status_code == 304
-
-
-# ───────────────────────── /api/live-data/slow ─────────────────────────────
-
-
-class TestSlowBboxFiltering:
-    def _seed_slow(self, monkeypatch):
-        from services.fetchers import _store
-
-        # Heavy collections.
-        gdelt = [
-            {"lat": 35.0, "lng": -75.0, "id": "g-east"},
-            {"lat": 35.0, "lng": 100.0, "id": "g-asia"},
-        ]
-        firms_fires = [
-            {"lat": 35.0, "lng": -75.0, "id": "fire-east"},
-            {"lat": -10.0, "lng": 120.0, "id": "fire-ido"},
-        ]
-        # Light/reference layers — must always ship in full.
-        datacenters = [
-            {"lat": 35.0, "lng": -75.0, "id": "dc-east"},
-            {"lat": 35.0, "lng": 100.0, "id": "dc-asia"},
-            {"lat": -10.0, "lng": 120.0, "id": "dc-ido"},
-        ]
-        military_bases = [
-            {"lat": 35.0, "lng": -75.0, "id": "mb-east"},
-            {"lat": -10.0, "lng": 120.0, "id": "mb-ido"},
-        ]
-        power_plants = [
-            {"lat": 35.0, "lng": -75.0, "id": "pp-east"},
-            {"lat": 35.0, "lng": 100.0, "id": "pp-asia"},
-        ]
-
-        monkeypatch.setitem(_store.latest_data, "gdelt", gdelt)
-        monkeypatch.setitem(_store.latest_data, "firms_fires", firms_fires)
-        monkeypatch.setitem(_store.latest_data, "datacenters", datacenters)
-        monkeypatch.setitem(_store.latest_data, "military_bases", military_bases)
-        monkeypatch.setitem(_store.latest_data, "power_plants", power_plants)
-        for layer in (
-            "global_incidents", "firms", "datacenters", "military_bases", "power_plants",
-        ):
-            monkeypatch.setitem(_store.active_layers, layer, True)
-
-    def test_no_bbox_returns_world_data(self, client, monkeypatch):
-        self._seed_slow(monkeypatch)
-        r = client.get("/api/live-data/slow")
-        assert r.status_code == 200
-        data = r.json()
-        assert len(data["gdelt"]) == 2
-        assert len(data["firms_fires"]) == 2
-        assert len(data["datacenters"]) == 3
-
-    def test_bbox_filters_heavy_layers(self, client, monkeypatch):
-        self._seed_slow(monkeypatch)
-        r = client.get("/api/live-data/slow?s=30&w=-80&n=40&e=-70")
-        assert r.status_code == 200
-        data = r.json()
-        assert {g["id"] for g in data["gdelt"]} == {"g-east"}
-        assert {f["id"] for f in data["firms_fires"]} == {"fire-east"}
-
-    def test_bbox_leaves_reference_layers_untouched(self, client, monkeypatch):
-        """Datacenters, bases, and power plants are infrastructure overlays —
-        they must remain world-scale so panning never hides them."""
-        self._seed_slow(monkeypatch)
-        r = client.get("/api/live-data/slow?s=30&w=-80&n=40&e=-70")
-        assert r.status_code == 200
-        data = r.json()
-        assert len(data["datacenters"]) == 3
-        assert len(data["military_bases"]) == 2
-        assert len(data["power_plants"]) == 2
-
-    def test_antimeridian_bbox(self, client, monkeypatch):
-        from services.fetchers import _store
-        # Box that straddles the antimeridian (Pacific): w=170, e=-170.
-        gdelt = [
-            {"lat": 0.0, "lng": 175.0, "id": "in-west"},
-            {"lat": 0.0, "lng": -175.0, "id": "in-east"},
-            {"lat": 0.0, "lng": 0.0, "id": "out-mid"},
-        ]
-        monkeypatch.setitem(_store.latest_data, "gdelt", gdelt)
-        monkeypatch.setitem(_store.active_layers, "global_incidents", True)
-        r = client.get("/api/live-data/slow?s=-10&w=170&n=10&e=-170")
-        assert r.status_code == 200
-        data = r.json()
-        ids = {g["id"] for g in data["gdelt"]}
-        assert "in-west" in ids
-        assert "in-east" in ids
-        assert "out-mid" not in ids
-
-
-# ─────────────────── Direct helper coverage (defensive) ─────────────────────
-
-
-class TestHelpers:
-    def test_has_full_bbox(self):
-        from routers.data import _has_full_bbox
-        assert _has_full_bbox(1, 2, 3, 4)
-        assert not _has_full_bbox(None, 2, 3, 4)
-        assert not _has_full_bbox(1, None, 3, 4)
-        assert not _has_full_bbox(1, 2, None, 4)
-        assert not _has_full_bbox(1, 2, 3, None)
-
-    def test_bbox_etag_suffix_quantizes(self):
-        from routers.data import _bbox_etag_suffix
-        a = _bbox_etag_suffix(30.1, -79.6, 39.9, -70.1)
-        b = _bbox_etag_suffix(30.4, -79.2, 39.4, -70.8)
-        assert a == b, "Sub-degree pan must collapse to the same ETag suffix"
-        assert a.startswith("|bbox=")
-
-    def test_bbox_etag_suffix_world_collapses(self):
-        from routers.data import _bbox_etag_suffix
-        # World-scale → empty suffix (shares the global ETag).
-        assert _bbox_etag_suffix(-90, -180, 90, 180) == ""
-
-    def test_bbox_etag_suffix_partial_is_empty(self):
-        from routers.data import _bbox_etag_suffix
-        assert _bbox_etag_suffix(None, -180, 90, 180) == ""
-
-    def test_apply_bbox_preserves_non_list_values(self):
-        from routers.data import _apply_bbox_to_payload, _FAST_BBOX_HEAVY_KEYS
-        payload = {
-            "commercial_flights": [{"lat": 35, "lng": -75, "id": "x"}],
-            "satellite_source": "tle",  # not a list, must pass through
-            "sigint_totals": {"total": 1},  # dict — must pass through
-        }
-        out = _apply_bbox_to_payload(dict(payload), _FAST_BBOX_HEAVY_KEYS, 30, -80, 40, -70)
-        assert out["satellite_source"] == "tle"
-        assert out["sigint_totals"] == {"total": 1}

backend/tests/test_no_new_duplicate_routes.py

@@ -1,208 +0,0 @@
-"""Issue #239 (tg12): backend registers duplicate API routes in both
-``main.py`` and router modules, so request behavior depends on the
-order ``FastAPI`` happened to register them.
-
-This test is the **CI guard** that locks in the invariant going forward.
-It does NOT delete any existing duplicates — those are tolerated via an
-explicit baseline file. What it DOES block is *new* duplicates appearing
-later, which is what the audit was actually asking for: a way to stop
-the drift before it gets worse.
-
-Findings (empirically verified, see PR #286 description):
-
-- ``main.app`` calls ``include_router(...)`` for every router at module
-  import time around line 3316.
-- Every ``@app.get/post/put/...`` decorator inside ``main.py`` runs
-  *after* those include_router calls, so the router handler is the one
-  that actually serves requests. The duplicates in ``main.py`` are
-  dead code at the route-resolution layer.
-- Behavior today is deterministic (router wins), but if someone later
-  adds a NEW route only in ``main.py``, or edits one copy of an
-  existing pair without the other, drift starts.
-
-How this test works:
-
-- Walks ``main.app.routes`` and records every ``(method, path)`` that
-  appears more than once, along with which modules registered each
-  copy.
-- Compares that set against the baseline in
-  ``backend/tests/data/duplicate_routes_baseline.json``.
-- **Fails** if any duplicate appears that is NOT in the baseline
-  (or if the registering modules for an existing duplicate change).
-- **Stays green** when duplicates are *removed* by genuinely deduping
-  the code. (The baseline is a ceiling, not a floor.)
-
-To extend in the future:
-
-- If you actually dedupe a route, leave the baseline alone — the test
-  still passes. Subsequent regenerations of the baseline (``python -m
-  scripts.regen_duplicate_routes_baseline`` or the snippet in this
-  test's docstring) will shrink it.
-- If you legitimately need a new duplicate (you probably do not), add
-  it to the baseline AND explain why in the PR description so reviewers
-  can push back.
-"""
-from __future__ import annotations
-
-import json
-from collections import defaultdict
-from pathlib import Path
-
-import pytest
-
-
-BASELINE_PATH = (
-    Path(__file__).parent / "data" / "duplicate_routes_baseline.json"
-)
-
-
-def _current_duplicates() -> dict[str, list[str]]:
-    """Walk ``main.app.routes`` and return ``{'METHOD /path': [module, ...]}``
-    for every (method, path) registered more than once."""
-    import main
-
-    by_key: dict[str, list[str]] = defaultdict(list)
-    for route in main.app.routes:
-        path = getattr(route, "path", None)
-        methods = getattr(route, "methods", None)
-        endpoint = getattr(route, "endpoint", None)
-        if not path or not methods or endpoint is None:
-            continue
-        for method in methods:
-            if method in ("HEAD", "OPTIONS"):
-                continue
-            by_key[f"{method} {path}"].append(endpoint.__module__)
-
-    return {
-        key: sorted(modules) for key, modules in by_key.items() if len(modules) > 1
-    }
-
-
-def _load_baseline() -> dict[str, list[str]]:
-    if not BASELINE_PATH.exists():
-        return {}
-    raw = json.loads(BASELINE_PATH.read_text(encoding="utf-8"))
-    dups = raw.get("duplicates", {})
-    if not isinstance(dups, dict):
-        return {}
-    return {k: sorted(v) for k, v in dups.items()}
-
-
-def test_no_new_duplicate_route_registrations():
-    """Block any (method, path) duplicate not already in the baseline.
-
-    This is the primary CI guard: PRs that add a NEW shadowed
-    ``@app.get`` while a router module already serves the same route
-    fail here with an actionable message.
-    """
-    current = _current_duplicates()
-    baseline = _load_baseline()
-
-    new_or_changed = []
-    for key, modules in sorted(current.items()):
-        if key not in baseline:
-            new_or_changed.append(
-                f"  + {key}  (NEW duplicate; registered in: {modules})"
-            )
-            continue
-        if modules != baseline[key]:
-            new_or_changed.append(
-                f"  ~ {key}  "
-                f"(modules changed: was {baseline[key]}, now {modules})"
-            )
-
-    if new_or_changed:
-        pytest.fail(
-            "Issue #239 CI guard: detected duplicate route registrations "
-            "that are NOT in the tolerated baseline.\n"
-            "\n"
-            "If you added a new @app.get/post/... in main.py for a path "
-            "that a router module already serves, please move the handler "
-            "into the router and delete the main.py copy — the router "
-            "version wins on request routing anyway, so the main.py copy "
-            "is dead code that just creates drift risk.\n"
-            "\n"
-            "Offending entries:\n"
-            + "\n".join(new_or_changed)
-            + "\n\n"
-            "Baseline lives at "
-            f"{BASELINE_PATH.relative_to(BASELINE_PATH.parent.parent.parent)}."
-        )
-
-
-def test_baseline_only_lists_real_duplicates():
-    """Catch baseline drift in the other direction: if an entry in the
-    baseline is no longer actually a duplicate (because someone deduped
-    it manually), the baseline is stale and should be shrunk so future
-    re-introductions of that duplicate get caught.
-
-    This test is informational — it does NOT fail the build today (the
-    audit's main concern is *new* duplicates, not stale baseline
-    entries). It prints a warning so the next baseline regeneration
-    can clean things up.
-    """
-    current = _current_duplicates()
-    baseline = _load_baseline()
-    stale = sorted(k for k in baseline if k not in current)
-    if stale:
-        # Use warnings instead of fail so this is friendly housekeeping,
-        # not a CI blocker. The other test catches the actual safety
-        # concern.
-        import warnings
-
-        warnings.warn(
-            f"duplicate_routes_baseline.json contains {len(stale)} entry/entries "
-            "no longer present in app.routes — consider regenerating the baseline. "
-            f"Stale: {stale[:5]}{'...' if len(stale) > 5 else ''}",
-            stacklevel=2,
-        )
-
-
-def test_router_handler_is_the_one_that_serves():
-    """Pin the empirical claim from PR #286: for every duplicated
-    (method, path), the FIRST-registered handler is in a router
-    module, not in main.py. If this ever flips — e.g. someone moves
-    include_router calls to the bottom of main.py — duplicate routes
-    start silently changing which handler runs. This catches that
-    rearrangement immediately.
-    """
-    import main
-
-    first_seen: dict[str, str] = {}
-    for route in main.app.routes:
-        path = getattr(route, "path", None)
-        methods = getattr(route, "methods", None)
-        endpoint = getattr(route, "endpoint", None)
-        if not path or not methods or endpoint is None:
-            continue
-        for method in methods:
-            if method in ("HEAD", "OPTIONS"):
-                continue
-            key = f"{method} {path}"
-            if key not in first_seen:
-                first_seen[key] = endpoint.__module__
-
-    main_winning = sorted(
-        k for k, mod in first_seen.items() if mod == "main"
-    )
-    # The duplicates we tolerate are router-first. If main is the first
-    # registered for any duplicated path, the router copy gets shadowed
-    # instead, which would invalidate every assumption made in audit
-    # rounds 5 and 6 about "the router version is canonical."
-    baseline = _load_baseline()
-    main_first_in_baseline = [k for k in main_winning if k in baseline]
-    if main_first_in_baseline:
-        pytest.fail(
-            "Issue #239 invariant broken: for at least one duplicated "
-            "(method, path), main.py is now registered FIRST and is "
-            "serving requests instead of the router copy. Audit rounds "
-            "5 and 6 assumed the router handler wins.\n"
-            "\n"
-            "Affected entries:\n"
-            + "\n".join(f"  {k}" for k in main_first_in_baseline)
-            + "\n\n"
-            "Most likely cause: someone moved app.include_router(...) "
-            "calls in main.py to after the @app.get decorators. Move "
-            "them back to before the @app routes (currently around "
-            "line 3316)."
-        )

backend/tests/test_openclaw_connect_info_reveal.py

@@ -1,334 +0,0 @@
-"""Issue #302 (tg12): OpenClaw connect-info HMAC secret disclosure.
-
-Before this change, ``GET /api/ai/connect-info?reveal=true`` returned the
-full HMAC secret in the response body on every modal open AND the same
-GET endpoint auto-bootstrapped (generated + persisted) the secret on a
-mere read. Even gated to ``require_local_operator``, that put the full
-secret into:
-
-  * browser visit history
-  * dev-tools network panel
-  * browser disk cache
-  * HAR exports
-  * screen captures / shoulder-surfing
-
-Every single time the OpenClaw Connect modal opened.
-
-After this change:
-
-  GET  /api/ai/connect-info            — always returns the MASKED
-                                          fingerprint. No ?reveal param.
-                                          No side effects (auto-bootstrap
-                                          gone).
-  POST /api/ai/connect-info/bootstrap  — mints+persists the secret if
-                                          missing. Idempotent. Never
-                                          returns the full secret.
-  POST /api/ai/connect-info/reveal     — returns the full secret with
-                                          strict Cache-Control: no-store
-                                          headers. POST so the body
-                                          doesn't land in URL history.
-  POST /api/ai/connect-info/regenerate — keeps the one-time-disclosure
-                                          for the new secret (regen IS a
-                                          deliberate destructive action).
-                                          Same no-store headers added.
-
-These tests pin every property.
-"""
-
-from __future__ import annotations
-
-import asyncio
-from unittest.mock import patch
-
-import pytest
-from httpx import ASGITransport, AsyncClient
-
-
-# ---------------------------------------------------------------------------
-# Loopback test client. ``require_local_operator`` resolves true for
-# request.client.host == "127.0.0.1"; FastAPI's TestClient sets it to
-# "testclient" which isn't on the allowlist. Use raw ASGITransport.
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture
-def loopback():
-    from main import app
-
-    class _Client:
-        def __init__(self, peer_ip: str = "127.0.0.1"):
-            self._loop = asyncio.new_event_loop()
-            self._transport = ASGITransport(app=app, client=(peer_ip, 12345))
-            self._base = f"http://{peer_ip}:8000"
-
-        def _do(self, method: str, url: str, **kw):
-            async def go():
-                async with AsyncClient(transport=self._transport, base_url=self._base) as ac:
-                    return await ac.request(method, url, **kw)
-            return self._loop.run_until_complete(go())
-
-        def get(self, url, **kw):  return self._do("GET", url, **kw)
-        def post(self, url, **kw): return self._do("POST", url, **kw)
-        def close(self): self._loop.close()
-
-    c = _Client()
-    yield c
-    c.close()
-
-
-@pytest.fixture
-def remote():
-    from main import app
-
-    class _Client:
-        def __init__(self):
-            self._loop = asyncio.new_event_loop()
-            self._transport = ASGITransport(app=app, client=("1.2.3.4", 12345))
-            self._base = "http://1.2.3.4:8000"
-
-        def _do(self, method: str, url: str, **kw):
-            async def go():
-                async with AsyncClient(transport=self._transport, base_url=self._base) as ac:
-                    return await ac.request(method, url, **kw)
-            return self._loop.run_until_complete(go())
-
-        def get(self, url, **kw):  return self._do("GET", url, **kw)
-        def post(self, url, **kw): return self._do("POST", url, **kw)
-        def close(self): self._loop.close()
-
-    c = _Client()
-    yield c
-    c.close()
-
-
-@pytest.fixture
-def stub_env(monkeypatch):
-    """Isolate connect-info tests from the dev's real backend .env.
-
-    Pydantic ``Settings()`` reads from ``.env`` file directly on
-    instantiation, so monkey-patching ``os.environ`` isn't sufficient
-    — the real ``OPENCLAW_HMAC_SECRET`` would leak through. Instead we
-    override ``get_settings()`` in the route module to return a fresh
-    ``Settings`` instance whose env values are driven entirely by an
-    in-test dict, AND we replace ``_write_env_value`` so writes update
-    that same dict instead of touching the developer's filesystem.
-
-    Yields the dict so individual tests can pre-seed values or assert
-    that writes happened.
-    """
-    import routers.ai_intel as ai_intel
-    import services.config as config
-
-    state: dict[str, str] = {}
-
-    class _FakeSettings:
-        @property
-        def OPENCLAW_HMAC_SECRET(self) -> str:
-            return state.get("OPENCLAW_HMAC_SECRET", "")
-
-        @property
-        def OPENCLAW_ACCESS_TIER(self) -> str:
-            return state.get("OPENCLAW_ACCESS_TIER", "restricted")
-
-    fake = _FakeSettings()
-
-    def _fake_get_settings():
-        return fake
-
-    # Route code calls ``get_settings.cache_clear()`` after writing the
-    # env. The production version is wrapped with ``@lru_cache``, so
-    # cache_clear exists. Attach a no-op shim here.
-    _fake_get_settings.cache_clear = lambda: None  # type: ignore[attr-defined]
-
-    monkeypatch.setattr(config, "get_settings", _fake_get_settings)
-
-    def _fake_write_env_value(key: str, value: str) -> None:
-        state[key] = value
-
-    monkeypatch.setattr(ai_intel, "_write_env_value", _fake_write_env_value)
-
-    yield state
-
-
-# ---------------------------------------------------------------------------
-# GET /api/ai/connect-info — always masked, no auto-bootstrap
-# ---------------------------------------------------------------------------
-
-
-class TestGetConnectInfoMasking:
-    def test_returns_masked_when_secret_set(self, loopback, stub_env):
-        secret = "abcdef" + "0" * 38 + "wxyz"
-        stub_env["OPENCLAW_HMAC_SECRET"] = secret
-
-        r = loopback.get("/api/ai/connect-info")
-        assert r.status_code == 200
-        body = r.json()
-        # Body must NOT carry the full secret value anywhere.
-        assert secret not in r.text, (
-            "GET /api/ai/connect-info MUST NOT include the full HMAC "
-            "secret. Response body contained the secret value."
-        )
-        assert body["hmac_secret_set"] is True
-        assert body["masked_hmac_secret"].startswith("abcdef")
-        assert body["masked_hmac_secret"].endswith("wxyz")
-        assert "•" in body["masked_hmac_secret"]
-        # Pre-fix field is gone.
-        assert "hmac_secret" not in body
-
-    def test_no_auto_bootstrap_when_secret_missing(self, loopback, stub_env):
-        """Side-effect-on-GET was the second half of issue #302. A GET
-        with no secret configured must NOT mint one — that should
-        require an explicit POST /bootstrap."""
-        r = loopback.get("/api/ai/connect-info")
-        assert r.status_code == 200
-        body = r.json()
-        assert body["hmac_secret_set"] is False
-        assert body["masked_hmac_secret"] == ""
-        # The bootstrap_behavior block should advertise the new flow.
-        assert body["bootstrap_behavior"]["auto_generates_when_missing"] is False
-        # And no _write_env_value call happened.
-        assert "OPENCLAW_HMAC_SECRET" not in stub_env
-
-    def test_no_reveal_query_param(self, loopback, stub_env):
-        """Pre-fix, ?reveal=true would return the full secret. Post-fix
-        the param is silently ignored — the response is the same as
-        without it (still masked, no leak)."""
-        secret = "abcdef" + "0" * 38 + "wxyz"
-        stub_env["OPENCLAW_HMAC_SECRET"] = secret
-
-        r = loopback.get("/api/ai/connect-info?reveal=true")
-        assert r.status_code == 200
-        assert secret not in r.text, (
-            "?reveal=true must be a no-op on GET — the full secret "
-            "MUST NOT come back in the response body."
-        )
-
-
-# ---------------------------------------------------------------------------
-# POST /api/ai/connect-info/bootstrap
-# ---------------------------------------------------------------------------
-
-
-class TestBootstrap:
-    def test_mints_when_missing(self, loopback, stub_env):
-        r = loopback.post("/api/ai/connect-info/bootstrap")
-        assert r.status_code == 200
-        body = r.json()
-        assert body["ok"] is True
-        assert body["generated"] is True
-        assert body["hmac_secret_set"] is True
-        # Bootstrap must NOT return the full secret in-line.
-        assert "hmac_secret" not in body or not body.get("hmac_secret")
-        assert "•" in body["masked_hmac_secret"]
-        # _write_env_value was actually called.
-        assert stub_env.get("OPENCLAW_HMAC_SECRET")
-        # The full value isn't echoed back in the response text either.
-        assert stub_env["OPENCLAW_HMAC_SECRET"] not in r.text
-
-    def test_idempotent_when_already_set(self, loopback, stub_env):
-        existing = "abcdef" + "0" * 38 + "wxyz"
-        stub_env["OPENCLAW_HMAC_SECRET"] = existing
-
-        r = loopback.post("/api/ai/connect-info/bootstrap")
-        assert r.status_code == 200
-        body = r.json()
-        assert body["ok"] is True
-        assert body["generated"] is False
-        assert body["hmac_secret_set"] is True
-        # Existing secret untouched — value is still the seeded one.
-        assert stub_env["OPENCLAW_HMAC_SECRET"] == existing
-        # No full secret in the response.
-        assert existing not in r.text
-
-
-# ---------------------------------------------------------------------------
-# POST /api/ai/connect-info/reveal
-# ---------------------------------------------------------------------------
-
-
-class TestReveal:
-    def test_returns_full_secret_when_set(self, loopback, stub_env):
-        secret = "abcdef" + "0" * 38 + "wxyz"
-        stub_env["OPENCLAW_HMAC_SECRET"] = secret
-
-        r = loopback.post("/api/ai/connect-info/reveal")
-        assert r.status_code == 200
-        body = r.json()
-        assert body["ok"] is True
-        assert body["hmac_secret"] == secret
-
-    def test_strict_cache_control_headers(self, loopback, stub_env):
-        """The whole point of POST /reveal vs GET ?reveal=true is that
-        the response carries headers that prevent every cache layer
-        from persisting the secret."""
-        secret = "abcdef" + "0" * 38 + "wxyz"
-        stub_env["OPENCLAW_HMAC_SECRET"] = secret
-
-        r = loopback.post("/api/ai/connect-info/reveal")
-        cc = r.headers.get("cache-control", "")
-        assert "no-store" in cc, (
-            f"reveal MUST set Cache-Control: no-store — got {cc!r}"
-        )
-        assert "no-cache" in cc
-        # Pragma + Expires as well for HTTP/1.0 caches.
-        assert r.headers.get("pragma", "").lower() == "no-cache"
-        assert r.headers.get("expires") == "0"
-
-    def test_404_when_no_secret_configured(self, loopback, stub_env):
-        r = loopback.post("/api/ai/connect-info/reveal")
-        assert r.status_code == 404
-        # Hint should point at the bootstrap endpoint, not just say "404".
-        detail = r.json().get("detail", "")
-        assert "/bootstrap" in detail or "bootstrap" in detail.lower()
-
-
-# ---------------------------------------------------------------------------
-# POST /api/ai/connect-info/regenerate — still returns the new secret
-# inline (deliberate destructive action), but with no-store headers.
-# ---------------------------------------------------------------------------
-
-
-class TestRegenerate:
-    def test_returns_new_secret_with_no_store_headers(self, loopback, stub_env):
-        # Seed an existing secret so we can prove it changes.
-        old = "oldold" + "0" * 38 + "1234"
-        stub_env["OPENCLAW_HMAC_SECRET"] = old
-
-        r = loopback.post("/api/ai/connect-info/regenerate")
-        assert r.status_code == 200
-        body = r.json()
-        assert body["ok"] is True
-        assert body["hmac_secret"]
-        assert body["hmac_secret"] != old
-        # no-store headers MUST be present so the new secret doesn't
-        # land in browser disk cache after the regenerate click.
-        cc = r.headers.get("cache-control", "")
-        assert "no-store" in cc and "no-cache" in cc
-        assert r.headers.get("pragma", "").lower() == "no-cache"
-
-
-# ---------------------------------------------------------------------------
-# Auth-gate regression — every endpoint still rejects anonymous remote
-# callers. This is the property we already enforce for the rest of the
-# operator-only surface; adding the three new endpoints to the audit
-# coverage prevents a future refactor from dropping the dependency.
-# ---------------------------------------------------------------------------
-
-
-class TestAnonymousRejection:
-    @pytest.mark.parametrize(
-        "method,path,body",
-        [
-            ("get",  "/api/ai/connect-info",            None),
-            ("post", "/api/ai/connect-info/bootstrap",  None),
-            ("post", "/api/ai/connect-info/reveal",     None),
-            ("post", "/api/ai/connect-info/regenerate", None),
-        ],
-    )
-    def test_remote_rejected(self, remote, method, path, body):
-        fn = getattr(remote, method)
-        r = fn(path, json=body) if body is not None else fn(path)
-        assert r.status_code == 403, (
-            f"{method.upper()} {path} must reject anonymous remote callers; "
-            f"got {r.status_code}"
-        )

backend/tests/test_per_operator_outbound_attribution.py

@@ -1,281 +0,0 @@
-"""Round 7a: per-install operator handle threads through every outbound
-third-party API call.
-
-Background: before this change every Shadowbroker install identified
-itself to Wikipedia, Wikidata, Nominatim, GDELT, OpenMHz, Broadcastify,
-weather.gov, NUFORC, etc. with a single project-wide ``Shadowbroker``
-User-Agent. From the upstream's perspective, every install in the world
-looked like one giant scraper. If one install misbehaved, the upstream's
-only recourse was to block ``Shadowbroker`` as a whole, taking out every
-other install.
-
-Fix: each install gets a stable pseudonymous handle (auto-generated like
-``shadow-7f3a92`` or operator-overridden via ``OPERATOR_HANDLE``) that
-gets embedded in the User-Agent for every outbound call. Upstreams can
-now rate-limit / contact the specific operator instead of the project.
-
-These tests pin:
-
-  1. The handle is auto-generated on first call if no override exists.
-  2. The handle survives process restart (persisted to disk).
-  3. ``OPERATOR_HANDLE`` env var override wins over the auto-gen handle.
-  4. The handle is sanitized (whitespace, special chars, length).
-  5. Every previously-MONSTER-UA call site now sends the per-operator UA.
-"""
-from __future__ import annotations
-
-import json
-import os
-from pathlib import Path
-from unittest.mock import patch
-
-import pytest
-
-
-@pytest.fixture
-def isolated_handle(tmp_path, monkeypatch):
-    """Redirect the persistence path to tmp and reset caches between tests."""
-    from services import network_utils
-
-    handle_file = tmp_path / "operator_handle.json"
-    monkeypatch.setattr(network_utils, "_OPERATOR_HANDLE_FILE", handle_file)
-    network_utils._reset_operator_handle_cache_for_tests()
-    monkeypatch.delenv("OPERATOR_HANDLE", raising=False)
-
-    # Reset Settings cache so OPERATOR_HANDLE env changes are picked up.
-    from services.config import get_settings
-    get_settings.cache_clear()
-
-    yield network_utils
-
-    network_utils._reset_operator_handle_cache_for_tests()
-    get_settings.cache_clear()
-
-
-# ---------------------------------------------------------------------------
-# Core handle generation / persistence / override
-# ---------------------------------------------------------------------------
-
-
-class TestOperatorHandleGeneration:
-    def test_auto_generates_on_first_call(self, isolated_handle):
-        h = isolated_handle.get_operator_handle()
-        # Prefix is "operator-" (deliberately neutral; "shadow-" looked
-        # exactly like a pattern abuse-detection systems would auto-block).
-        assert h.startswith("operator-")
-        assert len(h) == len("operator-") + 6
-        # Hex suffix.
-        suffix = h.split("-", 1)[1]
-        int(suffix, 16)  # raises if not hex
-
-    def test_persists_to_disk_so_handle_survives_restart(self, isolated_handle):
-        first = isolated_handle.get_operator_handle()
-        # Simulate process restart: clear in-memory cache, then ask again.
-        isolated_handle._reset_operator_handle_cache_for_tests()
-        second = isolated_handle.get_operator_handle()
-        assert second == first
-        # The file actually exists.
-        assert isolated_handle._OPERATOR_HANDLE_FILE.exists()
-        body = json.loads(isolated_handle._OPERATOR_HANDLE_FILE.read_text())
-        assert body["handle"] == first
-
-    def test_env_override_wins_over_auto_generated(self, isolated_handle, monkeypatch):
-        # First call without env var auto-generates.
-        auto = isolated_handle.get_operator_handle()
-        assert auto.startswith("operator-")
-        # Setting env var changes the resolved handle without touching the disk file.
-        monkeypatch.setenv("OPERATOR_HANDLE", "alice")
-        from services.config import get_settings
-        get_settings.cache_clear()
-        isolated_handle._reset_operator_handle_cache_for_tests()
-        assert isolated_handle.get_operator_handle() == "alice"
-
-    def test_handle_is_sanitized(self, isolated_handle, monkeypatch):
-        from services.config import get_settings
-
-        # Sanitization tests run against the normalizer directly so the
-        # empty-string case can be asserted independently of the env-var
-        # resolution path (where empty means "use auto-gen", not "use
-        # 'anonymous'").
-        from services.network_utils import _normalize_handle
-
-        cases = [
-            ("Alice Smith", "alice-smith"),
-            ("user@example.com", "user-example-com"),
-            ("  whitespace  ", "whitespace"),
-            ("UPPER-CASE", "upper-case"),
-            ("multiple---dashes", "multiple-dashes"),
-            ("/leading/slash", "leading-slash"),
-            ("trailing-", "trailing"),
-            ("", "anonymous"),
-        ]
-        for raw, expected in cases:
-            got = _normalize_handle(raw)
-            assert got == expected, f"{raw!r} -> {got!r}, expected {expected!r}"
-            assert got == got.lower()
-            for ch in got:
-                assert ch.isalnum() or ch in "-_", f"unsafe char {ch!r} in {got!r}"
-            assert "--" not in got
-
-    def test_handle_is_length_capped(self, isolated_handle, monkeypatch):
-        from services.config import get_settings
-
-        monkeypatch.setenv("OPERATOR_HANDLE", "x" * 1000)
-        get_settings.cache_clear()
-        isolated_handle._reset_operator_handle_cache_for_tests()
-        got = isolated_handle.get_operator_handle()
-        assert len(got) <= 48
-
-
-# ---------------------------------------------------------------------------
-# outbound_user_agent() builds the right header
-# ---------------------------------------------------------------------------
-
-
-class TestOutboundUserAgentString:
-    def test_includes_operator_handle(self, isolated_handle):
-        ua = isolated_handle.outbound_user_agent()
-        handle = isolated_handle.get_operator_handle()
-        assert f"operator: {handle}" in ua
-
-    def test_includes_purpose_when_provided(self, isolated_handle):
-        ua = isolated_handle.outbound_user_agent("wikipedia")
-        assert "purpose: wikipedia" in ua
-
-    def test_includes_contact_path(self, isolated_handle):
-        ua = isolated_handle.outbound_user_agent()
-        assert "github.com" in ua.lower()
-        assert "shadowbroker" in ua.lower()
-
-    def test_version_prefix(self, isolated_handle):
-        ua = isolated_handle.outbound_user_agent()
-        assert ua.startswith("Shadowbroker/")
-
-
-# ---------------------------------------------------------------------------
-# Wikipedia / Wikidata — retroactive fix for PR #284's MONSTER pattern
-# ---------------------------------------------------------------------------
-
-
-class TestWikimediaCallsAreNowPerOperator:
-    def test_wikidata_call_uses_per_operator_ua(self, isolated_handle, monkeypatch):
-        from services import region_dossier
-
-        captured = []
-
-        class _FakeResp:
-            status_code = 200
-            def json(self):
-                return {"results": {"bindings": []}}
-
-        def fake_fetch(url, **kwargs):
-            captured.append(kwargs.get("headers") or {})
-            return _FakeResp()
-
-        monkeypatch.setattr(region_dossier, "fetch_with_curl", fake_fetch)
-        region_dossier._fetch_wikidata_leader("Testlandia")
-
-        assert captured, "Wikidata fetcher was not called"
-        headers = captured[0]
-        assert "User-Agent" in headers
-        assert "Api-User-Agent" in headers
-        handle = isolated_handle.get_operator_handle()
-        for header_value in (headers["User-Agent"], headers["Api-User-Agent"]):
-            assert f"operator: {handle}" in header_value, (
-                f"Wikimedia UA must include the per-operator handle; got {header_value!r}"
-            )
-
-    def test_wikipedia_summary_uses_per_operator_ua(self, isolated_handle, monkeypatch):
-        from services import region_dossier
-
-        captured = []
-
-        class _FakeResp:
-            status_code = 200
-            def json(self):
-                return {
-                    "type": "standard",
-                    "description": "x",
-                    "extract": "y",
-                    "thumbnail": {"source": ""},
-                }
-
-        def fake_fetch(url, **kwargs):
-            captured.append((url, kwargs.get("headers") or {}))
-            return _FakeResp()
-
-        monkeypatch.setattr(region_dossier, "fetch_with_curl", fake_fetch)
-        region_dossier._fetch_local_wiki_summary("Paris", "France")
-
-        wikipedia_hits = [c for c in captured if "wikipedia.org" in c[0]]
-        assert wikipedia_hits, "Wikipedia summary fetch was not called"
-        for _url, headers in wikipedia_hits:
-            handle = isolated_handle.get_operator_handle()
-            assert f"operator: {handle}" in headers.get("User-Agent", "")
-
-
-# ---------------------------------------------------------------------------
-# Generic round-7a regression guard
-# ---------------------------------------------------------------------------
-
-
-class TestNoMonsterUserAgentRemains:
-    """The audit's underlying concern was that every Shadowbroker install
-    looked like one entity. This test scans the codebase for the OLD
-    aggregate identifier patterns and fails if a new one sneaks back in.
-
-    We allow the strings to appear in:
-      - comments (audit prose, change-log notes)
-      - tests
-      - .env.example (documentation)
-    The test only fails if the string lives in actual outbound-request
-    HEADER values without going through the per-operator helper.
-    """
-
-    BANNED_LITERALS = (
-        "ShadowBroker-OSINT/1.0",
-        "ShadowBroker-OSINT/0.9",
-        "ShadowBroker-FeedIngester/1.0",
-        "ShadowBroker/0.9.79 local Shodan connector",
-        "ShadowBroker/0.9.79 Finnhub connector",
-        "ShadowBroker/0.9.8 local Shodan connector",
-        "ShadowBroker/0.9.8 Finnhub connector",
-        "ShadowBroker/0.9.81 local Shodan connector",
-        "ShadowBroker/0.9.81 Finnhub connector",
-        "Mozilla/5.0 (compatible; ShadowBroker CCTV proxy)",
-    )
-
-    def test_no_banned_aggregate_user_agent_strings(self):
-        from pathlib import Path
-
-        backend_root = Path(__file__).parent.parent
-        offenders = []
-        for py in backend_root.rglob("*.py"):
-            # Skip test files and any audit-context comments.
-            rel = py.relative_to(backend_root).as_posix()
-            if rel.startswith("tests/"):
-                continue
-            text = py.read_text(encoding="utf-8", errors="ignore")
-            # Look only for the literal as part of a string in a User-Agent
-            # context: cheap heuristic via "User-Agent" + literal coexisting
-            # in the same file. A literal in a comment block won't trigger
-            # because the same line won't have User-Agent surrounding it.
-            for banned in self.BANNED_LITERALS:
-                if banned in text:
-                    # Walk lines to ensure it's a real header value.
-                    for i, line in enumerate(text.splitlines(), 1):
-                        if banned in line:
-                            # Comments / docstrings are allowed — only fail
-                            # if the line looks like a header assignment.
-                            stripped = line.strip()
-                            if stripped.startswith("#"):
-                                continue
-                            if '"User-Agent"' in line or "'User-Agent'" in line:
-                                offenders.append(f"{rel}:{i}: {stripped[:120]}")
-        assert not offenders, (
-            "Round 7a regression: the following lines reintroduced an "
-            "aggregate Shadowbroker User-Agent. Use "
-            "outbound_user_agent('purpose') instead so the per-install "
-            "operator handle is embedded.\n"
-            + "\n".join(offenders)
-        )

backend/tests/test_rate_limit_proxy_aware.py

@@ -1,186 +0,0 @@
-"""Tests for issue #287: proxy-aware slowapi key function.
-
-Contract:
- * Untrusted peer → key is the peer IP (matches old get_remote_address).
- * Trusted frontend peer with X-Forwarded-For → key is first XFF entry.
- * Trusted frontend peer without X-Forwarded-For → key is the peer IP
-   (fail-soft: no behaviour change vs. before #287).
- * XFF from an untrusted peer is IGNORED — there must be no way to
-   spoof another operator's bucket by sending XFF directly.
- * The first XFF entry is used (not the last — that's the trusted
-   proxy talking to the backend, not the actual operator).
-"""
-
-import pytest
-
-
-class _FakeClient:
-    def __init__(self, host: str):
-        self.host = host
-
-
-class _FakeRequest:
-    """Minimal slowapi-compatible request shim — has ``client`` and
-    ``headers`` attributes, which is all the key_func touches."""
-
-    def __init__(self, client_host: str, headers: dict | None = None):
-        self.client = _FakeClient(client_host) if client_host is not None else None
-        self.headers = dict(headers or {})
-        # slowapi's get_remote_address also tries request.client; we
-        # exercise both branches via the same shim.
-
-
-# ───────────────────────── untrusted peers ──────────────────────────────
-
-
-class TestUntrustedPeer:
-    def test_direct_loopback_uses_client_host(self, monkeypatch):
-        """Direct hit from 127.0.0.1 — no XFF — keys on the peer IP."""
-        from limiter import shadowbroker_rate_limit_key
-        # Make sure the trusted-frontend cache resolves to nothing relevant.
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset())
-        req = _FakeRequest("127.0.0.1")
-        assert shadowbroker_rate_limit_key(req) == "127.0.0.1"
-
-    def test_xff_from_untrusted_peer_is_ignored(self, monkeypatch):
-        """A random caller sending X-Forwarded-For must NOT steal another
-        operator's bucket. The XFF is dropped on the floor."""
-        from limiter import shadowbroker_rate_limit_key
-        # Trusted set deliberately does NOT include 1.2.3.4.
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        req = _FakeRequest("1.2.3.4", {"X-Forwarded-For": "9.9.9.9"})
-        # Falls back to the peer IP, not 9.9.9.9.
-        assert shadowbroker_rate_limit_key(req) == "1.2.3.4"
-
-    def test_unknown_host_with_xff_uses_peer_host(self, monkeypatch):
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset())
-        req = _FakeRequest("10.0.0.5", {"X-Forwarded-For": "1.1.1.1"})
-        assert shadowbroker_rate_limit_key(req) == "10.0.0.5"
-
-
-# ───────────────────────── trusted frontend peers ───────────────────────
-
-
-class TestTrustedFrontendPeer:
-    def test_trusted_peer_with_xff_uses_first_xff_entry(self, monkeypatch):
-        """When the immediate peer is the trusted frontend container and
-        XFF carries the operator's chain, we key on the operator."""
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        req = _FakeRequest("172.20.0.5", {"X-Forwarded-For": "203.0.113.7"})
-        assert shadowbroker_rate_limit_key(req) == "203.0.113.7"
-
-    def test_first_xff_entry_picked_in_chain(self, monkeypatch):
-        """`client, proxy1, proxy2` → we pick the client, not the proxies.
-        Picking the last entry would mean every operator behind the same
-        upstream gets bucketed together, which is the bug we're fixing."""
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        req = _FakeRequest(
-            "172.20.0.5",
-            {"X-Forwarded-For": "203.0.113.7, 198.51.100.1, 10.0.0.1"},
-        )
-        assert shadowbroker_rate_limit_key(req) == "203.0.113.7"
-
-    def test_trusted_peer_without_xff_falls_back_to_peer(self, monkeypatch):
-        """If the trusted frontend forgot to forward XFF (legacy clients,
-        broken deploys), don't crash — bucket on the bridge IP exactly
-        like the pre-#287 behaviour."""
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        req = _FakeRequest("172.20.0.5", headers={})
-        assert shadowbroker_rate_limit_key(req) == "172.20.0.5"
-
-    def test_trusted_peer_with_empty_xff_falls_back(self, monkeypatch):
-        """``X-Forwarded-For: ,  ,`` → no usable entries → falls back."""
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        req = _FakeRequest("172.20.0.5", {"X-Forwarded-For": " , , "})
-        assert shadowbroker_rate_limit_key(req) == "172.20.0.5"
-
-    def test_xff_header_case_insensitive(self, monkeypatch):
-        """HTTP header names are case-insensitive — slowapi normalises
-        but our shim doesn't, so we explicitly check both forms."""
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        req = _FakeRequest("172.20.0.5", {"x-forwarded-for": "203.0.113.7"})
-        assert shadowbroker_rate_limit_key(req) == "203.0.113.7"
-
-
-# ───────────────────────── isolation guarantees ─────────────────────────
-
-
-class TestIsolation:
-    def test_two_operators_behind_same_proxy_get_different_keys(self, monkeypatch):
-        """The whole reason this fix exists — two operators behind the
-        SAME proxy must end up in DIFFERENT buckets."""
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        op_a = _FakeRequest("172.20.0.5", {"X-Forwarded-For": "10.1.1.1"})
-        op_b = _FakeRequest("172.20.0.5", {"X-Forwarded-For": "10.1.1.2"})
-        key_a = shadowbroker_rate_limit_key(op_a)
-        key_b = shadowbroker_rate_limit_key(op_b)
-        assert key_a != key_b
-        assert key_a == "10.1.1.1"
-        assert key_b == "10.1.1.2"
-
-    def test_no_xff_spoof_from_outside(self, monkeypatch):
-        """If we ever expose the backend port directly to the internet,
-        an attacker MUST NOT be able to steal another operator's bucket
-        by sending their own XFF header."""
-        from limiter import shadowbroker_rate_limit_key
-        # Trusted set is the frontend container IP; the attacker is on a
-        # different (untrusted) IP and tries to spoof a victim's IP.
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset({"172.20.0.5"}))
-        attacker = _FakeRequest("203.0.113.66", {"X-Forwarded-For": "10.1.1.1"})
-        victim_via_proxy = _FakeRequest("172.20.0.5", {"X-Forwarded-For": "10.1.1.1"})
-        assert shadowbroker_rate_limit_key(attacker) == "203.0.113.66"
-        assert shadowbroker_rate_limit_key(victim_via_proxy) == "10.1.1.1"
-        # The attacker burning their own bucket doesn't touch the victim's.
-        assert shadowbroker_rate_limit_key(attacker) != shadowbroker_rate_limit_key(
-            victim_via_proxy
-        )
-
-    def test_limiter_object_uses_proxy_aware_key(self):
-        """Smoke check that the module-level Limiter exports the new key
-        function rather than slowapi's default."""
-        from limiter import limiter, shadowbroker_rate_limit_key
-        # slowapi stores it as ._key_func; we don't want to depend on
-        # that internal name, so just check the function is reachable.
-        assert callable(shadowbroker_rate_limit_key)
-        assert limiter is not None
-
-
-# ───────────────────────── defensive corners ────────────────────────────
-
-
-class TestDefensive:
-    def test_no_client_object(self, monkeypatch):
-        """Some upstream middleware paths (websocket, ASGI lifespan)
-        produce requests with no ``client`` attribute — must not raise."""
-        from limiter import shadowbroker_rate_limit_key
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", lambda: frozenset())
-
-        class _NoClient:
-            def __init__(self):
-                self.client = None
-                self.headers = {}
-
-        # slowapi's get_remote_address returns "127.0.0.1" as a default
-        # in this case, so we just ensure no exception escapes.
-        result = shadowbroker_rate_limit_key(_NoClient())
-        assert isinstance(result, str)
-
-    def test_resolver_raises_is_treated_as_untrusted(self, monkeypatch):
-        """If DNS blows up inside the trusted-bridge resolver, we MUST
-        fall back to peer IP — never accept XFF blindly."""
-        from limiter import shadowbroker_rate_limit_key
-
-        def _explode():
-            raise RuntimeError("DNS down")
-
-        monkeypatch.setattr("auth._resolve_trusted_bridge_ips", _explode)
-        req = _FakeRequest("172.20.0.5", {"X-Forwarded-For": "9.9.9.9"})
-        # XFF must be ignored when we can't confirm peer is trusted.
-        assert shadowbroker_rate_limit_key(req) == "172.20.0.5"

backend/tests/test_region_dossier_wikimedia_ua.py

@@ -77,25 +77,15 @@ def test_wikipedia_summary_call_passes_wikimedia_request_headers():
         assert "github.com" in headers["Api-User-Agent"].lower()
 
 
-def test_wikimedia_headers_helper_is_stable():
-    """Regression guard: if someone removes the contact path or the
-    per-operator handle from the Wikimedia headers, we want a loud
-    test failure, not a silent ToS drift.
-
-    Round 7a: the original ``_WIKIMEDIA_REQUEST_HEADERS`` constant was
-    replaced with the ``_wikimedia_request_headers()`` function so the
-    per-install operator handle is embedded at call time. This test
-    pins both the project identifier AND the contact path AND the
-    per-operator format.
+def test_wikimedia_headers_constant_is_stable():
+    """Regression guard: if someone removes the contact path from the
+    Api-User-Agent we want a loud test failure, not a silent ToS drift.
     """
-    from services.region_dossier import _wikimedia_request_headers
+    from services.region_dossier import _WIKIMEDIA_REQUEST_HEADERS
 
-    headers = _wikimedia_request_headers()
-    aua = headers.get("Api-User-Agent", "")
-    ua = headers.get("User-Agent", "")
-    for h, label in ((ua, "User-Agent"), (aua, "Api-User-Agent")):
-        assert "Shadowbroker" in h or "ShadowBroker" in h, f"{label} missing project id"
-        assert "github.com" in h.lower(), f"{label} missing contact URL"
-        assert "issues" in h.lower(), f"{label} missing /issues contact path"
-        # Round 7a: must include the per-operator handle.
-        assert "operator:" in h, f"{label} missing per-operator handle: {h!r}"
+    aua = _WIKIMEDIA_REQUEST_HEADERS.get("Api-User-Agent", "")
+    assert "Shadowbroker" in aua or "ShadowBroker" in aua
+    assert "github.com" in aua.lower()
+    # Must include a path Wikimedia operators can use to contact us
+    # (we use /issues against the public repo).
+    assert "issues" in aua.lower()

backend/tests/test_sentinel_credentials_server_side.py

@@ -1,277 +0,0 @@
-"""Issue #298 (tg12): Sentinel credentials must live server-side.
-
-Before the fix, ``frontend/src/components/SettingsPanel.tsx`` stored
-``client_id`` and ``client_secret`` in ``localStorage`` /
-``sessionStorage`` via the privacy storage helper, and the proxy routes
-in ``backend/routers/tools.py`` REQUIRED those values to come in the
-request body. Any same-origin script (XSS, malicious extension,
-dev-tools HAR export) had read access to real third-party Sentinel
-credentials.
-
-After the fix:
-
-  * ``SENTINEL_CLIENT_ID`` and ``SENTINEL_CLIENT_SECRET`` are entries
-    in the ``api_settings.API_REGISTRY`` and are persisted via the
-    existing ``/api/settings/api-keys`` flow (admin-gated, .env-backed,
-    never returned to the browser).
-  * The proxy routes prefer request-body values for back-compat but
-    fall back to ``os.environ.get("SENTINEL_CLIENT_ID")`` /
-    ``os.environ.get("SENTINEL_CLIENT_SECRET")`` when the body omits
-    them. The dashboard's ``sentinelHub.ts`` no longer sends credentials
-    in the body — every request now hits the env path.
-  * When neither source has a value, the route returns a 400 with a
-    pointer to the API Keys panel rather than a curt "client_id and
-    client_secret required" message.
-
-These tests cover the resolution order and the registry surface.
-"""
-
-from __future__ import annotations
-
-from unittest.mock import patch, MagicMock
-
-import pytest
-
-
-# ---------------------------------------------------------------------------
-# Helper: import the routes module fresh per test so monkey-patched
-# environment variables are picked up by the route's os.environ.get call.
-# (The lookup is per-request, not at import time, so this isn't strictly
-# required — but it makes the test layout obvious.)
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture
-def loopback_client():
-    """ASGI client with peer IP 127.0.0.1 so the Sentinel routes' (post-#303)
-    ``require_local_operator`` gate passes.
-
-    Built without a context manager so the privacy-core lifespan check
-    doesn't run in the test env.
-    """
-    import asyncio
-    from httpx import ASGITransport, AsyncClient
-    from main import app
-
-    class _Loop:
-        def __init__(self):
-            self._loop = asyncio.new_event_loop()
-            self._transport = ASGITransport(app=app, client=("127.0.0.1", 12345))
-            self._base = "http://127.0.0.1:8000"
-
-        def _do(self, method: str, url: str, **kw):
-            async def go():
-                async with AsyncClient(transport=self._transport, base_url=self._base) as ac:
-                    return await ac.request(method, url, **kw)
-            return self._loop.run_until_complete(go())
-
-        def get(self, url, **kw):  return self._do("GET", url, **kw)
-        def post(self, url, **kw): return self._do("POST", url, **kw)
-        def put(self, url, **kw):  return self._do("PUT", url, **kw)
-
-        def close(self): self._loop.close()
-
-    c = _Loop()
-    yield c
-    c.close()
-
-
-# ---------------------------------------------------------------------------
-# API_REGISTRY surface
-# ---------------------------------------------------------------------------
-
-
-class TestApiRegistry:
-    def test_sentinel_keys_registered(self):
-        """Both Sentinel keys must be entries in API_REGISTRY so the
-        existing /api/settings/api-keys PUT flow can write them to .env."""
-        from services.api_settings import API_REGISTRY, ALLOWED_ENV_KEYS
-
-        ids = {row["id"] for row in API_REGISTRY}
-        assert "sentinel_client_id" in ids
-        assert "sentinel_client_secret" in ids
-
-        # Critical: ALLOWED_ENV_KEYS is the gate on which .env keys the
-        # API can mutate. If we forgot to add the env_key field on the
-        # registry rows, callers couldn't actually save the values.
-        assert "SENTINEL_CLIENT_ID" in ALLOWED_ENV_KEYS
-        assert "SENTINEL_CLIENT_SECRET" in ALLOWED_ENV_KEYS
-
-    def test_api_keys_put_accepts_sentinel_keys(self, loopback_client, monkeypatch, tmp_path):
-        """End-to-end: PUT /api/settings/api-keys with SENTINEL_CLIENT_ID
-        + SENTINEL_CLIENT_SECRET must persist to .env."""
-        import services.api_settings as api_settings
-
-        # Redirect both .env paths to tmp so the test doesn't mutate
-        # the developer's real backend .env.
-        tmp_env = tmp_path / ".env"
-        monkeypatch.setattr(api_settings, "ENV_PATH", tmp_env)
-        monkeypatch.setattr(api_settings, "OPERATOR_KEYS_ENV_PATH", tmp_path / "operator_api_keys.env")
-
-        r = loopback_client.put(
-            "/api/settings/api-keys",
-            json={
-                "SENTINEL_CLIENT_ID": "test-sentinel-id",
-                "SENTINEL_CLIENT_SECRET": "test-sentinel-secret",
-            },
-        )
-        assert r.status_code == 200, f"PUT failed: {r.text}"
-        body = r.json()
-        assert body.get("ok") is True
-
-        # File on disk should now carry both keys.
-        parsed = api_settings._parse_env_file(tmp_env)
-        assert parsed.get("SENTINEL_CLIENT_ID") == "test-sentinel-id"
-        assert parsed.get("SENTINEL_CLIENT_SECRET") == "test-sentinel-secret"
-
-
-# ---------------------------------------------------------------------------
-# Credential resolution — body wins, env is fallback, neither is 400
-# ---------------------------------------------------------------------------
-
-
-class TestSentinelTokenCredResolution:
-    def test_env_fallback_when_body_empty(self, loopback_client, monkeypatch):
-        """No body credentials → backend reads .env values."""
-        monkeypatch.setenv("SENTINEL_CLIENT_ID", "env-id")
-        monkeypatch.setenv("SENTINEL_CLIENT_SECRET", "env-secret")
-
-        # Mock the upstream Copernicus call so we don't hit the network.
-        # Capture what was sent so we can prove env values were used.
-        captured: dict = {}
-        fake_resp = MagicMock()
-        fake_resp.status_code = 200
-        fake_resp.content = b'{"access_token": "stub", "expires_in": 300}'
-
-        def fake_post(url, *args, **kwargs):
-            captured["url"] = url
-            captured["data"] = kwargs.get("data", {})
-            return fake_resp
-
-        with patch("requests.post", side_effect=fake_post):
-            r = loopback_client.post(
-                "/api/sentinel/token",
-                data={},  # ← deliberately empty body
-                headers={"Content-Type": "application/x-www-form-urlencoded"},
-            )
-
-        assert r.status_code == 200
-        # The forwarded creds must come from env, not from a stale cache
-        # or fallback string.
-        assert captured.get("data", {}).get("client_id") == "env-id"
-        assert captured.get("data", {}).get("client_secret") == "env-secret"
-
-    def test_body_credentials_win_over_env(self, loopback_client, monkeypatch):
-        """Body values (back-compat path) must win when both sources
-        are present. This preserves the pre-#298 behavior for any
-        legacy callers that still post credentials."""
-        monkeypatch.setenv("SENTINEL_CLIENT_ID", "env-id")
-        monkeypatch.setenv("SENTINEL_CLIENT_SECRET", "env-secret")
-
-        captured: dict = {}
-        fake_resp = MagicMock()
-        fake_resp.status_code = 200
-        fake_resp.content = b'{"access_token": "stub"}'
-
-        def fake_post(url, *args, **kwargs):
-            captured["data"] = kwargs.get("data", {})
-            return fake_resp
-
-        with patch("requests.post", side_effect=fake_post):
-            r = loopback_client.post(
-                "/api/sentinel/token",
-                data={"client_id": "body-id", "client_secret": "body-secret"},
-                headers={"Content-Type": "application/x-www-form-urlencoded"},
-            )
-
-        assert r.status_code == 200
-        assert captured["data"]["client_id"] == "body-id"
-        assert captured["data"]["client_secret"] == "body-secret"
-
-    def test_400_when_neither_source_has_credentials(self, loopback_client, monkeypatch):
-        """If body is empty AND env is empty, return 400 with a
-        friendly pointer to the API Keys panel — not a curt
-        "required" message and not a 500."""
-        monkeypatch.delenv("SENTINEL_CLIENT_ID", raising=False)
-        monkeypatch.delenv("SENTINEL_CLIENT_SECRET", raising=False)
-
-        # If the route ever calls requests.post here, the gate is broken
-        # — empty creds should never produce an outbound HTTP call.
-        fake = MagicMock(side_effect=AssertionError(
-            "requests.post should not be called when no credentials are configured"
-        ))
-        with patch("requests.post", fake):
-            r = loopback_client.post(
-                "/api/sentinel/token",
-                data={},
-                headers={"Content-Type": "application/x-www-form-urlencoded"},
-            )
-
-        assert r.status_code == 400
-        detail = r.json().get("detail", "")
-        # The pointer to the API Keys panel is what makes this non-hostile.
-        assert "API Keys panel" in detail or "SENTINEL_CLIENT_ID" in detail
-        assert fake.call_count == 0
-
-
-class TestSentinelTileCredResolution:
-    def test_env_fallback_when_body_omits_credentials(self, loopback_client, monkeypatch):
-        """Tile route: no body credentials → uses env values."""
-        monkeypatch.setenv("SENTINEL_CLIENT_ID", "env-id")
-        monkeypatch.setenv("SENTINEL_CLIENT_SECRET", "env-secret")
-
-        token_resp = MagicMock()
-        token_resp.status_code = 200
-        token_resp.json = MagicMock(return_value={"access_token": "stub", "expires_in": 300})
-
-        process_resp = MagicMock()
-        process_resp.status_code = 200
-        process_resp.content = b"<png bytes>"
-        process_resp.headers = {"content-type": "image/png"}
-
-        captured: list = []
-
-        def fake_post(url, *args, **kwargs):
-            captured.append({"url": url, "data": kwargs.get("data"), "json": kwargs.get("json")})
-            if "openid-connect/token" in url:
-                return token_resp
-            return process_resp
-
-        with patch("requests.post", side_effect=fake_post):
-            r = loopback_client.post(
-                "/api/sentinel/tile",
-                json={
-                    # Note: no client_id / client_secret in body
-                    "preset": "TRUE-COLOR",
-                    "date": "2026-01-01",
-                    "z": 6, "x": 30, "y": 20,
-                },
-            )
-
-        assert r.status_code == 200
-        # First call was the token mint; verify it used env creds.
-        token_call = next(c for c in captured if "openid-connect/token" in c["url"])
-        assert token_call["data"]["client_id"] == "env-id"
-        assert token_call["data"]["client_secret"] == "env-secret"
-
-    def test_400_when_neither_source_has_credentials(self, loopback_client, monkeypatch):
-        monkeypatch.delenv("SENTINEL_CLIENT_ID", raising=False)
-        monkeypatch.delenv("SENTINEL_CLIENT_SECRET", raising=False)
-
-        fake = MagicMock(side_effect=AssertionError(
-            "requests.post should not be called when no credentials are configured"
-        ))
-        with patch("requests.post", fake):
-            r = loopback_client.post(
-                "/api/sentinel/tile",
-                json={
-                    "preset": "TRUE-COLOR",
-                    "date": "2026-01-01",
-                    "z": 6, "x": 30, "y": 20,
-                },
-            )
-
-        assert r.status_code == 400
-        detail = r.json().get("detail", "")
-        assert "API Keys panel" in detail or "SENTINEL_CLIENT_ID" in detail
-        assert fake.call_count == 0

backend/tests/test_sentinel_routes_auth_gate.py

@@ -1,231 +0,0 @@
-"""Issues #299, #300, #301 (tg12): Sentinel proxy routes must require
-local-operator auth.
-
-Before the fix, three Sentinel proxy routes in ``backend/routers/tools.py``
-were decorated only with ``@limiter.limit(...)`` — no
-``Depends(require_local_operator)``:
-
-  * ``POST /api/sentinel/token``  — Copernicus CDSE OAuth relay for
-    caller-supplied client_id + client_secret. Anonymous access made the
-    backend a free OAuth-mint relay for any Sentinel account.
-  * ``POST /api/sentinel/tile``   — Sentinel Hub Process API relay.
-    Caller supplies their own credentials, backend mints a token if
-    needed and relays the PNG. Anonymous access was a bandwidth + quota
-    relay for any Copernicus account.
-  * ``GET  /api/sentinel2/search`` — Planetary Computer STAC search with
-    Esri imagery fallback. No caller credentials are involved, but the
-    route is still an anonymous external-search relay.
-
-The fix adds ``dependencies=[Depends(require_local_operator)]`` to each.
-The parameterized regression in ``test_control_surface_auth.py`` covers
-the basic 403 path. This file adds the harder property: when the auth
-gate fires, **the underlying upstream HTTP call never happens** — no
-outbound Copernicus token mint, no Sentinel Hub Process call, no
-Planetary Computer STAC search. The egress-on-403 property is what
-separates a real gate from a route that returns 403 *after* burning a
-quota.
-"""
-
-from __future__ import annotations
-
-import asyncio
-from unittest.mock import patch, MagicMock
-
-import pytest
-from httpx import ASGITransport, AsyncClient
-
-
-# ---------------------------------------------------------------------------
-# Remote client fixture — same shape as test_control_surface_auth.py, but
-# inlined here so this file doesn't depend on the shared remote_client
-# fixture order. Uses 1.2.3.4 as the peer IP so loopback auth bypass
-# doesn't accidentally let the request through.
-# ---------------------------------------------------------------------------
-
-
-class _PeerClient:
-    """Raw ASGI client with a configurable peer IP. FastAPI's
-    ``TestClient`` reports ``request.client.host`` as ``"testclient"``
-    which isn't on the loopback allowlist — we need to set the peer
-    explicitly to exercise the real ``require_local_operator`` path.
-    """
-
-    def __init__(self, peer_ip: str):
-        from main import app
-
-        self._loop = asyncio.new_event_loop()
-        self._transport = ASGITransport(app=app, client=(peer_ip, 12345))
-        self._base = f"http://{peer_ip}:8000"
-
-    def _do(self, method: str, url: str, **kw):
-        async def go():
-            async with AsyncClient(transport=self._transport, base_url=self._base) as ac:
-                return await ac.request(method, url, **kw)
-
-        return self._loop.run_until_complete(go())
-
-    def get(self, url, **kw):
-        return self._do("GET", url, **kw)
-
-    def post(self, url, **kw):
-        return self._do("POST", url, **kw)
-
-    def close(self):
-        self._loop.close()
-
-
-@pytest.fixture
-def remote():
-    """Untrusted remote caller (1.2.3.4) — must hit the auth gate."""
-    client = _PeerClient("1.2.3.4")
-    yield client
-    client.close()
-
-
-@pytest.fixture
-def loopback():
-    """127.0.0.1 caller — must pass the gate exactly like the operator."""
-    client = _PeerClient("127.0.0.1")
-    yield client
-    client.close()
-
-
-# ---------------------------------------------------------------------------
-# /api/sentinel/token — issue #299
-# ---------------------------------------------------------------------------
-
-
-class TestSentinelTokenAuthGate:
-    def test_anonymous_caller_is_rejected(self, remote):
-        """A remote (non-loopback, non-bridge) caller MUST be rejected."""
-        r = remote.post(
-            "/api/sentinel/token",
-            data={"client_id": "anything", "client_secret": "anything"},
-        )
-        assert r.status_code == 403
-
-    def test_no_upstream_token_mint_on_403(self, remote):
-        """The Copernicus token endpoint must NOT be contacted when the
-        auth gate fires. This is what makes the gate real — without it,
-        a 403 returned *after* the upstream call still burns quota.
-
-        We patch ``requests.post`` at the module level so any outbound
-        token request would be intercepted. The mock is asserted to have
-        ZERO calls.
-        """
-        fake_post = MagicMock()
-        # If the gate is broken, the route would call requests.post; we
-        # want this MagicMock to make that fact loud.
-        fake_post.side_effect = AssertionError(
-            "requests.post was called despite auth-gate 403 — the gate is bypassable"
-        )
-        with patch("requests.post", fake_post):
-            r = remote.post(
-                "/api/sentinel/token",
-                data={"client_id": "anything", "client_secret": "anything"},
-            )
-        assert r.status_code == 403
-        assert fake_post.call_count == 0
-
-    def test_loopback_caller_passes_auth(self, loopback):
-        """A 127.0.0.1 caller must pass the gate. We don't care about
-        the upstream response shape — just that the request reaches the
-        handler (which would then try to talk to Copernicus). We patch
-        ``requests.post`` to return a 401 so the test doesn't hit the
-        real network.
-
-        Note: FastAPI's ``TestClient`` reports ``request.client.host``
-        as ``"testclient"`` by default, which is NOT on the loopback
-        allowlist (``127.0.0.1`` / ``::1`` / ``localhost``). The
-        ``loopback`` fixture below uses raw ASGI with an explicit
-        ``127.0.0.1`` peer IP so the auth gate sees real loopback.
-        """
-        fake_resp = MagicMock()
-        fake_resp.status_code = 401
-        fake_resp.content = b'{"error": "invalid_client"}'
-        with patch("requests.post", return_value=fake_resp):
-            r = loopback.post(
-                "/api/sentinel/token",
-                data={"client_id": "anything", "client_secret": "anything"},
-            )
-        # 200 (relayed), 401 (upstream said no), or 502 (upstream blew up)
-        # are all acceptable — what matters is we got past the auth gate
-        # (no 403). The route relays the upstream response status.
-        assert r.status_code != 403
-
-
-# ---------------------------------------------------------------------------
-# /api/sentinel/tile — issue #300
-# ---------------------------------------------------------------------------
-
-
-class TestSentinelTileAuthGate:
-    _VALID_BODY = {
-        "client_id": "anything",
-        "client_secret": "anything",
-        "preset": "TRUE-COLOR",
-        "date": "2026-01-01",
-        "z": 6,
-        "x": 30,
-        "y": 20,
-    }
-
-    def test_anonymous_caller_is_rejected(self, remote):
-        r = remote.post("/api/sentinel/tile", json=self._VALID_BODY)
-        assert r.status_code == 403
-
-    def test_no_upstream_call_on_403(self, remote):
-        """When the gate fires, neither the token mint nor the Process
-        API call should happen."""
-        fake_post = MagicMock(side_effect=AssertionError(
-            "requests.post was called despite auth-gate 403 — gate bypassable"
-        ))
-        with patch("requests.post", fake_post):
-            r = remote.post("/api/sentinel/tile", json=self._VALID_BODY)
-        assert r.status_code == 403
-        assert fake_post.call_count == 0
-
-
-# ---------------------------------------------------------------------------
-# /api/sentinel2/search — issue #301
-# ---------------------------------------------------------------------------
-
-
-class TestSentinel2SearchAuthGate:
-    def test_anonymous_caller_is_rejected(self, remote):
-        r = remote.get("/api/sentinel2/search?lat=0&lng=0")
-        assert r.status_code == 403
-
-    def test_no_upstream_search_on_403(self, remote):
-        """The Planetary Computer STAC search MUST NOT be called when
-        the gate fires."""
-        fake = MagicMock(side_effect=AssertionError(
-            "search_sentinel2_scene was called despite 403 — gate bypassable"
-        ))
-        # Patch the underlying service function — that's the network
-        # surface. If the auth dep fires first, the handler body never
-        # runs and this stays uncalled.
-        with patch("services.sentinel_search.search_sentinel2_scene", fake):
-            r = remote.get("/api/sentinel2/search?lat=0&lng=0")
-        assert r.status_code == 403
-        assert fake.call_count == 0
-
-    def test_loopback_caller_reaches_handler(self, loopback):
-        """127.0.0.1 must pass the gate and reach the search function.
-        Uses raw ASGI peer IP via the ``loopback`` fixture — TestClient
-        would set ``request.client.host`` to ``"testclient"`` which
-        isn't on the loopback allowlist."""
-        fake = MagicMock(return_value={"ok": True, "results": []})
-        with patch("services.sentinel_search.search_sentinel2_scene", fake):
-            r = loopback.get("/api/sentinel2/search?lat=0&lng=0")
-        assert r.status_code == 200
-        assert fake.call_count == 1
-
-
-# Note: an earlier draft included a static dependency walker that
-# inspected the FastAPI route table to assert require_local_operator
-# was wired in. It was deleted because FastAPI's internal route
-# representation varies across minor versions — the walker was brittle
-# and the behavioral pair (anonymous → 403 with no upstream egress;
-# loopback → handler reached) gives stronger end-to-end evidence than
-# any structural check.

backend/tests/test_uap_hf_fallback_cutoff.py

@@ -1,252 +0,0 @@
-"""HF NUFORC fallback honors the rolling cutoff window.
-
-Background
-----------
-The UAP sightings layer is sourced primarily from a live scrape of
-nuforc.org. When that fails (Cloudflare 403, curl disabled on Windows,
-wdtNonce regex stale, etc.) the code falls back to a static CSV mirror
-hosted on Hugging Face at ``kcimc/NUFORC/nuforc_str.csv``.
-
-The HF mirror is maintained by a third party and refreshed sporadically.
-Pre-fix, the fallback parsed every row, sorted by ``occurred`` descending,
-and took the top 250 — **with no date cutoff**. When the HF mirror is
-stale (its "newest" rows are ~2-3 years old), users saw a map full of
-2022-2023 sightings labeled as the "last 60 days" layer.
-
-These tests pin the new behavior:
-
-* Rows older than ``_NUFORC_RECENT_DAYS`` are dropped before the take-top-N.
-* If the HF mirror has nothing in the window, the fallback returns ``[]``
-  and logs ERROR (don't silently serve stale data).
-* ``fetch_uap_sightings`` records the failure when BOTH paths fail, so
-  the layer shows as broken in the health registry instead of "fresh".
-"""
-
-from __future__ import annotations
-
-import logging
-from datetime import datetime as real_datetime
-
-
-class _FixedDateTime(real_datetime):
-    """A datetime whose utcnow() returns a pinned value, for deterministic
-    cutoff math. Subclasses real datetime so existing operations still work."""
-
-    @classmethod
-    def utcnow(cls):
-        return cls(2026, 5, 1, 12, 0, 0)
-
-
-class _StubResponse:
-    status_code = 200
-
-    def __init__(self, text: str):
-        self.text = text
-
-
-def _stub_geocode_cache(*_args, **_kwargs):
-    """Pre-populated location cache so the fallback doesn't try to hit
-    Photon during the test."""
-    return {
-        "Denver, CO, USA": [39.7392, -104.9903],
-        "Seattle, WA, USA": [47.6062, -122.3321],
-        "Phoenix, AZ, USA": [33.4484, -112.0740],
-    }
-
-
-def test_hf_fallback_drops_rows_older_than_60_days(monkeypatch):
-    """Pre-fix: a row from 2023 would make it into the layer if it was
-    among the newest 250 in the HF mirror. Post-fix: it's filtered out
-    before we even count to 250."""
-    from services.fetchers import earth_observation as eo
-
-    # 2026-05-01 - 60 days = 2026-03-02. So 2026-03-01 is one day too old.
-    csv_text = (
-        "Sighting,Occurred,Location,Shape,Duration,Posted,Summary\n"
-        '1,2026-04-15 21:00:00 Local,"Denver, CO, USA",Triangle,5 minutes,2026-04-16,"In-window sighting"\n'
-        '2,2023-06-01 21:00:00 Local,"Seattle, WA, USA",Light,30 seconds,2023-06-02,"Three years old"\n'
-        '3,2022-01-15 20:00:00 Local,"Phoenix, AZ, USA",Disk,2 minutes,2022-01-16,"Even older"\n'
-    )
-
-    monkeypatch.setattr(eo, "datetime", _FixedDateTime)
-    monkeypatch.setattr(eo, "fetch_with_curl", lambda *a, **kw: _StubResponse(csv_text))
-    monkeypatch.setattr(eo, "_load_nuforc_location_cache", _stub_geocode_cache)
-    monkeypatch.setattr(eo, "_save_nuforc_location_cache", lambda cache: None)
-    # If the cutoff is missing, the geocoder may still get called for the
-    # 2022/2023 rows. We assert geocoder is NEVER invoked for stale rows.
-    geocode_calls: list[str] = []
-
-    def _geocode_spy(location, city, state, country=""):
-        geocode_calls.append(location)
-        return None  # already in cache, shouldn't be hit anyway
-
-    monkeypatch.setattr(eo, "_geocode_uap_location", _geocode_spy)
-
-    sightings = eo._build_uap_sightings_from_hf_mirror()
-
-    ids = [s["id"] for s in sightings]
-    assert ids == ["NUFORC-1"], f"only the 2026 row should survive: got {ids}"
-    # Stale rows must not have been geocoded — they should be dropped
-    # before the geocoding loop is reached.
-    assert geocode_calls == []
-
-
-def test_hf_fallback_returns_empty_when_mirror_is_fully_stale(monkeypatch, caplog):
-    """The smoking-gun case: the HF mirror is so stale that NO rows are
-    within the rolling window. Pre-fix returned 250 ancient rows. Post-fix
-    returns ``[]`` and logs ERROR so the operator knows the layer is dead."""
-    from services.fetchers import earth_observation as eo
-
-    csv_text = (
-        "Sighting,Occurred,Location,Shape,Duration,Posted,Summary\n"
-        '1,2023-04-15 21:00:00 Local,"Denver, CO, USA",Triangle,5 minutes,2023-04-16,"Old"\n'
-        '2,2022-06-01 21:00:00 Local,"Seattle, WA, USA",Light,30 seconds,2022-06-02,"Older"\n'
-        '3,2021-01-15 20:00:00 Local,"Phoenix, AZ, USA",Disk,2 minutes,2021-01-16,"Ancient"\n'
-    )
-
-    monkeypatch.setattr(eo, "datetime", _FixedDateTime)
-    monkeypatch.setattr(eo, "fetch_with_curl", lambda *a, **kw: _StubResponse(csv_text))
-    monkeypatch.setattr(eo, "_load_nuforc_location_cache", _stub_geocode_cache)
-    monkeypatch.setattr(eo, "_save_nuforc_location_cache", lambda cache: None)
-    monkeypatch.setattr(eo, "_geocode_uap_location", lambda *a, **kw: None)
-
-    with caplog.at_level(logging.ERROR, logger="services.fetchers.earth_observation"):
-        sightings = eo._build_uap_sightings_from_hf_mirror()
-
-    assert sightings == []
-    # The error log should mention how many stale rows were dropped so the
-    # operator can tell the mirror is the problem (not "we got 0 rows" which
-    # could also mean the download failed).
-    relevant = [r for r in caplog.records if "HF fallback yielded 0 rows" in r.getMessage()]
-    assert relevant, "expected loud ERROR when HF mirror is fully stale"
-    # The message should report the count of dropped stale rows.
-    assert any("dropped 3" in r.getMessage() for r in relevant)
-
-
-def test_hf_fallback_still_returns_data_when_some_rows_are_in_window(monkeypatch):
-    """Mixed-age mirror: some rows in the window, some not. The fallback
-    should return only the in-window rows and not log the doomsday ERROR."""
-    from services.fetchers import earth_observation as eo
-
-    csv_text = (
-        "Sighting,Occurred,Location,Shape,Duration,Posted,Summary\n"
-        '1,2026-04-15 21:00:00 Local,"Denver, CO, USA",Triangle,5 minutes,2026-04-16,"Fresh"\n'
-        '2,2026-04-10 21:00:00 Local,"Seattle, WA, USA",Light,30 seconds,2026-04-10,"Also fresh"\n'
-        '3,2020-01-15 20:00:00 Local,"Phoenix, AZ, USA",Disk,2 minutes,2020-01-16,"Ancient"\n'
-    )
-
-    monkeypatch.setattr(eo, "datetime", _FixedDateTime)
-    monkeypatch.setattr(eo, "fetch_with_curl", lambda *a, **kw: _StubResponse(csv_text))
-    monkeypatch.setattr(eo, "_load_nuforc_location_cache", _stub_geocode_cache)
-    monkeypatch.setattr(eo, "_save_nuforc_location_cache", lambda cache: None)
-    monkeypatch.setattr(eo, "_geocode_uap_location", lambda *a, **kw: None)
-
-    sightings = eo._build_uap_sightings_from_hf_mirror()
-
-    ids = sorted(s["id"] for s in sightings)
-    assert ids == ["NUFORC-1", "NUFORC-2"], f"only in-window rows should appear: got {ids}"
-
-
-def test_fetch_uap_sightings_marks_failure_when_both_paths_empty(monkeypatch, caplog):
-    """When the live path raises AND the HF fallback returns empty,
-    ``fetch_uap_sightings`` must:
-      * NOT mark the layer fresh (pre-fix bug: it did, so the layer
-        showed as healthy-but-empty for days)
-      * call ``assert_canary("uap_sightings", 0)`` so the health
-        registry surfaces the broken layer
-      * log an ERROR with the live-path exception for debugging
-    """
-    from services.fetchers import earth_observation as eo
-    from services.fetchers import _store
-
-    monkeypatch.setattr(_store, "is_any_active", lambda layer: True)
-    monkeypatch.setattr(eo, "_load_nuforc_sightings_cache", lambda force_refresh=False: None)
-
-    def _boom():
-        raise RuntimeError("NUFORC live: zero rows pulled across 3 months")
-
-    monkeypatch.setattr(eo, "_build_recent_uap_sightings", _boom)
-    monkeypatch.setattr(eo, "_build_uap_sightings_from_hf_mirror", lambda: [])
-
-    marked: list[str] = []
-    monkeypatch.setattr(eo, "_mark_fresh", lambda *keys: marked.extend(keys))
-
-    canary_calls: list[tuple[str, int]] = []
-    import services.slo as slo
-    monkeypatch.setattr(
-        slo, "assert_canary", lambda key, value: canary_calls.append((key, int(value)))
-    )
-
-    with caplog.at_level(logging.ERROR, logger="services.fetchers.earth_observation"):
-        eo.fetch_uap_sightings()
-
-    assert marked == [], "broken layer must NOT be marked fresh"
-    assert canary_calls == [("uap_sightings", 0)], (
-        f"expected canary trip when both paths fail; got {canary_calls}"
-    )
-    # The live error message should propagate into the error log so the
-    # operator can tell live failed AND fallback was empty (not the other
-    # way around).
-    assert any(
-        "both live NUFORC and HF fallback" in r.getMessage()
-        for r in caplog.records
-    )
-
-
-def test_fetch_uap_sightings_succeeds_when_fallback_returns_data(monkeypatch):
-    """Positive path: live fails, fallback returns rows. The layer is
-    populated and marked fresh; assert_canary is NOT tripped (we only
-    trip the canary when the layer has zero data)."""
-    from services.fetchers import earth_observation as eo
-    from services.fetchers import _store
-
-    monkeypatch.setattr(_store, "is_any_active", lambda layer: True)
-    monkeypatch.setattr(eo, "_load_nuforc_sightings_cache", lambda force_refresh=False: None)
-    monkeypatch.setattr(
-        eo, "_build_recent_uap_sightings", lambda: (_ for _ in ()).throw(RuntimeError("live down"))
-    )
-
-    fallback_rows = [{"id": "NUFORC-fb-1", "date_time": "2026-04-20", "lat": 0.0, "lng": 0.0}]
-    monkeypatch.setattr(eo, "_build_uap_sightings_from_hf_mirror", lambda: fallback_rows)
-    monkeypatch.setattr(eo, "_save_nuforc_sightings_cache", lambda s: None)
-
-    marked: list[str] = []
-    monkeypatch.setattr(eo, "_mark_fresh", lambda *keys: marked.extend(keys))
-
-    canary_calls: list[tuple[str, int]] = []
-    import services.slo as slo
-    monkeypatch.setattr(
-        slo, "assert_canary", lambda key, value: canary_calls.append((key, int(value)))
-    )
-
-    eo.fetch_uap_sightings()
-
-    assert marked == ["uap_sightings"]
-    assert canary_calls == [], "canary should not trip when fallback supplies data"
-
-
-def test_uap_scheduler_runs_weekly_not_daily():
-    """The cron job for the UAP layer must be configured for Mondays at
-    12:00 UTC, not daily. Daily was the pre-fix default; weekly matches
-    the layer's stated cadence (a rolling 60-day digest) and keeps load
-    on nuforc.org light."""
-    from services import data_fetcher
-
-    src = data_fetcher.__file__
-    with open(src, "r", encoding="utf-8") as f:
-        text = f.read()
-
-    # Anchor on the scheduler block by id, then assert the cron triggers.
-    assert "uap_sightings_weekly" in text, (
-        "scheduler id should be uap_sightings_weekly (was uap_sightings_daily pre-fix)"
-    )
-    # The day_of_week directive is the difference between daily and weekly.
-    # If somebody flips it back to daily, this fires.
-    weekly_block = text.split("uap_sightings_weekly", 1)[0]
-    # Walk backwards for the matching add_job call.
-    add_job_idx = weekly_block.rfind("add_job(")
-    assert add_job_idx >= 0, "could not locate add_job block for UAP scheduler"
-    job_block = text[add_job_idx : text.find(")", text.index("uap_sightings_weekly")) + 1]
-    assert 'day_of_week="mon"' in job_block, (
-        f"expected day_of_week='mon' in UAP scheduler block:\n{job_block}"
-    )

desktop-shell/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@shadowbroker/desktop-shell",
-  "version": "0.9.81",
+  "version": "0.9.79",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@shadowbroker/desktop-shell",
-      "version": "0.9.81",
+      "version": "0.9.79",
       "devDependencies": {
         "typescript": "^5.6.0"
       }

desktop-shell/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shadowbroker/desktop-shell",
-  "version": "0.9.81",
+  "version": "0.9.79",
   "private": true,
   "description": "ShadowBroker desktop shell packaging, runtime bridge, and release tooling",
   "scripts": {

desktop-shell/tauri-skeleton/scripts/build-backend-runtime.cjs

@@ -130,45 +130,6 @@ function stageBackendRuntime() {
   });
   stagePrivacyCoreArtifact();
   stageReleaseAttestation();
-  stageStartScripts();
-}
-
-/**
- * Copy ``start.bat`` and ``start.sh`` from the repo root into the
- * staged backend-runtime/ so they sit next to ``privacy_core.dll``.
- *
- * Why: an MSI/EXE/AppImage user who wants to launch via the dev-style
- * scripts (because the desktop shell is failing, or they prefer the
- * browser frontend at localhost:3000) shouldn't have to clone the
- * source repo just to get the scripts. Having them inside the install
- * directory also means the bundled ``privacy_core.dll`` fallback in
- * those scripts resolves to the SAME directory as the script, which
- * is exactly the layout the v0.9.81 script update is looking for.
- *
- * Tracked from issue #319: users who fell back to start.bat from
- * their MSI install dir had to go fetch it from GitHub, then saw a
- * scary "install Rust" warning because the script didn't know where
- * the bundled DLL was. Bundling the script removes both problems.
- */
-function stageStartScripts() {
-  const scripts = ['start.bat', 'start.sh'];
-  for (const name of scripts) {
-    const src = path.join(repoRoot, name);
-    if (!fs.existsSync(src)) {
-      console.warn(`backend-runtime staged without ${name} (not at repo root)`);
-      continue;
-    }
-    const dst = path.join(outputDir, name);
-    fs.copyFileSync(src, dst);
-    // Preserve executable bit on POSIX systems for the .sh script.
-    if (name.endsWith('.sh') && process.platform !== 'win32') {
-      try {
-        fs.chmodSync(dst, 0o755);
-      } catch {
-        /* best-effort; not fatal on filesystems that don't honor chmod */
-      }
-    }
-  }
 }
 
 function stagePrivacyCoreArtifact() {

desktop-shell/tauri-skeleton/scripts/build-frontend-export.cjs

@@ -46,18 +46,12 @@ function prepareBuildTree() {
   const stagedLayoutPath = path.join(buildFrontendDir, 'src', 'app', 'layout.tsx');
   if (fs.existsSync(stagedLayoutPath)) {
     const layoutSource = fs.readFileSync(stagedLayoutPath, 'utf8');
-    // CRLF compatibility: on Windows checkouts without ``core.autocrlf=input``
-    // (the default) layout.tsx has CRLF line endings, but the original regexes
-    // only matched LF. The strip silently no-op'd, ``force-dynamic`` stayed,
-    // and Next's static-export refused to render ``/_not-found`` ("Page with
-    // `dynamic = \"force-dynamic\"` couldn't be exported"). Use ``\r?\n`` so
-    // the strip works regardless of line-ending normalization.
     fs.writeFileSync(
       stagedLayoutPath,
       layoutSource
-        .replace(/\r?\n\/\/ The dashboard is a live local runtime[\s\S]*?client polling ever hydrates\.\r?\n/g, '\n')
-        .replace(/\r?\nexport const dynamic = ['"]force-dynamic['"];\r?\n/g, '\n')
-        .replace(/\r?\nexport const revalidate = 0;\r?\n/g, '\n'),
+        .replace(/\n\/\/ The dashboard is a live local runtime[\s\S]*?client polling ever hydrates\.\n/g, '\n')
+        .replace(/\nexport const dynamic = ['"]force-dynamic['"];\n/g, '\n')
+        .replace(/\nexport const revalidate = 0;\n/g, '\n'),
     );
   }
 

desktop-shell/tauri-skeleton/src-tauri/Cargo.lock

@@ -4201,7 +4201,7 @@ dependencies = [
 
 [[package]]
 name = "shadowbroker-tauri-shell"
-version = "0.9.81"
+version = "0.9.79"
 dependencies = [
  "axum",
  "base64 0.22.1",

desktop-shell/tauri-skeleton/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shadowbroker-tauri-shell"
-version = "0.9.81"
+version = "0.9.79"
 edition = "2021"
 
 [build-dependencies]

desktop-shell/tauri-skeleton/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "ShadowBroker",
-  "version": "0.9.81",
+  "version": "0.9.79",
   "identifier": "com.shadowbroker.desktop",
   "build": {
     "frontendDist": "../../../frontend/out",
@@ -38,7 +38,7 @@
   },
   "plugins": {
     "updater": {
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDVEMTFERDdCNjhBRTk3MDcKUldRSGw2NW9lOTBSWGRjS1ZobFN5TkZsd3NkZ2g2L09WZzU4aytTR2FtN3ZtR0ZKejlNNldTbFUK",
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUxODExMjQ4MkJBMThFNTgKUldSWWpxRXJTQktCNFF3ZXNQbndUK0pVWUEwNDNuajcrUGI3ZEI4TWtDUDlQdHhudmlHUkNjQUUK",
       "endpoints": [
         "https://github.com/BigBodyCobain/Shadowbroker/releases/latest/download/latest.json"
       ],

docker-compose.relay.yml

@@ -6,7 +6,7 @@ services:
       dockerfile: ./backend/Dockerfile
     container_name: shadowbroker-relay
     ports:
-      - "127.0.0.1:8000:8000"
+      - "0.0.0.0:8000:8000"
     env_file: .env
     volumes:
       - relay_data:/app/data

docker-compose.yml

@@ -24,16 +24,8 @@ services:
       # Private Infonet bootstrap seeds. Seeds are discovery hints, not fixed roots.
       - MESH_BOOTSTRAP_SEED_PEERS=${MESH_BOOTSTRAP_SEED_PEERS:-http://gqpbunqbgtkcqilvclm3xrkt3zowjyl3s62kkktvojgvxzizamvbrqid.onion:8000}
       - MESH_DEFAULT_SYNC_PEERS=${MESH_DEFAULT_SYNC_PEERS:-}
-      - MESH_SYNC_TIMEOUT_S=${MESH_SYNC_TIMEOUT_S:-5}
-      - MESH_RELAY_PUSH_TIMEOUT_S=${MESH_RELAY_PUSH_TIMEOUT_S:-45}
-      # Explicitly opt into HTTPS/IP-based peer sync. Default remains private transports only.
-      - MESH_INFONET_ALLOW_CLEARNET_SYNC=${MESH_INFONET_ALLOW_CLEARNET_SYNC:-false}
-      # Tor/Arti SOCKS transport for private .onion Infonet sync.
-      - MESH_ARTI_ENABLED=${MESH_ARTI_ENABLED:-false}
-      - MESH_ARTI_SOCKS_PORT=${MESH_ARTI_SOCKS_PORT:-9050}
       # Operator-trusted sync/push peers. Leave empty unless you control the peer secret on both sides.
       - MESH_RELAY_PEERS=${MESH_RELAY_PEERS:-}
-      - MESH_PUBLIC_PEER_URL=${MESH_PUBLIC_PEER_URL:-}
       # Shared transport auth for operator peer push. Must be set to a unique secret per deployment.
       - MESH_PEER_PUSH_SECRET=${MESH_PEER_PUSH_SECRET:-}
       # Issue #256: optional per-peer HMAC secrets. Comma-separated
@@ -65,18 +57,6 @@ services:
       # name). If you rename the frontend service or run with a different
       # container_name, list the hostnames here (comma-separated, no spaces).
       - SHADOWBROKER_TRUSTED_FRONTEND_HOSTS=${SHADOWBROKER_TRUSTED_FRONTEND_HOSTS:-frontend,shadowbroker-frontend}
-      # Third-party fetcher opt-ins. Default OFF — these phone home to
-      # politically/commercially sensitive upstreams (Polymarket, Kalshi,
-      # Yahoo Finance, EU disinfo trackers, NUFORC dataset host, etc.).
-      # Set to "true" in your .env only if you want the node's IP to
-      # contact each of these services. The dashboard panel for each
-      # feature reads as "no data" until the corresponding flag is on.
-      - PREDICTION_MARKETS_ENABLED=${PREDICTION_MARKETS_ENABLED:-false}
-      - FINANCIAL_ENABLED=${FINANCIAL_ENABLED:-false}
-      - CROWDTHREAT_ENABLED=${CROWDTHREAT_ENABLED:-false}
-      - FIMI_ENABLED=${FIMI_ENABLED:-false}
-      - NUFORC_ENABLED=${NUFORC_ENABLED:-false}
-      - NEWS_ENABLED=${NEWS_ENABLED:-true}
     volumes:
       - backend_data:/app/data
     restart: unless-stopped

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "frontend",
-  "version": "0.9.81",
+  "version": "0.9.79",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "frontend",
-      "version": "0.9.81",
+      "version": "0.9.79",
       "dependencies": {
         "@mapbox/point-geometry": "^1.1.0",
         "@tauri-apps/plugin-process": "^2.3.1",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.9.81",
+  "version": "0.9.79",
   "private": true,
   "scripts": {
     "dev": "node scripts/dev-all.cjs",

frontend/src/__tests__/desktop/updateRuntime.test.ts

@@ -9,12 +9,12 @@ import {
 } from '@/lib/updateRuntime';
 
 const RELEASE: GitHubLatestRelease = {
-  html_url: 'https://github.com/BigBodyCobain/Shadowbroker/releases/tag/v0.9.81',
+  html_url: 'https://github.com/BigBodyCobain/Shadowbroker/releases/tag/v0.9.79',
   assets: [
-    { name: 'ShadowBroker_0.9.81_x64_en-US.msi', browser_download_url: 'https://example.test/windows.msi' },
-    { name: 'ShadowBroker_0.9.81_x64-setup.exe', browser_download_url: 'https://example.test/windows-setup.exe' },
-    { name: 'ShadowBroker_0.9.81_aarch64.dmg', browser_download_url: 'https://example.test/macos.dmg' },
-    { name: 'ShadowBroker_0.9.81_amd64.AppImage', browser_download_url: 'https://example.test/linux.AppImage' },
+    { name: 'ShadowBroker_0.9.79_x64_en-US.msi', browser_download_url: 'https://example.test/windows.msi' },
+    { name: 'ShadowBroker_0.9.79_x64-setup.exe', browser_download_url: 'https://example.test/windows-setup.exe' },
+    { name: 'ShadowBroker_0.9.79_aarch64.dmg', browser_download_url: 'https://example.test/macos.dmg' },
+    { name: 'ShadowBroker_0.9.79_amd64.AppImage', browser_download_url: 'https://example.test/linux.AppImage' },
   ],
 };
 

frontend/src/__tests__/mesh/infonetShellGateDirectory.test.tsx

@@ -1,57 +0,0 @@
-import React from 'react';
-import { act, cleanup, render, screen } from '@testing-library/react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-vi.mock('@/mesh/meshIdentity', () => ({
-  getNodeIdentity: vi.fn(() => ({ publicKey: 'test-public-key', nodeId: '!sb_test' })),
-  getWormholeIdentityDescriptor: vi.fn(() => ({ publicKey: 'wormhole-public-key' })),
-}));
-
-vi.mock('@/mesh/wormholeIdentityClient', () => ({
-  activateWormholeGatePersona: vi.fn(),
-  createWormholeGatePersona: vi.fn(),
-  enterWormholeGate: vi.fn(),
-  fetchWormholeIdentity: vi.fn(),
-  listWormholeGatePersonas: vi.fn(async () => ({ personas: [] })),
-}));
-
-vi.mock('@/components/InfonetTerminal/GateView', () => ({ default: () => <div>Gate view</div> }));
-vi.mock('@/components/InfonetTerminal/MarketView', () => ({ default: () => <div>Market view</div> }));
-vi.mock('@/components/InfonetTerminal/ProfileView', () => ({ default: () => <div>Profile view</div> }));
-vi.mock('@/components/InfonetTerminal/MessagesView', () => ({ default: () => <div>Messages view</div> }));
-vi.mock('@/components/InfonetTerminal/TerminalDashboard', () => ({ default: () => <div>Dashboard</div> }));
-vi.mock('@/components/InfonetTerminal/WeatherWidget', () => ({ default: () => <div>Weather</div> }));
-vi.mock('@/components/InfonetTerminal/TrendingPosts', () => ({ default: () => <div>Trending</div> }));
-vi.mock('@/components/InfonetTerminal/HashchainEvents', () => ({ default: () => <div>Hashchain</div> }));
-vi.mock('@/components/InfonetTerminal/NetworkStats', () => ({ default: () => <div>Network stats</div> }));
-vi.mock('@/components/InfonetTerminal/AIQueryView', () => ({ default: () => <div>AI view</div> }));
-vi.mock('@/components/InfonetTerminal/PetitionsView', () => ({ default: () => <div>Petitions</div> }));
-vi.mock('@/components/InfonetTerminal/UpgradeView', () => ({ default: () => <div>Upgrades</div> }));
-vi.mock('@/components/InfonetTerminal/ResolutionView', () => ({ default: () => <div>Resolution</div> }));
-vi.mock('@/components/InfonetTerminal/GateShutdownView', () => ({ default: () => <div>Gate shutdown</div> }));
-vi.mock('@/components/InfonetTerminal/BootstrapView', () => ({ default: () => <div>Bootstrap</div> }));
-vi.mock('@/components/InfonetTerminal/FunctionKeyView', () => ({ default: () => <div>Function keys</div> }));
-
-describe('InfonetShell gate directory', () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-    cleanup();
-  });
-
-  it('renders available gates under the landing logo section', async () => {
-    const { default: InfonetShell } = await import('@/components/InfonetTerminal/InfonetShell');
-
-    render(<InfonetShell isOpen onClose={() => {}} />);
-    await act(async () => {
-      vi.advanceTimersByTime(2500);
-    });
-
-    expect(screen.getByText('AVAILABLE OBFUSCATED GATES:')).toBeTruthy();
-    expect(screen.getByRole('button', { name: /\[>\]\s*infonet/i })).toBeTruthy();
-    expect(screen.getByRole('button', { name: /\[>\]\s*gathered-intel/i })).toBeTruthy();
-  });
-});

frontend/src/__tests__/mesh/messagesViewFirstContact.test.tsx

@@ -842,7 +842,7 @@ describe('MessagesView first-contact trust UX', () => {
     expect(screen.queryByText(/delivery key has not reached/i)).not.toBeInTheDocument();
   });
 
-  it('removes an approved contact immediately from the visible contact list', { timeout: 30_000 }, async () => {
+  it('removes an approved contact immediately from the visible contact list', async () => {
     contactsState = {
       '!sb_remove': {
         alias: 'Remove Me',
@@ -865,49 +865,21 @@ describe('MessagesView first-contact trust UX', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Remove' }));
 
     // The Remove handler dispatches several React state updates in one
-    // event:
-    //   removeContact(peerId)           — external mutation (mock deletes
-    //                                     from contactsState)
-    //   setContacts(updater)            — React state update
-    //   setComposeStatus(`Removed       — toast text, computed via
-    //     contact: ${displayNameForPeer   displayNameForPeer(peerId, contacts)
-    //     (peerId, contacts)}.`)         which reads the CLOSED-OVER
-    //                                     contacts state
-    //
-    // The flake history (PRs #226, #237, #261, #262, #265, #294, #303,
-    // #304, plus the fd7d6fa push) has two distinct causes:
-    //
-    //   (a) CI runner starvation — two parallel ci.yml invocations
-    //       (direct + workflow_call from docker-publish.yml) starving
-    //       each other on the same Actions runner. Fixed structurally
-    //       in .github/workflows/ci.yml via a concurrency group.
-    //
-    //   (b) Alias-resolution race — under certain renders, the closed
-    //       -over `contacts` in the Remove handler can see the post-
-    //       mutation state (contact already gone), and
-    //       displayNameForPeer falls through to return the raw peer
-    //       id ("!sb_remove") rather than the alias ("Remove Me").
-    //       The toast then renders as "Removed contact: !sb_remove."
-    //       which the precise `/Removed contact: Remove Me\./i` regex
-    //       missed. We loosen the assertion to match either rendering
-    //       — the behavioural guarantee under test is "the removal
-    //       toast appears", not "the alias was resolved correctly
-    //       at toast-render time". That second property is an
-    //       implementation detail the component can reorder freely.
-    //
-    // The pair of assertions below still proves the real contract:
-    // 1. A toast that announces a removal renders.
-    // 2. The contact's alias is no longer visible in the contact list.
-    //
-    // The failure mode this no longer masks is "no toast at all", which
-    // still fails loudly at the 10s waitFor cap.
+    // event (removeContact + setContacts + setComposeStatus + setComposeError).
+    // Under CI load the resulting render-and-paint cycle has been observed
+    // to take >1s, which is the default findByText timeout — that race has
+    // produced flakes on PRs #226, #237, #261, and #262 in succession.
+    // The settle window is bounded by React's reconciliation, not by any
+    // network/animation cost, so a generous timeout is the right deflake
+    // here (the failure mode this masks would be "toast never renders",
+    // which would still fail at 5s).
     await waitFor(
       () => {
         expect(
-          screen.getByText(/Removed contact:/i),
+          screen.getByText(/Removed contact: Remove Me\./i),
         ).toBeInTheDocument();
       },
-      { timeout: 10000, interval: 50 },
+      { timeout: 5000, interval: 50 },
     );
     expect(screen.queryByText('Remove Me')).not.toBeInTheDocument();
   });

frontend/src/__tests__/utils/sentinelHub.test.ts

@@ -1,169 +0,0 @@
-/**
- * Issue #298 (tg12): Sentinel credentials must no longer live in browser
- * storage, and the proxy calls must not forward them in request bodies.
- * These tests pin both invariants on ``lib/sentinelHub``:
- *
- *  1. ``migrateLegacySentinelBrowserKeys()`` clears the legacy keys
- *     idempotently and reports what it cleared.
- *  2. ``fetchSentinelTile()`` and ``getSentinelToken()`` POST WITHOUT
- *     ``client_id`` or ``client_secret`` in the body — the backend
- *     resolves credentials from its ``.env``. A future refactor that
- *     accidentally re-introduces browser-storage reads (e.g. by
- *     restoring ``getSentinelCredentials()`` and forwarding it) gets a
- *     loud test failure here rather than a silent privacy regression.
- *  3. ``checkBackendSentinelStatus()`` queries ``/api/settings/api-keys``
- *     and returns true only when both Sentinel keys report ``is_set``.
- */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import {
-  migrateLegacySentinelBrowserKeys,
-  fetchSentinelTile,
-  getSentinelToken,
-  checkBackendSentinelStatus,
-  refreshSentinelStatus,
-} from '@/lib/sentinelHub';
-
-const originalFetch = globalThis.fetch;
-
-describe('lib/sentinelHub — issue #298 server-side credentials', () => {
-  beforeEach(() => {
-    window.localStorage.clear();
-    window.sessionStorage.clear();
-    refreshSentinelStatus();
-  });
-
-  afterEach(() => {
-    globalThis.fetch = originalFetch;
-    window.localStorage.clear();
-    window.sessionStorage.clear();
-    refreshSentinelStatus();
-  });
-
-  describe('migrateLegacySentinelBrowserKeys', () => {
-    it('clears legacy localStorage keys and reports what it cleared', () => {
-      window.localStorage.setItem('sb_sentinel_client_id', 'sh-leaked-id');
-      window.localStorage.setItem('sb_sentinel_client_secret', 'leaked-secret');
-      window.localStorage.setItem('sb_sentinel_instance_id', 'leaked-instance');
-
-      const result = migrateLegacySentinelBrowserKeys();
-
-      expect(window.localStorage.getItem('sb_sentinel_client_id')).toBeNull();
-      expect(window.localStorage.getItem('sb_sentinel_client_secret')).toBeNull();
-      expect(window.localStorage.getItem('sb_sentinel_instance_id')).toBeNull();
-      expect(result.cleared.sort()).toEqual([
-        'sb_sentinel_client_id',
-        'sb_sentinel_client_secret',
-        'sb_sentinel_instance_id',
-      ].sort());
-    });
-
-    it('clears sessionStorage too (privacy-strict mode used to put them there)', () => {
-      window.sessionStorage.setItem('sb_sentinel_client_id', 'sh-session-id');
-      window.sessionStorage.setItem('sb_sentinel_client_secret', 'session-secret');
-
-      const result = migrateLegacySentinelBrowserKeys();
-
-      expect(window.sessionStorage.getItem('sb_sentinel_client_id')).toBeNull();
-      expect(window.sessionStorage.getItem('sb_sentinel_client_secret')).toBeNull();
-      expect(result.cleared).toContain('sb_sentinel_client_id');
-      expect(result.cleared).toContain('sb_sentinel_client_secret');
-    });
-
-    it('is idempotent — calling it on a clean store reports nothing cleared', () => {
-      const result = migrateLegacySentinelBrowserKeys();
-      expect(result.cleared).toEqual([]);
-    });
-  });
-
-  describe('proxy requests no longer forward credentials', () => {
-    it('fetchSentinelTile POSTs without client_id/client_secret in the body', async () => {
-      // Plant credentials in browser storage to prove they would NOT be
-      // picked up even if present. Pre-#298, this would have been read
-      // from localStorage and posted in the body.
-      window.localStorage.setItem('sb_sentinel_client_id', 'sh-leaked-id');
-      window.localStorage.setItem('sb_sentinel_client_secret', 'leaked-secret');
-
-      const fetchMock = vi.fn(async () => new Response(new ArrayBuffer(0), { status: 200 }));
-      globalThis.fetch = fetchMock as unknown as typeof globalThis.fetch;
-
-      await fetchSentinelTile(6, 30, 20, 'TRUE-COLOR', '2026-01-01');
-
-      expect(fetchMock).toHaveBeenCalledTimes(1);
-      const [, init] = fetchMock.mock.calls[0] as [unknown, RequestInit];
-      const body = JSON.parse(String(init.body));
-      expect(body).not.toHaveProperty('client_id');
-      expect(body).not.toHaveProperty('client_secret');
-      // Sanity: the legitimate fields are still there.
-      expect(body).toMatchObject({ preset: 'TRUE-COLOR', date: '2026-01-01', z: 6, x: 30, y: 20 });
-    });
-
-    it('getSentinelToken POSTs with an empty form body (backend uses env)', async () => {
-      window.localStorage.setItem('sb_sentinel_client_id', 'sh-leaked-id');
-      window.localStorage.setItem('sb_sentinel_client_secret', 'leaked-secret');
-
-      const fetchMock = vi.fn(async () =>
-        new Response(JSON.stringify({ access_token: 'stub', expires_in: 300 }), { status: 200 }),
-      );
-      globalThis.fetch = fetchMock as unknown as typeof globalThis.fetch;
-
-      const token = await getSentinelToken();
-
-      expect(token).toBe('stub');
-      expect(fetchMock).toHaveBeenCalledTimes(1);
-      const [, init] = fetchMock.mock.calls[0] as [unknown, RequestInit];
-      const body = String(init.body);
-      // Body is a URLSearchParams stringification. We assert that the
-      // leaked credential never appears in it.
-      expect(body).not.toContain('sh-leaked-id');
-      expect(body).not.toContain('leaked-secret');
-    });
-  });
-
-  describe('checkBackendSentinelStatus', () => {
-    it('returns true when both Sentinel keys report is_set on /api/settings/api-keys', async () => {
-      const fetchMock = vi.fn(async (input: unknown) => {
-        const url = String(input);
-        if (url.endsWith('/api/settings/api-keys')) {
-          return new Response(
-            JSON.stringify([
-              { id: 'sentinel_client_id', env_key: 'SENTINEL_CLIENT_ID', is_set: true },
-              { id: 'sentinel_client_secret', env_key: 'SENTINEL_CLIENT_SECRET', is_set: true },
-              { id: 'opensky_client_id', env_key: 'OPENSKY_CLIENT_ID', is_set: false },
-            ]),
-            { status: 200 },
-          );
-        }
-        return new Response('not found', { status: 404 });
-      });
-      globalThis.fetch = fetchMock as unknown as typeof globalThis.fetch;
-
-      const configured = await checkBackendSentinelStatus();
-      expect(configured).toBe(true);
-    });
-
-    it('returns false when only one of the two keys is set', async () => {
-      const fetchMock = vi.fn(async () =>
-        new Response(
-          JSON.stringify([
-            { id: 'sentinel_client_id', env_key: 'SENTINEL_CLIENT_ID', is_set: true },
-            { id: 'sentinel_client_secret', env_key: 'SENTINEL_CLIENT_SECRET', is_set: false },
-          ]),
-          { status: 200 },
-        ),
-      );
-      globalThis.fetch = fetchMock as unknown as typeof globalThis.fetch;
-
-      const configured = await checkBackendSentinelStatus();
-      expect(configured).toBe(false);
-    });
-
-    it('fails safely (false) when the backend errors', async () => {
-      const fetchMock = vi.fn(async () => { throw new Error('network down'); });
-      globalThis.fetch = fetchMock as unknown as typeof globalThis.fetch;
-
-      const configured = await checkBackendSentinelStatus();
-      expect(configured).toBe(false);
-    });
-  });
-});

frontend/src/__tests__/utils/wikimediaClient.test.ts

@@ -1,21 +1,16 @@
 /**
- * Issues #218 / #219 / #220 (tg12 external audit) + Round 7a:
+ * Issues #218 / #219 / #220 (tg12 external audit):
  *
  * Every browser-direct call to Wikipedia or Wikidata must send the
- * `Api-User-Agent` header that Wikimedia's UA policy asks for, AND must
- * embed the per-install operator handle so Wikimedia can rate-limit /
- * contact the specific operator instead of treating "Shadowbroker" as
- * one giant entity.
- *
- * These tests pin both requirements on the shared `lib/wikimediaClient`
+ * `Api-User-Agent` header that Wikimedia's UA policy asks for. These
+ * tests pin that requirement on the shared `lib/wikimediaClient`
  * helper that WikiImage, NewsFeed, and useRegionDossier all route
- * through. A future refactor that drops either the header OR the
- * per-operator handle gets a loud test failure rather than a silent
- * ToS / privacy regression.
+ * through, so a future refactor that drops the header gets a loud
+ * test failure rather than a silent ToS regression.
  */
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import {
-  buildWikimediaUserAgent,
+  WIKIMEDIA_API_USER_AGENT,
   fetchWikipediaSummary,
   fetchWikidataSparql,
   _resetWikimediaClientCacheForTests,
@@ -23,18 +18,6 @@ import {
 
 const originalFetch = globalThis.fetch;
 
-// Helper: stub fetch so calls to /api/settings/operator-handle return a
-// known handle, and everything else proxies to whatever the test set up.
-function withHandle(handle: string, otherFetch: typeof globalThis.fetch) {
-  return vi.fn(async (input: any, init?: RequestInit) => {
-    const url = String(input);
-    if (url.endsWith('/api/settings/operator-handle')) {
-      return new Response(JSON.stringify({ handle }), { status: 200 });
-    }
-    return otherFetch(input, init);
-  });
-}
-
 describe('lib/wikimediaClient', () => {
   beforeEach(() => {
     _resetWikimediaClientCacheForTests();
@@ -45,35 +28,16 @@ describe('lib/wikimediaClient', () => {
     vi.restoreAllMocks();
   });
 
-  it('builds a stable per-operator Api-User-Agent with contact path', async () => {
-    globalThis.fetch = withHandle(
-      'operator-abc123',
-      vi.fn(async () => new Response('{}', { status: 200 })) as any,
-    ) as any;
-    const ua = await buildWikimediaUserAgent('wikipedia-summary');
-    expect(ua).toContain('Shadowbroker');
-    expect(ua.toLowerCase()).toContain('github.com');
-    expect(ua.toLowerCase()).toContain('issues');
-    expect(ua).toContain('operator: operator-abc123');
-    expect(ua).toContain('purpose: wikipedia-summary');
+  it('exposes a stable Api-User-Agent identifier with a contact path', () => {
+    expect(WIKIMEDIA_API_USER_AGENT).toContain('Shadowbroker');
+    expect(WIKIMEDIA_API_USER_AGENT.toLowerCase()).toContain('github.com');
+    expect(WIKIMEDIA_API_USER_AGENT.toLowerCase()).toContain('issues');
   });
 
-  it('falls back to "operator-offline" when handle endpoint is unreachable', async () => {
-    globalThis.fetch = vi.fn(async (input: any) => {
-      const url = String(input);
-      if (url.endsWith('/api/settings/operator-handle')) {
-        return new Response('forbidden', { status: 403 });
-      }
-      return new Response('{}', { status: 200 });
-    }) as any;
-    const ua = await buildWikimediaUserAgent('test');
-    expect(ua).toContain('operator: operator-offline');
-  });
-
-  it('sends per-operator Api-User-Agent on Wikipedia summary fetch', async () => {
-    const wikiCalls: Array<{ url: string; init?: RequestInit }> = [];
-    const baseFetch = vi.fn(async (url: any, init?: RequestInit) => {
-      wikiCalls.push({ url: String(url), init });
+  it('sends Api-User-Agent on Wikipedia summary fetch', async () => {
+    const calls: Array<{ url: string; init?: RequestInit }> = [];
+    globalThis.fetch = vi.fn(async (url: any, init?: RequestInit) => {
+      calls.push({ url: String(url), init });
       return new Response(
         JSON.stringify({
           type: 'standard',
@@ -84,71 +48,44 @@ describe('lib/wikimediaClient', () => {
         }),
         { status: 200 },
       );
-    });
-    globalThis.fetch = withHandle('operator-test01', baseFetch as any) as any;
+    }) as any;
 
     const summary = await fetchWikipediaSummary('Boeing 747');
     expect(summary?.thumbnail).toBe('https://example.org/thumb.jpg');
-    // wikiCalls only captures calls to non-handle URLs.
-    expect(wikiCalls).toHaveLength(1);
-    const headers = (wikiCalls[0].init?.headers || {}) as Record<string, string>;
-    expect(headers['Api-User-Agent']).toContain('operator: operator-test01');
-    expect(headers['Api-User-Agent']).toContain('purpose: wikipedia-summary');
+    expect(calls).toHaveLength(1);
+    const headers = (calls[0].init?.headers || {}) as Record<string, string>;
+    expect(headers['Api-User-Agent']).toBe(WIKIMEDIA_API_USER_AGENT);
   });
 
-  it('sends per-operator Api-User-Agent on Wikidata SPARQL fetch', async () => {
+  it('sends Api-User-Agent on Wikidata SPARQL fetch', async () => {
     const calls: Array<{ url: string; init?: RequestInit }> = [];
-    const baseFetch = vi.fn(async (url: any, init?: RequestInit) => {
+    globalThis.fetch = vi.fn(async (url: any, init?: RequestInit) => {
       calls.push({ url: String(url), init });
       return new Response(
         JSON.stringify({
-          results: { bindings: [{ leaderLabel: { value: 'Test Leader' } }] },
-        }),
-        { status: 200 },
-      );
-    });
-    globalThis.fetch = withHandle('operator-sparql', baseFetch as any) as any;
-
-    const bindings = await fetchWikidataSparql('SELECT * WHERE { ?s ?p ?o }');
-    expect(bindings).toHaveLength(1);
-    const headers = (calls[0].init?.headers || {}) as Record<string, string>;
-    expect(headers['Api-User-Agent']).toContain('operator: operator-sparql');
-    expect(headers['Api-User-Agent']).toContain('purpose: wikidata-sparql');
-    expect(headers['Accept']).toBe('application/sparql-results+json');
-  });
-
-  it('handle endpoint is queried only ONCE across many wiki fetches', async () => {
-    let handleCalls = 0;
-    let wikiCalls = 0;
-    globalThis.fetch = vi.fn(async (input: any) => {
-      const url = String(input);
-      if (url.endsWith('/api/settings/operator-handle')) {
-        handleCalls++;
-        return new Response(JSON.stringify({ handle: 'operator-cache' }), { status: 200 });
-      }
-      wikiCalls++;
-      return new Response(
-        JSON.stringify({
-          type: 'standard',
-          title: 'X',
-          description: '',
-          extract: '',
-          thumbnail: { source: 'https://example.org/x.jpg' },
+          results: {
+            bindings: [
+              {
+                leaderLabel: { value: 'Test Leader' },
+                govTypeLabel: { value: 'Test Government' },
+              },
+            ],
+          },
         }),
         { status: 200 },
       );
     }) as any;
 
-    await fetchWikipediaSummary('Eiffel Tower');
-    await fetchWikipediaSummary('Mount Fuji');
-    await fetchWikipediaSummary('Statue of Liberty');
-    expect(handleCalls).toBe(1);
-    expect(wikiCalls).toBe(3);
+    const bindings = await fetchWikidataSparql('SELECT * WHERE { ?s ?p ?o }');
+    expect(bindings).toHaveLength(1);
+    const headers = (calls[0].init?.headers || {}) as Record<string, string>;
+    expect(headers['Api-User-Agent']).toBe(WIKIMEDIA_API_USER_AGENT);
+    expect(headers['Accept']).toBe('application/sparql-results+json');
   });
 
   it('shares cache across consecutive callers for the same Wikipedia title', async () => {
     let fetchCount = 0;
-    const baseFetch = vi.fn(async () => {
+    globalThis.fetch = vi.fn(async () => {
       fetchCount++;
       return new Response(
         JSON.stringify({
@@ -160,8 +97,7 @@ describe('lib/wikimediaClient', () => {
         }),
         { status: 200 },
       );
-    });
-    globalThis.fetch = withHandle('operator-cache', baseFetch as any) as any;
+    }) as any;
 
     const a = await fetchWikipediaSummary('Eiffel Tower');
     const b = await fetchWikipediaSummary('Eiffel Tower');
@@ -171,7 +107,7 @@ describe('lib/wikimediaClient', () => {
 
   it('deduplicates concurrent in-flight requests for the same title', async () => {
     let fetchCount = 0;
-    const baseFetch = vi.fn(async () => {
+    globalThis.fetch = vi.fn(async () => {
       fetchCount++;
       await new Promise((r) => setTimeout(r, 5));
       return new Response(
@@ -184,8 +120,7 @@ describe('lib/wikimediaClient', () => {
         }),
         { status: 200 },
       );
-    });
-    globalThis.fetch = withHandle('operator-cache', baseFetch as any) as any;
+    }) as any;
 
     const [a, b, c] = await Promise.all([
       fetchWikipediaSummary('Mount Fuji'),
@@ -199,37 +134,28 @@ describe('lib/wikimediaClient', () => {
   });
 
   it('returns null on disambiguation pages without throwing', async () => {
-    globalThis.fetch = withHandle(
-      'operator-cache',
-      vi.fn(async () =>
-        new Response(JSON.stringify({ type: 'disambiguation' }), { status: 200 }),
-      ) as any,
+    globalThis.fetch = vi.fn(async () =>
+      new Response(JSON.stringify({ type: 'disambiguation' }), { status: 200 }),
     ) as any;
     const summary = await fetchWikipediaSummary('Mercury');
     expect(summary).toBeNull();
   });
 
   it('returns null on HTTP error without throwing', async () => {
-    globalThis.fetch = withHandle(
-      'operator-cache',
-      vi.fn(async () => new Response('not found', { status: 404 })) as any,
-    ) as any;
+    globalThis.fetch = vi.fn(async () => new Response('not found', { status: 404 })) as any;
     const summary = await fetchWikipediaSummary('Nonexistent Article 12345');
     expect(summary).toBeNull();
   });
 
   it('returns null on network error without throwing', async () => {
-    globalThis.fetch = withHandle(
-      'operator-cache',
-      vi.fn(async () => {
-        throw new Error('network down');
-      }) as any,
-    ) as any;
+    globalThis.fetch = vi.fn(async () => {
+      throw new Error('network down');
+    }) as any;
     const summary = await fetchWikipediaSummary('Anything');
     expect(summary).toBeNull();
   });
 
-  it('returns null on empty input without fetching anything', async () => {
+  it('returns null on empty input', async () => {
     globalThis.fetch = vi.fn(async () => new Response('{}', { status: 200 })) as any;
     expect(await fetchWikipediaSummary('')).toBeNull();
     expect(await fetchWikipediaSummary('   ')).toBeNull();

frontend/src/app/page.tsx

@@ -39,7 +39,6 @@ import { useFeedHealth } from '@/hooks/useFeedHealth';
 import { useKeyboardShortcuts } from '@/hooks/useKeyboardShortcuts';
 import KeyboardShortcutsOverlay from '@/components/KeyboardShortcutsOverlay';
 import AlertToast from '@/components/AlertToast';
-import AisUpstreamBanner from '@/components/AisUpstreamBanner';
 import { useAlertToasts } from '@/hooks/useAlertToasts';
 import { useWatchlist } from '@/hooks/useWatchlist';
 import WatchlistWidget from '@/components/WatchlistWidget';
@@ -51,7 +50,6 @@ import {
   hasSentinelInfoBeenSeen,
   markSentinelInfoSeen,
   hasSentinelCredentials,
-  checkBackendSentinelStatus,
 } from '@/lib/sentinelHub';
 import { useTranslation } from '@/i18n';
 import { LocateBar } from './LocateBar';
@@ -109,15 +107,6 @@ export default function Dashboard() {
   useEffect(() => {
     localStorage.setItem('sb_ticker_open', tickerOpen.toString());
   }, [tickerOpen]);
-
-  // Issue #298: kick the one-time backend Sentinel-status check on mount.
-  // This populates the cached value that ``hasSentinelCredentials()`` reads
-  // synchronously elsewhere (MaplibreViewer's tile-URL memo, the
-  // Sentinel-info modal flow). Fire-and-forget — the cache stays false
-  // until resolved so the UI fails safely.
-  useEffect(() => {
-    void checkBackendSentinelStatus();
-  }, []);
   const [settingsOpen, setSettingsOpen] = useState(false);
   const [legendOpen, setLegendOpen] = useState(false);
   const [shortcutsOpen, setShortcutsOpen] = useState(false);
@@ -934,11 +923,6 @@ export default function Dashboard() {
           onFlyTo={handleFlyTo}
         />
 
-        {/* AIS UPSTREAM OUTAGE BANNER — renders only when AIS is configured
-            but the WebSocket upstream is unreachable. Tells users the empty
-            ocean isn't their fault. */}
-        <AisUpstreamBanner />
-
         {/* ONBOARDING MODAL */}
         {showOnboarding && (
           <OnboardingModal

frontend/src/components/AIIntelPanel.tsx

@@ -357,15 +357,8 @@ function ConnectModalBody({ apiEndpoint, handleCopy, copied }: ConnectModalBodyP
   const [riskAccepted, setRiskAccepted] = React.useState(false);
   const [accessTier, setAccessTier] = React.useState<'restricted' | 'full'>('restricted');
   const [connectionMode, setConnectionMode] = React.useState<'local' | 'remote'>('local');
-  // hmacSecret holds the FULL secret once the operator has clicked
-  // Reveal (or after a regenerate). maskedHmacSecret is the safe-to-show
-  // fingerprint returned by GET /api/ai/connect-info and is loaded on
-  // mount. The two are independent state slots so a stale full secret
-  // can never leak back into the UI after a regenerate.
   const [hmacSecret, setHmacSecret] = React.useState('');
-  const [maskedHmacSecret, setMaskedHmacSecret] = React.useState('');
   const [hmacLoading, setHmacLoading] = React.useState(false);
-  const [revealing, setRevealing] = React.useState(false);
   const [tierSaving, setTierSaving] = React.useState(false);
   const [showAdvanced, setShowAdvanced] = React.useState(false);
   const [showResetConfirm, setShowResetConfirm] = React.useState(false);
@@ -388,40 +381,16 @@ function ConnectModalBody({ apiEndpoint, handleCopy, copied }: ConnectModalBodyP
   const [torError, setTorError] = React.useState('');
   const [torOnion, setTorOnion] = React.useState('');
 
-  // Issue #302 (tg12): the full HMAC secret no longer travels through
-  // GET /api/ai/connect-info on every modal open. The flow is now:
-  //
-  //   1. GET /api/ai/connect-info — always returns the masked fingerprint
-  //      (first6 + bullets + last4). `hmacSecret` stays empty until the
-  //      operator clicks the Reveal (eye) button below.
-  //   2. POST /api/ai/connect-info/bootstrap — fires once on mount if the
-  //      backend reports `hmac_secret_set: false`. Idempotent and never
-  //      returns the secret in the response.
-  //   3. POST /api/ai/connect-info/reveal — fires when the operator clicks
-  //      Reveal or Copy without the secret yet loaded. Returns the full
-  //      secret with strict `Cache-Control: no-store` so it doesn't land
-  //      in browser caches or HAR exports.
+  // Fetch connect-info + node status on mount
   React.useEffect(() => {
     (async () => {
       try {
         setHmacLoading(true);
-        const res = await fetch(`${API_BASE}/api/ai/connect-info`);
-        if (!res.ok) return;
-        const data = await res.json();
-        setMaskedHmacSecret(data.masked_hmac_secret || '');
-        setAccessTier(data.access_tier === 'full' ? 'full' : 'restricted');
-
-        // Transparent first-use bootstrap. Mirrors the pre-#302 UX of
-        // "open modal → secret exists" without the GET side-effect.
-        if (!data.hmac_secret_set) {
-          const bootRes = await fetch(
-            `${API_BASE}/api/ai/connect-info/bootstrap`,
-            { method: 'POST' },
-          );
-          if (bootRes.ok) {
-            const bootData = await bootRes.json();
-            setMaskedHmacSecret(bootData.masked_hmac_secret || '');
-          }
+        const res = await fetch(`${API_BASE}/api/ai/connect-info?reveal=true`);
+        if (res.ok) {
+          const data = await res.json();
+          setHmacSecret(data.hmac_secret || '');
+          setAccessTier(data.access_tier === 'full' ? 'full' : 'restricted');
         }
       } catch { /* ignore */ }
       finally { setHmacLoading(false); }
@@ -508,17 +477,8 @@ function ConnectModalBody({ apiEndpoint, handleCopy, copied }: ConnectModalBodyP
       const res = await fetch(`${API_BASE}/api/settings/agent/reset-all`, { method: 'POST' });
       const data = await res.json();
       if (data.ok) {
-        // Update local state with new credentials. reset-all returns
-        // the new HMAC secret in-band (same one-time-disclosure rule
-        // as /regenerate — a deliberate destructive action). Refresh
-        // both slots so the masked display stays in sync.
-        if (data.new_hmac_secret) {
-          setHmacSecret(data.new_hmac_secret);
-          const s = String(data.new_hmac_secret);
-          setMaskedHmacSecret(
-            s.length > 10 ? s.slice(0, 6) + '•'.repeat(8) + s.slice(-4) : '•'.repeat(16),
-          );
-        }
+        // Update local state with new credentials
+        if (data.new_hmac_secret) setHmacSecret(data.new_hmac_secret);
         if (data.new_onion) {
           setTorOnion(data.new_onion);
           setRemoteUrl(data.new_onion);
@@ -542,41 +502,13 @@ function ConnectModalBody({ apiEndpoint, handleCopy, copied }: ConnectModalBodyP
     finally { setTierSaving(false); }
   };
 
-  // Issue #302: POST /reveal returns the full secret with strict
-  // no-store headers. Lazily fetched — never on mount. Returns the
-  // secret string so callers can copy it immediately without waiting
-  // for React state propagation.
-  const revealHmacSecret = async (): Promise<string> => {
-    if (hmacSecret) return hmacSecret;
-    setRevealing(true);
-    try {
-      const res = await fetch(`${API_BASE}/api/ai/connect-info/reveal`, {
-        method: 'POST',
-      });
-      if (!res.ok) return '';
-      const data = await res.json();
-      const secret = String(data.hmac_secret || '');
-      setHmacSecret(secret);
-      return secret;
-    } catch {
-      return '';
-    } finally {
-      setRevealing(false);
-    }
-  };
-
   const handleRegenerate = async () => {
     setRegenerating(true);
     try {
       const res = await fetch(`${API_BASE}/api/ai/connect-info/regenerate`, { method: 'POST' });
       if (res.ok) {
         const data = await res.json();
-        // Regenerate is a deliberate destructive action — operator needs
-        // to see the new secret once to update their OpenClaw config.
-        // Both the full and masked forms refresh in one shot.
         setHmacSecret(data.hmac_secret || '');
-        setMaskedHmacSecret(data.masked_hmac_secret || '');
-        setShowSecret(true);
       }
     } catch { /* ignore */ }
     finally { setRegenerating(false); }
@@ -611,17 +543,9 @@ function ConnectModalBody({ apiEndpoint, handleCopy, copied }: ConnectModalBodyP
     finally { setNodeToggling(false); }
   };
 
-  // Issue #302: prefer the server-supplied fingerprint
-  // (maskedHmacSecret) \u2014 it's filled on mount via the (no-secret) GET.
-  // If the operator has clicked Reveal, fall through to deriving the
-  // mask from the in-memory full secret so we keep the same shape
-  // (first6 + bullets + last4) regardless of source. Final fallback
-  // (no secret loaded yet) is a generic bullet string.
-  const maskedSecret =
-    maskedHmacSecret ||
-    (hmacSecret
-      ? hmacSecret.slice(0, 6) + '\u2022'.repeat(8) + hmacSecret.slice(-4)
-      : '\u2022'.repeat(16));
+  const maskedSecret = hmacSecret
+    ? hmacSecret.slice(0, 6) + '\u2022'.repeat(8) + hmacSecret.slice(-4)
+    : '\u2022'.repeat(16);
 
   // Resolve the endpoint URL
   const resolvedUrl = connectionMode === 'local'
@@ -748,15 +672,10 @@ function ConnectModalBody({ apiEndpoint, handleCopy, copied }: ConnectModalBodyP
     return lines.join('\n');
   };
   const displaySnippet = buildSnippet(maskedSecret);
+  const copySnippet = buildSnippet(hmacSecret);
 
-  // Issue #302: the copy snippet needs the FULL secret. Pre-#302 we kept
-  // it in memory from the GET-with-reveal load; now we lazy-fetch via
-  // POST /reveal only when the operator actually clicks Copy. If they
-  // already revealed, the in-memory value is reused (no extra request).
-  const handleCopySnippet = async () => {
-    const secret = hmacSecret || (await revealHmacSecret());
-    if (!secret) return;
-    navigator.clipboard.writeText(buildSnippet(secret));
+  const handleCopySnippet = () => {
+    navigator.clipboard.writeText(copySnippet);
     setSnippetCopied(true);
     setTimeout(() => setSnippetCopied(false), 2000);
   };
@@ -994,38 +913,18 @@ function ConnectModalBody({ apiEndpoint, handleCopy, copied }: ConnectModalBodyP
                   </div>
                   <div className="flex items-center gap-2">
                     <code className="flex-1 bg-black/60 border border-violet-800/40 px-3 py-2 text-xs font-mono text-violet-300 overflow-hidden text-ellipsis">
-                      {/* Issue #302: when the operator hasn't clicked
-                          Reveal yet, hmacSecret is empty and we fall
-                          back to maskedHmacSecret (the safe fingerprint
-                          returned by GET /api/ai/connect-info). */}
-                      {showSecret && hmacSecret ? hmacSecret : (maskedHmacSecret || maskedSecret)}
+                      {showSecret ? hmacSecret : maskedSecret}
                     </code>
                     <button
-                      onClick={async () => {
-                        if (showSecret) {
-                          setShowSecret(false);
-                          return;
-                        }
-                        // Need the full secret in state before showing it.
-                        const secret = await revealHmacSecret();
-                        if (secret) setShowSecret(true);
-                      }}
-                      disabled={revealing}
-                      className="p-2 bg-violet-600/20 border border-violet-500/40 text-violet-400 hover:bg-violet-600/40 transition-colors shrink-0 disabled:opacity-50"
+                      onClick={() => setShowSecret(!showSecret)}
+                      className="p-2 bg-violet-600/20 border border-violet-500/40 text-violet-400 hover:bg-violet-600/40 transition-colors shrink-0"
                       title={showSecret ? 'Hide' : 'Reveal'}
                     >
                       {showSecret ? <EyeOff size={14} /> : <Eye size={14} />}
                     </button>
                     <button
-                      onClick={async () => {
-                        // Copy needs the full secret. Fetch it lazily if
-                        // the operator hasn't clicked Reveal yet — no
-                        // point making them reveal first just to copy.
-                        const secret = hmacSecret || (await revealHmacSecret());
-                        if (secret) handleCopy(secret);
-                      }}
-                      disabled={revealing}
-                      className="p-2 bg-violet-600/20 border border-violet-500/40 text-violet-400 hover:bg-violet-600/40 transition-colors shrink-0 disabled:opacity-50"
+                      onClick={() => handleCopy(hmacSecret)}
+                      className="p-2 bg-violet-600/20 border border-violet-500/40 text-violet-400 hover:bg-violet-600/40 transition-colors shrink-0"
                       title="Copy key"
                     >
                       {copied ? <Check size={14} /> : <Copy size={14} />}

frontend/src/components/AisUpstreamBanner.tsx

@@ -1,61 +0,0 @@
-/**
- * AisUpstreamBanner — visible notice that AIS ship data is unavailable
- * because the upstream provider (AISStream) is offline.
- *
- * Renders nothing when AIS is healthy or when AIS isn't configured at all.
- * Mounted at the app shell level so users see it before they wonder why
- * the ocean looks empty.
- */
-import { useState } from 'react';
-import { useAisUpstreamHealth } from '@/hooks/useAisUpstreamHealth';
-
-export function AisUpstreamBanner() {
-  const health = useAisUpstreamHealth();
-  const [dismissed, setDismissed] = useState(false);
-
-  if (!health || !health.aisEnabled || health.connected || dismissed) {
-    return null;
-  }
-
-  // Format the staleness for the operator. ``null`` means we never received
-  // anything since startup; otherwise show minutes if > 60s.
-  let stalenessLabel = 'never received';
-  if (health.lastMsgAgeSeconds != null) {
-    const minutes = Math.floor(health.lastMsgAgeSeconds / 60);
-    if (minutes >= 1) {
-      stalenessLabel = `last update ${minutes} min ago`;
-    } else {
-      stalenessLabel = `last update ${health.lastMsgAgeSeconds}s ago`;
-    }
-  }
-
-  return (
-    <div
-      role="status"
-      aria-live="polite"
-      className="pointer-events-auto fixed top-3 left-1/2 z-[100] -translate-x-1/2 max-w-[640px] rounded-md border border-amber-500/60 bg-amber-900/85 px-4 py-2 text-sm text-amber-50 shadow-lg backdrop-blur"
-    >
-      <div className="flex items-start gap-3">
-        <span aria-hidden className="mt-0.5 text-amber-300">⚠</span>
-        <div className="flex-1">
-          <div className="font-semibold">Ship data temporarily unavailable</div>
-          <div className="text-xs opacity-90">
-            AISStream upstream is offline ({stalenessLabel}). The map will
-            refill once their service comes back online — nothing is wrong
-            with your install.
-          </div>
-        </div>
-        <button
-          type="button"
-          onClick={() => setDismissed(true)}
-          aria-label="Dismiss"
-          className="text-amber-200 hover:text-white"
-        >
-          ✕
-        </button>
-      </div>
-    </div>
-  );
-}
-
-export default AisUpstreamBanner;

frontend/src/components/ChangelogModal.tsx

@@ -20,82 +20,129 @@ import {
   Heart,
 } from 'lucide-react';
 
-const CURRENT_VERSION = '0.9.81';
+const CURRENT_VERSION = '0.9.79';
 const STORAGE_KEY = `shadowbroker_changelog_v${CURRENT_VERSION}`;
-const RELEASE_TITLE = 'Signed Auto-Update + Update Button Race Fix';
+const RELEASE_TITLE = 'Onboarding, Live Feeds, Mesh, and Agent Hardening';
 
 const HEADLINE_FEATURES = [
   {
-    icon: <KeyRound size={20} className="text-purple-400" />,
+    icon: <Bot size={20} className="text-purple-400" />,
     accent: 'purple' as const,
-    title: 'Signed Auto-Update Going Forward (one manual hop)',
-    subtitle: 'After installing v0.9.81, the in-app Update button finally works end-to-end. This release establishes a fresh signing key — every release from here is a one-click upgrade.',
+    title: 'Agentic onboarding for OpenClaw-compatible agents',
+    subtitle: 'First-time setup now includes local/direct agent connection, access-tier selection, copyable HMAC setup, and optional Tor hidden-service prep.',
     details: [
-      'tauri.conf.json now carries a fresh minisign pubkey (the previous keypair was generated before v0.9.79 shipped but the matching private key was lost before any release was actually signed, so no release before v0.9.81 has working auto-update).',
-      'The v0.9.81 release artifacts ship with a signed latest.json + .sig files so every install on v0.9.81 or later can verify and apply the next release automatically via the Tauri updater plugin.',
-      'One-time cost: if you are upgrading from v0.9.79 or v0.9.8, the click-Update path falls back to a manual download because the new pubkey does not match the one baked into your install. Click the MANUAL DOWNLOAD button in the update dialog → grab the .msi from the release page → run it → from then on auto-update works in-app.',
+      'The onboarding flow can generate the local agent connection bundle through the existing HMAC API, point agents at /api/ai/tools, and let operators choose restricted read-only or full write access before connecting an agent.',
+      'Remote mode is labeled honestly: .onion exposes the signed HTTP agent API over Tor. Wormhole/MLS is not claimed as the current agent command transport.',
+      'The setup copy works for OpenClaw, Hermes, or any custom agent that implements the documented HMAC request contract.',
     ],
-    callToAction: 'CLICK UPDATE → DOWNLOAD MSI ONCE → AUTO-UPDATE FOREVER',
+    callToAction: 'OPEN FIRST-TIME SETUP -> AI AGENT',
   },
   {
-    icon: <Network size={20} className="text-amber-400" />,
-    accent: 'cyan' as const,
-    title: 'AIS Maritime Resilience — Outage Banner + AISHub Fallback',
-    subtitle: 'When AISStream’s WebSocket goes offline (as happened upstream in May 2026), the ships layer no longer goes silently empty.',
+    icon: <Bot size={20} className="text-purple-400" />,
+    accent: 'purple' as const,
+    title: 'Agentic AI Channel — supports OpenClaw and any HMAC-signing agent',
+    subtitle: 'ShadowBroker now exposes a signed agent command channel. Bring your own agent (OpenClaw, Claude Code, GPT, LangChain, or a custom client) and drive the dashboard from any LLM that speaks the protocol.',
     details: [
-      'AIS proxy health surfaces in /api/health: connected, last_msg_age_seconds, proxy_spawn_count. A dismissible amber banner explains the outage (“Ship data temporarily unavailable — AISStream upstream is offline”) instead of letting users assume their install is broken.',
-      'AISHub REST fallback (free tier at aishub.net/api). Polls every 20 minutes when the primary is disconnected and merges vessels into the same store with source: “aishub” so existing tooling attributes the provider.',
-      'Live data wins races: if the WebSocket reconnects mid-poll, fresh AISStream updates aren’t overwritten by stale REST records. Opt-in via AISHUB_USERNAME; cadence configurable via AISHUB_POLL_INTERVAL_MINUTES (clamped [1, 360]).',
+      'A signed command channel (POST /api/ai/channel/command) plus a batched concurrent-execution endpoint (up to 20 tool calls per round-trip via /api/ai/channel/batch). Agents query flights, ships, SIGINT, news, and intel layers; reason over the live mesh; and run market or threat analyses without a human in the loop.',
+      'HMAC-SHA256 request signing with timestamp + nonce replay protection. Tier-gated access (restricted vs full) governs which read and write commands the agent can invoke. Every call is auditable through the channel log.',
+      'ShadowBroker does not bundle an LLM, an agent runtime, or model weights — it ships the protocol. Any agent that signs requests with the documented HMAC contract can connect. OpenClaw is the reference implementation.',
     ],
-    callToAction: 'SET AISHUB_USERNAME \u2192 RESTART BACKEND',
+    callToAction: 'CONNECT YOUR AGENT \u2192 /API/AI/CHANNEL/COMMAND',
   },
   {
-    icon: <Shield size={20} className="text-cyan-400" />,
+    icon: <Network size={20} className="text-cyan-400" />,
     accent: 'cyan' as const,
-    title: 'Data-Layer Repair \u2014 UAP Cutoff + GPS Jamming Detection',
-    subtitle: 'Two long-broken layers fixed at the source. UFO sightings are actually recent now; GPS jamming zones actually fire.',
+    title: 'InfoNet Testnet \u2014 Framework, Privacy, and a Path to Decentralized Intelligence',
+    subtitle: 'The testnet now ships its full governance economy and the runway for a privacy-preserving decentralized intelligence platform.',
     details: [
-      'UAP sightings: the Hugging Face NUFORC mirror fallback had no date cutoff, so when the live nuforc.org scrape failed the layer served 3-year-old reports as \u201crecent\u201d. Now drops rows older than 60 days and logs loudly when the mirror is fully stale. Scheduler moved daily \u2192 weekly (Mondays 12:00 UTC).',
-      'GPS jamming: three stacked filters meant the layer almost never lit up. nac_p == 0 (\u201cGPS lock lost\u201d) was filtered out as if it were an old transponder \u2014 it\u2019s actually the strongest jamming signal. Now counted. MIN_AIRCRAFT lowered 5 \u2192 3 so sparser hotspots clear; MIN_RATIO lowered 0.30 \u2192 0.20.',
-      'Both layers now surface their own outages via assert_canary so operators see broken vs empty, not silently stale.',
+      'Sovereign Shell views: petitions (governance DSL covers parameter updates and feature toggles), upgrade-hash voting (80% supermajority, 67% Heavy-Node activation), evidence submission, dispute markets, gate suspension and shutdown, and bootstrap eligible-node-one-vote. Every write action is a clickable form with verbatim diagnostics on rejection.',
+      'Privacy primitive runway: locked Protocol contracts for ring signatures, stealth addresses, shielded balances, and DEX matching. The privacy-core Rust crate is the integration target. Function Keys (anonymous citizenship proof) ship 5 of 6 pieces; only blind-signature issuance waits on a primitive decision.',
+      'Backbone: two-tier event state with epoch finality, identity rotation, progressive penalties, ramp milestones, and constitutional invariants enforced via MappingProxyType. Sprint 11+ wires the cryptographic primitives into the locked Protocols.',
+      'Still an experimental testnet \u2014 no privacy guarantee yet. Treat all channels as public until E2E and the privacy primitives ship.',
     ],
-    callToAction: 'TOGGLE UAP \u2022 GPS JAMMING LAYERS',
+    callToAction: 'OPEN SOVEREIGN SHELL \u2192 PETITIONS \u2022 UPGRADES \u2022 GATES',
   },
 ];
 
 const NEW_FEATURES = [
   {
-    icon: <Plane size={18} className="text-orange-400" />,
-    title: 'Cumulative Fuel & CO2 per Flight',
-    desc: 'Aircraft tooltip now shows how much fuel each plane has actually burned in the air since first observation, not just the per-hour rate. 15-minute gap between sightings resets the session; 24-hour clamp protects against clock skew; per-icao prune every 5 minutes keeps memory bounded.',
-  },
-  {
-    icon: <Plane size={18} className="text-cyan-400" />,
-    title: 'Per-Flight Source Attribution',
-    desc: 'Every aircraft record now carries a source field (adsb.lol, OpenSky, airplanes.live, adsb.fi) so consumers can attribute the data provider. Pre-fix, adsb.lol records were unmarked while OpenSky records were explicitly tagged, making it look like adsb.lol was unused even though it is the primary source.',
+    icon: <Clock size={18} className="text-cyan-400" />,
+    title: 'Startup and Feed Responsiveness Pass',
+    desc: 'Map-critical feeds now lean on startup caches and priority preload behavior so the dashboard can paint before heavyweight synthesis jobs finish.',
   },
   {
     icon: <Network size={18} className="text-green-400" />,
-    title: 'Cross-Node DM Mailbox Replication',
-    desc: 'Direct messages now replicate across mesh nodes when one party is offline. Per-(sender, recipient) anti-spam cap enforced as a network rule (not client-side) so source-code tampering cannot bypass it.',
+    title: 'MeshChat MQTT Settings',
+    desc: 'Public MeshChat stays opt-in and now has an in-panel settings lane for broker, port, username, password, and channel PSK while remaining separated from Wormhole/private mode.',
   },
   {
-    icon: <Clock size={18} className="text-amber-400" />,
-    title: 'Infonet Sync — HTTP 429 Honored',
-    desc: 'When an upstream peer returns Retry-After, the node now waits exactly that long instead of retrying every 60 seconds and keeping the upstream rate-limit bucket permanently full. Exponential backoff on consecutive failures capped at 30 minutes.',
+    icon: <Plane size={18} className="text-cyan-400" />,
+    title: 'Selected Entity Trails',
+    desc: 'Flight and vessel trails are drawn only for selected assets, reducing global clutter while still exposing movement history for unknown-route entities.',
+  },
+  {
+    icon: <Plane size={18} className="text-amber-400" />,
+    title: 'Aircraft Detail Cards',
+    desc: 'Commercial aircraft stay airline-first, while private and general aviation aircraft can show model-focused Wiki context and imagery when available.',
+  },
+  {
+    icon: <Cpu size={18} className="text-purple-400" />,
+    title: 'AI Batch Command Channel',
+    desc: 'POST up to 20 tool calls in a single HTTP round-trip; the backend executes them concurrently and returns a fan-out result map. Cuts agent latency by an order of magnitude over sequential calls.',
+  },
+  {
+    icon: <Scale size={18} className="text-amber-400" />,
+    title: 'Governance DSL — Petition-Driven Parameter Changes',
+    desc: 'Type-safe payload executor for UPDATE_PARAM, BATCH_UPDATE_PARAMS, ENABLE_FEATURE, and DISABLE_FEATURE petitions. Tunable knobs change on-chain via a vote — no code deploys required.',
+  },
+  {
+    icon: <GitBranch size={18} className="text-purple-400" />,
+    title: 'Upgrade-Hash Governance',
+    desc: 'Protocol upgrades that need new logic (not just parameter changes) vote on a SHA-256 hash of the verified release. 80% supermajority, 40% quorum, 67% Heavy-Node activation. Lifecycle: signatures, voting, challenge window, awaiting readiness, activated.',
+  },
+  {
+    icon: <KeyRound size={18} className="text-purple-400" />,
+    title: 'Function Keys — Anonymous Citizenship Proof',
+    desc: 'A citizen proves "I am an Infonet citizen" without revealing their Infonet identity. 5 of 6 pieces shipped: nullifiers, challenge-response, two-phase commit receipts, enumerated denial codes, batched settlement. Issuance via blind signatures waits on a primitive decision.',
+  },
+  {
+    icon: <Shield size={18} className="text-cyan-400" />,
+    title: 'Privacy Primitive Runway',
+    desc: 'Locked Protocol contracts in services/infonet/privacy/contracts.py for ring signatures, stealth addresses, Pedersen commitments, range proofs, and DEX matching. The privacy-core Rust crate is the integration target — no caller of the privacy module needs to know which scheme is active.',
+  },
+  {
+    icon: <Layers size={18} className="text-blue-400" />,
+    title: 'Two-Tier State + Epoch Finality',
+    desc: 'Tier 1 events propagate CRDT-style for low latency; Tier 2 events require epoch finality before they can be acted on. Identity rotation, progressive penalties, ramp milestones, and constitutional invariants are enforced via MappingProxyType.',
+  },
+  {
+    icon: <Terminal size={18} className="text-cyan-400" />,
+    title: 'Sovereign Shell Write Surface',
+    desc: 'PetitionsView, UpgradeView, ResolutionView, GateShutdownView, BootstrapView, and FunctionKeyView each expose every Sprint 4-8 + 10 write action as a clickable form. Adaptive polling tightens to 8 seconds during active voting/challenge phases.',
+  },
+  {
+    icon: <Clock size={18} className="text-pink-400" />,
+    title: 'Time Machine — Snapshot Playback',
+    desc: 'Scrub backward through saved telemetry. Live polling pauses on entry to snapshot mode, the map redraws from the recorded snapshot, and moving entities interpolate between recorded frames. Hourly index lets you jump to any captured timestamp; pressing Live restores the current feed instantly.',
+  },
+  {
+    icon: <Satellite size={18} className="text-orange-400" />,
+    title: 'SAR Satellite Telemetry — ASF, OPERA, Copernicus',
+    desc: 'New SAR (Synthetic Aperture Radar) layer. Mode A (default-on) pulls free catalog metadata from the Alaska Satellite Facility — no account required. Mode B (two-step opt-in) ingests pre-processed ground-change anomalies from NASA OPERA, Copernicus EGMS, GFM, EMS, and UNOSAT — deformation, flood, and damage assessments. Integrates with OpenClaw so agents can read and act on SAR anomalies; broadcasts default to private-tier transport (Tor / RNS).',
   },
 ];
 
 const BUG_FIXES = [
-  'Update button no longer throws "admin_session_required" on desktop installs. The initial updateAction now syncs to Tauri detection at React-init time (window.__TAURI__ is injected before mount), so a click before the async runtime probe completes opens the GitHub release page in a browser instead of POSTing to /api/system/update.',
-  'Desktop installer now bundles defusedxml + PySocks (declared in pyproject.toml but missing from the venv shipped with v0.9.79 and the initial v0.9.8 publish). Fixes the bundled-backend launch crash reported in #319 and #296 (managed_backend_exited_early:exit code: 103).',
-  'UAP layer no longer serves 3-year-old NUFORC sightings via the Hugging Face static-mirror fallback (60-day cutoff now applied to the fallback path too).',
-  'GPS jamming detection now counts nac_p == 0 (the actual GPS-lost signal) instead of filtering it out as an old-transponder artifact.',
-  'GPS jamming thresholds lowered (MIN_AIRCRAFT 5 → 3, MIN_RATIO 0.30 → 0.20) so sparser hotspots clear the bar without losing the 1-aircraft noise cushion.',
-  'AIS layer surfaces an outage banner when the AISStream WebSocket upstream is offline, instead of silently showing an empty ocean.',
-  'Flight emissions tooltip now shows cumulative fuel/CO2 since first observation, not just the per-hour rate.',
-  'Per-aircraft observation tracker (15-min reopen gap, 24-hour clamp) survives trail-rendering cache pruning so cumulative counters do not reset mid-flight.',
-  'UAP scheduler moved daily → weekly (Mondays 12:00 UTC) to match the layer’s rolling-window cadence and reduce upstream load.',
+  'Docker proxy and backend port handling hardened so changing the host backend port does not require changing the internal service contract.',
+  'Global Threat Intercept and live-data startup paths no longer wait on slow-tier synthesis before cached data can paint the UI.',
+  'MeshChat and Infonet statuses now separate public MQTT participation, private Wormhole mode, and local node bootstrap so the UI does not imply the wrong connection state.',
+  'Commercial aircraft detail cards no longer show a confusing model image alongside the airline card.',
+  'Sovereign Shell adaptive polling — voting and challenge windows refresh every 8 seconds while active, every 30 to 60 seconds when idle. Voting feels live without a websocket layer.',
+  'Per-row write actions (petitions, upgrades, disputes) hold isolated submission state so concurrent forms no longer share a single in-flight slot.',
+  'Verbatim diagnostic surfacing on every write button. The backend reason text is always shown on rejection — no opaque "denied" toasts.',
+  'Evidence submission canonicalization matches Python repr() exactly, so client-side SHA-256 hashes round-trip cleanly through the chain.',
+  'Function Keys copy is context-agnostic — citizenship proof is described abstractly, not tied to a specific use case.',
+  'Post-cutover legacy mesh files (mesh_schema.py, mesh_signed_events.py, mesh_hashchain.py) hash-verified against the recorded baseline; the chain extension hook stays surgical.',
 ];
 
 const CONTRIBUTORS = [

frontend/src/components/InfonetTerminal/InfonetShell.tsx

@@ -298,33 +298,6 @@ export default function InfonetShell({
     setCurrentView(view);
   };
 
-  const renderGateDirectory = (variant: 'landing' | 'command' = 'command') => (
-    <div
-      className={
-        variant === 'landing'
-          ? 'w-full max-w-3xl border border-cyan-950/50 bg-black/20 px-4 py-3 text-left shadow-[0_0_18px_rgba(6,182,212,0.06)]'
-          : 'text-gray-400'
-      }
-    >
-      <p className={`${variant === 'landing' ? 'text-[11px]' : ''} text-gray-400 uppercase tracking-[0.18em]`}>
-        AVAILABLE OBFUSCATED GATES:
-      </p>
-      <div className={`grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 ${variant === 'landing' ? 'gap-x-8 gap-y-1.5 mt-2' : 'gap-2 mt-2'}`}>
-        {GATES.map(gate => (
-          <button
-            key={gate}
-            type="button"
-            className="group flex min-h-[24px] items-center text-left text-gray-300 hover:text-white transition-colors"
-            onClick={() => handleNavigate('gate', gate)}
-          >
-            <span className="text-gray-500 mr-2 group-hover:text-cyan-400 transition-colors">[{'>'}]</span>
-            <span className="truncate group-hover:drop-shadow-[0_0_5px_rgba(6,182,212,0.8)]">{gate}</span>
-          </button>
-        ))}
-      </div>
-    </div>
-  );
-
   const openGateWhenReady = async (
     gateTarget: string,
     operation: () => Promise<void>,
@@ -498,7 +471,19 @@ export default function InfonetShell({
       setHistory([]);
       return;
     } else if (trimmedCmd === 'gates') {
-      output = renderGateDirectory('command');
+      output = (
+        <div className="text-gray-400">
+          <p>AVAILABLE OBFUSCATED GATES:</p>
+          <div className="grid grid-cols-2 md:grid-cols-3 gap-2 mt-2">
+            {GATES.map(gate => (
+              <div key={gate} className="flex items-center cursor-pointer hover:text-gray-300 group" onClick={() => handleNavigate('gate', gate)}>
+                <span className="text-gray-500 mr-2 group-hover:text-cyan-400 transition-colors">[{'>'}]</span>
+                <span className="text-gray-300 group-hover:text-white transition-colors group-hover:drop-shadow-[0_0_5px_rgba(6,182,212,0.8)]">{gate}</span>
+              </div>
+            ))}
+          </div>
+        </div>
+      );
     } else if (trimmedCmd.startsWith('join ') || trimmedCmd.startsWith('g/')) {
       const target = trimmedCmd.startsWith('g/') ? trimmedCmd.slice(2) : trimmedCmd.split(' ')[1];
       if (GATES.includes(target)) {
@@ -676,9 +661,6 @@ export default function InfonetShell({
                   <p>Type <span className="text-green-400 font-bold">&apos;gates&apos;</span> or <span className="text-green-400 font-bold">g/</span> to view available chatrooms.</p>
                 </div>
                 <NetworkStats />
-                <div className="mt-5 w-full flex justify-center">
-                  {renderGateDirectory('landing')}
-                </div>
               </div>
 
               <HashchainEvents />

frontend/src/components/NewsFeed.tsx

@@ -249,70 +249,34 @@ const VESSEL_TYPE_WIKI: Record<string, string> = {
 
 type FlightTrailPoint = { lat?: number; lng?: number; alt?: number; ts?: number } | number[];
 
-function formatObservedDuration(seconds: number): string {
-    // Compact "1h 14m" / "23m" / "45s" — matches the density of the rest
-    // of the flight tooltip. < 60s is shown as "<1m" so the user knows
-    // we've JUST started observing this hex (cumulative will still be 0).
-    if (!Number.isFinite(seconds) || seconds <= 0) return '<1m';
-    if (seconds < 60) return '<1m';
-    const totalMinutes = Math.floor(seconds / 60);
-    const hours = Math.floor(totalMinutes / 60);
-    const minutes = totalMinutes % 60;
-    if (hours > 0) return `${hours}h ${minutes}m`;
-    return `${minutes}m`;
-}
-
 function EmissionsEstimateBlock({ flight }: { flight: any }) {
     const emissions = flight?.emissions;
-    // Cumulative fuel/CO2 since the backend first saw this hex this
-    // flight session. Prefer these big numbers — the user explicitly
-    // wanted "the actual fuel that has been burned", not the rate.
-    // Rates are still shown below as smaller context.
-    const observedSec = Number(emissions?.observed_seconds ?? 0);
-    const fuelBurned = Number(emissions?.fuel_gallons_burned ?? 0);
-    const co2Emitted = Number(emissions?.co2_kg_emitted ?? 0);
-    const haveCumulative = emissions && observedSec > 0;
+    const context = emissions ? 'Model-based cruise estimate' : null;
 
     return (
         <div className="border-b border-[var(--border-primary)] pb-2">
             <span className="text-[var(--text-muted)] text-[10px] block mb-1.5">EMISSIONS ESTIMATE</span>
             <div className="flex gap-3">
                 <div className="flex-1 bg-[var(--bg-primary)]/50 border border-[var(--border-primary)] px-2 py-1.5">
-                    <div className="text-[11px] text-[var(--text-muted)] tracking-widest">FUEL BURNED</div>
-                    <div className="text-sm font-bold text-orange-400">
-                        {haveCumulative ? (
-                            <>{fuelBurned.toLocaleString(undefined, { maximumFractionDigits: 1 })} <span className="text-[11px] text-[var(--text-muted)] font-normal">gal</span></>
-                        ) : emissions ? (
-                            <span className="text-[var(--text-muted)] font-normal text-xs">—</span>
+                    <div className="text-[11px] text-[var(--text-muted)] tracking-widest">FUEL RATE</div>
+                    <div className="text-xs font-bold text-orange-400">
+                        {emissions ? (
+                            <>{emissions.fuel_gph} <span className="text-[11px] text-[var(--text-muted)] font-normal">GPH</span></>
                         ) : 'UNKNOWN'}
                     </div>
-                    {emissions && (
-                        <div className="text-[10px] text-[var(--text-muted)] mt-0.5">
-                            @ {emissions.fuel_gph} gph
-                        </div>
-                    )}
                 </div>
                 <div className="flex-1 bg-[var(--bg-primary)]/50 border border-[var(--border-primary)] px-2 py-1.5">
-                    <div className="text-[11px] text-[var(--text-muted)] tracking-widest">CO2 EMITTED</div>
-                    <div className="text-sm font-bold text-red-400">
-                        {haveCumulative ? (
-                            <>{co2Emitted.toLocaleString(undefined, { maximumFractionDigits: 1 })} <span className="text-[11px] text-[var(--text-muted)] font-normal">kg</span></>
-                        ) : emissions ? (
-                            <span className="text-[var(--text-muted)] font-normal text-xs">—</span>
+                    <div className="text-[11px] text-[var(--text-muted)] tracking-widest">CO2 RATE</div>
+                    <div className="text-xs font-bold text-red-400">
+                        {emissions ? (
+                            <>{emissions.co2_kg_per_hour.toLocaleString()} <span className="text-[11px] text-[var(--text-muted)] font-normal">KG/HR</span></>
                         ) : 'UNKNOWN'}
                     </div>
-                    {emissions && (
-                        <div className="text-[10px] text-[var(--text-muted)] mt-0.5">
-                            @ {emissions.co2_kg_per_hour.toLocaleString()} kg/hr
-                        </div>
-                    )}
                 </div>
             </div>
-            {emissions && (
+            {context && (
                 <div className="mt-1.5 text-[10px] text-[var(--text-muted)] leading-relaxed">
-                    {haveCumulative
-                        ? `Observed in flight for ${formatObservedDuration(observedSec)} · model-based cruise estimate`
-                        : 'Just observed · totals will appear on next refresh'}
+                    {context}
                 </div>
             )}
         </div>

frontend/src/components/OnboardingModal.tsx

@@ -4,7 +4,7 @@ import React, { useState, useEffect } from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
 import { X, ExternalLink, Key, Shield, Radar, Globe, Satellite, Ship, Radio, Bot, Copy, Check, Network } from 'lucide-react';
 
-const CURRENT_ONBOARDING_VERSION = '0.9.81-agentic-onboarding-1';
+const CURRENT_ONBOARDING_VERSION = '0.9.79-agentic-onboarding-1';
 const STORAGE_KEY = `shadowbroker_onboarding_complete_v${CURRENT_ONBOARDING_VERSION}`;
 const LEGACY_STORAGE_KEY = 'shadowbroker_onboarding_complete';
 
@@ -140,51 +140,17 @@ const OnboardingModal = React.memo(function OnboardingModal({
   ].join('\n');
   const remoteAgentNeedsTor = agentMode === 'remote' && !torAddress;
 
-  // Issue #302 (tg12): the full HMAC secret no longer comes back from
-  // GET /api/ai/connect-info. We fetch metadata + the masked fingerprint
-  // first; if the operator has explicitly asked to see the key (the
-  // ``reveal`` flag), we follow up with POST /api/ai/connect-info/reveal
-  // (after a transparent POST /bootstrap if the secret hasn't been
-  // minted yet) which carries the secret with strict no-store headers.
   const fetchAgentConnectInfo = async (reveal = true) => {
     setAgentLoading(true);
     setAgentMsg(null);
     try {
-      // 1) GET metadata + masked fingerprint.
-      const metaRes = await fetch('/api/ai/connect-info');
-      const metaData = await metaRes.json().catch(() => ({}));
-      if (!metaRes.ok || metaData?.ok === false) {
-        throw new Error(metaData?.detail || 'Could not prepare agent credentials.');
-      }
-      setAgentTier(metaData.access_tier === 'full' ? 'full' : 'restricted');
-
-      // 2) Mint the secret if it isn't set yet — transparent, idempotent.
-      let secretSet = !!metaData.hmac_secret_set;
-      if (!secretSet) {
-        const bootRes = await fetch('/api/ai/connect-info/bootstrap', {
-          method: 'POST',
-        });
-        const bootData = await bootRes.json().catch(() => ({}));
-        if (!bootRes.ok || bootData?.ok === false) {
-          throw new Error(bootData?.detail || 'Could not generate agent credentials.');
-        }
-        secretSet = !!bootData.hmac_secret_set;
-      }
-
-      // 3) If the caller asked to see the secret, fetch it explicitly.
-      //    Otherwise the masked fingerprint is enough for the UI.
-      if (reveal && secretSet) {
-        const revealRes = await fetch('/api/ai/connect-info/reveal', {
-          method: 'POST',
-        });
-        const revealData = await revealRes.json().catch(() => ({}));
-        if (!revealRes.ok || revealData?.ok === false) {
-          throw new Error(revealData?.detail || 'Could not reveal agent credentials.');
-        }
-        setAgentSecret(revealData.hmac_secret || '');
-      } else {
-        setAgentSecret(metaData.masked_hmac_secret || '');
+      const res = await fetch(`/api/ai/connect-info?reveal=${reveal ? 'true' : 'false'}`);
+      const data = await res.json().catch(() => ({}));
+      if (!res.ok || data?.ok === false) {
+        throw new Error(data?.detail || 'Could not prepare agent credentials.');
       }
+      setAgentSecret(data.hmac_secret || '');
+      setAgentTier(data.access_tier === 'full' ? 'full' : 'restricted');
       setAgentMsg({ type: 'ok', text: 'Agent key is ready. Copy it into your local or remote agent runtime.' });
     } catch (error) {
       setAgentMsg({