Skip to content

Conversation

@balloob
Copy link
Member

@balloob balloob commented Oct 9, 2025

Breaking change

Proposed change

When Z-Wave JS handles an ESPHome discovery, now make sure we update the config entry and add-on config. No longer rely on reloading the config entry to set it up, because the add-on might not be in a known state.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:
  • Link to developer documentation pull request:
  • Link to frontend pull request:

Checklist

  • I understand the code I am submitting and can explain how it works.
  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.
  • Any generated code has been carefully reviewed for correctness and compliance with project standards.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@balloob balloob added this to the 2025.10.2 milestone Oct 9, 2025
Copilot AI review requested due to automatic review settings October 9, 2025 20:59
@balloob balloob requested a review from a team as a code owner October 9, 2025 20:59
@home-assistant
Copy link

home-assistant bot commented Oct 9, 2025

Hey there @home-assistant/z-wave, mind taking a look at this pull request as it has been labeled with an integration (zwave_js) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of zwave_js can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign zwave_js Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

The PR updates Z-Wave JS ESPHome discovery handling to properly update config entries and add-on configurations without relying on config entry reloads. Instead of depending on reloading to sync add-on options to the config entry data, it now directly updates the config entry data and ensures the add-on is stopped before making configuration changes.

  • Adds direct config entry data updates when handling ESPHome discovery for existing entries
  • Stops running add-on before updating configuration to ensure clean state transitions
  • Updates test to verify the new behavior with proper mocking

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
homeassistant/components/zwave_js/config_flow.py Adds add-on state checking, stopping logic, and direct config entry updates for ESPHome discovery
tests/components/zwave_js/test_config_flow.py Updates test fixture and adds assertions to verify new add-on stopping and config entry update behavior

@balloob balloob merged commit 96bb67b into dev Oct 9, 2025
28 checks passed
@balloob balloob deleted the zwave-update-addon branch October 9, 2025 21:14
chemelli74 pushed a commit to chemelli74/core that referenced this pull request Oct 10, 2025
@frenck frenck mentioned this pull request Oct 10, 2025
@github-actions github-actions bot locked and limited conversation to collaborators Oct 11, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants