fix(fire): v0.5.7-fire -- FIRMS NATS pattern + WFIGS tombstone dedup + remove fire_proximity + categories audit

Third family of the v0.5.7 NATS-and-categories campaign. Fire is the heaviest of the campaign -- four distinct fixes plus a category audit. Two of the four were broken in production: FIRMS subscribed to a syntactically invalid pattern, and WFIGS tombstones were silently dropped.

FIX 1 -- FIRMS NATS pattern (the canonical bug). Pre-v0.5.7-fire `_subjects_for("firms","us.id")` returned `["central.fire.hotspot.>.us.id"]`, which is INVALID NATS (the `>` multi-level wildcard is only legal at the tail token). It also wouldn't have matched anything Central publishes: per the Central v0.10.0 consumer integration guide §firms, the actual published pattern is `central.fire.hotspot.<satellite>.<confidence>` (5 tokens, no us.<state> suffix). The two slots after "hotspot" are satellite name and confidence band -- NOT tile coordinates or region tokens.

Note on prompt vs. guide discrepancy: the v0.5.7-fire task spec described a tile-coord/state pattern `central.fire.hotspot.*.*.us.id` (7 tokens with us.<state> tail). That's neither what Central v0.10.0 publishes nor what its guide documents. We follow the guide. Subscribing to the prompt's 7-token pattern would silently match zero messages in production (token-count mismatch). State filtering for FIRMS happens client-side via data.latitude / data.longitude against the configured region bbox.

New subscription: `central.fire.hotspot.>` -- tail-only `>`, NATS-legal, matches all <satellite>.<confidence> combinations.

FIX 2 -- WFIGS tombstone subjects. Per guide §wfigs_incidents and §wfigs_perimeters, WFIGS publishes:

    active:    central.fire.incident.<state>.<county>     (Convention A, depth-3 state)
    active:    central.fire.perimeter.<state>.<county>
    tombstone: central.fire.incident.removed.<state>     (5 tokens, "removed" at depth-3)
    tombstone: central.fire.perimeter.removed.<state>

Pre-v0.5.7-fire `_subjects_for("fires","us.id")` subscribed only to the active subjects (`central.fire.incident.id.>` and `central.fire.perimeter.id.>`). The tombstone subjects have "removed" at depth-3 instead of the state token, so the active-subject `>` filters silently dropped EVERY tombstone. Fall-off signals never reached meshai's inhibitor, so old incidents stayed "live" in the pipeline indefinitely.

Added the two tombstone subjects to the subscription list. Both are 5-token literals with no wildcards -- trivially NATS-legal.

FIX 3 -- WFIGS tombstone dedup. Per guide §wfigs_incidents removal semantics, the tombstone env_id has the shape `<IrwinID>:removed:<iso_now>` -- the `:removed:` is sandwiched in the middle, with a timestamp tail. Pre-v0.5.7-fire the consumer.py group_key recovery was `re.sub(r":removed$", "", group_key)` -- a literal trailing `:removed` match -- which DID NOT FIRE on the WFIGS form (the regex required `:removed` at the very end of the string, but the WFIGS form has `:<iso>` after it).

Consequence: WFIGS tombstones' group_key was the full `<IrwinID>:removed:<iso>` string instead of the bare `<IrwinID>`. The pipeline grouper/inhibitor never matched tombstones to their original incidents, so the lapse signal was lost.

Fixed by switching the regex to `re.sub(r":removed(:.*)?$", "", group_key)` -- handles both the WFIGS `<IrwinID>:removed:<iso>` form AND the legacy GDACS `<id>:removed` form. The `is_tombstone` detection also gained an explicit `":removed:" in env_id` check for the WFIGS shape.

Per the guide: "the same incident can have one or more removal tombstones over its lifecycle" (it can re-enter and re-fall-off). To preserve per-tombstone distinctness for downstream lifecycle accounting, the full env_id is stashed on `Event.data["_central_tombstone_id"]` (the group_key collapses to the IrwinID by design, but the original env_id with the :<iso> tail survives on data).

FIX 4 -- ALERT_CATEGORIES fire-family audit + removed parametric entries. Per Matt's direct feedback ("fire near mesh has its own set of parameters that I don't even know what they could be. like how far is near mesh? I don't know I can't set that."), the parametric `fire_proximity` and the duplicate-named `wildfire_proximity` (both labeled "Fire Near Mesh" with parametric radius-based descriptions) were unselectable in the new Advanced Rules UI. Removed both.

Cross-referenced what FIRMS and WFIGS actually emit (per the guide and the native adapter code) and audited the registry:

    Native emit:
      firms.py  -> new_ignition (when adapter flags new_ignition)
                or wildfire_hotspot (otherwise)  [v0.5.7-fire: was wildfire_proximity]
      fires.py  -> wildfire_incident
    Central path emit (via map_category):
      fire.hotspot.*    -> wildfire_hotspot
      fire.incident.*   -> wildfire_incident
      fire.perimeter.*  -> wildfire_incident (perimeters merge to the incident)
      fire.<other>      -> wildfire_incident (catchall)
    Registry after v0.5.7-fire:
      {new_ignition, wildfire_hotspot, wildfire_incident}
    Parity confirmed. No orphans, no missing.

Aligning firms.py to emit `wildfire_hotspot` (matching the central FIRMS map) means native + central FIRMS produce identical categories regardless of which feed path is enabled.

Composer (`_CATEGORY_EMOJI`, `_CATEGORY_LABEL`) and router (three source-attribution tables) updated to drop the removed categories and add the new ones.

Deferred to v0.5.8: distance_max_km field on rules for actual proximity filtering. Replaces the parametric fire_proximity registry entry with a parameterized rule field that the user CAN configure ("alert me about wildfire_incident within 30 km" instead of an opaque "Fire Near Mesh" toggle).

Tests
-----
PYTHONPATH=. pytest -q: 380 passed (was 366; +14 net).
  - tests/test_fire_v057.py (new): FIRMS subject is tail-only `>` with no mid-subject placement; WFIGS subjects cover active + four tombstones; WFIGS tombstone strips `:removed(:.*)?$` for group_key; two same-IrwinID tombstones both propagate through _handle and share group_key, with the original env_id preserved on data["_central_tombstone_id"]; legacy GDACS `:removed` shape still strips cleanly; fire_proximity / wildfire_proximity absent from ALERT_CATEGORIES; no "Fire Near Mesh" name duplicates; fire-family parity (native + central emit == registry); required-fields check on the three fire entries.
  - tests/test_central_region_routing.py: updated FIRMS test (tail-only `>`) and WFIGS test (includes tombstone subjects).
  - tests/test_pipeline_toggle_filter.py, tests/test_adapter_firms.py, tests/test_v052_dispatcher.py, tests/test_pipeline_digest.py: bulk-migrated obsolete category references (wildfire_proximity -> wildfire_hotspot, fire_proximity -> wildfire_incident) so the existing test suites continue to exercise the same routing/digest/dispatch paths with the new category names.

Safe-mode preserved (master off, all family toggles off, all adapters native, central disabled). No live toggle flipped. Not tagging yet -- v0.5.7 tag waits until all families ship.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

tests/test_adapter_firms.py

@@ -85,11 +85,11 @@ def test_to_event_new_ignition(adapter):
 
 
 def test_to_event_near_known_fire(adapter):
-    """Hotspot near known fire maps to wildfire_proximity."""
+    """Hotspot near known fire maps to wildfire_hotspot."""
     evt = make_firms_event(new_ignition=False, near_fire="Snake River Fire")
     event = adapter.to_event(evt)
     assert event is not None
-    assert event.category == "wildfire_proximity"
+    assert event.category == "wildfire_hotspot"
 
 
 # ============================================================
@@ -187,7 +187,7 @@ def test_to_event_missing_coords_returns_none(adapter):
 
 
 def test_to_event_missing_properties_returns_event(adapter):
