homeassistant-ai
diff --git a/‎src/ha_mcp/client/websocket_client.py‎
Lines changed: 13 additions & 5 deletions b/‎src/ha_mcp/client/websocket_client.py‎
Lines changed: 13 additions & 5 deletions
diff --git a/‎src/ha_mcp/tools/config_entry_flow.py‎
Lines changed: 17 additions & 2 deletions b/‎src/ha_mcp/tools/config_entry_flow.py‎
Lines changed: 17 additions & 2 deletions
@@ -46,6 +46,13 @@
 # overflowed the previous 20MB cap (#1721).
 MAX_WS_MESSAGE_BYTES = 64 * 1024 * 1024
 
+# How long :meth:`HomeAssistantWebSocketClient.send_command` waits for a reply
+# when the caller names no ``_wait_timeout``. Named rather than inlined because
+# callers that schedule retries have to budget around it: a caller whose retry
+# delay assumes a fast failure will start its next attempt one whole timeout
+# later than it planned when the command hangs instead.
+DEFAULT_COMMAND_WAIT_TIMEOUT = 30.0
+
 
 def _extract_ws_error(error: Any) -> tuple[str, str | None]:
     """Split an HA WebSocket ``error`` payload into ``(message, code)``.
@@ -621,10 +628,11 @@ async def send_command(self, command_type: str, **kwargs: Any) -> dict[str, Any]
         Args:
             command_type: Type of command to send
             _wait_timeout: Seconds to wait for the response (consumed from
-                ``kwargs``, not forwarded to Home Assistant). Defaults to 30s,
-                which suits fast commands; long-running ones (e.g. a
-                ``supervisor/api`` add-on install) must raise this so the
-                client doesn't give up before Home Assistant replies.
+                ``kwargs``, not forwarded to Home Assistant). Defaults to
+                ``DEFAULT_COMMAND_WAIT_TIMEOUT``, which suits fast commands;
+                long-running ones (e.g. a ``supervisor/api`` add-on install)
+                must raise this so the client doesn't give up before Home
+                Assistant replies.
             **kwargs: Command parameters (merged into the outgoing message)
 
         Returns:
@@ -644,7 +652,7 @@ async def send_command(self, command_type: str, **kwargs: Any) -> dict[str, Any]
         # break that call shape under mypy. The leading underscore keeps it out
         # of the HA message namespace — HA WebSocket fields never start with
         # one — so it can never shadow a real command field when popped.
-        wait_timeout: float = kwargs.pop("_wait_timeout", 30.0)
+        wait_timeout: float = kwargs.pop("_wait_timeout", DEFAULT_COMMAND_WAIT_TIMEOUT)
 
         message_id = self.get_next_message_id()
         message = {"id": message_id, "type": command_type, **kwargs}
 
@@ -168,8 +168,10 @@ async def set_config_subentry(
 
     The reconfigure branch fails when the flow leaves any supplied config key
     unconsumed, where it previously returned success plus a warning — see
-    :func:`_handle_config_subentry_flow_steps` for why. The create branch is
-    unchanged.
+    :func:`_handle_config_subentry_flow_steps` for why. It also walks with
+    ``keep_current_values`` (issue #2254), so a partial patch keeps the
+    subentry fields it does not name instead of resetting them. The create
+    branch is unchanged on both counts.
     """
     _reject_redaction_sentinels(config_dict)
     flow_result = await client.start_config_subentry_flow(
@@ -205,6 +207,7 @@ async def set_config_subentry(
             flow_result,
             config_dict,
             is_reconfigure=subentry_id is not None,
+            keep_current_values=subentry_id is not None,
         )
     except asyncio.CancelledError:
         await _abort_subentry_flow_best_effort(client, flow_id)
@@ -289,6 +292,17 @@ async def update_config_entry_options(
     ``ha_set_integration`` path passes ``None`` to accept any domain). Starts
     an options flow, walks the flow steps, and returns the result. Aborts the
     flow on error. ``noun`` only affects response wording.
+
+    This edits an existing entry, so the walk runs with
+    ``keep_current_values``: every field an options step declares that
+    ``config_dict`` does not name is submitted with the value the step itself
+    carries, exactly as the HA UI's "Configure" dialog posts back the boxes
+    nobody touched. Before issue #2254 those keys were dropped and voluptuous
+    substituted each field's static default, so a one-key patch silently reset
+    the rest of the entry's options. A key the caller sets to ``None`` is the
+    opposite request and is honoured as a clear, which for a field carrying a
+    schema default means submitting the ``None`` for Home Assistant to
+    validate rather than omitting it into that default.
     """
     _reject_redaction_sentinels(config_dict)
     config_entry = await client.get_config_entry(entry_id)
@@ -332,6 +346,7 @@ async def update_config_entry_options(
             config_dict,
             submit_fn=client.submit_options_flow_step,
             helper_type=expected_domain,
+            keep_current_values=True,
         )
     except Exception:
         try: