From 29badf6651591cd6786b841dc8fe4db3904a11e1 Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Thu, 11 Jun 2026 17:38:42 +0200
Subject: [PATCH 01/15] Add basic security check to dependency workflow
 (#171191)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
---
 .github/workflows/check-requirements.md       | 112 +++++++++++++++++-
 script/check_requirements/models.py           |   1 +
 script/check_requirements/render.py           |   1 +
 script/check_requirements/runner.py           |  11 ++
 .../scripts/check_requirements/test_render.py |   4 +
 .../scripts/check_requirements/test_runner.py |   6 +-
 6 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check-requirements.md b/.github/workflows/check-requirements.md
index 1e96cdede0aa1..0bc780ef09a04 100644
--- a/.github/workflows/check-requirements.md
+++ b/.github/workflows/check-requirements.md
@@ -97,7 +97,9 @@ Read the JSON directly for the full schema. Key fields:
   with `status` of `pass`/`warn`/`fail`/`needs_agent` and `details`).
 - `rendered_comment` contains, for each `needs_agent` check, two
   placeholders to replace:
-  - `{{CHECK_CELL:<pkg>:<kind>}}` → exactly one of `✅`, `⚠️`, `❌`.
+  - `{{CHECK_CELL:<pkg>:<kind>}}` → exactly one of `✅`, `☑️`, `⚠️`, `❌`.  The
+    **`security`** check kind uses `☑️` instead of `✅` for the success
+    case — see its section below for why.
   - `{{CHECK_DETAIL:<pkg>:<kind>}}` → `<icon> <one-line explanation>`
     (the bullet's `- **<label>**:` prefix is already rendered; replace
     only the placeholder).
@@ -252,6 +254,112 @@ blocking.
   by this version). Cite the offending `<file>:<line>` as a clickable
   link on the repo host.
 
+### Check kind: `security`
+
+**Baseline** scan of the upstream source for obvious supply-chain red
+flags — a cheap first pass, **not** a security review or malware audit.
+A clean result means "nothing obvious stood out", not "this package is
+safe". The success icon is `☑️` — **never** `✅` — so a passing scan is
+not read as an endorsement.
+
+If `repo_public` resolves to ❌ for the same package, mark `security`'s
+cell and detail as `—` and explain `Skipped because the source
+repository is not publicly accessible.` — the source cannot be fetched.
+
+**Step 1 — Fetch a representative slice**
+
+Locate the source from `package.repo_url`.
+
+- GitHub: resolve the default branch (`GET /repos/{owner}/{repo}`), list
+  the tree (`GET /repos/{owner}/{repo}/git/trees/{branch}?recursive=1`),
+  find the module dir (`{name}/` or `src/{name}/`, normalising `-` ↔ `_`).
+- GitLab: equivalent REST calls. Other hosts: `web-fetch` raw file URLs.
+
+Fetch the **raw contents** of `setup.py` (install-time code runs on every
+consumer), `pyproject.toml` (`[build-system]` / custom backend), the
+package's `__init__.py`, and co — prioritising `entry_points` targets, plus any name suggesting
+bootstrap / loader / self-update (`update*.py`, `loader*.py`,
+`bootstrap*.py`, `_native.py`, `_post_install*.py`, …).
+
+If the tree is too large for the API budget, inspect at least `setup.py`,
+`pyproject.toml`, and `__init__.py`, then return ⚠️ noting the partial scan.
+
+**Step 2 — Patterns to flag**
+
+Reason from principles, not a fixed checklist: for each file ask *would a
+well-behaved library doing what this package's PyPI description claims
+need to do this?* If "no" or "unclear", record a finding. The categories
+describe the **shape** of concerning behavior; the named APIs, filenames,
+and keys are illustrative — treat any equivalent construct (including ones
+that did not exist when this was written) the same way.
+
+For every finding include the file path, line number, a snippet
+(≤ 120 chars), a permalink
+(`https://github.com/{owner}/{repo}/blob/{sha}/{path}#L{line}` or the
+GitLab equivalent), and one sentence on why it is out of scope.
+
+1. **Reaches into Home Assistant internals.** A library should touch HA
+   only through its documented Python API — never the `config_dir`
+   filesystem or internal auth / session state. Flag code that opens,
+   reads, writes, or resolves paths to artifacts it does not own
+   (top-level YAML it did not create, anything under `.storage/`, other
+   integrations' files) or reads tokens / refresh tokens / auth providers
+   (e.g. `secrets.yaml`, `.storage/auth*`, `hass.auth`). The principle is
+   *out-of-scope access*, not a static list of names.
+2. **Network input flows into an execution sink (download-and-execute).**
+   Flag any data-flow from a network response body (any HTTP / WebSocket /
+   raw-socket client, sync or async) to an execution sink: `exec`, `eval`,
+   `compile`, `marshal.loads`, `pickle.loads`, `types.FunctionType`,
+   `importlib.util.spec_from_loader`, `subprocess.*`, `os.system`, shell
+   pipelines (`curl … | sh`), or a file later imported / executed — plus
+   package-manager calls (`pip install` / `download`) with args resolved
+   from network responses at runtime.
+3. **Build / install-time code is non-deterministic or non-local.**
+   `setup.py`, `setup.cfg` `cmdclass`, custom PEP 517 backends, and other
+   build hooks must only compile and copy files shipped in the sdist. Flag
+   build-stage code that opens a socket, shells out, writes outside the
+   build / install tree, or pulls a build backend not on PyPI (Git URL /
+   local path).
+4. **Reads secrets and combines them with an egress path.** The shape is
+   *secret-source → outbound-channel*. Flag code that reads credential
+   material (token-like env vars, credential files under the user's home,
+   OS keychain APIs, browser-profile dirs, HA token stores) **and** in the
+   same path sends it to a destination the package needn't talk to.
+   Reading or sending alone is not enough — the *combination* is the signal.
+5. **Hides what it does.** Flag opaque data flowing into an execution
+   sink: large encoded / compressed / hex strings (`base64`, `codecs`,
+   `zlib`, `lzma`, `bytes.fromhex`, or any equivalent) passed to `exec` /
+   `eval` / `compile` / `__import__`; identifiers assembled at runtime
+   then imported; or any construct whose evident purpose is to make the
+   behavior unreadable.
+6. **Hard-coded network destination off-purpose.** Flag outbound URLs or
+   hosts absent from the package's PyPI `project_urls` with no obvious
+   connection to its function — short-link / paste services, ephemeral
+   tunnels, raw IPs, non-default ports against unknown hosts — and any
+   network call at module top-level / `__init__.py` (runs on import for
+   every consumer).
+
+A clearly out-of-scope behavior that fits none of the above: flag under
+the closest category and explain. The categories guide reasoning, not bound it.
+
+**Verdict**
+
+Aggregate the findings into one of:
+
+- `☑️ Baseline scan found nothing obvious in <list of inspected files>.
+  This is not a security review — only the cheap checks were run.`
+  Use `☑️` (**not** `✅`) so a passing scan is not read as an endorsement.
+- `⚠️ <one-line summary>` — patterns with plausible legitimate uses;
+  include path / line / snippet / permalink per match for the reviewer.
+- `❌ <one-line summary>` — patterns with no legitimate explanation
+  (install-time network execution, decode-and-exec of opaque blobs, reads
+  of `secrets.yaml` / `.storage/auth*`, token exfiltration to an external
+  host); same detail.
+
+Be precise. False positives are expected — when in doubt prefer `⚠️` with
+context over `❌`. This check is informational and never blocks the
+workflow on its own; a human reviewer decides whether to merge.
+
 ## Notes
 
 - Be constructive; reference the inspected file by URL when useful.
@@ -259,4 +367,4 @@ blocking.
   the `<!-- requirements-check -->` marker.
 - If `/tmp/gh-aw/deterministic/results.json` is missing (upstream
   cancelled/failed), emit nothing — the post-step verification is
-  gated and won't complain.
+  gated and won't complain.
\ No newline at end of file
diff --git a/script/check_requirements/models.py b/script/check_requirements/models.py
index 4e76225658c36..4ed800cb9ce3c 100644
--- a/script/check_requirements/models.py
+++ b/script/check_requirements/models.py
@@ -25,6 +25,7 @@ class CheckKind(StrEnum):
     REPO_PUBLIC = "repo_public"
     CI_UPLOAD = "ci_upload"
     RELEASE_PIPELINE = "release_pipeline"
+    SECURITY = "security"
     PR_LINK = "pr_link"
     ASYNC_BLOCKING = "async_blocking"
     YANKED = "yanked"
diff --git a/script/check_requirements/render.py b/script/check_requirements/render.py
index e3c6204f3d99a..abe748b233008 100644
--- a/script/check_requirements/render.py
+++ b/script/check_requirements/render.py
@@ -21,6 +21,7 @@
     (CheckKind.REPO_PUBLIC, "Repo Public"),
     (CheckKind.CI_UPLOAD, "CI Upload"),
     (CheckKind.RELEASE_PIPELINE, "Release Pipeline"),
+    (CheckKind.SECURITY, "Security"),
     (CheckKind.PR_LINK, "PR Link"),
     (CheckKind.ASYNC_BLOCKING, "Async Safe"),
 )
diff --git a/script/check_requirements/runner.py b/script/check_requirements/runner.py
index ecff91df2560d..5d4d4e1c67462 100644
--- a/script/check_requirements/runner.py
+++ b/script/check_requirements/runner.py
@@ -16,6 +16,8 @@
 - `async_blocking`: inspection of the dependency source for blocking I/O
   inside `async def` functions. Always deferred when the source repo is
   available — the deterministic stage cannot read the upstream source.
