Dependent device follows the real state of its dependency (v3.1.4)

A device that depends on another (pool heat pump on the pool pump) was
switched off at once as soon as the pump was *planned* off, while the pump
itself was still running out its 10-minute countdown. It now goes off at
once only when the pump is really off - in the same cycle the pump is
switched off.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: xchillxx

custom_components/surplus_pilot/coordinator.py

@@ -654,7 +654,12 @@ async def _apply_devices(self, now: datetime, dev_on: dict[str, bool]) -> None:
             if want == actual:
                 self._pending.pop(did, None)
                 continue
-            immediate = not want and dec.reason in ("ausserhalb_zeitfenster", "wartet_auf_abhaengigkeit")
+            # off at once only when it can't run any more: outside its window,
+            # or the device it depends on is really off (not merely planned
+            # off and still counting down - then it follows with its own delay)
+            dep_id = d.get(CONF_DEV_DEPENDS_ON)
+            immediate = not want and (dec.reason == "ausserhalb_zeitfenster" or (
+                dec.reason == "wartet_auf_abhaengigkeit" and not (dep_id and dev_on.get(dep_id))))
             if want:
                 delay = DEVICE_FORCED_ON_DELAY_S if dec.path == "pflicht" else DEVICE_ON_DELAY_S
             else:
@@ -668,6 +673,7 @@ async def _apply_devices(self, now: datetime, dev_on: dict[str, bool]) -> None:
             if immediate or (now - pend[1]).total_seconds() >= delay:
                 if self.active:
                     await device_switch(self.hass, d, want)
+                    dev_on[did] = want   # a dependent device further down sees it this cycle
                     self._log(f"{d.get(CONF_DEV_NAME)} {'an' if want else 'aus'} "
                               f"({REASON_TEXT.get(dec.reason, dec.reason)})")
                 self._pending.pop(did, None)

custom_components/surplus_pilot/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/xchillxx/surplus-pilot/issues",
   "requirements": [],
-  "version": "3.1.3"
+  "version": "3.1.4"
 }

tests/test_integration.py

@@ -252,3 +252,50 @@ async def fake(call):
     assert co.car.decision is not None        # decided on the first cycle, no 10 min wait
     for did, (want, since) in pending_before.items():
         assert co._pending.get(did, (None, None))[1] in (since, None)
+
+
+async def test_dependent_device_follows_pump_not_its_plan(hass: HomeAssistant, freezer):
+    """07.10. 13:51 live: pump planned off (countdown 8 min, still running),
+    the pool heat pump was switched off at once 'waiting for dependency'."""
+    freezer.move_to("2026-10-07 09:01:00+00:00")
+    set_world(hass, pv=9.0, load=0.6, soc=96, car_soc=80, export=2.0)
+    hass.states.async_set("switch.car_charge", "off")
+    hass.states.async_set("switch.miner", "on")
+    hass.states.async_set("switch.pump", "on")
+    hass.states.async_set("climate.pool", "heat")
+    entry = MockConfigEntry(domain=DOMAIN, data=DATA)
+    entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    calls = []
+
+    async def fake(call):
+        calls.append((call.domain, call.service, dict(call.data)))
+        ent = call.data.get("entity_id")
+        if call.domain == "switch":
+            hass.states.async_set(ent, "on" if call.service == "turn_on" else "off")
+        elif call.domain == "climate":
+            hass.states.async_set(ent, call.data["hvac_mode"])
+
+    for dom, srv in (("switch", "turn_on"), ("switch", "turn_off"), ("number", "set_value"),
+                     ("climate", "set_hvac_mode")):
+        hass.services.async_register(dom, srv, fake)
+
+    def tick(pv):
+        freezer.tick(timedelta(minutes=1))
+        set_world(hass, pv=pv, load=0.6 + 0.15 + 1.3 + 0.86, soc=80, car_soc=80, export=0.0)
+        async_fire_time_changed(hass, dt_util.utcnow())
+
+    for _ in range(8):   # surplus gone: pump counts down, stays on for now
+        tick(1.0)
+        await hass.async_block_till_done()
+    assert hass.states.get("switch.pump").state == "on"
+    assert hass.states.get("climate.pool").state == "heat"
+    for _ in range(6):
+        tick(1.0)
+        await hass.async_block_till_done()
+    assert hass.states.get("switch.pump").state == "off"
+    assert hass.states.get("climate.pool").state == "off"   # same cycle as the pump, not 20 min later
+    i_pump = calls.index(("switch", "turn_off", {"entity_id": "switch.pump"}))
+    i_wp = next(i for i, c in enumerate(calls) if c[0] == "climate")
+    assert i_wp > i_pump