@@ -34,10 +34,6 @@
 # Containers whose value is a list of vocabulary tokens
 VOCAB_CONTAINERS = ("functions", "flags", "effects")
 
-# TRANSITIONAL: capabilities was a token list before schema 2. A reporter not yet converted still sends
-# one; it is kept as tokens rather than dropped. Removed once every reporter emits the dict (plan Task 10).
-LEGACY_TOKEN_CONTAINERS = ("capabilities",)
-
 # The seven INVERTER_DEF fields that describe behaviour rather than whether an entity exists.
 # A record's capabilities dict may hold only these.
 CAPABILITY_KEYS = (
@@ -592,7 +588,7 @@ def _walk(self, node, container=None):
                     out[key] = {self._guard_key(key, name): self._note(entry, substring=True) for name, entry in value.items()}
                 elif key in CLEAR_CONTAINERS and isinstance(value, dict):
                     out[key] = {self._guard_key(key, name): self._guard_value(key, name, entry) for name, entry in value.items()}
-                elif key in VOCAB_CONTAINERS or (key in LEGACY_TOKEN_CONTAINERS and isinstance(value, list)):
+                elif key in VOCAB_CONTAINERS:
                     # Vocabulary lists are clear too, and a token is free-form enough (digits
                     # are legal in the pattern) that a misfiled identifier can hide as one.
                     out[key] = [self._guard_scalar(key, "token", entry) for entry in value]
@@ -961,7 +957,7 @@ def _validate_container(container_name, value, component_name, section, log):
     own key since a token list has no separate key/value split. No container can accept a key
     whose name trips is_secret_key(), however it is nested.
     """
-    if container_name in VOCAB_CONTAINERS or (container_name in LEGACY_TOKEN_CONTAINERS and isinstance(value, list)):
+    if container_name in VOCAB_CONTAINERS:
         if not isinstance(value, list):
             return None
         out = []
 
@@ -1729,15 +1729,14 @@ def test_capabilities_drops_unknown_key_and_non_bool():
     return 0
 
 
-def test_capabilities_legacy_token_list_still_accepted():
-    """TRANSITIONAL (removed in Task 10): a not-yet-converted reporter's token list is kept, not crashed on."""
+def test_capabilities_list_is_dropped():
+    """Schema 2: capabilities is a dict of the seven behaviour keys, so a token list no longer validates."""
     record, _ = _one_inverter(capabilities=["schedule", "target_soc"])
-    assert record["capabilities"] == ["schedule", "target_soc"], record
+    assert "capabilities" not in record, record
     base, coordinator = _coordinator()
     coordinator.report("test", {"inverters": [{"device_id": "test:SN1", "capabilities": ["schedule"]}]})
-    catalogue = coordinator.catalogue()
-    assert catalogue["inverters"][0]["capabilities"] == ["schedule"], catalogue
-    print("PASS: legacy capability list tolerated")
+    assert "capabilities" not in coordinator.catalogue()["inverters"][0]
+    print("PASS: capability token list dropped")
     return 0
 
 
@@ -2022,7 +2021,7 @@ def test_coordinator_all(my_predbat=None):
     failures += test_schema_version_is_two()
     failures += test_capabilities_dict_keeps_known_bool_keys()
     failures += test_capabilities_drops_unknown_key_and_non_bool()
-    failures += test_capabilities_legacy_token_list_still_accepted()
+    failures += test_capabilities_list_is_dropped()
     failures += test_descriptor_requires_access()
     failures += test_descriptor_needs_exactly_one_of_entity_id_and_value()
     failures += test_descriptor_value_rejects_free_text()
 
@@ -97,10 +97,11 @@ def catalogue_raw(self):
             "inverter_type": "GE",
             "composition": "direct",
             "functions": ["solar", "battery"],
-            "capabilities": ["rest_v3", "pause_mode"],
+            "capabilities": {"support_charge_freeze": True, "can_span_midnight": True},
+            "flags": ["rest_v3"],
             "hardware_ids": {"serial": "CE2143G123"},
             "info": {"model": "Gen3", "firmware": "D0.450"},
-            "ratings": {"battery_kwh": 9.5, "max_charge_w": 3000},
+            "ratings": {"soc_max": 9.5, "battery_rate_max": 3000},
             "entities": {"charge_rate": {"entity_id": "number.givtcp_ce2143g123_charge_rate", "domain": "number", "access": "rw"}},
         }
     ],
@@ -156,7 +157,7 @@ def test_discovery_page_renders_the_catalogue(my_predbat):
     try:
         body = _render(my_predbat, _real_coordinator(my_predbat))
 
-        for expected in ("Inverters", "Meters", "givtcp:CE2143G123", "Gen3", "D0.450", "rest_v3"):
+        for expected in ("Inverters", "Meters", "givtcp:CE2143G123", "Gen3", "D0.450", "rest_v3", "support_charge_freeze", "soc_max"):
             if expected not in body:
                 print(f"  ERROR: expected the page to show {expected!r}")
                 failed = True
 
@@ -58,7 +58,7 @@ restart Predbat, or read a fresh debug dump, to see anything reported later than
 
 | Section | What it holds |
 | ------- | -------------- |
-| `inverters` | Battery inverters and PV-only devices - type, composition (direct/gateway/EMS), which functions it serves (`solar`, `battery`), and - where the reporter has a table mapping Predbat's controls to its entities (GivTCP today) - those entities |
+| `inverters` | Battery inverters and PV-only devices - type, composition (direct/gateway/EMS), which functions it serves (`solar`, `battery`), its behaviour (`capabilities`), its fixed ratings under Predbat's own setting names, and every setting Predbat's automatic configuration binds for it (`entities`) |
 | `chargers` | EV chargers, cross-linked to the cars they serve |
 | `cars` | Electric vehicles, cross-linked to the charger that charges them |
 | `meters` | Electricity (and gas) supply points, each with a direction (`import`/`export`) and, where known, a nested tariff record |
@@ -70,8 +70,8 @@ their automatic configuration treats every discovered inverter as a battery inve
 records follow that configuration - `solar` and `battery` on every inverter - rather than
 evidence about the hardware, and Solis's `solar` works the same way, since every Solis inverter
 is configured as a PV source. A PV-only unit that has been configured as a battery inverter will
-usually show it in its ratings: `battery` among its functions, but no `battery_kwh` or
-`battery_capacity_ah`.
+usually show it in its record: `battery` among its functions, but no `battery_capacity_ah` rating
+and no `soc_max` entity.
 
 No reporter (GivTCP, GE Cloud, Octopus, Ohme, Solcast, Fox, AlphaESS, Solis, Deye, Sunsynk) populates `programmes` yet - it is part of
 the schema for a future Axle/VPP-style reporter - so today it is always present as an empty list
@@ -206,11 +206,12 @@ class* that value gets:
 | --------- | ------- | --------- |
 | `hardware_ids` | Short strings | Clear |
 | `info` | Short strings, no `@` | Clear |
-| `ratings` | Numbers and booleans | Clear |
+| `ratings` | Numbers and booleans, keyed by Predbat's setting name where one exists (`inverter_limit`, `export_limit`, `import_limit`, `battery_rate_max`, `soc_max`, `battery_min_soc`) | Clear |
 | `coverage` | A number/boolean, or a list of lowercase tokens | Clear |
-| `entities` | An entity descriptor (`entity_id` plus typed fields like `domain`, `unit`, `min`/`max`) | Clear |
+| `entities` | An entity descriptor: `access` (`rw` or `r`, required), exactly one of `entity_id` or a fixed `value`, and typed fields such as `domain`, `unit`, `format`, `min`/`max`, `invert` | Clear |
+| `capabilities` | `true`/`false` for the seven behaviour keys of an inverter definition (`support_charge_freeze`, `support_discharge_freeze`, `support_feedin_first`, `can_span_midnight`, `charge_discharge_with_rate`, `charge_control_immediate`, `target_soc_used_for_discharge`) | Clear |
 | `account_ids` | Any scalar | Pseudonymised |
-| `functions` / `capabilities` / `flags` / `effects` | Lists of short lowercase tokens | Clear |
+| `functions` / `flags` / `effects` | Lists of short lowercase tokens | Clear |
 
 A value that does not fit its container's declared type is silently **dropped**, not coerced and
 not raised as an error - a string offered to `ratings`, or free text over 64 characters offered to
@@ -220,6 +221,17 @@ introduce, because a container that only accepts numbers structurally cannot car
 address or a pasted credential, however the schema grows. Choose whichever container matches the
 *kind* of fact you are reporting, not the one that happens to accept the value you have.
 
+### Inverter records and inverter definitions
+
+An inverter record holds enough to rebuild that inverter's definition - the per-type table
+(`INVERTER_DEF`) that tells Predbat how to drive it. `capabilities` carries its behaviour; whether it
+has a reserve, a target SoC, charge/discharge enable switches, idle times or a timed pause follows
+from which settings `entities` binds to a writable (`rw`) entity; and protocol detail such as the time
+format or whether the charge rate is set in watts or amps is read from those entities' descriptors.
+A setting Predbat replaces with a placeholder for this inverter type - SolisCloud's `reserve`, say - is
+left out of `entities`. See the design in
+`docs/superpowers/specs/2026-09-24-discovery-inverter-record-vocabulary-design.md`.
+
 ### Writing a reporter
 
 A component reports by defining **`build_discovery()`**, returning its report dict - or `None` when
 
@@ -155,8 +155,8 @@ that one careless call to the generic masker silently destroys the whole documen
 | `composition` | top level | `direct`, `gateway` (fronting `serials`), or `ems` |
 | `measures_meter` | cross-link | A meter `device_id`, so double counting is detectable |
 | `model`, `firmware` | `info` | |
-| `battery_kwh`, `max_charge_w`, `modules`, `dod_percent`, `nominal_voltage` | `ratings` | |
-| `capabilities` | vocabulary | Recorded not acted on: `schedule`, `pause_mode`, `pause_slots`, `target_soc`, `discharge_target`, `charge_rate_power`, `charge_rate_percent`, `soh` |
+| `inverter_limit`, `export_limit`, `import_limit`, `battery_rate_max`, `soc_max`, `battery_min_soc`, `modules`, `dod_percent`, `nominal_voltage` | `ratings` | Renamed to Predbat setting names on 24 Sep 2026 (was `battery_kwh`, `max_charge_w`) - see `2026-09-24-discovery-inverter-record-vocabulary-design.md` |
+| `capabilities` | dict of bool | Superseded on 24 Sep 2026: the seven `INVERTER_DEF` behaviour keys as `True`/`False`, not tokens - see `2026-09-24-discovery-inverter-record-vocabulary-design.md` |
 | `entities` | `entities` | Keyed by Predbat standard name |
 
 **Cross-links may dangle, and a component must never invent a record to resolve one.**