test(tools_integrations): pin diagnostic-hint wording on raise branches

Addresses kp13's second review-pass on PR homeassistant-ai#1424:

- Item 1 (Ruff format on test_tools_integrations.py): already addressed
  upstream in 98f6ed2 — no action in this commit.
- Item 2: adds the missing `"already_deleted" not in json.dumps(err)`
  assertion to test_remove_helpers_integrations_subentry_other_error_
  surfaces_service_call_failed in test_config_subentries_folded.py.
  Symmetric with the string-form sibling test below that already pins
  the no-mislabeling rule.
- "While you're in there": adds diagnostic-hint substring assertions
  to all six confirmed-absent raise-branch tests so the user-facing
  wording (the "May indicate ... typo" framing + the matching
  ha_search_entities() / ha_get_integration() tool suggestion, or the
  TOCTOU-specific "concurrent removal" hint) can't silently degrade
  on future edits.

Test additions per branch:

- test_direct_path_entry_not_found_raises (Path 3): pin "May indicate"
  + "ha_get_integration"
- test_simple_path_state_gone_raises_entity_not_found (Path 1): pin
  "May indicate" + "ha_search_entities"
- test_simple_path_404_on_state_check_raises_entity_not_found (Path 1
  via 404): same pins as state-gone sibling
- test_flow_path_entity_not_in_registry_raises (Path 2 step 1): pin
  "May indicate" + "ha_search_entities"
- test_flow_path_entry_not_found_at_delete_raises (Path 2 TOCTOU):
  pin "concurrent removal" (distinct from the typo-framed hint —
  semantically the entry WAS resolvable at step 1 and only vanished
  before step 3)
- test_remove_helpers_integrations_subentry_not_found_raises (Path 4):
  pin "May indicate" + "ha_get_integration"

76 unit tests pass locally. Ruff format clean.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: Patch76

tests/src/unit/test_config_subentries_folded.py

@@ -529,6 +529,9 @@ async def test_remove_helpers_integrations_subentry_not_found_raises(
     assert error_data["success"] is False
     assert error_data["error"]["code"] == "RESOURCE_NOT_FOUND"
     assert "ghost-subentry" in error_data["error"]["message"]
+    # Pin the diagnostic-hint wording (same rationale as Paths 1/3).
+    assert "May indicate" in error_data["error"]["message"]
+    assert "ha_get_integration" in error_data["error"]["message"]
     assert "already_deleted" not in json.dumps(error_data)
 
 
@@ -559,6 +562,10 @@ async def test_remove_helpers_integrations_subentry_other_error_surfaces_service
     error_data = json.loads(str(exc_info.value))
     assert error_data["error"]["code"] == "SERVICE_CALL_FAILED"
     assert "Insufficient permissions" in error_data["error"]["message"]
+    # Symmetric with the string-form sibling test below: a regression
+    # that re-routes a non-not_found error into the already_deleted
+    # success shape must not pass this test.
+    assert "already_deleted" not in json.dumps(error_data)
 
 
 async def test_remove_helpers_integrations_subentry_string_error_surfaces_service_call_failed(

tests/src/unit/test_tools_integrations.py

@@ -209,6 +209,13 @@ async def test_direct_path_entry_not_found_raises(self, tools, mock_client):
         assert err["success"] is False
         assert err["error"]["code"] == "RESOURCE_NOT_FOUND"
         assert "ghost_entry" in err["error"]["message"]
+        # Pin the diagnostic hint so the caller-facing wording can't
+        # silently degrade — both the "may indicate" framing and the
+        # ha_get_integration tool reference were part of the review-cycle
+        # outcome and removing either would regress UX without
+        # otherwise failing this test.
+        assert "May indicate" in err["error"]["message"]
+        assert "ha_get_integration" in err["error"]["message"]
         assert "already_deleted" not in json.dumps(err)
 
     async def test_direct_path_non_404_apierror_surfaces_structured_error(
@@ -358,6 +365,9 @@ async def test_simple_path_state_gone_raises_entity_not_found(
         assert err["success"] is False
         assert err["error"]["code"] == "ENTITY_NOT_FOUND"
         assert "my_button" in err["error"]["message"]
+        # Pin the diagnostic-hint wording (same rationale as Path 3).
+        assert "May indicate" in err["error"]["message"]
+        assert "ha_search_entities" in err["error"]["message"]
         assert "already_deleted" not in json.dumps(err)
 
     async def test_simple_path_404_on_state_check_raises_entity_not_found(
@@ -395,6 +405,10 @@ async def test_simple_path_404_on_state_check_raises_entity_not_found(
         assert err["success"] is False
         assert err["error"]["code"] == "ENTITY_NOT_FOUND"
         assert "never_existed_button" in err["error"]["message"]
+        # Same diagnostic hint as the state-gone branch — both sub-paths
+        # of Path 1 confirmed-absent route to the same raise.
+        assert "May indicate" in err["error"]["message"]
+        assert "ha_search_entities" in err["error"]["message"]
         assert "already_deleted" not in json.dumps(err)
 
     async def test_simple_path_non_404_apierror_propagates(self, tools, mock_client):
@@ -643,6 +657,9 @@ async def test_flow_path_entity_not_in_registry_raises(self, tools, mock_client)
         assert err["success"] is False
         assert err["error"]["code"] == "ENTITY_NOT_FOUND"
         assert "template.ghost" in err["error"]["message"]
+        # Pin the diagnostic-hint wording (same rationale as Path 1).
+        assert "May indicate" in err["error"]["message"]
+        assert "ha_search_entities" in err["error"]["message"]
         assert "already_deleted" not in json.dumps(err)
 
     async def test_flow_path_lookup_failed_maps_to_websocket_disconnected(
@@ -723,6 +740,11 @@ async def test_flow_path_entry_not_found_at_delete_raises(self, tools, mock_clie
         assert err["success"] is False
         assert err["error"]["code"] == "RESOURCE_NOT_FOUND"
         assert "stale_entry" in err["error"]["message"]
+        # Pin the TOCTOU-specific diagnostic hint ("concurrent removal"
+        # framing) — distinct from the typo-framed hint on other paths
+        # because the entry WAS resolvable at step 1 and only vanished
+        # before step 3 reached HA.
+        assert "concurrent removal" in err["error"]["message"]
         assert "already_deleted" not in json.dumps(err)
 
     async def test_flow_path_require_restart_propagated(self, tools, mock_client):