-    """Missing properties dict defaults to wildfire_proximity."""
+    """Missing properties dict defaults to wildfire_hotspot."""
     evt = {
         "source": "firms",
         "event_id": "test",
@@ -201,7 +201,7 @@ def test_to_event_missing_properties_returns_event(adapter):
     # No "properties" key at all
     event = adapter.to_event(evt)
     assert event is not None
-    assert event.category == "wildfire_proximity"
+    assert event.category == "wildfire_hotspot"
 
 
 def test_to_event_does_not_raise_on_corrupted_dict(adapter):

tests/test_central_region_routing.py

@@ -26,16 +26,26 @@ def test_subjects_for_usgs_quake_us_id():
     assert _subjects_for("usgs_quake", "us.id") == ["central.quake.event.>.us.id"]
 
 
-def test_subjects_for_firms_us_id():
-    """FIRMS hotspots: region AFTER wildcard, hotspot domain explicit."""
-    assert _subjects_for("firms", "us.id") == ["central.fire.hotspot.>.us.id"]
+def test_subjects_for_firms_us_id_uses_tail_only_wildcard():
+    """v0.5.7-fire: FIRMS publishes `central.fire.hotspot.<satellite>.<confidence>`
+    with NO region in the subject (per Central v0.10.0 guide §firms). The
+    pre-v0.5.7-fire `central.fire.hotspot.>.us.id` was syntactically invalid
+    (`>` mid-subject) AND wouldn't have matched anything Central actually
+    publishes. Region filtering for FIRMS now happens client-side via
+    data.latitude/longitude. Subscription uses tail-only `>` (NATS-legal)."""
+    assert _subjects_for("firms", "us.id") == ["central.fire.hotspot.>"]
 
 
-def test_subjects_for_fires_us_id_uses_state_token():
-    """NIFC fires: state-only token at depth-4 for both incident + perimeter."""
+def test_subjects_for_fires_us_id_includes_tombstones():
+    """v0.5.7-fire: WFIGS subjects -- active state-token at depth-3 + the
+    removal-tombstone subjects (`central.fire.{incident,perimeter}.removed.<state>`)
+    per Central v0.10.0 guide §wfigs_incidents §wfigs_perimeters. Pre-v0.5.7-fire
+    we only subscribed to active subjects, silently dropping fall-off signals."""
     assert _subjects_for("fires", "us.id") == [
         "central.fire.incident.id.>",
         "central.fire.perimeter.id.>",
+        "central.fire.incident.removed.id",
+        "central.fire.perimeter.removed.id",
     ]
 
 

tests/test_fire_v057.py

@@ -0,0 +1,258 @@
+"""v0.5.7-fire: FIRMS NATS pattern + WFIGS tombstone dedup + categories audit.
+
+Covers four things shipped in v0.5.7-fire:
+
+1. FIRMS subject pattern -- per Central v0.10.0 guide, FIRMS publishes
+   `central.fire.hotspot.<satellite>.<confidence>` with NO region in the
+   subject. The pre-v0.5.7-fire `central.fire.hotspot.>.us.id` was
+   syntactically invalid (`>` mid-subject) AND wouldn't have matched
+   anything. NOTE on user-prompt discrepancy: the v0.5.7-fire prompt
+   specified `central.fire.hotspot.*.*.us.id` (7 tokens with us.<state>
+   tail) but the actual Central v0.10.0 guide shows exactly 5 tokens with
+   no region. We follow the guide -- following the prompt verbatim would
+   produce a subscription that matches zero messages in production.
+2. WFIGS subjects -- active state-token subjects + the four removal
+   tombstone subjects per guide §wfigs_incidents §wfigs_perimeters.
+3. WFIGS tombstone dedup -- env_id form `<IrwinID>:removed:<iso_now>` must
+   strip to the bare IrwinID for group_key so all tombstones for the same
+   incident share the group_key (per guide §wfigs_incidents removal
+   semantics: "the same incident can have one or more removal tombstones
+   over its lifecycle"). Two tombstones with the same IrwinID but different
+   :removed:<iso> tails: both must propagate through _handle as distinct
+   Events; both must share group_key == IrwinID.
+4. ALERT_CATEGORIES fire-family audit -- fire_proximity and
+   wildfire_proximity removed (Matt: parametric, can't set "near"
+   threshold in UI); new_ignition, wildfire_hotspot, wildfire_incident kept
+   / added.
+"""
+
+import inspect
+import json
+import re
+
+import pytest
+
+from meshai.central.consumer import (
+    CentralConsumer,
+    _SUBJECTS_BARE,
+    _subjects_for,
+    map_category,
+)
+from meshai.config import EnvironmentalConfig
+from meshai.notifications.categories import ALERT_CATEGORIES
+from meshai.notifications.pipeline.bus import EventBus
+
+
+def _assert_legal_nats(subject: str) -> None:
+    """Assert NATS multi-level wildcard `>` only appears at the tail token."""
+    tokens = subject.split(".")
+    if ">" in tokens:
+        assert tokens[-1] == ">", f"`>` not at tail in {subject!r}"
+        assert tokens.count(">") == 1, f"multiple `>` in {subject!r}"
+    for tok in tokens:
+        assert tok, f"empty token in {subject!r}"
+        if tok not in {"*", ">"}:
+            assert "*" not in tok and ">" not in tok, f"mixed wildcard in token {tok!r}"
+
+
+# ---------- FIRMS subject pattern -----------------------------------------
+
+
+def test_firms_subject_uses_tail_only_wildcard():
+    """FIRMS publishes <satellite>.<confidence> only -- no us.<state>."""
+    subs = _subjects_for("firms", "us.id")
+    assert subs == ["central.fire.hotspot.>"]
+    for s in subs:
+        _assert_legal_nats(s)
+
+
+def test_firms_subject_has_no_mid_string_wildcard():
+    """Belt-and-braces: `>` only at tail, no mid-subject placement."""
+    for s in _subjects_for("firms", "us.id"):
+        tokens = s.split(".")
+        for tok in tokens[:-1]:
+            assert tok != ">", f"`>` mid-subject in {s!r}"
+
+
+# ---------- WFIGS subjects (fires) ----------------------------------------
+
+
+def test_fires_subjects_cover_active_and_tombstones():
+    """v0.5.7-fire: tombstone subjects are now subscribed alongside active."""
+    subs = _subjects_for("fires", "us.id")
+    assert subs == [
+        "central.fire.incident.id.>",
+        "central.fire.perimeter.id.>",
+        "central.fire.incident.removed.id",
+        "central.fire.perimeter.removed.id",
+    ]
+    for s in subs:
+        _assert_legal_nats(s)
+
+
+def test_fires_subjects_no_mid_subject_wildcard():
+    for s in _subjects_for("fires", "us.id"):
+        tokens = s.split(".")
+        for tok in tokens[:-1]:
+            assert tok != ">", f"`>` mid-subject in {s!r}"
+
+
+# ---------- WFIGS tombstone dedup -----------------------------------------
+
+
+def _envelope(adapter, eid, category="fire.incident.removed"):
+    """Build a CloudEvents-shaped envelope for a single WFIGS tombstone."""
+    return {"id": eid, "data": {
+        "id": eid, "adapter": adapter, "category": category,
+        "time": "2026-05-19T02:50:39+00:00", "severity": 0,
+        "geo": {"centroid": None, "primary_region": None, "regions": []},
+        "data": {"irwin_id": "{01AAC875-E26E-49E4-9DB0-80B5965A7B9F}",
+                 "state": "US-ID", "county": "Custer",
+                 "reason": "fallen_off_current_service",
+                 "last_observed_at": "2026-05-19T02:50:00+00:00"}}}
+
+
+def test_wfigs_tombstone_strips_removed_iso_suffix():
+    """Single WFIGS tombstone -- group_key recovers the bare IrwinID."""
+    rec = []
+    bus = EventBus(); bus.subscribe(rec.append)
+    c = CentralConsumer(EnvironmentalConfig(), bus)
+    irwin = "{01AAC875-E26E-49E4-9DB0-80B5965A7B9F}"
+    eid = f"{irwin}:removed:2026-05-19T02:50:39.843049+00:00"
+    env = _envelope("wfigs_incidents", eid)
+    ev = c._handle("central.fire.incident.removed.id", json.dumps(env).encode())
+    assert ev is not None
+    assert ev.data.get("_central_tombstone") is True
+    assert ev.group_key == irwin, f"group_key did not strip :removed:<iso> tail: {ev.group_key!r}"
+
+
+def test_wfigs_two_tombstones_same_irwin_both_propagate():
+    """Per guide §wfigs_incidents: the same incident can have multiple
+    removal tombstones over its lifecycle. Both tombstones with the same
+    IrwinID but different :removed:<iso> tails must:
+      - both be emitted by _handle (not collapsed at consumer layer)
+      - share the same group_key (== IrwinID) so they signal lapse
+        against the same original event
+    """
+    rec = []
+    bus = EventBus(); bus.subscribe(rec.append)
+    c = CentralConsumer(EnvironmentalConfig(), bus)
+    irwin = "{01AAC875-E26E-49E4-9DB0-80B5965A7B9F}"
+    eid1 = f"{irwin}:removed:2026-05-19T02:50:39.843049+00:00"
+    eid2 = f"{irwin}:removed:2026-05-20T14:22:17.111222+00:00"
+    env1 = _envelope("wfigs_incidents", eid1)
+    env2 = _envelope("wfigs_incidents", eid2)
+    ev1 = c._handle("central.fire.incident.removed.id", json.dumps(env1).encode())
+    ev2 = c._handle("central.fire.incident.removed.id", json.dumps(env2).encode())
+    # Both emitted -- no consumer-layer dedup collapsing.
+    assert ev1 is not None and ev2 is not None
+    assert len(rec) == 2, f"expected 2 events on bus, got {len(rec)}"
+    # Both share the bare IrwinID as group_key (so they lapse the original
+    # incident's accumulator entry by the same key).
+    assert ev1.group_key == irwin
+    assert ev2.group_key == irwin
+    # Event.id is intentionally deterministic from (source, category,
+    # group_key, lat, lon) — two tombstones for the same incident produce
+    # the same Event.id by design. Distinctness is preserved on
+    # data['_central_tombstone_id'] which carries the full :removed:<iso>
+    # tail so downstream consumers can tell the two fall-off events apart
+    # if they want to.
+    assert ev1.data.get("_central_tombstone_id") == eid1
+    assert ev2.data.get("_central_tombstone_id") == eid2
+    assert ev1.data["_central_tombstone_id"] != ev2.data["_central_tombstone_id"]
+
+
+def test_legacy_gdacs_tombstone_still_strips_plain_suffix():
+    """Regression guard: the legacy GDACS `<id>:removed` shape (no :<iso>
+    tail) must still strip cleanly. The v0.5.7-fire regex is a superset
+    of the pre-v0.5.7-fire regex, not a replacement."""
+    rec = []
+    bus = EventBus(); bus.subscribe(rec.append)
+    c = CentralConsumer(EnvironmentalConfig(), bus)
+    env = {"id": "FL1103885:removed", "data": {
+        "id": "FL1103885:removed", "adapter": "gdacs", "category": "disaster.fl.removed",
+        "time": "2026-05-28T00:00:00Z", "severity": 0,
+        "geo": {"centroid": None, "primary_region": None, "regions": []},
+        "data": {}}}
+    ev = c._handle("central.disaster.fl.removed.austria", json.dumps(env).encode())
+    assert ev is not None
+    assert ev.data.get("_central_tombstone") is True
+    assert ev.group_key == "FL1103885"
+
+
+# ---------- ALERT_CATEGORIES fire-family audit ----------------------------
+
+
+def test_fire_proximity_removed_from_registry():
+    """Matt: 'fire near mesh has its own set of parameters that I don't even
+    know what they could be. like how far is near mesh? I don't know I
+    can't set that.' -- removed in v0.5.7-fire; parametric distance is
+    queued for v0.5.8."""
+    assert "fire_proximity" not in ALERT_CATEGORIES
+
+
+def test_wildfire_proximity_removed_from_registry():
+    """Duplicate 'Fire Near Mesh' name w/ fire_proximity; same parametric
+    issue; removed in v0.5.7-fire."""
+    assert "wildfire_proximity" not in ALERT_CATEGORIES
+
+
+def test_no_duplicate_fire_near_mesh_names():
+    """No two fire-family registry entries share the 'Fire Near Mesh' name."""
+    names = [info["name"] for cid, info in ALERT_CATEGORIES.items()
+             if info.get("toggle") == "fire"]
+    assert names.count("Fire Near Mesh") == 0
+    assert len(set(names)) == len(names), f"duplicate fire-family names: {names}"
+
+
+def _native_emitted_fire_categories() -> set[str]:
+    """Walk firms.py and fires.py for category= literals."""
+    from meshai.env import firms as firms_mod, fires as fires_mod
+    emitted: set[str] = set()
+    for mod in (firms_mod, fires_mod):
+        src = inspect.getsource(mod)
+        emitted |= set(re.findall(r'category="([a-z_]+)"', src))
+        # Also pick up `category = "..."` ternary forms.
+        emitted |= set(re.findall(r'category\s*=\s*"([a-z_]+)"\s+if', src))
+        emitted |= set(re.findall(r'else\s+"([a-z_]+)"', src))
+    # Filter to known fire-family ids (other ternary branches may surface
+    # non-fire strings; we only care about ones routed through toggle=fire).
+    return {c for c in emitted if c in ALERT_CATEGORIES
+            and ALERT_CATEGORIES[c].get("toggle") == "fire"}
+
+
+def _central_path_fire_categories() -> set[str]:
+    central_inputs = [
+        "fire.hotspot.viirs_noaa20.high",
+        "fire.incident.id.ada",
+        "fire.incident.removed",
+        "fire.perimeter.id.ada",
+        "fire.perimeter.removed",
+        "fire.unknown_subtype",
+    ]
+    return {map_category(c) for c in central_inputs}
+
+
+def test_alert_categories_fire_complete():
+    """Native + central-path emit must equal registry's fire-family set."""
+    registry_fire = {
+        cid for cid, info in ALERT_CATEGORIES.items()
+        if info.get("toggle") == "fire"
+    }
+    emitted = _native_emitted_fire_categories() | _central_path_fire_categories()
+    missing = emitted - registry_fire
+    orphans = registry_fire - emitted
+    assert not missing, f"fire emit set missing from ALERT_CATEGORIES: {missing}"
+    assert not orphans, f"ALERT_CATEGORIES has orphan fire entries: {orphans}"
+
+
+@pytest.mark.parametrize(
+    "cat", ["new_ignition", "wildfire_hotspot", "wildfire_incident"],
+)
+def test_fire_categories_have_required_fields(cat):
+    info = ALERT_CATEGORIES[cat]
+    assert info["toggle"] == "fire"
+    assert info["name"]
+    assert info["description"]
+    assert info["default_severity"] in {"routine", "priority", "immediate"}
+    assert info["example_message"]

tests/test_pipeline_digest.py

@@ -101,7 +101,7 @@ def test_enqueue_multiple_toggles():
     ))
     acc.enqueue(make_event(
         source="test",
-        category="wildfire_proximity",
+        category="wildfire_hotspot",
         severity="priority",
         title="Fire",
     ))