+- `security`: lightweight scan of the upstream source for supply-chain red
+  flags. Always deferred — the agent fetches the source and inspects it.
 """
 
 from .diff import parse_diff
@@ -137,6 +139,7 @@ def run_checks(
             pkg.checks[CheckKind.REPO_PUBLIC] = fail
             pkg.checks[CheckKind.PR_LINK] = fail
             pkg.checks[CheckKind.ASYNC_BLOCKING] = fail
+            pkg.checks[CheckKind.SECURITY] = fail
         elif pkg.repo_url:
             pkg.checks[CheckKind.REPO_PUBLIC] = CheckResult(
                 CheckStatus.NEEDS_AGENT,
@@ -146,6 +149,10 @@ def run_checks(
                 CheckStatus.NEEDS_AGENT,
                 "Presence of the required link in the PR description must be verified by the agent.",
             )
+            pkg.checks[CheckKind.SECURITY] = CheckResult(
+                CheckStatus.NEEDS_AGENT,
+                "Baseline supply-chain source scan must be performed by the agent.",
+            )
             if pkg.old_version is None:
                 async_reason = (
                     "New dependency: agent must review the entire source tree "
@@ -168,6 +175,10 @@ def run_checks(
             pkg.checks[CheckKind.REPO_PUBLIC] = fail
             pkg.checks[CheckKind.PR_LINK] = fail
             pkg.checks[CheckKind.ASYNC_BLOCKING] = fail
+            pkg.checks[CheckKind.SECURITY] = CheckResult(
+                CheckStatus.FAIL,
+                "No source repository URL on PyPI — source cannot be inspected.",
+            )
     result = CheckRunResult(pr_number=pr_number, packages=packages)
     result.rendered_comment = render_comment(result)
     return result
diff --git a/tests/scripts/check_requirements/test_render.py b/tests/scripts/check_requirements/test_render.py
index fc7ac46f84a8d..7e35be32f47d1 100644
--- a/tests/scripts/check_requirements/test_render.py
+++ b/tests/scripts/check_requirements/test_render.py
@@ -25,6 +25,7 @@ def test_render_all_conclusive_collapses_details() -> None:
             CheckKind.REPO_PUBLIC: _pass("public"),
             CheckKind.CI_UPLOAD: _pass("attestation found"),
             CheckKind.RELEASE_PIPELINE: _pass("OIDC via attestation"),
+            CheckKind.SECURITY: _pass("baseline scan clean"),
             CheckKind.PR_LINK: _pass("link found"),
             CheckKind.ASYNC_BLOCKING: _pass("no blocking calls in async"),
         },
@@ -49,6 +50,7 @@ def test_render_needs_agent_emits_generic_placeholders() -> None:
             CheckKind.REPO_PUBLIC: CheckResult(CheckStatus.NEEDS_AGENT, ""),
             CheckKind.CI_UPLOAD: CheckResult(CheckStatus.WARN, "no attestation"),
             CheckKind.RELEASE_PIPELINE: CheckResult(CheckStatus.NEEDS_AGENT, ""),
+            CheckKind.SECURITY: CheckResult(CheckStatus.NEEDS_AGENT, ""),
             CheckKind.PR_LINK: CheckResult(CheckStatus.NEEDS_AGENT, ""),
             CheckKind.ASYNC_BLOCKING: CheckResult(CheckStatus.NEEDS_AGENT, ""),
         },
@@ -58,6 +60,8 @@ def test_render_needs_agent_emits_generic_placeholders() -> None:
     assert "{{CHECK_DETAIL:pkg:repo_public}}" in rendered
     assert "{{CHECK_CELL:pkg:release_pipeline}}" in rendered
     assert "{{CHECK_DETAIL:pkg:release_pipeline}}" in rendered
+    assert "{{CHECK_CELL:pkg:security}}" in rendered
+    assert "{{CHECK_DETAIL:pkg:security}}" in rendered
     assert "{{CHECK_CELL:pkg:pr_link}}" in rendered
     assert "{{CHECK_CELL:pkg:async_blocking}}" in rendered
     assert "{{CHECK_DETAIL:pkg:async_blocking}}" in rendered
diff --git a/tests/scripts/check_requirements/test_runner.py b/tests/scripts/check_requirements/test_runner.py
index a665df0dba202..fcddfbb898605 100644
--- a/tests/scripts/check_requirements/test_runner.py
+++ b/tests/scripts/check_requirements/test_runner.py
@@ -60,6 +60,7 @@ def test_runner_attestation_recognised(monkeypatch: pytest.MonkeyPatch) -> None:
     assert pkg.checks[CheckKind.REPO_PUBLIC].status == CheckStatus.NEEDS_AGENT
     assert pkg.checks[CheckKind.PR_LINK].status == CheckStatus.NEEDS_AGENT
     assert pkg.checks[CheckKind.ASYNC_BLOCKING].status == CheckStatus.NEEDS_AGENT
+    assert pkg.checks[CheckKind.SECURITY].status == CheckStatus.NEEDS_AGENT
     assert result.needs_agent is True
 
 
@@ -159,10 +160,11 @@ def test_runner_marks_missing_version_as_fail(
     pkg = result.packages[0]
     assert pkg.checks[CheckKind.CI_UPLOAD].status == CheckStatus.FAIL
     assert pkg.checks[CheckKind.RELEASE_PIPELINE].status == CheckStatus.FAIL
-    # No repo URL → repo_public, pr_link and async_blocking short-circuit to FAIL
+    # No repo URL → short-circuit to FAIL
     assert pkg.checks[CheckKind.REPO_PUBLIC].status == CheckStatus.FAIL
     assert pkg.checks[CheckKind.PR_LINK].status == CheckStatus.FAIL
     assert pkg.checks[CheckKind.ASYNC_BLOCKING].status == CheckStatus.FAIL
+    assert pkg.checks[CheckKind.SECURITY].status == CheckStatus.FAIL
     assert result.needs_agent is False
 
 
@@ -198,7 +200,9 @@ def test_runner_pypi_found_but_no_repo_url_fails_repo_checks(
     assert pkg.checks[CheckKind.REPO_PUBLIC].status == CheckStatus.FAIL
     assert pkg.checks[CheckKind.PR_LINK].status == CheckStatus.FAIL
     assert pkg.checks[CheckKind.ASYNC_BLOCKING].status == CheckStatus.FAIL
+    assert pkg.checks[CheckKind.SECURITY].status == CheckStatus.FAIL
     assert "does not advertise" in pkg.checks[CheckKind.REPO_PUBLIC].details
+    assert "cannot be inspected" in pkg.checks[CheckKind.SECURITY].details
 
 
 def test_runner_async_blocking_new_package_full_review(

From 9c86fe2ac5449abd13736e9fc2bf4763bbc3d093 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 11 Jun 2026 18:00:50 +0200
Subject: [PATCH 02/15] Update frontend to 20260527.6 (#173522)

---
 homeassistant/components/frontend/manifest.json             | 2 +-
 homeassistant/package_constraints.txt                       | 2 +-
 pylint/plugins/pylint_home_assistant/generated/mdi_icons.py | 2 +-
 requirements_all.txt                                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 3209faed47f2d..89dfbf6a68d61 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -21,5 +21,5 @@
   "integration_type": "system",
   "preview_features": { "winter_mode": {} },
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260527.5"]
+  "requirements": ["home-assistant-frontend==20260527.6"]
 }
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 9101470689ce1..43e74a9b96e37 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -39,7 +39,7 @@ habluetooth==6.8.3
 hass-nabucasa==2.2.0
 hassil==3.7.0
 home-assistant-bluetooth==2.0.0
-home-assistant-frontend==20260527.5
+home-assistant-frontend==20260527.6
 home-assistant-intents==2026.6.1
 httpx==0.28.1
 ifaddr==0.2.0
diff --git a/pylint/plugins/pylint_home_assistant/generated/mdi_icons.py b/pylint/plugins/pylint_home_assistant/generated/mdi_icons.py
index 7fd5b190c6024..7fc1b5ba9cd79 100644
--- a/pylint/plugins/pylint_home_assistant/generated/mdi_icons.py
+++ b/pylint/plugins/pylint_home_assistant/generated/mdi_icons.py
@@ -5,7 +5,7 @@
 
 from typing import Final
 
-FRONTEND_VERSION: Final[str] = "20260527.5"
+FRONTEND_VERSION: Final[str] = "20260527.6"
 
 MDI_ICONS: Final[set[str]] = {
     "ab-testing",
diff --git a/requirements_all.txt b/requirements_all.txt
index a12f50f7abfea..927126c946e78 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1272,7 +1272,7 @@ hole==0.9.0
 holidays==0.98
 
 # homeassistant.components.frontend
-home-assistant-frontend==20260527.5
+home-assistant-frontend==20260527.6
 
 # homeassistant.components.conversation
 home-assistant-intents==2026.6.1

From df49891f4016f46dd9d65231fa2acebbeba0c9cd Mon Sep 17 00:00:00 2001
From: Erwin Douna <e.douna@gmail.com>
Date: Thu, 11 Jun 2026 18:06:24 +0200
Subject: [PATCH 03/15] MELCloud Home add binary sensor (#173497)

---
 .../components/melcloud_home/__init__.py      |   2 +-
 .../components/melcloud_home/binary_sensor.py | 146 ++++++++++
 .../components/melcloud_home/entity.py        |   1 -
 .../components/melcloud_home/icons.json       |  12 +
 .../components/melcloud_home/strings.json     |  11 +
 .../snapshots/test_binary_sensor.ambr         | 253 ++++++++++++++++++
 .../melcloud_home/test_binary_sensor.py       |  39 +++
 .../components/melcloud_home/test_climate.py  |  13 +-
 8 files changed, 472 insertions(+), 5 deletions(-)
 create mode 100644 homeassistant/components/melcloud_home/binary_sensor.py
 create mode 100644 homeassistant/components/melcloud_home/icons.json
 create mode 100644 tests/components/melcloud_home/snapshots/test_binary_sensor.ambr
 create mode 100644 tests/components/melcloud_home/test_binary_sensor.py

diff --git a/homeassistant/components/melcloud_home/__init__.py b/homeassistant/components/melcloud_home/__init__.py
index 5ea364182d61a..1452689647470 100644
--- a/homeassistant/components/melcloud_home/__init__.py
+++ b/homeassistant/components/melcloud_home/__init__.py
@@ -8,7 +8,7 @@
 
 from .coordinator import MelCloudHomeConfigEntry, MelCloudHomeCoordinator
 
-PLATFORMS: list[Platform] = [Platform.CLIMATE]
+PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.CLIMATE]
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/melcloud_home/binary_sensor.py b/homeassistant/components/melcloud_home/binary_sensor.py
new file mode 100644
index 0000000000000..3673bae13f0ba
--- /dev/null
+++ b/homeassistant/components/melcloud_home/binary_sensor.py
@@ -0,0 +1,146 @@
+"""Binary sensor platform for MELCloud Home."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from aiomelcloudhome import ATAUnit, ATWUnit
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import MelCloudHomeConfigEntry, MelCloudHomeCoordinator
+from .entity import MelCloudHomeATAUnitEntity, MelCloudHomeATWUnitEntity
+
+PARALLEL_UPDATES = 0
+
+
+@dataclass(frozen=True, kw_only=True)
+class ATABinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Class to hold MELCloud Home ATA binary sensor description."""
+
+    state_fn: Callable[[ATAUnit], bool | None]
+
+
+@dataclass(frozen=True, kw_only=True)
+class ATWBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Class to hold MELCloud Home ATW binary sensor description."""
+
+    state_fn: Callable[[ATWUnit], bool | None]
+
+
+ATA_SENSORS: tuple[ATABinarySensorEntityDescription, ...] = (
+    ATABinarySensorEntityDescription(
+        key="error",
+        translation_key="error",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        state_fn=lambda unit: unit.is_in_error,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    ATABinarySensorEntityDescription(
+        key="standby",
+        translation_key="standby",
+        state_fn=lambda unit: unit.in_standby_mode,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+)
+
+ATW_SENSORS: tuple[ATWBinarySensorEntityDescription, ...] = (
+    ATWBinarySensorEntityDescription(
+        key="error",
+        translation_key="error",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        state_fn=lambda unit: unit.is_in_error,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    ATWBinarySensorEntityDescription(
+        key="standby",
+        translation_key="standby",
+        state_fn=lambda unit: unit.in_standby_mode,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    ATWBinarySensorEntityDescription(
+        key="forced_hot_water",
+        translation_key="forced_hot_water",
+        state_fn=lambda unit: unit.forced_hot_water_mode,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: MelCloudHomeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up MELCloud Home binary sensors."""
+    coordinator = entry.runtime_data
+
+    def _async_add_new_ata_units(units: list[ATAUnit]) -> None:
+        async_add_entities(
+            ATABinarySensor(coordinator, entity_description, unit)
+            for entity_description in ATA_SENSORS
+            for unit in units
+        )
+
+    def _async_add_new_atw_units(units: list[ATWUnit]) -> None:
+        async_add_entities(
+            ATWBinarySensor(coordinator, entity_description, unit)
+            for entity_description in ATW_SENSORS
+            for unit in units
+        )
+
+    coordinator.new_ata_callbacks.append(_async_add_new_ata_units)
+    coordinator.new_atw_callbacks.append(_async_add_new_atw_units)
+
+    _async_add_new_ata_units(list(coordinator.ata_units.values()))
+    _async_add_new_atw_units(list(coordinator.atw_units.values()))
+
+
+class ATABinarySensor(MelCloudHomeATAUnitEntity, BinarySensorEntity):
+    """Representation of a MELCloud Home ATA binary sensor."""
+
+    entity_description: ATABinarySensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: MelCloudHomeCoordinator,
+        entity_description: ATABinarySensorEntityDescription,
+        unit: ATAUnit,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator, unit)
+        self.entity_description = entity_description
+        self._attr_unique_id = f"{unit.id}_{entity_description.key}"
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return true if the binary sensor is on."""
+        return self.entity_description.state_fn(self.unit)
+
+
+class ATWBinarySensor(MelCloudHomeATWUnitEntity, BinarySensorEntity):
+    """Representation of a MELCloud Home ATW binary sensor."""
+
+    entity_description: ATWBinarySensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: MelCloudHomeCoordinator,
+        entity_description: ATWBinarySensorEntityDescription,
+        unit: ATWUnit,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator, unit)
+        self.entity_description = entity_description
+        self._attr_unique_id = f"{unit.id}_{entity_description.key}"
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return true if the binary sensor is on."""
+        return self.entity_description.state_fn(self.unit)
diff --git a/homeassistant/components/melcloud_home/entity.py b/homeassistant/components/melcloud_home/entity.py
index e1d52df89b144..1f5801a999596 100644
--- a/homeassistant/components/melcloud_home/entity.py
+++ b/homeassistant/components/melcloud_home/entity.py
@@ -15,7 +15,6 @@ class MelCloudHomeEntity(CoordinatorEntity[MelCloudHomeCoordinator]):
     """Base entity for MELCloud Home."""
 
     _attr_has_entity_name = True
-    _attr_name: str | None = None
 
 
 class MelCloudHomeUnitEntity[_UnitT: (ATAUnit, ATWUnit)](MelCloudHomeEntity):
diff --git a/homeassistant/components/melcloud_home/icons.json b/homeassistant/components/melcloud_home/icons.json
new file mode 100644
index 0000000000000..49f1b2bb7f92b
--- /dev/null
+++ b/homeassistant/components/melcloud_home/icons.json
@@ -0,0 +1,12 @@
+{
+  "entity": {
+    "binary_sensor": {
+      "forced_hot_water": {
+        "default": "mdi:water-boiler"
+      },
+      "standby": {
+        "default": "mdi:power-sleep"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/melcloud_home/strings.json b/homeassistant/components/melcloud_home/strings.json
index 033fd24bd4da5..63d31e86ac233 100644
--- a/homeassistant/components/melcloud_home/strings.json
+++ b/homeassistant/components/melcloud_home/strings.json
@@ -24,6 +24,17 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "error": {
+        "name": "Error"
+      },
+      "forced_hot_water": {
+        "name": "Forced hot water"
+      },
+      "standby": {
+        "name": "Standby"
+      }
+    },
     "climate": {
       "ata_unit": {
         "state_attributes": {
diff --git a/tests/components/melcloud_home/snapshots/test_binary_sensor.ambr b/tests/components/melcloud_home/snapshots/test_binary_sensor.ambr
new file mode 100644
index 0000000000000..fc2abc14245a1
--- /dev/null
+++ b/tests/components/melcloud_home/snapshots/test_binary_sensor.ambr
@@ -0,0 +1,253 @@
+# serializer version: 1
+# name: test_all_entities[binary_sensor.heat_pump_error-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': list([
+      None,
+    ]),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.heat_pump_error',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'object_id_base': 'Error',
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Error',
+    'platform': 'melcloud_home',
+    'previous_unique_id': None,
+    'suggested_object_id': None,
+    'supported_features': 0,
+    'translation_key': 'error',
+    'unique_id': 'atw-unit-uuid-1_error',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[binary_sensor.heat_pump_error-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Heat Pump Error',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.heat_pump_error',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[binary_sensor.heat_pump_forced_hot_water-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': list([
+      None,
+    ]),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.heat_pump_forced_hot_water',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'object_id_base': 'Forced hot water',
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Forced hot water',
+    'platform': 'melcloud_home',
+    'previous_unique_id': None,
+    'suggested_object_id': None,
+    'supported_features': 0,
+    'translation_key': 'forced_hot_water',
+    'unique_id': 'atw-unit-uuid-1_forced_hot_water',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[binary_sensor.heat_pump_forced_hot_water-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Heat Pump Forced hot water',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.heat_pump_forced_hot_water',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[binary_sensor.heat_pump_standby-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': list([
+      None,
+    ]),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.heat_pump_standby',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'object_id_base': 'Standby',
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Standby',
+    'platform': 'melcloud_home',
+    'previous_unique_id': None,
+    'suggested_object_id': None,
+    'supported_features': 0,
+    'translation_key': 'standby',
+    'unique_id': 'atw-unit-uuid-1_standby',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[binary_sensor.heat_pump_standby-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Heat Pump Standby',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.heat_pump_standby',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[binary_sensor.living_room_ac_error-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': list([
+      None,
+    ]),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.living_room_ac_error',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'object_id_base': 'Error',
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Error',
+    'platform': 'melcloud_home',
+    'previous_unique_id': None,
+    'suggested_object_id': None,
+    'supported_features': 0,
+    'translation_key': 'error',
+    'unique_id': 'ata-unit-uuid-1_error',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[binary_sensor.living_room_ac_error-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Living Room AC Error',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.living_room_ac_error',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[binary_sensor.living_room_ac_standby-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': list([
+      None,
+    ]),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.living_room_ac_standby',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'object_id_base': 'Standby',
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Standby',
+    'platform': 'melcloud_home',
+    'previous_unique_id': None,
+    'suggested_object_id': None,
+    'supported_features': 0,
+    'translation_key': 'standby',
+    'unique_id': 'ata-unit-uuid-1_standby',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[binary_sensor.living_room_ac_standby-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Living Room AC Standby',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.living_room_ac_standby',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/melcloud_home/test_binary_sensor.py b/tests/components/melcloud_home/test_binary_sensor.py
new file mode 100644
index 0000000000000..07352be2b1470
--- /dev/null
+++ b/tests/components/melcloud_home/test_binary_sensor.py
@@ -0,0 +1,39 @@
+"""Tests for the MELCloud Home binary sensor platform."""
+
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+ATA_ERROR_ENTITY_ID = "binary_sensor.living_room_ac_error"
+
+
+@pytest.fixture(autouse=True)
+def enable_all_entities(entity_registry_enabled_by_default: None) -> None:
+    """Make sure all entities are enabled."""
+
+
+@pytest.mark.usefixtures("mock_melcloud_client")
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    with patch(
+        "homeassistant.components.melcloud_home.PLATFORMS",
+        [Platform.BINARY_SENSOR],
+    ):
+        await setup_integration(hass, mock_config_entry)
+        await snapshot_platform(
+            hass, entity_registry, snapshot, mock_config_entry.entry_id
+        )
diff --git a/tests/components/melcloud_home/test_climate.py b/tests/components/melcloud_home/test_climate.py
index eff5e35aa9b4c..4d0f3791166b3 100644
--- a/tests/components/melcloud_home/test_climate.py
+++ b/tests/components/melcloud_home/test_climate.py
@@ -1,6 +1,6 @@
 """Test the MELCloud Home climate platform."""
 
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, patch
 
 from aiomelcloudhome import (
     ATAFanSpeed,
@@ -29,6 +29,7 @@
     ATTR_TEMPERATURE,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -50,8 +51,14 @@ async def test_climate_platform(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test all climate entity states and attributes from fixture data."""
-    await setup_integration(hass, mock_config_entry)
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+    with patch(
+        "homeassistant.components.melcloud_home.PLATFORMS",
+        [Platform.CLIMATE],
+    ):
+        await setup_integration(hass, mock_config_entry)
+        await snapshot_platform(
+            hass, entity_registry, snapshot, mock_config_entry.entry_id
+        )
 
 
 @pytest.mark.parametrize(

From d9aa99e3385933005c0217e68d5b380198b129e8 Mon Sep 17 00:00:00 2001
From: Ernst Klamer <e.klamer@gmail.com>
Date: Thu, 11 Jun 2026 19:55:37 +0200
Subject: [PATCH 04/15] Bump bthome-ble to 3.23.4 (#173526)

---
 homeassistant/components/bthome/manifest.json | 2 +-
 requirements_all.txt                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/bthome/manifest.json b/homeassistant/components/bthome/manifest.json
index 4c28a7e6ae558..666e6ab9ba9e0 100644
--- a/homeassistant/components/bthome/manifest.json
+++ b/homeassistant/components/bthome/manifest.json
@@ -20,5 +20,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/bthome",
   "iot_class": "local_push",
-  "requirements": ["bthome-ble==3.23.2"]
+  "requirements": ["bthome-ble==3.23.4"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 927126c946e78..5b254cfcdc9c7 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -724,7 +724,7 @@ brottsplatskartan==1.0.5
 brunt==1.2.0
 
 # homeassistant.components.bthome
-bthome-ble==3.23.2
+bthome-ble==3.23.4
 
 # homeassistant.components.bt_home_hub_5
 bthomehub5-devicelist==0.1.1

From cefbb109d27db5f1a0b585f6447f4abb0995c57c Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Thu, 11 Jun 2026 21:03:28 +0200
Subject: [PATCH 05/15] Add missing file cleanup to homekit tests (#173513)

---
 tests/components/homekit/test_init.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/components/homekit/test_init.py b/tests/components/homekit/test_init.py
index bf715f05b5e13..1dc4ce16c053b 100644
--- a/tests/components/homekit/test_init.py
+++ b/tests/components/homekit/test_init.py
@@ -74,6 +74,7 @@ async def test_humanify_homekit_changed_event(hass: HomeAssistant, hk_driver) ->
 async def test_bridge_with_triggers(
     hass: HomeAssistant,
     hk_driver,
+    demo_cleanup,
     entity_registry: er.EntityRegistry,
     caplog: pytest.LogCaptureFixture,
 ) -> None:

From 770488f0d495e26b05f43eda38b8947ba779f8d7 Mon Sep 17 00:00:00 2001
From: Erwin Douna <e.douna@gmail.com>
Date: Thu, 11 Jun 2026 21:13:57 +0200
Subject: [PATCH 06/15] MELCloud Home fixing typo (#173530)

---
 homeassistant/components/melcloud_home/strings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/melcloud_home/strings.json b/homeassistant/components/melcloud_home/strings.json
index 63d31e86ac233..69a9e039383f2 100644
--- a/homeassistant/components/melcloud_home/strings.json
+++ b/homeassistant/components/melcloud_home/strings.json
@@ -19,7 +19,7 @@
           "email": "Email address for your MELCloud Home account.",
           "password": "Password for your MELCloud Home account."
         },
-        "description": "Login to MELCloud Home with the email address and password associated with your account."
+        "description": "Log in to MELCloud Home with the email address and password associated with your account."
       }
     }
   },

From 437d33d791021a8f513e68c13acfccacede05db3 Mon Sep 17 00:00:00 2001
From: Mark Purcell <79175134+purcell-lab@users.noreply.github.com>
Date: Fri, 12 Jun 2026 05:46:10 +1000
Subject: [PATCH 07/15] Add diagnostics platform to Daikin integration
 (#173481)

---
 .../components/daikin/diagnostics.py          | 34 +++++++++++++++++++
 .../daikin/snapshots/test_diagnostics.ambr    | 28 +++++++++++++++
 tests/components/daikin/test_diagnostics.py   | 32 +++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 homeassistant/components/daikin/diagnostics.py
 create mode 100644 tests/components/daikin/snapshots/test_diagnostics.ambr
 create mode 100644 tests/components/daikin/test_diagnostics.py

diff --git a/homeassistant/components/daikin/diagnostics.py b/homeassistant/components/daikin/diagnostics.py
new file mode 100644
index 0000000000000..5267172dffd93
--- /dev/null
+++ b/homeassistant/components/daikin/diagnostics.py
@@ -0,0 +1,34 @@
+"""Diagnostics support for Daikin."""
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PASSWORD, CONF_UUID
+from homeassistant.core import HomeAssistant
+
+from .const import KEY_MAC
+from .coordinator import DaikinConfigEntry
+
+TO_REDACT_ENTRY = {CONF_API_KEY, CONF_HOST, CONF_PASSWORD, CONF_UUID, KEY_MAC}
+TO_REDACT_DEVICE = {"mac"}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: DaikinConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    device = entry.runtime_data.device
+    return {
+        "entry_data": async_redact_data(dict(entry.data), TO_REDACT_ENTRY),
+        "device": {
+            "values": async_redact_data(dict(device.values), TO_REDACT_DEVICE),
+            "support_away_mode": device.support_away_mode,
+            "support_advanced_modes": device.support_advanced_modes,
+            "support_fan_rate": device.support_fan_rate,
+            "support_swing_mode": device.support_swing_mode,
+            "support_outside_temperature": device.support_outside_temperature,
+            "support_humidity": device.support_humidity,
+            "support_energy_consumption": device.support_energy_consumption,
+            "support_compressor_frequency": device.support_compressor_frequency,
+        },
+    }
diff --git a/tests/components/daikin/snapshots/test_diagnostics.ambr b/tests/components/daikin/snapshots/test_diagnostics.ambr
new file mode 100644
index 0000000000000..c2232b3ea1946
--- /dev/null
+++ b/tests/components/daikin/snapshots/test_diagnostics.ambr
@@ -0,0 +1,28 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'device': dict({
+      'support_advanced_modes': False,
+      'support_away_mode': False,
+      'support_compressor_frequency': False,
+      'support_energy_consumption': False,
+      'support_fan_rate': False,
+      'support_humidity': False,
+      'support_outside_temperature': False,
+      'support_swing_mode': False,
+      'values': dict({
+        'lztemp_c': '22',
+        'lztemp_h': '22',
+        'model': 'TESTMODEL',
+        'name': 'Daikin Test',
+        'ver': '1_0_0',
+        'zone_name': 'Living',
+        'zone_onoff': '1',
+      }),
+    }),
+    'entry_data': dict({
+      'host': '**REDACTED**',
+      'mac': '**REDACTED**',
+    }),
+  })
+# ---
diff --git a/tests/components/daikin/test_diagnostics.py b/tests/components/daikin/test_diagnostics.py
new file mode 100644
index 0000000000000..17a464beace94
--- /dev/null
+++ b/tests/components/daikin/test_diagnostics.py
@@ -0,0 +1,32 @@
+"""Tests for the diagnostics data provided by the Daikin integration."""
+
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.daikin.const import KEY_MAC
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+
+from .test_config_flow import HOST, MAC
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+async def test_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    zone_device,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test diagnostics."""
+    entry = MockConfigEntry(
+        domain="daikin",
+        unique_id=MAC,
+        data={CONF_HOST: HOST, KEY_MAC: MAC},
+    )
+    entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert await get_diagnostics_for_config_entry(hass, hass_client, entry) == snapshot

From aa1940095e6492f0a9dd84d70c1980454aea7114 Mon Sep 17 00:00:00 2001
From: Tom Cassady <heytcass@gmail.com>
Date: Thu, 11 Jun 2026 16:01:28 -0400
Subject: [PATCH 08/15] Fix UniFi Protect ufp_set debug log printing
 UndefinedType for translation-key entities (#173460)

---
 homeassistant/components/unifiprotect/entity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/unifiprotect/entity.py b/homeassistant/components/unifiprotect/entity.py
index d8f6251b6cb25..2520d9049cb3a 100644
--- a/homeassistant/components/unifiprotect/entity.py
+++ b/homeassistant/components/unifiprotect/entity.py
@@ -440,7 +440,7 @@ class ProtectSettableKeysMixin(ProtectEntityDescription[T]):
 
     async def ufp_set(self, obj: T, value: Any) -> None:
         """Set value for UniFi Protect device."""
-        _LOGGER.debug("Setting %s to %s for %s", self.name, value, obj.display_name)
+        _LOGGER.debug("Setting %s to %s for %s", self.key, value, obj.display_name)
         if self.ufp_set_method is not None:
             await getattr(obj, self.ufp_set_method)(value)
         elif self.ufp_set_method_fn is not None:

From 4cf5509bc17a5166f5ff1cc917bd45c32fb0087f Mon Sep 17 00:00:00 2001
From: Ronald van der Meer <ronald@vandermeer.frl>
Date: Thu, 11 Jun 2026 22:28:08 +0200
Subject: [PATCH 09/15] Fix Duco system health for multiple loaded entries
 (#173324)

---
 .../components/duco/system_health.py          | 34 +++++++++++++++++--
 tests/components/duco/test_system_health.py   | 28 +++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/duco/system_health.py b/homeassistant/components/duco/system_health.py
index 72c43c9980a25..882b04d726d66 100644
--- a/homeassistant/components/duco/system_health.py
+++ b/homeassistant/components/duco/system_health.py
@@ -31,6 +31,29 @@ async def _async_get_write_requests_remaining(
         return {"type": "failed", "error": "unreachable"}
 
 
+def _entry_write_requests_remaining_key(config_entry: DucoConfigEntry) -> str:
+    """Return the identifying label for a config entry quota."""
+    identifier = config_entry.unique_id or config_entry.entry_id
+    return f"{config_entry.title or config_entry.entry_id} ({identifier})"
+
+
+async def _async_get_write_requests_remaining_summary(
+    config_entries: list[DucoConfigEntry],
+) -> str:
+    """Get a per-entry write-request summary for system health."""
+    # Keep one translated system health label; multiple Duco boxes are
+    # summarized in the value to avoid ambiguous per-entry labels.
+    summaries: list[str] = []
+    for config_entry in config_entries:
+        result = await _async_get_write_requests_remaining(config_entry)
+        summaries.append(
+            f"{_entry_write_requests_remaining_key(config_entry)}: "
+            f"{result if not isinstance(result, dict) else f'Failed: {result["error"]}'}"
+        )
+
+    return "; ".join(summaries)
+
+
 async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
     """Get info for the info page."""
     config_entries: list[DucoConfigEntry] = hass.config_entries.async_loaded_entries(
@@ -40,8 +63,15 @@ async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
     if not config_entries:
         return {}
 
+    if len(config_entries) == 1:
+        return {
+            "write_requests_remaining": _async_get_write_requests_remaining(
+                config_entries[0]
+            )
+        }
+
     return {
-        "write_requests_remaining": _async_get_write_requests_remaining(
-            config_entries[0]
+        "write_requests_remaining": _async_get_write_requests_remaining_summary(
+            config_entries
         )
     }
diff --git a/tests/components/duco/test_system_health.py b/tests/components/duco/test_system_health.py
index c351f7688c4bb..96ea6a12547fa 100644
--- a/tests/components/duco/test_system_health.py
+++ b/tests/components/duco/test_system_health.py
@@ -5,9 +5,12 @@
 from duco_connectivity.exceptions import DucoConnectionError
 
 from homeassistant.components.duco.const import DOMAIN
+from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from . import setup_integration
+
 from tests.common import MockConfigEntry, get_system_health_info
 
 
@@ -53,3 +56,28 @@ async def test_system_health_no_loaded_entries(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
     assert await get_system_health_info(hass, DOMAIN) == {}
+
+
+async def test_system_health_multiple_loaded_entries(
+    hass: HomeAssistant,
+    init_integration: MockConfigEntry,
+    mock_duco_client: AsyncMock,
+) -> None:
+    """Test system health aggregates quotas for multiple loaded Duco boxes."""
+    second_entry = MockConfigEntry(
+        title="SECOND_BOX",
+        domain=DOMAIN,
+        data={CONF_HOST: "192.168.1.101"},
+        unique_id="aa:bb:cc:dd:ee:00",
+    )
+    await setup_integration(hass, second_entry)
+    mock_duco_client.async_get_write_requests_remaining.side_effect = [100, 75]
+
+    assert await async_setup_component(hass, "system_health", {})
+    await hass.async_block_till_done()
+
+    info = await get_system_health_info(hass, DOMAIN)
+
+    assert await info["write_requests_remaining"] == (
+        "SILENT_CONNECT (aa:bb:cc:dd:ee:ff): 100; SECOND_BOX (aa:bb:cc:dd:ee:00): 75"
+    )

From edbb27a9125c930690cadb89264fa7c45594e452 Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Thu, 11 Jun 2026 22:28:29 +0200
Subject: [PATCH 10/15] Bump gh aw to 0.79.6 (#173553)

---
 .gitattributes                                |   2 +-
 .github/dependabot.yml                        |   1 +
 .github/workflows/check-requirements.lock.yml | 313 +++++++++++++-----
 3 files changed, 237 insertions(+), 79 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index d1fbf3ca074f3..56947f53f2ffe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,4 +22,4 @@ requirements.txt linguist-generated=true
 requirements_all.txt linguist-generated=true
 requirements_test_pre_commit.txt linguist-generated=true
 script/hassfest/docker/Dockerfile linguist-generated=true
-.github/workflows/*.lock.yml linguist-generated=true
+.github/workflows/*.lock.yml linguist-generated=true merge=ours
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5a2b21d2dee81..1a4e0cbfe1f82 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,3 +14,4 @@ updates:
     ignore:
       # Managed by gh aw compile. Version-locked to the gh-aw compiler; do not bump.
       - dependency-name: "github/gh-aw-actions/**"
+      - dependency-name: "github/gh-aw-actions"
diff --git a/.github/workflows/check-requirements.lock.yml b/.github/workflows/check-requirements.lock.yml
index b932dc189912f..2d0a718ddf3d7 100644
--- a/.github/workflows/check-requirements.lock.yml
+++ b/.github/workflows/check-requirements.lock.yml
@@ -1,5 +1,5 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"e4fcdd04986da27ef3059faa0cea3d64bb879fe12085ebfdec0041bbc31ec181","compiler_version":"v0.74.4","strict":true,"agent_id":"copilot"}
-# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"d3abfe96a194bce3a523ed2093ddedd5704cdf62","version":"v0.74.4"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.46"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.46"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.46"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.9","digest":"sha256:64828b42a4482f58fab16509d7f8f495a6d97c972a98a68aff20543531ac0388","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.9@sha256:64828b42a4482f58fab16509d7f8f495a6d97c972a98a68aff20543531ac0388"},{"image":"ghcr.io/github/github-mcp-server:v1.0.4"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"e4fcdd04986da27ef3059faa0cea3d64bb879fe12085ebfdec0041bbc31ec181","body_hash":"3894ded07d5934ac5f29d160ffb1f9115cf72b6da8a7e453a4d4f69e8641a48e","compiler_version":"v0.79.6","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.60"}}
+# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"df4cb1c069e1874edd31b4311f1884172cec0e10","version":"v6.0.3"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"v0.79.6","version":"v0.79.6"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.2","digest":"sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.2@sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2","digest":"sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2@sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.2","digest":"sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.2@sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.25","digest":"sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.25@sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa"},{"image":"ghcr.io/github/github-mcp-server:v1.1.2","digest":"sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c","pinned_image":"ghcr.io/github/github-mcp-server:v1.1.2@sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
 #  | |_| | __ _  ___ _ __ | |_ _  ___ 
@@ -14,7 +14,7 @@
 # \  /\  / (_) | | | | ( | | | | (_) \ V  V /\__ \
 #  \/  \/ \___/|_| |_|\_\|_| |_|\___/ \_/\_/ |___/
 #
-# This file was automatically generated by gh-aw (v0.74.4). DO NOT EDIT.
+# This file was automatically generated by gh-aw (v0.79.6). DO NOT EDIT.
 #
 # To update this file, edit the corresponding .md file and run:
 #   gh aw compile
@@ -36,15 +36,14 @@
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
 #   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@73ed520ae4ecd087a485e1991605595978b32ac1 # v0.78.1
+#   - github/gh-aw-actions/setup@v0.79.6
 #
 # Container images used:
-#   - ghcr.io/github/gh-aw-firewall/agent:0.25.46
-#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.25.46
-#   - ghcr.io/github/gh-aw-firewall/squid:0.25.46
-#   - ghcr.io/github/gh-aw-mcpg:v0.3.9@sha256:64828b42a4482f58fab16509d7f8f495a6d97c972a98a68aff20543531ac0388
-#   - ghcr.io/github/github-mcp-server:v1.0.4
-#   - node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f
+#   - ghcr.io/github/gh-aw-firewall/agent:0.27.2@sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6
+#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2@sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4
+#   - ghcr.io/github/gh-aw-firewall/squid:0.27.2@sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591
+#   - ghcr.io/github/gh-aw-mcpg:v0.3.25@sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa
+#   - ghcr.io/github/github-mcp-server:v1.1.2@sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c
 
 name: "Check requirements (AW)"
 on:
@@ -74,9 +73,14 @@ jobs:
     permissions:
       actions: read
       contents: read
+    env:
+      GH_AW_MAX_DAILY_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_DAILY_AI_CREDITS || '5000' }}
     outputs:
       comment_id: ""
       comment_repo: ""
+      daily_effective_workflow_exceeded: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_effective_workflow_exceeded == 'true' }}
+      daily_effective_workflow_threshold: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_effective_workflow_threshold || '' }}
+      daily_effective_workflow_total_effective_tokens: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_effective_workflow_total_effective_tokens || '' }}
       engine_id: ${{ steps.generate_aw_info.outputs.engine_id }}
       lockdown_check_failed: ${{ steps.generate_aw_info.outputs.lockdown_check_failed == 'true' }}
       model: ${{ steps.generate_aw_info.outputs.model }}
@@ -88,33 +92,35 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@73ed520ae4ecd087a485e1991605595978b32ac1 # v0.78.1
+        uses: github/gh-aw-actions/setup@v0.79.6
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.pre_activation.outputs.setup-trace-id }}
           parent-span-id: ${{ needs.pre_activation.outputs.setup-parent-span-id || needs.pre_activation.outputs.setup-span-id }}
+          safe-output-artifact-client: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "Check requirements (AW)"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/check-requirements.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.48"
+          GH_AW_INFO_VERSION: "1.0.60"
+          GH_AW_INFO_AWF_VERSION: "v0.27.2"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Generate agentic run info
         id: generate_aw_info
         env:
           GH_AW_INFO_ENGINE_ID: "copilot"
           GH_AW_INFO_ENGINE_NAME: "GitHub Copilot CLI"
-          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
-          GH_AW_INFO_VERSION: "1.0.48"
-          GH_AW_INFO_AGENT_VERSION: "1.0.48"
-          GH_AW_INFO_CLI_VERSION: "v0.74.4"
+          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_INFO_VERSION: "1.0.60"
+          GH_AW_INFO_AGENT_VERSION: "1.0.60"
+          GH_AW_INFO_CLI_VERSION: "v0.79.6"
           GH_AW_INFO_WORKFLOW_NAME: "Check requirements (AW)"
           GH_AW_INFO_EXPERIMENTAL: "false"
           GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
           GH_AW_INFO_STAGED: "false"
           GH_AW_INFO_ALLOWED_DOMAINS: '["python"]'
           GH_AW_INFO_FIREWALL_ENABLED: "true"
-          GH_AW_INFO_AWF_VERSION: "v0.25.46"
+          GH_AW_INFO_AWF_VERSION: "v0.27.2"
           GH_AW_INFO_AWMG_VERSION: ""
           GH_AW_INFO_FIREWALL_TYPE: "squid"
           GH_AW_COMPILED_STRICT: "true"
@@ -125,6 +131,24 @@ jobs:
             setupGlobals(core, github, context, exec, io, getOctokit);
             const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_aw_info.cjs');
             await main(core, context);
+      - name: Check daily workflow token guardrail
+        id: daily-effective-workflow-guardrail
+        if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_WORKFLOW_NAME: "Check requirements (AW)"
+          GH_AW_WORKFLOW_ID: "check-requirements"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_WORKFLOW_DISPATCH_AW_CONTEXT: ${{ github.event.inputs.aw_context || '' }}
+          GH_AW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_AW_MAX_DAILY_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_DAILY_AI_CREDITS || '5000' }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_daily_aic_workflow_guardrail.cjs');
+            await main();
       - name: Validate COPILOT_GITHUB_TOKEN secret
         id: validate-secret
         run: bash "${RUNNER_TEMP}/gh-aw/actions/validate_multi_secret.sh" COPILOT_GITHUB_TOKEN 'GitHub Copilot CLI' https://github.github.com/gh-aw/reference/engines/#github-copilot-default
@@ -137,6 +161,7 @@ jobs:
           sparse-checkout: |
             .github
             .agents
+            .antigravity
             .claude
             .codex
             .crush
@@ -147,8 +172,8 @@ jobs:
           fetch-depth: 1
       - name: Save agent config folders for base branch restoration
         env:
-          GH_AW_AGENT_FOLDERS: ".agents .claude .codex .crush .gemini .github .opencode .pi"
-          GH_AW_AGENT_FILES: ".crush.json AGENTS.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+          GH_AW_AGENT_FOLDERS: ".agents .antigravity .claude .codex .crush .gemini .github .opencode .pi"
+          GH_AW_AGENT_FILES: ".crush.json AGENTS.md ANTIGRAVITY.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
         # poutine:ignore untrusted_checkout_exec
         run: bash "${RUNNER_TEMP}/gh-aw/actions/save_base_github_folders.sh"
       - name: Check workflow lock file
@@ -166,7 +191,7 @@ jobs:
       - name: Check compile-agentic version
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_COMPILED_VERSION: "v0.74.4"
+          GH_AW_COMPILED_VERSION: "v0.79.6"
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -189,20 +214,20 @@ jobs:
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_2fc32253e89940f3_EOF'
+          cat << 'GH_AW_PROMPT_781cf5b2f30d6d93_EOF'
           <system>
-          GH_AW_PROMPT_2fc32253e89940f3_EOF
+          GH_AW_PROMPT_781cf5b2f30d6d93_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_2fc32253e89940f3_EOF'
+          cat << 'GH_AW_PROMPT_781cf5b2f30d6d93_EOF'
           <safe-output-tools>
           Tools: add_comment, missing_tool, missing_data, noop
           </safe-output-tools>
-          GH_AW_PROMPT_2fc32253e89940f3_EOF
+          GH_AW_PROMPT_781cf5b2f30d6d93_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_2fc32253e89940f3_EOF'
+          cat << 'GH_AW_PROMPT_781cf5b2f30d6d93_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if github.actor}}
@@ -231,12 +256,12 @@ jobs:
           {{/if}}
           </github-context>
           
-          GH_AW_PROMPT_2fc32253e89940f3_EOF
+          GH_AW_PROMPT_781cf5b2f30d6d93_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_2fc32253e89940f3_EOF'
+          cat << 'GH_AW_PROMPT_781cf5b2f30d6d93_EOF'
           </system>
           {{#runtime-import .github/workflows/check-requirements.md}}
-          GH_AW_PROMPT_2fc32253e89940f3_EOF
+          GH_AW_PROMPT_781cf5b2f30d6d93_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -304,12 +329,15 @@ jobs:
           include-hidden-files: true
           path: |
             /tmp/gh-aw/aw_info.json
+            /tmp/gh-aw/model_multipliers.json
+            /tmp/gh-aw/models.json
             /tmp/gh-aw/aw-prompts/prompt.txt
             /tmp/gh-aw/aw-prompts/prompt-template.txt
             /tmp/gh-aw/aw-prompts/prompt-import-tree.json
             /tmp/gh-aw/github_rate_limits.jsonl
             /tmp/gh-aw/base
             /tmp/gh-aw/.github/agents
+            /tmp/gh-aw/.github/skills
           if-no-files-found: ignore
           retention-days: 1
 
@@ -317,6 +345,7 @@ jobs:
     needs:
       - activation
       - extract_pr_number
+    if: needs.activation.outputs.daily_effective_workflow_exceeded != 'true'
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -324,6 +353,7 @@ jobs:
       pull-requests: read
     concurrency:
       group: "gh-aw-copilot-${{ github.workflow }}"
+      queue: max
     env:
       DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
       GH_AW_ASSETS_ALLOWED_EXTS: ""
@@ -332,24 +362,27 @@ jobs:
       GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
       GH_AW_WORKFLOW_ID_SANITIZED: checkrequirements
     outputs:
-      agentic_engine_timeout: ${{ steps.detect-copilot-errors.outputs.agentic_engine_timeout || 'false' }}
+      agentic_engine_timeout: ${{ steps.detect-agent-errors.outputs.agentic_engine_timeout || 'false' }}
+      ai_credits_rate_limit_error: ${{ steps.parse-mcp-gateway.outputs.ai_credits_rate_limit_error || 'false' }}
+      aic: ${{ steps.parse-mcp-gateway.outputs.aic }}
+      ambient_context: ${{ steps.parse-mcp-gateway.outputs.ambient_context }}
       checkout_pr_success: ${{ steps.checkout-pr.outputs.checkout_pr_success || 'true' }}
       effective_tokens: ${{ steps.parse-mcp-gateway.outputs.effective_tokens }}
-      effective_tokens_rate_limit_error: ${{ steps.parse-mcp-gateway.outputs.effective_tokens_rate_limit_error || 'false' }}
       has_patch: ${{ steps.collect_output.outputs.has_patch }}
-      inference_access_error: ${{ steps.detect-copilot-errors.outputs.inference_access_error || 'false' }}
-      mcp_policy_error: ${{ steps.detect-copilot-errors.outputs.mcp_policy_error || 'false' }}
+      inference_access_error: ${{ steps.detect-agent-errors.outputs.inference_access_error || 'false' }}
+      mcp_policy_error: ${{ steps.detect-agent-errors.outputs.mcp_policy_error || 'false' }}
       model: ${{ needs.activation.outputs.model }}
-      model_not_supported_error: ${{ steps.detect-copilot-errors.outputs.model_not_supported_error || 'false' }}
+      model_not_supported_error: ${{ steps.detect-agent-errors.outputs.model_not_supported_error || 'false' }}
       output: ${{ steps.collect_output.outputs.output }}
       output_types: ${{ steps.collect_output.outputs.output_types }}
       setup-parent-span-id: ${{ steps.setup.outputs.parent-span-id || steps.setup.outputs.span-id }}
       setup-span-id: ${{ steps.setup.outputs.span-id }}
       setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+      unknown_model_ai_credits: ${{ steps.parse-mcp-gateway.outputs.unknown_model_ai_credits || 'false' }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@73ed520ae4ecd087a485e1991605595978b32ac1 # v0.78.1
+        uses: github/gh-aw-actions/setup@v0.79.6
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -358,7 +391,8 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "Check requirements (AW)"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/check-requirements.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.48"
+          GH_AW_INFO_VERSION: "1.0.60"
+          GH_AW_INFO_AWF_VERSION: "v0.27.2"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Set runtime paths
         id: set-runtime-paths
@@ -403,7 +437,7 @@ jobs:
       - name: Checkout PR branch
         id: checkout-pr
         if: |
-          github.event.pull_request || github.event.issue.pull_request
+          github.event.pull_request || github.event.issue.pull_request || github.event_name == 'workflow_dispatch' && fromJSON(github.event.inputs.aw_context || '{}').item_type == 'pull_request'
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
@@ -415,11 +449,11 @@ jobs:
             const { main } = require('${{ runner.temp }}/gh-aw/actions/checkout_pr_branch.cjs');
             await main();
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.48
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.60
         env:
           GH_HOST: github.com
       - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.46
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.27.2
       - name: Parse integrity filter lists
         id: parse-guard-vars
         env:
@@ -435,24 +469,28 @@ jobs:
       - name: Restore agent config folders from base branch
         if: steps.checkout-pr.outcome == 'success'
         env:
-          GH_AW_AGENT_FOLDERS: ".agents .claude .codex .crush .gemini .github .opencode .pi"
-          GH_AW_AGENT_FILES: ".crush.json AGENTS.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+          GH_AW_AGENT_FOLDERS: ".agents .antigravity .claude .codex .crush .gemini .github .opencode .pi"
+          GH_AW_AGENT_FILES: ".crush.json AGENTS.md ANTIGRAVITY.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
         run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_base_github_folders.sh"
       - name: Restore inline sub-agents from activation artifact
         env:
           GH_AW_SUB_AGENT_DIR: ".github/agents"
           GH_AW_SUB_AGENT_EXT: ".agent.md"
         run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_sub_agents.sh"
+      - name: Restore inline skills from activation artifact
+        env:
+          GH_AW_SKILL_DIR: ".github/skills"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_skills.sh"
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.46 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.46 ghcr.io/github/gh-aw-firewall/squid:0.25.46 ghcr.io/github/gh-aw-mcpg:v0.3.9@sha256:64828b42a4482f58fab16509d7f8f495a6d97c972a98a68aff20543531ac0388 ghcr.io/github/github-mcp-server:v1.0.4 node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.27.2@sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6 ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2@sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4 ghcr.io/github/gh-aw-firewall/squid:0.27.2@sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591 ghcr.io/github/gh-aw-mcpg:v0.3.25@sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa ghcr.io/github/github-mcp-server:v1.1.2@sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c
       - name: Generate Safe Outputs Config
         run: |
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_eaae5443153d0b45_EOF'
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_f496a449c5dccca1_EOF'
           {"add_comment":{"max":1,"target":"${{ needs.extract_pr_number.outputs.pr_number }}"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_eaae5443153d0b45_EOF
+          GH_AW_SAFE_OUTPUTS_CONFIG_f496a449c5dccca1_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
@@ -640,16 +678,16 @@ jobs:
             * ) DOCKER_SOCK_PATH=/var/run/docker.sock ;;
           esac
           DOCKER_SOCK_GID=$(stat -c '%g' "$DOCKER_SOCK_PATH" 2>/dev/null || echo '0')
-          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v '"${DOCKER_SOCK_PATH}"':/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DOCKER_HOST=unix:///var/run/docker.sock -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.9'
+          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v '"${DOCKER_SOCK_PATH}"':/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DOCKER_HOST=unix:///var/run/docker.sock -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.25'
           
           mkdir -p /home/runner/.copilot
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_d99df59573a98681_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_f09adf73c5e58a42_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
                 "type": "stdio",
-                "container": "ghcr.io/github/github-mcp-server:v1.0.4",
+                "container": "ghcr.io/github/github-mcp-server:v1.1.2",
                 "env": {
                   "GITHUB_HOST": "\${GITHUB_SERVER_URL}",
                   "GITHUB_PERSONAL_ACCESS_TOKEN": "\${GITHUB_MCP_SERVER_TOKEN}",
@@ -688,7 +726,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_d99df59573a98681_EOF
+          GH_AW_MCP_CONFIG_f09adf73c5e58a42_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -717,29 +755,48 @@ jobs:
         run: |
           set -o pipefail
           printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
+          trap 'rm -f /home/runner/.copilot/settings.json' EXIT
+          mkdir -p /home/runner/.copilot
+          printf '%s' '{"builtInAgents":{"rubberDuck":false}}' > /home/runner/.copilot/settings.json
           touch /tmp/gh-aw/agent-step-summary.md
           GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
           export GH_AW_NODE_BIN
+          export COPILOT_API_KEY="$COPILOT_DUMMY_BYOK"
           (umask 177 && touch /tmp/gh-aw/agent-stdio.log)
-          printf '%s\n' '{"$schema":"https://github.com/github/gh-aw-firewall/releases/download/v0.25.46/awf-config.schema.json","network":{"allowDomains":["*.pythonhosted.org","anaconda.org","api.business.githubcopilot.com","api.enterprise.githubcopilot.com","api.github.com","api.githubcopilot.com","api.individual.githubcopilot.com","binstar.org","bootstrap.pypa.io","conda.anaconda.org","conda.binstar.org","files.pythonhosted.org","github.com","host.docker.internal","pip.pypa.io","pypi.org","pypi.python.org","raw.githubusercontent.com","registry.npmjs.org","repo.anaconda.com","repo.continuum.io","telemetry.enterprise.githubcopilot.com"]},"apiProxy":{"enabled":true,"enableTokenSteering":true,"maxRuns":500,"maxEffectiveTokens":25000000,"models":{"auto":["large"],"coding":["copilot/gpt-5*codex*","openai/gpt-5*codex*","gpt-5-codex"],"deep-research":["copilot/deep-research*","copilot/o3-deep-research*","copilot/o4-mini-deep-research*","google/deep-research*","gemini/deep-research*","openai/o3-deep-research*","openai/o4-mini-deep-research*"],"gemini-flash":["copilot/gemini-*flash*","google/gemini-*flash*","gemini/gemini-*flash*"],"gemini-flash-lite":["copilot/gemini-*flash*lite*","google/gemini-*flash*lite*","gemini/gemini-*flash*lite*"],"gemini-pro":["copilot/gemini-*pro*","google/gemini-*pro*","gemini/gemini-*pro*"],"gemma":["copilot/gemma*","google/gemma*","gemini/gemma*"],"gpt-4.1":["copilot/gpt-4.1*","openai/gpt-4.1*"],"gpt-5":["copilot/gpt-5*","openai/gpt-5*"],"gpt-5-codex":["copilot/gpt-5*codex*","openai/gpt-5*codex*"],"gpt-5-mini":["copilot/gpt-5*mini*","openai/gpt-5*mini*"],"gpt-5-nano":["copilot/gpt-5*nano*","openai/gpt-5*nano*"],"gpt-5-pro":["copilot/gpt-5*pro*","openai/gpt-5*pro*"],"haiku":["copilot/*haiku*","anthropic/*haiku*"],"large":["sonnet","gpt-5-pro","gpt-5","gemini-pro"],"mini":["haiku","gpt-5-mini","gpt-5-nano","gemini-flash-lite"],"opus":["copilot/*opus*","anthropic/*opus*"],"reasoning":["copilot/o1*","copilot/o3*","copilot/o4*","openai/o1*","openai/o3*","openai/o4*"],"small":["mini"],"sonnet":["copilot/*sonnet*","anthropic/*sonnet*"],"vision":["copilot/gemini-*image*","gemini/gemini-*image*","copilot/gemini-*flash*","gemini/gemini-*flash*"]}},"container":{"imageTag":"0.25.46"}}' > "${RUNNER_TEMP}/gh-aw/awf-config.json" && cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          GH_AW_MAX_AI_CREDITS="${{ vars.GH_AW_DEFAULT_MAX_AI_CREDITS || '1000' }}"
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.27.2/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"*.pythonhosted.org\",\"anaconda.org\",\"api.business.githubcopilot.com\",\"api.enterprise.githubcopilot.com\",\"api.github.com\",\"api.githubcopilot.com\",\"api.individual.githubcopilot.com\",\"binstar.org\",\"bootstrap.pypa.io\",\"conda.anaconda.org\",\"conda.binstar.org\",\"files.pythonhosted.org\",\"github.com\",\"host.docker.internal\",\"pip.pypa.io\",\"pypi.org\",\"pypi.python.org\",\"raw.githubusercontent.com\",\"registry.npmjs.org\",\"repo.anaconda.com\",\"repo.continuum.io\",\"telemetry.enterprise.githubcopilot.com\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"models\":{\"agent\":[\"sonnet-6x\",\"gpt-5.4\",\"gpt-5.3\",\"gemini-pro\",\"any\"],\"antigravity\":[\"copilot/antigravity*\",\"google/antigravity*\",\"gemini/antigravity*\"],\"any\":[\"copilot/*\",\"anthropic/*\",\"openai/*\",\"google/*\",\"gemini/*\"],\"claude\":[\"agent\"],\"codex\":[\"agent\"],\"coding\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\",\"gpt-5-codex\"],\"computer-use\":[\"copilot/*computer-use*\",\"google/*computer-use*\",\"gemini/*computer-use*\",\"openai/*computer-use*\"],\"copilot\":[\"agent\"],\"deep-research\":[\"copilot/deep-research*\",\"copilot/o3-deep-research*\",\"copilot/o4-mini-deep-research*\",\"google/deep-research*\",\"gemini/deep-research*\",\"openai/o3-deep-research*\",\"openai/o4-mini-deep-research*\"],\"gemini\":[\"agent\"],\"gemini-3-flash\":[\"copilot/gemini-3*flash*\",\"google/gemini-3*flash*\",\"gemini/gemini-3*flash*\"],\"gemini-3-pro\":[\"copilot/gemini-3*pro*\",\"google/gemini-3*pro*\",\"google/nano-banana*\",\"gemini/gemini-3*pro*\"],\"gemini-3.1-flash\":[\"copilot/gemini-3.1*flash*\",\"google/gemini-3.1*flash*\",\"gemini/gemini-3.1*flash*\"],\"gemini-3.1-pro\":[\"copilot/gemini-3.1*pro*\",\"google/gemini-3.1*pro*\",\"gemini/gemini-3.1*pro*\"],\"gemini-3.5-flash\":[\"copilot/gemini-3.5*flash*\",\"google/gemini-3.5*flash*\",\"gemini/gemini-3.5*flash*\"],\"gemini-flash\":[\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"],\"gemini-flash-lite\":[\"copilot/gemini-*flash*lite*\",\"google/gemini-*flash*lite*\",\"gemini/gemini-*flash*lite*\"],\"gemini-pro\":[\"copilot/gemini-*pro*\",\"google/gemini-*pro*\",\"gemini/gemini-*pro*\"],\"gemma\":[\"copilot/gemma*\",\"google/gemma*\",\"gemini/gemma*\"],\"gpt-5\":[\"copilot/gpt-5*\",\"openai/gpt-5*\"],\"gpt-5-codex\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\"],\"gpt-5-mini\":[\"copilot/gpt-5*mini*\",\"openai/gpt-5*mini*\"],\"gpt-5-nano\":[\"copilot/gpt-5*nano*\",\"openai/gpt-5*nano*\"],\"gpt-5-pro\":[\"copilot/gpt-5*pro*\",\"openai/gpt-5*pro*\"],\"gpt-5.2\":[\"copilot/gpt-5.2*\",\"openai/gpt-5.2*\"],\"gpt-5.3\":[\"copilot/gpt-5.3*\",\"openai/gpt-5.3*\"],\"gpt-5.4\":[\"copilot/gpt-5.4*\",\"openai/gpt-5.4*\"],\"gpt-5.5\":[\"copilot/gpt-5.5*\",\"openai/gpt-5.5*\"],\"haiku\":[\"copilot/*haiku*\",\"anthropic/*haiku*\"],\"large\":[\"sonnet\",\"gpt-5-pro\",\"gpt-5\",\"gemini-pro\"],\"mai-code\":[\"copilot/MAI-Code*\",\"copilot/mai-code*\",\"openai/MAI-Code*\"],\"mini\":[\"haiku\",\"gpt-5-mini\",\"gpt-5-nano\",\"gemini-flash-lite\"],\"nano-banana\":[\"copilot/nano-banana*\",\"google/nano-banana*\",\"gemini/nano-banana*\"],\"opus\":[\"copilot/*opus*\",\"anthropic/*opus*\"],\"opusplan\":[\"opus?effort=high\"],\"reasoning\":[\"copilot/o1*\",\"copilot/o3*\",\"copilot/o4*\",\"openai/o1*\",\"openai/o3*\",\"openai/o4*\"],\"robotics\":[\"copilot/*robotics*\",\"google/*robotics*\",\"gemini/*robotics*\"],\"small\":[\"mini\"],\"small-agent\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash\"],\"sonnet\":[\"copilot/*sonnet*\",\"anthropic/*sonnet*\"],\"sonnet-6x\":[\"copilot/*sonnet-4.5*\",\"copilot/*sonnet-4.6*\",\"copilot/*sonnet-4-5-*\",\"anthropic/*sonnet-4-5-*\",\"copilot/*sonnet-4-6*\",\"anthropic/*sonnet-4-6*\"],\"summarization\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash-lite\",\"mini\"],\"vision\":[\"copilot/gemini-*image*\",\"gemini/gemini-*image*\",\"copilot/gemini-*flash*\",\"gemini/gemini-*flash*\"]}},\"container\":{\"imageTag\":\"0.27.2,squid=sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591,agent=sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6,api-proxy=sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4,cli-proxy=sha256:02f3ec08f32dc26c5427920c6a2e2f3036238fce44802f2f11ef49ed8621b5d0\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          GH_AW_MODEL_MULTIPLIERS_PATH="/tmp/gh-aw/model_multipliers.json" node "${RUNNER_TEMP}/gh-aw/actions/merge_awf_model_multipliers.cjs"
+          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
           GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS=""
           if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
             GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS="--docker-host-path-prefix /tmp/gh-aw"
           fi
+          GH_AW_TOOL_CACHE_MOUNT=""
+          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}"
+          if [ -d "$GH_AW_TOOL_CACHE" ]; then
+            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
+              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
+            fi
+          elif [ -d "/home/runner/work/_tool" ]; then
+            GH_AW_TOOL_CACHE_MOUNT="/home/runner/work/_tool:/home/runner/work/_tool:ro"
+          fi
           # shellcheck disable=SC1003
-          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
-            -- /bin/bash -c 'export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
+          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
+            -- /bin/bash -c 'set +o histexpand; export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}"; export PATH="$(find "$GH_AW_TOOL_CACHE" /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
         env:
           AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
-          COPILOT_API_KEY: dummy-byok-key-for-offline-mode
+          COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
           GH_AW_MCP_CONFIG: /home/runner/.copilot/mcp-config.json
           GH_AW_PHASE: agent
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
-          GH_AW_VERSION: v0.74.4
+          GH_AW_TIMEOUT_MINUTES: 20
+          GH_AW_VERSION: v0.79.6
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
           GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
@@ -753,12 +810,13 @@ jobs:
           GIT_AUTHOR_NAME: github-actions[bot]
           GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
           GIT_COMMITTER_NAME: github-actions[bot]
+          RUNNER_TEMP: ${{ runner.temp }}
           XDG_CONFIG_HOME: /home/runner
-      - name: Detect Copilot errors
-        id: detect-copilot-errors
+      - name: Detect agent errors
         if: always()
+        id: detect-agent-errors
         continue-on-error: true
-        run: node "${RUNNER_TEMP}/gh-aw/actions/detect_copilot_errors.cjs"
+        run: node "${RUNNER_TEMP}/gh-aw/actions/detect_agent_errors.cjs"
       - name: Configure Git credentials
         env:
           REPO_NAME: ${{ github.repository }}
@@ -939,7 +997,7 @@ jobs:
       - safe_outputs
     if: >
       always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
-      needs.activation.outputs.stale_lock_file_failed == 'true')
+      needs.activation.outputs.stale_lock_file_failed == 'true' || needs.activation.outputs.daily_effective_workflow_exceeded == 'true')
     runs-on: ubuntu-slim
     permissions:
       contents: read
@@ -958,7 +1016,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@73ed520ae4ecd087a485e1991605595978b32ac1 # v0.78.1
+        uses: github/gh-aw-actions/setup@v0.79.6
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -967,7 +1025,8 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "Check requirements (AW)"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/check-requirements.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.48"
+          GH_AW_INFO_VERSION: "1.0.60"
+          GH_AW_INFO_AWF_VERSION: "v0.27.2"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Download agent output artifact
         id: download-agent-output
@@ -983,6 +1042,40 @@ jobs:
           mkdir -p /tmp/gh-aw/
           find "/tmp/gh-aw/" -type f -print
           echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+      - name: Collect usage artifact files
+        if: always()
+        continue-on-error: true
+        run: |
+          mkdir -p /tmp/gh-aw/usage/agent /tmp/gh-aw/usage/detection
+          echo "Usage artifact source file status:"
+          for file in /tmp/gh-aw/aw-info.jsonl /tmp/gh-aw/agent_usage.jsonl /tmp/gh-aw/detection_usage.jsonl /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl; do
+            [ -f "$file" ] && echo "FOUND: $file" || echo "MISSING: $file"
+          done
+          [ -f /tmp/gh-aw/aw-info.jsonl ] && cp /tmp/gh-aw/aw-info.jsonl /tmp/gh-aw/usage/aw-info.jsonl || true
+          [ -f /tmp/gh-aw/agent_usage.jsonl ] && cp /tmp/gh-aw/agent_usage.jsonl /tmp/gh-aw/usage/agent_usage.jsonl || true
+          [ -f /tmp/gh-aw/detection_usage.jsonl ] && cp /tmp/gh-aw/detection_usage.jsonl /tmp/gh-aw/usage/detection_usage.jsonl || true
+          [ -f /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/usage/agent/token_usage.jsonl ] || : > /tmp/gh-aw/usage/agent/token_usage.jsonl
+          [ -f /tmp/gh-aw/usage/detection/token_usage.jsonl ] || : > /tmp/gh-aw/usage/detection/token_usage.jsonl
+          find /tmp/gh-aw/usage -type f -print | sort
+      - name: Upload usage artifact
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: usage
+          path: |
+            /tmp/gh-aw/usage/aw-info.jsonl
+            /tmp/gh-aw/usage/agent_usage.jsonl
+            /tmp/gh-aw/usage/detection_usage.jsonl
+            /tmp/gh-aw/usage/agent/token_usage.jsonl
+            /tmp/gh-aw/usage/detection/token_usage.jsonl
+          if-no-files-found: ignore
       - name: Process no-op messages
         id: noop
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -990,9 +1083,14 @@ jobs:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_NOOP_MAX: "1"
           GH_AW_WORKFLOW_NAME: "Check requirements (AW)"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/check-requirements.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_NOOP_REPORT_AS_ISSUE: "true"
+          GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+          GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
+          GH_AW_AMBIENT_CONTEXT: ${{ needs.agent.outputs.ambient_context }}
+          GH_AW_WORKFLOW_ID: "check-requirements"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1006,6 +1104,7 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_WORKFLOW_NAME: "Check requirements (AW)"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/check-requirements.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
           GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
@@ -1023,6 +1122,7 @@ jobs:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_MISSING_TOOL_CREATE_ISSUE: "true"
           GH_AW_WORKFLOW_NAME: "Check requirements (AW)"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/check-requirements.md"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1037,6 +1137,7 @@ jobs:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_REPORT_INCOMPLETE_CREATE_ISSUE: "true"
           GH_AW_WORKFLOW_NAME: "Check requirements (AW)"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/check-requirements.md"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1051,6 +1152,7 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_WORKFLOW_NAME: "Check requirements (AW)"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/check-requirements.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_WORKFLOW_ID: "check-requirements"
@@ -1059,7 +1161,11 @@ jobs:
           GH_AW_SECRET_VERIFICATION_RESULT: ${{ needs.activation.outputs.secret_verification_result }}
           GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
           GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens || '' }}
-          GH_AW_EFFECTIVE_TOKENS_RATE_LIMIT_ERROR: ${{ needs.agent.outputs.effective_tokens_rate_limit_error || 'false' }}
+          GH_AW_AI_CREDITS_RATE_LIMIT_ERROR: ${{ needs.agent.outputs.ai_credits_rate_limit_error || 'false' }}
+          GH_AW_UNKNOWN_MODEL_AI_CREDITS: ${{ needs.agent.outputs.unknown_model_ai_credits || 'false' }}
+          GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+          GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
+          GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_AI_CREDITS || '1000' }}
           GH_AW_INFERENCE_ACCESS_ERROR: ${{ needs.agent.outputs.inference_access_error }}
           GH_AW_MCP_POLICY_ERROR: ${{ needs.agent.outputs.mcp_policy_error }}
           GH_AW_AGENTIC_ENGINE_TIMEOUT: ${{ needs.agent.outputs.agentic_engine_timeout }}
@@ -1067,12 +1173,14 @@ jobs:
           GH_AW_ENGINE_API_HOSTS: "api.enterprise.githubcopilot.com,api.githubcopilot.com,api.business.githubcopilot.com,api.individual.githubcopilot.com"
           GH_AW_LOCKDOWN_CHECK_FAILED: ${{ needs.activation.outputs.lockdown_check_failed }}
           GH_AW_STALE_LOCK_FILE_FAILED: ${{ needs.activation.outputs.stale_lock_file_failed }}
+          GH_AW_DAILY_EFFECTIVE_WORKFLOW_EXCEEDED: ${{ needs.activation.outputs.daily_effective_workflow_exceeded }}
+          GH_AW_DAILY_EFFECTIVE_WORKFLOW_TOTAL_EFFECTIVE_TOKENS: ${{ needs.activation.outputs.daily_effective_workflow_total_effective_tokens }}
+          GH_AW_DAILY_EFFECTIVE_WORKFLOW_THRESHOLD: ${{ needs.activation.outputs.daily_effective_workflow_threshold }}
           GH_AW_GROUP_REPORTS: "false"
           GH_AW_FAILURE_REPORT_AS_ISSUE: "true"
           GH_AW_MISSING_TOOL_REPORT_AS_FAILURE: "true"
           GH_AW_MISSING_DATA_REPORT_AS_FAILURE: "true"
           GH_AW_TIMEOUT_MINUTES: "20"
-          GH_AW_MAX_EFFECTIVE_TOKENS: "25000000"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1091,13 +1199,14 @@ jobs:
     permissions:
       contents: read
     outputs:
+      aic: ${{ steps.parse_detection_token_usage.outputs.aic }}
       detection_conclusion: ${{ steps.detection_conclusion.outputs.conclusion }}
       detection_reason: ${{ steps.detection_conclusion.outputs.reason }}
       detection_success: ${{ steps.detection_conclusion.outputs.success }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@73ed520ae4ecd087a485e1991605595978b32ac1 # v0.78.1
+        uses: github/gh-aw-actions/setup@v0.79.6
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1106,7 +1215,8 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "Check requirements (AW)"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/check-requirements.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.48"
+          GH_AW_INFO_VERSION: "1.0.60"
+          GH_AW_INFO_AWF_VERSION: "v0.27.2"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Download agent output artifact
         id: download-agent-output
@@ -1133,7 +1243,7 @@ jobs:
           rm -rf /tmp/gh-aw/sandbox/firewall/logs
           rm -rf /tmp/gh-aw/sandbox/firewall/audit
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.46 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.46 ghcr.io/github/gh-aw-firewall/squid:0.25.46
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.27.2@sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6 ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2@sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4 ghcr.io/github/gh-aw-firewall/squid:0.27.2@sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591
       - name: Check if detection needed
         id: detection_guard
         if: always()
@@ -1158,7 +1268,11 @@ jobs:
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         run: |
           mkdir -p /tmp/gh-aw/threat-detection/aw-prompts
+          rm -f /tmp/gh-aw/agent_usage.json
           cp /tmp/gh-aw/aw-prompts/prompt.txt /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt 2>/dev/null || true
+          if [ ! -s /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt ]; then
+            echo "::warning::ERR_VALIDATION: Missing or empty detection context prompt at /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt. Ensure the agent artifact includes /tmp/gh-aw/aw-prompts/prompt.txt. Detection will continue with fallback workflow context."
+          fi
           cp /tmp/gh-aw/agent_output.json /tmp/gh-aw/threat-detection/agent_output.json 2>/dev/null || true
           for f in /tmp/gh-aw/aw-*.patch; do
             [ -f "$f" ] && cp "$f" /tmp/gh-aw/threat-detection/ 2>/dev/null || true
@@ -1192,11 +1306,11 @@ jobs:
           node-version: '24'
           package-manager-cache: false
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.48
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.60
         env:
           GH_HOST: github.com
       - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.46
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.27.2
       - name: Execute GitHub Copilot CLI
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         continue-on-error: true
@@ -1206,27 +1320,46 @@ jobs:
         run: |
           set -o pipefail
           printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
+          trap 'rm -f /home/runner/.copilot/settings.json' EXIT
+          mkdir -p /home/runner/.copilot
+          printf '%s' '{"builtInAgents":{"rubberDuck":false}}' > /home/runner/.copilot/settings.json
           touch /tmp/gh-aw/agent-step-summary.md
           GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
           export GH_AW_NODE_BIN
+          export COPILOT_API_KEY="$COPILOT_DUMMY_BYOK"
           (umask 177 && touch /tmp/gh-aw/threat-detection/detection.log)
-          printf '%s\n' '{"$schema":"https://github.com/github/gh-aw-firewall/releases/download/v0.25.46/awf-config.schema.json","network":{"allowDomains":["api.business.githubcopilot.com","api.enterprise.githubcopilot.com","api.github.com","api.githubcopilot.com","api.individual.githubcopilot.com","github.com","host.docker.internal","telemetry.enterprise.githubcopilot.com"]},"apiProxy":{"enabled":true,"enableTokenSteering":true,"maxRuns":500,"maxEffectiveTokens":25000000},"container":{"imageTag":"0.25.46"}}' > "${RUNNER_TEMP}/gh-aw/awf-config.json" && cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          GH_AW_MAX_AI_CREDITS="${{ vars.GH_AW_DEFAULT_DETECTION_MAX_AI_CREDITS || '400' }}"
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.27.2/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"api.business.githubcopilot.com\",\"api.enterprise.githubcopilot.com\",\"api.github.com\",\"api.githubcopilot.com\",\"api.individual.githubcopilot.com\",\"github.com\",\"host.docker.internal\",\"registry.npmjs.org\",\"telemetry.enterprise.githubcopilot.com\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS}},\"container\":{\"imageTag\":\"0.27.2,squid=sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591,agent=sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6,api-proxy=sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4,cli-proxy=sha256:02f3ec08f32dc26c5427920c6a2e2f3036238fce44802f2f11ef49ed8621b5d0\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          GH_AW_MODEL_MULTIPLIERS_PATH="/tmp/gh-aw/model_multipliers.json" node "${RUNNER_TEMP}/gh-aw/actions/merge_awf_model_multipliers.cjs"
+          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
           GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS=""
           if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
             GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS="--docker-host-path-prefix /tmp/gh-aw"
           fi
+          GH_AW_TOOL_CACHE_MOUNT=""
+          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}"
+          if [ -d "$GH_AW_TOOL_CACHE" ]; then
+            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
+              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
+            fi
+          elif [ -d "/home/runner/work/_tool" ]; then
+            GH_AW_TOOL_CACHE_MOUNT="/home/runner/work/_tool:/home/runner/work/_tool:ro"
+          fi
           # shellcheck disable=SC1003
-          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
-            -- /bin/bash -c 'export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
+          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
+            -- /bin/bash -c 'set +o histexpand; GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}"; export PATH="$(find "$GH_AW_TOOL_CACHE" /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
         env:
           AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
-          COPILOT_API_KEY: dummy-byok-key-for-offline-mode
+          COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || 'claude-sonnet-4.6' }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
           GH_AW_PHASE: detection
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
-          GH_AW_VERSION: v0.74.4
+          GH_AW_TIMEOUT_MINUTES: 20
+          GH_AW_VERSION: v0.79.6
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
           GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
@@ -1239,7 +1372,21 @@ jobs:
           GIT_AUTHOR_NAME: github-actions[bot]
           GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
           GIT_COMMITTER_NAME: github-actions[bot]
+          RUNNER_TEMP: ${{ runner.temp }}
           XDG_CONFIG_HOME: /home/runner
+      - name: Parse threat detection token usage for step summary
+        id: parse_detection_token_usage
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_TOKEN_USAGE_SUMMARY_TITLE: Threat Detection Token Usage
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_token_usage.cjs');
+            await main();
       - name: Upload threat detection log
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -1293,6 +1440,7 @@ jobs:
       - name: Configure GH_HOST for enterprise compatibility
         id: ghes-host-config
         shell: bash
+        # zizmor: ignore[github-env] - GITHUB_SERVER_URL is set by GitHub Actions, not user input.
         run: |
           # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
           # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
@@ -1323,14 +1471,15 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@73ed520ae4ecd087a485e1991605595978b32ac1 # v0.78.1
+        uses: github/gh-aw-actions/setup@v0.79.6
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "Check requirements (AW)"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/check-requirements.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.48"
+          GH_AW_INFO_VERSION: "1.0.60"
+          GH_AW_INFO_AWF_VERSION: "v0.27.2"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Check team membership for workflow
         id: check_membership
@@ -1358,17 +1507,22 @@ jobs:
       discussions: write
       issues: write
       pull-requests: write
-    timeout-minutes: 15
+    timeout-minutes: 45
     env:
+      GH_AW_AGENT_AIC: ${{ needs.agent.outputs.aic }}
+      GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+      GH_AW_AMBIENT_CONTEXT: ${{ needs.agent.outputs.ambient_context }}
       GH_AW_CALLER_WORKFLOW_ID: "${{ github.repository }}/check-requirements"
       GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
       GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
       GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
       GH_AW_ENGINE_ID: "copilot"
       GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
-      GH_AW_ENGINE_VERSION: "1.0.48"
+      GH_AW_ENGINE_VERSION: "1.0.60"
+      GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
       GH_AW_WORKFLOW_ID: "check-requirements"
       GH_AW_WORKFLOW_NAME: "Check requirements (AW)"
+      GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/check-requirements.md"
     outputs:
       code_push_failure_count: ${{ steps.process_safe_outputs.outputs.code_push_failure_count }}
       code_push_failure_errors: ${{ steps.process_safe_outputs.outputs.code_push_failure_errors }}
@@ -1381,7 +1535,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@73ed520ae4ecd087a485e1991605595978b32ac1 # v0.78.1
+        uses: github/gh-aw-actions/setup@v0.79.6
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1390,7 +1544,8 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "Check requirements (AW)"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/check-requirements.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.48"
+          GH_AW_INFO_VERSION: "1.0.60"
+          GH_AW_INFO_AWF_VERSION: "v0.27.2"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Download agent output artifact
         id: download-agent-output
@@ -1409,6 +1564,7 @@ jobs:
       - name: Configure GH_HOST for enterprise compatibility
         id: ghes-host-config
         shell: bash
+        # zizmor: ignore[github-env] - GITHUB_SERVER_URL is set by GitHub Actions, not user input.
         run: |
           # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
           # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
@@ -1420,6 +1576,7 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_COMMENT_ID: ${{ needs.activation.outputs.comment_id }}
           GH_AW_ALLOWED_DOMAINS: "*.pythonhosted.org,anaconda.org,api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,binstar.org,bootstrap.pypa.io,conda.anaconda.org,conda.binstar.org,files.pythonhosted.org,github.com,host.docker.internal,pip.pypa.io,pypi.org,pypi.python.org,raw.githubusercontent.com,registry.npmjs.org,repo.anaconda.com,repo.continuum.io,telemetry.enterprise.githubcopilot.com"
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_API_URL: ${{ github.api_url }}

From 2aa1da72161bd11f3314a6fafe6a643c1e38a9a2 Mon Sep 17 00:00:00 2001
From: James Myatt <james@jamesmyatt.co.uk>
Date: Thu, 11 Jun 2026 21:32:15 +0100
Subject: [PATCH 11/15] (bring) Fix docstring (#173451)

---
 homeassistant/components/bring/todo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/bring/todo.py b/homeassistant/components/bring/todo.py
index 67e8aaafd914c..32b5674c60dae 100644
--- a/homeassistant/components/bring/todo.py
+++ b/homeassistant/components/bring/todo.py
@@ -125,7 +125,7 @@ async def async_create_todo_item(self, item: TodoItem) -> None:
         await self.coordinator.async_refresh()
 
     async def async_update_todo_item(self, item: TodoItem) -> None:
-        """Update an item to the To-do list.
+        """Update an item in the To-do list.
 
         Bring has an internal 'recent' list which we want to use instead of a todo list
         status, therefore completed todo list items are matched to the recent list and

From e99cb27015c2eb02a8ce6e108d769a7d56bff2eb Mon Sep 17 00:00:00 2001
From: bkobus-bbx <bartlomiej.kobus@blebox.eu>
Date: Thu, 11 Jun 2026 22:43:08 +0200
Subject: [PATCH 12/15] Add has_entity_name and translation keys to blebox
 entities (#170089)

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
---
 .../components/blebox/binary_sensor.py        |  2 +
 homeassistant/components/blebox/button.py     |  2 +
 homeassistant/components/blebox/climate.py    |  1 +
 homeassistant/components/blebox/cover.py      |  2 +
 homeassistant/components/blebox/entity.py     |  3 +-
 homeassistant/components/blebox/light.py      |  5 +
 homeassistant/components/blebox/sensor.py     | 32 ++++++-
 homeassistant/components/blebox/strings.json  | 29 +++++-
 homeassistant/components/blebox/switch.py     | 11 +++
 tests/components/blebox/test_binary_sensor.py | 36 +++++--
 tests/components/blebox/test_button.py        |  4 +-
 tests/components/blebox/test_climate.py       |  6 +-
 tests/components/blebox/test_cover.py         | 14 +--
 tests/components/blebox/test_light.py         | 84 ++++++++++++++--
 tests/components/blebox/test_sensor.py        | 96 +++++++++++++++++--
 tests/components/blebox/test_switch.py        | 40 ++++++--
 tests/components/blebox/test_update.py        |  4 +-
 17 files changed, 326 insertions(+), 45 deletions(-)

diff --git a/homeassistant/components/blebox/binary_sensor.py b/homeassistant/components/blebox/binary_sensor.py
index 105cc1b2c18de..0e493c88490f5 100644
--- a/homeassistant/components/blebox/binary_sensor.py
+++ b/homeassistant/components/blebox/binary_sensor.py
@@ -59,6 +59,8 @@ def __init__(
         """Initialize a BleBox binary sensor feature."""
         super().__init__(coordinator, feature)
         self.entity_description = description
+        if feature.name:
+            self._attr_name = feature.name
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/blebox/button.py b/homeassistant/components/blebox/button.py
index 4500eeaeb48ce..071a1d9467e16 100644
--- a/homeassistant/components/blebox/button.py
+++ b/homeassistant/components/blebox/button.py
@@ -41,6 +41,8 @@ async def async_setup_entry(
 class BleBoxButtonEntity(BleBoxEntity[blebox_uniapi.button.Button], ButtonEntity):
     """Representation of BleBox buttons."""
 
+    _attr_name = None
+
     def __init__(
         self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.button.Button
     ) -> None:
diff --git a/homeassistant/components/blebox/climate.py b/homeassistant/components/blebox/climate.py
index 6d0b5f45fb226..0538ce8da6559 100644
--- a/homeassistant/components/blebox/climate.py
+++ b/homeassistant/components/blebox/climate.py
@@ -51,6 +51,7 @@ async def async_setup_entry(
 class BleBoxClimateEntity(BleBoxEntity[blebox_uniapi.climate.Climate], ClimateEntity):
     """Representation of a BleBox climate feature (saunaBox)."""
 
+    _attr_name = None
     _attr_supported_features = (
         ClimateEntityFeature.TARGET_TEMPERATURE
         | ClimateEntityFeature.TURN_OFF
diff --git a/homeassistant/components/blebox/cover.py b/homeassistant/components/blebox/cover.py
index 0488607963ecd..fba460c7706ba 100644
--- a/homeassistant/components/blebox/cover.py
+++ b/homeassistant/components/blebox/cover.py
@@ -74,6 +74,8 @@ async def async_setup_entry(
 class BleBoxCoverEntity(BleBoxEntity[blebox_uniapi.cover.Cover], CoverEntity):
     """Representation of a BleBox cover feature."""
 
+    _attr_name = None
+
     def __init__(
         self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.cover.Cover
     ) -> None:
diff --git a/homeassistant/components/blebox/entity.py b/homeassistant/components/blebox/entity.py
index f1880cfbc56fd..ccd5a565986ba 100644
--- a/homeassistant/components/blebox/entity.py
+++ b/homeassistant/components/blebox/entity.py
@@ -12,11 +12,12 @@
 class BleBoxEntity[_FeatureT: Feature](CoordinatorEntity[BleBoxCoordinator]):
     """Implements a common class for entities representing a BleBox feature."""
 
+    _attr_has_entity_name = True
+
     def __init__(self, coordinator: BleBoxCoordinator, feature: _FeatureT) -> None:
         """Initialize a BleBox entity."""
         super().__init__(coordinator)
         self._feature = feature
-        self._attr_name = feature.full_name
         self._attr_unique_id = feature.unique_id
         product = feature.product
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/blebox/light.py b/homeassistant/components/blebox/light.py
index 312097226a3b7..7590c4bc00bd0 100644
--- a/homeassistant/components/blebox/light.py
+++ b/homeassistant/components/blebox/light.py
@@ -71,6 +71,11 @@ def __init__(
         super().__init__(coordinator, feature)
         if feature.effect_list:
             self._attr_supported_features = LightEntityFeature.EFFECT
+        if feature.index is not None:
+            self._attr_translation_key = "channel"
+            self._attr_translation_placeholders = {"index": str(feature.index + 1)}
+        else:
+            self._attr_name = None
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/blebox/sensor.py b/homeassistant/components/blebox/sensor.py
index 8e1e561cfb07e..2f88eeebcd690 100644
--- a/homeassistant/components/blebox/sensor.py
+++ b/homeassistant/components/blebox/sensor.py
@@ -1,5 +1,6 @@
 """BleBox sensor entities."""
 
+from collections import Counter
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime
@@ -67,6 +68,7 @@ class BleBoxSensorEntityDescription(SensorEntityDescription):
     ),
     BleBoxSensorEntityDescription(
         key="temperature",
+        translation_key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -97,48 +99,56 @@ class BleBoxSensorEntityDescription(SensorEntityDescription):
     ),
     BleBoxSensorEntityDescription(
         key="forwardActiveEnergy",
+        translation_key="forward_active_energy",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     BleBoxSensorEntityDescription(
         key="reverseActiveEnergy",
+        translation_key="reverse_active_energy",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     BleBoxSensorEntityDescription(
         key="reactivePower",
-        device_class=SensorDeviceClass.POWER,
+        translation_key="reactive_power",
+        device_class=SensorDeviceClass.REACTIVE_POWER,
         native_unit_of_measurement=UnitOfReactivePower.VOLT_AMPERE_REACTIVE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     BleBoxSensorEntityDescription(
         key="activePower",
+        translation_key="active_power",
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     BleBoxSensorEntityDescription(
         key="apparentPower",
+        translation_key="apparent_power",
         device_class=SensorDeviceClass.APPARENT_POWER,
         native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     BleBoxSensorEntityDescription(
         key="voltage",
+        translation_key="voltage",
         device_class=SensorDeviceClass.VOLTAGE,
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     BleBoxSensorEntityDescription(
         key="current",
+        translation_key="current",
         device_class=SensorDeviceClass.CURRENT,
         native_unit_of_measurement=UnitOfElectricCurrent.MILLIAMPERE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     BleBoxSensorEntityDescription(
         key="frequency",
+        translation_key="frequency",
         device_class=SensorDeviceClass.FREQUENCY,
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         state_class=SensorStateClass.MEASUREMENT,
@@ -172,10 +182,20 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
+
     coordinator = config_entry.runtime_data
+    features = coordinator.box.features.get("sensors", [])
+    counts = Counter(f.device_class for f in features)
     entities = [
-        BleBoxSensorEntity(coordinator, feature, description)
-        for feature in coordinator.box.features.get("sensors", [])
+        BleBoxSensorEntity(
+            coordinator,
+            feature,
+            description,
+            feature.index
+            if counts[feature.device_class] > 1 and feature.index
+            else None,
+        )
+        for feature in features
         for description in SENSOR_TYPES
         if description.key == feature.device_class
     ]
@@ -192,10 +212,16 @@ def __init__(
         coordinator: BleBoxCoordinator,
         feature: blebox_uniapi.sensor.BaseSensor,
         description: BleBoxSensorEntityDescription,
+        index: int | None = None,
     ) -> None:
         """Initialize a BleBox sensor feature."""
         super().__init__(coordinator, feature)
         self.entity_description = description
+        if feature.name:
+            self._attr_name = feature.name
+        elif index is not None and description.translation_key:
+            self._attr_translation_key = f"{description.translation_key}_n"
+            self._attr_translation_placeholders = {"index": str(index)}
 
     @property
     def native_value(self) -> StateType:
diff --git a/homeassistant/components/blebox/strings.json b/homeassistant/components/blebox/strings.json
index 4240167412107..b7cf1e6834980 100644
--- a/homeassistant/components/blebox/strings.json
+++ b/homeassistant/components/blebox/strings.json
@@ -30,13 +30,24 @@
           "port": "[%key:common::config_flow::data::port%]",
           "username": "[%key:common::config_flow::data::username%]"
         },
+        "data_description": {
+          "host": "The IP address of your BleBox device.",
+          "password": "The password for your BleBox device.",
+          "port": "The port of your BleBox device.",
+          "username": "The username for your BleBox device."
+        },
         "description": "Set up your BleBox to integrate with Home Assistant.",
         "title": "Set up your BleBox device"
       }
     }
   },
   "entity": {
+    "light": { "channel": { "name": "Channel {index}" } },
     "sensor": {
+      "active_power": { "name": "Active power" },
+      "active_power_n": { "name": "Active power {index}" },
+      "apparent_power": { "name": "Apparent power" },
+      "apparent_power_n": { "name": "Apparent power {index}" },
       "co2_level": {
         "name": "Carbon dioxide level",
         "state": {
@@ -49,7 +60,14 @@
           "unhealthy": "Unhealthy"
         }
       },
+      "current": { "name": "Current" },
+      "current_n": { "name": "Current {index}" },
+      "forward_active_energy": { "name": "Forward active energy" },
+      "forward_active_energy_n": { "name": "Forward active energy {index}" },
+      "frequency": { "name": "Frequency" },
+      "frequency_n": { "name": "Frequency {index}" },
       "open_status": {
+        "name": "Open status",
         "state": {
           "ajar": "Ajar",
           "closed": "[%key:common::state::closed%]",
@@ -57,7 +75,16 @@
           "open": "[%key:common::state::open%]",
           "unclosed_or_unlocked": "Unclosed or unlocked"
         }
-      }
+      },
+      "power_consumption": { "name": "Energy last hour" },
+      "reactive_power": { "name": "Reactive power" },
+      "reactive_power_n": { "name": "Reactive power {index}" },
+      "reverse_active_energy": { "name": "Reverse active energy" },
+      "reverse_active_energy_n": { "name": "Reverse active energy {index}" },
+      "temperature": { "name": "Temperature" },
+      "temperature_n": { "name": "Temperature {index}" },
+      "voltage": { "name": "Voltage" },
+      "voltage_n": { "name": "Voltage {index}" }
     }
   },
   "exceptions": {
diff --git a/homeassistant/components/blebox/switch.py b/homeassistant/components/blebox/switch.py
index 5af500c4c70f9..a14226f1465a9 100644
--- a/homeassistant/components/blebox/switch.py
+++ b/homeassistant/components/blebox/switch.py
@@ -9,6 +9,7 @@
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
+from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity
 from .util import blebox_command
 
@@ -34,6 +35,16 @@ class BleBoxSwitchEntity(BleBoxEntity[blebox_uniapi.switch.Switch], SwitchEntity
 
     _attr_device_class = SwitchDeviceClass.SWITCH
 
+    _attr_name = None
+
+    def __init__(
+        self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.switch.Switch
+    ) -> None:
+        """Initialize a BleBox switch feature."""
+        super().__init__(coordinator, feature)
+        if feature.name:
+            self._attr_name = feature.name
+
     @property
     def is_on(self) -> bool | None:
         """Return whether switch is on."""
diff --git a/tests/components/blebox/test_binary_sensor.py b/tests/components/blebox/test_binary_sensor.py
index 06e9021f6579e..ea9585f0a7464 100644
--- a/tests/components/blebox/test_binary_sensor.py
+++ b/tests/components/blebox/test_binary_sensor.py
@@ -22,11 +22,13 @@ def airsensor_fixture() -> tuple[AsyncMock, str]:
         unique_id="BleBox-windRainSensor-ea68e74f4f49-0.rain",
         full_name="windRainSensor-0.rain",
         device_class="moisture",
+        index=None,
     )
+    type(feature).name = PropertyMock(return_value=None)
     product = feature.product
     type(product).name = PropertyMock(return_value="My rain sensor")
     type(product).model = PropertyMock(return_value="rainSensor")
-    return feature, "binary_sensor.my_rain_sensor_windrainsensor_0_rain"
+    return feature, "binary_sensor.my_rain_sensor_moisture"
 
 
 @pytest.fixture(name="open_sensor")
@@ -39,10 +41,11 @@ def open_sensor_fixture() -> tuple[AsyncMock, str]:
         full_name="openSensor-0.open",
         device_class="open",
     )
+    type(feature).name = PropertyMock(return_value=None)
     product = feature.product
     type(product).name = PropertyMock(return_value="My open sensor")
     type(product).model = PropertyMock(return_value="openSensor")
-    return feature, "binary_sensor.my_open_sensor_opensensor_0_open"
+    return feature, "binary_sensor.my_open_sensor_window"
 
 
 @pytest.fixture(name="inputsensor")
@@ -55,10 +58,11 @@ def inputsensor_fixture() -> tuple[AsyncMock, str]:
         full_name="inputSensorD-0.input",
         device_class="input",
     )
+    type(feature).name = PropertyMock(return_value=None)
     product = feature.product
     type(product).name = PropertyMock(return_value="My input sensor")
     type(product).model = PropertyMock(return_value="inputSensorD")
-    return feature, "binary_sensor.my_input_sensor_inputsensord_0_input"
+    return feature, "binary_sensor.my_input_sensor"
 
 
 @pytest.mark.parametrize(
@@ -74,7 +78,7 @@ def inputsensor_fixture() -> tuple[AsyncMock, str]:
         pytest.param(
             "rainsensor",
             "BleBox-windRainSensor-ea68e74f4f49-0.rain",
-            "My rain sensor windRainSensor-0.rain",
+            "My rain sensor Moisture",
             BinarySensorDeviceClass.MOISTURE,
             STATE_ON,
             "My rain sensor",
@@ -83,7 +87,7 @@ def inputsensor_fixture() -> tuple[AsyncMock, str]:
         pytest.param(
             "inputsensor",
             "BleBox-inputSensorD-aa11bb22cc33-0.input",
-            "My input sensor inputSensorD-0.input",
+            "My input sensor",
             None,
             STATE_ON,
             "My input sensor",
@@ -116,6 +120,26 @@ async def test_init(
     assert device.name == expected_device_name
 
 
+async def test_binary_sensor_with_name(hass: HomeAssistant) -> None:
+    """Test that a binary sensor with a feature name uses it as the entity name."""
+    feature = mock_feature(
+        "binary_sensors",
+        blebox_uniapi.binary_sensor.Rain,
+        unique_id="BleBox-windRainSensor-ea68e74f4f49-0.rain",
+        full_name="windRainSensor-0.rain",
+        device_class="moisture",
+        index=0,
+    )
+    type(feature).name = PropertyMock(return_value="Front yard")
+    product = feature.product
+    type(product).name = PropertyMock(return_value="My rain sensor")
+    type(product).model = PropertyMock(return_value="rainSensor")
+
+    await async_setup_entity(hass, "binary_sensor.my_rain_sensor_front_yard")
+    state = hass.states.get("binary_sensor.my_rain_sensor_front_yard")
+    assert state.name == "My rain sensor Front yard"
+
+
 async def test_open_sensor_init(
     open_sensor: tuple[AsyncMock, str],
     device_registry: dr.DeviceRegistry,
@@ -127,7 +151,7 @@ async def test_open_sensor_init(
     assert entry.unique_id == "BleBox-openSensor-1afe34db9437-0.open"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My open sensor openSensor-0.open"
+    assert state.name == "My open sensor Window"
     assert state.attributes[ATTR_DEVICE_CLASS] == BinarySensorDeviceClass.WINDOW
 
     device = device_registry.async_get(entry.device_id)
diff --git a/tests/components/blebox/test_button.py b/tests/components/blebox/test_button.py
index a2a6ad517e504..6e9a5c3323bb5 100644
--- a/tests/components/blebox/test_button.py
+++ b/tests/components/blebox/test_button.py
@@ -39,7 +39,7 @@ def tv_lift_box_fixture(caplog: pytest.LogCaptureFixture):
     type(product).model = PropertyMock(return_value="tvLiftBox")
     type(product)._query_string = PropertyMock(return_value="open_or_stop")
 
-    return (feature, "button.my_tvliftbox_tvliftbox_open_or_stop")
+    return (feature, "button.my_tvliftbox")
 
 
 async def test_tvliftbox_init(
@@ -54,7 +54,7 @@ async def test_tvliftbox_init(
 
     assert entry.unique_id == "BleBox-tvLiftBox-4a3fdaad90aa-open_or_stop"
 
-    assert state.name == "My tvLiftBox tvLiftBox-open_or_stop"
+    assert state.name == "My tvLiftBox"
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/blebox/test_climate.py b/tests/components/blebox/test_climate.py
index fbaf6fbd05faf..6aa7c02ebcbef 100644
--- a/tests/components/blebox/test_climate.py
+++ b/tests/components/blebox/test_climate.py
@@ -55,7 +55,7 @@ def saunabox_fixture():
     product = feature.product
     type(product).name = PropertyMock(return_value="My sauna")
     type(product).model = PropertyMock(return_value="saunaBox")
-    return (feature, "climate.my_sauna_saunabox_thermostat")
+    return (feature, "climate.my_sauna")
 
 
 @pytest.fixture(name="thermobox")
@@ -78,7 +78,7 @@ def thermobox_fixture():
     product = feature.product
     type(product).name = PropertyMock(return_value="My thermo")
     type(product).model = PropertyMock(return_value="thermoBox")
-    return (feature, "climate.my_thermo_thermobox_thermostat")
+    return (feature, "climate.my_thermo")
 
 
 async def test_init(
@@ -91,7 +91,7 @@ async def test_init(
     assert entry.unique_id == "BleBox-saunaBox-1afe34db9437-thermostat"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My sauna saunaBox-thermostat"
+    assert state.name == "My sauna"
 
     supported_features = state.attributes[ATTR_SUPPORTED_FEATURES]
     assert supported_features & ClimateEntityFeature.TARGET_TEMPERATURE
diff --git a/tests/components/blebox/test_cover.py b/tests/components/blebox/test_cover.py
index 247fb7419f9b6..56a3bec3e293d 100644
--- a/tests/components/blebox/test_cover.py
+++ b/tests/components/blebox/test_cover.py
@@ -63,7 +63,7 @@ def shutterbox_fixture():
     product = feature.product
     type(product).name = PropertyMock(return_value="My shutter")
     type(product).model = PropertyMock(return_value="shutterBox")
-    return (feature, "cover.my_shutter_shutterbox_position")
+    return (feature, "cover.my_shutter")
 
 
 @pytest.fixture(name="gatebox")
@@ -86,7 +86,7 @@ def gatebox_fixture():
     product = feature.product
     type(product).name = PropertyMock(return_value="My gatebox")
     type(product).model = PropertyMock(return_value="gateBox")
-    return (feature, "cover.my_gatebox_gatebox_position")
+    return (feature, "cover.my_gatebox")
 
 
 @pytest.fixture(name="gatecontroller")
@@ -109,7 +109,7 @@ def gate_fixture():
     product = feature.product
     type(product).name = PropertyMock(return_value="My gate controller")
     type(product).model = PropertyMock(return_value="gateController")
-    return (feature, "cover.my_gate_controller_gatecontroller_position")
+    return (feature, "cover.my_gate_controller")
 
 
 async def test_init_gatecontroller(
@@ -122,7 +122,7 @@ async def test_init_gatecontroller(
     assert entry.unique_id == "BleBox-gateController-2bee34e750b8-position"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My gate controller gateController-position"
+    assert state.name == "My gate controller"
     assert state.attributes[ATTR_DEVICE_CLASS] == CoverDeviceClass.GATE
 
     supported_features = state.attributes[ATTR_SUPPORTED_FEATURES]
@@ -153,7 +153,7 @@ async def test_init_shutterbox(
     assert entry.unique_id == "BleBox-shutterBox-2bee34e750b8-position"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My shutter shutterBox-position"
+    assert state.name == "My shutter"
     assert entry.original_device_class == CoverDeviceClass.SHUTTER
 
     supported_features = state.attributes[ATTR_SUPPORTED_FEATURES]
@@ -184,7 +184,7 @@ async def test_init_gatebox(
     assert entry.unique_id == "BleBox-gateBox-1afe34db9437-position"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My gatebox gateBox-position"
+    assert state.name == "My gatebox"
     assert state.attributes[ATTR_DEVICE_CLASS] == CoverDeviceClass.DOOR
 
     supported_features = state.attributes[ATTR_SUPPORTED_FEATURES]
@@ -248,7 +248,7 @@ async def test_device_class_from_unified_cover_type(
     type(product).name = PropertyMock(return_value="My shutter")
     type(product).model = PropertyMock(return_value="shutterBox")
 
-    entity_id = "cover.my_shutter_shutterbox_position"
+    entity_id = "cover.my_shutter"
     entry = await async_setup_entity(hass, entity_id)
     assert entry.original_device_class == expected_device_class
 
diff --git a/tests/components/blebox/test_light.py b/tests/components/blebox/test_light.py
index 99e4518a93978..8d0bdd74291ad 100644
--- a/tests/components/blebox/test_light.py
+++ b/tests/components/blebox/test_light.py
@@ -50,11 +50,12 @@ def dimmer_fixture():
         supports_white=False,
         color_mode=blebox_uniapi.light.BleboxColorMode.MONO,
         effect_list=None,
+        index=None,
     )
     product = feature.product
     type(product).name = PropertyMock(return_value="My dimmer")
     type(product).model = PropertyMock(return_value="dimmerBox")
-    return (feature, "light.my_dimmer_dimmerbox_brightness")
+    return (feature, "light.my_dimmer")
 
 
 async def test_dimmer_init(
@@ -67,7 +68,7 @@ async def test_dimmer_init(
     assert entry.unique_id == "BleBox-dimmerBox-1afe34e750b8-brightness"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My dimmer dimmerBox-brightness"
+    assert state.name == "My dimmer"
 
     color_modes = state.attributes[ATTR_SUPPORTED_COLOR_MODES]
     assert color_modes == [ColorMode.BRIGHTNESS]
@@ -209,11 +210,12 @@ def wlightboxs_fixture():
         supports_white=False,
         color_mode=blebox_uniapi.light.BleboxColorMode.MONO,
         effect_list=["NONE", "PL", "RELAX"],
+        index=None,
     )
     product = feature.product
     type(product).name = PropertyMock(return_value="My wLightBoxS")
     type(product).model = PropertyMock(return_value="wLightBoxS")
-    return (feature, "light.my_wlightboxs_wlightboxs_color")
+    return (feature, "light.my_wlightboxs")
 
 
 async def test_wlightbox_s_init(
@@ -226,7 +228,7 @@ async def test_wlightbox_s_init(
     assert entry.unique_id == "BleBox-wLightBoxS-1afe34e750b8-color"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My wLightBoxS wLightBoxS-color"
+    assert state.name == "My wLightBoxS"
 
     color_modes = state.attributes[ATTR_SUPPORTED_COLOR_MODES]
     assert color_modes == [ColorMode.BRIGHTNESS]
@@ -305,11 +307,12 @@ def wlightbox_fixture():
         color_mode=blebox_uniapi.light.BleboxColorMode.RGBW,
         effect="NONE",
         effect_list=["NONE", "PL", "POLICE"],
+        index=None,
     )
     product = feature.product
     type(product).name = PropertyMock(return_value="My wLightBox")
     type(product).model = PropertyMock(return_value="wLightBox")
-    return (feature, "light.my_wlightbox_wlightbox_color")
+    return (feature, "light.my_wlightbox")
 
 
 @pytest.fixture(name="wlightbox_ct")
@@ -330,11 +333,12 @@ def wlightbox_ct_fixture() -> tuple[MagicMock, str]:
         color_mode=blebox_uniapi.light.BleboxColorMode.CT,
         effect="NONE",
         effect_list=["NONE", "PL", "POLICE"],
+        index=None,
     )
     product = feature.product
     type(product).name = PropertyMock(return_value="My wLightBox")
     type(product).model = PropertyMock(return_value="wLightBox")
-    return feature, "light.my_wlightbox_wlightbox_ct"
+    return feature, "light.my_wlightbox"
 
 
 @pytest.mark.parametrize("kelvin_requested", [1000, 2700, 3000, 4000, 5000, 6500, 8000])
@@ -389,7 +393,7 @@ async def test_wlightbox_init(
     assert entry.unique_id == "BleBox-wLightBox-1afe34e750b8-color"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My wLightBox wLightBox-color"
+    assert state.name == "My wLightBox"
 
     color_modes = state.attributes[ATTR_SUPPORTED_COLOR_MODES]
     assert color_modes == [ColorMode.RGBW]
@@ -650,3 +654,69 @@ def turn_on(value):
 
     state = hass.states.get(entity_id)
     assert state.attributes[ATTR_EFFECT] == "POLICE"
+
+
+@pytest.mark.parametrize(
+    ("index", "color_mode", "entity_id", "expected_name"),
+    [
+        (
+            0,
+            blebox_uniapi.light.BleboxColorMode.MONO,
+            "light.my_wlightbox_channel_1",
+            "My wLightBox Channel 1",
+        ),
+        (
+            1,
+            blebox_uniapi.light.BleboxColorMode.MONO,
+            "light.my_wlightbox_channel_2",
+            "My wLightBox Channel 2",
+        ),
+        (
+            3,
+            blebox_uniapi.light.BleboxColorMode.MONO,
+            "light.my_wlightbox_channel_4",
+            "My wLightBox Channel 4",
+        ),
+        (
+            0,
+            blebox_uniapi.light.BleboxColorMode.CTx2,
+            "light.my_wlightbox_channel_1",
+            "My wLightBox Channel 1",
+        ),
+        (
+            1,
+            blebox_uniapi.light.BleboxColorMode.CTx2,
+            "light.my_wlightbox_channel_2",
+            "My wLightBox Channel 2",
+        ),
+    ],
+)
+async def test_multichannel_light_name(
+    hass: HomeAssistant,
+    index: int,
+    color_mode: blebox_uniapi.light.BleboxColorMode,
+    entity_id: str,
+    expected_name: str,
+) -> None:
+    """Test that multi-channel lights get the correct channel name."""
+    feature = mock_feature(
+        "lights",
+        blebox_uniapi.light.Light,
+        unique_id=f"BleBox-wLightBox-1afe34e750b8-brightness_{index}",
+        full_name=f"wLightBox-brightness_{index}",
+        device_class=None,
+        brightness=None,
+        is_on=None,
+        supports_color=False,
+        supports_white=False,
+        color_mode=color_mode,
+        effect_list=None,
+        index=index,
+    )
+    product = feature.product
+    type(product).name = PropertyMock(return_value="My wLightBox")
+    type(product).model = PropertyMock(return_value="wLightBox")
+
+    await async_setup_entity(hass, entity_id)
+    state = hass.states.get(entity_id)
+    assert state.name == expected_name
diff --git a/tests/components/blebox/test_sensor.py b/tests/components/blebox/test_sensor.py
index 3ada992f6de01..8a50b926a6952 100644
--- a/tests/components/blebox/test_sensor.py
+++ b/tests/components/blebox/test_sensor.py
@@ -19,7 +19,14 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
-from .conftest import async_setup_config_entry, async_setup_entity, mock_feature
+from .conftest import (
+    async_setup_config_entry,
+    async_setup_entities,
+    async_setup_entity,
+    mock_feature,
+    mock_only_feature,
+    setup_product_mock,
+)
 
 from tests.common import MockConfigEntry
 
@@ -35,11 +42,13 @@ def airsensor_fixture():
         device_class="pm1",
         unit="concentration_of_mp",
         native_value=None,
+        index=None,
     )
+    type(feature).name = PropertyMock(return_value=None)
     product = feature.product
     type(product).name = PropertyMock(return_value="My air sensor")
     type(product).model = PropertyMock(return_value="airSensor")
-    return (feature, "sensor.my_air_sensor_airsensor_0_air")
+    return (feature, "sensor.my_air_sensor_pm1")
 
 
 @pytest.fixture(name="tempsensor")
@@ -54,11 +63,13 @@ def tempsensor_fixture():
         unit="celsius",
         current=None,
         native_value=None,
+        index=None,
     )
+    type(feature).name = PropertyMock(return_value=None)
     product = feature.product
     type(product).name = PropertyMock(return_value="My temperature sensor")
     type(product).model = PropertyMock(return_value="tempSensor")
-    return (feature, "sensor.my_temperature_sensor_tempsensor_0_temperature")
+    return (feature, "sensor.my_temperature_sensor_temperature")
 
 
 async def test_init(
@@ -71,7 +82,7 @@ async def test_init(
     assert entry.unique_id == "BleBox-tempSensor-1afe34db9437-0.temperature"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My temperature sensor tempSensor-0.temperature"
+    assert state.name == "My temperature sensor Temperature"
 
     assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.TEMPERATURE
     assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfTemperature.CELSIUS
@@ -130,7 +141,7 @@ async def test_airsensor_init(
     assert entry.unique_id == "BleBox-airSensor-1afe34db9437-0.air"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My air sensor airSensor-0.air"
+    assert state.name == "My air sensor PM1"
 
     assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.PM1
     assert state.state == STATE_UNKNOWN
@@ -144,6 +155,75 @@ async def test_airsensor_init(
     assert device.sw_version == "1.23"
 
 
+async def test_multi_sensor_single_has_no_channel_suffix(
+    hass: HomeAssistant,
+) -> None:
+    """Test that a single indexed sensor shows no channel suffix."""
+    feature = mock_feature(
+        "sensors",
+        blebox_uniapi.sensor.GenericSensor,
+        unique_id="BleBox-smartMeter-aabbcc-voltage_0",
+        full_name="smartMeter-voltage_0",
+        device_class="voltage",
+        unit="volt",
+        native_value=None,
+        sensor_id=0,
+        index=0,
+    )
+    type(feature).name = PropertyMock(return_value=None)
+    product = feature.product
+    type(product).name = PropertyMock(return_value="My smart meter")
+    type(product).model = PropertyMock(return_value="smartMeter")
+
+    await async_setup_entity(hass, "sensor.my_smart_meter_voltage")
+    state = hass.states.get("sensor.my_smart_meter_voltage")
+    assert state.name == "My smart meter Voltage"
+
+
+async def test_multi_sensor_multiple_have_channel_suffix(
+    hass: HomeAssistant,
+) -> None:
+    """Test SmartMeter-like device: index=0 (summary) has no suffix, index=1-3 (phases) get phase number suffix."""
+    features = [
+        mock_only_feature(
+            blebox_uniapi.sensor.GenericSensor,
+            unique_id=f"BleBox-smartMeter-aabbcc-voltage_{i}",
+            full_name=f"smartMeter-voltage_{i}",
+            device_class="voltage",
+            unit="volt",
+            native_value=None,
+            sensor_id=i,
+            index=i,
+        )
+        for i in range(4)
+    ]
+
+    product = setup_product_mock("sensors", features)
+    type(product).name = PropertyMock(return_value="My smart meter")
+    type(product).model = PropertyMock(return_value="smartMeter")
+    type(product).brand = PropertyMock(return_value="BleBox")
+    type(product).firmware_version = PropertyMock(return_value="1.23")
+    type(product).unique_id = PropertyMock(return_value="aabbcc112233")
+
+    for feature in features:
+        type(feature).product = PropertyMock(return_value=product)
+        type(feature).name = PropertyMock(return_value=None)
+        feature.async_update = AsyncMock()
+
+    entity_ids = [
+        "sensor.my_smart_meter_voltage",
+        "sensor.my_smart_meter_voltage_1",
+        "sensor.my_smart_meter_voltage_2",
+        "sensor.my_smart_meter_voltage_3",
+    ]
+    await async_setup_entities(hass, entity_ids)
+
+    assert hass.states.get(entity_ids[0]).name == "My smart meter Voltage"
+    assert hass.states.get(entity_ids[1]).name == "My smart meter Voltage 1"
+    assert hass.states.get(entity_ids[2]).name == "My smart meter Voltage 2"
+    assert hass.states.get(entity_ids[3]).name == "My smart meter Voltage 3"
+
+
 async def test_airsensor_update(airsensor, hass: HomeAssistant) -> None:
     """Test air quality sensor state after update."""
 
@@ -172,10 +252,11 @@ def open_status_sensor_fixture():
         device_class="openStatus",
         native_value=None,
     )
+    type(feature).name = PropertyMock(return_value=None)
     product = feature.product
     type(product).name = PropertyMock(return_value="My open sensor")
     type(product).model = PropertyMock(return_value="openSensor")
-    return (feature, "sensor.my_open_sensor_opensensor_0_openstatus")
+    return (feature, "sensor.my_open_sensor_open_status")
 
 
 async def test_open_status_sensor_init(open_status_sensor, hass: HomeAssistant) -> None:
@@ -244,10 +325,11 @@ def co2_definition_sensor_fixture():
         device_class="co2Definition",
         native_value=None,
     )
+    type(feature).name = PropertyMock(return_value=None)
     product = feature.product
     type(product).name = PropertyMock(return_value="My CO2 sensor")
     type(product).model = PropertyMock(return_value="co2Sensor")
-    return (feature, "sensor.my_co2_sensor_co2sensor_0_co2definition")
+    return (feature, "sensor.my_co2_sensor_carbon_dioxide_level")
 
 
 async def test_co2_definition_sensor_init(
diff --git a/tests/components/blebox/test_switch.py b/tests/components/blebox/test_switch.py
index 4f0e27bb4f1fc..959e68b43e2f9 100644
--- a/tests/components/blebox/test_switch.py
+++ b/tests/components/blebox/test_switch.py
@@ -41,11 +41,14 @@ def switchbox_fixture():
         full_name="switchBox-0.relay",
         device_class="relay",
         is_on=False,
+        index=0,
     )
+    type(feature).name = PropertyMock(return_value=None)
+    feature.async_update = AsyncMock()
     product = feature.product
     type(product).name = PropertyMock(return_value="My switch box")
     type(product).model = PropertyMock(return_value="switchBox")
-    return (feature, "switch.my_switch_box_switchbox_0_relay")
+    return (feature, "switch.my_switch_box")
 
 
 async def test_switchbox_init(
@@ -59,7 +62,7 @@ async def test_switchbox_init(
     assert entry.unique_id == "BleBox-switchBox-1afe34e750b8-0.relay"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My switch box switchBox-0.relay"
+    assert state.name == "My switch box"
 
     assert state.attributes[ATTR_DEVICE_CLASS] == SwitchDeviceClass.SWITCH
 
@@ -148,13 +151,16 @@ def turn_off():
 def relay_mock(relay_id=0):
     """Return a default switchBoxD switch entity mock."""
 
-    return mock_only_feature(
+    feature = mock_only_feature(
         blebox_uniapi.switch.Switch,
         unique_id=f"BleBox-switchBoxD-1afe34e750b8-{relay_id}.relay",
         full_name=f"switchBoxD-{relay_id}.relay",
         device_class="relay",
         is_on=None,
+        index=relay_id,
     )
+    type(feature).name = PropertyMock(return_value=None)
+    return feature
 
 
 @pytest.fixture(name="switchbox_d")
@@ -178,7 +184,7 @@ def switchbox_d_fixture():
 
     return (
         features,
-        ["switch.my_relays_switchboxd_0_relay", "switch.my_relays_switchboxd_1_relay"],
+        ["switch.my_relays", "switch.my_relays_2"],
     )
 
 
@@ -195,7 +201,7 @@ async def test_switchbox_d_init(
     assert entry.unique_id == "BleBox-switchBoxD-1afe34e750b8-0.relay"
 
     state = hass.states.get(entity_ids[0])
-    assert state.name == "My relays switchBoxD-0.relay"
+    assert state.name == "My relays"
     assert state.attributes[ATTR_DEVICE_CLASS] == SwitchDeviceClass.SWITCH
     assert state.state == STATE_UNKNOWN
 
@@ -211,7 +217,7 @@ async def test_switchbox_d_init(
     assert entry.unique_id == "BleBox-switchBoxD-1afe34e750b8-1.relay"
 
     state = hass.states.get(entity_ids[1])
-    assert state.name == "My relays switchBoxD-1.relay"
+    assert state.name == "My relays"
     assert state.attributes[ATTR_DEVICE_CLASS] == SwitchDeviceClass.SWITCH
     assert state.state == STATE_UNKNOWN
 
@@ -347,6 +353,28 @@ def turn_off1():
     assert hass.states.get(entity_ids[1]).state == STATE_OFF
 
 
+async def test_switchbox_with_name(hass: HomeAssistant) -> None:
+    """Test that a switch with a feature name uses it as the entity name."""
+    feature = mock_feature(
+        "switches",
+        blebox_uniapi.switch.Switch,
+        unique_id="BleBox-switchBoxD-1afe34e750b8-0.relay",
+        full_name="switchBoxD-0.relay",
+        device_class="relay",
+        is_on=False,
+        index=0,
+    )
+    type(feature).name = PropertyMock(return_value="Garden lights")
+    feature.async_update = AsyncMock()
+    product = feature.product
+    type(product).name = PropertyMock(return_value="My switch box")
+    type(product).model = PropertyMock(return_value="switchBoxD")
+
+    await async_setup_entity(hass, "switch.my_switch_box_garden_lights")
+    state = hass.states.get("switch.my_switch_box_garden_lights")
+    assert state.name == "My switch box Garden lights"
+
+
 ALL_SWITCH_FIXTURES = ["switchbox", "switchbox_d"]
 
 
diff --git a/tests/components/blebox/test_update.py b/tests/components/blebox/test_update.py
index dc11de2e4a9d2..9f56b9112fb06 100644
--- a/tests/components/blebox/test_update.py
+++ b/tests/components/blebox/test_update.py
@@ -48,7 +48,7 @@ def firmwareupdate_fixture() -> tuple[blebox_uniapi.update.Update, str]:
     product = feature.product
     type(product).name = PropertyMock(return_value="My airSensor")
     type(product).model = PropertyMock(return_value="airSensor")
-    return (feature, "update.my_airsensor_airsensor_firmware")
+    return (feature, "update.my_airsensor_firmware")
 
 
 async def test_init(
@@ -63,7 +63,7 @@ async def test_init(
     assert entry.unique_id == "BleBox-airSensor-4a3fdaad90aa-firmware"
 
     state = hass.states.get(entity_id)
-    assert state.name == "My airSensor airSensor-firmware"
+    assert state.name == "My airSensor Firmware"
     assert state.attributes[ATTR_DEVICE_CLASS] == UpdateDeviceClass.FIRMWARE
 
     supported_features = state.attributes[ATTR_SUPPORTED_FEATURES]

From 594bcff43fef6940e5dd4746091d941cffb6ad95 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Thu, 11 Jun 2026 22:45:43 +0200
Subject: [PATCH 13/15] Fix Hue grouped light icon by adding translation_key
 (#173536)

---
 homeassistant/components/hue/v2/group.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homeassistant/components/hue/v2/group.py b/homeassistant/components/hue/v2/group.py
index 797fab8fd14cc..f886351c68cb3 100644
--- a/homeassistant/components/hue/v2/group.py
+++ b/homeassistant/components/hue/v2/group.py
@@ -85,6 +85,7 @@ class GroupedHueLight(HueBaseEntity, LightEntity):
 
     entity_description = LightEntityDescription(
         key="hue_grouped_light",
+        translation_key="hue_grouped_light",
         has_entity_name=True,
         name=None,
     )

From 99096e4b65cdde0fefdda2b95a0b92e374641797 Mon Sep 17 00:00:00 2001
From: Legendberg <200012211+Legendberg@users.noreply.github.com>
Date: Thu, 11 Jun 2026 13:47:45 -0700
Subject: [PATCH 14/15] Add Litter-Robot 5 basic entity support (#165879)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../components/litterrobot/binary_sensor.py   |  44 ++++++-
 .../components/litterrobot/button.py          |   6 +
 .../components/litterrobot/icons.json         |  21 ++++
 .../components/litterrobot/sensor.py          |  16 +++
 .../components/litterrobot/strings.json       |  22 ++++
 tests/components/litterrobot/conftest.py      |  51 +++++++-
 .../fixtures/litter_robot_5_data.json         | 109 ++++++++++++++++
 .../fixtures/litter_robot_5_pro_data.json     | 117 ++++++++++++++++++
 .../litterrobot/test_binary_sensor.py         |  47 +++++++
 tests/components/litterrobot/test_button.py   |  39 ++++++
 tests/components/litterrobot/test_select.py   |  77 +++++++++++-
 tests/components/litterrobot/test_sensor.py   |  33 +++++
 12 files changed, 577 insertions(+), 5 deletions(-)
 create mode 100644 tests/components/litterrobot/fixtures/litter_robot_5_data.json
 create mode 100644 tests/components/litterrobot/fixtures/litter_robot_5_pro_data.json

diff --git a/homeassistant/components/litterrobot/binary_sensor.py b/homeassistant/components/litterrobot/binary_sensor.py
index 587e01a291f94..a9a4b091a5a3c 100644
--- a/homeassistant/components/litterrobot/binary_sensor.py
+++ b/homeassistant/components/litterrobot/binary_sensor.py
@@ -4,7 +4,14 @@
 from dataclasses import dataclass
 from typing import Generic
 
-from pylitterbot import FeederRobot, LitterRobot, LitterRobot3, LitterRobot4, Robot
+from pylitterbot import (
+    FeederRobot,
+    LitterRobot,
+    LitterRobot3,
+    LitterRobot4,
+    LitterRobot5,
+    Robot,
+)
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -60,6 +67,41 @@ class RobotBinarySensorEntityDescription(
             is_on_fn=lambda robot: not robot.is_hopper_removed,
         ),
     ),
+    LitterRobot5: (
+        RobotBinarySensorEntityDescription[LitterRobot5](
+            key="hopper_connected",
+            translation_key="hopper_connected",
+            device_class=BinarySensorDeviceClass.CONNECTIVITY,
+            entity_registry_enabled_default=False,
+            is_on_fn=lambda robot: not robot.is_hopper_removed,
+        ),
+        RobotBinarySensorEntityDescription[LitterRobot5](
+            key="drawer_removed",
+            translation_key="drawer_removed",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            is_on_fn=lambda robot: robot.is_drawer_removed,
+        ),
+        RobotBinarySensorEntityDescription[LitterRobot5](
+            key="bonnet_removed",
+            translation_key="bonnet_removed",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            is_on_fn=lambda robot: robot.is_bonnet_removed,
+        ),
+        RobotBinarySensorEntityDescription[LitterRobot5](
+            key="laser_dirty",
+            translation_key="laser_dirty",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            is_on_fn=lambda robot: robot.is_laser_dirty,
+        ),
+        RobotBinarySensorEntityDescription[LitterRobot5](
+            key="online",
+            translation_key="online",
+            device_class=BinarySensorDeviceClass.CONNECTIVITY,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            entity_registry_enabled_default=False,
+            is_on_fn=lambda robot: robot.is_online,
+        ),
+    ),
     (FeederRobot, LitterRobot3, LitterRobot4): (
         RobotBinarySensorEntityDescription[FeederRobot | LitterRobot3 | LitterRobot4](
             key="power_status",
diff --git a/homeassistant/components/litterrobot/button.py b/homeassistant/components/litterrobot/button.py
index 1675145766f8c..7d70e8f497c3d 100644
--- a/homeassistant/components/litterrobot/button.py
+++ b/homeassistant/components/litterrobot/button.py
@@ -41,6 +41,12 @@ class RobotButtonEntityDescription(ButtonEntityDescription, Generic[_WhiskerEnti
         entity_category=EntityCategory.CONFIG,
         press_fn=lambda robot: robot.reset(),
     ),
+    (LitterRobot5,): RobotButtonEntityDescription[LitterRobot5](
+        key="change_filter",
+        translation_key="change_filter",
+        entity_category=EntityCategory.CONFIG,
+        press_fn=lambda robot: robot.change_filter(),
+    ),
     (FeederRobot,): RobotButtonEntityDescription[FeederRobot](
         key="give_snack",
         translation_key="give_snack",
diff --git a/homeassistant/components/litterrobot/icons.json b/homeassistant/components/litterrobot/icons.json
index 4d80b0702ac06..14749e81ea520 100644
--- a/homeassistant/components/litterrobot/icons.json
+++ b/homeassistant/components/litterrobot/icons.json
@@ -1,9 +1,21 @@
 {
   "entity": {
     "binary_sensor": {
+      "bonnet_removed": {
+        "default": "mdi:robot-vacuum-alert"
+      },
+      "drawer_removed": {
+        "default": "mdi:robot-vacuum-alert"
+      },
       "hopper_connected": {
         "default": "mdi:filter-check"
       },
+      "laser_dirty": {
+        "default": "mdi:robot-vacuum-alert"
+      },
+      "online": {
+        "default": "mdi:cloud-check"
+      },
       "sleep_mode": {
         "default": "mdi:sleep"
       },
@@ -12,6 +24,9 @@
       }
     },
     "button": {
+      "change_filter": {
+        "default": "mdi:filter-cog"
+      },
       "give_snack": {
         "default": "mdi:candy-outline"
       },
@@ -65,6 +80,12 @@
           "motor_ot_amps": "mdi:flash-alert"
         }
       },
+      "next_filter_replacement": {
+        "default": "mdi:filter-cog"
+      },
+      "scoops_saved_count": {
+        "default": "mdi:counter"
+      },
       "total_cycles": {
         "default": "mdi:counter"
       },
diff --git a/homeassistant/components/litterrobot/sensor.py b/homeassistant/components/litterrobot/sensor.py
index 61f5115167f90..b5dd21a410ded 100644
--- a/homeassistant/components/litterrobot/sensor.py
+++ b/homeassistant/components/litterrobot/sensor.py
@@ -166,6 +166,22 @@ class RobotSensorEntityDescription(SensorEntityDescription, Generic[_WhiskerEnti
             value_fn=lambda robot: robot.pet_weight,
         ),
     ],
+    LitterRobot5: [
+        RobotSensorEntityDescription[LitterRobot5](
+            key="scoops_saved_count",
+            translation_key="scoops_saved_count",
+            entity_category=EntityCategory.DIAGNOSTIC,
+            state_class=SensorStateClass.TOTAL_INCREASING,
+            value_fn=lambda robot: robot.scoops_saved_count,
+        ),
+        RobotSensorEntityDescription[LitterRobot5](
+            key="next_filter_replacement",
+            translation_key="next_filter_replacement",
+            device_class=SensorDeviceClass.TIMESTAMP,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            value_fn=lambda robot: robot.next_filter_replacement_date,
+        ),
+    ],
     FeederRobot: [
         RobotSensorEntityDescription[FeederRobot](
             key="food_dispensed_today",
diff --git a/homeassistant/components/litterrobot/strings.json b/homeassistant/components/litterrobot/strings.json
index cfa57d1adaf73..066abbbac33df 100644
--- a/homeassistant/components/litterrobot/strings.json
+++ b/homeassistant/components/litterrobot/strings.json
@@ -45,9 +45,21 @@
   },
   "entity": {
     "binary_sensor": {
+      "bonnet_removed": {
+        "name": "Bonnet removed"
+      },
+      "drawer_removed": {
+        "name": "Drawer removed"
+      },
       "hopper_connected": {
         "name": "Hopper connected"
       },
+      "laser_dirty": {
+        "name": "Laser dirty"
+      },
+      "online": {
+        "name": "Online"
+      },
       "power_status": {
         "name": "Power status"
       },
@@ -59,6 +71,9 @@
       }
     },
     "button": {
+      "change_filter": {
+        "name": "Change filter"
+      },
       "give_snack": {
         "name": "Give snack"
       },
@@ -132,9 +147,16 @@
       "next_feeding": {
         "name": "Next feeding"
       },
+      "next_filter_replacement": {
+        "name": "Next filter replacement"
+      },
       "pet_weight": {
         "name": "Pet weight"
       },
+      "scoops_saved_count": {
+        "name": "Scoops saved",
+        "unit_of_measurement": "scoops"
+      },
       "sleep_mode_end_time": {
         "name": "Sleep mode end time"
       },
diff --git a/tests/components/litterrobot/conftest.py b/tests/components/litterrobot/conftest.py
index 10452bb1b3719..ffa80a5a3186b 100644
--- a/tests/components/litterrobot/conftest.py
+++ b/tests/components/litterrobot/conftest.py
@@ -3,7 +3,15 @@
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from pylitterbot import Account, FeederRobot, LitterRobot3, LitterRobot4, Pet, Robot
+from pylitterbot import (
+    Account,
+    FeederRobot,
+    LitterRobot3,
+    LitterRobot4,
+    LitterRobot5,
+    Pet,
+    Robot,
+)
 from pylitterbot.exceptions import InvalidCommandException
 from pylitterbot.robot.litterrobot4 import HopperStatus
 import pytest
@@ -16,6 +24,8 @@
 
 ROBOT_DATA = load_json_object_fixture("litter_robot_3_data.json", DOMAIN)
 ROBOT_4_DATA = load_json_object_fixture("litter_robot_4_data.json", DOMAIN)
+ROBOT_5_DATA = load_json_object_fixture("litter_robot_5_data.json", DOMAIN)
+ROBOT_5_PRO_DATA = load_json_object_fixture("litter_robot_5_pro_data.json", DOMAIN)
 FEEDER_ROBOT_DATA = load_json_object_fixture("feeder_robot_data.json", DOMAIN)
 PET_DATA = load_json_object_fixture("pet_data.json", DOMAIN)
 
@@ -23,7 +33,10 @@
 def create_mock_robot(
     robot_data: dict | None,
     account: Account,
+    *,
     v4: bool,
+    v5: bool,
+    v5_pro: bool,
     feeder: bool,
     side_effect: Any | None = None,
 ) -> Robot:
@@ -31,7 +44,15 @@ def create_mock_robot(
     if not robot_data:
         robot_data = {}
 
-    if v4:
+    if v5 or v5_pro:
+        data = ROBOT_5_PRO_DATA if v5_pro else ROBOT_5_DATA
+        robot = LitterRobot5(data={**data, **robot_data}, account=account)
+        robot.reset = AsyncMock(side_effect=side_effect)
+        robot.change_filter = AsyncMock(side_effect=side_effect)
+        robot.set_night_light_brightness = AsyncMock(side_effect=side_effect)
+        robot.set_night_light_mode = AsyncMock(side_effect=side_effect)
+        robot.set_panel_brightness = AsyncMock(side_effect=side_effect)
+    elif v4:
         robot = LitterRobot4(data={**ROBOT_4_DATA, **robot_data}, account=account)
     elif feeder:
         robot = FeederRobot(data={**FEEDER_ROBOT_DATA, **robot_data}, account=account)
@@ -68,6 +89,8 @@ def create_mock_account(
     side_effect: Any | None = None,
     skip_robots: bool = False,
     v4: bool = False,
+    v5: bool = False,
+    v5_pro: bool = False,
     feeder: bool = False,
     pet: bool = False,
 ) -> MagicMock:
@@ -79,7 +102,17 @@ def create_mock_account(
     account.robots = (
         []
         if skip_robots
-        else [create_mock_robot(robot_data, account, v4, feeder, side_effect)]
+        else [
+            create_mock_robot(
+                robot_data,
+                account,
+                v4=v4,
+                v5=v5,
+                v5_pro=v5_pro,
+                feeder=feeder,
+                side_effect=side_effect,
+            )
+        ]
     )
     account.get_robots = lambda robot_class: [
         robot for robot in account.robots if isinstance(robot, robot_class)
@@ -100,6 +133,18 @@ def mock_account_with_litterrobot_4() -> MagicMock:
     return create_mock_account(v4=True)
 
 
+@pytest.fixture
+def mock_account_with_litterrobot_5() -> MagicMock:
+    """Mock account with Litter-Robot 5."""
+    return create_mock_account(v5=True)
+
+
+@pytest.fixture
+def mock_account_with_litterrobot_5_pro() -> MagicMock:
+    """Mock account with Litter-Robot 5 Pro."""
+    return create_mock_account(v5_pro=True)
+
+
 @pytest.fixture
 def mock_account_with_litterhopper() -> MagicMock:
     """Mock account with LitterHopper attached to Litter-Robot 4."""
diff --git a/tests/components/litterrobot/fixtures/litter_robot_5_data.json b/tests/components/litterrobot/fixtures/litter_robot_5_data.json
new file mode 100644
index 0000000000000..5c3d1adb8785e
--- /dev/null
+++ b/tests/components/litterrobot/fixtures/litter_robot_5_data.json
@@ -0,0 +1,109 @@
+{
+  "name": "Test",
+  "serial": "LR5C010001",
+  "type": "LR5",
+  "timezone": "America/New_York",
+  "powerStatus": "AC",
+  "setupDateTime": "2022-08-28T17:01:12.644Z",
+  "nextFilterReplacementDate": "2023-02-28T17:01:12.644Z",
+  "state": {
+    "odometerCleanCycles": 158,
+    "odometerEmptyCycles": 1,
+    "odometerFilterCycles": 0,
+    "odometerPowerCycles": 8,
+    "lastResetOdometerCleanCycles": 42,
+    "DFINumberOfCycles": 104,
+    "dfiFullCounter": 3,
+    "catDetect": "CAT_DETECT_CLEAR",
+    "isBonnetRemoved": false,
+    "isDrawerRemoved": false,
+    "isDrawerFull": false,
+    "isLaserDirty": false,
+    "isOnline": true,
+    "isHopperInstalled": true,
+    "isSleeping": false,
+    "isNightLightOn": false,
+    "isFirmwareUpdating": false,
+    "isGasSensorFaultDetected": false,
+    "isUsbFaultDetected": false,
+    "weightSensor": 1200.0,
+    "globeMotorFaultStatus": "FAULT_CLEAR",
+    "globeMotorRetractFaultStatus": "FAULT_CLEAR",
+    "pinchStatus": "CLEAR",
+    "lastSeen": "2022-09-17T12:06:37.884Z",
+    "setupDateTime": "2022-08-28T17:01:12.644Z",
+    "firmwareVersions": {
+      "mcuVersion": "10512.2560.2.53",
+      "wifiVersion": "1.1.50"
+    },
+    "firmwareUpdateStatus": "NONE",
+    "litterLevelPercent": 70.0,
+    "globeLitterLevel": 460,
+    "globeLitterLevelIndicator": "OPTIMAL",
+    "robotState": "StRobotIdle",
+    "displayCode": "DcModeIdle",
+    "powerStatus": "AC",
+    "wifiRssi": -53.0,
+    "scoopsSaved": 3769
+  },
+  "litterRobotSettings": {
+    "cycleDelay": 15,
+    "isSmartWeightEnabled": true
+  },
+  "nightLightSettings": {
+    "brightness": 50,
+    "color": "#FFFFFF",
+    "mode": "Auto"
+  },
+  "panelSettings": {
+    "displayIntensity": "Medium",
+    "isKeypadLocked": false
+  },
+  "soundSettings": {
+    "volume": 75
+  },
+  "sleepSchedules": [
+    {
+      "dayOfWeek": 0,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 1,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 2,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 3,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 4,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 5,
+      "isEnabled": false,
+      "sleepTime": 1380,
+      "wakeTime": 480
+    },
+    {
+      "dayOfWeek": 6,
+      "isEnabled": false,
+      "sleepTime": 1380,
+      "wakeTime": 480
+    }
+  ]
+}
diff --git a/tests/components/litterrobot/fixtures/litter_robot_5_pro_data.json b/tests/components/litterrobot/fixtures/litter_robot_5_pro_data.json
new file mode 100644
index 0000000000000..67433dca30fe8
--- /dev/null
+++ b/tests/components/litterrobot/fixtures/litter_robot_5_pro_data.json
@@ -0,0 +1,117 @@
+{
+  "name": "Test Pro",
+  "serial": "LR5P010001",
+  "type": "LR5_PRO",
+  "timezone": "America/New_York",
+  "powerStatus": "AC",
+  "setupDateTime": "2022-08-28T17:01:12.644Z",
+  "nextFilterReplacementDate": "2023-02-28T17:01:12.644Z",
+  "state": {
+    "odometerCleanCycles": 158,
+    "odometerEmptyCycles": 1,
+    "odometerFilterCycles": 0,
+    "odometerPowerCycles": 8,
+    "lastResetOdometerCleanCycles": 42,
+    "DFINumberOfCycles": 104,
+    "dfiFullCounter": 3,
+    "catDetect": "CAT_DETECT_CLEAR",
+    "isBonnetRemoved": false,
+    "isDrawerRemoved": false,
+    "isDrawerFull": false,
+    "isLaserDirty": false,
+    "isOnline": true,
+    "isHopperInstalled": true,
+    "isSleeping": false,
+    "isNightLightOn": false,
+    "isFirmwareUpdating": false,
+    "isGasSensorFaultDetected": false,
+    "isUsbFaultDetected": false,
+    "weightSensor": 1200.0,
+    "globeMotorFaultStatus": "FAULT_CLEAR",
+    "globeMotorRetractFaultStatus": "FAULT_CLEAR",
+    "pinchStatus": "CLEAR",
+    "lastSeen": "2022-09-17T12:06:37.884Z",
+    "setupDateTime": "2022-08-28T17:01:12.644Z",
+    "serial": "LR5P010001",
+    "type": "LR5_PRO",
+    "firmwareVersions": {
+      "mcuVersion": "10512.2560.2.53",
+      "wifiVersion": "1.1.50"
+    },
+    "firmwareUpdateStatus": "NONE",
+    "litterLevelPercent": 70.0,
+    "globeLitterLevel": 460,
+    "globeLitterLevelIndicator": "OPTIMAL",
+    "robotState": "StRobotIdle",
+    "displayCode": "DcModeIdle",
+    "powerStatus": "AC",
+    "wifiRssi": -53.0,
+    "scoopsSaved": 3769
+  },
+  "litterRobotSettings": {
+    "cycleDelay": 15,
+    "isSmartWeightEnabled": true
+  },
+  "nightLightSettings": {
+    "brightness": 50,
+    "color": "#FFFFFF",
+    "mode": "Auto"
+  },
+  "panelSettings": {
+    "displayIntensity": "Medium",
+    "isKeypadLocked": false
+  },
+  "soundSettings": {
+    "volume": 50,
+    "cameraAudioEnabled": false
+  },
+  "sleepSchedules": [
+    {
+      "dayOfWeek": 0,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 1,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 2,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 3,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 4,
+      "isEnabled": true,
+      "sleepTime": 1320,
+      "wakeTime": 420
+    },
+    {
+      "dayOfWeek": 5,
+      "isEnabled": false,
+      "sleepTime": 1380,
+      "wakeTime": 480
+    },
+    {
+      "dayOfWeek": 6,
+      "isEnabled": false,
+      "sleepTime": 1380,
+      "wakeTime": 480
+    }
+  ],
+  "cameraMetadata": {
+    "deviceId": "68f5f44bba1544a7cc8697c2",
+    "serialNumber": "E0510076020EBFV",
+    "spaceId": "0123456789abcdef01234567"
+  }
+}
diff --git a/tests/components/litterrobot/test_binary_sensor.py b/tests/components/litterrobot/test_binary_sensor.py
index a8da7e53d9fea..b0fba179e4258 100644
--- a/tests/components/litterrobot/test_binary_sensor.py
+++ b/tests/components/litterrobot/test_binary_sensor.py
@@ -45,3 +45,50 @@ async def test_litterhopper_binary_sensors(
     assert (
         state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.CONNECTIVITY
     )
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_litter_robot_5_binary_sensors(
+    hass: HomeAssistant,
+    mock_account_with_litterrobot_5: MagicMock,
+) -> None:
+    """Tests Litter-Robot 5 binary sensors."""
+    await setup_integration(hass, mock_account_with_litterrobot_5, BINARY_SENSOR_DOMAIN)
+
+    state = hass.states.get("binary_sensor.test_drawer_removed")
+    assert state
+    assert state.state == "off"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.PROBLEM
+
+    state = hass.states.get("binary_sensor.test_bonnet_removed")
+    assert state
+    assert state.state == "off"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.PROBLEM
+
+    state = hass.states.get("binary_sensor.test_laser_dirty")
+    assert state
+    assert state.state == "off"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.PROBLEM
+
+    state = hass.states.get("binary_sensor.test_hopper_connected")
+    assert state
+    assert state.state == "on"
+    assert (
+        state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.CONNECTIVITY
+    )
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_litter_robot_5_online_sensor(
+    hass: HomeAssistant,
+    mock_account_with_litterrobot_5: MagicMock,
+) -> None:
+    """Tests Litter-Robot 5 online binary sensor (diagnostic, disabled by default)."""
+    await setup_integration(hass, mock_account_with_litterrobot_5, BINARY_SENSOR_DOMAIN)
+
+    state = hass.states.get("binary_sensor.test_online")
+    assert state
+    assert state.state == "on"
+    assert (
+        state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.CONNECTIVITY
+    )
diff --git a/tests/components/litterrobot/test_button.py b/tests/components/litterrobot/test_button.py
index c59d0556b29cb..596a3af048260 100644
--- a/tests/components/litterrobot/test_button.py
+++ b/tests/components/litterrobot/test_button.py
@@ -59,3 +59,42 @@ async def test_button_command_exception(
             {ATTR_ENTITY_ID: BUTTON_ENTITY},
             blocking=True,
         )
+
+
+@pytest.mark.parametrize(
+    ("entity_id", "robot_command"),
+    [
+        ("button.test_reset", "reset"),
+        ("button.test_change_filter", "change_filter"),
+    ],
+)
+async def test_litter_robot_5_button(
+    hass: HomeAssistant,
+    mock_account_with_litterrobot_5: MagicMock,
+    entity_registry: er.EntityRegistry,
+    entity_id: str,
+    robot_command: str,
+) -> None:
+    """Test the Litter-Robot 5 button entities."""
+    await setup_integration(hass, mock_account_with_litterrobot_5, BUTTON_DOMAIN)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_UNKNOWN
+
+    entry = entity_registry.async_get(entity_id)
+    assert entry
+    assert entry.entity_category is EntityCategory.CONFIG
+
+    with freeze_time("2021-11-15 17:37:00", tz_offset=-7):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+    await hass.async_block_till_done()
+    assert (
+        getattr(mock_account_with_litterrobot_5.robots[0], robot_command).call_count
+        == 1
+    )
diff --git a/tests/components/litterrobot/test_select.py b/tests/components/litterrobot/test_select.py
index 7723ec1d478c3..411bedf35121e 100644
--- a/tests/components/litterrobot/test_select.py
+++ b/tests/components/litterrobot/test_select.py
@@ -2,7 +2,8 @@
 
 from unittest.mock import AsyncMock, MagicMock
 
-from pylitterbot import LitterRobot3, LitterRobot4
+from pylitterbot import LitterRobot3, LitterRobot4, LitterRobot5
+from pylitterbot.robot.litterrobot4 import NightLightMode
 import pytest
 
 from homeassistant.components.select import (
@@ -127,3 +128,77 @@ async def test_select_command_exception(
             {ATTR_ENTITY_ID: SELECT_ENTITY_ID, ATTR_OPTION: "7"},
             blocking=True,
         )
+
+
+async def test_litterrobot_5_globe_light(
+    hass: HomeAssistant,
+    mock_account_with_litterrobot_5: MagicMock,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Tests the Litter-Robot 5 globe light (night light mode) select entity."""
+    entity_id = "select.test_globe_light"
+    await setup_integration(hass, mock_account_with_litterrobot_5, SELECT_DOMAIN)
+
+    select = hass.states.get(entity_id)
+    assert select
+    assert len(select.attributes[ATTR_OPTIONS]) == 3
+    assert select.state == "auto"
+
+    entity_entry = entity_registry.async_get(entity_id)
+    assert entity_entry
+    assert entity_entry.entity_category is EntityCategory.CONFIG
+
+    data = {ATTR_ENTITY_ID: entity_id}
+
+    robot: LitterRobot5 = mock_account_with_litterrobot_5.robots[0]
+
+    for option in select.attributes[ATTR_OPTIONS]:
+        data[ATTR_OPTION] = option
+
+        await hass.services.async_call(
+            SELECT_DOMAIN,
+            SERVICE_SELECT_OPTION,
+            data,
+            blocking=True,
+        )
+
+    assert robot.set_night_light_mode.call_count == 3
+    robot.set_night_light_mode.assert_any_call(NightLightMode.OFF)
+    robot.set_night_light_mode.assert_any_call(NightLightMode.ON)
+    robot.set_night_light_mode.assert_any_call(NightLightMode.AUTO)
+
+
+async def test_litterrobot_5_panel_brightness(
+    hass: HomeAssistant,
+    mock_account_with_litterrobot_5: MagicMock,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Tests the Litter-Robot 5 panel brightness select entity."""
+    entity_id = "select.test_panel_brightness"
+    await setup_integration(hass, mock_account_with_litterrobot_5, SELECT_DOMAIN)
+
+    select = hass.states.get(entity_id)
+    assert select
+    assert len(select.attributes[ATTR_OPTIONS]) == 3
+    assert select.state == "medium"
+
+    entity_entry = entity_registry.async_get(entity_id)
+    assert entity_entry
+    assert entity_entry.entity_category is EntityCategory.CONFIG
+
+    data = {ATTR_ENTITY_ID: entity_id}
+
+    robot: LitterRobot5 = mock_account_with_litterrobot_5.robots[0]
+    robot.set_panel_brightness = AsyncMock(return_value=True)
+
+    for count, option in enumerate(select.attributes[ATTR_OPTIONS]):
+        data[ATTR_OPTION] = option
+
+        await hass.services.async_call(
+            SELECT_DOMAIN,
+            SERVICE_SELECT_OPTION,
+            data,
+            blocking=True,
+        )
+
+        assert robot.set_panel_brightness.call_count == count + 1
diff --git a/tests/components/litterrobot/test_sensor.py b/tests/components/litterrobot/test_sensor.py
index 5fcb49e1b581d..354431531ccce 100644
--- a/tests/components/litterrobot/test_sensor.py
+++ b/tests/components/litterrobot/test_sensor.py
@@ -154,3 +154,36 @@ async def test_litterhopper_sensor(
     await setup_integration(hass, mock_account_with_litterhopper, SENSOR_DOMAIN)
     sensor = hass.states.get("sensor.test_hopper_status")
     assert sensor.state == "enabled"
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_litter_robot_5_sensor(
+    hass: HomeAssistant, mock_account_with_litterrobot_5: MagicMock
+) -> None:
+    """Tests Litter-Robot 5 sensors."""
+    await setup_integration(hass, mock_account_with_litterrobot_5, SENSOR_DOMAIN)
+
+    sensor = hass.states.get("sensor.test_litter_level")
+    assert sensor
+    assert sensor.state == "70.0"
+    assert sensor.attributes["unit_of_measurement"] == PERCENTAGE
+
+    sensor = hass.states.get("sensor.test_pet_weight")
+    assert sensor
+    assert sensor.state == "12.0"
+    assert sensor.attributes["unit_of_measurement"] == UnitOfMass.POUNDS
+
+    sensor = hass.states.get("sensor.test_scoops_saved")
+    assert sensor
+    assert sensor.state == "3769"
+    assert sensor.attributes["state_class"] == SensorStateClass.TOTAL_INCREASING
+
+    sensor = hass.states.get("sensor.test_next_filter_replacement")
+    assert sensor
+    assert sensor.state == "2023-02-28T17:01:12+00:00"
+    assert sensor.attributes["device_class"] == SensorDeviceClass.TIMESTAMP
+
+    sensor = hass.states.get("sensor.test_total_cycles")
+    assert sensor
+    assert sensor.state == "158"
+    assert sensor.attributes["state_class"] == SensorStateClass.TOTAL_INCREASING

From 2e8e5c63e86ea19012729ee72fb54081b25b55d5 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Thu, 11 Jun 2026 23:17:04 +0200
Subject: [PATCH 15/15] Fix Hue light level sensor crash on None value
 (#173532)

---
 homeassistant/components/hue/v2/sensor.py |  4 +++-
 tests/components/hue/test_sensor_v2.py    | 21 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/hue/v2/sensor.py b/homeassistant/components/hue/v2/sensor.py
index c5e621affce2a..20b100ba08576 100644
--- a/homeassistant/components/hue/v2/sensor.py
+++ b/homeassistant/components/hue/v2/sensor.py
@@ -166,8 +166,10 @@ class HueLightLevelSensor(HueSensorBase):
     )
 
     @property
-    def native_value(self) -> int:
+    def native_value(self) -> int | None:
         """Return the value reported by the sensor."""
+        if self.resource.light.value is None:
+            return None
         # Light level in 10000 log10 (lux) +1 measured by sensor. Logarithm
         # scale used because the human eye adjusts to light levels and small
         # changes at low lux levels are more noticeable than at high lux
diff --git a/tests/components/hue/test_sensor_v2.py b/tests/components/hue/test_sensor_v2.py
index e7b90c2015dcf..ed86444933cc3 100644
--- a/tests/components/hue/test_sensor_v2.py
+++ b/tests/components/hue/test_sensor_v2.py
@@ -3,7 +3,7 @@
 from unittest.mock import Mock
 
 from homeassistant.components import hue
-from homeassistant.const import Platform
+from homeassistant.const import STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -185,3 +185,22 @@ async def test_grouped_light_level_sensor(
     assert (
         sensor.state == "999"
     )  # Light level 30000 translates to 10^((30000-1)/10000) ≈ 999 lux
+
+
+async def test_light_level_sensor_none_value(
+    hass: HomeAssistant, mock_bridge_v2: Mock, v2_resources_test_data: JsonArrayType
+) -> None:
+    """Test that light level sensor handles None value without crashing."""
+    # Modify the light_level sensor to have None value (simulates sensor unavailability)
+    for resource in v2_resources_test_data:
+        if resource.get("id") == "d504e7a4-9a18-4854-90fd-c5b6ac102c40":
+            resource["light"]["light_level"] = None
+            resource["light"]["light_level_valid"] = False
+            break
+
+    await mock_bridge_v2.api.load_test_data(v2_resources_test_data)
+    await setup_platform(hass, mock_bridge_v2, Platform.SENSOR)
+
+    sensor = hass.states.get("sensor.hue_motion_sensor_illuminance")
+    assert sensor is not None
+    assert sensor.state == STATE_UNKNOWN