Skip to content

Sync main into prerelease/2.2 - #324

Merged
cayossarian merged 6 commits into
prerelease/2.2from
sync/main-into-2.2
Oct 10, 2026
Merged

cayossarian merged 6 commits into
prerelease/2.2from
sync/main-into-2.2

Conversation

@cayossarian

Copy link
Copy Markdown
Member

Brings #322's review fixes onto the 2.2 line, as one merge commit. 2.2 reads the hardware version in hardware_guard.async_read_hardware_version, shared by setup and credential rotation, so #322's unread-status change is ported there rather than kept as a second read: the read answers HARDWARE_UNREAD on failure and catches httpx.InvalidURL, setup leaves a standing unvalidated-hardware Repair up on an unread status, and rotation treats it as unknown hardware as before. The verdict test table keeps both sides' cases. pytest: 2454 passed, 1 skipped; all pre-commit hooks pass.

- Threshold services resolve an entity against the monitor's stored
  overrides as well as the live circuits, so the override of a circuit
  that has left the panel can still be cleared through its orphaned
  entity. Only this integration's entities are matched.
- A hardware status that cannot be read proceeds without clearing a
  standing unvalidated-hardware Repair; httpx.InvalidURL is caught too.
- The hardware verdict ignores surrounding whitespace and the case of
  UNKNOWN, so a spelling alone cannot make the terminal refusal.
- A threshold call whose entity's own panel is not loaded says so
  instead of reporting monitoring as disabled.
- Correct the battery power docstring: an unpublished value now reads
  unknown where 2.0.8 reported 0 W.
- Circuit sensor name fallbacks use construct_circuit_identifier_from_tabs.
fix: address review findings on the 2.1.3b2 changes
Brings #322's review fixes onto the 2.2 line. Resolutions: 2.2 reads the hardware version in hardware_guard.async_read_hardware_version, shared by setup and credential rotation, so #322's unread-status change is ported there instead of keeping a second read in __init__.py: the read answers HARDWARE_UNREAD on failure and also catches httpx.InvalidURL, setup leaves a standing unvalidated-hardware Repair up on an unread status, and rotation treats it as unknown hardware as before. The verdict test table keeps both sides' cases, 3.0 and the whitespace and case variants. This also puts the read timeout's docstring back under its constant.
No AI attribution in history or on GitHub
Brings #323's no-AI-attribution rule in AGENTS.md onto the 2.2 line.
@cayossarian
cayossarian merged commit 90ed6c2 into prerelease/2.2 Oct 10, 2026
7 checks passed
@cayossarian
cayossarian deleted the sync/main-into-2.2 branch October 10, 2026 00:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant