[pull] dev from home-assistant:dev

.claude/skills/ha-merge-queue/SKILL.md

@@ -27,7 +27,7 @@ verify every finalist with the per-PR checks below.
 
 ## Verify each finalist
 
-Check all five. A PR fails the shortlist if any one fails.
+Check all six conditions. A PR fails the shortlist if any of checks 1 through 5 fail.
 
 Paginate every list response before deciding. Check runs, reviews and review threads are all
 paged, typically 30 per page, and a full-suite Home Assistant PR runs to 40-odd check runs —
@@ -90,12 +90,27 @@ Compare the returned count against the reported total and keep fetching until th
  discount one for the category it appears to fall into; an unaddressed defect is a
  blocker whether or not anyone is arguing about it.
 
+6. **Peer-Review Checklist Verification (Priority Boost)** — inspect the PR body text for
+ the template checkbox: `- [x] I have reviewed two other [open pull requests][prs] in this repository.`
+ - **Checked (`[x]`):** Give this PR higher priority in ranking to reward contributors helping
+ clear the review backlog.
+ - **Unchecked (`[ ]` or missing):** Keep in queue with standard priority (do not disqualify).
+
 ## Report
 
-Rank by how little work each PR needs: `clean` first, then `blocked` with everything else
-green. For each PR give the number as a full markdown link, the integration or core area,
-one line on what it does, and its blocking state. Plenty of `home-assistant/core` PRs touch
-helpers, the framework, the recorder or repo tooling and have no integration at all — name
+Rank and order candidates primarily by their status readiness (`clean` first, then `blocked`
+with everything else green), and **secondarily by peer-review participation**:
+
+1. **Clean PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+2. **Clean PRs** without the checkbox checked.
+3. **Blocked/Near-miss PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+4. **Blocked/Near-miss PRs** without the checkbox checked.
+
+For each PR give the number as a full markdown link, the integration or core area,
+one line on what it does, its blocking state, and explicitly note if the author checked the
+peer-review box (e.g., "⭐ *Contributor reviewed 2 PRs*").
+
+Plenty of `home-assistant/core` PRs touch helpers, the framework, the recorder or repo tooling and have no integration at all — name
 what they touch instead, rather than dropping them or inventing one.
 
 Then list the near-misses separately, each with the one action that unblocks it. The
@@ -115,4 +130,4 @@ change but carries no `breaking-change` label will silently miss the release not
 - Only report in the CONSOLE. DO NOT ACT ON GITHUB — no comments, no reviews, no merges,
  no pushes to contributor branches. Per `AI_POLICY.md`, a human decides and acts.
 - Never call a PR ready on green CI alone. Read the diff of every PR you shortlist; CI
- cannot tell you whether the change is correct or wanted.
+ cannot tell you whether the change is correct or wanted.

homeassistant/components/centriconnect/config_flow.py

@@ -1,5 +1,6 @@
 """Config flow for the CentriConnect/MyPropane API integration."""
 
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any, override
 
@@ -11,7 +12,7 @@
  CentriConnectNotFoundError,
  CentriConnectTooManyRequestsError,
 )
-import voluptuous as vol
+import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_USERNAME
@@ -22,11 +23,25 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
+STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
  {
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_DEVICE_ID): str,
- vol.Required(CONF_PASSWORD): str,
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_REAUTHENTICATE_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_USER_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_DEVICE_ID): str,
+ probatio.Required(CONF_PASSWORD): str,
  }
 )
 
@@ -57,34 +72,117 @@ class CentriConnectConfigFlow(ConfigFlow, domain=DOMAIN):
  """Handle a config flow for CentriConnect/MyPropane API."""
 
  VERSION = 1
-
- @override
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
+ _device_id: str | None = None
+
+ async def _handle_flow(
+ self,
+ step_id: str,
+ data_schema: probatio.Schema,
+ user_input: dict[str, Any] | None,
+ update_user_input: Callable[[dict[str, Any]], dict[str, Any]],
+ on_success: Callable[[dict[str, Any], dict[str, Any]], ConfigFlowResult],
  ) -> ConfigFlowResult:
- """Handle the initial step."""
+ """Handle the flow for both user and reconfigure steps."""
  errors: dict[str, str] = {}
  if user_input is not None:
  try:
- info = await validate_input(self.hass, user_input)
- except CentriConnectConnectionError, CentriConnectTooManyRequestsError:
+ info = await validate_input(self.hass, update_user_input(user_input))
+ except (
+ CentriConnectConnectionError,
+ CentriConnectTooManyRequestsError,
+ ):
  errors["base"] = "cannot_connect"
  except CentriConnectNotFoundError:
  errors["base"] = "invalid_auth"
  except CentriConnectEmptyResponseError, CentriConnectDecodeError:
  errors["base"] = "unknown"
- except Exception:
+ except Exception: # pylint: disable=broad-except
  _LOGGER.exception("Unexpected exception")
  errors["base"] = "unknown"
  else:
  await self.async_set_unique_id(
  unique_id=info[CENTRICONNECT_DEVICE_ID], raise_on_progress=True
  )
- self._abort_if_unique_id_configured(
- updates=user_input, reload_on_update=True
- )
- return self.async_create_entry(title=info["title"], data=user_input)
+ return on_success(info, user_input)
 
  return self.async_show_form(
- step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+ step_id=step_id, data_schema=data_schema, errors=errors
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle reconfiguration of the integration."""
+ old_entry = self._get_reconfigure_entry()
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ old_entry, data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reconfigure",
+ data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: old_entry.data[CONF_DEVICE_ID],
+ },
+ on_success=_on_success,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Handle configuration by re-auth."""
+ self._device_id = entry_data[CONF_DEVICE_ID]
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Perform reauthentication upon an API authentication error."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ self._get_reauth_entry(), data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reauth_confirm",
+ data_schema=STEP_REAUTHENTICATE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: self._device_id,
+ },
+ on_success=_on_success,
+ )
+
+ @override
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_configured(
+ updates=user_input, reload_on_update=True
+ )
+ return self.async_create_entry(title=info["title"], data=user_input)
+
+ return await self._handle_flow(
+ step_id="user",
+ data_schema=STEP_USER_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: user_input,
+ on_success=_on_success,
  )

homeassistant/components/centriconnect/quality_scale.yaml

@@ -42,7 +42,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
- reauthentication-flow: todo
+ reauthentication-flow: done
  test-coverage: done
 
  # Gold
@@ -70,7 +70,7 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
- reconfiguration-flow: todo
+ reconfiguration-flow: done
  repair-issues:
  status: exempt
  comment: No user-actionable repair scenarios identified for this integration.

homeassistant/components/centriconnect/strings.json

@@ -1,14 +1,39 @@
 {
  "config": {
  "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+ "wrong_device": "This CentriConnect/MyPropane device does not match the existing device ID. Please make sure you entered the credentials correctly."
  },
  "error": {
  "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
  "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
  "unknown": "[%key:common::config_flow::error::unknown%]"
  },
  "step": {
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
+ "reconfigure": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
  "user": {
  "data": {
  "device_id": "Device ID",

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
  "integration_type": "service",
  "iot_class": "cloud_push",
  "requirements": [
- "google-cloud-texttospeech==2.25.1",
- "google-cloud-speech==2.31.1"
+ "google-cloud-texttospeech==2.37.0",
+ "google-cloud-speech==2.40.0"
  ]
 }

homeassistant/components/ipp/config_flow.py

@@ -27,7 +27,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN
+from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +45,7 @@ async def validate_input(hass: HomeAssistant, data: dict) -> dict[str, Any]:
  tls=data[CONF_SSL],
  verify_ssl=data[CONF_VERIFY_SSL],
  session=session,
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  printer = await ipp.printer()

homeassistant/components/ipp/const.py

@@ -14,6 +14,9 @@
 ATTR_STATE_REASON = "state_reason"
 ATTR_URI_SUPPORTED = "uri_supported"
 
+# Printers waking from sleep can take well over pyipp's own default
+REQUEST_TIMEOUT = 30
+
 # Config Keys
 CONF_BASE_PATH = "base_path"
 CONF_SERIAL = "serial"

homeassistant/components/ipp/coordinator.py

@@ -12,7 +12,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BASE_PATH, DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN, REQUEST_TIMEOUT
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
@@ -36,6 +36,7 @@ def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
  tls=config_entry.data[CONF_SSL],
  verify_ssl=config_entry.data[CONF_VERIFY_SSL],
  session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  super().__init__(

homeassistant/components/lunatone/icons.json

@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "dali_line_status": {
+ "default": "mdi:current-ac"
+ }
+ }
+ }
+}

.claude/skills/ha-merge-queue/SKILL.md

@@ -27,7 +27,7 @@ verify every finalist with the per-PR checks below.
 
 ## Verify each finalist
 
-Check all five. A PR fails the shortlist if any one fails.
+Check all six conditions. A PR fails the shortlist if any of checks 1 through 5 fail.
 
 Paginate every list response before deciding. Check runs, reviews and review threads are all
 paged, typically 30 per page, and a full-suite Home Assistant PR runs to 40-odd check runs —
@@ -90,12 +90,27 @@ Compare the returned count against the reported total and keep fetching until th
  discount one for the category it appears to fall into; an unaddressed defect is a
  blocker whether or not anyone is arguing about it.
 
+6. **Peer-Review Checklist Verification (Priority Boost)** — inspect the PR body text for
+ the template checkbox: `- [x] I have reviewed two other [open pull requests][prs] in this repository.`
+ - **Checked (`[x]`):** Give this PR higher priority in ranking to reward contributors helping
+ clear the review backlog.
+ - **Unchecked (`[ ]` or missing):** Keep in queue with standard priority (do not disqualify).
+
 ## Report
 
-Rank by how little work each PR needs: `clean` first, then `blocked` with everything else
-green. For each PR give the number as a full markdown link, the integration or core area,
-one line on what it does, and its blocking state. Plenty of `home-assistant/core` PRs touch
-helpers, the framework, the recorder or repo tooling and have no integration at all — name
+Rank and order candidates primarily by their status readiness (`clean` first, then `blocked`
+with everything else green), and **secondarily by peer-review participation**:
+
+1. **Clean PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+2. **Clean PRs** without the checkbox checked.
+3. **Blocked/Near-miss PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+4. **Blocked/Near-miss PRs** without the checkbox checked.
+
+For each PR give the number as a full markdown link, the integration or core area,
+one line on what it does, its blocking state, and explicitly note if the author checked the
+peer-review box (e.g., "⭐ *Contributor reviewed 2 PRs*").
+
+Plenty of `home-assistant/core` PRs touch helpers, the framework, the recorder or repo tooling and have no integration at all — name
 what they touch instead, rather than dropping them or inventing one.
 
 Then list the near-misses separately, each with the one action that unblocks it. The
@@ -115,4 +130,4 @@ change but carries no `breaking-change` label will silently miss the release not
 - Only report in the CONSOLE. DO NOT ACT ON GITHUB — no comments, no reviews, no merges,
  no pushes to contributor branches. Per `AI_POLICY.md`, a human decides and acts.
 - Never call a PR ready on green CI alone. Read the diff of every PR you shortlist; CI
- cannot tell you whether the change is correct or wanted.
+ cannot tell you whether the change is correct or wanted.

homeassistant/components/centriconnect/config_flow.py

@@ -1,5 +1,6 @@
 """Config flow for the CentriConnect/MyPropane API integration."""
 
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any, override
 
@@ -11,7 +12,7 @@
  CentriConnectNotFoundError,
  CentriConnectTooManyRequestsError,
 )
-import voluptuous as vol
+import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_USERNAME
@@ -22,11 +23,25 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
+STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
  {
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_DEVICE_ID): str,
- vol.Required(CONF_PASSWORD): str,
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_REAUTHENTICATE_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_USER_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_DEVICE_ID): str,
+ probatio.Required(CONF_PASSWORD): str,
  }
 )
 
@@ -57,34 +72,117 @@ class CentriConnectConfigFlow(ConfigFlow, domain=DOMAIN):
  """Handle a config flow for CentriConnect/MyPropane API."""
 
  VERSION = 1
-
- @override
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
+ _device_id: str | None = None
+
+ async def _handle_flow(
+ self,
+ step_id: str,
+ data_schema: probatio.Schema,
+ user_input: dict[str, Any] | None,
+ update_user_input: Callable[[dict[str, Any]], dict[str, Any]],
+ on_success: Callable[[dict[str, Any], dict[str, Any]], ConfigFlowResult],
  ) -> ConfigFlowResult:
- """Handle the initial step."""
+ """Handle the flow for both user and reconfigure steps."""
  errors: dict[str, str] = {}
  if user_input is not None:
  try:
- info = await validate_input(self.hass, user_input)
- except CentriConnectConnectionError, CentriConnectTooManyRequestsError:
+ info = await validate_input(self.hass, update_user_input(user_input))
+ except (
+ CentriConnectConnectionError,
+ CentriConnectTooManyRequestsError,
+ ):
  errors["base"] = "cannot_connect"
  except CentriConnectNotFoundError:
  errors["base"] = "invalid_auth"
  except CentriConnectEmptyResponseError, CentriConnectDecodeError:
  errors["base"] = "unknown"
- except Exception:
+ except Exception: # pylint: disable=broad-except
  _LOGGER.exception("Unexpected exception")
  errors["base"] = "unknown"
  else:
  await self.async_set_unique_id(
  unique_id=info[CENTRICONNECT_DEVICE_ID], raise_on_progress=True
  )
- self._abort_if_unique_id_configured(
- updates=user_input, reload_on_update=True
- )
- return self.async_create_entry(title=info["title"], data=user_input)
+ return on_success(info, user_input)
 
  return self.async_show_form(
- step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+ step_id=step_id, data_schema=data_schema, errors=errors
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle reconfiguration of the integration."""
+ old_entry = self._get_reconfigure_entry()
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ old_entry, data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reconfigure",
+ data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: old_entry.data[CONF_DEVICE_ID],
+ },
+ on_success=_on_success,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Handle configuration by re-auth."""
+ self._device_id = entry_data[CONF_DEVICE_ID]
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Perform reauthentication upon an API authentication error."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ self._get_reauth_entry(), data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reauth_confirm",
+ data_schema=STEP_REAUTHENTICATE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: self._device_id,
+ },
+ on_success=_on_success,
+ )
+
+ @override
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_configured(
+ updates=user_input, reload_on_update=True
+ )
+ return self.async_create_entry(title=info["title"], data=user_input)
+
+ return await self._handle_flow(
+ step_id="user",
+ data_schema=STEP_USER_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: user_input,
+ on_success=_on_success,
  )

homeassistant/components/centriconnect/quality_scale.yaml

@@ -42,7 +42,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
- reauthentication-flow: todo
+ reauthentication-flow: done
  test-coverage: done
 
  # Gold
@@ -70,7 +70,7 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
- reconfiguration-flow: todo
+ reconfiguration-flow: done
  repair-issues:
  status: exempt
  comment: No user-actionable repair scenarios identified for this integration.

homeassistant/components/centriconnect/strings.json

@@ -1,14 +1,39 @@
 {
  "config": {
  "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+ "wrong_device": "This CentriConnect/MyPropane device does not match the existing device ID. Please make sure you entered the credentials correctly."
  },
  "error": {
  "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
  "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
  "unknown": "[%key:common::config_flow::error::unknown%]"
  },
  "step": {
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
+ "reconfigure": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
  "user": {
  "data": {
  "device_id": "Device ID",

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
  "integration_type": "service",
  "iot_class": "cloud_push",
  "requirements": [
- "google-cloud-texttospeech==2.25.1",
- "google-cloud-speech==2.31.1"
+ "google-cloud-texttospeech==2.37.0",
+ "google-cloud-speech==2.40.0"
  ]
 }

homeassistant/components/ipp/config_flow.py

@@ -27,7 +27,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN
+from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +45,7 @@ async def validate_input(hass: HomeAssistant, data: dict) -> dict[str, Any]:
  tls=data[CONF_SSL],
  verify_ssl=data[CONF_VERIFY_SSL],
  session=session,
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  printer = await ipp.printer()

homeassistant/components/ipp/const.py

@@ -14,6 +14,9 @@
 ATTR_STATE_REASON = "state_reason"
 ATTR_URI_SUPPORTED = "uri_supported"
 
+# Printers waking from sleep can take well over pyipp's own default
+REQUEST_TIMEOUT = 30
+
 # Config Keys
 CONF_BASE_PATH = "base_path"
 CONF_SERIAL = "serial"

homeassistant/components/ipp/coordinator.py

@@ -12,7 +12,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BASE_PATH, DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN, REQUEST_TIMEOUT
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
@@ -36,6 +36,7 @@ def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
  tls=config_entry.data[CONF_SSL],
  verify_ssl=config_entry.data[CONF_VERIFY_SSL],
  session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  super().__init__(

homeassistant/components/lunatone/icons.json

@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "dali_line_status": {
+ "default": "mdi:current-ac"
+ }
+ }
+ }
+}

.claude/skills/ha-merge-queue/SKILL.md

@@ -27,7 +27,7 @@ verify every finalist with the per-PR checks below.
 
 ## Verify each finalist
 
-Check all five. A PR fails the shortlist if any one fails.
+Check all six conditions. A PR fails the shortlist if any of checks 1 through 5 fail.
 
 Paginate every list response before deciding. Check runs, reviews and review threads are all
 paged, typically 30 per page, and a full-suite Home Assistant PR runs to 40-odd check runs —
@@ -90,12 +90,27 @@ Compare the returned count against the reported total and keep fetching until th
  discount one for the category it appears to fall into; an unaddressed defect is a
  blocker whether or not anyone is arguing about it.
 
+6. **Peer-Review Checklist Verification (Priority Boost)** — inspect the PR body text for
+ the template checkbox: `- [x] I have reviewed two other [open pull requests][prs] in this repository.`
+ - **Checked (`[x]`):** Give this PR higher priority in ranking to reward contributors helping
+ clear the review backlog.
+ - **Unchecked (`[ ]` or missing):** Keep in queue with standard priority (do not disqualify).
+
 ## Report
 
-Rank by how little work each PR needs: `clean` first, then `blocked` with everything else
-green. For each PR give the number as a full markdown link, the integration or core area,
-one line on what it does, and its blocking state. Plenty of `home-assistant/core` PRs touch
-helpers, the framework, the recorder or repo tooling and have no integration at all — name
+Rank and order candidates primarily by their status readiness (`clean` first, then `blocked`
+with everything else green), and **secondarily by peer-review participation**:
+
+1. **Clean PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+2. **Clean PRs** without the checkbox checked.
+3. **Blocked/Near-miss PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+4. **Blocked/Near-miss PRs** without the checkbox checked.
+
+For each PR give the number as a full markdown link, the integration or core area,
+one line on what it does, its blocking state, and explicitly note if the author checked the
+peer-review box (e.g., "⭐ *Contributor reviewed 2 PRs*").
+
+Plenty of `home-assistant/core` PRs touch helpers, the framework, the recorder or repo tooling and have no integration at all — name
 what they touch instead, rather than dropping them or inventing one.
 
 Then list the near-misses separately, each with the one action that unblocks it. The
@@ -115,4 +130,4 @@ change but carries no `breaking-change` label will silently miss the release not
 - Only report in the CONSOLE. DO NOT ACT ON GITHUB — no comments, no reviews, no merges,
  no pushes to contributor branches. Per `AI_POLICY.md`, a human decides and acts.
 - Never call a PR ready on green CI alone. Read the diff of every PR you shortlist; CI
- cannot tell you whether the change is correct or wanted.
+ cannot tell you whether the change is correct or wanted.

homeassistant/components/centriconnect/config_flow.py

@@ -1,5 +1,6 @@
 """Config flow for the CentriConnect/MyPropane API integration."""
 
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any, override
 
@@ -11,7 +12,7 @@
  CentriConnectNotFoundError,
  CentriConnectTooManyRequestsError,
 )
-import voluptuous as vol
+import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_USERNAME
@@ -22,11 +23,25 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
+STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
  {
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_DEVICE_ID): str,
- vol.Required(CONF_PASSWORD): str,
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_REAUTHENTICATE_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_USER_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_DEVICE_ID): str,
+ probatio.Required(CONF_PASSWORD): str,
  }
 )
 
@@ -57,34 +72,117 @@ class CentriConnectConfigFlow(ConfigFlow, domain=DOMAIN):
  """Handle a config flow for CentriConnect/MyPropane API."""
 
  VERSION = 1
-
- @override
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
+ _device_id: str | None = None
+
+ async def _handle_flow(
+ self,
+ step_id: str,
+ data_schema: probatio.Schema,
+ user_input: dict[str, Any] | None,
+ update_user_input: Callable[[dict[str, Any]], dict[str, Any]],
+ on_success: Callable[[dict[str, Any], dict[str, Any]], ConfigFlowResult],
  ) -> ConfigFlowResult:
- """Handle the initial step."""
+ """Handle the flow for both user and reconfigure steps."""
  errors: dict[str, str] = {}
  if user_input is not None:
  try:
- info = await validate_input(self.hass, user_input)
- except CentriConnectConnectionError, CentriConnectTooManyRequestsError:
+ info = await validate_input(self.hass, update_user_input(user_input))
+ except (
+ CentriConnectConnectionError,
+ CentriConnectTooManyRequestsError,
+ ):
  errors["base"] = "cannot_connect"
  except CentriConnectNotFoundError:
  errors["base"] = "invalid_auth"
  except CentriConnectEmptyResponseError, CentriConnectDecodeError:
  errors["base"] = "unknown"
- except Exception:
+ except Exception: # pylint: disable=broad-except
  _LOGGER.exception("Unexpected exception")
  errors["base"] = "unknown"
  else:
  await self.async_set_unique_id(
  unique_id=info[CENTRICONNECT_DEVICE_ID], raise_on_progress=True
  )
- self._abort_if_unique_id_configured(
- updates=user_input, reload_on_update=True
- )
- return self.async_create_entry(title=info["title"], data=user_input)
+ return on_success(info, user_input)
 
  return self.async_show_form(
- step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+ step_id=step_id, data_schema=data_schema, errors=errors
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle reconfiguration of the integration."""
+ old_entry = self._get_reconfigure_entry()
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ old_entry, data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reconfigure",
+ data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: old_entry.data[CONF_DEVICE_ID],
+ },
+ on_success=_on_success,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Handle configuration by re-auth."""
+ self._device_id = entry_data[CONF_DEVICE_ID]
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Perform reauthentication upon an API authentication error."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ self._get_reauth_entry(), data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reauth_confirm",
+ data_schema=STEP_REAUTHENTICATE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: self._device_id,
+ },
+ on_success=_on_success,
+ )
+
+ @override
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_configured(
+ updates=user_input, reload_on_update=True
+ )
+ return self.async_create_entry(title=info["title"], data=user_input)
+
+ return await self._handle_flow(
+ step_id="user",
+ data_schema=STEP_USER_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: user_input,
+ on_success=_on_success,
  )

homeassistant/components/centriconnect/quality_scale.yaml

@@ -42,7 +42,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
- reauthentication-flow: todo
+ reauthentication-flow: done
  test-coverage: done
 
  # Gold
@@ -70,7 +70,7 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
- reconfiguration-flow: todo
+ reconfiguration-flow: done
  repair-issues:
  status: exempt
  comment: No user-actionable repair scenarios identified for this integration.

homeassistant/components/centriconnect/strings.json

@@ -1,14 +1,39 @@
 {
  "config": {
  "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+ "wrong_device": "This CentriConnect/MyPropane device does not match the existing device ID. Please make sure you entered the credentials correctly."
  },
  "error": {
  "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
  "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
  "unknown": "[%key:common::config_flow::error::unknown%]"
  },
  "step": {
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
+ "reconfigure": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
  "user": {
  "data": {
  "device_id": "Device ID",

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
  "integration_type": "service",
  "iot_class": "cloud_push",
  "requirements": [
- "google-cloud-texttospeech==2.25.1",
- "google-cloud-speech==2.31.1"
+ "google-cloud-texttospeech==2.37.0",
+ "google-cloud-speech==2.40.0"
  ]
 }

homeassistant/components/ipp/config_flow.py

@@ -27,7 +27,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN
+from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +45,7 @@ async def validate_input(hass: HomeAssistant, data: dict) -> dict[str, Any]:
  tls=data[CONF_SSL],
  verify_ssl=data[CONF_VERIFY_SSL],
  session=session,
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  printer = await ipp.printer()

homeassistant/components/ipp/const.py

@@ -14,6 +14,9 @@
 ATTR_STATE_REASON = "state_reason"
 ATTR_URI_SUPPORTED = "uri_supported"
 
+# Printers waking from sleep can take well over pyipp's own default
+REQUEST_TIMEOUT = 30
+
 # Config Keys
 CONF_BASE_PATH = "base_path"
 CONF_SERIAL = "serial"

homeassistant/components/ipp/coordinator.py

@@ -12,7 +12,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BASE_PATH, DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN, REQUEST_TIMEOUT
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
@@ -36,6 +36,7 @@ def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
  tls=config_entry.data[CONF_SSL],
  verify_ssl=config_entry.data[CONF_VERIFY_SSL],
  session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  super().__init__(

homeassistant/components/lunatone/icons.json

@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "dali_line_status": {
+ "default": "mdi:current-ac"
+ }
+ }
+ }
+}

.claude/skills/ha-merge-queue/SKILL.md

@@ -27,7 +27,7 @@ verify every finalist with the per-PR checks below.
 
 ## Verify each finalist
 
-Check all five. A PR fails the shortlist if any one fails.
+Check all six conditions. A PR fails the shortlist if any of checks 1 through 5 fail.
 
 Paginate every list response before deciding. Check runs, reviews and review threads are all
 paged, typically 30 per page, and a full-suite Home Assistant PR runs to 40-odd check runs —
@@ -90,12 +90,27 @@ Compare the returned count against the reported total and keep fetching until th
  discount one for the category it appears to fall into; an unaddressed defect is a
  blocker whether or not anyone is arguing about it.
 
+6. **Peer-Review Checklist Verification (Priority Boost)** — inspect the PR body text for
+ the template checkbox: `- [x] I have reviewed two other [open pull requests][prs] in this repository.`
+ - **Checked (`[x]`):** Give this PR higher priority in ranking to reward contributors helping
+ clear the review backlog.
+ - **Unchecked (`[ ]` or missing):** Keep in queue with standard priority (do not disqualify).
+
 ## Report
 
-Rank by how little work each PR needs: `clean` first, then `blocked` with everything else
-green. For each PR give the number as a full markdown link, the integration or core area,
-one line on what it does, and its blocking state. Plenty of `home-assistant/core` PRs touch
-helpers, the framework, the recorder or repo tooling and have no integration at all — name
+Rank and order candidates primarily by their status readiness (`clean` first, then `blocked`
+with everything else green), and **secondarily by peer-review participation**:
+
+1. **Clean PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+2. **Clean PRs** without the checkbox checked.
+3. **Blocked/Near-miss PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+4. **Blocked/Near-miss PRs** without the checkbox checked.
+
+For each PR give the number as a full markdown link, the integration or core area,
+one line on what it does, its blocking state, and explicitly note if the author checked the
+peer-review box (e.g., "⭐ *Contributor reviewed 2 PRs*").
+
+Plenty of `home-assistant/core` PRs touch helpers, the framework, the recorder or repo tooling and have no integration at all — name
 what they touch instead, rather than dropping them or inventing one.
 
 Then list the near-misses separately, each with the one action that unblocks it. The
@@ -115,4 +130,4 @@ change but carries no `breaking-change` label will silently miss the release not
 - Only report in the CONSOLE. DO NOT ACT ON GITHUB — no comments, no reviews, no merges,
  no pushes to contributor branches. Per `AI_POLICY.md`, a human decides and acts.
 - Never call a PR ready on green CI alone. Read the diff of every PR you shortlist; CI
- cannot tell you whether the change is correct or wanted.
+ cannot tell you whether the change is correct or wanted.

homeassistant/components/centriconnect/config_flow.py

@@ -1,5 +1,6 @@
 """Config flow for the CentriConnect/MyPropane API integration."""
 
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any, override
 
@@ -11,7 +12,7 @@
  CentriConnectNotFoundError,
  CentriConnectTooManyRequestsError,
 )
-import voluptuous as vol
+import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_USERNAME
@@ -22,11 +23,25 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
+STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
  {
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_DEVICE_ID): str,
- vol.Required(CONF_PASSWORD): str,
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_REAUTHENTICATE_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_USER_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_DEVICE_ID): str,
+ probatio.Required(CONF_PASSWORD): str,
  }
 )
 
@@ -57,34 +72,117 @@ class CentriConnectConfigFlow(ConfigFlow, domain=DOMAIN):
  """Handle a config flow for CentriConnect/MyPropane API."""
 
  VERSION = 1
-
- @override
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
+ _device_id: str | None = None
+
+ async def _handle_flow(
+ self,
+ step_id: str,
+ data_schema: probatio.Schema,
+ user_input: dict[str, Any] | None,
+ update_user_input: Callable[[dict[str, Any]], dict[str, Any]],
+ on_success: Callable[[dict[str, Any], dict[str, Any]], ConfigFlowResult],
  ) -> ConfigFlowResult:
- """Handle the initial step."""
+ """Handle the flow for both user and reconfigure steps."""
  errors: dict[str, str] = {}
  if user_input is not None:
  try:
- info = await validate_input(self.hass, user_input)
- except CentriConnectConnectionError, CentriConnectTooManyRequestsError:
+ info = await validate_input(self.hass, update_user_input(user_input))
+ except (
+ CentriConnectConnectionError,
+ CentriConnectTooManyRequestsError,
+ ):
  errors["base"] = "cannot_connect"
  except CentriConnectNotFoundError:
  errors["base"] = "invalid_auth"
  except CentriConnectEmptyResponseError, CentriConnectDecodeError:
  errors["base"] = "unknown"
- except Exception:
+ except Exception: # pylint: disable=broad-except
  _LOGGER.exception("Unexpected exception")
  errors["base"] = "unknown"
  else:
  await self.async_set_unique_id(
  unique_id=info[CENTRICONNECT_DEVICE_ID], raise_on_progress=True
  )
- self._abort_if_unique_id_configured(
- updates=user_input, reload_on_update=True
- )
- return self.async_create_entry(title=info["title"], data=user_input)
+ return on_success(info, user_input)
 
  return self.async_show_form(
- step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+ step_id=step_id, data_schema=data_schema, errors=errors
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle reconfiguration of the integration."""
+ old_entry = self._get_reconfigure_entry()
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ old_entry, data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reconfigure",
+ data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: old_entry.data[CONF_DEVICE_ID],
+ },
+ on_success=_on_success,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Handle configuration by re-auth."""
+ self._device_id = entry_data[CONF_DEVICE_ID]
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Perform reauthentication upon an API authentication error."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ self._get_reauth_entry(), data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reauth_confirm",
+ data_schema=STEP_REAUTHENTICATE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: self._device_id,
+ },
+ on_success=_on_success,
+ )
+
+ @override
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_configured(
+ updates=user_input, reload_on_update=True
+ )
+ return self.async_create_entry(title=info["title"], data=user_input)
+
+ return await self._handle_flow(
+ step_id="user",
+ data_schema=STEP_USER_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: user_input,
+ on_success=_on_success,
  )

homeassistant/components/centriconnect/quality_scale.yaml

@@ -42,7 +42,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
- reauthentication-flow: todo
+ reauthentication-flow: done
  test-coverage: done
 
  # Gold
@@ -70,7 +70,7 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
- reconfiguration-flow: todo
+ reconfiguration-flow: done
  repair-issues:
  status: exempt
  comment: No user-actionable repair scenarios identified for this integration.

homeassistant/components/centriconnect/strings.json

@@ -1,14 +1,39 @@
 {
  "config": {
  "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+ "wrong_device": "This CentriConnect/MyPropane device does not match the existing device ID. Please make sure you entered the credentials correctly."
  },
  "error": {
  "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
  "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
  "unknown": "[%key:common::config_flow::error::unknown%]"
  },
  "step": {
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
+ "reconfigure": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
  "user": {
  "data": {
  "device_id": "Device ID",

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
  "integration_type": "service",
  "iot_class": "cloud_push",
  "requirements": [
- "google-cloud-texttospeech==2.25.1",
- "google-cloud-speech==2.31.1"
+ "google-cloud-texttospeech==2.37.0",
+ "google-cloud-speech==2.40.0"
  ]
 }

homeassistant/components/ipp/config_flow.py

@@ -27,7 +27,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN
+from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +45,7 @@ async def validate_input(hass: HomeAssistant, data: dict) -> dict[str, Any]:
  tls=data[CONF_SSL],
  verify_ssl=data[CONF_VERIFY_SSL],
  session=session,
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  printer = await ipp.printer()

homeassistant/components/ipp/const.py

@@ -14,6 +14,9 @@
 ATTR_STATE_REASON = "state_reason"
 ATTR_URI_SUPPORTED = "uri_supported"
 
+# Printers waking from sleep can take well over pyipp's own default
+REQUEST_TIMEOUT = 30
+
 # Config Keys
 CONF_BASE_PATH = "base_path"
 CONF_SERIAL = "serial"

homeassistant/components/ipp/coordinator.py

@@ -12,7 +12,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BASE_PATH, DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN, REQUEST_TIMEOUT
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
@@ -36,6 +36,7 @@ def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
  tls=config_entry.data[CONF_SSL],
  verify_ssl=config_entry.data[CONF_VERIFY_SSL],
  session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  super().__init__(

homeassistant/components/lunatone/icons.json

@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "dali_line_status": {
+ "default": "mdi:current-ac"
+ }
+ }
+ }
+}

.claude/skills/ha-merge-queue/SKILL.md

@@ -27,7 +27,7 @@ verify every finalist with the per-PR checks below.
 
 ## Verify each finalist
 
-Check all five. A PR fails the shortlist if any one fails.
+Check all six conditions. A PR fails the shortlist if any of checks 1 through 5 fail.
 
 Paginate every list response before deciding. Check runs, reviews and review threads are all
 paged, typically 30 per page, and a full-suite Home Assistant PR runs to 40-odd check runs —
@@ -90,12 +90,27 @@ Compare the returned count against the reported total and keep fetching until th
  discount one for the category it appears to fall into; an unaddressed defect is a
  blocker whether or not anyone is arguing about it.
 
+6. **Peer-Review Checklist Verification (Priority Boost)** — inspect the PR body text for
+ the template checkbox: `- [x] I have reviewed two other [open pull requests][prs] in this repository.`
+ - **Checked (`[x]`):** Give this PR higher priority in ranking to reward contributors helping
+ clear the review backlog.
+ - **Unchecked (`[ ]` or missing):** Keep in queue with standard priority (do not disqualify).
+
 ## Report
 
-Rank by how little work each PR needs: `clean` first, then `blocked` with everything else
-green. For each PR give the number as a full markdown link, the integration or core area,
-one line on what it does, and its blocking state. Plenty of `home-assistant/core` PRs touch
-helpers, the framework, the recorder or repo tooling and have no integration at all — name
+Rank and order candidates primarily by their status readiness (`clean` first, then `blocked`
+with everything else green), and **secondarily by peer-review participation**:
+
+1. **Clean PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+2. **Clean PRs** without the checkbox checked.
+3. **Blocked/Near-miss PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+4. **Blocked/Near-miss PRs** without the checkbox checked.
+
+For each PR give the number as a full markdown link, the integration or core area,
+one line on what it does, its blocking state, and explicitly note if the author checked the
+peer-review box (e.g., "⭐ *Contributor reviewed 2 PRs*").
+
+Plenty of `home-assistant/core` PRs touch helpers, the framework, the recorder or repo tooling and have no integration at all — name
 what they touch instead, rather than dropping them or inventing one.
 
 Then list the near-misses separately, each with the one action that unblocks it. The
@@ -115,4 +130,4 @@ change but carries no `breaking-change` label will silently miss the release not
 - Only report in the CONSOLE. DO NOT ACT ON GITHUB — no comments, no reviews, no merges,
  no pushes to contributor branches. Per `AI_POLICY.md`, a human decides and acts.
 - Never call a PR ready on green CI alone. Read the diff of every PR you shortlist; CI
- cannot tell you whether the change is correct or wanted.
+ cannot tell you whether the change is correct or wanted.

homeassistant/components/centriconnect/config_flow.py

@@ -1,5 +1,6 @@
 """Config flow for the CentriConnect/MyPropane API integration."""
 
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any, override
 
@@ -11,7 +12,7 @@
  CentriConnectNotFoundError,
  CentriConnectTooManyRequestsError,
 )
-import voluptuous as vol
+import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_USERNAME
@@ -22,11 +23,25 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
+STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
  {
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_DEVICE_ID): str,
- vol.Required(CONF_PASSWORD): str,
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_REAUTHENTICATE_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_USER_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_DEVICE_ID): str,
+ probatio.Required(CONF_PASSWORD): str,
  }
 )
 
@@ -57,34 +72,117 @@ class CentriConnectConfigFlow(ConfigFlow, domain=DOMAIN):
  """Handle a config flow for CentriConnect/MyPropane API."""
 
  VERSION = 1
-
- @override
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
+ _device_id: str | None = None
+
+ async def _handle_flow(
+ self,
+ step_id: str,
+ data_schema: probatio.Schema,
+ user_input: dict[str, Any] | None,
+ update_user_input: Callable[[dict[str, Any]], dict[str, Any]],
+ on_success: Callable[[dict[str, Any], dict[str, Any]], ConfigFlowResult],
  ) -> ConfigFlowResult:
- """Handle the initial step."""
+ """Handle the flow for both user and reconfigure steps."""
  errors: dict[str, str] = {}
  if user_input is not None:
  try:
- info = await validate_input(self.hass, user_input)
- except CentriConnectConnectionError, CentriConnectTooManyRequestsError:
+ info = await validate_input(self.hass, update_user_input(user_input))
+ except (
+ CentriConnectConnectionError,
+ CentriConnectTooManyRequestsError,
+ ):
  errors["base"] = "cannot_connect"
  except CentriConnectNotFoundError:
  errors["base"] = "invalid_auth"
  except CentriConnectEmptyResponseError, CentriConnectDecodeError:
  errors["base"] = "unknown"
- except Exception:
+ except Exception: # pylint: disable=broad-except
  _LOGGER.exception("Unexpected exception")
  errors["base"] = "unknown"
  else:
  await self.async_set_unique_id(
  unique_id=info[CENTRICONNECT_DEVICE_ID], raise_on_progress=True
  )
- self._abort_if_unique_id_configured(
- updates=user_input, reload_on_update=True
- )
- return self.async_create_entry(title=info["title"], data=user_input)
+ return on_success(info, user_input)
 
  return self.async_show_form(
- step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+ step_id=step_id, data_schema=data_schema, errors=errors
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle reconfiguration of the integration."""
+ old_entry = self._get_reconfigure_entry()
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ old_entry, data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reconfigure",
+ data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: old_entry.data[CONF_DEVICE_ID],
+ },
+ on_success=_on_success,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Handle configuration by re-auth."""
+ self._device_id = entry_data[CONF_DEVICE_ID]
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Perform reauthentication upon an API authentication error."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ self._get_reauth_entry(), data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reauth_confirm",
+ data_schema=STEP_REAUTHENTICATE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: self._device_id,
+ },
+ on_success=_on_success,
+ )
+
+ @override
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_configured(
+ updates=user_input, reload_on_update=True
+ )
+ return self.async_create_entry(title=info["title"], data=user_input)
+
+ return await self._handle_flow(
+ step_id="user",
+ data_schema=STEP_USER_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: user_input,
+ on_success=_on_success,
  )

homeassistant/components/centriconnect/quality_scale.yaml

@@ -42,7 +42,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
- reauthentication-flow: todo
+ reauthentication-flow: done
  test-coverage: done
 
  # Gold
@@ -70,7 +70,7 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
- reconfiguration-flow: todo
+ reconfiguration-flow: done
  repair-issues:
  status: exempt
  comment: No user-actionable repair scenarios identified for this integration.

homeassistant/components/centriconnect/strings.json

@@ -1,14 +1,39 @@
 {
  "config": {
  "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+ "wrong_device": "This CentriConnect/MyPropane device does not match the existing device ID. Please make sure you entered the credentials correctly."
  },
  "error": {
  "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
  "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
  "unknown": "[%key:common::config_flow::error::unknown%]"
  },
  "step": {
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
+ "reconfigure": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
  "user": {
  "data": {
  "device_id": "Device ID",

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
  "integration_type": "service",
  "iot_class": "cloud_push",
  "requirements": [
- "google-cloud-texttospeech==2.25.1",
- "google-cloud-speech==2.31.1"
+ "google-cloud-texttospeech==2.37.0",
+ "google-cloud-speech==2.40.0"
  ]
 }

homeassistant/components/ipp/config_flow.py

@@ -27,7 +27,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN
+from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +45,7 @@ async def validate_input(hass: HomeAssistant, data: dict) -> dict[str, Any]:
  tls=data[CONF_SSL],
  verify_ssl=data[CONF_VERIFY_SSL],
  session=session,
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  printer = await ipp.printer()

homeassistant/components/ipp/const.py

@@ -14,6 +14,9 @@
 ATTR_STATE_REASON = "state_reason"
 ATTR_URI_SUPPORTED = "uri_supported"
 
+# Printers waking from sleep can take well over pyipp's own default
+REQUEST_TIMEOUT = 30
+
 # Config Keys
 CONF_BASE_PATH = "base_path"
 CONF_SERIAL = "serial"

homeassistant/components/ipp/coordinator.py

@@ -12,7 +12,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BASE_PATH, DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN, REQUEST_TIMEOUT
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
@@ -36,6 +36,7 @@ def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
  tls=config_entry.data[CONF_SSL],
  verify_ssl=config_entry.data[CONF_VERIFY_SSL],
  session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  super().__init__(

homeassistant/components/lunatone/icons.json

@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "dali_line_status": {
+ "default": "mdi:current-ac"
+ }
+ }
+ }
+}

.claude/skills/ha-merge-queue/SKILL.md

@@ -27,7 +27,7 @@ verify every finalist with the per-PR checks below.
 
 ## Verify each finalist
 
-Check all five. A PR fails the shortlist if any one fails.
+Check all six conditions. A PR fails the shortlist if any of checks 1 through 5 fail.
 
 Paginate every list response before deciding. Check runs, reviews and review threads are all
 paged, typically 30 per page, and a full-suite Home Assistant PR runs to 40-odd check runs —
@@ -90,12 +90,27 @@ Compare the returned count against the reported total and keep fetching until th
  discount one for the category it appears to fall into; an unaddressed defect is a
  blocker whether or not anyone is arguing about it.
 
+6. **Peer-Review Checklist Verification (Priority Boost)** — inspect the PR body text for
+ the template checkbox: `- [x] I have reviewed two other [open pull requests][prs] in this repository.`
+ - **Checked (`[x]`):** Give this PR higher priority in ranking to reward contributors helping
+ clear the review backlog.
+ - **Unchecked (`[ ]` or missing):** Keep in queue with standard priority (do not disqualify).
+
 ## Report
 
-Rank by how little work each PR needs: `clean` first, then `blocked` with everything else
-green. For each PR give the number as a full markdown link, the integration or core area,
-one line on what it does, and its blocking state. Plenty of `home-assistant/core` PRs touch
-helpers, the framework, the recorder or repo tooling and have no integration at all — name
+Rank and order candidates primarily by their status readiness (`clean` first, then `blocked`
+with everything else green), and **secondarily by peer-review participation**:
+
+1. **Clean PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+2. **Clean PRs** without the checkbox checked.
+3. **Blocked/Near-miss PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+4. **Blocked/Near-miss PRs** without the checkbox checked.
+
+For each PR give the number as a full markdown link, the integration or core area,
+one line on what it does, its blocking state, and explicitly note if the author checked the
+peer-review box (e.g., "⭐ *Contributor reviewed 2 PRs*").
+
+Plenty of `home-assistant/core` PRs touch helpers, the framework, the recorder or repo tooling and have no integration at all — name
 what they touch instead, rather than dropping them or inventing one.
 
 Then list the near-misses separately, each with the one action that unblocks it. The
@@ -115,4 +130,4 @@ change but carries no `breaking-change` label will silently miss the release not
 - Only report in the CONSOLE. DO NOT ACT ON GITHUB — no comments, no reviews, no merges,
  no pushes to contributor branches. Per `AI_POLICY.md`, a human decides and acts.
 - Never call a PR ready on green CI alone. Read the diff of every PR you shortlist; CI
- cannot tell you whether the change is correct or wanted.
+ cannot tell you whether the change is correct or wanted.

homeassistant/components/centriconnect/config_flow.py

@@ -1,5 +1,6 @@
 """Config flow for the CentriConnect/MyPropane API integration."""
 
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any, override
 
@@ -11,7 +12,7 @@
  CentriConnectNotFoundError,
  CentriConnectTooManyRequestsError,
 )
