fix(ohme): leave the Intelligent car slots to Octopus when the Intelligent device is the car

[springfall2008]

Fixes #5402. Builds on #5401, which is merged.

The problem

With ohme_automatic: true and ohme_automatic_octopus_intelligent unset, the Ohme component took the Intelligent car slots for itself whenever the import tariff was an Intelligent one. It never checked which device Octopus Intelligent controls.

When that device is the car (a BMW, Mini or Volkswagen linked to Octopus directly) and not the Ohme, Octopus schedules the charge through the car and the Ohme is only the socket. Predbat was then planning from Ohme's session, target and ready time, and ignoring Octopus's own dispatch list. The issue has an example: Octopus reporting no dispatches and 80% by 18:40, while Predbat worked from a 12-hour, 91 kWh Ohme slot to 100% by 11:52.

What this changes

Auto-detection now looks at the Octopus component's Intelligent devices as well as the tariff. On an Intelligent tariff with the flag unset:

Octopus Intelligent devices (not suspended)	Car slots come from	Notes
Include an Ohme charger	Ohme, at the off-peak rate	Unchanged
Only other devices (the car, or another make of charger)	The Octopus component's own dispatches	New. Ohme's schedule is not used at all, and ohme_control stands down
None, but there are suspended ones	Ohme's own schedule, at the normal tariff rate	New. No device is being scheduled by Octopus, so there are no dispatches
No Intelligent device on the account	Ohme, at the off-peak rate	Unchanged, now a deliberate fallback

An explicit ohme_automatic_octopus_intelligent: true or false still wins, and the Ohme is still registered as the charger (car_charging_planned, car_charging_now, car_charging_energy) in every case.

Decisions worth a look

• "Ohme charger" means is_charger true and provider Ohme (case-insensitive), as the issue proposed. A charger of another make on the account is treated like the car: Octopus keeps the slots.
• Suspended devices are ignored, matching what OctopusAPI.automatic_config() already does for its own wiring. This does change behaviour for an Ohme whose smart charging is suspended in the Octopus app: its slots used to be priced as cheap dispatches and are now car load at the tariff rate. That seems right, since Octopus is not dispatching it, but it is wider than the issue's example.
• No Intelligent device at all keeps the old behaviour. Octopus has nothing to wire the car slots to there, so Ohme's slots are the only record of the charge.
• ohme_control is ruled out when Octopus drives another device, not only when the slots come from Ohme. Otherwise Predbat would pause and max-charge the Ohme while Octopus is scheduling the car through it. With an explicit ohme_automatic_octopus_intelligent: false it is still allowed, as before.

How it works

• octopus_intelligent_wanted() reads the devices through OctopusAPI.get_intelligent_devices(). That list only holds live devices and is kept through a failed poll, so it does not flap with the API. A new octopus_other_device flag records "Octopus is driving something that is not this charger", and charger_slots_wanted() refuses the charger-schedule mode from feat(ohme): take the car plan from Ohme's own schedule when Predbat is not controlling the charger #5401 while it is set.
• The decision is already re-made on every poll (feat(ohme): take the car plan from Ohme's own schedule when Predbat is not controlling the charger #5401), so linking a different device to Octopus Intelligent is followed without a restart.
• OctopusAPI.run() now re-wires the car slots when their owner changes. If Ohme claimed the slots before the device was known and then gives the claim up, the device set has not moved, so nothing else would have wired them. This is the one change outside ohme.py.

Testing

• test_ohme.py: the detection rules for each device combination (Ohme, car, other charger, both, suspended, none, explicit flag, non-Intelligent tariff); a first run with the car as the device, with and without Octopus's wiring already in place, and with ohme_control; and a running install where the device is found late, swapped for the Ohme, then suspended.
• test_octopus_intelligent_devices.py: the Octopus component leaves the slots alone while Ohme holds them, wires its own entity on the next sensor refresh after Ohme lets go, and does not repeat that.
• ./run_all --quick passes.

Docs: docs/car-charging.md (the auto-detect description and the "Which car charging plan Predbat shows" table) and the Ohme entry in docs/components.md.

🤖 Generated with Claude Code

[Copilot]

Copilot review overview

🟡 Changes recommended

Ownership release can incorrectly erase Ohme’s schedule for suspended devices or restore stale dispatch wiring after leaving an Intelligent tariff.

Review effort: Balanced
Findings: 1

Open (1)

• Avoid rewiring after Ohme ownership release without active Intelligent device · New

What changed in this PR

Updates Ohme/Octopus Intelligent coordination so charging slots follow the device controlled by Octopus.

Changes:

• Detects whether Octopus controls the Ohme charger or another device.
• Rewires slot ownership when the controlled device changes.
• Adds regression tests and documentation.

File	Description
apps/​predbat/​ohme.py	Selects slots based on the Intelligent device.
apps/​predbat/​octopus.py	Reconfigures slots after ownership changes.
apps/​predbat/​tests/​test_ohme.py	Tests device detection and transitions.
apps/​predbat/​tests/​test_octopus_intelligent_devices.py	Tests ownership-based rewiring.
docs/​car-charging.md	Documents slot-selection behavior.
docs/​components.md	Clarifies Ohme auto-detection.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.