fix(lemonade): validate grouped amd_gpu/nvidia_gpu device keys

Live Lemonade groups AMD/NVIDIA GPUs under a single amd_gpu/nvidia_gpu
list key, but _validate_device_requirement only normalized the macOS
'metal' key. A present Radeon dGPU under amd_gpu fell through to CPU, so
a device='gpu' request wrongly raised HardwareRequirementError and forced
a CPU fallback. Generalize the normalization to any detected GPU key via
the existing shape-agnostic _is_gpu_device_key helper.

Closes #2367

Author: github-actions[bot]

src/gaia/llm/lemonade_manager.py

@@ -422,11 +422,11 @@ def _validate_device_requirement(cls, client, required_min_device, device):
                             if k in item:
                                 detected.add(str(item[k]))
                                 break
-        # Lemonade on Apple Silicon reports the llama.cpp Metal backend as
-        # 'metal' in system_info while its health payload calls the same device
-        # 'gpu' — normalize to the generic GPU tier so a default device='gpu'
-        # request validates on macOS instead of falling through to cpu.
-        if "metal" in detected:
+        # Live Lemonade groups AMD/NVIDIA GPUs under amd_gpu/nvidia_gpu (a list),
+        # and Apple Silicon uses 'metal' — none are in _DEVICE_PRIORITY's legacy
+        # amd_igpu/amd_dgpu keys. Normalize any detected GPU to the generic GPU
+        # tier so a present dGPU isn't rejected and forced to CPU.
+        if any(_is_gpu_device_key(d) for d in detected):
             detected.add("amd_dgpu")
         # Find highest-capability detected device
         highest = None

tests/unit/test_multi_device_wiring.py

@@ -92,6 +92,76 @@ def test_cpu_always_satisfied(self, monkeypatch):
         assert LemonadeManager.ensure_ready(device="cpu") is True
 
 
+class TestGpuValidatedForGroupedKeyShapes:
+    """A 'gpu' request validates against live Lemonade's grouped-key shapes.
+
+    Live Lemonade on Linux/Windows reports AMD/NVIDIA GPUs under a single
+    grouped key (``amd_gpu``/``nvidia_gpu``) whose value is a *list*, not the
+    legacy split ``amd_igpu``/``amd_dgpu`` keys. ``_validate_device_requirement``
+    used to only normalize the macOS ``metal`` key, so a real dGPU under
+    ``amd_gpu`` fell through to CPU and a ``gpu`` request wrongly raised.
+    """
+
+    def test_gpu_satisfied_on_amd_gpu_list_shape(self, monkeypatch):
+        # The reproduction shape: amd_gpu as a list (RX 7900 XTX), amd_npu
+        # unavailable — same payload live Lemonade returns on Ubuntu.
+        from gaia.llm.lemonade_manager import LemonadeManager
+
+        _patch_lemonade(monkeypatch, "lemonade11_amd_dgpu_windows.json")
+        assert LemonadeManager.ensure_ready(device="gpu") is True
+
+    def test_gpu_satisfied_on_metal_shape(self, monkeypatch):
+        from gaia.llm.lemonade_manager import LemonadeManager
+
+        _patch_lemonade(monkeypatch, "lemonade11_metal_macos.json")
+        assert LemonadeManager.ensure_ready(device="gpu") is True
+
+    def test_gpu_satisfied_on_nvidia_gpu_list_shape(self, monkeypatch):
+        from gaia.llm.lemonade_client import LemonadeClient
+        from gaia.llm.lemonade_manager import LemonadeManager
+
+        data = {
+            "devices": {
+                "nvidia_gpu": [{"available": True, "name": "NVIDIA GeForce RTX 4090"}],
+                "amd_npu": {"available": False},
+                "cpu": {"available": True},
+            }
+        }
+        monkeypatch.setattr(
+            LemonadeClient, "get_status", lambda self: _make_status(), raising=False
+        )
+        monkeypatch.setattr(
+            LemonadeClient, "get_system_info", lambda self: data, raising=False
+        )
+        assert LemonadeManager.ensure_ready(device="gpu") is True
+
+    def test_unavailable_amd_gpu_list_still_fails(self, monkeypatch):
+        # Availability floor preserved: a present-but-available:false grouped
+        # GPU must NOT satisfy a gpu request.
+        from gaia.llm.lemonade_client import LemonadeClient
+        from gaia.llm.lemonade_manager import (
+            HardwareRequirementError,
+            LemonadeManager,
+        )
+
+        data = {
+            "devices": {
+                "amd_gpu": [{"available": False, "name": "AMD Radeon RX 7900 XTX"}],
+                "amd_npu": {"available": False},
+                "cpu": {"available": True},
+            }
+        }
+        monkeypatch.setattr(
+            LemonadeClient, "get_status", lambda self: _make_status(), raising=False
+        )
+        monkeypatch.setattr(
+            LemonadeClient, "get_system_info", lambda self: data, raising=False
+        )
+        with pytest.raises(HardwareRequirementError) as exc:
+            LemonadeManager.ensure_ready(device="gpu")
+        assert "gpu" in str(exc.value).lower()
+
+
 # ── B2: unavailable device fails loudly with an actionable error ──────────────