fix: recognize Anenji Protocol 4 hardware revision

Author: Maksym Shtembuliak

CHANGELOG.md

@@ -55,6 +55,15 @@ the GitHub release body should be rendered from the matching version section her
 
 ### Fixed
 
+- Restored exact Anenji ANJ-11KW-48V-WIFI-P identification for the captured
+  Protocol 4 fingerprint `layout=4`, `model=0x8401`. Unlike the broad legacy
+  heuristic, the new catalog entry affects only this proven fingerprint; it
+  uses the documented Protocol 4 telemetry map while keeping all writes
+  untested and Full-Control-only until hardware confirmation.
+- Fixed cancellation cleanup for an in-progress inverter driver sweep on
+  Python 3.14. Expected late probe failures are now consumed by an owned
+  no-fail outcome relay instead of being reported as unhandled event-loop
+  exceptions after Home Assistant cancels or replaces the refresh.
 - Fixed AT-text collector restart verification by separating the vendor's
   dedicated soft-reset command from its staged-settings apply command. A command
   acknowledgement still does not count as recovery until the old session drops

catalog/inverter_models/catalog.json

@@ -1,5 +1,5 @@
 {
   "schema_version": 1,
-  "catalog_version": "2026.08.1",
+  "catalog_version": "2026.08.2",
   "description": "Commercial inverter model support catalog"
 }

catalog/inverter_models/models/anenji_anj_11kw_48v_wifi_p.json

@@ -13,6 +13,19 @@
         "anenji_anj_11kw"
       ],
       "known_firmware": []
+    },
+    {
+      "variant_key": "layout4_model33793",
+      "label": "Anenji 11kW model-code 0x8401 variant",
+      "device_descriptor_keys": [
+        "anenji_anj_11kw_8401"
+      ],
+      "validation": {
+        "hardware": "captured",
+        "telemetry": "confirmed",
+        "controls": "partial"
+      },
+      "known_firmware": []
     }
   ],
   "validation": {
@@ -27,6 +40,7 @@
     "notes": [
       "Device-specific runtime profile is user-confirmed.",
       "Communication Protocol No. 3-10 documentation defines the protocol-4 telemetry projection used by this model.",
+      "The captured 0x8401 hardware fingerprint uses the documented Protocol 4 telemetry surface; its write controls remain untested and require explicit Full Control.",
       "Register 602 secondary-output priority is documented and hardware-read-correlated; local write behavior remains conditional pending a device retest."
     ]
   },
@@ -38,6 +52,7 @@
     "corpus_anenji_anj_11kw",
     "private_message_anenji_anj_11kw_validation",
     "documentation_anenji_protocol_3_10",
-    "support_archive_anenji_anj_11kw_secondary_controls_20260707"
+    "support_archive_anenji_anj_11kw_secondary_controls_20260707",
+    "github_issue_13_anenji_8401_beta4"
   ]
 }

catalog/inverter_models/schemas/model.schema.json

@@ -46,6 +46,17 @@
             "items": {"type": "string"},
             "description": "Keys of devices[] entries in the runtime inverter catalog."
           },
+          "validation": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["hardware", "telemetry", "controls"],
+            "description": "Optional hardware-variant validation override. Omit when the model-level validation applies unchanged.",
+            "properties": {
+              "hardware": {"type": "string", "enum": ["none", "reported", "captured", "confirmed"]},
+              "telemetry": {"type": "string", "enum": ["unknown", "partial", "confirmed"]},
+              "controls": {"type": "string", "enum": ["none", "partial", "confirmed"]}
+            }
+          },
           "known_firmware": {"type": "array", "items": {"type": "string"}}
         }
       }

catalog/inverter_models/sources/github_issue_13_anenji_8401_beta4.json

@@ -0,0 +1,16 @@
+{
+  "schema_version": 1,
+  "source_key": "github_issue_13_anenji_8401_beta4",
+  "kind": "github_issue",
+  "title": "Anenji ANJ-11KW-48V-WIFI-P 0x8401 beta.4 support archive",
+  "reference": "project-issue:13#support-archive-20260830",
+  "captured_at": "2026-08-30",
+  "visibility": "public",
+  "summary": "A beta.4 support archive captured the exact Modbus fingerprint layout 4 and model code 0x8401 for an Anenji ANJ-11KW-48V-WIFI-P. The same collector and inverter identity had previously been classified by the cloud as devcode 6544 and had operated through the Anenji Protocol 4 map on v0.2.0. The new fingerprint therefore receives exact commercial identity and Protocol 4 telemetry, while its local write controls remain explicitly untested.",
+  "assertions": [
+    "commercial_identity",
+    "fingerprint",
+    "runtime_compatibility",
+    "telemetry_validation"
+  ]
+}

custom_components/eybond_local/protocol_catalogs/inverter_catalog.json

@@ -1,6 +1,6 @@
 {
  "schema_version": 2,
- "catalog_version": "2026.08.7",
+ "catalog_version": "2026.08.8",
  "description": "Universal offline inverter catalog with reusable protocol actions, runtime surfaces, and deterministic identity evidence.",
  "protocols": [
   {
@@ -1925,6 +1925,48 @@
     "confidence": "capture-derived"
    }
   },
+  {
+   "entry_key": "anenji_anj_11kw_8401",
+   "fingerprint": {
+    "layout_code": 4,
+    "model_code": 33793
+   },
+   "structural": [
+    "serial_ascii_plausible"
+   ],
+   "model_name": "Anenji ANJ-11KW-48V-WIFI-P",
+   "surface_key": "smg_protocol_4_family_fallback",
+   "runtime_probe": {
+    "validation": [
+     {
+      "key": "output_rating_voltage",
+      "min": 1
+     },
+     {
+      "key": "output_rating_frequency",
+      "min": 1
+     },
+     {
+      "key": "protocol_number",
+      "one_of": [
+       4
+      ]
+     }
+    ]
+   },
+   "cloud_hints": {
+    "devcodes": [
+     6544
+    ]
+   },
+   "provenance": {
+    "sources": [
+     "project-issue:13 support archive (2026-08-30): layout_code=4, model_code=0x8401, stable serial and responsive Protocol 4 telemetry",
+     "project-issue:13 historical evidence: the same collector/inverter identity was cloud-classified as devcode 6544 and operated through the Anenji Protocol 4 map on v0.2.0"
+    ],
+    "confidence": "capture-derived"
+   }
+  },
   {
    "entry_key": "sandisolar_sd_11kp48v",
    "fingerprint": {

custom_components/eybond_local/runtime/hub/detection.py

@@ -26,7 +26,33 @@
 )
 
 
-async def _async_cancel_and_drain_task(task: asyncio.Task) -> bool:
+async def _async_capture_task_outcome(task: asyncio.Task) -> tuple[bool, object]:
+    """Capture one owned task outcome without failing the relay task."""
+
+    try:
+        return True, await task
+    except asyncio.CancelledError as exc:
+        return False, exc
+    except Exception as exc:
+        return False, exc
+
+
+async def _async_await_captured_task(outcome_task: asyncio.Task) -> object:
+    """Await a no-fail outcome relay and restore the captured semantics."""
+
+    succeeded, outcome = await asyncio.shield(outcome_task)
+    if succeeded:
+        return outcome
+    if isinstance(outcome, BaseException):
+        raise outcome
+    raise RuntimeError("invalid_task_outcome")
+
+
+async def _async_cancel_and_drain_task(
+    task: asyncio.Task,
+    *,
+    outcome_task: asyncio.Task | None = None,
+) -> bool:
     """Cancel one owned child task and retrieve its terminal outcome.
 
     Driver detection races the wire probe against an owned-session guard.  If
@@ -37,25 +63,29 @@ async def _async_cancel_and_drain_task(task: asyncio.Task) -> bool:
     interrupting mandatory cleanup.
     """
 
-    parent_cancel_interrupted = False
     if not task.done():
         task.cancel()
+
+    # Python 3.14 deliberately reports an exception from the inner future when
+    # a shield wrapper is cancelled.  Shield a no-fail outcome relay instead of
+    # the owned wire task itself.  Callers that already use such a relay pass it
+    # in so the wire task is never directly wrapped by shield.
+    drain_task = outcome_task or asyncio.create_task(
+        _async_capture_task_outcome(task),
+        name=f"{task.get_name()}_drain",
+    )
+    parent_cancel_interrupted = False
     while True:
         try:
-            await asyncio.shield(task)
+            await asyncio.shield(drain_task)
             return parent_cancel_interrupted
         except asyncio.CancelledError:
-            if task.done():
+            if drain_task.done():
                 return parent_cancel_interrupted
-            # Shield keeps the owned child alive, so a cancellation observed
+            # Shield keeps the outcome consumer alive, so cancellation observed
             # while it is still pending belongs to this parent task.  Remember
             # it and finish draining before the caller re-raises it.
             parent_cancel_interrupted = True
-        except Exception:
-            # The caller already consumed normal-path failures.  A failure that
-            # races parent cancellation is still retrieved here and remains an
-            # ordinary detection outcome rather than an orphan task exception.
-            return parent_cancel_interrupted
 
 
 class HubDetectionMixin:
@@ -241,6 +271,10 @@ async def _async_detect_driver(self) -> str:
             ),
             name="eybond_inverter_detection",
         )
+        detection_outcome_task = asyncio.create_task(
+            _async_capture_task_outcome(detection_task),
+            name="eybond_inverter_detection_outcome",
+        )
         wait_for_session_change = getattr(
             self._link_manager,
             "async_wait_for_owned_session_change",
@@ -255,19 +289,29 @@ async def _async_detect_driver(self) -> str:
         parent_cancel_requested = False
         try:
             if session_change_task is None:
-                detection_result = await asyncio.shield(detection_task)
+                detection_result = await _async_await_captured_task(
+                    detection_outcome_task
+                )
             else:
                 done, _pending = await asyncio.wait(
-                    (detection_task, session_change_task),
+                    (detection_outcome_task, session_change_task),
                     return_when=asyncio.FIRST_COMPLETED,
                 )
-                if session_change_task in done and detection_task not in done:
-                    await _async_cancel_and_drain_task(detection_task)
+                if (
+                    session_change_task in done
+                    and detection_outcome_task not in done
+                ):
+                    await _async_cancel_and_drain_task(
+                        detection_task,
+                        outcome_task=detection_outcome_task,
+                    )
                     logger.info(
                         "Discarding inverter detection after owned collector session changed"
                     )
                     return "collector_session_changed"
-                detection_result = await asyncio.shield(detection_task)
+                detection_result = await _async_await_captured_task(
+                    detection_outcome_task
+                )
         except asyncio.CancelledError:
             parent_cancel_requested = True
             raise
@@ -288,7 +332,10 @@ async def _async_detect_driver(self) -> str:
             return str(exc)
         finally:
             parent_cancel_requested = (
-                await _async_cancel_and_drain_task(detection_task)
+                await _async_cancel_and_drain_task(
+                    detection_task,
+                    outcome_task=detection_outcome_task,
+                )
                 or parent_cancel_requested
             )
             if session_change_task is not None:

docs/generated/INVERTER_MODEL_CATALOG.generated.md

@@ -2,9 +2,9 @@
 
 Generated by `tools/model_catalog.py`. Do not edit by hand.
 
-- Model catalog version: 2026.08.1
-- Runtime inverter catalog version: 2026.08.7
-- Models: 17 | Variants: 18
+- Model catalog version: 2026.08.2
+- Runtime inverter catalog version: 2026.08.8
+- Models: 17 | Variants: 19
 
 ## How To Read This Catalog
 
@@ -21,7 +21,7 @@ This page describes what has been confirmed for a specific inverter model or mod
 
 | Manufacturer | Model | Protocol | Detection | Runtime Tier | Telemetry | Controls | Hardware |
 |---|---|---|---|---|---|---|---|
-| Anenji | ANJ-11KW-48V-WIFI-P | modbus_smg | fingerprint | full | confirmed | confirmed | captured |
+| Anenji | ANJ-11KW-48V-WIFI-P — Anenji 11kW variant | modbus_smg | fingerprint | full | confirmed | confirmed | captured |
 | PowMr | 4.2KW — PI30 VMII-NXPW5KW raw-model variant | pi30 | anchors | full | confirmed | confirmed | captured |
 | PowMr | 4.2KW — SmartESS 0925 local Modbus alternate runtime | pi30 | anchors | full | confirmed | confirmed | captured |
 | Sandisolar | SD-HYM-4862HWP | modbus_smg | fingerprint | full | confirmed | confirmed | confirmed |
@@ -31,6 +31,7 @@ This page describes what has been confirmed for a specific inverter model or mod
 | Manufacturer | Model | Protocol | Detection | Runtime Tier | Telemetry | Controls | Hardware |
 |---|---|---|---|---|---|---|---|
 | Anenji | 6200 (single output) | modbus_smg | fingerprint | full | confirmed | partial | captured |
+| Anenji | ANJ-11KW-48V-WIFI-P — Anenji 11kW model-code 0x8401 variant | modbus_smg | fingerprint | full | confirmed | partial | captured |
 | Anenji | ANJ-4000W-24V | modbus_smg | fingerprint | full | confirmed | partial | captured |
 | Anenji | ANJ-6200-48PL | modbus_smg | fingerprint | full | confirmed | partial | captured |
 | Anenji | HHS-11kW-WIFI (without parallel) | modbus_smg | fingerprint | full | partial | partial | captured |
@@ -107,6 +108,7 @@ Runtime descriptors with no specific commercial model record. These are generic
   - Coverage notes:
     - Device-specific runtime profile is user-confirmed.
     - Communication Protocol No. 3-10 documentation defines the protocol-4 telemetry projection used by this model.
+    - The captured 0x8401 hardware fingerprint uses the documented Protocol 4 telemetry surface; its write controls remain untested and require explicit Full Control.
     - Register 602 secondary-output priority is documented and hardware-read-correlated; local write behavior remains conditional pending a device retest.
 - Summary: Anenji 11kW unit with a model-specific control profile over the shared protocol-4 register projection, backed by donor captures, user-confirmed controls, and the Protocol No. 3-10 documentation.
 - Variants:
@@ -117,9 +119,17 @@ Runtime descriptors with no specific commercial model record. These are generic
       - Protocol: modbus_smg | Detection: fingerprint (layout 4, model 32768, rated —)
       - Tier: full | Read-only: no | Profile: modbus_smg/models/anenji_anj_11kw_48v_wifi_p.json | Schema: modbus_smg/models/anenji_anj_11kw_48v_wifi_p.json
       - Capabilities: 63 (tested 50, untested 13); support tiers: blocked 2, conditional 52, standard 9 | Telemetry: 117 measurements, 18 binary sensors
+  - `layout4_model33793` — Anenji 11kW model-code 0x8401 variant
+    - Validation override: hardware captured, telemetry confirmed, controls partial
+    - Descriptors: anenji_anj_11kw_8401
+    - Known firmware: —
+    - `anenji_anj_11kw_8401` → surface `smg_protocol_4_family_fallback` (driver modbus_smg, variant protocol_4_family_fallback)
+      - Protocol: modbus_smg | Detection: fingerprint (layout 4, model 33793, rated —)
+      - Tier: full | Read-only: no | Profile: modbus_smg/protocols/communication_protocol_4.json | Schema: modbus_smg/protocols/communication_protocol_4.json
+      - Capabilities: 60 (untested 60); support tiers: blocked 2, conditional 58 | Telemetry: 117 measurements, 18 binary sensors
 - Known limitations:
   - Secondary Output Priority writes are available only in Full Control until register 602 is write-tested on hardware.
-- Evidence: 4 source(s)
+- Evidence: 5 source(s)
 
 ### Anenji — ANJ-4000W-24V (`anenji_4200_protocol_1`)
 

tests/test_catalog_identity.py

@@ -130,6 +130,25 @@ async def test_point_identity_reads_restore_confirmed_anenji_11kw(self) -> None:
             ("modbus_smg.identity.171", "modbus_smg.identity.184"),
         )
 
+    async def test_point_identity_reads_match_issue_13_anenji_8401_variant(self) -> None:
+        session = _PointIdentityOnlySession({171: 0x8401, 184: 4})
+
+        probe = await async_probe_catalog_identity(session)
+
+        self.assertIsNotNone(probe)
+        assert probe is not None
+        self.assertEqual(probe.match.kind, MATCH_DEVICE)
+        self.assertEqual(probe.match.entry.entry_key, "anenji_anj_11kw_8401")
+        self.assertEqual(probe.match.entry.model_name, "Anenji ANJ-11KW-48V-WIFI-P")
+        self.assertEqual(probe.match.entry.binding.variant_key, "protocol_4_family_fallback")
+        self.assertEqual(
+            probe.match.entry.binding.profile_name,
+            "modbus_smg/protocols/communication_protocol_4.json",
+        )
+        self.assertEqual(probe.layout_code, 4)
+        self.assertEqual(probe.model_code, 0x8401)
+        self.assertEqual(session.reads, [(171, 1), (184, 1)])
+
     async def test_point_identity_reads_match_hhs_11kw_protocol_3_variant(self) -> None:
         session = _PointIdentityOnlySession({171: 29440, 184: 3})