-import voluptuous as vol
+import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_USERNAME
@@ -22,11 +23,25 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
+STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
  {
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_DEVICE_ID): str,
- vol.Required(CONF_PASSWORD): str,
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_REAUTHENTICATE_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_USER_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_DEVICE_ID): str,
+ probatio.Required(CONF_PASSWORD): str,
  }
 )
 
@@ -57,34 +72,117 @@ class CentriConnectConfigFlow(ConfigFlow, domain=DOMAIN):
  """Handle a config flow for CentriConnect/MyPropane API."""
 
  VERSION = 1
-
- @override
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
+ _device_id: str | None = None
+
+ async def _handle_flow(
+ self,
+ step_id: str,
+ data_schema: probatio.Schema,
+ user_input: dict[str, Any] | None,
+ update_user_input: Callable[[dict[str, Any]], dict[str, Any]],
+ on_success: Callable[[dict[str, Any], dict[str, Any]], ConfigFlowResult],
  ) -> ConfigFlowResult:
- """Handle the initial step."""
+ """Handle the flow for both user and reconfigure steps."""
  errors: dict[str, str] = {}
  if user_input is not None:
  try:
- info = await validate_input(self.hass, user_input)
- except CentriConnectConnectionError, CentriConnectTooManyRequestsError:
+ info = await validate_input(self.hass, update_user_input(user_input))
+ except (
+ CentriConnectConnectionError,
+ CentriConnectTooManyRequestsError,
+ ):
  errors["base"] = "cannot_connect"
  except CentriConnectNotFoundError:
  errors["base"] = "invalid_auth"
  except CentriConnectEmptyResponseError, CentriConnectDecodeError:
  errors["base"] = "unknown"
- except Exception:
+ except Exception: # pylint: disable=broad-except
  _LOGGER.exception("Unexpected exception")
  errors["base"] = "unknown"
  else:
  await self.async_set_unique_id(
  unique_id=info[CENTRICONNECT_DEVICE_ID], raise_on_progress=True
  )
- self._abort_if_unique_id_configured(
- updates=user_input, reload_on_update=True
- )
- return self.async_create_entry(title=info["title"], data=user_input)
+ return on_success(info, user_input)
 
  return self.async_show_form(
- step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+ step_id=step_id, data_schema=data_schema, errors=errors
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle reconfiguration of the integration."""
+ old_entry = self._get_reconfigure_entry()
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ old_entry, data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reconfigure",
+ data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: old_entry.data[CONF_DEVICE_ID],
+ },
+ on_success=_on_success,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Handle configuration by re-auth."""
+ self._device_id = entry_data[CONF_DEVICE_ID]
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Perform reauthentication upon an API authentication error."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ self._get_reauth_entry(), data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reauth_confirm",
+ data_schema=STEP_REAUTHENTICATE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: self._device_id,
+ },
+ on_success=_on_success,
+ )
+
+ @override
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_configured(
+ updates=user_input, reload_on_update=True
+ )
+ return self.async_create_entry(title=info["title"], data=user_input)
+
+ return await self._handle_flow(
+ step_id="user",
+ data_schema=STEP_USER_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: user_input,
+ on_success=_on_success,
  )

homeassistant/components/centriconnect/quality_scale.yaml

@@ -42,7 +42,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
- reauthentication-flow: todo
+ reauthentication-flow: done
  test-coverage: done
 
  # Gold
@@ -70,7 +70,7 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
- reconfiguration-flow: todo
+ reconfiguration-flow: done
  repair-issues:
  status: exempt
  comment: No user-actionable repair scenarios identified for this integration.

homeassistant/components/centriconnect/strings.json

@@ -1,14 +1,39 @@
 {
  "config": {
  "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+ "wrong_device": "This CentriConnect/MyPropane device does not match the existing device ID. Please make sure you entered the credentials correctly."
  },
  "error": {
  "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
  "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
  "unknown": "[%key:common::config_flow::error::unknown%]"
  },
  "step": {
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
+ "reconfigure": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
  "user": {
  "data": {
  "device_id": "Device ID",

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
  "integration_type": "service",
  "iot_class": "cloud_push",
  "requirements": [
- "google-cloud-texttospeech==2.25.1",
- "google-cloud-speech==2.31.1"
+ "google-cloud-texttospeech==2.37.0",
+ "google-cloud-speech==2.40.0"
  ]
 }

homeassistant/components/ipp/config_flow.py

@@ -27,7 +27,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN
+from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +45,7 @@ async def validate_input(hass: HomeAssistant, data: dict) -> dict[str, Any]:
  tls=data[CONF_SSL],
  verify_ssl=data[CONF_VERIFY_SSL],
  session=session,
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  printer = await ipp.printer()

homeassistant/components/ipp/const.py

@@ -14,6 +14,9 @@
 ATTR_STATE_REASON = "state_reason"
 ATTR_URI_SUPPORTED = "uri_supported"
 
+# Printers waking from sleep can take well over pyipp's own default
+REQUEST_TIMEOUT = 30
+
 # Config Keys
 CONF_BASE_PATH = "base_path"
 CONF_SERIAL = "serial"

homeassistant/components/ipp/coordinator.py

@@ -12,7 +12,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BASE_PATH, DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN, REQUEST_TIMEOUT
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
@@ -36,6 +36,7 @@ def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
  tls=config_entry.data[CONF_SSL],
  verify_ssl=config_entry.data[CONF_VERIFY_SSL],
  session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  super().__init__(

homeassistant/components/lunatone/icons.json

@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "dali_line_status": {
+ "default": "mdi:current-ac"
+ }
+ }
+ }
+}

.claude/skills/ha-merge-queue/SKILL.md

@@ -27,7 +27,7 @@ verify every finalist with the per-PR checks below.
 
 ## Verify each finalist
 
-Check all five. A PR fails the shortlist if any one fails.
+Check all six conditions. A PR fails the shortlist if any of checks 1 through 5 fail.
 
 Paginate every list response before deciding. Check runs, reviews and review threads are all
 paged, typically 30 per page, and a full-suite Home Assistant PR runs to 40-odd check runs —
@@ -90,12 +90,27 @@ Compare the returned count against the reported total and keep fetching until th
  discount one for the category it appears to fall into; an unaddressed defect is a
  blocker whether or not anyone is arguing about it.
 
+6. **Peer-Review Checklist Verification (Priority Boost)** — inspect the PR body text for
+ the template checkbox: `- [x] I have reviewed two other [open pull requests][prs] in this repository.`
+ - **Checked (`[x]`):** Give this PR higher priority in ranking to reward contributors helping
+ clear the review backlog.
+ - **Unchecked (`[ ]` or missing):** Keep in queue with standard priority (do not disqualify).
+
 ## Report
 
-Rank by how little work each PR needs: `clean` first, then `blocked` with everything else
-green. For each PR give the number as a full markdown link, the integration or core area,
-one line on what it does, and its blocking state. Plenty of `home-assistant/core` PRs touch
-helpers, the framework, the recorder or repo tooling and have no integration at all — name
+Rank and order candidates primarily by their status readiness (`clean` first, then `blocked`
+with everything else green), and **secondarily by peer-review participation**:
+
+1. **Clean PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+2. **Clean PRs** without the checkbox checked.
+3. **Blocked/Near-miss PRs** with the `[x] I have reviewed two other open pull requests...` checkbox checked.
+4. **Blocked/Near-miss PRs** without the checkbox checked.
+
+For each PR give the number as a full markdown link, the integration or core area,
+one line on what it does, its blocking state, and explicitly note if the author checked the
+peer-review box (e.g., "⭐ *Contributor reviewed 2 PRs*").
+
+Plenty of `home-assistant/core` PRs touch helpers, the framework, the recorder or repo tooling and have no integration at all — name
 what they touch instead, rather than dropping them or inventing one.
 
 Then list the near-misses separately, each with the one action that unblocks it. The
@@ -115,4 +130,4 @@ change but carries no `breaking-change` label will silently miss the release not
 - Only report in the CONSOLE. DO NOT ACT ON GITHUB — no comments, no reviews, no merges,
  no pushes to contributor branches. Per `AI_POLICY.md`, a human decides and acts.
 - Never call a PR ready on green CI alone. Read the diff of every PR you shortlist; CI
- cannot tell you whether the change is correct or wanted.
+ cannot tell you whether the change is correct or wanted.

homeassistant/components/centriconnect/config_flow.py

@@ -1,5 +1,6 @@
 """Config flow for the CentriConnect/MyPropane API integration."""
 
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any, override
 
@@ -11,7 +12,7 @@
  CentriConnectNotFoundError,
  CentriConnectTooManyRequestsError,
 )
-import voluptuous as vol
+import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_USERNAME
@@ -22,11 +23,25 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
+STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
  {
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_DEVICE_ID): str,
- vol.Required(CONF_PASSWORD): str,
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_REAUTHENTICATE_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_USER_DATA_SCHEMA = probatio.Schema(
+ {
+ probatio.Required(CONF_USERNAME): str,
+ probatio.Required(CONF_DEVICE_ID): str,
+ probatio.Required(CONF_PASSWORD): str,
  }
 )
 
@@ -57,34 +72,117 @@ class CentriConnectConfigFlow(ConfigFlow, domain=DOMAIN):
  """Handle a config flow for CentriConnect/MyPropane API."""
 
  VERSION = 1
-
- @override
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
+ _device_id: str | None = None
+
+ async def _handle_flow(
+ self,
+ step_id: str,
+ data_schema: probatio.Schema,
+ user_input: dict[str, Any] | None,
+ update_user_input: Callable[[dict[str, Any]], dict[str, Any]],
+ on_success: Callable[[dict[str, Any], dict[str, Any]], ConfigFlowResult],
  ) -> ConfigFlowResult:
- """Handle the initial step."""
+ """Handle the flow for both user and reconfigure steps."""
  errors: dict[str, str] = {}
  if user_input is not None:
  try:
- info = await validate_input(self.hass, user_input)
- except CentriConnectConnectionError, CentriConnectTooManyRequestsError:
+ info = await validate_input(self.hass, update_user_input(user_input))
+ except (
+ CentriConnectConnectionError,
+ CentriConnectTooManyRequestsError,
+ ):
  errors["base"] = "cannot_connect"
  except CentriConnectNotFoundError:
  errors["base"] = "invalid_auth"
  except CentriConnectEmptyResponseError, CentriConnectDecodeError:
  errors["base"] = "unknown"
- except Exception:
+ except Exception: # pylint: disable=broad-except
  _LOGGER.exception("Unexpected exception")
  errors["base"] = "unknown"
  else:
  await self.async_set_unique_id(
  unique_id=info[CENTRICONNECT_DEVICE_ID], raise_on_progress=True
  )
- self._abort_if_unique_id_configured(
- updates=user_input, reload_on_update=True
- )
- return self.async_create_entry(title=info["title"], data=user_input)
+ return on_success(info, user_input)
 
  return self.async_show_form(
- step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+ step_id=step_id, data_schema=data_schema, errors=errors
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle reconfiguration of the integration."""
+ old_entry = self._get_reconfigure_entry()
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ old_entry, data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reconfigure",
+ data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: old_entry.data[CONF_DEVICE_ID],
+ },
+ on_success=_on_success,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Handle configuration by re-auth."""
+ self._device_id = entry_data[CONF_DEVICE_ID]
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Perform reauthentication upon an API authentication error."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_mismatch(reason="wrong_device")
+ return self.async_update_reload_and_abort(
+ self._get_reauth_entry(), data_updates=user_input
+ )
+
+ return await self._handle_flow(
+ step_id="reauth_confirm",
+ data_schema=STEP_REAUTHENTICATE_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: {
+ **user_input,
+ CONF_DEVICE_ID: self._device_id,
+ },
+ on_success=_on_success,
+ )
+
+ @override
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+
+ def _on_success(
+ info: dict[str, Any], user_input: dict[str, Any]
+ ) -> ConfigFlowResult:
+ self._abort_if_unique_id_configured(
+ updates=user_input, reload_on_update=True
+ )
+ return self.async_create_entry(title=info["title"], data=user_input)
+
+ return await self._handle_flow(
+ step_id="user",
+ data_schema=STEP_USER_DATA_SCHEMA,
+ user_input=user_input,
+ update_user_input=lambda user_input: user_input,
+ on_success=_on_success,
  )

homeassistant/components/centriconnect/quality_scale.yaml

@@ -42,7 +42,7 @@ rules:
  integration-owner: done
  log-when-unavailable: done
  parallel-updates: done
- reauthentication-flow: todo
+ reauthentication-flow: done
  test-coverage: done
 
  # Gold
@@ -70,7 +70,7 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
- reconfiguration-flow: todo
+ reconfiguration-flow: done
  repair-issues:
  status: exempt
  comment: No user-actionable repair scenarios identified for this integration.

homeassistant/components/centriconnect/strings.json

@@ -1,14 +1,39 @@
 {
  "config": {
  "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+ "wrong_device": "This CentriConnect/MyPropane device does not match the existing device ID. Please make sure you entered the credentials correctly."
  },
  "error": {
  "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
  "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
  "unknown": "[%key:common::config_flow::error::unknown%]"
  },
  "step": {
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
+ "reconfigure": {
+ "data": {
+ "password": "[%key:component::centriconnect::config::step::user::data::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data::username%]"
+ },
+ "data_description": {
+ "password": "[%key:component::centriconnect::config::step::user::data_description::password%]",
+ "username": "[%key:component::centriconnect::config::step::user::data_description::username%]"
+ },
+ "description": "[%key:component::centriconnect::config::step::user::description%]"
+ },
  "user": {
  "data": {
  "device_id": "Device ID",

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
  "integration_type": "service",
  "iot_class": "cloud_push",
  "requirements": [
- "google-cloud-texttospeech==2.25.1",
- "google-cloud-speech==2.31.1"
+ "google-cloud-texttospeech==2.37.0",
+ "google-cloud-speech==2.40.0"
  ]
 }

homeassistant/components/ipp/config_flow.py

@@ -27,7 +27,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN
+from .const import CONF_BASE_PATH, CONF_SERIAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +45,7 @@ async def validate_input(hass: HomeAssistant, data: dict) -> dict[str, Any]:
  tls=data[CONF_SSL],
  verify_ssl=data[CONF_VERIFY_SSL],
  session=session,
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  printer = await ipp.printer()

homeassistant/components/ipp/const.py

@@ -14,6 +14,9 @@
 ATTR_STATE_REASON = "state_reason"
 ATTR_URI_SUPPORTED = "uri_supported"
 
+# Printers waking from sleep can take well over pyipp's own default
+REQUEST_TIMEOUT = 30
+
 # Config Keys
 CONF_BASE_PATH = "base_path"
 CONF_SERIAL = "serial"

homeassistant/components/ipp/coordinator.py

@@ -12,7 +12,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BASE_PATH, DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN, REQUEST_TIMEOUT
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
@@ -36,6 +36,7 @@ def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
  tls=config_entry.data[CONF_SSL],
  verify_ssl=config_entry.data[CONF_VERIFY_SSL],
  session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
+ request_timeout=REQUEST_TIMEOUT,
  )
 
  super().__init__(

homeassistant/components/lunatone/icons.json

@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "dali_line_status": {
+ "default": "mdi:current-ac"
+ }
+ }
+ }
+}