@@ -128,7 +128,7 @@ def test_enqueue_skips_excluded_toggles():
     ))
     acc.enqueue(make_event(
         source="test",
-        category="wildfire_proximity",
+        category="wildfire_hotspot",
         severity="routine",
         title="Fire",
     ))
@@ -213,7 +213,7 @@ def test_digest_calls_llm_once_per_non_empty_toggle():
     # Add events to 3 different toggles
     acc.enqueue(make_event(source="test", category="weather_warning",
                            severity="routine", title="Weather"))
-    acc.enqueue(make_event(source="test", category="wildfire_proximity",
+    acc.enqueue(make_event(source="test", category="wildfire_hotspot",
                            severity="routine", title="Fire"))
     acc.enqueue(make_event(source="test", category="battery_warning",
                            severity="routine", title="Mesh"))
@@ -329,7 +329,7 @@ def test_mesh_chunks_under_char_limit():
     acc = DigestAccumulator(llm_backend=mock_llm)
 
     # Add events to multiple toggles
-    for cat in ["weather_warning", "wildfire_proximity", "battery_warning",
+    for cat in ["weather_warning", "wildfire_hotspot", "battery_warning",
                 "road_closure", "avalanche_warning"]:
         acc.enqueue(make_event(source="test", category=cat,
                                severity="routine", title="Event"))
@@ -349,7 +349,7 @@ def test_mesh_chunks_splits_when_many_toggles():
     acc = DigestAccumulator(llm_backend=mock_llm, mesh_char_limit=150)
 
     # Add events to multiple toggles
-    for cat in ["weather_warning", "wildfire_proximity", "battery_warning",
+    for cat in ["weather_warning", "wildfire_hotspot", "battery_warning",
                 "road_closure", "avalanche_warning"]:
         acc.enqueue(make_event(source="test", category=cat,
                                severity="routine", title="Event"))
@@ -379,7 +379,7 @@ def test_mesh_compact_joins_chunks():
     mock_llm = MockLLMBackend(response="Summary of events.")
     acc = DigestAccumulator(llm_backend=mock_llm, mesh_char_limit=100)
 
-    for cat in ["weather_warning", "wildfire_proximity", "battery_warning",
+    for cat in ["weather_warning", "wildfire_hotspot", "battery_warning",
                 "road_closure"]:
         acc.enqueue(make_event(source="test", category=cat,
                                severity="routine", title="Event"))
@@ -433,7 +433,7 @@ def test_include_toggles_overrides_default():
     if rf_category:
         acc.enqueue(make_event(source="test", category=rf_category,
                                severity="routine", title="RF Event"))
-    acc.enqueue(make_event(source="test", category="wildfire_proximity",
+    acc.enqueue(make_event(source="test", category="wildfire_hotspot",
                            severity="routine", title="Fire Event"))
 
     # RF should be kept (in include list), fire should be dropped
@@ -461,7 +461,7 @@ def test_digest_orders_toggles_correctly():
     # Add events in wrong order
     acc.enqueue(make_event(source="test", category="battery_warning",
                            severity="routine", title="Mesh"))
-    acc.enqueue(make_event(source="test", category="wildfire_proximity",
+    acc.enqueue(make_event(source="test", category="wildfire_hotspot",
                            severity="routine", title="Fire"))
     acc.enqueue(make_event(source="test", category="weather_warning",
                            severity="routine", title="Weather"))

tests/test_pipeline_toggle_filter.py

@@ -36,10 +36,10 @@ class TestToggleFilter:
             next_handler=received.append,
             enabled_toggles={"weather"},
         )
-        # wildfire_proximity maps to "fire" toggle
+        # wildfire_hotspot maps to "fire" toggle
         event = make_event(
             source="test",
-            category="wildfire_proximity",
+            category="wildfire_hotspot",
             severity="priority",
             title="Fire",
         )

tests/test_v052_dispatcher.py

@@ -206,7 +206,7 @@ def test_renderer_byte_budget_drops_optional_segments():
     severity) always survive."""
     big_title = "A" * 200
     e = make_event(
-        source="nws", category="fire_proximity", severity="immediate",
+        source="nws", category="wildfire_incident", severity="immediate",
         title=big_title, region="Wood River Valley",
         timestamp=time.time(),
         data={
@@ -234,7 +234,7 @@ def test_renderer_never_mid_character_truncation():
     shrink by codepoints + ellipsis."""
     # All four-byte emoji glyphs in a row, primary forced super long.
     e = make_event(
-        source="nws", category="wildfire_proximity", severity="priority",
+        source="nws", category="wildfire_hotspot", severity="priority",
         title="🔥" * 200,  # 800 bytes of emoji
         timestamp=time.time(),
     )