Apple Touch Icons added 3

2

.gitignore

@@ -61,3 +61,10 @@ Thumbs.db
 
 # Poetry
 poetry.lock
+
+apps/homekit/homekit.state
+
+tools/ca/
+tools/clients/
+tools/certificates/
+tools/certificates.tgz

.woodpecker/build.yml

@@ -0,0 +1,25 @@
+matrix:
+  APP:
+    - ui
+    - api
+    - abstraction
+    - rules
+
+steps:
+  build-${APP}:
+    image: plugins/kaniko
+    settings:
+      registry:
+        from_secret: local_registry
+      username:
+        from_secret: local_username
+      password:
+        from_secret: local_password
+      repo: ${FORGE_NAME}/${CI_REPO}/${APP}
+      auto_tag: true
+      dockerfile: apps/${APP}/Dockerfile
+    when:
+      event: [tag]
+      ref:
+        exclude:
+          - refs/tags/*-configchange

.woodpecker/deploy.yml

@@ -0,0 +1,29 @@
+matrix:
+  APP:
+    - ui
+    - api
+    - abstraction
+    - rules
+
+steps:
+  deploy-${APP}:
+    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
+      NAMESPACE: "homea2"
+      IMAGE: "${FORGE_NAME}/${CI_REPO}/${APP}:${CI_COMMIT_TAG}"
+    commands:
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - echo "Deploying application ${APP} ($IMAGE) to namespace $NAMESPACE"
+      - cat deployment/${APP}-deployment.yaml | sed "s,%IMAGE%,$IMAGE,g" | kubectl apply -n $NAMESPACE -f -
+    when:
+      event: [tag]
+      ref:
+        exclude:
+          - refs/tags/*-configchange
+
+depends_on:
+  - build
+  - predeploy

.woodpecker/predeploy.yml

@@ -0,0 +1,38 @@
+steps:
+  create_namespace:
+    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
+      NAMESPACE: "homea2"
+    commands:
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - kubectl create namespace $NAMESPACE || echo "Namespace $NAMESPACE already exists"
+    when:
+      event: [tag]
+      ref:
+        exclude:
+          - refs/tags/*-configchange
+
+  apply_configuration:
+    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
+      NAMESPACE: "homea2"
+    commands:
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - kubectl create configmap home-automation-config 
+        --from-file=devices.yaml=config/devices.yaml 
+        --from-file=groups.yaml=config/groups.yaml 
+        --from-file=layout.yaml=config/layout.yaml 
+        --from-file=rules.yaml=config/rules.yaml 
+        --from-file=scenes.yaml=config/scenes.yaml 
+        --namespace=$NAMESPACE 
+        --dry-run=client -o yaml | kubectl apply -f - 
+      - kubectl apply -f deployment/configmap.yaml -n $NAMESPACE
+    when:
+      event: [tag]
+

PORTS.md

@@ -1,53 +0,0 @@
-# Port Configuration
-
-This document describes the port allocation for the home automation services.
-
-## Port Scan Results (31. Oktober 2025)
-
-### Ports in Use
-- **8000**: In use (likely API server)
-- **8021**: In use (system service)
-- **8080**: In use (system service)
-- **8100**: In use (system service)
-- **8200**: In use (system service)
-- **8770**: In use (system service)
-
-### Free Ports Found
-- **8001**: FREE ✓
-- **8002**: FREE ✓
-- **8003**: FREE ✓
-- **8004**: FREE ✓
-- **8005**: FREE ✓
-
-## Service Port Allocation
-
-| Service | Port | Purpose |
-|---------|------|---------|
-| API     | 8001 | FastAPI REST API for capabilities and health checks |
-| UI      | 8002 | FastAPI web interface with Jinja2 templates |
-| (Reserved) | 8003 | Available for future services |
-| (Reserved) | 8004 | Available for future services |
-| (Reserved) | 8005 | Available for future services |
-
-## Access URLs
-
-- **API**: http://localhost:8001
-  - Health: http://localhost:8001/health
-  - Spec: http://localhost:8001/spec
-  - Docs: http://localhost:8001/docs
-
-- **UI**: http://localhost:8002
-  - Main page: http://localhost:8002/
-
-## Starting Services
-
-```bash
-# Start API
-poetry run uvicorn apps.api.main:app --reload --port 8001
-
-# Start UI
-poetry run uvicorn apps.ui.main:app --reload --port 8002
-
-# Start Abstraction Worker (no port - MQTT client)
-poetry run python -m apps.abstraction.main
-```

README.md

@@ -1,29 +1,63 @@
 # Home Automation Monorepo
 
-A Python-based home automation system built with Poetry in a monorepo structure.
+A Python-based home automation system built with Poetry in a monorepo structure. Features a microservices architecture with MQTT/Redis messaging, dynamic UI with realtime updates, and flexible device configuration.
+
+## Features
+
+- **Dynamic Dashboard**: Responsive web UI with realtime device status via Server-Sent Events
+- **MQTT Integration**: Device communication through MQTT broker with vendor abstraction
+- **Realtime Updates**: Live device state updates via Redis Pub/Sub and SSE
+- **Flexible Layout**: Configure rooms and device tiles via YAML
+- **Multiple Device Support**: Lights with power and brightness control
+- **Clean Architecture**: Separation of concerns with API-first design
 
 ## Project Structure
 
 ```
 home-automation/
 ├── apps/                    # Applications
-│   ├── api/                # API service
-│   ├── abstraction/        # Abstraction layer
-│   ├── rules/              # Rules engine
-│   └── ui/                 # User interface
+│   ├── api/                # API Gateway (FastAPI, port 8001)
+│   │   └── main.py        # REST API, SSE endpoint, device management
+│   ├── abstraction/        # MQTT ↔ Redis Bridge
+│   │   └── main.py        # Protocol translation layer
+│   ├── rules/              # Rules Engine (planned)
+│   └── ui/                 # Web Interface (FastAPI, port 8002)
+│       ├── main.py        # Jinja2 templates, API client
+│       ├── api_client.py  # HTTP client for API Gateway
+│       ├── templates/     # HTML templates
+│       │   ├── dashboard.html  # Dynamic dashboard
+│       │   └── index.html      # Legacy static UI
+│       └── static/        # CSS and assets
 ├── packages/               # Shared packages
-│   └── home_capabilities/  # Home capabilities library
+│   └── home_capabilities/  # Core libraries
+│       ├── light.py       # Light device models
+│       └── layout.py      # UI layout models
+├── config/                 # Configuration files
+│   ├── devices.yaml       # Device definitions with features
+│   └── layout.yaml        # UI room/device layout
+├── tools/                  # Development tools
+│   └── sim_test_lampe.py  # Multi-device MQTT simulator
 ├── infra/                  # Infrastructure
 │   ├── docker-compose.yml
 │   └── README.md
 ├── pyproject.toml          # Poetry configuration
+├── PORTS.md               # Port allocation
 └── README.md
 ```
 
 ## Requirements
 
-- Python 3.11+
-- Poetry
+- Python 3.11+ (tested with 3.14.0)
+- Poetry 2.2.1+
+- MQTT Broker (e.g., Mosquitto)
+- Redis Server
+
+### External Services
+
+This system requires the following external services:
+
+- **MQTT Broker**: `172.16.2.16:1883` (configured in `config/devices.yaml`)
+- **Redis Server**: `172.23.1.116:6379/8` (configured in `config/devices.yaml`)
 
 ## Setup
 
@@ -42,8 +76,57 @@ home-automation/
    poetry shell
    ```
 
+4. Configure devices and layout:
+   - Edit `config/devices.yaml` for device definitions and MQTT/Redis settings
+   - Edit `config/layout.yaml` for UI room organization
+
+## Configuration
+
+### devices.yaml
+
+Defines available devices with their features and MQTT topics:
+
+```yaml
+devices:
+  - device_id: test_lampe_1
+    type: light
+    features:
+      power: true
+      brightness: true
+    topics:
+      set: "vendor/test_lampe_1/set"
+      state: "vendor/test_lampe_1/state"
+```
+
+### layout.yaml
+
+Organizes devices into rooms for the UI:
+
+```yaml
+rooms:
+  - name: Wohnzimmer
+    devices:
+      - device_id: test_lampe_1
+        title: Stehlampe
+        icon: "LIGHT"
+        rank: 10  # Lower rank = higher priority
+```
+
 ## Development
 
+### Dependencies
+
+Key packages installed:
+
+- **Web Framework**: FastAPI 0.120.3, Uvicorn 0.38.0
+- **Data Validation**: Pydantic 2.12.3
+- **MQTT**: aiomqtt 2.4.0 (async), paho-mqtt 2.1.0 (sync)
+- **Redis**: redis 7.0.1
+- **HTTP Client**: httpx 0.28.1
+- **Templates**: Jinja2 3.1.6
+- **Config**: PyYAML 6.0.3
+- **Testing**: beautifulsoup4 4.14.2
+
 ### Code Quality Tools
 
 This project uses the following tools configured in `pyproject.toml`:
@@ -65,8 +148,105 @@ poetry run ruff check .
 poetry run mypy .
 ```
 
+### Adding New Devices
+
+1. Add device to `config/devices.yaml`:
+   ```yaml
+   - device_id: new_device
+     type: light
+     features:
+       power: true
+       brightness: false
+     topics:
+       set: "vendor/new_device/set"
+       state: "vendor/new_device/state"
+   ```
+
+2. Add device to rooms in `config/layout.yaml`:
+   ```yaml
+   rooms:
+     - name: Kitchen
+       devices:
+         - device_id: new_device
+           title: Kitchen Light
+           icon: "LIGHT"
+           rank: 5
+   ```
+
+3. Restart API and UI services (they will auto-reload if using `--reload`)
+
+4. Device will appear in dashboard automatically!
+
+### Extending Features
+
+To add new device capabilities:
+
+1. Update Pydantic models in `packages/home_capabilities/`
+2. Add feature to `devices.yaml`
+3. Extend dashboard template for UI controls
+4. Update simulator or create new simulator for testing
+
+## Troubleshooting
+
+### Connection Issues
+
+- **SSE not connecting**: Check API server is running on port 8001
+- **Device not responding**: Check MQTT broker connectivity
+- **No updates in UI**: Check abstraction layer and Redis connection
+
+### Check Logs
+
+```bash
+# API logs
+tail -f /tmp/api.log
+
+# Abstraction layer logs
+tail -f /tmp/abstraction.log
+
+# UI logs
+tail -f /tmp/ui.log
+```
+
+### Common Commands
+
+```bash
+# Check if services are running
+ps aux | grep -E "uvicorn|abstraction"
+
+# Check port usage
+lsof -i :8001
+lsof -i :8002
+
+# Test MQTT connection
+mosquitto_pub -h 172.16.2.16 -t test -m "hello"
+```
+
 ### Running Applications
 
+#### Quick Start - All Services
+
+Start all services in the background:
+
+```bash
+# 1. Start MQTT Abstraction Layer
+poetry run python -m apps.abstraction.main > /tmp/abstraction.log 2>&1 &
+
+# 2. Start API Gateway
+poetry run uvicorn apps.api.main:app --host 0.0.0.0 --port 8001 > /tmp/api.log 2>&1 &
+
+# 3. Start UI
+poetry run uvicorn apps.ui.main:app --host 0.0.0.0 --port 8002 > /tmp/ui.log 2>&1 &
+
+# 4. Start Device Simulator (optional)
+poetry run python tools/sim_test_lampe.py &
+```
+
+Stop all services:
+
+```bash
+pkill -f "uvicorn apps" && pkill -f "apps.abstraction.main" && pkill -f "sim_test_lampe"
+```
+
 #### Port Configuration
 
 See `PORTS.md` for detailed port allocation.
@@ -93,7 +273,10 @@ The API will be available at:
 
 Available endpoints:
 - `GET /health` - Health check endpoint
-- `GET /spec` - Capabilities specification
+- `GET /devices` - List all devices with features
+- `GET /layout` - Get UI layout configuration
+- `POST /devices/{device_id}/set` - Control a device
+- `GET /realtime` - Server-Sent Events stream for live updates
 
 #### UI Server
 
@@ -108,20 +291,142 @@ poetry run python -m apps.ui.main
 ```
 
 The UI will be available at:
-- Main page: http://localhost:8002
-- `GET /spec` - Capabilities specification
+- **Dynamic Dashboard**: http://localhost:8002/dashboard (or http://localhost:8002)
+  - Realtime device status via SSE
+  - Toggle buttons with state reflection
+  - Brightness sliders for dimmable lights
+  - Event log for all updates
+  - Responsive layout from `config/layout.yaml`
+- **Legacy Static UI**: http://localhost:8002/index.html
+  - Fixed layout with test_lampe_1 and test_lampe_2
+
+#### Abstraction Layer
+
+The MQTT-Redis bridge translates between protocols:
+
+```bash
+poetry run python -m apps.abstraction.main
+```
+
+Functions:
+- Subscribes to vendor-specific MQTT topics (`vendor/*/state`)
+- Publishes state changes to Redis Pub/Sub (`ui:updates`)
+- Enables decoupling of UI from MQTT
+
+#### Device Simulator
+
+Test your setup with the multi-device simulator:
+
+```bash
+poetry run python tools/sim_test_lampe.py
+```
+
+Simulates:
+- `test_lampe_1`: Light with power and brightness control
+- `test_lampe_2`: Simple light with power only
+- `test_lampe_3`: Simple light with power only
+
+The simulator:
+- Subscribes to `vendor/test_lampe_*/set` topics
+- Maintains device state (power, brightness)
+- Publishes state to `vendor/test_lampe_*/state` (retained)
+- Handles graceful shutdown (sets all lights to off)
 
 #### Other Applications
 
 ```bash
-# Abstraction
-poetry run python -m apps.abstraction.main
-
-# Rules
+# Rules Engine (planned)
 poetry run python -m apps.rules.main
+```
 
-# UI
-poetry run python -m apps.ui.main
+## Architecture
+
+### Message Flow
+
+```
+User Action (UI) 
+  → HTTP POST to API Gateway (/devices/{id}/set)
+    → MQTT Publish (home/light/{id}/set)
+      → Abstraction Layer receives
+        → MQTT Publish (vendor/{id}/set)
+          → Device/Simulator receives
+            → Device State Update
+              → MQTT Publish (vendor/{id}/state, retained)
+                → Abstraction Layer receives
+                  → Redis Pub/Sub (ui:updates)
+                    → API Gateway /realtime SSE
+                      → UI Updates (EventSource)
+```
+
+### Key Components
+
+1. **API Gateway** (`apps/api/main.py`)
+   - Single source of truth for configuration
+   - REST endpoints for device control
+   - SSE endpoint for realtime updates
+   - Reads `devices.yaml` and `layout.yaml`
+
+2. **UI** (`apps/ui/main.py`)
+   - Pure API consumer (no direct file access)
+   - Fetches devices and layout via HTTP
+   - Renders dynamic dashboard with Jinja2
+   - Connects to SSE for live updates
+
+3. **Abstraction Layer** (`apps/abstraction/main.py`)
+   - Protocol translation (MQTT ↔ Redis)
+   - Subscribes to vendor topics
+   - Publishes to Redis for UI updates
+
+4. **Device Simulator** (`tools/sim_test_lampe.py`)
+   - Emulates physical devices
+   - Responds to SET commands
+   - Publishes STATE updates
+
+## Testing
+
+### Manual Testing
+
+1. Start all services (see Quick Start above)
+
+2. Open the dashboard: http://localhost:8002
+
+3. Toggle a light and watch:
+   - Button changes state (Einschalten ↔ Ausschalten)
+   - Status updates in realtime
+   - Event log shows all messages
+
+4. Check MQTT traffic:
+   ```bash
+   # Subscribe to all topics
+   mosquitto_sub -h 172.16.2.16 -t '#' -v
+   
+   # Publish test command
+   mosquitto_pub -h 172.16.2.16 -t 'vendor/test_lampe_1/set' \
+     -m '{"power":"on","brightness":75}'
+   ```
+
+5. Check Redis Pub/Sub:
+   ```bash
+   redis-cli -h 172.23.1.116 -p 6379 -n 8
+   > SUBSCRIBE ui:updates
+   ```
+
+### API Testing
+
+```bash
+# Get all devices
+curl http://localhost:8001/devices | python3 -m json.tool
+
+# Get layout
+curl http://localhost:8001/layout | python3 -m json.tool
+
+# Control a device
+curl -X POST http://localhost:8001/devices/test_lampe_1/set \
+  -H "Content-Type: application/json" \
+  -d '{"type":"light","payload":{"power":"on"}}'
+
+# Test SSE stream
+curl -N http://localhost:8001/realtime
 ```
 
 ## License

apps/abstraction/Dockerfile

@@ -0,0 +1,44 @@
+# Abstraction Layer Dockerfile
+# MQTT ↔ Device Protocol Translation Worker
+
+FROM python:3.14-alpine
+
+# Prevent Python from writing .pyc files and enable unbuffered output
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    MQTT_BROKER=172.16.2.16 \
+    MQTT_PORT=1883 \
+    REDIS_HOST=localhost \
+    REDIS_PORT=6379 \
+    REDIS_DB=0
+
+# Create non-root user
+RUN addgroup -g 10001 -S app && \
+    adduser -u 10001 -S app -G app
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies
+RUN apk add --no-cache \
+    gcc \
+    musl-dev \
+    linux-headers
+
+# Install Python dependencies
+COPY apps/abstraction/requirements.txt /app/requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY apps/__init__.py /app/apps/__init__.py
+COPY apps/abstraction/ /app/apps/abstraction/
+COPY packages/ /app/packages/
+
+# Change ownership to app user
+RUN chown -R app:app /app
+
+# Switch to non-root user
+USER app
+
+# Run application
+CMD ["python", "-m", "apps.abstraction.main"]

apps/abstraction/README.md

@@ -12,11 +12,46 @@ The abstraction layer is an asyncio-based worker that manages device communicati
 
 ## Running
 
+### Local Development
+
 ```bash
 # Start the abstraction worker
 poetry run python -m apps.abstraction.main
 ```
 
+### Docker Container
+
+#### Build Image
+
+```bash
+docker build -t abstraction:dev -f apps/abstraction/Dockerfile .
+```
+
+#### Run Container
+
+```bash
+docker run --rm \
+  -v $(pwd)/config:/app/config:ro \
+  -e MQTT_BROKER=172.23.1.102 \
+  -e MQTT_PORT=1883 \
+  -e REDIS_HOST=172.23.1.116 \
+  -e REDIS_PORT=6379 \
+  -e REDIS_DB=8 \
+  abstraction:dev
+```
+
+#### Environment Variables
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `MQTT_BROKER` | `172.16.2.16` | MQTT broker hostname/IP |
+| `MQTT_PORT` | `1883` | MQTT broker port |
+| `REDIS_HOST` | `localhost` | Redis server hostname/IP |
+| `REDIS_PORT` | `6379` | Redis server port |
+| `REDIS_DB` | `0` | Redis database number |
+
+### What the Worker Does
+
 The worker will:
 1. Load configuration from `config/devices.yaml`
 2. Connect to MQTT broker (172.16.2.16:1883)

apps/abstraction/main.py

@@ -4,16 +4,26 @@ import asyncio
 import json
 import logging
 import os
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
 import redis.asyncio as aioredis
 import yaml
+import socket
+import uuid
 from aiomqtt import Client
+from pydantic import ValidationError
+
+from packages.home_capabilities import LightState, ThermostatState, ContactState, TempHumidityState, RelayState, ThreePhasePowerState
+from apps.abstraction.transformation import (
+    transform_abstract_to_vendor,
+    transform_vendor_to_abstract
+)
 
 # Configure logging
 logging.basicConfig(
-    level=logging.INFO,
+    level=logging.DEBUG,
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
 )
 logger = logging.getLogger(__name__)
@@ -32,8 +42,8 @@ def load_config(config_path: Path) -> dict[str, Any]:
         logger.warning(f"Config file not found: {config_path}, using defaults")
         return {
             "mqtt": {
-                "broker": "172.16.2.16",
-                "port": 1883,
+                "broker": os.getenv("MQTT_BROKER", "localhost"),
+                "port": int(os.getenv("MQTT_PORT", "1883")),
                 "client_id": "home-automation-abstraction",
                 "keepalive": 60
             },
@@ -79,11 +89,12 @@ def validate_devices(devices: list[dict[str, Any]]) -> None:
         if "topics" not in device:
             raise ValueError(f"Device {device_id} missing 'topics'")
         
-        if "set" not in device["topics"]:
-            raise ValueError(f"Device {device_id} missing 'topics.set'")
-        
+        # 'state' topic is required for all devices
         if "state" not in device["topics"]:
             raise ValueError(f"Device {device_id} missing 'topics.state'")
+        
+        # 'set' topic is optional (read-only devices like contact sensors don't have it)
+        # No validation needed for topics.set
     
     # Log loaded devices
     device_ids = [d["device_id"] for d in devices]
@@ -121,6 +132,7 @@ async def handle_abstract_set(
     mqtt_client: Client,
     device_id: str,
     device_type: str,
+    device_technology: str,
     vendor_topic: str,
     payload: dict[str, Any]
 ) -> None:
@@ -129,13 +141,53 @@ async def handle_abstract_set(
     Args:
         mqtt_client: MQTT client instance
         device_id: Device identifier
-        device_type: Device type (e.g., 'light')
+        device_type: Device type (e.g., 'light', 'thermostat')
+        device_technology: Technology identifier (e.g., 'zigbee2mqtt')
         vendor_topic: Vendor-specific SET topic
         payload: Message payload
     """
     # Extract actual payload (remove type wrapper if present)
-    vendor_payload = payload.get("payload", payload)
-    vendor_message = json.dumps(vendor_payload)
+    abstract_payload = payload.get("payload", payload)
+    
+    # Validate payload based on device type
+    try:
+        if device_type == "light":
+            # Validate light SET payload (power and/or brightness)
+            LightState.model_validate(abstract_payload)
+        elif device_type == "relay":
+            # Validate relay SET payload (power only)
+            RelayState.model_validate(abstract_payload)
+        elif device_type == "thermostat":
+            # For thermostat SET: only allow mode and target fields
+            allowed_set_fields = {"mode", "target"}
+            invalid_fields = set(abstract_payload.keys()) - allowed_set_fields
+            if invalid_fields:
+                logger.warning(
+                    f"Thermostat SET {device_id} contains invalid fields {invalid_fields}, "
+                    f"only {allowed_set_fields} allowed"
+                )
+                return
+            
+            # Validate against ThermostatState (current/battery/window_open are optional)
+            ThermostatState.model_validate(abstract_payload)
+        elif device_type in {"contact", "contact_sensor"}:
+            # Contact sensors are read-only - SET commands should not occur
+            logger.warning(f"Contact sensor {device_id} received SET command - ignoring (read-only device)")
+            return
+    except ValidationError as e:
+        logger.error(f"Validation failed for {device_type} SET {device_id}: {e}")
+        return
+    
+    # Transform abstract payload to vendor-specific format
+    vendor_payload = transform_abstract_to_vendor(device_type, device_technology, abstract_payload)
+    
+    # For MAX! thermostats and Shelly relays, vendor_payload is a plain string
+    # For other devices, it's a dict that needs JSON encoding
+    if (device_technology == "max" and device_type == "thermostat") or \
+       (device_technology == "shelly" and device_type == "relay"):
+        vendor_message = vendor_payload  # Already a string
+    else:
+        vendor_message = json.dumps(vendor_payload)
     
     logger.info(f"→ vendor SET {device_id}: {vendor_topic} ← {vendor_message}")
     await mqtt_client.publish(vendor_topic, vendor_message, qos=1)
@@ -146,7 +198,8 @@ async def handle_vendor_state(
     redis_client: aioredis.Redis,
     device_id: str,
     device_type: str,
-    payload: dict[str, Any],
+    device_technology: str,
+    payload: str,
     redis_channel: str = "ui:updates"
 ) -> None:
     """Handle vendor STATE message and publish to abstract topic + Redis.
@@ -155,22 +208,53 @@ async def handle_vendor_state(
         mqtt_client: MQTT client instance
         redis_client: Redis client instance
         device_id: Device identifier
-        device_type: Device type (e.g., 'light')
-        payload: State payload
+        device_type: Device type (e.g., 'light', 'thermostat')
+        device_technology: Technology identifier (e.g., 'zigbee2mqtt')
+        payload: string Message payload
         redis_channel: Redis channel for UI updates
     """
+    # Transform vendor-specific payload to abstract format
+    abstract_payload = transform_vendor_to_abstract(device_type, device_technology, payload)
+    
+    # Validate state payload based on device type
+    try:
+        if device_type == "light":
+            LightState.model_validate(abstract_payload)
+        elif device_type == "relay":
+            RelayState.model_validate(abstract_payload)
+        elif device_type == "thermostat":
+            # Validate thermostat state: mode, target, current (required), battery, window_open
+            ThermostatState.model_validate(abstract_payload)
+        elif device_type in {"contact", "contact_sensor"}:
+            # Validate contact sensor state
+            ContactState.model_validate(abstract_payload)
+        elif device_type in {"temp_humidity", "temp_humidity_sensor"}:
+            # Validate temperature & humidity sensor state
+            TempHumidityState.model_validate(abstract_payload)
+        elif device_type == "three_phase_powermeter":
+            # Validate three-phase powermeter state
+            ThreePhasePowerState.model_validate(abstract_payload)
+    except ValidationError as e:
+        logger.error(f"Validation failed for {device_type} STATE {device_id}: {e}")
+        return
+    
+    # Normalize device type for topic (use 'contact' for both 'contact' and 'contact_sensor')
+    topic_type = "contact" if device_type in {"contact", "contact_sensor"} else device_type
+    topic_type = "temp_humidity" if device_type in {"temp_humidity", "temp_humidity_sensor"} else topic_type
+    
     # Publish to abstract state topic (retained)
-    abstract_topic = f"home/{device_type}/{device_id}/state"
-    abstract_message = json.dumps(payload)
+    abstract_topic = f"home/{topic_type}/{device_id}/state"
+    abstract_message = json.dumps(abstract_payload)
     
     logger.info(f"← abstract STATE {device_id}: {abstract_topic} → {abstract_message}")
     await mqtt_client.publish(abstract_topic, abstract_message, qos=1, retain=True)
     
-    # Publish to Redis for UI updates
+    # Publish to Redis for UI updates with timestamp
     ui_update = {
         "type": "state",
         "device_id": device_id,
-        "payload": payload
+        "payload": abstract_payload,
+        "ts": datetime.now(timezone.utc).isoformat()
     }
     redis_message = json.dumps(ui_update)
     
@@ -186,9 +270,12 @@ async def mqtt_worker(config: dict[str, Any], redis_client: aioredis.Redis) -> N
         redis_client: Redis client for UI updates
     """
     mqtt_config = config.get("mqtt", {})
-    broker = mqtt_config.get("broker", "172.16.2.16")
-    port = mqtt_config.get("port", 1883)
+    broker = os.getenv("MQTT_BROKER") or mqtt_config.get("broker", "localhost")
+    port = int(os.getenv("MQTT_PORT", mqtt_config.get("port", 1883)))
     client_id = mqtt_config.get("client_id", "home-automation-abstraction")
+    # Append a short suffix (ENV override possible) so multiple processes don't collide
+    client_suffix = os.environ.get("MQTT_CLIENT_ID_SUFFIX") or uuid.uuid4().hex[:6]
+    unique_client_id = f"{client_id}-{client_suffix}"
     keepalive = mqtt_config.get("keepalive", 60)
     
     redis_config = config.get("redis", {})
@@ -206,18 +293,26 @@ async def mqtt_worker(config: dict[str, Any], redis_client: aioredis.Redis) -> N
             async with Client(
                 hostname=broker,
                 port=port,
-                identifier=client_id,
-                keepalive=keepalive
+                identifier=unique_client_id,
+                keepalive=keepalive,
+                timeout=10.0  # Add explicit timeout for operations
             ) as client:
-                logger.info(f"Connected to MQTT broker as {client_id}")
+                logger.info(f"Connected to MQTT broker as {unique_client_id}")
                 
-                # Subscribe to abstract SET topics for all devices
+                # Subscribe to topics for all devices
                 for device in devices.values():
-                    abstract_set_topic = f"home/{device['type']}/{device['device_id']}/set"
-                    await client.subscribe(abstract_set_topic)
-                    logger.info(f"Subscribed to abstract SET: {abstract_set_topic}")
+                    device_id = device['device_id']
+                    device_type = device['type']
                     
-                    # Subscribe to vendor STATE topics
+                    # Subscribe to abstract SET topic only if device has a SET topic (not read-only)
+                    if "set" in device["topics"]:
+                        abstract_set_topic = f"home/{device_type}/{device_id}/set"
+                        await client.subscribe(abstract_set_topic)
+                        logger.info(f"Subscribed to abstract SET: {abstract_set_topic}")
+                    else:
+                        logger.info(f"Skipping SET subscription for read-only device: {device_id}")
+                    
+                    # Subscribe to vendor STATE topics (all devices have state)
                     vendor_state_topic = device["topics"]["state"]
                     await client.subscribe(vendor_state_topic)
                     logger.info(f"Subscribed to vendor STATE: {vendor_state_topic}")
@@ -225,44 +320,59 @@ async def mqtt_worker(config: dict[str, Any], redis_client: aioredis.Redis) -> N
                 # Reset retry delay on successful connection
                 retry_delay = 1
                 
+                # Track last activity for connection health
+                last_activity = asyncio.get_event_loop().time()
+                connection_timeout = keepalive * 2  # 2x keepalive as timeout
+                
                 # Process messages
                 async for message in client.messages:
-                    topic = str(message.topic)
-                    payload_str = message.payload.decode()
-                    
                     try:
-                        payload = json.loads(payload_str)
-                    except json.JSONDecodeError:
-                        logger.warning(f"Invalid JSON on {topic}: {payload_str}")
-                        continue
-                    
-                    # Check if this is an abstract SET message
-                    if topic.startswith("home/") and topic.endswith("/set"):
-                        # Extract device_type and device_id from topic
-                        parts = topic.split("/")
-                        if len(parts) == 4:  # home/<type>/<id>/set
-                            device_type = parts[1]
-                            device_id = parts[2]
-                            
-                            if device_id in devices:
-                                device = devices[device_id]
-                                vendor_topic = device["topics"]["set"]
-                                await handle_abstract_set(
-                                    client, device_id, device_type, vendor_topic, payload
-                                )
-                    
-                    # Check if this is a vendor STATE message
-                    else:
-                        # Find device by vendor state topic
-                        for device_id, device in devices.items():
-                            if topic == device["topics"]["state"]:
-                                await handle_vendor_state(
-                                    client, redis_client, device_id, device["type"], payload, redis_channel
-                                )
-                                break
+                        last_activity = asyncio.get_event_loop().time()
+                        topic = str(message.topic)
+                        payload_str = message.payload.decode()
+                        retain = getattr(message, 'retain', None)
+                        logger.debug(f"MQTT message received on ({retain=}) {topic}: {payload_str}")
                         
+                        # Check if this is an abstract SET message
+                        if topic.startswith("home/") and topic.endswith("/set"):
+
+                            payload = json.loads(payload_str)
+
+                            # Extract device_type and device_id from topic
+                            parts = topic.split("/")
+                            if len(parts) == 4:  # home/<type>/<id>/set
+                                device_type = parts[1]
+                                device_id = parts[2]
+                                
+                                if device_id in devices:
+                                    device = devices[device_id]
+                                    vendor_topic = device["topics"]["set"]
+                                    device_technology = device.get("technology", "unknown")
+                                    await handle_abstract_set(
+                                       client, device_id, device_type, device_technology, vendor_topic, payload
+                                    )
+                        
+                        # Check if this is a vendor STATE message
+                        else:
+                            # Find device by vendor state topic for other technologies
+                            for device_id, device in devices.items():
+                                if topic == device["topics"]["state"]:
+                                    device_technology = device.get("technology", "unknown")
+                                    await handle_vendor_state(
+                                        client, redis_client, device_id, device["type"], 
+                                        device_technology, payload_str, redis_channel
+                                    )
+                                    break
+                    except json.JSONDecodeError:
+                        logger.error(f"Failed to decode JSON payload on topic {topic}: {payload_str}")
+                        
+        except asyncio.CancelledError:
+            logger.info("MQTT worker cancelled")
+            raise
         except Exception as e:
+            import traceback
             logger.error(f"MQTT error: {e}")
+            logger.debug(f"Traceback: {traceback.format_exc()}")
             logger.info(f"Reconnecting in {retry_delay}s...")
             await asyncio.sleep(retry_delay)
             retry_delay = min(retry_delay * 2, max_retry_delay)
@@ -281,9 +391,19 @@ async def async_main() -> None:
     validate_devices(devices)
     logger.info(f"Loaded {len(devices)} device(s) from configuration")
     
-    # Get Redis URL from config or environment variable or use default
-    redis_config = config.get("redis", {})
-    redis_url = redis_config.get("url") or os.environ.get("REDIS_URL", "redis://localhost:6379/0")
+    # Build Redis URL from environment variables or config or use default
+    redis_host = os.environ.get("REDIS_HOST")
+    redis_port = os.environ.get("REDIS_PORT")
+    redis_db = os.environ.get("REDIS_DB")
+    
+    if redis_host and redis_port and redis_db:
+        redis_url = f"redis://{redis_host}:{redis_port}/{redis_db}"
+        logger.info(f"Using Redis from environment variables: {redis_url}")
+    else:
+        # Fallback to config file
+        redis_config = config.get("redis", {})
+        redis_url = redis_config.get("url") or "redis://localhost:6379/0"
+        logger.info(f"Using Redis from config file: {redis_url}")
     
     # Connect to Redis with retry
     redis_client = await get_redis_client(redis_url)

apps/abstraction/requirements.txt

@@ -0,0 +1,5 @@
+pydantic>=2
+aiomqtt==2.0.1
+redis==5.0.1
+pyyaml==6.0.1
+tenacity==8.2.3

apps/abstraction/transformation.py

@@ -0,0 +1,680 @@
+"""Payload transformation functions for vendor-specific device communication.
+
+This module implements a registry-pattern for vendor-specific transformations:
+- Each (device_type, technology, direction) tuple maps to a specific handler function
+- Handlers transform payloads between abstract and vendor-specific formats
+- Unknown combinations fall back to pass-through (no transformation)
+"""
+
+import logging
+import json
+from typing import Any, Callable
+
+logger = logging.getLogger(__name__)
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: simulator technology
+# ============================================================================
+
+def _transform_light_simulator_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract light payload to simulator format.
+    
+    Simulator uses same format as abstract protocol (no transformation needed).
+    """
+    return payload
+
+
+def _transform_light_simulator_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform simulator light payload to abstract format.
+    
+    Simulator uses same format as abstract protocol (no transformation needed).
+    """
+
+    payload = json.loads(payload)
+
+    return payload
+
+
+def _transform_thermostat_simulator_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract thermostat payload to simulator format.
+    
+    Simulator uses same format as abstract protocol (no transformation needed).
+    """
+    return payload
+
+
+def _transform_thermostat_simulator_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform simulator thermostat payload to abstract format.
+    
+    Simulator uses same format as abstract protocol (no transformation needed).
+    """
+
+    payload = json.loads(payload)
+
+    return payload
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: zigbee2mqtt technology
+# ============================================================================
+
+def _transform_light_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract light payload to zigbee2mqtt format.
+    
+    Transformations:
+    - power: 'on'/'off' -> state: 'ON'/'OFF'
+    - brightness: 0-100 -> brightness: 0-254
+    
+    Example:
+    - Abstract: {'power': 'on', 'brightness': 100}
+    - zigbee2mqtt: {'state': 'ON', 'brightness': 254}
+    """
+    vendor_payload = payload.copy()
+    
+    # Transform power -> state with uppercase values
+    if "power" in vendor_payload:
+        power_value = vendor_payload.pop("power")
+        vendor_payload["state"] = power_value.upper() if isinstance(power_value, str) else power_value
+    
+    # Transform brightness: 0-100 (%) -> 0-254 (zigbee2mqtt range)
+    if "brightness" in vendor_payload:
+        abstract_brightness = vendor_payload["brightness"]
+        if isinstance(abstract_brightness, (int, float)):
+            # Convert percentage (0-100) to zigbee2mqtt range (0-254)
+            vendor_payload["brightness"] = round(abstract_brightness * 254 / 100)
+    
+    return vendor_payload
+
+
+def _transform_light_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform zigbee2mqtt light payload to abstract format.
+    
+    Transformations:
+    - state: 'ON'/'OFF' -> power: 'on'/'off'
+    - brightness: 0-254 -> brightness: 0-100
+    
+    Example:
+    - zigbee2mqtt: {'state': 'ON', 'brightness': 254}
+    - Abstract: {'power': 'on', 'brightness': 100}
+    """
+    abstract_payload = json.loads(payload)
+    
+    # Transform state -> power with lowercase values
+    if "state" in abstract_payload:
+        state_value = abstract_payload.pop("state")
+        abstract_payload["power"] = state_value.lower() if isinstance(state_value, str) else state_value
+    
+    # Transform brightness: 0-254 (zigbee2mqtt range) -> 0-100 (%)
+    if "brightness" in abstract_payload:
+        vendor_brightness = abstract_payload["brightness"]
+        if isinstance(vendor_brightness, (int, float)):
+            # Convert zigbee2mqtt range (0-254) to percentage (0-100)
+            abstract_payload["brightness"] = round(vendor_brightness * 100 / 254)
+    
+    return abstract_payload
+
+
+def _transform_thermostat_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract thermostat payload to zigbee2mqtt format.
+    
+    Transformations:
+    - target -> current_heating_setpoint (as string)
+    - mode is ignored (zigbee2mqtt thermostats use system_mode in state only)
+    
+    Example:
+    - Abstract: {'target': 22.0}
+    - zigbee2mqtt: {'current_heating_setpoint': '22.0'}
+    """
+    vendor_payload = {}
+    
+    if "target" in payload:
+        # zigbee2mqtt expects current_heating_setpoint as string
+        vendor_payload["current_heating_setpoint"] = str(payload["target"])
+    
+    return vendor_payload
+
+
+def _transform_thermostat_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform zigbee2mqtt thermostat payload to abstract format.
+    
+    Transformations:
+    - current_heating_setpoint -> target (as float)
+    - local_temperature -> current (as float)
+    - system_mode -> mode
+    
+    Example:
+    - zigbee2mqtt: {'current_heating_setpoint': 15, 'local_temperature': 23, 'system_mode': 'heat'}
+    - Abstract: {'target': 15.0, 'current': 23.0, 'mode': 'heat'}
+    """
+    payload = json.loads(payload)
+    abstract_payload = {}
+    
+    # Extract target temperature
+    if "current_heating_setpoint" in payload:
+        setpoint = payload["current_heating_setpoint"]
+        abstract_payload["target"] = float(setpoint)
+    
+    # Extract current temperature
+    if "local_temperature" in payload:
+        current = payload["local_temperature"]
+        abstract_payload["current"] = float(current)
+    
+    # Extract mode
+    if "system_mode" in payload:
+        abstract_payload["mode"] = payload["system_mode"]
+    
+    return abstract_payload
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: contact_sensor - zigbee2mqtt technology
+# ============================================================================
+
+def _transform_contact_sensor_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract contact sensor payload to zigbee2mqtt format.
+    
+    Contact sensors are read-only, so this should not be called for SET commands.
+    Returns payload as-is for compatibility.
+    """
+    logger.warning("Contact sensors are read-only - SET commands should not be used")
+    return payload
+
+
+def _transform_contact_sensor_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform zigbee2mqtt contact sensor payload to abstract format.
+    
+    Transformations:
+    - contact: bool -> "open" | "closed"
+      - zigbee2mqtt semantics: False = OPEN, True = CLOSED (inverted!)
+    - battery: pass through (already 0-100)
+    - linkquality: pass through
+    - device_temperature: pass through (if present)
+    - voltage: pass through (if present)
+    
+    Example:
+    - zigbee2mqtt: {"contact": false, "battery": 100, "linkquality": 87}
+    - Abstract: {"contact": "open", "battery": 100, "linkquality": 87}
+    """
+    payload = json.loads(payload)
+    abstract_payload = {}
+    
+    # Transform contact state (inverted logic!)
+    if "contact" in payload:
+        contact_bool = payload["contact"]
+        # zigbee2mqtt: False = OPEN, True = CLOSED
+        abstract_payload["contact"] = "closed" if contact_bool else "open"
+    
+    # Pass through optional fields
+    if "battery" in payload:
+        abstract_payload["battery"] = payload["battery"]
+    
+    if "linkquality" in payload:
+        abstract_payload["linkquality"] = payload["linkquality"]
+    
+    if "device_temperature" in payload:
+        abstract_payload["device_temperature"] = payload["device_temperature"]
+    
+    if "voltage" in payload:
+        abstract_payload["voltage"] = payload["voltage"]
+    
+    return abstract_payload
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: contact_sensor - max technology (Homegear MAX!)
+# ============================================================================
+
+def _transform_contact_sensor_max_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract contact sensor payload to MAX! format.
+    
+    Contact sensors are read-only, so this should not be called for SET commands.
+    Returns payload as-is for compatibility.
+    """
+    logger.warning("Contact sensors are read-only - SET commands should not be used")
+    return payload
+
+
+def _transform_contact_sensor_max_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform MAX! (Homegear) contact sensor payload to abstract format.
+    
+    MAX! sends "true"/"false" (string or bool) on STATE topic.
+    
+    Transformations:
+    - "true" or True -> "open" (window/door open)
+    - "false" or False -> "closed" (window/door closed)
+    
+    Example:
+    - MAX!: "true" or True
+    - Abstract: {"contact": "open"}
+    """
+    try:
+        contact_value = payload.strip().lower() == "true"
+        
+        # MAX! semantics: True = OPEN, False = CLOSED
+        return {
+            "contact": "open" if contact_value else "closed"
+        }
+    except (ValueError, TypeError) as e:
+        logger.error(f"MAX! contact sensor failed to parse: {payload}, error: {e}")
+        return {
+            "contact": "closed"  # Default to closed on error
+        }
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: temp_humidity_sensor - zigbee2mqtt technology
+# ============================================================================
+
+def _transform_temp_humidity_sensor_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract temp/humidity sensor payload to zigbee2mqtt format.
+    
+    Temp/humidity sensors are read-only, so this should not be called for SET commands.
+    Returns payload as-is for compatibility.
+    """
+    return payload
+
+
+def _transform_temp_humidity_sensor_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform zigbee2mqtt temp/humidity sensor payload to abstract format.
+    
+    Passthrough - zigbee2mqtt provides temperature, humidity, battery, linkquality directly.
+    """
+    payload = json.loads(payload)
+    return payload
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: temp_humidity_sensor - MAX! technology
+# ============================================================================
+
+def _transform_temp_humidity_sensor_max_to_vendor(payload: str) -> dict[str, Any]:
+    """Transform abstract temp/humidity sensor payload to MAX! format.
+    
+    Temp/humidity sensors are read-only, so this should not be called for SET commands.
+    Returns payload as-is for compatibility.
+    """
+
+    payload = json.loads(payload)
+
+    return payload
+
+
+def _transform_temp_humidity_sensor_max_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform MAX! temp/humidity sensor payload to abstract format.
+    
+    Passthrough - MAX! provides temperature, humidity, battery directly.
+    """
+    payload = json.loads(payload)
+    return payload
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: relay - zigbee2mqtt technology
+# ============================================================================
+
+def _transform_relay_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract relay payload to zigbee2mqtt format.
+    
+    Relay only has power on/off, same transformation as light.
+    - power: 'on'/'off' -> state: 'ON'/'OFF'
+    """
+    vendor_payload = payload.copy()
+    
+    if "power" in vendor_payload:
+        power_value = vendor_payload.pop("power")
+        vendor_payload["state"] = power_value.upper() if isinstance(power_value, str) else power_value
+    
+    return vendor_payload
+
+
+def _transform_relay_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform zigbee2mqtt relay payload to abstract format.
+    
+    Relay only has power on/off, same transformation as light.
+    - state: 'ON'/'OFF' -> power: 'on'/'off'
+    """
+    payload = json.loads(payload)
+    abstract_payload = payload.copy()
+    
+    if "state" in abstract_payload:
+        state_value = abstract_payload.pop("state")
+        abstract_payload["power"] = state_value.lower() if isinstance(state_value, str) else state_value
+    
+    return abstract_payload
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: relay - shelly technology
+# ============================================================================
+
+def _transform_relay_shelly_to_vendor(payload: dict[str, Any]) -> str:
+    """Transform abstract relay payload to Shelly format.
+    
+    Shelly expects plain text 'on' or 'off' (not JSON).
+    - power: 'on'/'off' -> 'on'/'off' (plain string)
+    
+    Example:
+    - Abstract: {'power': 'on'}
+    - Shelly: 'on'
+    """
+    power = payload.get("power", "off")
+    return power
+
+
+def _transform_relay_shelly_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform Shelly relay payload to abstract format.
+    
+    Shelly sends plain text 'on' or 'off' (not JSON).
+    - 'on'/'off' -> power: 'on'/'off'
+    
+    Example:
+    - Shelly: 'on'
+    - Abstract: {'power': 'on'}
+    """
+    return {"power": payload.strip()}
+
+# ============================================================================
+# HANDLER FUNCTIONS: relay - hottis_modbus technology
+# ============================================================================
+
+def _transform_relay_hottis_modbus_to_vendor(payload: dict[str, Any]) -> str:
+    """Transform abstract relay payload to Hottis Modbus format.
+    
+    Hottis Modbus expects plain text 'on' or 'off' (not JSON).
+    - power: 'on'/'off' -> 'on'/'off' (plain string)
+    
+    Example:
+    - Abstract: {'power': 'on'}
+    - Hottis Modbus: 'on'
+    """
+    power = payload.get("power", "off")
+    return power
+
+
+def _transform_relay_hottis_modbus_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform Hottis Modbus relay payload to abstract format.
+    
+    Hottis Modbus sends plain text 'on' or 'off' (not JSON).
+    - 'on'/'off' -> power: 'on'/'off'
+    
+    Example:
+    - Hottis Modbus: 'on'
+    - Abstract: {'power': 'on'}
+    """
+    return {"power": payload.strip()}
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: three_phase_powermeter - hottis_modbus technology
+# ============================================================================
+
+def _transform_three_phase_powermeter_hottis_modbus_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+    """Transform abstract three_phase_powermeter payload to hottis_modbus format.
+
+    energy: float = Field(..., description="Total energy in kWh")
+    total_power: float = Field(..., description="Total power in W")
+    phase1_power: float = Field(..., description="Power for phase 1 in W")
+    phase2_power: float = Field(..., description="Power for phase 2 in W")
+    phase3_power: float = Field(..., description="Power for phase 3 in W")
+    phase1_voltage: float = Field(..., description="Voltage for phase 1 in V")
+    phase2_voltage: float = Field(..., description="Voltage for phase 2 in V")
+    phase3_voltage: float = Field(..., description="Voltage for phase 3 in V")
+    phase1_current: float = Field(..., description="Current for phase 1 in A")
+    phase2_current: float = Field(..., description="Current for phase 2 in A")
+    phase3_current: float = Field(..., description="Current for phase 3 in A")
+
+
+    """
+
+    vendor_payload = {
+        "energy": payload.get("energy", 0.0),
+        "total_power": payload.get("total_power", 0.0),
+        "phase1_power": payload.get("phase1_power", 0.0),
+        "phase2_power": payload.get("phase2_power", 0.0),
+        "phase3_power": payload.get("phase3_power", 0.0),
+        "phase1_voltage": payload.get("phase1_voltage", 0.0),
+        "phase2_voltage": payload.get("phase2_voltage", 0.0),
+        "phase3_voltage": payload.get("phase3_voltage", 0.0),
+        "phase1_current": payload.get("phase1_current", 0.0),
+        "phase2_current": payload.get("phase2_current", 0.0),
+        "phase3_current": payload.get("phase3_current", 0.0),
+    }
+
+    return vendor_payload
+
+
+def _transform_three_phase_powermeter_hottis_modbus_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform hottis_modbus three_phase_powermeter payload to abstract format.
+    
+    Transformations:
+    - Direct mapping of all power meter fields
+    
+    Example:
+    - hottis_modbus: {'energy': 123.45, 'total_power': 1500.0, 'phase1_power': 500.0, ...}
+    - Abstract: {'energy': 123.45, 'total_power': 1500.0, 'phase1_power': 500.0, ...}
+    """
+    payload = json.loads(payload)
+    abstract_payload = {
+        "energy": payload.get("energy", 0.0),
+        "total_power": payload.get("total_power", 0.0),
+        "phase1_power": payload.get("phase1_power", 0.0),
+        "phase2_power": payload.get("phase2_power", 0.0),
+        "phase3_power": payload.get("phase3_power", 0.0),
+        "phase1_voltage": payload.get("phase1_voltage", 0.0),
+        "phase2_voltage": payload.get("phase2_voltage", 0.0),
+        "phase3_voltage": payload.get("phase3_voltage", 0.0),
+        "phase1_current": payload.get("phase1_current", 0.0),
+        "phase2_current": payload.get("phase2_current", 0.0),
+        "phase3_current": payload.get("phase3_current", 0.0),
+    }
+    
+    return abstract_payload
+
+
+# ============================================================================
+# HANDLER FUNCTIONS: max technology (Homegear MAX!)
+# ============================================================================
+
+def _transform_thermostat_max_to_vendor(payload: dict[str, Any]) -> str:
+    """Transform abstract thermostat payload to MAX! (Homegear) format.
+    
+    MAX! expects only the integer temperature value (no JSON).
+    
+    Transformations:
+    - Extract 'target' temperature from payload
+    - Convert float to integer (MAX! only accepts integers)
+    - Return as plain string value
+    
+    Example:
+    - Abstract: {'mode': 'heat', 'target': 22.5}
+    - MAX!: "22"
+    
+    Note: MAX! ignores mode - it's always in heating mode
+    """
+    if "target" not in payload:
+        logger.warning(f"MAX! thermostat payload missing 'target': {payload}")
+        return "21"  # Default fallback
+    
+    target_temp = payload["target"]
+    
+    # Convert to integer (MAX! protocol requirement)
+    if isinstance(target_temp, (int, float)):
+        int_temp = int(round(target_temp))
+        return str(int_temp)
+    
+    logger.warning(f"MAX! invalid target temperature type: {type(target_temp)}, value: {target_temp}")
+    return "21"
+
+
+def _transform_thermostat_max_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform MAX! (Homegear) thermostat payload to abstract format.
+    
+    MAX! sends only the integer temperature value (no JSON).
+    
+    Transformations:
+    - Parse plain string/int value
+    - Convert to float for abstract protocol
+    - Wrap in abstract payload structure with mode='heat'
+    
+    Example:
+    - MAX!: "22" or 22
+    - Abstract: {'target': 22.0, 'mode': 'heat'}
+    
+    Note: MAX! doesn't send current temperature via SET_TEMPERATURE topic
+    """
+
+    # Handle both string and numeric input
+    target_temp = float(payload.strip())
+    
+    return {
+        "target": target_temp,
+        "mode": "heat"  # MAX! is always in heating mode
+    }
+
+
+# ============================================================================
+# REGISTRY: Maps (device_type, technology, direction) -> handler function
+# ============================================================================
+
+TransformHandler = Callable[[dict[str, Any]], dict[str, Any]]
+
+TRANSFORM_HANDLERS: dict[tuple[str, str, str], TransformHandler] = {
+    # Light transformations
+    ("light", "simulator", "to_vendor"): _transform_light_simulator_to_vendor,
+    ("light", "simulator", "to_abstract"): _transform_light_simulator_to_abstract,
+    ("light", "zigbee2mqtt", "to_vendor"): _transform_light_zigbee2mqtt_to_vendor,
+    ("light", "zigbee2mqtt", "to_abstract"): _transform_light_zigbee2mqtt_to_abstract,
+    
+    # Thermostat transformations
+    ("thermostat", "simulator", "to_vendor"): _transform_thermostat_simulator_to_vendor,
+    ("thermostat", "simulator", "to_abstract"): _transform_thermostat_simulator_to_abstract,
+    ("thermostat", "zigbee2mqtt", "to_vendor"): _transform_thermostat_zigbee2mqtt_to_vendor,
+    ("thermostat", "zigbee2mqtt", "to_abstract"): _transform_thermostat_zigbee2mqtt_to_abstract,
+    ("thermostat", "max", "to_vendor"): _transform_thermostat_max_to_vendor,
+    ("thermostat", "max", "to_abstract"): _transform_thermostat_max_to_abstract,
+    
+    # Contact sensor transformations (support both 'contact' and 'contact_sensor' types)
+    ("contact_sensor", "zigbee2mqtt", "to_vendor"): _transform_contact_sensor_zigbee2mqtt_to_vendor,
+    ("contact_sensor", "zigbee2mqtt", "to_abstract"): _transform_contact_sensor_zigbee2mqtt_to_abstract,
+    ("contact_sensor", "max", "to_vendor"): _transform_contact_sensor_max_to_vendor,
+    ("contact_sensor", "max", "to_abstract"): _transform_contact_sensor_max_to_abstract,
+    ("contact", "zigbee2mqtt", "to_vendor"): _transform_contact_sensor_zigbee2mqtt_to_vendor,
+    ("contact", "zigbee2mqtt", "to_abstract"): _transform_contact_sensor_zigbee2mqtt_to_abstract,
+    ("contact", "max", "to_vendor"): _transform_contact_sensor_max_to_vendor,
+    ("contact", "max", "to_abstract"): _transform_contact_sensor_max_to_abstract,
+    
+    # Temperature & humidity sensor transformations (support both type aliases)
+    ("temp_humidity_sensor", "zigbee2mqtt", "to_vendor"): _transform_temp_humidity_sensor_zigbee2mqtt_to_vendor,
+    ("temp_humidity_sensor", "zigbee2mqtt", "to_abstract"): _transform_temp_humidity_sensor_zigbee2mqtt_to_abstract,
+    ("temp_humidity_sensor", "max", "to_vendor"): _transform_temp_humidity_sensor_max_to_vendor,
+    ("temp_humidity_sensor", "max", "to_abstract"): _transform_temp_humidity_sensor_max_to_abstract,
+    ("temp_humidity", "zigbee2mqtt", "to_vendor"): _transform_temp_humidity_sensor_zigbee2mqtt_to_vendor,
+    ("temp_humidity", "zigbee2mqtt", "to_abstract"): _transform_temp_humidity_sensor_zigbee2mqtt_to_abstract,
+    ("temp_humidity", "max", "to_vendor"): _transform_temp_humidity_sensor_max_to_vendor,
+    ("temp_humidity", "max", "to_abstract"): _transform_temp_humidity_sensor_max_to_abstract,
+    
+    # Relay transformations
+    ("relay", "zigbee2mqtt", "to_vendor"): _transform_relay_zigbee2mqtt_to_vendor,
+    ("relay", "zigbee2mqtt", "to_abstract"): _transform_relay_zigbee2mqtt_to_abstract,
+    ("relay", "shelly", "to_vendor"): _transform_relay_shelly_to_vendor,
+    ("relay", "shelly", "to_abstract"): _transform_relay_shelly_to_abstract,
+    ("relay", "hottis_modbus", "to_vendor"): _transform_relay_hottis_modbus_to_vendor,
+    ("relay", "hottis_modbus", "to_abstract"): _transform_relay_hottis_modbus_to_abstract,
+
+    # Three-Phase Powermeter transformations
+    ("three_phase_powermeter", "hottis_modbus", "to_vendor"): _transform_three_phase_powermeter_hottis_modbus_to_vendor,
+    ("three_phase_powermeter", "hottis_modbus", "to_abstract"): _transform_three_phase_powermeter_hottis_modbus_to_abstract,
+}
+
+
+def _get_transform_handler(
+    device_type: str,
+    device_technology: str,
+    direction: str
+) -> TransformHandler:
+    """Get transformation handler for given device type, technology and direction.
+    
+    Args:
+        device_type: Type of device (e.g., "light", "thermostat")
+        device_technology: Technology/vendor (e.g., "simulator", "zigbee2mqtt")
+        direction: Transformation direction ("to_vendor" or "to_abstract")
+    
+    Returns:
+        Handler function for transformation, or pass-through if not found
+    """
+    key = (device_type, device_technology, direction)
+    handler = TRANSFORM_HANDLERS.get(key)
+    
+    if handler is None:
+        logger.warning(
+            f"No transformation handler for {key}, using pass-through. "
+            f"Available: {list(TRANSFORM_HANDLERS.keys())}"
+        )
+        return lambda payload: payload  # Pass-through fallback
+    
+    return handler
+
+
+# ============================================================================
+# PUBLIC API: Main transformation functions
+# ============================================================================
+
+def transform_abstract_to_vendor(
+    device_type: str,
+    device_technology: str,
+    abstract_payload: dict[str, Any]
+) -> dict[str, Any]:
+    """Transform abstract payload to vendor-specific format.
+    
+    Args:
+        device_type: Type of device (e.g., "light", "thermostat")
+        device_technology: Technology/vendor (e.g., "simulator", "zigbee2mqtt")
+        abstract_payload: Payload in abstract home protocol format
+    
+    Returns:
+        Payload in vendor-specific format
+    """
+    logger.debug(
+        f"transform_abstract_to_vendor IN: type={device_type}, tech={device_technology}, "
+        f"payload={abstract_payload}"
+    )
+    
+    handler = _get_transform_handler(device_type, device_technology, "to_vendor")
+    vendor_payload = handler(abstract_payload)
+    
+    logger.debug(
+        f"transform_abstract_to_vendor OUT: type={device_type}, tech={device_technology}, "
+        f"payload={vendor_payload}"
+    )
+    return vendor_payload
+
+
+def transform_vendor_to_abstract(
+    device_type: str,
+    device_technology: str,
+    vendor_payload: str
+) -> dict[str, Any]:
+    """Transform vendor-specific payload to abstract format.
+    
+    Args:
+        device_type: Type of device (e.g., "light", "thermostat")
+        device_technology: Technology/vendor (e.g., "simulator", "zigbee2mqtt")
+        vendor_payload: Payload in vendor-specific format
+    
+    Returns:
+        Payload in abstract home protocol format
+    """
+    logger.debug(
+        f"transform_vendor_to_abstract IN: type={device_type}, tech={device_technology}, "
+        f"payload={vendor_payload}"
+    )
+    
+    handler = _get_transform_handler(device_type, device_technology, "to_abstract")
+    abstract_payload = handler(vendor_payload)
+    
+    logger.debug(
+        f"transform_vendor_to_abstract OUT: type={device_type}, tech={device_technology}, "
+        f"payload={abstract_payload}"
+    )
+    return abstract_payload

apps/api/Dockerfile

@@ -0,0 +1,48 @@
+# API Service Dockerfile
+# FastAPI + Redis + MQTT Gateway
+
+FROM python:3.14-alpine
+
+# Prevent Python from writing .pyc files and enable unbuffered output
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    MQTT_BROKER=172.16.2.16 \
+    MQTT_PORT=1883 \
+    REDIS_HOST=localhost \
+    REDIS_PORT=6379 \
+    REDIS_DB=0 \
+    REDIS_CHANNEL=ui:updates
+
+# Create non-root user
+RUN addgroup -g 10001 -S app && \
+    adduser -u 10001 -S app -G app
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies
+RUN apk add --no-cache \
+    gcc \
+    musl-dev \
+    linux-headers
+
+# Install Python dependencies
+COPY apps/api/requirements.txt /app/requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY apps/__init__.py /app/apps/__init__.py
+COPY apps/api/ /app/apps/api/
+COPY packages/ /app/packages/
+
+# Change ownership to app user
+RUN chown -R app:app /app
+
+# Switch to non-root user
+USER app
+
+# Expose port
+EXPOSE 8001
+
+# Run application
+CMD ["python", "-m", "uvicorn", "apps.api.main:app", "--host", "0.0.0.0", "--port", "8001"]

apps/api/README.md

@@ -20,7 +20,7 @@ poetry run uvicorn apps.api.main:app --reload
 ### Production Mode
 
 ```bash
-poetry run uvicorn apps.api.main:app --host 0.0.0.0 --port 8000
+poetry run uvicorn apps.api.main:app --host 0.0.0.0 --port 8001
 ```
 
 ### Using Python directly
@@ -29,6 +29,56 @@ poetry run uvicorn apps.api.main:app --host 0.0.0.0 --port 8000
 poetry run python -m apps.api.main
 ```
 
+### Docker Container
+
+#### Build Image
+
+```bash
+docker build -t api:dev -f apps/api/Dockerfile .
+```
+
+#### Run Container
+
+```bash
+docker run --rm -p 8001:8001 \
+  -v $(pwd)/config:/app/config:ro \
+  -e MQTT_BROKER=172.23.1.102 \
+  -e MQTT_PORT=1883 \
+  -e REDIS_HOST=172.23.1.116 \
+  -e REDIS_PORT=6379 \
+  -e REDIS_DB=8 \
+  -e REDIS_CHANNEL=ui:updates \
+  api:dev
+```
+
+**Mit Docker Network (empfohlen für Linux):**
+```bash
+docker network create home-automation
+docker run --rm -p 8001:8001 \
+  --network home-automation \
+  --name api \
+  -v $(pwd)/config:/app/config:ro \
+  -e MQTT_BROKER=172.16.2.16 \
+  -e REDIS_HOST=172.23.1.116 \
+  -e REDIS_DB=8 \
+  api:dev
+```
+
+**Hinweise:**
+- **Linux**: Port wird auf `0.0.0.0:8001` gebunden (von überall erreichbar)
+- **macOS/finch**: Port wird auf `127.0.0.1:8001` gebunden (nur localhost)
+
+#### Environment Variables
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `MQTT_BROKER` | `172.16.2.16` | MQTT broker hostname/IP |
+| `MQTT_PORT` | `1883` | MQTT broker port |
+| `REDIS_HOST` | `localhost` | Redis server hostname/IP |
+| `REDIS_PORT` | `6379` | Redis server port |
+| `REDIS_DB` | `0` | Redis database number |
+| `REDIS_CHANNEL` | `ui:updates` | Redis pub/sub channel |
+
 ## API Endpoints
 
 ### `GET /health`

apps/api/main.py

@@ -1,5 +1,3 @@
-"""API main entry point."""
-
 import asyncio
 import json
 import logging
@@ -15,10 +13,47 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel, ValidationError
 
-from packages.home_capabilities import CAP_VERSION, LightState
+from packages.home_capabilities import (
+    LIGHT_VERSION,
+    THERMOSTAT_VERSION,
+    CONTACT_SENSOR_VERSION,
+    TEMP_HUMIDITY_SENSOR_VERSION,
+    RELAY_VERSION,
+    LightState,
+    ThermostatState,
+    ContactState,
+    TempHumidityState,
+    RelayState,
+    load_layout,
+)
 
+# Import resolvers (must be before router imports to avoid circular dependency)
+from apps.api.resolvers import (
+    DeviceDTO,
+    resolve_group_devices,
+    resolve_scene_step_devices,
+    load_device_rooms,
+    get_room,
+    clear_room_cache,
+)
+
+logging.basicConfig(
+    level=logging.DEBUG,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
 logger = logging.getLogger(__name__)
 
+# ============================================================================
+# STATE CACHES
+# ============================================================================
+
+# In-memory cache for last known device states
+# Will be populated from Redis pub/sub messages
+device_states: dict[str, dict[str, Any]] = {}
+
+# Background task reference
+background_task: asyncio.Task | None = None
+
 app = FastAPI(
     title="Home Automation API",
     description="API for home automation system",
@@ -30,13 +65,64 @@ app.add_middleware(
     CORSMiddleware,
     allow_origins=[
         "http://localhost:8002",
+        "http://172.19.1.11:8002",
         "http://127.0.0.1:8002",
+        "https://homea2.hottis.de"
     ],
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
 )
 
+@app.get("/devices/{device_id}/layout")
+async def get_device_layout(device_id: str):
+    """Gibt die layout-spezifischen Informationen für ein einzelnes Gerät zurück."""
+    layout = load_layout()
+    for room in layout.rooms:
+        for device in room.devices:
+            if device.device_id == device_id:
+                return {
+                    "device_id": device_id,
+                    "room": room.name,
+                    "title": device.title,
+                    "icon": device.icon,
+                    "rank": device.rank,
+                }
+    raise HTTPException(status_code=404, detail="Device layout not found")
+
+@app.get("/devices/{device_id}/state")
+async def get_device_state(device_id: str):
+    try:
+        logger.debug(f"Fetching state for device {device_id}")
+        state = device_states[device_id]
+        return state
+    except KeyError:
+        raise HTTPException(status_code=404, detail="Device state not found")
+
+# --- Minimal-invasive: Einzelgerät-Layout-Endpunkt ---
+@app.get("/devices/{device_id}/layout")
+async def get_device_layout(device_id: str):
+    """Gibt die layout-spezifischen Informationen für ein einzelnes Gerät zurück."""
+    layout = load_layout()
+    for room in layout.get("rooms", []):
+        for device in room.get("devices", []):
+            if device.get("device_id") == device_id:
+                # Rückgabe: Layout-Infos + Raumname
+                return {
+                    "device_id": device_id,
+                    "room": room.get("name"),
+                    "title": device.get("title"),
+                    "icon": device.get("icon"),
+                    "rank": device.get("rank"),
+                }
+    raise HTTPException(status_code=404, detail="Device layout not found")
+
+@app.on_event("startup")
+async def startup_event():
+    """Include routers after app is initialized to avoid circular imports."""
+    from apps.api.routes.groups_scenes import router as groups_scenes_router
+    app.include_router(groups_scenes_router, prefix="")
+
 
 @app.get("/health")
 async def health() -> dict[str, str]:
@@ -48,6 +134,77 @@ async def health() -> dict[str, str]:
     return {"status": "ok"}
 
 
+async def redis_state_listener():
+    """Background task that listens to Redis pub/sub and updates state cache."""
+    redis_client = None
+    pubsub = None
+    
+    try:
+        redis_url, redis_channel = get_redis_settings()
+        logger.info(f"Starting Redis state listener for channel {redis_channel}")
+        
+        redis_client = await aioredis.from_url(redis_url, decode_responses=True)
+        pubsub = redis_client.pubsub()
+        await pubsub.subscribe(redis_channel)
+        
+        logger.info("Redis state listener connected")
+        
+        while True:
+            try:
+                message = await asyncio.wait_for(
+                    pubsub.get_message(ignore_subscribe_messages=True),
+                    timeout=1.0
+                )
+                
+                if message and message["type"] == "message":
+                    data = message["data"]
+                    try:
+                        state_data = json.loads(data)
+                        if state_data.get("type") == "state" and state_data.get("device_id"):
+                            device_id = state_data["device_id"]
+                            payload = state_data.get("payload", {})
+                            device_states[device_id] = payload
+                            logger.debug(f"Updated state cache for {device_id}: {payload}")
+                    except Exception as e:
+                        logger.warning(f"Failed to parse state data: {e}")
+                        
+            except asyncio.TimeoutError:
+                pass  # No message, continue
+                
+    except asyncio.CancelledError:
+        logger.info("Redis state listener cancelled")
+        raise
+    except Exception as e:
+        logger.error(f"Redis state listener error: {e}")
+    finally:
+        if pubsub:
+            await pubsub.unsubscribe(redis_channel)
+            await pubsub.close()
+        if redis_client:
+            await redis_client.close()
+
+
+@app.on_event("startup")
+async def startup_event():
+    """Start background tasks on application startup."""
+    global background_task
+    background_task = asyncio.create_task(redis_state_listener())
+    logger.info("Started background Redis state listener")
+
+
+@app.on_event("shutdown")
+async def shutdown_event():
+    """Clean up background tasks on application shutdown."""
+    global background_task
+    if background_task:
+        background_task.cancel()
+        try:
+            await background_task
+        except asyncio.CancelledError:
+            pass
+        logger.info("Stopped background Redis state listener")
+
+
 @app.get("/spec")
 async def spec() -> dict[str, dict[str, str]]:
     """Capability specification endpoint.
@@ -57,7 +214,11 @@ async def spec() -> dict[str, dict[str, str]]:
     """
     return {
         "capabilities": {
-            "light": CAP_VERSION
+            "light": LIGHT_VERSION,
+            "thermostat": THERMOSTAT_VERSION,
+            "contact": CONTACT_SENSOR_VERSION,
+            "temp_humidity": TEMP_HUMIDITY_SENSOR_VERSION,
+            "relay": RELAY_VERSION
         }
     }
 
@@ -103,20 +264,81 @@ def load_devices() -> list[dict[str, Any]]:
 def get_mqtt_settings() -> tuple[str, int]:
     """Get MQTT broker settings from environment.
     
+    Supports both MQTT_BROKER and MQTT_HOST for compatibility.
+    
     Returns:
         tuple: (host, port)
     """
-    host = os.environ.get("MQTT_HOST", "172.16.2.16")
+    host = os.environ.get("MQTT_BROKER") or os.environ.get("MQTT_HOST", "172.16.2.16")
     port = int(os.environ.get("MQTT_PORT", "1883"))
     return host, port
 
 
+# ============================================================================
+# MQTT PUBLISH
+# ============================================================================
+
+async def publish_abstract_set(device_type: str, device_id: str, payload: dict[str, Any]) -> None:
+    """
+    Publish an abstract set command via MQTT.
+    
+    This function encapsulates MQTT publishing logic so that group/scene
+    execution doesn't need to know MQTT topic details.
+    
+    Topic format: home/{device_type}/{device_id}/set
+    Message format: {"type": device_type, "payload": payload}
+    
+    Args:
+        device_type: Device type (light, thermostat, relay, etc.)
+        device_id: Device identifier
+        payload: Command payload (e.g., {"power": "on", "brightness": 50})
+        
+    Example:
+        >>> await publish_abstract_set("light", "kueche_deckenlampe", {"power": "on", "brightness": 35})
+        # Publishes to: home/light/kueche_deckenlampe/set
+        # Message: {"type": "light", "payload": {"power": "on", "brightness": 35}}
+    """
+    mqtt_host, mqtt_port = get_mqtt_settings()
+    topic = f"home/{device_type}/{device_id}/set"
+    message = {
+        "type": device_type,
+        "payload": payload
+    }
+    
+    try:
+        async with Client(hostname=mqtt_host, port=mqtt_port) as client:
+            await client.publish(
+                topic=topic,
+                payload=json.dumps(message),
+                qos=1
+            )
+            logger.info(f"Published to {topic}: {message}")
+    except Exception as e:
+        logger.error(f"Failed to publish to {topic}: {e}")
+        raise
+
+
 def get_redis_settings() -> tuple[str, str]:
     """Get Redis settings from configuration.
     
+    Prioritizes environment variables over config file:
+    - REDIS_HOST, REDIS_PORT, REDIS_DB → redis://host:port/db
+    - REDIS_CHANNEL → pub/sub channel name
+    
     Returns:
         tuple: (url, channel)
     """
+    # Check environment variables first
+    redis_host = os.getenv("REDIS_HOST")
+    redis_port = os.getenv("REDIS_PORT", "6379")
+    redis_db = os.getenv("REDIS_DB", "0")
+    redis_channel = os.getenv("REDIS_CHANNEL", "ui:updates")
+    
+    if redis_host:
+        url = f"redis://{redis_host}:{redis_port}/{redis_db}"
+        return url, redis_channel
+    
+    # Fallback to config file
     config_path = Path(__file__).parent.parent.parent / "config" / "devices.yaml"
     
     if config_path.exists():
@@ -144,6 +366,32 @@ async def publish_mqtt(topic: str, payload: dict[str, Any]) -> None:
         await client.publish(topic, message, qos=1)
 
 
+@app.get("/devices/states")
+async def get_device_states() -> dict[str, dict[str, Any]]:
+    """Get current states of all devices from in-memory cache.
+    
+    Returns:
+        dict: Dictionary mapping device_id to state payload
+    """
+    logger.debug("Fetching all device states")
+    return device_states
+
+
+@app.get("/devices/{device_id}")
+async def get_device(device_id: str) -> DeviceInfo:
+    logger.debug(f"Fetching info for device {device_id}")
+    devices = load_devices()
+    device = next((d for d in devices if d["device_id"] == device_id), None)
+    if not device:
+        raise HTTPException(status_code=404, detail="Device not found")
+    return DeviceInfo(
+            device_id=device["device_id"],
+            type=device["type"],
+            name=device.get("name", device["device_id"]),
+            features=device.get("features", {})
+        )
+
+
 @app.get("/devices")
 async def get_devices() -> list[DeviceInfo]:
     """Get list of available devices.
@@ -151,6 +399,7 @@ async def get_devices() -> list[DeviceInfo]:
     Returns:
         list: List of device information including features
     """
+    logger.debug("Fetching list of devices")
     devices = load_devices()
     return [
         DeviceInfo(
@@ -163,6 +412,7 @@ async def get_devices() -> list[DeviceInfo]:
     ]
 
 
+
 @app.get("/layout")
 async def get_layout() -> dict[str, Any]:
     """Get UI layout configuration.
@@ -170,8 +420,6 @@ async def get_layout() -> dict[str, Any]:
     Returns:
         dict: Layout configuration with rooms and device tiles
     """
-    from packages.home_capabilities import load_layout
-    
     try:
         layout = load_layout()
         
@@ -200,6 +448,23 @@ async def get_layout() -> dict[str, Any]:
         return {"rooms": []}
 
 
+@app.get("/devices/{device_id}/room")
+async def get_device_room(device_id: str) -> dict[str, str | None]:
+    """Get the room name for a specific device.
+    
+    Args:
+        device_id: Device identifier
+        
+    Returns:
+        dict: {"device_id": str, "room": str | null}
+    """
+    room = get_room(device_id)
+    return {
+        "device_id": device_id,
+        "room": room
+    }
+
+
 @app.post("/devices/{device_id}/set", status_code=status.HTTP_202_ACCEPTED)
 async def set_device(device_id: str, request: SetDeviceRequest) -> dict[str, str]:
     """Set device state.
@@ -224,6 +489,13 @@ async def set_device(device_id: str, request: SetDeviceRequest) -> dict[str, str
             detail=f"Device {device_id} not found"
         )
     
+    # Check if device is read-only (contact sensors, etc.)
+    if "topics" in device and "set" not in device["topics"]:
+        raise HTTPException(
+            status_code=status.HTTP_405_METHOD_NOT_ALLOWED,
+            detail="Device is read-only"
+        )
+    
     # Validate payload based on device type
     if request.type == "light":
         try:
@@ -233,6 +505,42 @@ async def set_device(device_id: str, request: SetDeviceRequest) -> dict[str, str
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                 detail=f"Invalid payload for light: {e}"
             )
+    elif request.type == "relay":
+        try:
+            RelayState(**request.payload)
+        except ValidationError as e:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=f"Invalid payload for relay: {e}"
+            )
+    elif request.type == "thermostat":
+        try:
+            # For thermostat SET: only allow mode and target
+            allowed_set_fields = {"mode", "target"}
+            invalid_fields = set(request.payload.keys()) - allowed_set_fields
+            if invalid_fields:
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail=f"Thermostat SET only allows {allowed_set_fields}, got invalid fields: {invalid_fields}"
+                )
+            ThermostatState(**request.payload)
+        except ValidationError as e:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=f"Invalid payload for thermostat: {e}"
+            )
+    elif request.type in {"contact", "contact_sensor"}:
+        # Contact sensors are read-only
+        raise HTTPException(
+            status_code=status.HTTP_405_METHOD_NOT_ALLOWED,
+            detail="Contact sensors are read-only devices"
+        )
+    elif request.type in {"temp_humidity", "temp_humidity_sensor"}:
+        # Temperature & humidity sensors are read-only
+        raise HTTPException(
+            status_code=status.HTTP_405_METHOD_NOT_ALLOWED,
+            detail="Temperature & humidity sensors are read-only devices"
+        )
     else:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -252,7 +560,13 @@ async def set_device(device_id: str, request: SetDeviceRequest) -> dict[str, str
 
 
 async def event_generator(request: Request) -> AsyncGenerator[str, None]:
-    """Generate SSE events from Redis Pub/Sub.
+    """Generate SSE events from Redis Pub/Sub with Safari compatibility.
+    
+    Safari-compatible features:
+    - Immediate retry hint on connection
+    - Regular heartbeats every 15s (comment-only, no data)
+    - Proper flushing after each yield
+    - Graceful disconnect handling
     
     Args:
         request: FastAPI request object for disconnect detection
@@ -260,70 +574,125 @@ async def event_generator(request: Request) -> AsyncGenerator[str, None]:
     Yields:
         str: SSE formatted event strings
     """
-    redis_url, redis_channel = get_redis_settings()
-    redis_client = await aioredis.from_url(redis_url, decode_responses=True)
-    pubsub = redis_client.pubsub()
+    redis_client = None
+    pubsub = None
     
     try:
-        await pubsub.subscribe(redis_channel)
+        # Send retry hint immediately for EventSource reconnect behavior
+        yield "retry: 2500\n\n"
         
-        # Create heartbeat task
+        # Try to connect to Redis
+        redis_url, redis_channel = get_redis_settings()
+        try:
+            redis_client = await aioredis.from_url(redis_url, decode_responses=True)
+            pubsub = redis_client.pubsub()
+            await pubsub.subscribe(redis_channel)
+            logger.info(f"SSE client connected, subscribed to {redis_channel}")
+        except Exception as e:
+            logger.warning(f"Redis unavailable, running in heartbeat-only mode: {e}")
+            redis_client = None
+            pubsub = None
+        
+        # Heartbeat tracking
         last_heartbeat = asyncio.get_event_loop().time()
+        heartbeat_interval = 15  # Safari-friendly: shorter interval
         
         while True:
             # Check if client disconnected
             if await request.is_disconnected():
+                logger.info("SSE client disconnected")
                 break
             
-            # Get message with timeout for heartbeat
-            try:
-                message = await asyncio.wait_for(
-                    pubsub.get_message(ignore_subscribe_messages=True),
-                    timeout=1.0
-                )
-                
-                if message and message["type"] == "message":
-                    # Send data event
-                    data = message["data"]
-                    yield f"event: message\ndata: {data}\n\n"
-                    last_heartbeat = asyncio.get_event_loop().time()
-                
-            except asyncio.TimeoutError:
-                pass
+            # Try to get message from Redis (if available)
+            if pubsub:
+                try:
+                    message = await asyncio.wait_for(
+                        pubsub.get_message(ignore_subscribe_messages=True),
+                        timeout=0.1
+                    )
+                    
+                    if message and message["type"] == "message":
+                        data = message["data"]
+                        logger.debug(f"Sending SSE message: {data[:100]}...")
+                        
+                        # Update in-memory cache with latest state
+                        try:
+                            state_data = json.loads(data)
+                            if state_data.get("type") == "state" and state_data.get("device_id"):
+                                device_states[state_data["device_id"]] = state_data.get("payload", {})
+                        except Exception as e:
+                            logger.warning(f"Failed to parse state data for cache: {e}")
+                        
+                        yield f"event: message\ndata: {data}\n\n"
+                        last_heartbeat = asyncio.get_event_loop().time()
+                        continue  # Skip sleep, check for more messages immediately
+                        
+                except asyncio.TimeoutError:
+                    pass  # No message, continue to heartbeat check
+                except Exception as e:
+                    logger.error(f"Redis error: {e}")
+                    # Continue with heartbeats even if Redis fails
             
-            # Send heartbeat every 25 seconds
+            # Sleep briefly to avoid busy loop
+            await asyncio.sleep(0.1)
+            
+            # Send heartbeat if interval elapsed
             current_time = asyncio.get_event_loop().time()
-            if current_time - last_heartbeat >= 25:
-                yield "event: ping\ndata: heartbeat\n\n"
+            if current_time - last_heartbeat >= heartbeat_interval:
+                # Comment-style ping (Safari-compatible, no event type)
+                yield ": ping\n\n"
                 last_heartbeat = current_time
             
+    except asyncio.CancelledError:
+        logger.info("SSE connection cancelled by client")
+        raise
+    except Exception as e:
+        logger.error(f"SSE error: {e}")
+        raise
     finally:
-        await pubsub.unsubscribe(redis_channel)
-        await pubsub.close()
-        await redis_client.close()
+        # Cleanup Redis connection
+        if pubsub:
+            try:
+                await pubsub.unsubscribe(redis_channel)
+                await pubsub.aclose()
+            except Exception as e:
+                logger.error(f"Error closing pubsub: {e}")
+        
+        if redis_client:
+            try:
+                await redis_client.aclose()
+            except Exception as e:
+                logger.error(f"Error closing redis: {e}")
+        
+        logger.info("SSE connection closed")
 
 
 @app.get("/realtime")
 async def realtime_events(request: Request) -> StreamingResponse:
     """Server-Sent Events endpoint for real-time updates.
     
+    Safari-compatible SSE implementation:
+    - Immediate retry hint (2.5s reconnect delay)
+    - Heartbeat every 15s using comment syntax ": ping"
+    - Proper Cache-Control headers
+    - No buffering (nginx compatibility)
+    - Graceful Redis fallback (heartbeat-only mode)
+    
     Args:
         request: FastAPI request object
         
     Returns:
-        StreamingResponse: SSE stream of Redis messages
+        StreamingResponse: SSE stream with Redis messages and heartbeats
     """
     return StreamingResponse(
         event_generator(request),
         media_type="text/event-stream",
         headers={
-            "Cache-Control": "no-cache",
+            "Cache-Control": "no-cache, no-transform",
             "Connection": "keep-alive",
             "X-Accel-Buffering": "no",  # Disable nginx buffering
         }
     )
-    
-    return {"message": f"Command sent to {device_id}"}
 
 
 def main() -> None:

apps/api/requirements.txt

@@ -0,0 +1,6 @@
+fastapi==0.104.1
+uvicorn[standard]==0.24.0
+pydantic>=2
+redis==5.0.1
+aiomqtt==2.0.1
+pyyaml==6.0.1

apps/api/resolvers.py

@@ -0,0 +1,286 @@
+"""Group and scene resolution logic."""
+
+import logging
+from pathlib import Path
+from typing import Any, TypedDict
+
+from packages.home_capabilities import (
+    GroupConfig,
+    GroupsConfigRoot,
+    SceneStep,
+    get_group_by_id,
+    load_layout,
+)
+
+logger = logging.getLogger(__name__)
+
+
+# ============================================================================
+# TYPE DEFINITIONS
+# ============================================================================
+
+class DeviceDTO(TypedDict, total=False):
+    """Device Data Transfer Object.
+    
+    Represents a device as returned by /devices endpoint or load_devices().
+    
+    Required fields:
+        device_id: Unique device identifier
+        type: Device type (light, thermostat, relay, etc.)
+    
+    Optional fields:
+        name: Human-readable device name
+        features: Device capabilities (power, brightness, etc.)
+        technology: MQTT, zigbee2mqtt, simulator, etc.
+        topics: MQTT topic configuration
+        metadata: Additional device information
+    """
+    device_id: str
+    type: str
+    name: str
+    features: dict[str, Any]
+    technology: str
+    topics: dict[str, str]
+    metadata: dict[str, Any]
+
+
+# ============================================================================
+# DEVICE-ROOM MAPPING
+# ============================================================================
+
+# Global cache for device -> room mapping
+_device_room_cache: dict[str, str] = {}
+
+
+def load_device_rooms(path: str | Path | None = None) -> dict[str, str]:
+    """
+    Load device-to-room mapping from layout configuration.
+    
+    This function extracts a mapping of device_id -> room_name from the layout.yaml
+    file, which is useful for resolving selectors like {room: "Küche"}.
+    
+    Args:
+        path: Optional path to layout.yaml. If None, uses default path
+              (config/layout.yaml relative to workspace root)
+    
+    Returns:
+        Dictionary mapping device_id to room_name. Returns empty dict if:
+        - layout.yaml doesn't exist
+        - layout.yaml is malformed
+        - layout.yaml is empty
+        
+    Example:
+        >>> mapping = load_device_rooms()
+        >>> mapping['kueche_lampe1']
+        'Küche'
+    """
+    global _device_room_cache
+    
+    try:
+        # Load the layout using existing function
+        layout = load_layout(path)
+        
+        # Build device -> room mapping
+        device_rooms: dict[str, str] = {}
+        for room in layout.rooms:
+            for device in room.devices:
+                device_rooms[device.device_id] = room.name
+        
+        # Update global cache
+        _device_room_cache = device_rooms.copy()
+        
+        logger.info(f"Loaded device-room mapping: {len(device_rooms)} devices")
+        return device_rooms
+        
+    except (FileNotFoundError, ValueError, Exception) as e:
+        logger.warning(f"Failed to load device-room mapping: {e}")
+        logger.warning("Returning empty device-room mapping")
+        _device_room_cache = {}
+        return {}
+
+
+def get_room(device_id: str) -> str | None:
+    """
+    Get the room name for a given device ID.
+    
+    This function uses the cached device-room mapping loaded by load_device_rooms().
+    If the cache is empty, it will attempt to load it first.
+    
+    Args:
+        device_id: The device identifier to lookup
+        
+    Returns:
+        Room name if device is found, None otherwise
+        
+    Example:
+        >>> get_room('kueche_lampe1')
+        'Küche'
+        >>> get_room('nonexistent_device')
+        None
+    """
+    # Check if cache is populated
+    if not _device_room_cache:
+        logger.debug("Device-room cache empty, loading from layout...")
+        # Load mapping (this updates the global _device_room_cache)
+        load_device_rooms()
+    
+    # Access the cache after potential reload
+    return _device_room_cache.get(device_id)
+
+
+def clear_room_cache() -> None:
+    """
+    Clear the cached device-room mapping.
+    
+    This is useful for testing or when the layout configuration has changed
+    and needs to be reloaded.
+    """
+    _device_room_cache.clear()
+    logger.debug("Cleared device-room cache")
+
+
+# ============================================================================
+# GROUP & SCENE RESOLUTION
+# ============================================================================
+
+def resolve_group_devices(
+    group: GroupConfig,
+    devices: list[DeviceDTO],
+    device_rooms: dict[str, str]
+) -> list[DeviceDTO]:
+    """
+    Resolve devices for a group based on device_ids or selector.
+    
+    Args:
+        group: Group configuration with device_ids or selector
+        devices: List of all available devices
+        device_rooms: Mapping of device_id -> room_name
+        
+    Returns:
+        List of devices matching the group criteria (no duplicates)
+        
+    Example:
+        >>> # Group with explicit device_ids
+        >>> group = GroupConfig(id="test", name="Test", device_ids=["lamp1", "lamp2"])
+        >>> resolve_group_devices(group, all_devices, {})
+        [{"device_id": "lamp1", ...}, {"device_id": "lamp2", ...}]
+        
+        >>> # Group with selector (all lights in kitchen)
+        >>> group = GroupConfig(
+        ...     id="kitchen_lights",
+        ...     name="Kitchen Lights",
+        ...     selector=GroupSelector(type="light", room="Küche")
+        ... )
+        >>> resolve_group_devices(group, all_devices, device_rooms)
+        [{"device_id": "kueche_deckenlampe", ...}, ...]
+    """
+    # Case 1: Explicit device_ids
+    if group.device_ids:
+        device_id_set = set(group.device_ids)
+        return [d for d in devices if d["device_id"] in device_id_set]
+    
+    # Case 2: Selector-based filtering
+    if group.selector:
+        filtered = []
+        
+        for device in devices:
+            # Filter by type (required in selector)
+            if device["type"] != group.selector.type:
+                continue
+            
+            # Filter by room (optional)
+            if group.selector.room:
+                device_room = device_rooms.get(device["device_id"])
+                if device_room != group.selector.room:
+                    continue
+            
+            # Filter by tags (optional, future feature)
+            # if group.selector.tags:
+            #     device_tags = device.get("metadata", {}).get("tags", [])
+            #     if not any(tag in device_tags for tag in group.selector.tags):
+            #         continue
+            
+            filtered.append(device)
+        
+        return filtered
+    
+    # No device_ids and no selector → empty list
+    return []
+
+
+def resolve_scene_step_devices(
+    step: SceneStep,
+    groups_config: GroupsConfigRoot,
+    devices: list[DeviceDTO],
+    device_rooms: dict[str, str]
+) -> list[DeviceDTO]:
+    """
+    Resolve devices for a scene step based on group_id or selector.
+    
+    Args:
+        step: Scene step with group_id or selector
+        groups_config: Groups configuration for group lookup
+        devices: List of all available devices
+        device_rooms: Mapping of device_id -> room_name
+        
+    Returns:
+        List of devices matching the step criteria
+        
+    Raises:
+        ValueError: If group_id is specified but group not found
+        
+    Example:
+        >>> # Step with group_id
+        >>> step = SceneStep(group_id="kitchen_lights", action={...})
+        >>> resolve_scene_step_devices(step, groups_cfg, all_devices, device_rooms)
+        [{"device_id": "kueche_deckenlampe", ...}, ...]
+        
+        >>> # Step with selector
+        >>> step = SceneStep(
+        ...     selector=SceneSelector(type="light", room="Küche"),
+        ...     action={...}
+        ... )
+        >>> resolve_scene_step_devices(step, groups_cfg, all_devices, device_rooms)
+        [{"device_id": "kueche_deckenlampe", ...}, ...]
+    """
+    # Case 1: Group reference
+    if step.group_id:
+        # Look up the group
+        group = get_group_by_id(groups_config, step.group_id)
+        
+        if not group:
+            raise ValueError(
+                f"Scene step references unknown group_id: '{step.group_id}'. "
+                f"Available groups: {[g.id for g in groups_config.groups]}"
+            )
+        
+        # Resolve the group's devices
+        return resolve_group_devices(group, devices, device_rooms)
+    
+    # Case 2: Direct selector
+    if step.selector:
+        filtered = []
+        
+        for device in devices:
+            # Filter by type (optional in scene selector)
+            if step.selector.type and device["type"] != step.selector.type:
+                continue
+            
+            # Filter by room (optional)
+            if step.selector.room:
+                device_room = device_rooms.get(device["device_id"])
+                if device_room != step.selector.room:
+                    continue
+            
+            # Filter by tags (optional, future feature)
+            # if step.selector.tags:
+            #     device_tags = device.get("metadata", {}).get("tags", [])
+            #     if not any(tag in device_tags for tag in step.selector.tags):
+            #         continue
+            
+            filtered.append(device)
+        
+        return filtered
+    
+    # Should not reach here due to SceneStep validation (must have group_id or selector)
+    return []

apps/api/routes/__init__.py

@@ -0,0 +1 @@
+"""API routes package."""

apps/api/routes/groups_scenes.py

@@ -0,0 +1,454 @@
+"""Groups and Scenes API routes."""
+
+import asyncio
+import logging
+from pathlib import Path
+from typing import Any
+
+from fastapi import APIRouter, HTTPException, status
+from pydantic import BaseModel
+
+from packages.home_capabilities import (
+    GroupConfig,
+    GroupsConfigRoot,
+    SceneConfig,
+    ScenesConfigRoot,
+    get_group_by_id,
+    get_scene_by_id,
+    load_groups,
+    load_scenes,
+)
+
+# Import from parent modules
+import sys
+sys.path.insert(0, str(Path(__file__).parent.parent))
+from resolvers import (
+    DeviceDTO,
+    resolve_group_devices,
+    resolve_scene_step_devices,
+    load_device_rooms,
+)
+from main import load_devices, publish_abstract_set
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter()
+
+
+# ============================================================================
+# REQUEST/RESPONSE MODELS
+# ============================================================================
+
+class GroupResponse(BaseModel):
+    """Response model for a group."""
+    id: str
+    name: str
+    device_count: int
+    devices: list[str]
+    selector: dict[str, Any] | None = None
+    capabilities: dict[str, bool]
+
+
+class GroupSetRequest(BaseModel):
+    """Request to set state for all devices in a group."""
+    action: dict[str, Any]  # e.g., {"type": "light", "payload": {"power": "on", "brightness": 50}}
+
+
+class SceneResponse(BaseModel):
+    """Response model for a scene."""
+    id: str
+    name: str
+    steps: int
+
+
+class SceneRunRequest(BaseModel):
+    """Request to execute a scene (currently empty, future: override params)."""
+    pass
+
+
+class SceneExecutionResponse(BaseModel):
+    """Response after scene execution."""
+    scene_id: str
+    scene_name: str
+    steps_executed: int
+    devices_affected: int
+    execution_plan: list[dict[str, Any]]
+
+
+# ============================================================================
+# GROUPS ENDPOINTS
+# ============================================================================
+
+@router.get("/groups", response_model=list[GroupResponse], tags=["groups"])
+async def list_groups() -> list[GroupResponse]:
+    """
+    List all available groups.
+    
+    Returns:
+        list[GroupResponse]: List of groups with their devices
+    """
+    try:
+        # Load configuration
+        groups_config = load_groups(Path(__file__).parent.parent.parent.parent / "config" / "groups.yaml")
+        devices = load_devices()
+        device_rooms = load_device_rooms()
+        
+        # Build response for each group
+        response = []
+        for group in groups_config.groups:
+            # Resolve devices for this group
+            resolved_devices = resolve_group_devices(group, devices, device_rooms)
+            device_ids = [d["device_id"] for d in resolved_devices]
+            
+            # Convert selector to dict if present
+            selector_dict = None
+            if group.selector:
+                selector_dict = {
+                    "type": group.selector.type,
+                    "room": group.selector.room,
+                    "tags": group.selector.tags,
+                }
+            
+            response.append(GroupResponse(
+                id=group.id,
+                name=group.name,
+                device_count=len(device_ids),
+                devices=device_ids,
+                selector=selector_dict,
+                capabilities=group.capabilities,
+            ))
+        
+        return response
+        
+    except Exception as e:
+        logger.error(f"Error loading groups: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to load groups: {str(e)}"
+        )
+
+
+@router.get("/groups/{group_id}", response_model=GroupResponse, tags=["groups"])
+async def get_group(group_id: str) -> GroupResponse:
+    """
+    Get details for a specific group.
+    
+    Args:
+        group_id: Group identifier
+        
+    Returns:
+        GroupResponse: Group details with resolved devices
+    """
+    try:
+        # Load configuration
+        groups_config = load_groups(Path(__file__).parent.parent.parent.parent / "config" / "groups.yaml")
+        devices = load_devices()
+        device_rooms = load_device_rooms()
+        
+        # Find the group
+        group = get_group_by_id(groups_config, group_id)
+        if not group:
+            available_groups = [g.id for g in groups_config.groups]
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"Group '{group_id}' not found. Available groups: {available_groups}"
+            )
+        
+        # Resolve devices
+        resolved_devices = resolve_group_devices(group, devices, device_rooms)
+        device_ids = [d["device_id"] for d in resolved_devices]
+        
+        # Convert selector to dict if present
+        selector_dict = None
+        if group.selector:
+            selector_dict = {
+                "type": group.selector.type,
+                "room": group.selector.room,
+                "tags": group.selector.tags,
+            }
+        
+        return GroupResponse(
+            id=group.id,
+            name=group.name,
+            device_count=len(device_ids),
+            devices=device_ids,
+            selector=selector_dict,
+            capabilities=group.capabilities,
+        )
+        
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(f"Error getting group {group_id}: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to get group: {str(e)}"
+        )
+
+
+@router.post("/groups/{group_id}/set", status_code=status.HTTP_202_ACCEPTED, tags=["groups"])
+async def set_group(group_id: str, request: GroupSetRequest) -> dict[str, Any]:
+    """
+    Set state for all devices in a group.
+    
+    This endpoint resolves the group to its devices and would send
+    the action to each device. Currently returns execution plan.
+    
+    Args:
+        group_id: Group identifier
+        request: Action to apply to all devices in the group
+        
+    Returns:
+        dict: Execution plan (devices and actions to be executed)
+    """
+    try:
+        # Load configuration
+        groups_config = load_groups(Path(__file__).parent.parent.parent.parent / "config" / "groups.yaml")
+        devices = load_devices()
+        device_rooms = load_device_rooms()
+        
+        # Find the group
+        group = get_group_by_id(groups_config, group_id)
+        if not group:
+            available_groups = [g.id for g in groups_config.groups]
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"Group '{group_id}' not found. Available groups: {available_groups}"
+            )
+        
+        # Resolve devices
+        resolved_devices = resolve_group_devices(group, devices, device_rooms)
+        
+        if not resolved_devices:
+            logger.warning(f"Group '{group_id}' resolved to 0 devices")
+        
+        # Execute actions via MQTT
+        execution_plan = []
+        for device in resolved_devices:
+            device_type = device["type"]
+            device_id = device["device_id"]
+            payload = request.action.get("payload", {})
+            
+            # Publish MQTT command
+            try:
+                await publish_abstract_set(device_type, device_id, payload)
+                execution_plan.append({
+                    "device_id": device_id,
+                    "device_type": device_type,
+                    "action": request.action,
+                    "status": "published"
+                })
+            except Exception as e:
+                logger.error(f"Failed to publish to {device_id}: {e}")
+                execution_plan.append({
+                    "device_id": device_id,
+                    "device_type": device_type,
+                    "action": request.action,
+                    "status": "failed",
+                    "error": str(e)
+                })
+        
+        return {
+            "group_id": group_id,
+            "group_name": group.name,
+            "devices_affected": len(resolved_devices),
+            "execution_plan": execution_plan,
+            "status": "executed"
+        }
+        
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(f"Error setting group {group_id}: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to set group: {str(e)}"
+        )
+
+
+# ============================================================================
+# SCENES ENDPOINTS
+# ============================================================================
+
+@router.get("/scenes", response_model=list[SceneResponse], tags=["scenes"])
+async def list_scenes() -> list[SceneResponse]:
+    """
+    List all available scenes.
+    
+    Returns:
+        list[SceneResponse]: List of scenes
+    """
+    try:
+        # Load configuration
+        scenes_config = load_scenes(Path(__file__).parent.parent.parent.parent / "config" / "scenes.yaml")
+        
+        # Build response for each scene
+        response = []
+        for scene in scenes_config.scenes:
+            response.append(SceneResponse(
+                id=scene.id,
+                name=scene.name,
+                steps=len(scene.steps),
+            ))
+        
+        return response
+        
+    except Exception as e:
+        logger.error(f"Error loading scenes: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to load scenes: {str(e)}"
+        )
+
+
+@router.get("/scenes/{scene_id}", response_model=SceneResponse, tags=["scenes"])
+async def get_scene(scene_id: str) -> SceneResponse:
+    """
+    Get details for a specific scene.
+    
+    Args:
+        scene_id: Scene identifier
+        
+    Returns:
+        SceneResponse: Scene details
+    """
+    try:
+        # Load configuration
+        scenes_config = load_scenes(Path(__file__).parent.parent.parent.parent / "config" / "scenes.yaml")
+        
+        # Find the scene
+        scene = get_scene_by_id(scenes_config, scene_id)
+        if not scene:
+            available_scenes = [s.id for s in scenes_config.scenes]
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"Scene '{scene_id}' not found. Available scenes: {available_scenes}"
+            )
+        
+        return SceneResponse(
+            id=scene.id,
+            name=scene.name,
+            steps=len(scene.steps),
+        )
+        
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(f"Error getting scene {scene_id}: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to get scene: {str(e)}"
+        )
+
+
+@router.post("/scenes/{scene_id}/run", response_model=SceneExecutionResponse, tags=["scenes"])
+async def run_scene(scene_id: str, request: SceneRunRequest | None = None) -> SceneExecutionResponse:
+    """
+    Execute a scene.
+    
+    This endpoint resolves each step in the scene to its target devices
+    and would execute the actions. Currently returns execution plan.
+    
+    Args:
+        scene_id: Scene identifier
+        request: Optional execution parameters (reserved for future use)
+        
+    Returns:
+        SceneExecutionResponse: Execution plan and summary
+    """
+    try:
+        # Load configuration
+        scenes_config = load_scenes(Path(__file__).parent.parent.parent.parent / "config" / "scenes.yaml")
+        groups_config = load_groups(Path(__file__).parent.parent.parent.parent / "config" / "groups.yaml")
+        devices = load_devices()
+        device_rooms = load_device_rooms()
+        
+        # Find the scene
+        scene = get_scene_by_id(scenes_config, scene_id)
+        if not scene:
+            available_scenes = [s.id for s in scenes_config.scenes]
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"Scene '{scene_id}' not found. Available scenes: {available_scenes}"
+            )
+        
+        # Execute scene steps
+        execution_plan = []
+        total_devices = 0
+        
+        for i, step in enumerate(scene.steps, 1):
+            # Resolve devices for this step
+            resolved_devices = resolve_scene_step_devices(step, groups_config, devices, device_rooms)
+            total_devices += len(resolved_devices)
+            
+            # Extract action payload
+            action_payload = step.action.get("payload", {})
+            
+            # Execute for each device
+            step_executions = []
+            for device in resolved_devices:
+                device_type = device["type"]
+                device_id = device["device_id"]
+                
+                try:
+                    await publish_abstract_set(device_type, device_id, action_payload)
+                    step_executions.append({
+                        "device_id": device_id,
+                        "status": "published"
+                    })
+                except Exception as e:
+                    logger.error(f"Failed to publish to {device_id} in step {i}: {e}")
+                    step_executions.append({
+                        "device_id": device_id,
+                        "status": "failed",
+                        "error": str(e)
+                    })
+            
+            # Build step info
+            step_info = {
+                "step": i,
+                "devices_affected": len(resolved_devices),
+                "device_ids": [d["device_id"] for d in resolved_devices],
+                "action": step.action,
+                "executions": step_executions,
+            }
+            
+            # Add targeting info
+            if step.group_id:
+                step_info["target"] = {"type": "group_id", "value": step.group_id}
+            elif step.selector:
+                step_info["target"] = {
+                    "type": "selector",
+                    "selector_type": step.selector.type,
+                    "room": step.selector.room,
+                }
+            
+            if step.delay_ms:
+                step_info["delay_ms"] = step.delay_ms
+                # Apply delay before next step
+                await asyncio.sleep(step.delay_ms / 1000.0)
+            
+            execution_plan.append(step_info)
+        
+        return SceneExecutionResponse(
+            scene_id=scene.id,
+            scene_name=scene.name,
+            steps_executed=len(scene.steps),
+            devices_affected=total_devices,
+            execution_plan=execution_plan,
+        )
+        
+    except HTTPException:
+        raise
+    except ValueError as e:
+        # Handle unknown group_id in scene step
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(e)
+        )
+    except Exception as e:
+        logger.error(f"Error running scene {scene_id}: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to run scene: {str(e)}"
+        )

apps/homekit/README.md

@@ -0,0 +1,465 @@
+# HomeKit Bridge
+
+HomeKit Accessory Protocol (HAP) Bridge für das Home Automation System.
+
+## Überblick
+
+Diese HomeKit-Bridge ermöglicht die Steuerung aller Geräte über Apple HomeKit / Home-App auf iPhone/iPad/Mac.
+
+**Architektur:**
+- Läuft auf Raspberry Pi im lokalen Netzwerk
+- Kommuniziert ausschließlich über REST-API (kein direkter MQTT/Redis-Zugriff)
+- Verwendet [HAP-Python](https://github.com/ikalchev/HAP-python) für HomeKit-Protokoll
+- Unterstützt Echtzeit-Updates über Server-Sent Events (SSE)
+
+## Implementierungsanleitung für Copilot
+
+<details>
+<summary>Copilot-Aufgabe: Implementiere die HomeKit-Bridge (HAP-Python) für unser System</summary>
+
+### Kontext
+
+- Wir verwenden HAP-Python als HomeKit-Bridge.
+- Die Bridge läuft auf einem Raspberry Pi im gleichen LAN wie die iPhones.
+- Die Bridge kommuniziert AUSSCHLIESSLICH über die REST-API mit dem restlichen System (KEIN direkter MQTT-/Redis-Zugriff).
+- Geräte- und Raum-Infos kommen aus:
+    - `GET /devices`
+    - `GET /layout`
+  und werden über `device_id` gejoint.
+- Die Abbildung von abstrakten Gerätetypen/Features auf HomeKit-Services/Characteristics steht in der Datei `apps/homekit/homekit_mapping.md` (Markdown-Tabelle). Bitte orientiere dich daran.
+
+### Ziel
+
+Implementiere eine lauffähige HomeKit-Bridge in `apps/homekit`, die:
+- beim Start Geräte & Räume über die API lädt,
+- daraus anhand der Mapping-Tabelle HomeKit-Accessories erzeugt,
+- Zustandsänderungen über einen Realtime-Endpoint der API empfängt und in HomeKit spiegeln kann,
+- Set-Kommandos aus HomeKit (z.B. Licht an/aus, Helligkeit, Zieltemperatur) per `POST /devices/{id}/set` an die API sendet,
+- saubere Start-/Stop-Logs ausgibt,
+- einfache Test-/Startanweisungen für den Raspberry Pi und die Home-App (iPhone) in Kommentaren dokumentiert.
+
+### WICHTIG
+
+- Bitte benutze HAP-Python (pyhap).
+- Keine direkte MQTT- oder Redis-Kommunikation in der Bridge.
+- Nutze HTTP(S) zur API (z.B. mit requests oder httpx; gerne sync, HAP-Python ist selbst eventloop-orientiert).
+- Nutze die Mapping-Tabelle in `apps/homekit/homekit_mapping.md` als Leitlinie für die Accessory-Typen.
+
+### Paketstruktur
+
+```
+apps/homekit/
+├── __init__.py
+├── main.py                  # Einstiegspunkt
+├── api_client.py            # REST-Client zur API
+├── device_registry.py       # Join /devices + /layout → internes Device-Modell
+├── accessories/
+│   ├── base.py              # gemeinsame Basisklasse/n für Accessories
+│   ├── light.py             # Light-Accessories
+│   ├── thermostat.py
+│   ├── contact.py
+│   ├── sensor.py            # temp_humidity etc.
+│   └── cover.py             # optional, Rollladen
+└── tests/                   # rudimentäre Tests/Checks
+```
+
+## Teil 1: Internes Gerätemodell / Device-Registry
+
+### 1.1 Erstelle in `apps/homekit/device_registry.py`:
+
+**Dataklasse/Model Device:**
+- `device_id: str`
+- `type: str` - "light","thermostat","outlet","contact","temp_humidity","cover",...
+- `name: str` - Kurzname aus `GET /devices.name`
+- `friendly_name: str` - title aus `GET /layout` (fallback name)
+- `room: str | None` - Raumname aus layout
+- `features: dict[str, bool]`
+- `read_only: bool` - heuristisch: Sensor-/Kontakt-Typen sind read_only
+
+**Klasse DeviceRegistry mit Funktionen:**
+- `def load_from_api(api: ApiClient) -> DeviceRegistry`:
+    - ruft `GET /devices` und `GET /layout` auf,
+    - joint über `device_id`,
+    - erstellt Device-Instanzen.
+- `get_all(): list[Device]`
+- `get_by_id(device_id: str) -> Device | None`
+
+**Akzeptanz:**
+- `load_from_api` funktioniert mit der bestehenden Struktur von `/devices` und `/layout`:
+    - `/devices` liefert mindestens `{device_id, type, name, features}`
+    - `/layout` liefert eine Struktur, aus der `device_id → room + title` ableitbar ist
+- Der Join über `device_id` klappt; fehlende Layout-Einträge werden toleriert
+
+## Teil 2: API-Client
+
+### 2.1 Erstelle in `apps/homekit/api_client.py`:
+
+**Klasse ApiClient mit:**
+- `__init__(self, base_url: str, token: str | None = None, timeout: int = 5)`
+- **Methoden:**
+    - `get_devices() -> list[dict]`: GET /devices
+    - `get_layout() -> dict`: GET /layout
+    - `get_device_state(device_id: str) -> dict`: GET /devices/{id}/state
+    - `post_device_set(device_id: str, type: str, payload: dict) -> None`: POST /devices/{id}/set
+    - `stream_realtime() -> Iterator[dict]`:
+        - GET /realtime als SSE, yield jedes Event als dict:
+          `{"type":"state","device_id":...,"payload":{...},"ts":...}`
+
+**Auth:**
+- Wenn ein API-Token via ENV `HOMEKIT_API_TOKEN` gesetzt ist, nutze HTTP-Header:
+  `Authorization: Bearer <token>`
+
+**Akzeptanz:**
+- ApiClient ist robust:
+    - bei Netzwerkfehlern gibt es sinnvolle Exceptions/Logs,
+    - `stream_realtime` behandelt Reconnect (z.B. einfache Endlosschleife mit Backoff).
+- Es werden keine MQTT-Details verwendet, nur HTTP.
+
+## Teil 3: HomeKit-Accessory-Klassen (HAP-Python)
+
+### 3.1 Erstelle in `apps/homekit/accessories/base.py`:
+
+**Basisklasse BaseDeviceAccessory(Accessory) mit:**
+- Referenz auf Device (aus DeviceRegistry)
+- Referenz auf ApiClient
+- Methoden zum:
+    - Registrieren von HAP-Characteristics und Set-Handlern
+    - Aktualisieren von Characteristics bei eingehenden Events
+- Logging
+
+### 3.2 Erstelle spezifische Accessory-Klassen basierend auf homekit_mapping.md:
+
+**LightAccessories (`apps/homekit/accessories/light.py`):**
+- On/Off (nur power)
+- Dimmable (power + brightness)
+- Color (power + brightness + color_hsb)
+
+**ThermostatAccessory:**
+- CurrentTemperature, TargetTemperature, Mode (so weit in Mapping definiert)
+
+**ContactAccessory:**
+- ContactSensorState (open/closed)
+
+**TempHumidityAccessory:**
+- TemperatureSensor (CurrentTemperature)
+- HumiditySensor (CurrentRelativeHumidity)
+
+**OutletAccessory:**
+- On/Off
+
+**CoverAccessory (optional):**
+- WindowCovering mit CurrentPosition/TargetPosition
+
+**Die Mapping-Tabelle in `homekit_mapping.md` ist die normative Referenz:**
+- Bitte lies die Tabelle und mappe `abstract_type + Features → passende Accessory-Klasse und Characteristics`
+- Wo die Tabelle `Status=TODO/REVIEW` hat:
+    - Implementiere nur das, was eindeutig ist,
+    - lasse TODO-Kommentare an den entsprechenden Stellen im Code.
+
+**Akzeptanz:**
+- Für die abstrakten Typen, die bereits in `devices.yaml` und Mapping-Tabelle klar definiert sind (z.B. light, thermostat, contact, temp_humidity), existieren passende Accessory-Klassen.
+- Set-Operationen erzeugen korrekte Payloads für `POST /devices/{id}/set`:
+    - Light: `{"type":"light","payload":{"power":"on"/"off", "brightness":..., "hue":..., "sat":...}}`
+    - Thermostat: `{"type":"thermostat","payload":{"target":...}}`
+    - Contact: read_only → keine Set-Handler
+    - Temp/Humidity: read_only → keine Set-Handler
+
+## Teil 4: Bridge-Setup mit HAP-Python
+
+### 4.1 Implementiere in `apps/homekit/main.py`:
+
+**env-Konfiguration:**
+- `HOMEKIT_NAME` (default: "Home Automation Bridge")
+- `HOMEKIT_PIN` (z.B. "031-45-154")
+- `HOMEKIT_PORT` (default 51826)
+- `API_BASE` (z.B. "http://api:8001" oder extern)
+- `HOMEKIT_API_TOKEN` (optional)
+
+**Funktion `build_bridge(driver, api_client: ApiClient) -> Bridge`:**
+- DeviceRegistry via `load_from_api(api_client)` laden.
+- Für jedes Device anhand Mapping-Tabelle die passende Accessory-Klasse instanziieren.
+- Einen Bridge-Accessory (`pyhap.accessory.Bridge`) erstellen.
+- Alle Device-Accessories der Bridge hinzufügen.
+
+**Realtime-Event-Loop:**
+- In einem Hintergrund-Thread oder ThreadPool:
+    - `api_client.stream_realtime()` iterieren,
+    - für jedes Event `device_id → Accessory` finden,
+    - Characteristics updaten.
+- Thread wird beim Shutdown sauber beendet.
+
+**`main()`:**
+- Logging einrichten.
+- ApiClient erstellen.
+- `AccessoryDriver(port=HOMEKIT_PORT, persist_file="homekit.state")` erstellen.
+- Bridge via `build_bridge(driver, api_client)` bauen.
+- Bridge dem Driver hinzufügen.
+- Realtime-Thread starten.
+- `driver.start()` aufrufen.
+- Auf KeyboardInterrupt reagieren und sauber stoppen.
+
+**Akzeptanz:**
+- Beim Start loggt die Bridge:
+    - Anzahl Devices,
+    - auf welchem Port sie als HomeKit-Bridge lauscht,
+    - welches API_BASE verwendet wird.
+- Die Datei `homekit.state` wird im Arbeitsverzeichnis bzw. einem konfigurierbaren Ordner abgelegt (um Pairing-Info persistent zu halten).
+- Die Bridge übersteht API-Neustarts (Realtime-Loop reconnectet) und Netzwerkflaps.
+
+## Teil 5: Tests & Testanweisungen
+
+### 5.1 Lege in `apps/homekit/tests/` einfache Tests/Checks an:
+
+**Unit-Tests (pytest), soweit ohne echtes HomeKit möglich:**
+- Test für `DeviceRegistry.load_from_api()` mit Mock-Antworten aus `/devices` und `/layout`:
+    - Korrekte Join-Logik,
+    - Korrekte room/friendly_name-Zuordnung.
+- Test für set-Payload-Erzeugung pro Accessory:
+    - z.B. LightAccessory: On=True → POST /devices/{id}/set wird mit korrektem Payload aufgerufen (über Mock ApiClient).
+
+### Allgemein
+
+- Nutze möglichst sinnvolle Typannotationen und Docstrings.
+- Hinterlasse TODO-Kommentare an Stellen, wo die Mapping-Tabelle explizit Status=TODO/REVIEW hat.
+- Ändere KEINE bestehenden API-Endpunkte; verlasse dich nur auf deren aktuelles Verhalten (GET /devices, GET /layout, /realtime, POST /devices/{id}/set).
+
+
+## Installation & Setup
+
+### Voraussetzungen
+
+- Python 3.9+
+- Raspberry Pi im gleichen LAN wie iPhone/iPad
+- API-Server erreichbar (z.B. `http://api:8001`)
+
+### Installation
+
+```bash
+cd apps/homekit
+pip install -r requirements.txt
+```
+
+### Umgebungsvariablen
+
+Erstelle eine `.env` Datei oder setze folgende Variablen:
+
+```bash
+export API_BASE="http://YOUR_API_IP:8001"
+export HOMEKIT_API_TOKEN="your-token-if-needed"  # optional
+export HOMEKIT_PIN="031-45-154"
+export HOMEKIT_NAME="Home Automation Bridge"
+export HOMEKIT_PORT="51826"
+export HOMEKIT_PERSIST_FILE="homekit.state"
+```
+
+## Start
+
+```bash
+python -m apps.homekit.main
+```
+
+**Erwartete Logs:**
+```
+Loading devices from API...
+Loaded X devices from API
+Bridge built with Y accessories
+HomeKit Bridge started on port 51826
+Starting realtime event loop...
+```
+
+## Pairing mit iPhone (Home-App)
+
+1. **Voraussetzungen:**
+   - iPhone im gleichen WLAN wie Raspberry Pi
+   - Bridge läuft und zeigt "started on port 51826"
+
+2. **Home-App öffnen:**
+   - Öffne die Home-App auf dem iPhone
+   - Tippe auf "+"  → "Gerät hinzufügen"
+   - Wähle "Weitere Optionen..." oder "Code fehlt oder kann nicht gescannt werden"
+
+3. **Bridge auswählen:**
+   - Die Bridge sollte in der Nähe-Liste erscheinen (z.B. "Home Automation Bridge")
+   - Tippe auf die Bridge
+
+4. **PIN eingeben:**
+   - Gib den PIN ein: `031-45-154` (oder dein `HOMEKIT_PIN`)
+   - Format: `XXX-XX-XXX`
+
+5. **Konfiguration abschließen:**
+   - Geräte werden geladen
+   - Räume werden automatisch aus `layout.yaml` übernommen
+   - Geräte können nun über Home-App gesteuert werden
+
+## Funktionstests
+
+### Test 1: Licht einschalten
+
+**Aktion:** Lampe in Home-App antippen (On)
+
+**Erwartung:**
+- API-Log zeigt: `POST /devices/{id}/set` mit `{"type":"light","payload":{"power":"on"}}`
+- Physische Lampe oder Simulator schaltet ein
+
+### Test 2: Helligkeit ändern (dimmbare Lampe)
+
+**Aktion:** Helligkeits-Slider bewegen (z.B. 75%)
+
+**Erwartung:**
+- `POST /devices/{id}/set` mit `brightness` ca. 75
+- Lampe dimmt entsprechend
+
+### Test 3: Farbe ändern (Farblampe)
+
+**Aktion:** Farbe in Home-App wählen
+
+**Erwartung:**
+- `POST /devices/{id}/set` mit `hue`/`sat` Werten
+- Lampe wechselt Farbe
+
+### Test 4: Thermostat Zieltemperatur
+
+**Aktion:** Zieltemperatur auf 22°C setzen
+
+**Erwartung:**
+- `POST /devices/{id}/set` mit `target=22`
+- `CurrentTemperature` wird über `/realtime` aktualisiert
+
+### Test 5: Kontaktsensor (read-only)
+
+**Aktion:** Fenster physisch öffnen/schließen
+
+**Erwartung:**
+- `/realtime` sendet Event
+- Home-App zeigt "Offen" oder "Geschlossen"
+
+### Test 6: Temperatur-/Feuchtigkeitssensor
+
+**Aktion:** Werte ändern sich (z.B. Heizung an)
+
+**Erwartung:**
+- `/realtime` Events aktualisieren Werte
+- Home-App zeigt aktuelle Temperatur/Luftfeuchtigkeit
+
+## Troubleshooting
+
+### Bridge erscheint nicht in Home-App
+
+- **Netzwerk prüfen:** iPhone und RPi im gleichen Subnet?
+- **Firewall prüfen:** Port 51826 muss erreichbar sein
+- **Logs prüfen:** Fehler beim Start?
+- **mDNS/Bonjour:** Funktioniert Bonjour im Netzwerk?
+
+### Geräte reagieren nicht
+
+- **API-Logs prüfen:** Kommen POST-Requests an?
+- **Realtime-Verbindung:** Läuft `/realtime` Event-Loop? (Log-Meldungen)
+- **API-Endpoints testen:** Manuell mit `curl` testen
+
+### Pairing schlägt fehl
+
+- **State-Datei löschen:** `rm homekit.state` und Bridge neu starten
+- **PIN-Format prüfen:** Muss `XXX-XX-XXX` Format haben
+- **Alte Pairings löschen:** In Home-App unter "Home-Einstellungen" → "HomeKit-Geräte zurücksetzen"
+
+### Realtime-Updates funktionieren nicht
+
+- **SSE-Verbindung prüfen:** Logs zeigen "Starting realtime event loop..."?
+- **API-Endpoint testen:** `curl -N http://api:8001/realtime`
+- **Firewall/Proxy:** Blockiert etwas SSE-Streams?
+
+## Docker Deployment
+
+### Dockerfile
+
+```dockerfile
+FROM python:3.11-slim
+
+WORKDIR /app
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD ["python", "-m", "apps.homekit.main"]
+```
+
+### docker-compose.yml
+
+```yaml
+services:
+  homekit:
+    build: ./apps/homekit
+    environment:
+      - API_BASE=http://api:8001
+      - HOMEKIT_PIN=031-45-154
+      - HOMEKIT_NAME=Home Automation Bridge
+    ports:
+      - "51826:51826"
+    volumes:
+      - ./data/homekit:/data
+    network_mode: "host"  # Wichtig für mDNS/Bonjour Discovery
+    restart: unless-stopped
+```
+
+**Wichtig:** `network_mode: "host"` ist erforderlich für mDNS/Bonjour Discovery, damit die Bridge im lokalen Netzwerk gefunden werden kann.
+
+## Architektur
+
+```
+┌─────────────┐
+│  iPhone/    │
+│  Home-App   │
+└──────┬──────┘
+       │ HomeKit (HAP)
+       │ Port 51826
+┌──────▼──────────────────┐
+│  HomeKit Bridge         │
+│  (HAP-Python)           │
+│  - Device Registry      │
+│  - Accessory Mapping    │
+│  - SSE Event Loop       │
+└──────┬──────────────────┘
+       │ HTTP REST API
+       │ (GET /devices, POST /set, SSE /realtime)
+┌──────▼──────────────────┐
+│  API Server             │
+│  (FastAPI)              │
+└──────┬──────────────────┘
+       │ MQTT
+┌──────▼──────────────────┐
+│  Abstraction Layer      │
+│  (Zigbee2MQTT, MAX!)    │
+└─────────────────────────┘
+```
+
+## Weitere Dokumentation
+
+- **API-Mapping:** Siehe `homekit_mapping.md` für Device-Type → HomeKit-Service Mapping
+- **API-Dokumentation:** Siehe API-Server README für Endpoint-Dokumentation
+- **HAP-Python Docs:** https://github.com/ikalchev/HAP-python
+
+## Entwicklung
+
+### Tests ausführen
+
+```bash
+pytest apps/homekit/tests/
+```
+
+### Logs
+
+Die Bridge gibt detaillierte Logs aus:
+- `INFO`: Normale Betriebsmeldungen (Start, Device-Anzahl, etc.)
+- `DEBUG`: Detaillierte State-Updates und API-Calls
+- `ERROR`: Fehler bei API-Kommunikation oder Accessory-Updates
+
+Log-Level über Environment-Variable steuern:
+```bash
+export LOG_LEVEL=DEBUG
+```
+
+## Lizenz
+
+Siehe Hauptprojekt-Lizenz.

apps/homekit/accessories/__init__.py

@@ -0,0 +1,5 @@
+"""
+HomeKit Accessories Package
+
+This package contains HomeKit accessory implementations for different device types.
+"""

apps/homekit/accessories/contact.py

@@ -0,0 +1,48 @@
+"""
+Contact Sensor Accessory Implementation for HomeKit
+
+Implements contact sensor (window/door sensors):
+- ContactSensorState (read-only): 0=Detected, 1=Not Detected
+"""
+
+from pyhap.accessory import Accessory
+from pyhap.const import CATEGORY_SENSOR
+
+
+class ContactAccessory(Accessory):
+    """Contact sensor for doors and windows."""
+    
+    category = CATEGORY_SENSOR
+    
+    def __init__(self, driver, device, api_client, display_name=None, *args, **kwargs):
+        """
+        Initialize the contact sensor accessory.
+        
+        Args:
+            driver: HAP driver instance
+            device: Device object from DeviceRegistry
+            api_client: ApiClient for sending commands
+            display_name: Optional display name (defaults to device.friendly_name)
+        """
+        name = display_name or device.friendly_name or device.name
+        super().__init__(driver, name, *args, **kwargs)
+        self.device = device
+        self.api_client = api_client
+        
+        # Add ContactSensor service
+        self.contact_service = self.add_preload_service('ContactSensor')
+        
+        # Get ContactSensorState characteristic
+        self.contact_state_char = self.contact_service.get_characteristic('ContactSensorState')
+        
+        # Initialize with "not detected" (closed)
+        self.contact_state_char.set_value(1)
+    
+    def update_state(self, state_payload):
+        """Update state from API event."""
+        if "contact" in state_payload:
+            # API sends: "open" or "closed"
+            # HomeKit: 0=Contact Detected (closed), 1=Contact Not Detected (open)
+            is_open = state_payload["contact"] == "open"
+            homekit_state = 1 if is_open else 0
+            self.contact_state_char.set_value(homekit_state)

apps/homekit/accessories/light.py

@@ -0,0 +1,177 @@
+"""
+Light Accessory Implementations for HomeKit
+
+Implements different light types:
+- OnOffLightAccessory: Simple on/off light
+- DimmableLightAccessory: Light with brightness control
+- ColorLightAccessory: RGB light with full color control
+"""
+
+from pyhap.accessory import Accessory
+from pyhap.const import CATEGORY_LIGHTBULB
+
+
+class OnOffLightAccessory(Accessory):
+    """Simple On/Off Light without dimming or color."""
+    
+    category = CATEGORY_LIGHTBULB
+    
+    def __init__(self, driver, device, api_client, display_name=None, *args, **kwargs):
+        """
+        Initialize the light accessory.
+        
+        Args:
+            driver: HAP driver instance
+            device: Device object from DeviceRegistry
+            api_client: ApiClient for sending commands
+            display_name: Optional display name (defaults to device.friendly_name)
+        """
+        name = display_name or device.friendly_name or device.name
+        super().__init__(driver, name, *args, **kwargs)
+        self.device = device
+        self.api_client = api_client
+        
+        # Add Lightbulb service with On characteristic
+        self.lightbulb_service = self.add_preload_service('Lightbulb')
+        
+        # Get the On characteristic and set callback
+        self.on_char = self.lightbulb_service.get_characteristic('On')
+        self.on_char.setter_callback = self.set_on
+    
+    def set_on(self, value):
+        """Called when HomeKit wants to turn light on/off."""
+        power_state = "on" if value else "off"
+        payload = {
+            "type": "light",
+            "payload": {"power": power_state}
+        }
+        self.api_client.post_device_set(self.device.device_id, payload["type"], payload["payload"])
+    
+    def update_state(self, state_payload):
+        """Update state from API event."""
+        if "power" in state_payload:
+            is_on = state_payload["power"] == "on"
+            self.on_char.set_value(is_on)
+
+
+class DimmableLightAccessory(OnOffLightAccessory):
+    """Dimmable Light with brightness control."""
+    
+    def __init__(self, driver, device, api_client, display_name=None, *args, **kwargs):
+        # Don't call super().__init__() yet - we need to set up service first
+        name = display_name or device.friendly_name or device.name
+        Accessory.__init__(self, driver, name, *args, **kwargs)
+        self.device = device
+        self.api_client = api_client
+        self.category = CATEGORY_LIGHTBULB
+        
+        # Create Lightbulb service with all characteristics at once
+        from pyhap.loader import Loader
+        loader = Loader()
+        
+        # Create the service
+        lightbulb_service = loader.get_service('Lightbulb')
+        
+        # Add On characteristic
+        on_char = lightbulb_service.get_characteristic('On')
+        on_char.setter_callback = self.set_on
+        self.on_char = on_char
+        
+        # Add Brightness characteristic
+        brightness_char = loader.get_char('Brightness')
+        brightness_char.set_value(0)
+        brightness_char.setter_callback = self.set_brightness
+        lightbulb_service.add_characteristic(brightness_char)
+        self.brightness_char = brightness_char
+        
+        # Now add the complete service to the accessory
+        self.add_service(lightbulb_service)
+        self.lightbulb_service = lightbulb_service
+    
+    def set_brightness(self, value):
+        """Called when HomeKit wants to change brightness."""
+        payload = {
+            "type": "light",
+            "payload": {"brightness": int(value)}
+        }
+        self.api_client.post_device_set(self.device.device_id, payload["type"], payload["payload"])
+    
+    def update_state(self, state_payload):
+        """Update state from API event."""
+        super().update_state(state_payload)
+        if "brightness" in state_payload:
+            self.brightness_char.set_value(state_payload["brightness"])
+
+
+class ColorLightAccessory(DimmableLightAccessory):
+    """RGB Light with full color control."""
+    
+    def __init__(self, driver, device, api_client, display_name=None, *args, **kwargs):
+        # Don't call super().__init__() - build everything from scratch
+        name = display_name or device.friendly_name or device.name
+        Accessory.__init__(self, driver, name, *args, **kwargs)
+        self.device = device
+        self.api_client = api_client
+        self.category = CATEGORY_LIGHTBULB
+        
+        # Create Lightbulb service with all characteristics at once
+        from pyhap.loader import Loader
+        loader = Loader()
+        
+        # Create the service
+        lightbulb_service = loader.get_service('Lightbulb')
+        
+        # Add On characteristic
+        on_char = lightbulb_service.get_characteristic('On')
+        on_char.setter_callback = self.set_on
+        self.on_char = on_char
+        
+        # Add Brightness characteristic
+        brightness_char = loader.get_char('Brightness')
+        brightness_char.set_value(0)
+        brightness_char.setter_callback = self.set_brightness
+        lightbulb_service.add_characteristic(brightness_char)
+        self.brightness_char = brightness_char
+        
+        # Add Hue characteristic
+        hue_char = loader.get_char('Hue')
+        hue_char.set_value(0)
+        hue_char.setter_callback = self.set_hue
+        lightbulb_service.add_characteristic(hue_char)
+        self.hue_char = hue_char
+        
+        # Add Saturation characteristic
+        saturation_char = loader.get_char('Saturation')
+        saturation_char.set_value(0)
+        saturation_char.setter_callback = self.set_saturation
+        lightbulb_service.add_characteristic(saturation_char)
+        self.saturation_char = saturation_char
+        
+        # Now add the complete service to the accessory
+        self.add_service(lightbulb_service)
+        self.lightbulb_service = lightbulb_service
+    
+    def set_hue(self, value):
+        """Called when HomeKit wants to change hue."""
+        payload = {
+            "type": "light",
+            "payload": {"hue": int(value)}
+        }
+        self.api_client.post_device_set(self.device.device_id, payload["type"], payload["payload"])
+    
+    def set_saturation(self, value):
+        """Called when HomeKit wants to change saturation."""
+        payload = {
+            "type": "light",
+            "payload": {"sat": int(value)}
+        }
+        self.api_client.post_device_set(self.device.device_id, payload["type"], payload["payload"])
+    
+    def update_state(self, state_payload):
+        """Update state from API event."""
+        super().update_state(state_payload)
+        if "hue" in state_payload:
+            self.hue_char.set_value(state_payload["hue"])
+        if "sat" in state_payload:
+            self.saturation_char.set_value(state_payload["sat"])
+

apps/homekit/accessories/outlet.py

@@ -0,0 +1,57 @@
+"""
+Outlet/Relay Accessory Implementation for HomeKit
+
+Implements simple relay/outlet (on/off switch):
+- On (read/write)
+- OutletInUse (always true)
+"""
+
+from pyhap.accessory import Accessory
+from pyhap.const import CATEGORY_OUTLET
+
+
+class OutletAccessory(Accessory):
+    """Relay/Outlet for simple on/off control."""
+    
+    category = CATEGORY_OUTLET
+    
+    def __init__(self, driver, device, api_client, display_name=None, *args, **kwargs):
+        """
+        Initialize the outlet accessory.
+        
+        Args:
+            driver: HAP driver instance
+            device: Device object from DeviceRegistry
+            api_client: ApiClient for sending commands
+            display_name: Optional display name (defaults to device.friendly_name)
+        """
+        name = display_name or device.friendly_name or device.name
+        super().__init__(driver, name, *args, **kwargs)
+        self.device = device
+        self.api_client = api_client
+        
+        # Add Outlet service
+        self.outlet_service = self.add_preload_service('Outlet')
+        
+        # Get On characteristic and set callback
+        self.on_char = self.outlet_service.get_characteristic('On')
+        self.on_char.setter_callback = self.set_on
+        
+        # OutletInUse is always true (relay is always functional)
+        self.in_use_char = self.outlet_service.get_characteristic('OutletInUse')
+        self.in_use_char.set_value(True)
+    
+    def set_on(self, value):
+        """Called when HomeKit wants to turn outlet on/off."""
+        power_state = "on" if value else "off"
+        payload = {
+            "type": "relay",
+            "payload": {"power": power_state}
+        }
+        self.api_client.post_device_set(self.device.device_id, payload["type"], payload["payload"])
+    
+    def update_state(self, state_payload):
+        """Update state from API event."""
+        if "power" in state_payload:
+            is_on = state_payload["power"] == "on"
+            self.on_char.set_value(is_on)

apps/homekit/accessories/sensor.py

@@ -0,0 +1,46 @@
+"""
+Temperature & Humidity Sensor Accessory Implementation for HomeKit
+
+Implements combined temperature and humidity sensor:
+- CurrentTemperature (read-only)
+- CurrentRelativeHumidity (read-only)
+"""
+
+from pyhap.accessory import Accessory
+from pyhap.const import CATEGORY_SENSOR
+
+
+class TempHumidityAccessory(Accessory):
+    """Combined temperature and humidity sensor."""
+    
+    category = CATEGORY_SENSOR
+    
+    def __init__(self, driver, device, api_client, display_name=None, *args, **kwargs):
+        """
+        Initialize the temp/humidity sensor accessory.
+        
+        Args:
+            driver: HAP driver instance
+            device: Device object from DeviceRegistry
+            api_client: ApiClient for sending commands
+            display_name: Optional display name (defaults to device.friendly_name)
+        """
+        name = display_name or device.friendly_name or device.name
+        super().__init__(driver, name, *args, **kwargs)
+        self.device = device
+        self.api_client = api_client
+        
+        # Add TemperatureSensor service
+        self.temp_service = self.add_preload_service('TemperatureSensor')
+        self.current_temp_char = self.temp_service.get_characteristic('CurrentTemperature')
+        
+        # Add HumiditySensor service
+        self.humidity_service = self.add_preload_service('HumiditySensor')
+        self.current_humidity_char = self.humidity_service.get_characteristic('CurrentRelativeHumidity')
+    
+    def update_state(self, state_payload):
+        """Update state from API event."""
+        if "temperature" in state_payload:
+            self.current_temp_char.set_value(float(state_payload["temperature"]))
+        if "humidity" in state_payload:
+            self.current_humidity_char.set_value(float(state_payload["humidity"]))

apps/homekit/accessories/thermostat.py

@@ -0,0 +1,72 @@
+"""
+Thermostat Accessory Implementation for HomeKit
+
+Implements thermostat control according to homekit_mapping.md:
+- CurrentTemperature (read-only)
+- TargetTemperature (read/write)
+- CurrentHeatingCoolingState (fixed: 1 = heating)
+- TargetHeatingCoolingState (fixed: 3 = auto)
+"""
+
+from pyhap.accessory import Accessory
+from pyhap.const import CATEGORY_THERMOSTAT
+
+
+class ThermostatAccessory(Accessory):
+    """Thermostat with temperature control."""
+    
+    category = CATEGORY_THERMOSTAT
+    
+    def __init__(self, driver, device, api_client, display_name=None, *args, **kwargs):
+        """
+        Initialize the thermostat accessory.
+        
+        Args:
+            driver: HAP driver instance
+            device: Device object from DeviceRegistry
+            api_client: ApiClient for sending commands
+            display_name: Optional display name (defaults to device.friendly_name)
+        """
+        name = display_name or device.friendly_name or device.name
+        super().__init__(driver, name, *args, **kwargs)
+        self.device = device
+        self.api_client = api_client
+        
+        # Add Thermostat service
+        self.thermostat_service = self.add_preload_service('Thermostat')
+        
+        # Get characteristics
+        self.current_temp_char = self.thermostat_service.get_characteristic('CurrentTemperature')
+        self.target_temp_char = self.thermostat_service.get_characteristic('TargetTemperature')
+        self.current_heating_cooling_char = self.thermostat_service.get_characteristic('CurrentHeatingCoolingState')
+        self.target_heating_cooling_char = self.thermostat_service.get_characteristic('TargetHeatingCoolingState')
+        
+        # Set callback for target temperature
+        self.target_temp_char.setter_callback = self.set_target_temperature
+        
+        # Set fixed heating/cooling states (mode is always "auto")
+        # CurrentHeatingCoolingState: 0=Off, 1=Heat, 2=Cool
+        self.current_heating_cooling_char.set_value(1)  # Always heating
+        
+        # TargetHeatingCoolingState: 0=Off, 1=Heat, 2=Cool, 3=Auto
+        self.target_heating_cooling_char.set_value(3)  # Always auto
+        
+        # Set temperature range (5-30°C as per UI)
+        self.target_temp_char.properties['minValue'] = 5
+        self.target_temp_char.properties['maxValue'] = 30
+        self.target_temp_char.properties['minStep'] = 0.5
+    
+    def set_target_temperature(self, value):
+        """Called when HomeKit wants to change target temperature."""
+        payload = {
+            "type": "thermostat",
+            "payload": {"target": float(value)}
+        }
+        self.api_client.post_device_set(self.device.device_id, payload["type"], payload["payload"])
+    
+    def update_state(self, state_payload):
+        """Update state from API event."""
+        if "current" in state_payload:
+            self.current_temp_char.set_value(float(state_payload["current"]))
+        if "target" in state_payload:
+            self.target_temp_char.set_value(float(state_payload["target"]))

apps/homekit/api_client.py

@@ -0,0 +1,161 @@
+"""
+API Client for HomeKit Bridge
+
+Handles all HTTP communication with the REST API backend.
+"""
+
+import logging
+from typing import Dict, List, Iterator, Optional
+import httpx
+import json
+import time
+
+logger = logging.getLogger(__name__)
+
+
+class ApiClient:
+    """HTTP client for communicating with the home automation API."""
+    
+    def __init__(self, base_url: str, token: Optional[str] = None, timeout: int = 5):
+        """
+        Initialize API client.
+        
+        Args:
+            base_url: Base URL of the API (e.g., "http://192.168.1.100:8001")
+            token: Optional API token for authentication
+            timeout: Request timeout in seconds
+        """
+        self.base_url = base_url.rstrip('/')
+        self.timeout = timeout
+        self.headers = {}
+        
+        if token:
+            self.headers['Authorization'] = f'Bearer {token}'
+    
+    def get_devices(self) -> List[Dict]:
+        """
+        Get list of all devices.
+        
+        Returns:
+            List of device dictionaries
+        """
+        try:
+            response = httpx.get(
+                f'{self.base_url}/devices',
+                headers=self.headers,
+                timeout=self.timeout
+            )
+            response.raise_for_status()
+            return response.json()
+        except Exception as e:
+            logger.error(f"Failed to get devices: {e}")
+            raise
+    
+    def get_layout(self) -> Dict:
+        """
+        Get layout information (rooms and device assignments).
+        
+        Returns:
+            Layout dictionary with room structure
+        """
+        try:
+            response = httpx.get(
+                f'{self.base_url}/layout',
+                headers=self.headers,
+                timeout=self.timeout
+            )
+            response.raise_for_status()
+            return response.json()
+        except Exception as e:
+            logger.error(f"Failed to get layout: {e}")
+            raise
+    
+    def get_device_state(self, device_id: str) -> Dict:
+        """
+        Get current state of a specific device.
+        
+        Args:
+            device_id: Device identifier
+            
+        Returns:
+            Device state dictionary
+        """
+        try:
+            response = httpx.get(
+                f'{self.base_url}/devices/{device_id}/state',
+                headers=self.headers,
+                timeout=self.timeout
+            )
+            response.raise_for_status()
+            return response.json()
+        except Exception as e:
+            logger.error(f"Failed to get state for {device_id}: {e}")
+            raise
+    
+    def post_device_set(self, device_id: str, device_type: str, payload: Dict) -> None:
+        """
+        Send command to a device.
+        
+        Args:
+            device_id: Device identifier
+            device_type: Device type (e.g., "light", "thermostat")
+            payload: Command payload (e.g., {"power": "on", "brightness": 75})
+        """
+        try:
+            data = {
+                "type": device_type,
+                "payload": payload
+            }
+            response = httpx.post(
+                f'{self.base_url}/devices/{device_id}/set',
+                headers=self.headers,
+                json=data,
+                timeout=self.timeout
+            )
+            response.raise_for_status()
+            logger.debug(f"Set {device_id}: {payload}")
+        except Exception as e:
+            logger.error(f"Failed to set {device_id}: {e}")
+            raise
+    
+    def stream_realtime(self, reconnect_delay: int = 5) -> Iterator[Dict]:
+        """
+        Stream real-time events from the API using Server-Sent Events (SSE).
+        
+        Automatically reconnects on connection loss.
+        
+        Args:
+            reconnect_delay: Seconds to wait before reconnecting
+            
+        Yields:
+            Event dictionaries: {"type": "state", "device_id": "...", "payload": {...}, "ts": ...}
+        """
+        while True:
+            try:
+                logger.info("Connecting to realtime event stream...")
+                with httpx.stream(
+                    'GET',
+                    f'{self.base_url}/realtime',
+                    headers=self.headers,
+                    timeout=None  # No timeout for streaming
+                ) as response:
+                    response.raise_for_status()
+                    logger.info("Connected to realtime event stream")
+                    
+                    for line in response.iter_lines():
+                        if line.startswith('data: '):
+                            data_str = line[6:]  # Remove 'data: ' prefix
+                            try:
+                                event = json.loads(data_str)
+                                yield event
+                            except json.JSONDecodeError as e:
+                                logger.warning(f"Failed to parse SSE event: {e}")
+                                
+            except httpx.HTTPError as e:
+                logger.error(f"Realtime stream error: {e}")
+                logger.info(f"Reconnecting in {reconnect_delay} seconds...")
+                time.sleep(reconnect_delay)
+            except Exception as e:
+                logger.error(f"Unexpected error in realtime stream: {e}")
+                logger.info(f"Reconnecting in {reconnect_delay} seconds...")
+                time.sleep(reconnect_delay)

apps/homekit/device_registry.py

@@ -0,0 +1,138 @@
+"""
+Device Registry for HomeKit Bridge
+
+Loads devices from API and joins with layout information.
+"""
+
+import logging
+from typing import Dict, List, Optional
+from dataclasses import dataclass
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class Device:
+    """Represents a device with combined info from /devices and /layout."""
+    
+    device_id: str
+    type: str  # "light", "thermostat", "relay", "contact", "temp_humidity", "cover"
+    name: str  # Short name from /devices
+    friendly_name: str  # Display title from /layout (fallback to name)
+    room: Optional[str]  # Room name from layout
+    features: Dict[str, bool]  # Feature flags (e.g., {"power": true, "brightness": true})
+    read_only: bool  # True for sensors that don't accept commands
+
+
+class DeviceRegistry:
+    """Registry of all devices loaded from the API."""
+    
+    def __init__(self, devices: List[Device]):
+        """
+        Initialize registry with devices.
+        
+        Args:
+            devices: List of Device objects
+        """
+        self._devices = devices
+        self._by_id = {d.device_id: d for d in devices}
+    
+    @classmethod
+    def load_from_api(cls, api_client) -> 'DeviceRegistry':
+        """
+        Load devices from API and join with layout information.
+        
+        Args:
+            api_client: ApiClient instance
+            
+        Returns:
+            DeviceRegistry with all devices
+        """
+        # Get devices and layout
+        devices_data = api_client.get_devices()
+        layout_data = api_client.get_layout()
+        
+        # Build lookup: device_id -> (room_name, title)
+        layout_map = {}
+        if isinstance(layout_data, dict) and 'rooms' in layout_data:
+            rooms_list = layout_data['rooms']
+            if isinstance(rooms_list, list):
+                for room in rooms_list:
+                    if isinstance(room, dict):
+                        room_name = room.get('name', 'Unknown')
+                        devices_in_room = room.get('devices', [])
+                        for device_info in devices_in_room:
+                            if isinstance(device_info, dict):
+                                device_id = device_info.get('device_id')
+                                title = device_info.get('title', '')
+                                if device_id:
+                                    layout_map[device_id] = (room_name, title)
+        
+        # Create Device objects
+        devices = []
+        for dev_data in devices_data:
+            device_id = dev_data.get('device_id')
+            if not device_id:
+                logger.warning(f"Device without device_id: {dev_data}")
+                continue
+            
+            # Get layout info
+            room_name, title = layout_map.get(device_id, (None, ''))
+            
+            # Determine if read-only (sensors don't accept set commands)
+            device_type = dev_data.get('type', '')
+            read_only = device_type in ['contact', 'temp_humidity', 'motion', 'smoke']
+            
+            device = Device(
+                device_id=device_id,
+                type=device_type,
+                name=dev_data.get('name', device_id),
+                friendly_name=title or dev_data.get('name', device_id),
+                room=room_name,
+                features=dev_data.get('features', {}),
+                read_only=read_only
+            )
+            devices.append(device)
+        
+        logger.info(f"Loaded {len(devices)} devices from API")
+        return cls(devices)
+    
+    def get_all(self) -> List[Device]:
+        """Get all devices."""
+        return self._devices.copy()
+    
+    def get_by_id(self, device_id: str) -> Optional[Device]:
+        """
+        Get device by ID.
+        
+        Args:
+            device_id: Device identifier
+            
+        Returns:
+            Device or None if not found
+        """
+        return self._by_id.get(device_id)
+    
+    def get_by_type(self, device_type: str) -> List[Device]:
+        """
+        Get all devices of a specific type.
+        
+        Args:
+            device_type: Device type (e.g., "light", "thermostat")
+            
+        Returns:
+            List of matching devices
+        """
+        return [d for d in self._devices if d.type == device_type]
+    
+    def get_by_room(self, room: str) -> List[Device]:
+        """
+        Get all devices in a specific room.
+        
+        Args:
+            room: Room name
+            
+        Returns:
+            List of devices in the room
+        """
+        return [d for d in self._devices if d.room == room]

apps/homekit/homekit_mapping.md

@@ -0,0 +1,111 @@
+<!--
+Copilot-Aufgabe: HomeKit-Accessory-Mapping-Tabelle aus bestehender Implementierung ableiten
+
+Ziel:
+Erstelle eine Mapping-Tabelle, die beschreibt, wie unsere abstrakten Gerätetypen
+(type/Features aus devices.yaml, apps/abstraction und apps/api) auf HomeKit-Accessories
+und Characteristics (HAP-Python) abgebildet werden sollen.
+
+Die Tabelle soll:
+- sich an der bestehenden Implementierung und Konfiguration orientieren:
+  - devices.yaml (Typen, Features)
+  - apps/abstraction (Capabilities, Payload-Strukturen, Topics)
+  - apps/api (DTOs, /devices-Response, /devices/{id}/set, /realtime-Events)
+- für jeden bekannten Gerätetyp (z.B. light, thermostat, outlet, contact, temp_humidity, cover, switch)
+  festhalten:
+  - Abstract Type (type)
+  - Relevante Features (Features-Flags, z.B. power, brightness, color_hsb, target, current, contact, humidity)
+  - HomeKit Service (z.B. LightBulb, Thermostat, Outlet, ContactSensor, TemperatureSensor, HumiditySensor, WindowCovering)
+  - HomeKit Characteristics (z.B. On, Brightness, Hue, Saturation, CurrentTemperature, TargetTemperature, ContactSensorState, CurrentPosition, TargetPosition)
+  - State-Mapping (abstraktes payload → HomeKit-Characteristics)
+  - Set-Mapping (HomeKit-Characteristics → HTTP POST /devices/{id}/set Payload)
+  - Status (OK / REVIEW / TODO)
+
+Vorgehen für Copilot:
+1. Analysiere die bestehenden Typen und Features:
+   - devices.yaml → "type" und "features" pro Gerät
+   - apps/abstraction → Capabilities, State-/Set-Modelle (z.B. light@1.2.0, thermostat, contact, temp_humidity)
+   - apps/api:
+       - Response-Modell von GET /devices (device_id, type, name, features)
+       - Struktur von GET /devices/{id}/state (payload-Felder je Typ)
+       - Struktur der Events in /realtime (payload-Felder je Typ)
+       - Body von POST /devices/{id}/set (type, payload)
+
+2. Lege aufgrund dieser Analyse alle aktuell verwendeten abstrakten Typen an, z.B.:
+   - light (mit power, brightness, color_hsb)
+   - thermostat (mit current, target, mode)
+   - outlet
+   - contact
+   - temp_humidity
+   - ggf. cover, switch, etc., falls vorhanden
+
+3. Erstelle eine Tabelle in Markdown mit folgenden Spalten:
+
+   | Abstract Type | Features (aus devices.yaml) | HomeKit Service | HomeKit Characteristics | State-Mapping (payload → HK) | Set-Mapping (HK → payload) | Status |
+   |---------------|-----------------------------|-----------------|-------------------------|------------------------------|----------------------------|--------|
+
+   Beispiele für Inhalte:
+   - Abstract Type: `light`
+   - Features: `power, brightness, color_hsb`
+   - HomeKit Service: `LightBulb`
+   - HomeKit Characteristics: `On, Brightness, Hue, Saturation`
+   - State-Mapping: `payload.power -> On; payload.brightness -> Brightness; payload.hue -> Hue; payload.sat -> Saturation`
+   - Set-Mapping: `On -> {"type":"light","payload":{"power":"on"/"off"}} ...`
+   - Status: `OK` wenn Mapping klar, `REVIEW` wenn du unsicher bist, `TODO` wenn Informationen fehlen
+
+4. Nutze vorhandene Informationen aus dem Code:
+   - Wenn ein Gerätetyp in apps/abstraction bereits ein klares State-/Set-Modell hat, übernimm das in State-/Set-Mapping.
+   - Wenn bestimmte Features noch nicht im Code genutzt werden, markiere die entsprechenden Mapping-Zeilen mit Status=TODO.
+   - Falls unklar ist, welcher HomeKit-Service für einen Typ am besten passt, mache einen Vorschlag und setze Status=REVIEW.
+
+5. Markiere explizit, wo man später noch eingreifen muss:
+   - In der Spalte "Status" mit `REVIEW` oder `TODO`.
+   - Optional zusätzliche kurze Kommentare unter der Tabelle wie:
+     - `<!-- TODO: RGBW-Unterstützung prüfen -->`
+     - `<!-- REVIEW: Soll temp_humidity als zwei Accessories oder kombiniert abgebildet werden? -->`
+
+Akzeptanz-Kriterien:
+- Es existiert am Ende dieses Dokuments eine Markdown-Tabelle mit mindestens allen abstrakten Gerätetypen, die aktuell in devices.yaml / apps/abstraction / apps/api verwendet werden.
+- Für jeden Typ sind HomeKit Service und Characteristics ausgefüllt oder mit Status=REVIEW/TODO markiert.
+- State-/Set-Mapping ist für alle bereits gut verstandenen Typen (z.B. einfache Lichter, Thermostate, Kontakte, Temp/Humidity-Sensoren) konkret beschrieben.
+- Stellen, an denen die aktuelle Implementierung keine klaren Informationen liefert, sind sichtbar mit Status=REVIEW oder TODO gekennzeichnet.
+- Copilot ändert an keiner anderen Stelle des Codes etwas, sondern erzeugt nur diese Tabelle/Dokumentation.
+-->
+
+
+# HomeKit-Accessory-Mapping-Tabelle
+
+Dieses Dokument beschreibt das Mapping zwischen unseren abstrakten Gerätetypen (aus `devices.yaml`, `apps/abstraction` und `apps/api`) und HomeKit-Accessories/Characteristics (HAP-Python).
+
+## Mapping-Tabelle
+
+| Abstract Type | Features (aus devices.yaml) | HomeKit Service | HomeKit Characteristics | State-Mapping (payload → HK) | Set-Mapping (HK → payload) | Status |
+|---------------|-----------------------------|-----------------|-------------------------|------------------------------|----------------------------|--------|
+| `light` | `power, brightness, color_hsb` | `LightBulb` | `On, Brightness, Hue, Saturation` | `payload.power -> On (true/false)`<br>`payload.brightness -> Brightness (0-100)`<br>`payload.hue -> Hue (0-360)`<br>`payload.sat -> Saturation (0-100)` | `On -> {"type":"light","payload":{"power":"on"/"off"}}`<br>`Brightness -> {"type":"light","payload":{"brightness":0-100}}`<br>`Hue/Saturation -> {"type":"light","payload":{"hue":0-360,"sat":0-100}}` | OK |
+| `light` | `power, brightness` | `LightBulb` | `On, Brightness` | `payload.power -> On (true/false)`<br>`payload.brightness -> Brightness (0-100)` | `On -> {"type":"light","payload":{"power":"on"/"off"}}`<br>`Brightness -> {"type":"light","payload":{"brightness":0-100}}` | OK |
+| `light` | `power` | `LightBulb` | `On` | `payload.power -> On (true/false)` | `On -> {"type":"light","payload":{"power":"on"/"off"}}` | OK |
+| `thermostat` | `current, target` | `Thermostat` | `CurrentTemperature, TargetTemperature, CurrentHeatingCoolingState, TargetHeatingCoolingState` | `payload.current -> CurrentTemperature (°C)`<br>`payload.target -> TargetTemperature (°C)`<br>`CurrentHeatingCoolingState -> 1 (heat, fest)`<br>`TargetHeatingCoolingState -> 3 (auto, fest)` | `TargetTemperature -> {"type":"thermostat","payload":{"target":temp}}`<br>**Hinweis:** Mode ist immer "auto", keine Mode-Änderung über HomeKit | OK |
+| `relay` | `power` | `Outlet` | `On, OutletInUse` | `payload.power -> On (true/false)`<br>`payload.power -> OutletInUse (true/false)` | `On -> {"type":"relay","payload":{"power":"on"/"off"}}` | OK |
+| `contact` | `contact` | `ContactSensor` | `ContactSensorState` | `payload.contact -> ContactSensorState (0=detected, 1=not detected)` | N/A (read-only sensor) | OK |
+| `temp_humidity` | `temperature, humidity` | `TemperatureSensor` + `HumiditySensor` | `CurrentTemperature, CurrentRelativeHumidity` | `payload.temperature -> CurrentTemperature (°C)`<br>`payload.humidity -> CurrentRelativeHumidity (%)` | N/A (read-only sensors) | REVIEW |
+| `cover` | `position, tilt` | `WindowCovering` | `CurrentPosition, TargetPosition, CurrentHorizontalTiltAngle, TargetHorizontalTiltAngle` | `payload.position -> CurrentPosition (0-100)`<br>`payload.tilt -> CurrentHorizontalTiltAngle (-90 to 90)` | `TargetPosition -> {"type":"cover","payload":{"position":0-100}}`<br>`TargetHorizontalTiltAngle -> {"type":"cover","payload":{"tilt":-90 to 90}}` | TODO |
+| `switch` | `power` | `Switch` | `On` | `payload.power -> On (true/false)` | `On -> {"type":"switch","payload":{"power":"on"/"off"}}` | OK |
+
+## Offene Punkte und Kommentare
+
+<!-- OK: thermostat - Verwendet nur Mode "auto" (TargetHeatingCoolingState=3, CurrentHeatingCoolingState=1). Keine Mode-Änderung über HomeKit möglich. -->
+
+<!-- REVIEW: temp_humidity - Soll als ein kombiniertes Accessory oder zwei separate Accessories (TemperatureSensor + HumiditySensor) abgebildet werden? HAP-Python erlaubt beides -->
+
+<!-- TODO: cover - Position/Tilt-Mapping validieren. Sind die Wertebereiche korrekt? Gibt es zusätzliche Features wie PositionState (opening/closing/stopped)? -->
+
+<!-- TODO: RGBW-Unterstützung - Prüfen, ob separate ColorTemperature-Characteristic für Warmweiß/Kaltweiß benötigt wird -->
+
+<!-- TODO: Prüfen, ob weitere Gerätetypen in devices.yaml existieren (z.B. motion, door, lock, fan, etc.) und diese ergänzen -->
+
+## Hinweise zur Implementierung
+
+- **State-Updates**: Alle State-Änderungen von MQTT/API werden auf entsprechende HomeKit-Characteristics gemappt und via `set_value()` aktualisiert
+- **Set-Befehle**: HomeKit-Charakteristik-Änderungen werden in HTTP POST-Requests an `/devices/{id}/set` umgewandelt
+- **Read-only Sensors**: Sensoren (contact, temp_humidity) unterstützen nur State-Updates, keine Set-Befehle
+- **Bidirektionales Mapping**: Änderungen müssen in beide Richtungen synchronisiert werden (HomeKit ↔ Abstraction Layer)

apps/homekit/main.py

@@ -0,0 +1,272 @@
+"""
+HomeKit Bridge Main Module
+
+Implementiert eine HAP-Python Bridge, die Geräte über die REST-API lädt
+und über HomeKit verfügbar macht.
+
+Für detaillierte Implementierungsanweisungen, Tests und Deployment-Informationen
+siehe README.md in diesem Verzeichnis.
+"""
+
+import os
+import logging
+import signal
+import sys
+import threading
+from typing import Optional
+
+from pyhap.accessory_driver import AccessoryDriver
+from pyhap.accessory import Bridge
+
+from .accessories.light import (
+    OnOffLightAccessory,
+    DimmableLightAccessory,
+    ColorLightAccessory,
+)
+from .accessories.thermostat import ThermostatAccessory
+from .accessories.contact import ContactAccessory
+from .accessories.sensor import TempHumidityAccessory
+from .accessories.outlet import OutletAccessory
+from .api_client import ApiClient
+from .device_registry import DeviceRegistry
+
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+)
+logger = logging.getLogger(__name__)
+
+
+# Environment configuration
+HOMEKIT_NAME = os.getenv("HOMEKIT_NAME", "Home Automation Bridge")
+HOMEKIT_PIN = os.getenv("HOMEKIT_PIN", "031-45-154")
+HOMEKIT_PORT = int(os.getenv("HOMEKIT_PORT", "51826"))
+API_BASE = os.getenv("API_BASE", "http://api:8001")
+HOMEKIT_API_TOKEN = os.getenv("HOMEKIT_API_TOKEN")
+PERSIST_FILE = os.getenv("HOMEKIT_PERSIST_FILE", "homekit.state")
+
+
+def build_bridge(driver: AccessoryDriver, api_client: ApiClient) -> Bridge:
+    """
+    Build the HomeKit Bridge with all device accessories.
+    
+    Args:
+        driver: HAP-Python AccessoryDriver
+        api_client: API client for communication with backend
+        
+    Returns:
+        Bridge accessory with all device accessories attached
+    """
+    logger.info("Loading devices from API...")
+    registry = DeviceRegistry.load_from_api(api_client)
+    devices = registry.get_all()
+    logger.info(f"Loaded {len(devices)} devices from API")
+    
+    # Create bridge
+    bridge = Bridge(driver, HOMEKIT_NAME)
+    accessory_map = {}  # device_id -> Accessory instance
+    
+    for device in devices:
+        try:
+            accessory = create_accessory_for_device(device, api_client, driver)
+            if accessory:
+                # Set room information in the accessory (HomeKit will use this for suggestions)
+                if device.room:
+                    # Store room info for potential future use
+                    accessory._room_name = device.room
+                    
+                bridge.add_accessory(accessory)
+                accessory_map[device.device_id] = accessory
+                logger.info(f"Added accessory: {device.friendly_name} ({device.type}) in room: {device.room or 'Unknown'}")
+            else:
+                logger.warning(f"No accessory mapping for device: {device.name} ({device.type})")
+        except Exception as e:
+            logger.error(f"Failed to create accessory for {device.name}: {e}", exc_info=True)
+    
+    # Store accessory_map on bridge for realtime updates
+    bridge._accessory_map = accessory_map
+    
+    logger.info(f"Bridge built with {len(accessory_map)} accessories")
+    return bridge
+
+
+def get_accessory_name(device) -> str:
+    """
+    Build accessory name including room information.
+    
+    Args:
+        device: Device object from DeviceRegistry
+        
+    Returns:
+        Name string like "Device Name (Room)" or just "Device Name" if no room
+    """
+    base_name = device.friendly_name or device.name
+    if device.room:
+        return f"{base_name} ({device.room})"
+    return base_name
+
+
+def create_accessory_for_device(device, api_client: ApiClient, driver: AccessoryDriver):
+    """
+    Create appropriate HomeKit accessory based on device type and features.
+    
+    Maps device types to HomeKit accessories according to homekit_mapping.md.
+    """
+    device_type = device.type
+    features = device.features
+    display_name = get_accessory_name(device)
+    
+    # Light accessories
+    if device_type == "light":
+        if features.get("color_hsb"):
+            return ColorLightAccessory(driver, device, api_client, display_name=display_name)
+        elif features.get("brightness"):
+            return DimmableLightAccessory(driver, device, api_client, display_name=display_name)
+        else:
+            return OnOffLightAccessory(driver, device, api_client, display_name=display_name)
+    
+    # Thermostat
+    elif device_type == "thermostat":
+        return ThermostatAccessory(driver, device, api_client, display_name=display_name)
+    
+    # Contact sensor
+    elif device_type == "contact":
+        return ContactAccessory(driver, device, api_client, display_name=display_name)
+    
+    # Temperature/Humidity sensor
+    elif device_type == "temp_humidity_sensor":
+        return TempHumidityAccessory(driver, device, api_client, display_name=display_name)
+    
+    # Relay/Outlet
+    elif device_type == "relay":
+        return OutletAccessory(driver, device, api_client, display_name=display_name)
+    
+    # Cover/Blinds (optional)
+    elif device_type == "cover":
+        # TODO: Implement CoverAccessory based on homekit_mapping.md
+        logger.warning(f"Cover accessory not yet implemented for {device.name}")
+        return None
+    
+    # TODO: Add more device types as needed (lock, motion, etc.)
+    
+    return None
+
+
+def realtime_event_loop(api_client: ApiClient, bridge: Bridge, stop_event: threading.Event):
+    """
+    Background thread that listens to realtime events and updates accessories.
+    
+    Args:
+        api_client: API client
+        bridge: HomeKit bridge with accessories
+        stop_event: Threading event to signal shutdown
+    """
+    logger.info("Starting realtime event loop...")
+    
+    while not stop_event.is_set():
+        try:
+            for event in api_client.stream_realtime():
+                if stop_event.is_set():
+                    break
+                
+                # Handle state update events
+                if event.get("type") == "state":
+                    device_id = event.get("device_id")
+                    payload = event.get("payload", {})
+                    
+                    # Find corresponding accessory
+                    accessory = bridge._accessory_map.get(device_id)
+                    if accessory and hasattr(accessory, 'update_state'):
+                        try:
+                            accessory.update_state(payload)
+                            logger.debug(f"Updated state for {device_id}: {payload}")
+                        except Exception as e:
+                            logger.error(f"Error updating accessory {device_id}: {e}")
+                
+        except Exception as e:
+            if not stop_event.is_set():
+                logger.error(f"Realtime stream error: {e}. Reconnecting in 5s...")
+                stop_event.wait(5)  # Backoff before reconnect
+    
+    logger.info("Realtime event loop stopped")
+
+
+def main():
+    logger.info("=" * 60)
+    logger.info(f"Starting HomeKit Bridge: {HOMEKIT_NAME}")
+    logger.info(f"API Base: {API_BASE}")
+    logger.info(f"HomeKit Port: {HOMEKIT_PORT}")
+    logger.info(f"PIN: {HOMEKIT_PIN}")
+    logger.info("=" * 60)
+    
+    # Create API client
+    api_client = ApiClient(
+        base_url=API_BASE,
+        token=HOMEKIT_API_TOKEN,
+        timeout=10
+    )
+    
+    # Test API connectivity
+    try:
+        devices = api_client.get_devices()
+        logger.info(f"API connectivity OK - {len(devices)} devices available")
+    except Exception as e:
+        logger.error(f"Failed to connect to API at {API_BASE}: {e}")
+        logger.error("Please check API_BASE and network connectivity")
+        sys.exit(1)
+    
+    # Create AccessoryDriver
+    driver = AccessoryDriver(
+        port=HOMEKIT_PORT,
+        persist_file=PERSIST_FILE
+    )
+    
+    # Build bridge with all accessories
+    try:
+        bridge = build_bridge(driver, api_client)
+    except Exception as e:
+        logger.error(f"Failed to build bridge: {e}", exc_info=True)
+        sys.exit(1)
+    
+    # Add bridge to driver
+    driver.add_accessory(accessory=bridge)
+    
+    # Setup realtime event thread
+    stop_event = threading.Event()
+    realtime_thread = threading.Thread(
+        target=realtime_event_loop,
+        args=(api_client, bridge, stop_event),
+        daemon=True
+    )
+    
+    # Signal handlers for graceful shutdown
+    def signal_handler(sig, frame):
+        logger.info("Received shutdown signal, stopping...")
+        stop_event.set()
+        driver.stop()
+    
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+    
+    # Start realtime thread
+    realtime_thread.start()
+    
+    # Start the bridge
+    logger.info(f"HomeKit Bridge started on port {HOMEKIT_PORT}")
+    logger.info(f"Pair with PIN: {HOMEKIT_PIN}")
+    logger.info("Press Ctrl+C to stop")
+    
+    try:
+        driver.start()
+    except KeyboardInterrupt:
+        logger.info("KeyboardInterrupt received")
+    finally:
+        logger.info("Stopping bridge...")
+        stop_event.set()
+        realtime_thread.join(timeout=5)
+        logger.info("Bridge stopped")
+
+
+if __name__ == "__main__":
+    main()

apps/homekit/requirements.txt

@@ -0,0 +1,13 @@
+# HomeKit Bridge Dependencies
+# HAP-Python - HomeKit Accessory Protocol implementation
+HAP-python>=4.9.0
+
+# HTTP client for API communication (REST API only - no MQTT)
+httpx>=0.24.0
+
+# Utilities
+python-dotenv>=1.0.0  # For .env file support
+pydantic>=2.0.0       # For data validation (shared with main app)
+
+# Logging and monitoring (optional)
+# sentry-sdk>=1.0.0   # Optional: Error tracking

apps/homekit/start_bridge.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# HomeKit Bridge Startup Script
+# This script sets up the virtual environment, installs dependencies, and starts the bridge
+
+set -e  # Exit on error
+
+# Determine script directory (apps/homekit)
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Navigate to workspace root (two levels up from apps/homekit)
+WORKSPACE_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+cd "$WORKSPACE_ROOT"
+
+echo "🏠 HomeKit Bridge Startup"
+echo "========================="
+echo "   Working dir: $WORKSPACE_ROOT"
+echo ""
+
+# Virtual environment path
+VENV_DIR="$SCRIPT_DIR/venv"
+
+# Check if virtual environment exists
+if [ ! -d "$VENV_DIR" ]; then
+    echo "📦 Virtual environment not found. Creating..."
+    # Try to use Python 3.12 or 3.13 (3.14 has compatibility issues with HAP-Python)
+    if command -v python3.13 &> /dev/null; then
+        PYTHON_CMD=python3.13
+    elif command -v python3.12 &> /dev/null; then
+        PYTHON_CMD=python3.12
+    elif command -v python3.11 &> /dev/null; then
+        PYTHON_CMD=python3.11
+    else
+        PYTHON_CMD=python3
+        echo "⚠️  Warning: Using default python3. HAP-Python may not work with Python 3.14+"
+    fi
+    echo "   Using: $PYTHON_CMD"
+    $PYTHON_CMD -m venv "$VENV_DIR"
+    echo "✅ Virtual environment created at $VENV_DIR"
+fi
+
+# Activate virtual environment
+echo "🔧 Activating virtual environment..."
+source "$VENV_DIR/bin/activate"
+
+# Install/update dependencies
+echo "📥 Installing dependencies from requirements.txt..."
+pip install --upgrade pip -q
+pip install -r "$SCRIPT_DIR/requirements.txt" -q
+echo "✅ Dependencies installed"
+
+# Set environment variables (with defaults)
+export HOMEKIT_NAME="${HOMEKIT_NAME:-Home Automation Bridge}"
+export HOMEKIT_PIN="${HOMEKIT_PIN:-031-45-154}"
+export HOMEKIT_PORT="${HOMEKIT_PORT:-51826}"
+export API_BASE="${API_BASE:-http://172.19.1.11:8001}"
+export HOMEKIT_API_TOKEN="${HOMEKIT_API_TOKEN:-}"
+export HOMEKIT_PERSIST_FILE="${HOMEKIT_PERSIST_FILE:-$SCRIPT_DIR/homekit.state}"
+
+# Display configuration
+echo ""
+echo "⚙️  Configuration:"
+echo "   Bridge Name:    $HOMEKIT_NAME"
+echo "   Bridge PIN:     $HOMEKIT_PIN"
+echo "   Bridge Port:    $HOMEKIT_PORT"
+echo "   API Base URL:   $API_BASE"
+echo "   Persist File:   $HOMEKIT_PERSIST_FILE"
+echo ""
+
+# Start the bridge
+echo "🚀 Starting HomeKit Bridge..."
+echo "   (Press Ctrl+C to stop)"
+echo ""
+
+# Run the bridge from workspace root with correct module path
+python -m apps.homekit.main

apps/rules/Dockerfile

@@ -0,0 +1,53 @@
+# Rules Engine Dockerfile
+# Event-driven automation rules processor with MQTT and Redis
+
+FROM python:3.14-alpine
+
+# Prevent Python from writing .pyc files and enable unbuffered output
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    RULES_CONFIG=config/rules.yaml \
+    MQTT_BROKER=172.16.2.16 \
+    MQTT_PORT=1883 \
+    REDIS_HOST=localhost \
+    REDIS_PORT=6379 \
+    REDIS_DB=8 \
+    LOG_LEVEL=INFO
+
+# Create non-root user
+RUN addgroup -g 10001 -S app && \
+    adduser -u 10001 -S app -G app
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies
+RUN apk add --no-cache \
+    gcc \
+    musl-dev \
+    linux-headers
+
+# Install Python dependencies
+COPY apps/rules/requirements.txt /app/requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY apps/__init__.py /app/apps/
+COPY apps/rules/ /app/apps/rules/
+COPY packages/ /app/packages/
+COPY config/ /app/config/
+
+# Change ownership to non-root user
+RUN chown -R app:app /app
+
+# Switch to non-root user
+USER app
+
+# Expose no ports (MQTT/Redis client only)
+
+# Health check (check if process is running)
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD pgrep -f "apps.rules.main" || exit 1
+
+# Run the rules engine
+CMD ["python", "-m", "apps.rules.main"]

apps/rules/impl/__init__.py

@@ -0,0 +1,15 @@
+"""
+Rule Implementations Package
+
+This package contains all rule implementation modules.
+
+Naming Convention:
+- Module name: snake_case matching the rule type name
+  Example: window_setback.py for type 'window_setback@1.0'
+  
+- Class name: PascalCase + 'Rule' suffix
+  Example: WindowSetbackRule
+  
+The rule engine uses load_rule() from rule_interface to dynamically
+import modules from this package based on the 'type' field in rules.yaml.
+"""

apps/rules/impl/window_setback.py

@@ -0,0 +1,256 @@
+"""
+Example Rule Implementation: Window Setback
+
+Demonstrates how to implement a Rule using the rule_interface.
+This rule lowers thermostat temperature when a window is opened.
+"""
+
+from typing import Any
+
+from pydantic import BaseModel, Field, ValidationError
+
+from apps.rules.rule_interface import Rule, RuleDescriptor, RuleContext
+
+
+class WindowSetbackObjects(BaseModel):
+    """Object structure for window setback rule"""
+    contacts: list[str] = Field(..., min_length=1, description="Contact sensors to monitor")
+    thermostats: list[str] = Field(..., min_length=1, description="Thermostats to control")
+
+
+class WindowSetbackRule(Rule):
+    """
+    Window setback automation rule.
+    
+    When a window/door contact opens, set thermostats to eco temperature.
+    When closed for a minimum duration, restore previous target temperature.
+    
+    Configuration:
+        objects:
+            contacts: List of contact sensor device IDs to monitor (required, min 1)
+            thermostats: List of thermostat device IDs to control (required, min 1)
+        params:
+            eco_target: Temperature to set when window opens (default: 16.0)
+            open_min_secs: Minimum seconds window must be open before triggering (default: 20)
+            close_min_secs: Minimum seconds window must be closed before restoring (default: 20)
+            previous_target_ttl_secs: How long to remember previous temperature (default: 86400)
+    
+    State storage (Redis keys):
+        rule:{rule_id}:contact:{device_id}:state -> "open" | "closed"
+        rule:{rule_id}:contact:{device_id}:ts -> ISO timestamp of last change
+        rule:{rule_id}:thermo:{device_id}:current_target -> Current target temp (updated on every STATE)
+        rule:{rule_id}:thermo:{device_id}:previous -> Previous target temp (saved on window open, deleted on restore)
+    
+    Logic:
+        1. Thermostat STATE events → update current_target in Redis
+        2. Window opens → copy current_target to previous, then set to eco_target
+        3. Window closes → restore from previous, then delete previous key
+    """
+    
+    def __init__(self):
+        super().__init__()
+        self._validated_objects: dict[str, WindowSetbackObjects] = {}
+    
+    async def setup(self, desc: RuleDescriptor, ctx: RuleContext) -> None:
+        """Validate objects structure during setup"""
+        try:
+            validated = WindowSetbackObjects(**desc.objects)
+            self._validated_objects[desc.id] = validated
+            ctx.logger.info(
+                f"Rule {desc.id} validated: {len(validated.contacts)} contacts, "
+                f"{len(validated.thermostats)} thermostats"
+            )
+        except ValidationError as e:
+            raise ValueError(
+                f"Invalid objects configuration for rule {desc.id}: {e}"
+            ) from e
+    
+    def get_subscriptions(self, desc: RuleDescriptor) -> list[str]:
+        """
+        Return MQTT topics to subscribe to.
+        
+        Subscribe to:
+        - Contact sensor state changes (to detect window open/close)
+        - Thermostat state changes (to track current target temperature)
+        """
+        topics = []
+        
+        # Subscribe to contact sensors
+        contacts = desc.objects.get('contacts', [])
+        for contact_id in contacts:
+            topics.append(f"home/contact/{contact_id}/state")
+        
+        # Subscribe to thermostats to track their current target temperature
+        thermostats = desc.objects.get('thermostats', [])
+        for thermo_id in thermostats:
+            topics.append(f"home/thermostat/{thermo_id}/state")
+        
+        return topics
+    
+    async def on_event(
+        self,
+        evt: dict[str, Any],
+        desc: RuleDescriptor,
+        ctx: RuleContext
+    ) -> None:
+        """
+        Process contact sensor or thermostat state changes.
+        
+        Logic:
+        1. If contact opened → remember current thermostat targets, set to eco
+        2. If contact closed for min_secs → restore previous targets
+        3. If thermostat target changed → update stored previous value
+        """
+        device_id = evt['device_id']
+        cap = evt['cap']
+        payload = evt['payload']
+        
+        # Only process events for devices in our objects
+        target_contacts = desc.objects.get('contacts', [])
+        target_thermostats = desc.objects.get('thermostats', [])
+        
+        if cap == 'contact' and device_id in target_contacts:
+            await self._handle_contact_event(evt, desc, ctx)
+        
+        elif cap == 'thermostat' and device_id in target_thermostats:
+            await self._handle_thermostat_event(evt, desc, ctx)
+    
+    async def _handle_contact_event(
+        self,
+        evt: dict[str, Any],
+        desc: RuleDescriptor,
+        ctx: RuleContext
+    ) -> None:
+        """Handle contact sensor state change."""
+        device_id = evt['device_id']
+        contact_state = evt['payload'].get('contact')  # "open" or "closed"
+        event_ts = evt.get('ts', ctx.now().isoformat())
+        
+        if not contact_state:
+            ctx.logger.warning(f"Contact event missing 'contact' field: {evt}")
+            return
+        
+        # Store current state and timestamp
+        state_key = f"rule:{desc.id}:contact:{device_id}:state"
+        ts_key = f"rule:{desc.id}:contact:{device_id}:ts"
+        
+        await ctx.redis.set(state_key, contact_state)
+        await ctx.redis.set(ts_key, event_ts)
+        
+        if contact_state == 'open':
+            await self._on_window_opened(desc, ctx)
+        elif contact_state == 'closed':
+            await self._on_window_closed(desc, ctx)
+    
+    async def _on_window_opened(self, desc: RuleDescriptor, ctx: RuleContext) -> None:
+        """
+        Window opened - save current temperatures, then set thermostats to eco.
+        
+        Important: We must save the current target BEFORE setting to eco,
+        otherwise we'll save the eco temperature instead of the original.
+        """
+        eco_target = desc.params.get('eco_target', 16.0)
+        target_thermostats = desc.objects.get('thermostats', [])
+        ttl_secs = desc.params.get('previous_target_ttl_secs', 86400)
+        
+        ctx.logger.info(
+            f"Rule {desc.id}: Window opened, setting {len(target_thermostats)} "
+            f"thermostats to eco temperature {eco_target}°C"
+        )
+        
+        # FIRST: Save current target temperatures as "previous" (before we change them!)
+        for thermo_id in target_thermostats:
+            current_key = f"rule:{desc.id}:thermo:{thermo_id}:current_target"
+            current_temp_str = await ctx.redis.get(current_key)
+            
+            if current_temp_str:
+                # Save current as previous (with TTL)
+                prev_key = f"rule:{desc.id}:thermo:{thermo_id}:previous"
+                await ctx.redis.set(prev_key, current_temp_str, ttl_secs=ttl_secs)
+                ctx.logger.debug(
+                    f"Saved previous target for {thermo_id}: {current_temp_str}°C"
+                )
+            else:
+                ctx.logger.warning(
+                    f"No current target found for {thermo_id}, cannot save previous"
+                )
+        
+        # THEN: Set all thermostats to eco temperature
+        for thermo_id in target_thermostats:
+            try:
+                await ctx.mqtt.publish_set_thermostat(thermo_id, eco_target)
+                ctx.logger.debug(f"Set {thermo_id} to {eco_target}°C")
+            except Exception as e:
+                ctx.logger.error(f"Failed to set {thermo_id}: {e}")
+    
+    async def _on_window_closed(self, desc: RuleDescriptor, ctx: RuleContext) -> None:
+        """
+        Window closed - restore previous temperatures.
+        
+        Note: This is simplified. A production implementation would check
+        close_min_secs and use a timer/scheduler.
+        """
+        target_thermostats = desc.objects.get('thermostats', [])
+        
+        ctx.logger.info(
+            f"Rule {desc.id}: Window closed, restoring {len(target_thermostats)} "
+            f"thermostats to previous temperatures"
+        )
+        
+        # Restore previous temperatures
+        for thermo_id in target_thermostats:
+            prev_key = f"rule:{desc.id}:thermo:{thermo_id}:previous"
+            prev_temp_str = await ctx.redis.get(prev_key)
+            
+            if prev_temp_str:
+                try:
+                    prev_temp = float(prev_temp_str)
+                    await ctx.mqtt.publish_set_thermostat(thermo_id, prev_temp)
+                    ctx.logger.debug(f"Restored {thermo_id} to {prev_temp}°C")
+                    
+                    # Delete the previous key after restoring
+                    await ctx.redis.delete(prev_key)
+                except Exception as e:
+                    ctx.logger.error(f"Failed to restore {thermo_id}: {e}")
+            else:
+                ctx.logger.warning(
+                    f"No previous target found for {thermo_id}, cannot restore"
+                )
+    
+    async def _handle_thermostat_event(
+        self,
+        evt: dict[str, Any],
+        desc: RuleDescriptor,
+        ctx: RuleContext
+    ) -> None:
+        """
+        Handle thermostat state change - track current target temperature.
+        
+        This keeps a record of the thermostat's current target, so we can
+        save it as "previous" when a window opens.
+        
+        Important: We store in "current_target", NOT "previous". The "previous"
+        key is only written when a window opens, to avoid race conditions.
+        """
+        device_id = evt['device_id']
+        payload = evt['payload']
+        current_target = payload.get('target')
+        
+        if current_target is None:
+            return  # No target in this state update
+        
+        # Store current target (always update, even if it's the eco temperature)
+        current_key = f"rule:{desc.id}:thermo:{device_id}:current_target"
+        ttl_secs = desc.params.get('previous_target_ttl_secs', 86400)
+        
+        await ctx.redis.set(current_key, str(current_target), ttl_secs=ttl_secs)
+        
+        ctx.logger.debug(
+            f"Rule {desc.id}: Updated current target for {device_id}: {current_target}°C"
+        )
+
+
+# Rule registry - maps rule type to implementation class
+RULE_IMPLEMENTATIONS = {
+    'window_setback@1.0': WindowSetbackRule,
+}

apps/rules/main.py

@@ -1,83 +1,374 @@
-"""Rules main entry point."""
+"""
+Rules Engine
 
+Loads rules configuration, subscribes to MQTT events, and dispatches events
+to registered rule implementations.
+"""
+
+import asyncio
 import logging
+import os
 import signal
 import sys
-import time
-from typing import NoReturn
+from datetime import datetime
+from typing import Any
 
-from apscheduler.schedulers.background import BackgroundScheduler
+from apps.rules.rules_config import load_rules_config
+from apps.rules.rule_interface import (
+    RuleDescriptor,
+    RuleContext,
+    MQTTClient,
+    RedisState,
+    load_rule
+)
 
 # Configure logging
 logging.basicConfig(
-    level=logging.INFO,
+    level=logging.DEBUG,
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
 )
 logger = logging.getLogger(__name__)
 
-# Global scheduler instance
-scheduler: BackgroundScheduler | None = None
 
-
-def rule_tick() -> None:
-    """Example job that runs every minute.
-    
-    This is a placeholder for actual rule evaluation logic.
+class RuleEngine:
     """
-    logger.info("Rule tick")
-
-
-def shutdown_handler(signum: int, frame: object) -> NoReturn:
-    """Handle shutdown signals gracefully.
-    
-    Args:
-        signum: Signal number
-        frame: Current stack frame
+    Rule engine that loads rules, subscribes to MQTT events,
+    and dispatches them to registered rule implementations.
     """
-    logger.info(f"Received signal {signum}, shutting down...")
-    if scheduler:
-        scheduler.shutdown(wait=True)
-        logger.info("Scheduler stopped")
-    sys.exit(0)
+    
+    def __init__(
+        self,
+        rules_config_path: str,
+        mqtt_broker: str,
+        mqtt_port: int,
+        redis_url: str
+    ):
+        """
+        Initialize rule engine.
+        
+        Args:
+            rules_config_path: Path to rules.yaml
+            mqtt_broker: MQTT broker hostname/IP
+            mqtt_port: MQTT broker port
+            redis_url: Redis connection URL
+        """
+        self.rules_config_path = rules_config_path
+        self.mqtt_broker = mqtt_broker
+        self.mqtt_port = mqtt_port
+        self.redis_url = redis_url
+        
+        # Will be initialized in setup()
+        self.rule_descriptors: list[RuleDescriptor] = []
+        self.rules: dict[str, Any] = {}  # rule_id -> Rule instance
+        self.mqtt_client: MQTTClient | None = None
+        self.redis_state: RedisState | None = None
+        self.context: RuleContext | None = None
+        self._mqtt_topics: list[str] = []  # Topics to subscribe to
+        
+        # For graceful shutdown
+        self._shutdown_event = asyncio.Event()
+    
+    async def setup(self) -> None:
+        """
+        Load configuration and instantiate rules.
+        
+        Raises:
+            ImportError: If rule implementation not found
+            ValueError: If configuration is invalid
+        """
+        logger.info(f"Loading rules configuration from {self.rules_config_path}")
+        
+        # Load rules configuration
+        config = load_rules_config(self.rules_config_path)
+        self.rule_descriptors = config.rules
+        
+        logger.info(f"Loaded {len(self.rule_descriptors)} rule(s) from configuration")
+        
+        # Instantiate each rule
+        for desc in self.rule_descriptors:
+            if not desc.enabled:
+                logger.info(f"  - {desc.id} (type: {desc.type}) [DISABLED]")
+                continue
+            
+            try:
+                rule_instance = load_rule(desc)
+                self.rules[desc.id] = rule_instance
+                logger.info(f"  - {desc.id} (type: {desc.type})")
+            except Exception as e:
+                logger.error(f"Failed to load rule {desc.id} (type: {desc.type}): {e}")
+                raise
+        
+        enabled_count = len(self.rules)
+        total_count = len(self.rule_descriptors)
+        disabled_count = total_count - enabled_count
+        logger.info(f"Successfully loaded {enabled_count} rule implementation(s) ({disabled_count} disabled)")
+        
+        # Call setup on each rule for validation
+        for rule_id, rule_instance in self.rules.items():
+            desc = next((d for d in self.rule_descriptors if d.id == rule_id), None)
+            if desc:
+                try:
+                    ctx = RuleContext(
+                        logger=logger,
+                        mqtt_publisher=self.mqtt_client,
+                        redis_state=self.redis_state
+                    )
+                    await rule_instance.setup(desc, ctx)
+                except Exception as e:
+                    logger.error(f"Failed to setup rule {rule_id}: {e}")
+                    raise
+        
+        # Collect MQTT subscriptions from all enabled rules
+        all_topics = set()
+        for rule_id, rule_instance in self.rules.items():
+            desc = next((d for d in self.rule_descriptors if d.id == rule_id), None)
+            if desc:
+                try:
+                    topics = rule_instance.get_subscriptions(desc)
+                    all_topics.update(topics)
+                    logger.debug(f"Rule {rule_id} subscribes to {len(topics)} topic(s)")
+                except Exception as e:
+                    logger.error(f"Failed to get subscriptions for rule {rule_id}: {e}")
+                    raise
+        
+        logger.info(f"Total MQTT subscriptions needed: {len(all_topics)}")
+        
+        # Create unique client ID to avoid conflicts
+        import uuid
+        import os
+        
+        client_id_base = "rule_engine"
+        client_suffix = os.environ.get("MQTT_CLIENT_ID_SUFFIX") or uuid.uuid4().hex[:6]
+        unique_client_id = f"{client_id_base}-{client_suffix}"
+        
+        # Initialize MQTT client
+        self.mqtt_client = MQTTClient(
+            broker=self.mqtt_broker,
+            port=self.mqtt_port,
+            client_id=unique_client_id
+        )
+        self.mqtt_client.set_logger(logger)
+        
+        # Store topics for connection
+        self._mqtt_topics = list(all_topics)
+        
+        # Initialize Redis state
+        self.redis_state = RedisState(self.redis_url)
+        
+        # Create MQTT publisher wrapper for RuleContext
+        from apps.rules.rule_interface import MQTTPublisher
+        mqtt_publisher = MQTTPublisher(mqtt_client=self.mqtt_client)
+        
+        # Create rule context
+        self.context = RuleContext(
+            logger=logger,
+            mqtt_publisher=mqtt_publisher,
+            redis_state=self.redis_state,
+            now_fn=datetime.now
+        )
+    
+    def _filter_rules_for_event(self, event: dict[str, Any]) -> list[tuple[str, RuleDescriptor]]:
+        """
+        Filter rules that should receive this event.
+        
+        Rules match if the event's device_id is in the rule's objects.
+        
+        Args:
+            event: Normalized MQTT event
+            
+        Returns:
+            List of (rule_id, descriptor) tuples that should process this event
+        """
+        matching_rules = []
+        device_id = event.get('device_id')
+        cap = event.get('cap')
+        
+        if not device_id or not cap:
+            return matching_rules
+        
+        logger.debug(f"Filtering for cap={cap}, device_id={device_id}")
+        
+        # Only check enabled rules (rules in self.rules dict)
+        for rule_id, rule_instance in self.rules.items():
+            desc = next((d for d in self.rule_descriptors if d.id == rule_id), None)
+            if not desc:
+                continue
+                
+            objects = desc.objects
+            
+            # Check if this device is in the rule's objects
+            matched = False
+            
+            if cap == 'contact' and objects.get('contacts'):
+                logger.debug(f"Rule {rule_id}: checking contacts {objects.get('contacts')}")
+                if device_id in objects.get('contacts', []):
+                    matched = True
+            
+            elif cap == 'thermostat' and objects.get('thermostats'):
+                logger.debug(f"Rule {rule_id}: checking thermostats {objects.get('thermostats')}")
+                if device_id in objects.get('thermostats', []):
+                    matched = True
+            
+            elif cap == 'light' and objects.get('lights'):
+                logger.debug(f"Rule {rule_id}: checking lights {objects.get('lights')}")
+                if device_id in objects.get('lights', []):
+                    matched = True
+            
+            elif cap == 'relay' and objects.get('relays'):
+                logger.debug(f"Rule {rule_id}: checking relays {objects.get('relays')}")
+                if device_id in objects.get('relays', []):
+                    matched = True
+            
+            if matched:
+                matching_rules.append((rule_id, desc))
+        
+        return matching_rules
+    
+    async def _dispatch_event(self, event: dict[str, Any]) -> None:
+        """
+        Dispatch event to matching rules.
+        
+        Calls rule.on_event() for each matching rule sequentially
+        to preserve order and avoid race conditions.
+        
+        Args:
+            event: Normalized MQTT event
+        """
+        # Debug logging
+        logger.debug(f"Received event: {event}")
+        
+        matching_rules = self._filter_rules_for_event(event)
+        
+        if not matching_rules:
+            # No rules interested in this event
+            logger.debug(f"No matching rules for {event.get('cap')}/{event.get('device_id')}")
+            return
+        
+        logger.info(
+            f"Event {event['cap']}/{event['device_id']}: "
+            f"{len(matching_rules)} matching rule(s)"
+        )
+        
+        # Process rules sequentially to preserve order
+        for rule_id, desc in matching_rules:
+            rule = self.rules.get(rule_id)
+            if not rule:
+                logger.warning(f"Rule instance not found for {rule_id}")
+                continue
+            
+            try:
+                await rule.on_event(event, desc, self.context)
+            except Exception as e:
+                logger.error(
+                    f"Error in rule {rule_id} processing event "
+                    f"{event['cap']}/{event['device_id']}: {e}",
+                    exc_info=True
+                )
+                # Continue with other rules
+    
+    async def run(self) -> None:
+        """
+        Main event loop - subscribe to MQTT and process events.
+        
+        Runs until shutdown signal received.
+        """
+        logger.info("Starting event processing loop")
+        
+        try:
+            async for event in self.mqtt_client.connect(topics=self._mqtt_topics):
+                # Check for shutdown
+                if self._shutdown_event.is_set():
+                    logger.info("Shutdown signal received, stopping event loop")
+                    break
+                
+                # Dispatch event to matching rules
+                await self._dispatch_event(event)
+                
+        except asyncio.CancelledError:
+            logger.info("Event loop cancelled")
+            raise
+        except Exception as e:
+            logger.error(f"Fatal error in event loop: {e}", exc_info=True)
+            raise
+    
+    async def shutdown(self) -> None:
+        """Graceful shutdown - close connections."""
+        logger.info("Shutting down rule engine...")
+        self._shutdown_event.set()
+        
+        if self.redis_state:
+            await self.redis_state.close()
+            logger.info("Redis connection closed")
+        
+        logger.info("Shutdown complete")
+
+
+async def main_async() -> None:
+    """Async main function."""
+    # Read configuration from environment
+    rules_config = os.getenv('RULES_CONFIG', 'config/rules.yaml')
+    mqtt_broker = os.getenv('MQTT_BROKER', '172.16.2.16')
+    mqtt_port = int(os.getenv('MQTT_PORT', '1883'))
+    redis_host = os.getenv('REDIS_HOST', '172.23.1.116')
+    redis_port = int(os.getenv('REDIS_PORT', '6379'))
+    redis_db = int(os.getenv('REDIS_DB', '8'))
+    redis_url = f'redis://{redis_host}:{redis_port}/{redis_db}'
+    
+    logger.info("=" * 60)
+    logger.info("Rules Engine Starting")
+    logger.info("=" * 60)
+    logger.info(f"Config: {rules_config}")
+    logger.info(f"MQTT: {mqtt_broker}:{mqtt_port}")
+    logger.info(f"Redis: {redis_url}")
+    logger.info("=" * 60)
+    
+    # Initialize engine
+    engine = RuleEngine(
+        rules_config_path=rules_config,
+        mqtt_broker=mqtt_broker,
+        mqtt_port=mqtt_port,
+        redis_url=redis_url
+    )
+    
+    # Load rules
+    try:
+        await engine.setup()
+    except Exception as e:
+        logger.error(f"Failed to setup engine: {e}", exc_info=True)
+        sys.exit(1)
+    
+    # Setup signal handlers for graceful shutdown
+    loop = asyncio.get_running_loop()
+    main_task = None
+    
+    def signal_handler():
+        logger.info("Received shutdown signal")
+        engine._shutdown_event.set()
+        if main_task and not main_task.done():
+            main_task.cancel()
+    
+    for sig in (signal.SIGTERM, signal.SIGINT):
+        loop.add_signal_handler(sig, signal_handler)
+    
+    # Run engine
+    try:
+        main_task = asyncio.create_task(engine.run())
+        await main_task
+    except asyncio.CancelledError:
+        logger.info("Main task cancelled")
+    finally:
+        await engine.shutdown()
 
 
 def main() -> None:
-    """Run the rules application."""
-    global scheduler
-    
-    logger.info("Rules engine starting...")
-    
-    # Register signal handlers
-    signal.signal(signal.SIGINT, shutdown_handler)
-    signal.signal(signal.SIGTERM, shutdown_handler)
-    
-    # Initialize scheduler
-    scheduler = BackgroundScheduler()
-    
-    # Add example job - runs every minute
-    scheduler.add_job(
-        rule_tick,
-        'interval',
-        minutes=1,
-        id='rule_tick',
-        name='Rule Tick Job'
-    )
-    
-    # Start scheduler
-    scheduler.start()
-    logger.info("Scheduler started with rule_tick job (every 1 minute)")
-    
-    # Run initial tick immediately
-    rule_tick()
-    
-    # Keep the application running
+    """Entry point for rule engine."""
     try:
-        while True:
-            time.sleep(1)
+        asyncio.run(main_async())
     except KeyboardInterrupt:
-        logger.info("KeyboardInterrupt received, shutting down...")
-        scheduler.shutdown(wait=True)
-        logger.info("Scheduler stopped")
+        logger.info("Keyboard interrupt received")
+    except Exception as e:
+        logger.error(f"Fatal error: {e}", exc_info=True)
+        sys.exit(1)
 
 
 if __name__ == "__main__":

apps/rules/requirements.txt

@@ -0,0 +1,5 @@
+# Rules Engine Dependencies
+pydantic>=2.0
+redis>=5.0.1
+aiomqtt>=2.0.1
+pyyaml>=6.0.1

apps/rules/rule_interface.py

@@ -0,0 +1,759 @@
+"""
+Rule Interface and Context Objects
+
+Provides the core abstractions for implementing automation rules:
+- RuleDescriptor: Configuration data for a rule instance
+- RedisState: State persistence interface
+- RuleContext: Runtime context provided to rules
+- Rule: Abstract base class for all rule implementations
+"""
+
+from abc import ABC, abstractmethod
+from datetime import datetime
+from typing import Any, Awaitable, Optional
+
+from pydantic import BaseModel, Field
+
+
+class RuleDescriptor(BaseModel):
+    """
+    Configuration descriptor for a rule instance.
+    
+    This is the validated representation of a rule from rules.yaml.
+    The engine loads these and passes them to rule implementations.
+    
+    The 'objects' field is intentionally flexible (dict) to allow different
+    rule types to define their own object structures.
+    """
+    
+    id: str = Field(..., description="Unique identifier for this rule instance")
+    name: Optional[str] = Field(None, description="Optional human-readable name")
+    type: str = Field(..., description="Rule type with version (e.g., 'window_setback@1.0')")
+    enabled: bool = Field(default=True, description="Whether this rule is enabled")
+    objects: dict[str, Any] = Field(
+        default_factory=dict,
+        description="Objects this rule monitors or controls (structure varies by rule type)"
+    )
+    params: dict[str, Any] = Field(
+        default_factory=dict,
+        description="Rule-specific parameters"
+    )
+
+
+class RedisState:
+    """
+    Async Redis-backed state persistence for rules with automatic reconnection.
+    
+    Provides a simple key-value and hash storage interface for rules to persist
+    state across restarts. All operations are asynchronous and include retry logic
+    for robustness against temporary Redis outages.
+    
+    Key Convention:
+    - Callers should use keys like: f"rules:{rule_id}:contact:{device_id}"
+    - This class does NOT enforce key prefixes - caller controls the full key
+    """
+    
+    def __init__(self, url: str, max_retries: int = 3, retry_delay: float = 0.5):
+        """
+        Initialize RedisState with connection URL.
+        
+        Args:
+            url: Redis connection URL (e.g., 'redis://172.23.1.116:6379/8')
+            max_retries: Maximum number of retry attempts for operations (default: 3)
+            retry_delay: Initial delay between retries in seconds, uses exponential backoff (default: 0.5)
+        
+        Note:
+            Connection is lazy - actual connection happens on first operation.
+            Uses connection pooling with automatic reconnection on failure.
+        """
+        self._url = url
+        self._max_retries = max_retries
+        self._retry_delay = retry_delay
+        self._redis: Optional[Any] = None  # redis.asyncio.Redis instance
+    
+    async def _get_client(self):
+        """
+        Get or create Redis client with connection pool.
+        
+        Lazy initialization ensures we don't connect until first use.
+        Uses decode_responses=True for automatic UTF-8 decoding.
+        """
+        if self._redis is None:
+            import redis.asyncio as aioredis
+            self._redis = await aioredis.from_url(
+                self._url,
+                decode_responses=True,  # Automatic UTF-8 decode
+                encoding='utf-8',
+                max_connections=10,  # Connection pool size
+                socket_connect_timeout=5,
+                socket_keepalive=True,
+                health_check_interval=30  # Auto-check connection health
+            )
+        return self._redis
+    
+    async def _execute_with_retry(self, operation, *args, **kwargs):
+        """
+        Execute Redis operation with exponential backoff retry.
+        
+        Handles temporary connection failures gracefully by retrying
+        with exponential backoff. On permanent failure, raises the
+        original exception.
+        
+        Args:
+            operation: Async callable (Redis method)
+            *args, **kwargs: Arguments to pass to operation
+            
+        Returns:
+            Result of the operation
+            
+        Raises:
+            Exception: If all retries are exhausted
+        """
+        import asyncio
+        
+        last_exception = None
+        for attempt in range(self._max_retries):
+            try:
+                client = await self._get_client()
+                return await operation(client, *args, **kwargs)
+            except Exception as e:
+                last_exception = e
+                if attempt < self._max_retries - 1:
+                    # Exponential backoff: 0.5s, 1s, 2s, ...
+                    delay = self._retry_delay * (2 ** attempt)
+                    await asyncio.sleep(delay)
+                    # Reset client to force reconnection
+                    if self._redis:
+                        try:
+                            await self._redis.close()
+                        except:
+                            pass
+                        self._redis = None
+        
+        # All retries exhausted
+        raise last_exception
+    
+    # JSON helpers for complex data structures
+    def _dumps(self, obj: Any) -> str:
+        """Serialize Python object to JSON string."""
+        import json
+        return json.dumps(obj, ensure_ascii=False)
+    
+    def _loads(self, s: str) -> Any:
+        """Deserialize JSON string to Python object."""
+        import json
+        return json.loads(s)
+    
+    async def get(self, key: str) -> Optional[str]:
+        """
+        Get a string value by key.
+        
+        Args:
+            key: Redis key (e.g., "rules:my_rule:contact:sensor_1")
+            
+        Returns:
+            String value or None if key doesn't exist
+            
+        Example:
+            >>> state = RedisState("redis://localhost:6379/0")
+            >>> await state.set("rules:r1:temp", "22.5")
+            >>> temp = await state.get("rules:r1:temp")
+            >>> print(temp)  # "22.5"
+        """
+        async def _get(client, k):
+            return await client.get(k)
+        
+        return await self._execute_with_retry(_get, key)
+    
+    async def set(self, key: str, value: str, ttl_secs: Optional[int] = None) -> None:
+        """
+        Set a string value with optional TTL.
+        
+        Args:
+            key: Redis key
+            value: String value to store
+            ttl_secs: Optional time-to-live in seconds. If None, key persists indefinitely.
+            
+        Example:
+            >>> state = RedisState("redis://localhost:6379/0")
+            >>> # Store with 1 hour TTL
+            >>> await state.set("rules:r1:previous_temp", "20.0", ttl_secs=3600)
+        """
+        async def _set(client, k, v, ttl):
+            if ttl is not None:
+                await client.setex(k, ttl, v)
+            else:
+                await client.set(k, v)
+        
+        await self._execute_with_retry(_set, key, value, ttl_secs)
+    
+    async def hget(self, key: str, field: str) -> Optional[str]:
+        """
+        Get a hash field value.
+        
+        Args:
+            key: Redis hash key
+            field: Field name within the hash
+            
+        Returns:
+            String value or None if field doesn't exist
+            
+        Example:
+            >>> state = RedisState("redis://localhost:6379/0")
+            >>> await state.hset("rules:r1:device_states", "sensor_1", "open")
+            >>> value = await state.hget("rules:r1:device_states", "sensor_1")
+            >>> print(value)  # "open"
+        """
+        async def _hget(client, k, f):
+            return await client.hget(k, f)
+        
+        return await self._execute_with_retry(_hget, key, field)
+    
+    async def hset(self, key: str, field: str, value: str) -> None:
+        """
+        Set a hash field value.
+        
+        Args:
+            key: Redis hash key
+            field: Field name within the hash
+            value: String value to store
+            
+        Example:
+            >>> state = RedisState("redis://localhost:6379/0")
+            >>> await state.hset("rules:r1:sensors", "bedroom", "open")
+            >>> await state.hset("rules:r1:sensors", "kitchen", "closed")
+        """
+        async def _hset(client, k, f, v):
+            await client.hset(k, f, v)
+        
+        await self._execute_with_retry(_hset, key, field, value)
+    
+    async def expire(self, key: str, ttl_secs: int) -> None:
+        """
+        Set or update TTL on an existing key.
+        
+        Args:
+            key: Redis key
+            ttl_secs: Time-to-live in seconds
+            
+        Example:
+            >>> state = RedisState("redis://localhost:6379/0")
+            >>> await state.set("rules:r1:temp", "22.5")
+            >>> await state.expire("rules:r1:temp", 3600)  # Expire in 1 hour
+        """
+        async def _expire(client, k, ttl):
+            await client.expire(k, ttl)
+        
+        await self._execute_with_retry(_expire, key, ttl_secs)
+    
+    async def delete(self, key: str) -> None:
+        """
+        Delete a key from Redis.
+        
+        Args:
+            key: Redis key to delete
+            
+        Example:
+            >>> state = RedisState("redis://localhost:6379/0")
+            >>> await state.set("rules:r1:temp", "22.5")
+            >>> await state.delete("rules:r1:temp")
+        """
+        async def _delete(client, k):
+            await client.delete(k)
+        
+        await self._execute_with_retry(_delete, key)
+    
+    async def close(self) -> None:
+        """
+        Close Redis connection and cleanup resources.
+        
+        Should be called when shutting down the application.
+        """
+        if self._redis:
+            await self._redis.close()
+            self._redis = None
+
+
+class MQTTClient:
+    """
+    Async MQTT client for rule engine with event normalization and publishing.
+    
+    Subscribes to device state topics, normalizes events to a consistent format,
+    and provides high-level publishing methods for device commands.
+    
+    Event Normalization:
+    All incoming MQTT messages are parsed into a normalized event structure:
+    {
+        "topic": "home/contact/sensor_1/state",
+        "type": "state",
+        "cap": "contact",          # Capability type (contact, thermostat, light, etc.)
+        "device_id": "sensor_1",
+        "payload": {"contact": "open"},
+        "ts": "2025-11-11T10:30:45.123456"
+    }
+    """
+    
+    def __init__(
+        self,
+        broker: str,
+        port: int = 1883,
+        client_id: str = "rule_engine",
+        reconnect_interval: int = 5,
+        max_reconnect_delay: int = 300
+    ):
+        """
+        Initialize MQTT client.
+        
+        Args:
+            broker: MQTT broker hostname or IP
+            port: MQTT broker port (default: 1883)
+            client_id: Unique client ID for this connection
+            reconnect_interval: Initial reconnect delay in seconds (default: 5)
+            max_reconnect_delay: Maximum reconnect delay in seconds (default: 300)
+        """
+        self._broker = broker
+        self._port = port
+        self._client_id = client_id
+        self._reconnect_interval = reconnect_interval
+        self._max_reconnect_delay = max_reconnect_delay
+        self._client = None
+        self._logger = None  # Set externally
+        
+    def set_logger(self, logger):
+        """Set logger instance for connection status messages."""
+        self._logger = logger
+    
+    def _log(self, level: str, msg: str):
+        """Internal logging helper."""
+        if self._logger:
+            getattr(self._logger, level)(msg)
+        else:
+            print(f"[{level.upper()}] {msg}")
+    
+    async def connect(self, topics: list[str] = None):
+        """
+        Connect to MQTT broker with automatic reconnection.
+        
+        This method manages the connection and automatically reconnects
+        with exponential backoff if the connection is lost.
+        
+        Args:
+            topics: List of MQTT topics to subscribe to. If None, subscribes to nothing.
+        """
+        import aiomqtt
+        from aiomqtt import Client
+        
+        if topics is None:
+            topics = []
+        
+        reconnect_delay = self._reconnect_interval
+        
+        while True:
+            try:
+                self._log("info", f"Connecting to MQTT broker {self._broker}:{self._port} (client_id={self._client_id})")
+                
+                async with Client(
+                    hostname=self._broker,
+                    port=self._port,
+                    identifier=self._client_id,
+                ) as client:
+                    self._client = client
+                    self._log("info", f"Connected to MQTT broker {self._broker}:{self._port}")
+                    
+                    # Subscribe to provided topics
+                    if topics:
+                        for topic in topics:
+                            await client.subscribe(topic)
+                        self._log("info", f"Subscribed to {len(topics)} topic(s): {', '.join(topics[:5])}{'...' if len(topics) > 5 else ''}")
+                    
+                    # Reset reconnect delay on successful connection
+                    reconnect_delay = self._reconnect_interval
+                    
+                    # Process messages - this is a generator that yields messages
+                    async for message in client.messages:
+                        yield self._normalize_event(message)
+                        
+            except aiomqtt.MqttError as e:
+                self._log("error", f"MQTT connection error: {e}")
+                self._log("info", f"Reconnecting in {reconnect_delay} seconds...")
+                
+                import asyncio
+                await asyncio.sleep(reconnect_delay)
+                
+                # Exponential backoff
+                reconnect_delay = min(reconnect_delay * 2, self._max_reconnect_delay)
+    
+    def _normalize_event(self, message) -> dict[str, Any]:
+        """
+        Normalize MQTT message to standard event format.
+        
+        Parses topic to extract capability type and device_id,
+        adds timestamp, and structures payload.
+        
+        Args:
+            message: aiomqtt.Message instance
+            
+        Returns:
+            Normalized event dictionary
+            
+        Example:
+            Topic: home/contact/sensor_bedroom/state
+            Payload: {"contact": "open"}
+            
+            Returns:
+            {
+                "topic": "home/contact/sensor_bedroom/state",
+                "type": "state",
+                "cap": "contact",
+                "device_id": "sensor_bedroom",
+                "payload": {"contact": "open"},
+                "ts": "2025-11-11T10:30:45.123456"
+            }
+        """
+        from datetime import datetime
+        import json
+        
+        topic = str(message.topic)
+        topic_parts = topic.split('/')
+        
+        # Parse topic: home/{capability}/{device_id}/state
+        if len(topic_parts) >= 4 and topic_parts[0] == 'home' and topic_parts[3] == 'state':
+            cap = topic_parts[1]  # contact, thermostat, light, etc.
+            device_id = topic_parts[2]
+        else:
+            # Fallback for unexpected topic format
+            cap = "unknown"
+            device_id = topic_parts[-2] if len(topic_parts) >= 2 else "unknown"
+        
+        # Parse payload
+        try:
+            payload = json.loads(message.payload.decode('utf-8'))
+        except (json.JSONDecodeError, UnicodeDecodeError):
+            payload = {"raw": message.payload.decode('utf-8', errors='replace')}
+        
+        # Generate timestamp
+        ts = datetime.now().isoformat()
+        
+        return {
+            "topic": topic,
+            "type": "state",
+            "cap": cap,
+            "device_id": device_id,
+            "payload": payload,
+            "ts": ts
+        }
+    
+    async def publish_set_thermostat(self, device_id: str, target: float) -> None:
+        """
+        Publish thermostat target temperature command.
+        
+        Publishes to: home/thermostat/{device_id}/set
+        QoS: 1 (at least once delivery)
+        
+        Args:
+            device_id: Thermostat device identifier
+            target: Target temperature in degrees Celsius
+            
+        Example:
+            >>> mqtt = MQTTClient("172.16.2.16", 1883)
+            >>> await mqtt.publish_set_thermostat("thermostat_wohnzimmer", 22.5)
+            
+            Published to: home/thermostat/thermostat_wohnzimmer/set
+            Payload: {"type":"thermostat","payload":{"target":22.5}}
+        """
+        import json
+        
+        if self._client is None:
+            raise RuntimeError("MQTT client not connected. Call connect() first.")
+        
+        topic = f"home/thermostat/{device_id}/set"
+        payload = {
+            "type": "thermostat",
+            "payload": {
+                "target": target
+            }
+        }
+        
+        payload_str = json.dumps(payload)
+        
+        await self._client.publish(
+            topic,
+            payload=payload_str.encode('utf-8'),
+            qos=1  # At least once delivery
+        )
+        
+        self._log("debug", f"Published SET to {topic}: {payload_str}")
+
+
+# Legacy alias for backward compatibility
+class MQTTPublisher:
+    """
+    Legacy MQTT publishing interface - DEPRECATED.
+    
+    Use MQTTClient instead for new code.
+    This class is kept for backward compatibility with existing documentation.
+    """
+    
+    def __init__(self, mqtt_client):
+        """
+        Initialize MQTT publisher.
+        
+        Args:
+            mqtt_client: MQTTClient instance
+        """
+        self._mqtt = mqtt_client
+    
+    async def publish_set_thermostat(self, device_id: str, target: float) -> None:
+        """
+        Publish a thermostat target temperature command.
+        
+        Args:
+            device_id: Thermostat device identifier
+            target: Target temperature in degrees Celsius
+        """
+        await self._mqtt.publish_set_thermostat(device_id, target)
+
+
+class RuleContext:
+    """
+    Runtime context provided to rules during event processing.
+    
+    Contains all external dependencies and utilities a rule needs:
+    - Logger for diagnostics
+    - MQTT client for publishing commands
+    - Redis client for state persistence
+    - Current timestamp function
+    """
+    
+    def __init__(
+        self,
+        logger,
+        mqtt_publisher: MQTTPublisher,
+        redis_state: RedisState,
+        now_fn=None
+    ):
+        """
+        Initialize rule context.
+        
+        Args:
+            logger: Logger instance (e.g., logging.Logger)
+            mqtt_publisher: MQTTPublisher instance for device commands
+            redis_state: RedisState instance for persistence
+            now_fn: Optional callable returning current datetime (defaults to datetime.now)
+        """
+        self.logger = logger
+        self.mqtt = mqtt_publisher
+        self.redis = redis_state
+        self._now_fn = now_fn or datetime.now
+    
+    def now(self) -> datetime:
+        """
+        Get current timestamp.
+        
+        Returns:
+            Current datetime (timezone-aware if now_fn provides it)
+        """
+        return self._now_fn()
+
+
+class Rule(ABC):
+    """
+    Abstract base class for all automation rule implementations.
+    
+    Rules implement event-driven automation logic. The engine calls on_event()
+    for each relevant device state change, passing the event data, rule configuration,
+    and runtime context.
+    
+    Implementations must be idempotent - processing the same event multiple times
+    should produce the same result.
+    
+    Example implementation:
+    
+        class WindowSetbackRule(Rule):
+            def get_subscriptions(self, desc: RuleDescriptor) -> list[str]:
+                # Subscribe to contact sensor state topics
+                topics = []
+                for contact_id in desc.objects.contacts or []:
+                    topics.append(f"home/contact/{contact_id}/state")
+                return topics
+            
+            async def on_event(self, evt: dict, desc: RuleDescriptor, ctx: RuleContext) -> None:
+                device_id = evt['device_id']
+                cap = evt['cap']
+                
+                if cap == 'contact':
+                    contact_state = evt['payload'].get('contact')
+                    if contact_state == 'open':
+                        # Window opened - set thermostats to eco
+                        for thermo_id in desc.objects.thermostats or []:
+                            eco_temp = desc.params.get('eco_target', 16.0)
+                            await ctx.mqtt.publish_set_thermostat(thermo_id, eco_temp)
+    """
+    
+    @abstractmethod
+    def get_subscriptions(self, desc: RuleDescriptor) -> list[str]:
+        """
+        Return list of MQTT topics this rule needs to subscribe to.
+        
+        Called once during rule engine setup. The rule examines its configuration
+        (desc.objects) and returns the specific state topics it needs to monitor.
+        
+        Args:
+            desc: Rule configuration from rules.yaml
+            
+        Returns:
+            List of MQTT topic patterns/strings to subscribe to
+            
+        Example:
+            For a window setback rule monitoring 2 contacts:
+            ['home/contact/sensor_bedroom/state', 'home/contact/sensor_kitchen/state']
+        """
+        pass
+    
+    @abstractmethod
+    async def on_event(
+        self,
+        evt: dict[str, Any],
+        desc: RuleDescriptor,
+        ctx: RuleContext
+    ) -> None:
+        """
+        Process a device state change event.
+        
+        This method is called by the rule engine whenever a device state changes
+        that is relevant to this rule. The implementation should examine the event
+        and take appropriate actions (e.g., publish MQTT commands, update state).
+        
+        MUST be idempotent: Processing the same event multiple times should be safe.
+        
+        Args:
+            evt: Event dictionary with the following structure:
+                {
+                    "topic": "home/contact/device_id/state",  # MQTT topic
+                    "type": "state",                          # Message type
+                    "cap": "contact",                         # Capability type
+                    "device_id": "kontakt_wohnzimmer",        # Device identifier
+                    "payload": {"contact": "open"},           # Capability-specific payload
+                    "ts": "2025-11-11T10:30:45.123456"       # ISO timestamp
+                }
+            
+            desc: Rule configuration from rules.yaml
+            
+            ctx: Runtime context with logger, MQTT, Redis, and timestamp utilities
+        
+        Returns:
+            None
+            
+        Raises:
+            Exception: Implementation may raise exceptions for errors.
+                      The engine will log them but continue processing.
+        """
+        pass
+
+
+# ============================================================================
+# Dynamic Rule Loading
+# ============================================================================
+
+import importlib
+import re
+from typing import Type
+
+# Cache for loaded rule classes (per process)
+_RULE_CLASS_CACHE: dict[str, Type[Rule]] = {}
+
+
+def load_rule(desc: RuleDescriptor) -> Rule:
+    """
+    Dynamically load and instantiate a rule based on its type descriptor.
+    
+    Convention:
+    - Rule type format: 'name@version' (e.g., 'window_setback@1.0')
+    - Module path: apps.rules.impl.{name}
+    - Class name: PascalCase version of name + 'Rule'
+      Example: 'window_setback' → 'WindowSetbackRule'
+    
+    Args:
+        desc: Rule descriptor from rules.yaml
+        
+    Returns:
+        Instantiated Rule object
+        
+    Raises:
+        ValueError: If type format is invalid
+        ImportError: If rule module cannot be found
+        AttributeError: If rule class cannot be found in module
+        
+    Examples:
+        >>> desc = RuleDescriptor(
+        ...     id="test_rule",
+        ...     type="window_setback@1.0",
+        ...     targets={},
+        ...     params={}
+        ... )
+        >>> rule = load_rule(desc)
+        >>> isinstance(rule, Rule)
+        True
+    """
+    rule_type = desc.type
+    
+    # Check cache first
+    if rule_type in _RULE_CLASS_CACHE:
+        rule_class = _RULE_CLASS_CACHE[rule_type]
+        return rule_class()
+    
+    # Parse type: 'name@version'
+    if '@' not in rule_type:
+        raise ValueError(
+            f"Invalid rule type '{rule_type}': must be in format 'name@version' "
+            f"(e.g., 'window_setback@1.0')"
+        )
+    
+    name, version = rule_type.split('@', 1)
+    
+    # Validate name (alphanumeric and underscores only)
+    if not re.match(r'^[a-z][a-z0-9_]*$', name):
+        raise ValueError(
+            f"Invalid rule name '{name}': must start with lowercase letter "
+            f"and contain only lowercase letters, numbers, and underscores"
+        )
+    
+    # Convert snake_case to PascalCase for class name
+    # Example: 'window_setback' → 'WindowSetbackRule'
+    class_name = ''.join(word.capitalize() for word in name.split('_')) + 'Rule'
+    
+    # Construct module path
+    module_path = f'apps.rules.impl.{name}'
+    
+    # Try to import the module
+    try:
+        module = importlib.import_module(module_path)
+    except ImportError as e:
+        raise ImportError(
+            f"Cannot load rule type '{rule_type}': module '{module_path}' not found.\n"
+            f"Hint: Create file 'apps/rules/impl/{name}.py' with class '{class_name}'.\n"
+            f"Original error: {e}"
+        ) from e
+    
+    # Try to get the class from the module
+    try:
+        rule_class = getattr(module, class_name)
+    except AttributeError as e:
+        raise AttributeError(
+            f"Cannot load rule type '{rule_type}': class '{class_name}' not found in module '{module_path}'.\n"
+            f"Hint: Define 'class {class_name}(Rule):' in 'apps/rules/impl/{name}.py'.\n"
+            f"Available classes in module: {[name for name in dir(module) if not name.startswith('_')]}"
+        ) from e
+    
+    # Validate that it's a Rule subclass
+    if not issubclass(rule_class, Rule):
+        raise TypeError(
+            f"Class '{class_name}' in '{module_path}' is not a subclass of Rule. "
+            f"Ensure it inherits from apps.rules.rule_interface.Rule"
+        )
+    
+    # Cache the class
+    _RULE_CLASS_CACHE[rule_type] = rule_class
+    
+    # Instantiate and return
+    return rule_class()

apps/rules/rules_config.py

@@ -0,0 +1,122 @@
+"""
+Rules Configuration Schema and Loader
+
+Provides Pydantic models for validating rules.yaml configuration.
+"""
+
+from pathlib import Path
+from typing import Any, Optional
+
+import yaml
+from pydantic import BaseModel, Field, field_validator
+
+
+class Rule(BaseModel):
+    """Single rule configuration"""
+    id: str = Field(..., description="Unique rule identifier")
+    name: Optional[str] = Field(None, description="Optional human-readable name")
+    type: str = Field(..., description="Rule type (e.g., 'window_setback@1.0')")
+    enabled: bool = Field(default=True, description="Whether this rule is enabled")
+    objects: dict[str, Any] = Field(default_factory=dict, description="Objects this rule monitors or controls")
+    params: dict[str, Any] = Field(default_factory=dict, description="Rule-specific parameters")
+
+    @field_validator('id')
+    @classmethod
+    def validate_id(cls, v: str) -> str:
+        if not v or not v.strip():
+            raise ValueError("Rule ID cannot be empty")
+        return v.strip()
+
+    @field_validator('type')
+    @classmethod
+    def validate_type(cls, v: str) -> str:
+        if not v or not v.strip():
+            raise ValueError("Rule type cannot be empty")
+        if '@' not in v:
+            raise ValueError(f"Rule type must include version (e.g., 'window_setback@1.0'), got: {v}")
+        return v.strip()
+
+
+class RulesConfig(BaseModel):
+    """Root configuration object"""
+    rules: list[Rule] = Field(..., description="List of all rules")
+
+    @field_validator('rules')
+    @classmethod
+    def validate_unique_ids(cls, rules: list[Rule]) -> list[Rule]:
+        """Ensure all rule IDs are unique"""
+        ids = [rule.id for rule in rules]
+        duplicates = [id for id in ids if ids.count(id) > 1]
+        if duplicates:
+            raise ValueError(f"Duplicate rule IDs found: {set(duplicates)}")
+        return rules
+
+
+def load_rules_config(config_path: str | Path = "config/rules.yaml") -> RulesConfig:
+    """
+    Load and validate rules configuration from YAML file.
+    
+    Args:
+        config_path: Path to rules.yaml file
+        
+    Returns:
+        Validated RulesConfig object
+        
+    Raises:
+        FileNotFoundError: If config file doesn't exist
+        ValueError: If YAML is invalid or validation fails
+    """
+    config_path = Path(config_path)
+    
+    if not config_path.exists():
+        raise FileNotFoundError(f"Rules configuration not found: {config_path}")
+    
+    with open(config_path, 'r', encoding='utf-8') as f:
+        try:
+            data = yaml.safe_load(f)
+        except yaml.YAMLError as e:
+            raise ValueError(f"Invalid YAML in {config_path}: {e}") from e
+    
+    if not data:
+        raise ValueError(f"Empty configuration file: {config_path}")
+    
+    if 'rules' not in data:
+        raise ValueError(
+            f"Missing 'rules:' key in {config_path}. "
+            "Configuration must start with 'rules:' followed by a list of rule definitions."
+        )
+    
+    try:
+        return RulesConfig(**data)
+    except Exception as e:
+        raise ValueError(f"Configuration validation failed: {e}") from e
+
+
+def get_rule_by_id(config: RulesConfig, rule_id: str) -> Rule | None:
+    """Get a specific rule by ID"""
+    for rule in config.rules:
+        if rule.id == rule_id:
+            return rule
+    return None
+
+
+def get_rules_by_type(config: RulesConfig, rule_type: str) -> list[Rule]:
+    """Get all rules of a specific type"""
+    return [rule for rule in config.rules if rule.type == rule_type]
+
+
+if __name__ == "__main__":
+    # Test configuration loading
+    try:
+        config = load_rules_config()
+        print(f"✅ Loaded {len(config.rules)} rules:")
+        for rule in config.rules:
+            name = f" ({rule.name})" if rule.name else ""
+            enabled = "✓" if rule.enabled else "✗"
+            print(f"  [{enabled}] {rule.id}{name}: {rule.type}")
+            if rule.objects:
+                obj_summary = ", ".join(f"{k}: {len(v) if isinstance(v, list) else v}" 
+                                       for k, v in rule.objects.items())
+                print(f"      Objects: {obj_summary}")
+    except Exception as e:
+        print(f"❌ Configuration error: {e}")

apps/simulator/Dockerfile

@@ -0,0 +1,44 @@
+# Simulator Service Dockerfile
+# FastAPI Web UI + MQTT Device Simulator
+
+FROM python:3.14-alpine
+
+# Prevent Python from writing .pyc files and enable unbuffered output
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    MQTT_BROKER=172.16.2.16 \
+    MQTT_PORT=1883 \
+    SIM_PORT=8010
+
+# Create non-root user
+RUN addgroup -g 10001 -S app && \
+    adduser -u 10001 -S app -G app
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies
+RUN apk add --no-cache \
+    gcc \
+    musl-dev \
+    linux-headers
+
+# Install Python dependencies
+COPY apps/simulator/requirements.txt /app/requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY apps/__init__.py /app/apps/__init__.py
+COPY apps/simulator/ /app/apps/simulator/
+
+# Change ownership to app user
+RUN chown -R app:app /app
+
+# Switch to non-root user
+USER app
+
+# Expose port
+EXPOSE 8010
+
+# Run the simulator
+CMD ["python", "-m", "uvicorn", "apps.simulator.main:app", "--host", "0.0.0.0", "--port", "8010"]

apps/simulator/README.md

@@ -0,0 +1,351 @@
+# Device Simulator Web Application
+
+Web-basierte Anwendung zur Simulation von Home-Automation-Geräten mit Echtzeit-Monitoring.
+
+## Features
+
+- ✅ **Web-Interface**: Dashboard mit Echtzeit-Anzeige aller Events
+- ✅ **Server-Sent Events (SSE)**: Live-Updates ohne Polling
+- ✅ **Funktioniert ohne Browser**: Simulator läuft im Hintergrund
+- ✅ **Multi-Device Support**: Lights + Thermostats
+- ✅ **MQTT Integration**: Vollständige Kommunikation über MQTT
+- ✅ **Statistiken**: Zähler für Events, Commands und States
+- ✅ **Event-History**: Letzte 50 Events mit Details
+
+## Geräte
+
+### Lights (3 Stück)
+- `test_lampe_1` - Dimmbar
+- `test_lampe_2` - Einfach
+- `test_lampe_3` - Dimmbar
+
+### Thermostats (1 Stück)
+- `test_thermo_1` - Auto/Heat/Off Modi, Temperatur-Drift
+
+## Installation
+
+Der Simulator ist bereits Teil des Projekts. Keine zusätzlichen Dependencies erforderlich.
+
+## Start
+
+### Local Development
+
+```bash
+# Standard-Start (Port 8010)
+poetry run uvicorn apps.simulator.main:app --host 0.0.0.0 --port 8010
+
+# Mit Auto-Reload für Entwicklung
+poetry run uvicorn apps.simulator.main:app --host 0.0.0.0 --port 8010 --reload
+
+# Im Hintergrund
+poetry run uvicorn apps.simulator.main:app --host 0.0.0.0 --port 8010 > /tmp/simulator.log 2>&1 &
+```
+
+### Docker Container
+
+#### Build Image
+
+```bash
+docker build -t simulator:dev -f apps/simulator/Dockerfile .
+```
+
+#### Run Container
+
+```bash
+docker run --rm -p 8010:8010 \
+  -e MQTT_BROKER=172.23.1.102 \
+  -e MQTT_PORT=1883 \
+  -e SIM_PORT=8010 \
+  simulator:dev
+```
+
+**Note for finch/nerdctl users:**
+- finch binds ports to `127.0.0.1` by default
+- The web interface will be accessible at `http://127.0.0.1:8010`
+
+#### Environment Variables
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `MQTT_BROKER` | `172.16.2.16` | MQTT broker hostname/IP |
+| `MQTT_PORT` | `1883` | MQTT broker port |
+| `SIM_PORT` | `8010` | Port for web interface |
+
+## Web-Interface
+
+Öffne im Browser:
+```
+http://localhost:8010
+```
+
+### Features im Dashboard
+
+1. **Status-Anzeige**
+   - MQTT-Verbindungsstatus
+   - Anzahl aktiver Geräte
+   - Simulator-Status
+
+2. **Geräte-Übersicht**
+   - Echtzeit-Anzeige aller Light-States
+   - Echtzeit-Anzeige aller Thermostat-States
+
+3. **Event-Stream**
+   - Alle MQTT-Commands
+   - Alle State-Updates
+   - Temperatur-Drift-Events
+   - Fehler und Warnungen
+
+4. **Statistiken**
+   - Total Events
+   - Commands Received
+   - States Published
+
+5. **Controls**
+   - Clear Events
+   - Toggle Auto-Scroll
+
+## API Endpoints
+
+### `GET /`
+Web-Dashboard (HTML)
+
+### `GET /health`
+Health-Check
+```json
+{
+  "status": "ok",
+  "simulator_running": true,
+  "mqtt_connected": true
+}
+```
+
+### `GET /status`
+Vollständiger Status
+```json
+{
+  "connected": true,
+  "running": true,
+  "light_states": {...},
+  "thermostat_states": {...},
+  "broker": "172.16.2.16:1883"
+}
+```
+
+### `GET /events`
+Letzte Events (JSON)
+```json
+{
+  "events": [...]
+}
+```
+
+### `GET /realtime`
+Server-Sent Events Stream
+
+## Event-Typen
+
+### `simulator_connected`
+Simulator hat MQTT-Verbindung hergestellt
+```json
+{
+  "type": "simulator_connected",
+  "broker": "172.16.2.16:1883",
+  "client_id": "device_simulator-abc123"
+}
+```
+
+### `command_received`
+SET-Command von MQTT empfangen
+```json
+{
+  "type": "command_received",
+  "device_id": "test_lampe_1",
+  "topic": "vendor/test_lampe_1/set",
+  "payload": {"power": "on"}
+}
+```
+
+### `light_updated`
+Light-State wurde aktualisiert
+```json
+{
+  "type": "light_updated",
+  "device_id": "test_lampe_1",
+  "changes": {
+    "power": {"old": "off", "new": "on"}
+  },
+  "new_state": {"power": "on", "brightness": 50}
+}
+```
+
+### `thermostat_updated`
+Thermostat-State wurde aktualisiert
+```json
+{
+  "type": "thermostat_updated",
+  "device_id": "test_thermo_1",
+  "changes": {
+    "mode": {"old": "off", "new": "heat"}
+  },
+  "new_state": {...}
+}
+```
+
+### `temperature_drift`
+Temperatur-Drift simuliert (alle 5 Sekunden)
+```json
+{
+  "type": "temperature_drift",
+  "device_id": "test_thermo_1",
+  "old_temp": 20.5,
+  "new_temp": 20.7,
+  "target": 21.0,
+  "mode": "auto"
+}
+```
+
+### `state_published`
+State wurde nach MQTT publiziert
+```json
+{
+  "type": "state_published",
+  "device_id": "test_lampe_1",
+  "device_type": "light",
+  "topic": "vendor/test_lampe_1/state",
+  "payload": {"power": "on", "brightness": 50}
+}
+```
+
+## MQTT Topics
+
+### Subscribe
+- `vendor/test_lampe_1/set`
+- `vendor/test_lampe_2/set`
+- `vendor/test_lampe_3/set`
+- `vendor/test_thermo_1/set`
+
+### Publish (retained, QoS 1)
+- `vendor/test_lampe_1/state`
+- `vendor/test_lampe_2/state`
+- `vendor/test_lampe_3/state`
+- `vendor/test_thermo_1/state`
+
+## Integration mit anderen Services
+
+Der Simulator funktioniert nahtlos mit:
+
+1. **Abstraction Layer** (`apps.abstraction.main`)
+   - Empfängt Commands über MQTT
+   - Sendet States zurück
+
+2. **API** (`apps.api.main`)
+   - Commands werden via API gesendet
+   - Simulator reagiert automatisch
+
+3. **UI** (`apps.ui.main`)
+   - UI zeigt Simulator-States in Echtzeit
+   - Bedienung über UI beeinflusst Simulator
+
+## Deployment
+
+### Systemd Service
+```ini
+[Unit]
+Description=Device Simulator
+After=network.target
+
+[Service]
+Type=simple
+User=homeautomation
+WorkingDirectory=/path/to/home-automation
+ExecStart=/path/to/.venv/bin/uvicorn apps.simulator.main:app --host 0.0.0.0 --port 8003
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+```
+
+### Docker
+```dockerfile
+FROM python:3.14
+WORKDIR /app
+COPY . .
+RUN pip install poetry && poetry install
+EXPOSE 8003
+CMD ["poetry", "run", "uvicorn", "apps.simulator.main:app", "--host", "0.0.0.0", "--port", "8003"]
+```
+
+## Troubleshooting
+
+### Simulator startet nicht
+```bash
+# Check logs
+tail -f /tmp/simulator.log
+
+# Verify MQTT broker
+mosquitto_sub -h 172.16.2.16 -t '#' -v
+```
+
+### Keine Events im Dashboard
+1. Browser-Console öffnen (F12)
+2. Prüfe SSE-Verbindung
+3. Reload Seite (F5)
+
+### MQTT-Verbindung fehlgeschlagen
+```bash
+# Test broker connection
+mosquitto_pub -h 172.16.2.16 -t test -m hello
+
+# Check broker status
+systemctl status mosquitto
+```
+
+## Unterschied zum alten Simulator
+
+### Alt (`tools/device_simulator.py`)
+- ✅ Reine CLI-Anwendung
+- ✅ Logging nur in stdout
+- ❌ Keine Web-UI
+- ❌ Keine Live-Monitoring
+
+### Neu (`apps/simulator/main.py`)
+- ✅ FastAPI Web-Application
+- ✅ Logging + Web-Dashboard
+- ✅ SSE für Echtzeit-Updates
+- ✅ REST API für Status
+- ✅ Funktioniert auch ohne Browser
+- ✅ Statistiken und Event-History
+
+## Entwicklung
+
+### Code-Struktur
+```
+apps/simulator/
+├── __init__.py
+├── main.py              # FastAPI app + Simulator logic
+└── templates/
+    └── index.html       # Web dashboard
+```
+
+### Logging
+```python
+logger.info()   # Wird in stdout UND als Event gestreamt
+add_event({})   # Wird nur als Event gestreamt
+```
+
+### Neue Event-Typen hinzufügen
+1. Event in `main.py` erstellen: `add_event({...})`
+2. Optional: CSS-Klasse in `index.html` für Farbe
+3. Event wird automatisch im Dashboard angezeigt
+
+## Performance
+
+- **Memory**: ~50 MB
+- **CPU**: <1% idle, ~5% bei Commands
+- **SSE Connections**: Unbegrenzt
+- **Event Queue**: Max 100 Events (rolling)
+- **Per-Client Queue**: Unbegrenzt
+
+## License
+
+Teil des Home-Automation Projekts.

apps/simulator/__init__.py

@@ -0,0 +1 @@
+"""Simulator app package."""

apps/simulator/main.py

@@ -0,0 +1,489 @@
+"""Device Simulator Web Application.
+
+FastAPI application that runs the device simulator in the background
+and provides a web interface with real-time event streaming (SSE).
+"""
+
+import asyncio
+import json
+import logging
+import os
+import uuid
+from datetime import datetime
+from typing import Dict, Any, AsyncGenerator
+from queue import Queue
+from collections import deque
+
+from aiomqtt import Client, MqttError
+from fastapi import FastAPI, Request
+from fastapi.responses import HTMLResponse, StreamingResponse
+from fastapi.templating import Jinja2Templates
+from pathlib import Path
+
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+logger = logging.getLogger(__name__)
+
+# Configuration
+BROKER_HOST = os.getenv("MQTT_BROKER", "172.16.2.16")
+BROKER_PORT = int(os.getenv("MQTT_PORT", "1883"))
+DRIFT_INTERVAL = 5  # seconds for thermostat temperature drift
+
+# Device configurations
+LIGHT_DEVICES = ["test_lampe_1", "test_lampe_2", "test_lampe_3"]
+THERMOSTAT_DEVICES = ["test_thermo_1"]
+
+# Global event queue for SSE
+event_queue = deque(maxlen=100)  # Keep last 100 events
+sse_queues = []  # List of queues for active SSE connections
+
+
+def add_event(event: dict):
+    """Add event to global queue and notify all SSE clients."""
+    event_with_ts = {
+        **event,
+        "timestamp": datetime.utcnow().isoformat() + "Z"
+    }
+    event_queue.append(event_with_ts)
+    
+    # Notify all SSE clients
+    for q in sse_queues:
+        try:
+            q.put_nowait(event_with_ts)
+        except:
+            pass
+
+
+class DeviceSimulator:
+    """Unified simulator for lights and thermostats."""
+    
+    def __init__(self):
+        # Light states
+        self.light_states: Dict[str, Dict[str, Any]] = {
+            "test_lampe_1": {"power": "off", "brightness": 50},
+            "test_lampe_2": {"power": "off", "brightness": 50},
+            "test_lampe_3": {"power": "off", "brightness": 50}
+        }
+        
+        # Thermostat states
+        self.thermostat_states: Dict[str, Dict[str, Any]] = {
+            "test_thermo_1": {
+                "mode": "auto",
+                "target": 21.0,
+                "current": 20.5,
+                "battery": 90,
+                "window_open": False
+            }
+        }
+        
+        self.client = None
+        self.running = True
+        self.drift_task = None
+        self.connected = False
+    
+    async def publish_state(self, device_id: str, device_type: str):
+        """Publish device state to MQTT (retained, QoS 1)."""
+        if not self.client:
+            return
+        
+        if device_type == "light":
+            state = self.light_states.get(device_id)
+        elif device_type == "thermostat":
+            state = self.thermostat_states.get(device_id)
+        else:
+            logger.warning(f"Unknown device type: {device_type}")
+            return
+        
+        if not state:
+            logger.warning(f"Unknown device: {device_id}")
+            return
+        
+        state_topic = f"vendor/{device_id}/state"
+        payload = json.dumps(state)
+        
+        await self.client.publish(
+            state_topic,
+            payload=payload,
+            qos=1,
+            retain=True
+        )
+        
+        add_event({
+            "type": "state_published",
+            "device_id": device_id,
+            "device_type": device_type,
+            "topic": state_topic,
+            "payload": state
+        })
+        
+        logger.info(f"[{device_id}] Published state: {payload}")
+    
+    async def handle_light_set(self, device_id: str, payload: dict):
+        """Handle SET command for light device."""
+        if device_id not in self.light_states:
+            logger.warning(f"Unknown light device: {device_id}")
+            return
+        
+        state = self.light_states[device_id]
+        changes = {}
+        
+        if "power" in payload:
+            old_power = state["power"]
+            state["power"] = payload["power"]
+            if old_power != state["power"]:
+                changes["power"] = {"old": old_power, "new": state["power"]}
+                logger.info(f"[{device_id}] Power: {old_power} -> {state['power']}")
+        
+        if "brightness" in payload:
+            old_brightness = state["brightness"]
+            state["brightness"] = int(payload["brightness"])
+            if old_brightness != state["brightness"]:
+                changes["brightness"] = {"old": old_brightness, "new": state["brightness"]}
+                logger.info(f"[{device_id}] Brightness: {old_brightness} -> {state['brightness']}")
+        
+        if changes:
+            add_event({
+                "type": "light_updated",
+                "device_id": device_id,
+                "changes": changes,
+                "new_state": dict(state)
+            })
+            await self.publish_state(device_id, "light")
+    
+    async def handle_thermostat_set(self, device_id: str, payload: dict):
+        """Handle SET command for thermostat device."""
+        if device_id not in self.thermostat_states:
+            logger.warning(f"Unknown thermostat device: {device_id}")
+            return
+        
+        state = self.thermostat_states[device_id]
+        changes = {}
+        
+        if "mode" in payload:
+            new_mode = payload["mode"]
+            if new_mode in ["off", "heat", "auto"]:
+                old_mode = state["mode"]
+                state["mode"] = new_mode
+                if old_mode != new_mode:
+                    changes["mode"] = {"old": old_mode, "new": new_mode}
+                    logger.info(f"[{device_id}] Mode: {old_mode} -> {new_mode}")
+            else:
+                logger.warning(f"[{device_id}] Invalid mode: {new_mode}")
+        
+        if "target" in payload:
+            try:
+                new_target = float(payload["target"])
+                if 5.0 <= new_target <= 30.0:
+                    old_target = state["target"]
+                    state["target"] = new_target
+                    if old_target != new_target:
+                        changes["target"] = {"old": old_target, "new": new_target}
+                        logger.info(f"[{device_id}] Target: {old_target}°C -> {new_target}°C")
+                else:
+                    logger.warning(f"[{device_id}] Target out of range: {new_target}")
+            except (ValueError, TypeError):
+                logger.warning(f"[{device_id}] Invalid target value: {payload['target']}")
+        
+        if changes:
+            add_event({
+                "type": "thermostat_updated",
+                "device_id": device_id,
+                "changes": changes,
+                "new_state": dict(state)
+            })
+            await self.publish_state(device_id, "thermostat")
+    
+    def apply_temperature_drift(self, device_id: str):
+        """
+        Simulate temperature drift for thermostat.
+        Max change: ±0.2°C per interval.
+        """
+        if device_id not in self.thermostat_states:
+            return
+        
+        state = self.thermostat_states[device_id]
+        old_current = state["current"]
+        
+        if state["mode"] == "off":
+            # Drift towards ambient (18°C)
+            ambient = 18.0
+            diff = ambient - state["current"]
+        else:
+            # Drift towards target
+            diff = state["target"] - state["current"]
+        
+        # Apply max ±0.2°C drift
+        if abs(diff) < 0.1:
+            state["current"] = round(state["current"] + diff, 1)
+        elif diff > 0:
+            state["current"] = round(state["current"] + 0.2, 1)
+        else:
+            state["current"] = round(state["current"] - 0.2, 1)
+        
+        if old_current != state["current"]:
+            add_event({
+                "type": "temperature_drift",
+                "device_id": device_id,
+                "old_temp": old_current,
+                "new_temp": state["current"],
+                "target": state["target"],
+                "mode": state["mode"]
+            })
+            
+        logger.info(f"[{device_id}] Temperature drift: current={state['current']}°C (target={state['target']}°C, mode={state['mode']})")
+    
+    async def thermostat_drift_loop(self):
+        """Background loop for thermostat temperature drift."""
+        while self.running:
+            await asyncio.sleep(DRIFT_INTERVAL)
+            
+            for device_id in THERMOSTAT_DEVICES:
+                self.apply_temperature_drift(device_id)
+                await self.publish_state(device_id, "thermostat")
+    
+    async def handle_message(self, message):
+        """Handle incoming MQTT message."""
+        try:
+            # Extract device_id from topic (vendor/{device_id}/set)
+            topic_parts = message.topic.value.split('/')
+            if len(topic_parts) != 3 or topic_parts[0] != "vendor" or topic_parts[2] != "set":
+                logger.warning(f"Unexpected topic format: {message.topic}")
+                return
+            
+            device_id = topic_parts[1]
+            payload = json.loads(message.payload.decode())
+            
+            add_event({
+                "type": "command_received",
+                "device_id": device_id,
+                "topic": message.topic.value,
+                "payload": payload
+            })
+            
+            logger.info(f"[{device_id}] Received SET: {payload}")
+            
+            # Determine device type and handle accordingly
+            if device_id in self.light_states:
+                await self.handle_light_set(device_id, payload)
+            elif device_id in self.thermostat_states:
+                await self.handle_thermostat_set(device_id, payload)
+            else:
+                logger.warning(f"Unknown device: {device_id}")
+                
+        except json.JSONDecodeError as e:
+            logger.error(f"Invalid JSON: {e}")
+            add_event({"type": "error", "message": f"Invalid JSON: {e}"})
+        except Exception as e:
+            logger.error(f"Error handling message: {e}")
+            add_event({"type": "error", "message": f"Error: {e}"})
+    
+    async def run(self):
+        """Main simulator loop."""
+        # Generate unique client ID to avoid collisions
+        base_client_id = "device_simulator"
+        client_suffix = os.environ.get("MQTT_CLIENT_ID_SUFFIX") or uuid.uuid4().hex[:6]
+        unique_client_id = f"{base_client_id}-{client_suffix}"
+        
+        try:
+            async with Client(
+                hostname=BROKER_HOST,
+                port=BROKER_PORT,
+                identifier=unique_client_id
+            ) as client:
+                self.client = client
+                self.connected = True
+                
+                add_event({
+                    "type": "simulator_connected",
+                    "broker": f"{BROKER_HOST}:{BROKER_PORT}",
+                    "client_id": unique_client_id
+                })
+                
+                logger.info(f"✅ Connected to MQTT broker {BROKER_HOST}:{BROKER_PORT}")
+                
+                # Publish initial states
+                for device_id in LIGHT_DEVICES:
+                    await self.publish_state(device_id, "light")
+                    logger.info(f"💡 Light simulator started: {device_id}")
+                
+                for device_id in THERMOSTAT_DEVICES:
+                    await self.publish_state(device_id, "thermostat")
+                    logger.info(f"🌡️  Thermostat simulator started: {device_id}")
+                
+                add_event({
+                    "type": "devices_initialized",
+                    "lights": LIGHT_DEVICES,
+                    "thermostats": THERMOSTAT_DEVICES
+                })
+                
+                # Subscribe to all SET topics
+                all_devices = LIGHT_DEVICES + THERMOSTAT_DEVICES
+                for device_id in all_devices:
+                    set_topic = f"vendor/{device_id}/set"
+                    await client.subscribe(set_topic, qos=1)
+                    logger.info(f"👂 Subscribed to {set_topic}")
+                
+                add_event({
+                    "type": "subscriptions_complete",
+                    "topics": [f"vendor/{d}/set" for d in all_devices]
+                })
+                
+                # Start thermostat drift loop
+                self.drift_task = asyncio.create_task(self.thermostat_drift_loop())
+                
+                # Listen for messages
+                async for message in client.messages:
+                    await self.handle_message(message)
+                
+                # Cancel drift loop on disconnect
+                if self.drift_task:
+                    self.drift_task.cancel()
+                
+        except MqttError as e:
+            logger.error(f"❌ MQTT Error: {e}")
+            add_event({"type": "error", "message": f"MQTT Error: {e}"})
+            self.connected = False
+        except Exception as e:
+            logger.error(f"❌ Error: {e}")
+            add_event({"type": "error", "message": f"Error: {e}"})
+            self.connected = False
+        finally:
+            self.running = False
+            self.connected = False
+            if self.drift_task:
+                self.drift_task.cancel()
+            add_event({"type": "simulator_stopped"})
+            logger.info("👋 Simulator stopped")
+
+
+# Create FastAPI app
+app = FastAPI(
+    title="Device Simulator",
+    description="Web interface for device simulator with real-time event streaming",
+    version="1.0.0"
+)
+
+# Setup templates
+templates_dir = Path(__file__).parent / "templates"
+templates = Jinja2Templates(directory=str(templates_dir))
+
+# Global simulator instance
+simulator = DeviceSimulator()
+simulator_task = None
+
+
+@app.on_event("startup")
+async def startup_event():
+    """Start simulator on application startup."""
+    global simulator_task
+    simulator_task = asyncio.create_task(simulator.run())
+    add_event({"type": "app_started", "message": "Simulator web app started"})
+    logger.info("🚀 Simulator web app started")
+
+
+@app.on_event("shutdown")
+async def shutdown_event():
+    """Stop simulator on application shutdown."""
+    global simulator_task
+    simulator.running = False
+    if simulator_task:
+        simulator_task.cancel()
+        try:
+            await simulator_task
+        except asyncio.CancelledError:
+            pass
+    add_event({"type": "app_stopped", "message": "Simulator web app stopped"})
+    logger.info("🛑 Simulator web app stopped")
+
+
+@app.get("/", response_class=HTMLResponse)
+async def index(request: Request):
+    """Render simulator dashboard."""
+    return templates.TemplateResponse("index.html", {
+        "request": request,
+        "broker": f"{BROKER_HOST}:{BROKER_PORT}",
+        "light_devices": LIGHT_DEVICES,
+        "thermostat_devices": THERMOSTAT_DEVICES,
+        "connected": simulator.connected
+    })
+
+
+@app.get("/health")
+async def health():
+    """Health check endpoint."""
+    return {
+        "status": "ok",
+        "simulator_running": simulator.running,
+        "mqtt_connected": simulator.connected
+    }
+
+
+@app.get("/status")
+async def status():
+    """Get current simulator status."""
+    return {
+        "connected": simulator.connected,
+        "running": simulator.running,
+        "light_states": simulator.light_states,
+        "thermostat_states": simulator.thermostat_states,
+        "broker": f"{BROKER_HOST}:{BROKER_PORT}"
+    }
+
+
+@app.get("/events")
+async def get_events():
+    """Get recent events."""
+    return {
+        "events": list(event_queue)
+    }
+
+
+@app.get("/realtime")
+async def realtime(request: Request):
+    """Server-Sent Events stream for real-time updates."""
+    async def event_generator() -> AsyncGenerator[str, None]:
+        # Create a queue for this SSE connection
+        q = asyncio.Queue()
+        sse_queues.append(q)
+        
+        try:
+            # Send recent events first
+            for event in event_queue:
+                yield f"data: {json.dumps(event)}\n\n"
+            
+            # Stream new events
+            while True:
+                # Check if client disconnected
+                if await request.is_disconnected():
+                    break
+                
+                try:
+                    # Wait for new event with timeout
+                    event = await asyncio.wait_for(q.get(), timeout=30.0)
+                    yield f"data: {json.dumps(event)}\n\n"
+                except asyncio.TimeoutError:
+                    # Send heartbeat
+                    yield f"event: ping\ndata: {json.dumps({'type': 'ping'})}\n\n"
+        
+        finally:
+            # Remove queue on disconnect
+            if q in sse_queues:
+                sse_queues.remove(q)
+    
+    return StreamingResponse(
+        event_generator(),
+        media_type="text/event-stream",
+        headers={
+            "Cache-Control": "no-cache",
+            "Connection": "keep-alive",
+            "X-Accel-Buffering": "no"
+        }
+    )
+
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=8003)

apps/simulator/requirements.txt

@@ -0,0 +1,4 @@
+fastapi==0.104.1
+uvicorn[standard]==0.24.0
+aiomqtt==2.0.1
+jinja2==3.1.2

apps/simulator/templates/index.html

@@ -0,0 +1,537 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Device Simulator - Monitor</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+        
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+            background: linear-gradient(135deg, #2c3e50 0%, #34495e 100%);
+            min-height: 100vh;
+            padding: 2rem;
+            color: #ecf0f1;
+        }
+        
+        .container {
+            max-width: 1400px;
+            margin: 0 auto;
+        }
+        
+        header {
+            background: rgba(255, 255, 255, 0.1);
+            border-radius: 16px;
+            padding: 2rem;
+            margin-bottom: 2rem;
+            backdrop-filter: blur(10px);
+            border: 1px solid rgba(255, 255, 255, 0.2);
+        }
+        
+        h1 {
+            font-size: 2rem;
+            margin-bottom: 0.5rem;
+        }
+        
+        .status-bar {
+            display: flex;
+            gap: 2rem;
+            margin-top: 1rem;
+            flex-wrap: wrap;
+        }
+        
+        .status-item {
+            display: flex;
+            align-items: center;
+            gap: 0.5rem;
+        }
+        
+        .status-indicator {
+            width: 12px;
+            height: 12px;
+            border-radius: 50%;
+            animation: pulse 2s infinite;
+        }
+        
+        .status-indicator.connected {
+            background: #2ecc71;
+            box-shadow: 0 0 10px #2ecc71;
+        }
+        
+        .status-indicator.disconnected {
+            background: #e74c3c;
+            box-shadow: 0 0 10px #e74c3c;
+        }
+        
+        @keyframes pulse {
+            0%, 100% { opacity: 1; }
+            50% { opacity: 0.5; }
+        }
+        
+        .grid {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            gap: 2rem;
+            margin-bottom: 2rem;
+        }
+        
+        @media (max-width: 1200px) {
+            .grid {
+                grid-template-columns: 1fr;
+            }
+        }
+        
+        .panel {
+            background: rgba(255, 255, 255, 0.1);
+            border-radius: 16px;
+            padding: 1.5rem;
+            backdrop-filter: blur(10px);
+            border: 1px solid rgba(255, 255, 255, 0.2);
+        }
+        
+        .panel h2 {
+            font-size: 1.25rem;
+            margin-bottom: 1rem;
+            border-bottom: 2px solid rgba(255, 255, 255, 0.3);
+            padding-bottom: 0.5rem;
+        }
+        
+        .device-list {
+            display: grid;
+            gap: 0.75rem;
+        }
+        
+        .device-item {
+            background: rgba(0, 0, 0, 0.2);
+            padding: 0.75rem 1rem;
+            border-radius: 8px;
+            font-family: 'Monaco', 'Courier New', monospace;
+            font-size: 0.875rem;
+            border-left: 3px solid transparent;
+        }
+        
+        .device-item.light {
+            border-left-color: #f39c12;
+        }
+        
+        .device-item.thermostat {
+            border-left-color: #3498db;
+        }
+        
+        .events-panel {
+            grid-column: 1 / -1;
+        }
+        
+        .event-list {
+            max-height: 600px;
+            overflow-y: auto;
+            display: flex;
+            flex-direction: column;
+            gap: 0.5rem;
+        }
+        
+        .event-item {
+            background: rgba(0, 0, 0, 0.3);
+            padding: 1rem;
+            border-radius: 8px;
+            border-left: 4px solid;
+            animation: slideIn 0.3s ease-out;
+        }
+        
+        @keyframes slideIn {
+            from {
+                opacity: 0;
+                transform: translateX(-20px);
+            }
+            to {
+                opacity: 1;
+                transform: translateX(0);
+            }
+        }
+        
+        .event-item.command_received {
+            border-left-color: #9b59b6;
+        }
+        
+        .event-item.state_published {
+            border-left-color: #27ae60;
+        }
+        
+        .event-item.light_updated {
+            border-left-color: #f39c12;
+        }
+        
+        .event-item.thermostat_updated {
+            border-left-color: #3498db;
+        }
+        
+        .event-item.temperature_drift {
+            border-left-color: #1abc9c;
+        }
+        
+        .event-item.error {
+            border-left-color: #e74c3c;
+        }
+        
+        .event-item.simulator_connected,
+        .event-item.devices_initialized,
+        .event-item.subscriptions_complete {
+            border-left-color: #2ecc71;
+        }
+        
+        .event-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 0.5rem;
+        }
+        
+        .event-type {
+            font-weight: 600;
+            text-transform: uppercase;
+            font-size: 0.75rem;
+            letter-spacing: 0.05em;
+        }
+        
+        .event-time {
+            font-size: 0.75rem;
+            opacity: 0.7;
+        }
+        
+        .event-data {
+            font-family: 'Monaco', 'Courier New', monospace;
+            font-size: 0.875rem;
+            white-space: pre-wrap;
+            word-break: break-all;
+            background: rgba(0, 0, 0, 0.2);
+            padding: 0.75rem;
+            border-radius: 4px;
+            margin-top: 0.5rem;
+        }
+        
+        .stats {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+            gap: 1rem;
+            margin-top: 1rem;
+        }
+        
+        .stat-card {
+            background: rgba(0, 0, 0, 0.2);
+            padding: 1rem;
+            border-radius: 8px;
+            text-align: center;
+        }
+        
+        .stat-value {
+            font-size: 2rem;
+            font-weight: 700;
+            margin-bottom: 0.25rem;
+        }
+        
+        .stat-label {
+            font-size: 0.875rem;
+            opacity: 0.8;
+        }
+        
+        .controls {
+            display: flex;
+            gap: 1rem;
+            margin-top: 1rem;
+        }
+        
+        button {
+            padding: 0.75rem 1.5rem;
+            border: none;
+            border-radius: 8px;
+            font-weight: 600;
+            cursor: pointer;
+            transition: all 0.2s;
+            font-size: 0.875rem;
+        }
+        
+        button.primary {
+            background: #3498db;
+            color: white;
+        }
+        
+        button.primary:hover {
+            background: #2980b9;
+            transform: translateY(-2px);
+            box-shadow: 0 4px 12px rgba(52, 152, 219, 0.4);
+        }
+        
+        button.danger {
+            background: #e74c3c;
+            color: white;
+        }
+        
+        button.danger:hover {
+            background: #c0392b;
+        }
+        
+        /* Scrollbar styling */
+        ::-webkit-scrollbar {
+            width: 8px;
+        }
+        
+        ::-webkit-scrollbar-track {
+            background: rgba(0, 0, 0, 0.2);
+            border-radius: 4px;
+        }
+        
+        ::-webkit-scrollbar-thumb {
+            background: rgba(255, 255, 255, 0.3);
+            border-radius: 4px;
+        }
+        
+        ::-webkit-scrollbar-thumb:hover {
+            background: rgba(255, 255, 255, 0.5);
+        }
+        
+        .empty-state {
+            text-align: center;
+            padding: 3rem;
+            opacity: 0.6;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <header>
+            <h1>🔌 Device Simulator Monitor</h1>
+            <p>Real-time monitoring of simulated home automation devices</p>
+            
+            <div class="status-bar">
+                <div class="status-item">
+                    <div class="status-indicator {% if connected %}connected{% else %}disconnected{% endif %}" id="mqtt-status"></div>
+                    <span>MQTT: <span id="mqtt-text">{{ broker }}</span></span>
+                </div>
+                <div class="status-item">
+                    <div class="status-indicator connected" id="app-status"></div>
+                    <span>Simulator: <span id="app-text">Running</span></span>
+                </div>
+                <div class="status-item">
+                    <span>💡 {{ light_devices|length }} Lights</span>
+                </div>
+                <div class="status-item">
+                    <span>🌡️ {{ thermostat_devices|length }} Thermostats</span>
+                </div>
+            </div>
+        </header>
+        
+        <div class="grid">
+            <div class="panel">
+                <h2>💡 Light Devices</h2>
+                <div class="device-list">
+                    {% for device_id in light_devices %}
+                    <div class="device-item light">
+                        <strong>{{ device_id }}</strong>
+                        <div id="light-{{ device_id }}" style="margin-top: 0.25rem; opacity: 0.8;">
+                            Power: off, Brightness: 50
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+            
+            <div class="panel">
+                <h2>🌡️ Thermostat Devices</h2>
+                <div class="device-list">
+                    {% for device_id in thermostat_devices %}
+                    <div class="device-item thermostat">
+                        <strong>{{ device_id }}</strong>
+                        <div id="thermo-{{ device_id }}" style="margin-top: 0.25rem; opacity: 0.8;">
+                            Mode: auto, Target: 21.0°C, Current: 20.5°C
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+            
+            <div class="panel events-panel">
+                <h2>📡 Real-time Events</h2>
+                <div class="stats">
+                    <div class="stat-card">
+                        <div class="stat-value" id="total-events">0</div>
+                        <div class="stat-label">Total Events</div>
+                    </div>
+                    <div class="stat-card">
+                        <div class="stat-value" id="commands-received">0</div>
+                        <div class="stat-label">Commands Received</div>
+                    </div>
+                    <div class="stat-card">
+                        <div class="stat-value" id="states-published">0</div>
+                        <div class="stat-label">States Published</div>
+                    </div>
+                </div>
+                
+                <div class="controls">
+                    <button class="primary" onclick="clearEvents()">Clear Events</button>
+                    <button class="primary" onclick="toggleAutoScroll()">
+                        <span id="autoscroll-text">Auto-scroll: ON</span>
+                    </button>
+                </div>
+                
+                <div class="event-list" id="event-list">
+                    <div class="empty-state">
+                        <p>Waiting for events...</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <script>
+        let eventSource = null;
+        let autoScroll = true;
+        let stats = {
+            total: 0,
+            commands: 0,
+            states: 0
+        };
+        
+        // Connect to SSE
+        function connectSSE() {
+            eventSource = new EventSource('/realtime');
+            
+            eventSource.onopen = () => {
+                console.log('SSE connected');
+                updateStatus('app', true, 'Running');
+            };
+            
+            eventSource.addEventListener('message', (e) => {
+                const event = JSON.parse(e.data);
+                handleEvent(event);
+            });
+            
+            eventSource.addEventListener('ping', (e) => {
+                console.log('Heartbeat received');
+            });
+            
+            eventSource.onerror = (error) => {
+                console.error('SSE error:', error);
+                updateStatus('app', false, 'Disconnected');
+                eventSource.close();
+                
+                // Reconnect after 5 seconds
+                setTimeout(connectSSE, 5000);
+            };
+        }
+        
+        function handleEvent(event) {
+            // Update stats
+            stats.total++;
+            if (event.type === 'command_received') stats.commands++;
+            if (event.type === 'state_published') stats.states++;
+            
+            document.getElementById('total-events').textContent = stats.total;
+            document.getElementById('commands-received').textContent = stats.commands;
+            document.getElementById('states-published').textContent = stats.states;
+            
+            // Update device states
+            if (event.type === 'light_updated' && event.new_state) {
+                updateLightState(event.device_id, event.new_state);
+            } else if (event.type === 'thermostat_updated' && event.new_state) {
+                updateThermostatState(event.device_id, event.new_state);
+            } else if (event.type === 'state_published') {
+                if (event.device_type === 'light') {
+                    updateLightState(event.device_id, event.payload);
+                } else if (event.device_type === 'thermostat') {
+                    updateThermostatState(event.device_id, event.payload);
+                }
+            } else if (event.type === 'simulator_connected') {
+                updateStatus('mqtt', true, event.broker);
+            }
+            
+            // Add to event list
+            addEventToList(event);
+        }
+        
+        function updateLightState(deviceId, state) {
+            const el = document.getElementById(`light-${deviceId}`);
+            if (el) {
+                el.textContent = `Power: ${state.power}, Brightness: ${state.brightness}`;
+            }
+        }
+        
+        function updateThermostatState(deviceId, state) {
+            const el = document.getElementById(`thermo-${deviceId}`);
+            if (el) {
+                el.textContent = `Mode: ${state.mode}, Target: ${state.target}°C, Current: ${state.current}°C`;
+            }
+        }
+        
+        function updateStatus(type, connected, text) {
+            const indicator = document.getElementById(`${type}-status`);
+            const textEl = document.getElementById(`${type}-text`);
+            
+            if (indicator) {
+                indicator.className = `status-indicator ${connected ? 'connected' : 'disconnected'}`;
+            }
+            if (textEl) {
+                textEl.textContent = text;
+            }
+        }
+        
+        function addEventToList(event) {
+            const eventList = document.getElementById('event-list');
+            
+            // Remove empty state
+            const emptyState = eventList.querySelector('.empty-state');
+            if (emptyState) {
+                emptyState.remove();
+            }
+            
+            const eventItem = document.createElement('div');
+            eventItem.className = `event-item ${event.type}`;
+            
+            const time = new Date(event.timestamp).toLocaleTimeString('de-DE');
+            const eventData = { ...event };
+            delete eventData.timestamp;
+            
+            eventItem.innerHTML = `
+                <div class="event-header">
+                    <span class="event-type">${event.type}</span>
+                    <span class="event-time">${time}</span>
+                </div>
+                <div class="event-data">${JSON.stringify(eventData, null, 2)}</div>
+            `;
+            
+            eventList.insertBefore(eventItem, eventList.firstChild);
+            
+            // Keep only last 50 events
+            while (eventList.children.length > 50) {
+                eventList.removeChild(eventList.lastChild);
+            }
+            
+            // Auto-scroll to top
+            if (autoScroll) {
+                eventList.scrollTop = 0;
+            }
+        }
+        
+        function clearEvents() {
+            const eventList = document.getElementById('event-list');
+            eventList.innerHTML = '<div class="empty-state"><p>Events cleared</p></div>';
+            stats = { total: 0, commands: 0, states: 0 };
+            document.getElementById('total-events').textContent = '0';
+            document.getElementById('commands-received').textContent = '0';
+            document.getElementById('states-published').textContent = '0';
+        }
+        
+        function toggleAutoScroll() {
+            autoScroll = !autoScroll;
+            document.getElementById('autoscroll-text').textContent = `Auto-scroll: ${autoScroll ? 'ON' : 'OFF'}`;
+        }
+        
+        // Initialize
+        connectSSE();
+    </script>
+</body>
+</html>

apps/ui/Dockerfile

@@ -0,0 +1,49 @@
+# UI Service Dockerfile
+# FastAPI + Jinja2 + HTMX Dashboard
+
+FROM python:3.14-alpine
+
+# Prevent Python from writing .pyc files and enable unbuffered output
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    UI_PORT=8002 \
+    API_BASE=http://api:8001 \
+    BASE_PATH=""
+
+# Create non-root user
+RUN addgroup -g 10001 -S app && \
+    adduser -u 10001 -S app -G app
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies
+RUN apk add --no-cache \
+    curl \
+    gcc \
+    musl-dev \
+    linux-headers
+
+# Install Python dependencies
+COPY apps/ui/requirements.txt /app/requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY apps/__init__.py /app/apps/__init__.py
+COPY apps/ui/ /app/apps/ui/
+
+# Change ownership to app user
+RUN chown -R app:app /app
+
+# Switch to non-root user
+USER app
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost:${UI_PORT}/health || exit 1
+
+# Expose port
+EXPOSE 8002
+
+# Run application
+CMD ["python", "-m", "uvicorn", "apps.ui.main:app", "--host", "0.0.0.0", "--port", "8002"]

apps/ui/README.md

@@ -27,6 +27,38 @@ poetry run uvicorn apps.ui.main:app --reload --port 8002
 poetry run python -m apps.ui.main
 ```
 
+### Docker Container
+
+#### Build Image
+
+```bash
+docker build -t ui:dev -f apps/ui/Dockerfile .
+```
+
+#### Run Container
+
+```bash
+docker run --rm -p 8002:8002 \
+  --add-host=host.docker.internal:host-gateway \
+  -e UI_PORT=8002 \
+  -e API_BASE=http://host.docker.internal:8001 \
+  -e BASE_PATH=/ \
+  ui:dev
+```
+
+**Note for finch/nerdctl users:**
+- finch binds ports to `127.0.0.1` by default (not `0.0.0.0`)
+- Use `--add-host=host.docker.internal:host-gateway` to allow container-to-host communication
+- Set `API_BASE=http://host.docker.internal:8001` to reach the API container
+
+#### Environment Variables
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `UI_PORT` | `8002` | Port for UI server |
+| `API_BASE` | `http://localhost:8001` | Base URL for API service |
+| `BASE_PATH` | `/` | Base path for routing |
+
 ## Project Structure
 
 ```

apps/ui/api_client.py

@@ -8,12 +8,12 @@ import httpx
 logger = logging.getLogger(__name__)
 
 
-def fetch_devices(api_base: str = "http://localhost:8001") -> list[dict]:
+def fetch_devices(api_base: str) -> list[dict]:
     """
     Fetch devices from the API Gateway.
     
     Args:
-        api_base: Base URL of the API Gateway (default: http://localhost:8001)
+        api_base: Base URL of the API Gateway (e.g., "http://localhost:8001" or "http://api:8001")
         
     Returns:
         List of device dictionaries. Each device contains at least:
@@ -56,12 +56,12 @@ def fetch_devices(api_base: str = "http://localhost:8001") -> list[dict]:
         return []
 
 
-def fetch_layout(api_base: str = "http://localhost:8001") -> dict:
+def fetch_layout(api_base: str) -> dict:
     """
     Fetch UI layout from the API Gateway.
     
     Args:
-        api_base: Base URL of the API Gateway (default: http://localhost:8001)
+        api_base: Base URL of the API Gateway (e.g., "http://localhost:8001" or "http://api:8001")
         
     Returns:
         Layout dictionary with structure:

apps/ui/main.py

@@ -1,10 +1,11 @@
 """UI main entry point."""
 
 import logging
+import os
 from pathlib import Path
 
 from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse
+from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
@@ -12,11 +13,30 @@ from apps.ui.api_client import fetch_devices, fetch_layout
 
 logger = logging.getLogger(__name__)
 
-# Initialize FastAPI app
+# Read configuration from environment variables
+API_BASE = os.getenv("API_BASE", "http://localhost:8001")
+BASE_PATH = os.getenv("BASE_PATH", "")  # e.g., "/ui" for reverse proxy
+
+print(f"UI using API_BASE: {API_BASE}")
+print(f"UI using BASE_PATH: {BASE_PATH}")
+
+def api_url(path: str) -> str:
+    """Helper function to construct API URLs.
+    
+    Args:
+        path: API path (e.g., "/devices")
+        
+    Returns:
+        Full API URL
+    """
+    return f"{API_BASE}{path}"
+
+# Initialize FastAPI app with optional root_path for reverse proxy
 app = FastAPI(
     title="Home Automation UI",
     description="User interface for home automation system",
-    version="0.1.0"
+    version="0.1.0",
+    root_path=BASE_PATH
 )
 
 # Setup Jinja2 templates
@@ -29,6 +49,21 @@ static_dir.mkdir(exist_ok=True)
 app.mount("/static", StaticFiles(directory=str(static_dir)), name="static")
 
 
+@app.get("/health")
+async def health() -> JSONResponse:
+    """Health check endpoint for Kubernetes/Docker.
+    
+    Returns:
+        JSONResponse: Health status
+    """
+    return JSONResponse({
+        "status": "ok",
+        "service": "ui",
+        "api_base": API_BASE,
+        "base_path": BASE_PATH
+    })
+
+
 @app.get("/", response_class=HTMLResponse)
 async def index(request: Request) -> HTMLResponse:
     """Redirect to dashboard.
@@ -39,7 +74,75 @@ async def index(request: Request) -> HTMLResponse:
     Returns:
         HTMLResponse: Rendered dashboard
     """
-    return await dashboard(request)
+    return await rooms(request)
+
+
+@app.get("/rooms", response_class=HTMLResponse)
+async def rooms(request: Request) -> HTMLResponse:
+    """Render the rooms overview page.
+    
+    Args:
+        request: The FastAPI request object
+        
+    Returns:
+        HTMLResponse: Rendered rooms template
+    """
+    return templates.TemplateResponse("rooms.html", {
+        "request": request,
+        "api_base": API_BASE
+    })
+
+
+@app.get("/room/{room_name}", response_class=HTMLResponse)
+async def room_detail(request: Request, room_name: str) -> HTMLResponse:
+    """Render the room detail page with devices.
+    
+    Args:
+        request: The FastAPI request object
+        room_name: Name of the room to display
+        
+    Returns:
+        HTMLResponse: Rendered room template
+    """
+    return templates.TemplateResponse("room.html", {
+        "request": request,
+        "api_base": API_BASE,
+        "room_name": room_name
+    })
+
+
+@app.get("/device/{device_id}", response_class=HTMLResponse)
+async def device_detail(request: Request, device_id: str) -> HTMLResponse:
+    """Render the device detail page with controls.
+    
+    Args:
+        request: The FastAPI request object
+        device_id: ID of the device to display
+        
+    Returns:
+        HTMLResponse: Rendered device template
+    """
+    return templates.TemplateResponse("device.html", {
+        "request": request,
+        "api_base": API_BASE,
+        "device_id": device_id
+    })
+
+
+@app.get("/garage", response_class=HTMLResponse)
+async def garage(request: Request) -> HTMLResponse:
+    """Render the garage page with car outlet devices.
+    
+    Args:
+        request: The FastAPI request object
+        
+    Returns:
+        HTMLResponse: Rendered garage template
+    """
+    return templates.TemplateResponse("garage.html", {
+        "request": request,
+        "api_base": API_BASE
+    })
 
 
 @app.get("/dashboard", response_class=HTMLResponse)
@@ -53,11 +156,11 @@ async def dashboard(request: Request) -> HTMLResponse:
         HTMLResponse: Rendered dashboard template
     """
     try:
-        # Load layout from API
-        layout_data = fetch_layout()
+        # Load layout from API (use configured API_BASE)
+        layout_data = fetch_layout(API_BASE)
         
         # Fetch devices from API (now includes features)
-        api_devices = fetch_devices()
+        api_devices = fetch_devices(API_BASE)
         
         # Create device lookup by device_id
         device_map = {d["device_id"]: d for d in api_devices}
@@ -98,7 +201,8 @@ async def dashboard(request: Request) -> HTMLResponse:
         
         return templates.TemplateResponse("dashboard.html", {
             "request": request,
-            "rooms": rooms
+            "rooms": rooms,
+            "api_base": API_BASE  # Pass API_BASE to template
         })
         
     except Exception as e:
@@ -106,7 +210,8 @@ async def dashboard(request: Request) -> HTMLResponse:
         # Fallback to empty dashboard
         return templates.TemplateResponse("dashboard.html", {
             "request": request,
-            "rooms": []
+            "rooms": [],
+            "api_base": API_BASE  # Pass API_BASE even on error
         })
 
 

apps/ui/requirements.txt

@@ -0,0 +1,4 @@
+fastapi==0.104.1
+uvicorn[standard]==0.24.0
+jinja2==3.1.2
+httpx==0.25.1

apps/ui/static/README.md

@@ -0,0 +1,301 @@
+# Home Automation API Client
+
+Wiederverwendbare JavaScript-API-Client-Bibliothek für das Home Automation UI.
+
+## Installation
+
+Füge die folgenden Script-Tags in deine HTML-Seiten ein:
+
+```html
+<script src="/static/types.js"></script>
+<script src="/static/api-client.js"></script>
+```
+
+## Konfiguration
+
+Der API-Client nutzt `window.API_BASE`, das vom Backend gesetzt wird:
+
+```javascript
+window.API_BASE = '{{ api_base }}';  // Jinja2 template
+```
+
+## Verwendung
+
+### Globale Instanz
+
+Der API-Client erstellt automatisch eine globale Instanz `window.apiClient`:
+
+```javascript
+// Layout abrufen
+const layout = await window.apiClient.getLayout();
+
+// Geräte abrufen
+const devices = await window.apiClient.getDevices();
+
+// Gerätestatus abrufen
+const state = await window.apiClient.getDeviceState('kitchen_light');
+
+// Gerätesteuerung
+await window.apiClient.setDeviceState('kitchen_light', 'light', {
+    power: true,
+    brightness: 80
+});
+```
+
+### Verfügbare Methoden
+
+#### `getLayout(): Promise<Layout>`
+Lädt die Layout-Daten (Räume und ihre Geräte).
+
+```javascript
+const layout = await window.apiClient.getLayout();
+// { rooms: [{name: "Küche", devices: ["kitchen_light", ...]}, ...] }
+```
+
+#### `getDevices(): Promise<Device[]>`
+Lädt alle Geräte mit ihren Features.
+
+```javascript
+const devices = await window.apiClient.getDevices();
+// [{device_id: "...", name: "...", type: "light", features: {...}}, ...]
+```
+
+#### `getDeviceState(deviceId): Promise<DeviceState>`
+Lädt den aktuellen Status eines Geräts.
+
+```javascript
+const state = await window.apiClient.getDeviceState('kitchen_light');
+// {power: true, brightness: 80, ...}
+```
+
+#### `getAllStates(): Promise<Object>`
+Lädt alle Gerätestatus auf einmal.
+
+```javascript
+const states = await window.apiClient.getAllStates();
+// {"kitchen_light": {power: true, ...}, "thermostat_1": {...}, ...}
+```
+
+#### `setDeviceState(deviceId, type, payload): Promise<void>`
+Sendet einen Befehl an ein Gerät.
+
+```javascript
+// Licht einschalten
+await window.apiClient.setDeviceState('kitchen_light', 'light', {
+    power: true,
+    brightness: 80
+});
+
+// Thermostat einstellen
+await window.apiClient.setDeviceState('thermostat_1', 'thermostat', {
+    target_temp: 22.5
+});
+
+// Rollladen steuern
+await window.apiClient.setDeviceState('cover_1', 'cover', {
+    position: 50
+});
+```
+
+#### `getDeviceRoom(deviceId): Promise<{room: string}>`
+Ermittelt den Raum eines Geräts.
+
+```javascript
+const { room } = await window.apiClient.getDeviceRoom('kitchen_light');
+// {room: "Küche"}
+```
+
+#### `getScenes(): Promise<Scene[]>`
+Lädt alle verfügbaren Szenen.
+
+```javascript
+const scenes = await window.apiClient.getScenes();
+```
+
+#### `activateScene(sceneId): Promise<void>`
+Aktiviert eine Szene.
+
+```javascript
+await window.apiClient.activateScene('evening');
+```
+
+### Realtime-Updates (SSE)
+
+#### `connectRealtime(onEvent, onError): EventSource`
+Verbindet sich mit dem SSE-Stream für Live-Updates.
+
+```javascript
+window.apiClient.connectRealtime(
+    (event) => {
+        console.log('Update:', event.device_id, event.state);
+        // event = {device_id: "...", type: "state", state: {...}}
+    },
+    (error) => {
+        console.error('Connection error:', error);
+    }
+);
+```
+
+#### `onDeviceUpdate(deviceId, callback): Function`
+Registriert einen Listener für spezifische Geräte-Updates.
+
+```javascript
+// Für ein bestimmtes Gerät
+const unsubscribe = window.apiClient.onDeviceUpdate('kitchen_light', (event) => {
+    console.log('Kitchen light changed:', event.state);
+    updateUI(event.state);
+});
+
+// Für alle Geräte
+const unsubscribeAll = window.apiClient.onDeviceUpdate(null, (event) => {
+    console.log('Any device changed:', event.device_id, event.state);
+});
+
+// Später: Listener entfernen
+unsubscribe();
+```
+
+#### `disconnectRealtime(): void`
+Trennt die SSE-Verbindung und entfernt alle Listener.
+
+```javascript
+window.apiClient.disconnectRealtime();
+```
+
+### Helper-Methoden
+
+#### `findDevice(devices, deviceId): Device|null`
+Findet ein Gerät in einem Array.
+
+```javascript
+const devices = await window.apiClient.getDevices();
+const device = window.apiClient.findDevice(devices, 'kitchen_light');
+```
+
+#### `findRoom(layout, roomName): Room|null`
+Findet einen Raum im Layout.
+
+```javascript
+const layout = await window.apiClient.getLayout();
+const room = window.apiClient.findRoom(layout, 'Küche');
+```
+
+#### `getDevicesForRoom(layout, devices, roomName): Device[]`
+Gibt alle Geräte eines Raums zurück.
+
+```javascript
+const layout = await window.apiClient.getLayout();
+const devices = await window.apiClient.getDevices();
+const kitchenDevices = window.apiClient.getDevicesForRoom(layout, devices, 'Küche');
+```
+
+#### `api(path): string`
+Konstruiert eine vollständige API-URL.
+
+```javascript
+const url = window.apiClient.api('/devices');
+// "http://172.19.1.11:8001/devices"
+```
+
+### Backward Compatibility
+
+Die globale `api()` Funktion ist weiterhin verfügbar:
+
+```javascript
+function api(url) {
+    return window.apiClient.api(url);
+}
+```
+
+## Typen (JSDoc)
+
+Die Datei `types.js` enthält JSDoc-Definitionen für alle API-Typen:
+
+- `Room` - Raum mit Geräten
+- `Layout` - Layout-Struktur
+- `Device` - Gerätedaten
+- `DeviceFeatures` - Geräte-Features
+- `DeviceState` - Gerätestatus (Light, Thermostat, Contact, etc.)
+- `RealtimeEvent` - SSE-Event-Format
+- `Scene` - Szenen-Definition
+- `*Payload` - Command-Payloads für verschiedene Gerätetypen
+
+Diese ermöglichen IDE-Autocomplete und Type-Checking in modernen Editoren (VS Code, WebStorm).
+
+## Beispiel: Vollständige Seite
+
+```html
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <title>My Page</title>
+    <script src="/static/types.js"></script>
+    <script src="/static/api-client.js"></script>
+</head>
+<body>
+    <div id="status"></div>
+    <button id="toggle">Toggle Light</button>
+
+    <script>
+        window.API_BASE = 'http://172.19.1.11:8001';
+        const deviceId = 'kitchen_light';
+
+        async function init() {
+            // Load initial state
+            const state = await window.apiClient.getDeviceState(deviceId);
+            updateUI(state);
+
+            // Listen for updates
+            window.apiClient.onDeviceUpdate(deviceId, (event) => {
+                updateUI(event.state);
+            });
+
+            // Connect to realtime
+            window.apiClient.connectRealtime((event) => {
+                console.log('Event:', event);
+            });
+
+            // Handle button clicks
+            document.getElementById('toggle').onclick = async () => {
+                const currentState = await window.apiClient.getDeviceState(deviceId);
+                await window.apiClient.setDeviceState(deviceId, 'light', {
+                    power: !currentState.power
+                });
+            };
+        }
+
+        function updateUI(state) {
+            document.getElementById('status').textContent = 
+                state.power ? 'ON' : 'OFF';
+        }
+
+        init();
+    </script>
+</body>
+</html>
+```
+
+## Error Handling
+
+Alle API-Methoden werfen Exceptions bei Fehlern:
+
+```javascript
+try {
+    const state = await window.apiClient.getDeviceState('invalid_id');
+} catch (error) {
+    console.error('API error:', error);
+    showErrorMessage(error.message);
+}
+```
+
+## Auto-Reconnect
+
+Der SSE-Client versucht automatisch, nach 5 Sekunden wieder zu verbinden, wenn die Verbindung abbricht.
+
+## Verwendete Technologien
+
+- **Fetch API** - Für HTTP-Requests
+- **EventSource** - Für Server-Sent Events
+- **JSDoc** - Für Type Definitions
+- **ES6+** - Modern JavaScript (Class, async/await, etc.)

apps/ui/static/api-client.js

@@ -0,0 +1,290 @@
+/**
+ * Home Automation API Client
+ * 
+ * Provides a unified interface to interact with the backend API.
+ * All functions use the global window.API_BASE configuration.
+ */
+
+class HomeAutomationClient {
+    /**
+     * Get layout info for a specific device
+     * @param {string} deviceId - Device ID
+     * @returns {Promise<object>} Layout info
+     */
+    async getDeviceLayout(deviceId) {
+        return await this.fetch(this.api(`/devices/${deviceId}/layout`));
+    }
+    constructor() {
+        this.eventSource = null;
+        this.eventListeners = [];
+    }
+
+    /**
+     * Helper to construct full API URLs
+     * Reads window.API_BASE at runtime to support dynamic configuration
+     * @param {string} path - API path (e.g., '/devices')
+     * @returns {string} Full URL
+     */
+    api(path) {
+        const baseUrl = window.API_BASE || '';
+        return `${baseUrl}${path}`;
+    }
+
+    /**
+     * Generic fetch wrapper with error handling
+     * @param {string} url - URL to fetch
+     * @param {object} options - Fetch options
+     * @returns {Promise<any>} Response data
+     */
+    async fetch(url, options = {}) {
+        try {
+            const response = await fetch(url, {
+                ...options,
+                headers: {
+                    'Content-Type': 'application/json',
+                    ...options.headers
+                }
+            });
+
+            if (!response.ok) {
+                throw new Error(`API error: ${response.status} ${response.statusText}`);
+            }
+
+            return await response.json();
+        } catch (error) {
+            console.error('API request failed:', error);
+            throw error;
+        }
+    }
+
+    /**
+     * Get layout data (rooms and their devices)
+     * @returns {Promise<{rooms: Array<{name: string, devices: string[]}>}>}
+     */
+    async getLayout() {
+        return await this.fetch(this.api('/layout'));
+    }
+
+    /**
+     * Get all devices with their features
+     * @returns {Promise<Array<{device_id: string, name: string, type: string, features: object}>>}
+     */
+    async getDevices() {
+        return await this.fetch(this.api('/devices'));
+    }
+
+    async getDevice(deviceId) {
+        return await this.fetch(this.api(`/devices/${deviceId}`));
+    }
+
+    /**
+     * Get current state of a specific device
+     * @param {string} deviceId - Device ID
+     * @returns {Promise<object>} Device state
+     */
+    async getDeviceState(deviceId) {
+        return await this.fetch(this.api(`/devices/${deviceId}/state`));
+    }
+
+    /**
+     * Get all device states at once
+     * @returns {Promise<object>} Map of device_id to state
+     */
+    async getAllStates() {
+        return await this.fetch(this.api('/devices/states'));
+    }
+
+    /**
+     * Send a command to a device
+     * @param {string} deviceId - Device ID
+     * @param {string} type - Device type (light, thermostat, etc.)
+     * @param {object} payload - Command payload
+     * @returns {Promise<void>}
+     */
+    async setDeviceState(deviceId, type, payload) {
+        const requestBody = { type, payload };
+        console.log('API setDeviceState request:', requestBody);
+        await fetch(this.api(`/devices/${deviceId}/set`), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(requestBody)
+        });
+    }
+
+    /**
+     * Get room information for a device
+     * @param {string} deviceId - Device ID
+     * @returns {Promise<{room: string}>}
+     */
+    async getDeviceRoom(deviceId) {
+        return await this.fetch(this.api(`/devices/${deviceId}/room`));
+    }
+
+    /**
+     * Get all available scenes
+     * @returns {Promise<Array<{scene_id: string, name: string, devices: object}>>}
+     */
+    async getScenes() {
+        return await this.fetch(this.api('/scenes'));
+    }
+
+    /**
+     * Activate a scene
+     * @param {string} sceneId - Scene ID
+     * @returns {Promise<void>}
+     */
+    async activateScene(sceneId) {
+        await fetch(this.api(`/scenes/${sceneId}/activate`), {
+            method: 'POST'
+        });
+    }
+
+    /**
+     * Connect to realtime event stream (SSE)
+     * @param {Function} onEvent - Callback function(event)
+     * @param {Function} onError - Error callback (optional)
+     * @returns {EventSource} EventSource instance
+     */
+    connectRealtime(onEvent, onError = null) {
+        if (this.eventSource) {
+            this.eventSource.close();
+        }
+
+        const realtimeUrl = this.api('/realtime');
+        console.log('Connecting to SSE endpoint:', realtimeUrl);
+        this.eventSource = new EventSource(realtimeUrl);
+
+        this.eventSource.onmessage = (event) => {
+            console.log('Raw SSE event received:', event.data);
+            try {
+                const data = JSON.parse(event.data);
+                console.log('Parsed SSE data:', data);
+                
+                // Normalize event format: convert API format to unified format
+                const normalizedEvent = {
+                    device_id: data.device_id,
+                    type: data.type,
+                    state: data.payload || data.state  // Support both formats
+                };
+                
+                console.log('Normalized SSE event:', normalizedEvent);
+                onEvent(normalizedEvent);
+                
+                // Notify all registered listeners
+                this.eventListeners.forEach(listener => {
+                    if (!listener.deviceId || listener.deviceId === normalizedEvent.device_id) {
+                        listener.callback(normalizedEvent);
+                    }
+                });
+            } catch (error) {
+                console.error('Failed to parse SSE event:', error, 'Raw data:', event.data);
+            }
+        };
+
+        this.eventSource.onopen = (event) => {
+            console.log('SSE connection opened:', event);
+        };
+
+        this.eventSource.onerror = (error) => {
+            console.error('SSE connection error:', error);
+            console.log('EventSource readyState:', this.eventSource.readyState);
+            if (onError) {
+                onError(error);
+            }
+            
+            // Auto-reconnect after 5 seconds
+            setTimeout(() => {
+                if (this.eventSource) {
+                    this.eventSource.close();
+                    this.connectRealtime(onEvent, onError);
+                }
+            }, 5000);
+        };
+
+        return this.eventSource;
+    }
+
+    /**
+     * Register a listener for specific device updates
+     * @param {string|null} deviceId - Device ID or null for all devices
+     * @param {Function} callback - Callback function(event)
+     * @returns {Function} Unsubscribe function
+     */
+    onDeviceUpdate(deviceId, callback) {
+        const listener = { deviceId, callback };
+        this.eventListeners.push(listener);
+
+        // Return unsubscribe function
+        return () => {
+            const index = this.eventListeners.indexOf(listener);
+            if (index > -1) {
+                this.eventListeners.splice(index, 1);
+            }
+        };
+    }
+
+    /**
+     * Disconnect from realtime stream
+     */
+    disconnectRealtime() {
+        if (this.eventSource) {
+            this.eventSource.close();
+            this.eventSource = null;
+        }
+        this.eventListeners = [];
+    }
+
+    /**
+     * Helper: Get device by ID from devices array
+     * @param {Array} devices - Devices array
+     * @param {string} deviceId - Device ID to find
+     * @returns {object|null} Device object or null
+     */
+    findDevice(devices, deviceId) {
+        return devices.find(d => d.device_id === deviceId) || null;
+    }
+
+    /**
+     * Helper: Get room by name from layout
+     * @param {object} layout - Layout object
+     * @param {string} roomName - Room name to find
+     * @returns {object|null} Room object or null
+     */
+    findRoom(layout, roomName) {
+        return layout.rooms.find(r => r.name === roomName) || null;
+    }
+
+    /**
+     * Helper: Get devices for a specific room
+     * @param {object} layout - Layout object
+     * @param {Array} devices - Devices array
+     * @param {string} roomName - Room name
+     * @returns {Array} Array of device objects
+     */
+    getDevicesForRoom(layout, devices, roomName) {
+        const room = this.findRoom(layout, roomName);
+        if (!room) return [];
+
+        const deviceMap = {};
+        devices.forEach(d => deviceMap[d.device_id] = d);
+
+        // Extract device IDs from room.devices (they are objects with device_id property)
+        const deviceIds = room.devices.map(d => d.device_id || d);
+        
+        return deviceIds
+            .map(id => deviceMap[id])
+            .filter(d => d != null);
+    }
+}
+
+// Create global instance
+window.apiClient = new HomeAutomationClient();
+
+/**
+ * Convenience function for backward compatibility
+ */
+function api(url) {
+    return window.apiClient.api(url);
+}

apps/ui/static/apple-touch-icon.svg

@@ -0,0 +1,4 @@
+<svg width="180" height="180" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="180" height="180" rx="40" fill="#667EEA"/>
+<text x="90" y="130" font-size="80" text-anchor="middle" fill="white">🏡</text>
+</svg>

apps/ui/static/favicon.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <!-- Roof -->
+  <path d="M50 10 L90 45 L85 45 L85 50 L15 50 L15 45 L10 45 Z" fill="#667eea" stroke="#4c51bf" stroke-width="2" stroke-linejoin="round"/>
+  <!-- House body -->
+  <rect x="15" y="45" width="70" height="45" fill="#764ba2" stroke="#4c51bf" stroke-width="2"/>
+  <!-- Door -->
+  <rect x="35" y="60" width="15" height="30" fill="#4c51bf" rx="2"/>
+  <!-- Window -->
+  <rect x="60" y="60" width="20" height="15" fill="#fbbf24" stroke="#f59e0b" stroke-width="1"/>
+  <!-- Window panes -->
+  <line x1="70" y1="60" x2="70" y2="75" stroke="#f59e0b" stroke-width="1"/>
+  <line x1="60" y1="67.5" x2="80" y2="67.5" stroke="#f59e0b" stroke-width="1"/>
+</svg>

apps/ui/static/garage-icon.svg

@@ -0,0 +1,4 @@
+<svg width="180" height="180" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="180" height="180" rx="40" fill="#667EEA"/>
+<text x="90" y="130" font-size="80" text-anchor="middle" fill="white">🚗</text>
+</svg>

apps/ui/static/types.js

@@ -0,0 +1,166 @@
+/**
+ * Type definitions for Home Automation API
+ * 
+ * These are JSDoc type definitions that provide IDE autocomplete
+ * and type checking in JavaScript files.
+ */
+
+/**
+ * @typedef {Object} Room
+ * @property {string} name - Room name (e.g., "Küche", "Wohnzimmer")
+ * @property {Array<{device_id: string, title: string, icon: string, rank: number}>} devices - Array of device objects in this room
+ */
+
+/**
+ * @typedef {Object} Layout
+ * @property {Room[]} rooms - Array of rooms with their devices
+ */
+
+/**
+ * @typedef {Object} DeviceFeatures
+ * @property {boolean} [dimmable] - Light: supports brightness control
+ * @property {boolean} [color_hsb] - Light: supports HSB color control
+ * @property {boolean} [color_temp] - Light: supports color temperature
+ * @property {number} [min_temp] - Thermostat: minimum temperature
+ * @property {number} [max_temp] - Thermostat: maximum temperature
+ * @property {number} [step] - Thermostat: temperature step size
+ */
+
+/**
+ * @typedef {Object} Device
+ * @property {string} device_id - Unique device identifier
+ * @property {string} name - Human-readable device name
+ * @property {string} type - Device type: light, thermostat, contact, temp_humidity_sensor, relay, outlet, cover
+ * @property {DeviceFeatures} features - Device-specific features
+ */
+
+/**
+ * @typedef {Object} LightState
+ * @property {boolean} power - On/off state
+ * @property {number} [brightness] - Brightness 0-100 (if dimmable)
+ * @property {Object} [color_hsb] - HSB color (if color_hsb)
+ * @property {number} color_hsb.hue - Hue 0-360
+ * @property {number} color_hsb.saturation - Saturation 0-100
+ * @property {number} color_hsb.brightness - Brightness 0-100
+ * @property {number} [color_temp] - Color temperature in mireds (if color_temp)
+ */
+
+/**
+ * @typedef {Object} ThermostatState
+ * @property {number} current_temp - Current temperature in °C
+ * @property {number} target_temp - Target temperature in °C
+ * @property {string} mode - Operating mode: heat, cool, auto, off
+ */
+
+/**
+ * @typedef {Object} ContactState
+ * @property {boolean} open - true if open, false if closed
+ */
+
+/**
+ * @typedef {Object} TempHumidityState
+ * @property {number} temperature - Temperature in °C
+ * @property {number} humidity - Relative humidity 0-100%
+ */
+
+/**
+ * @typedef {Object} RelayState
+ * @property {boolean} power - On/off state
+ */
+
+/**
+ * @typedef {Object} OutletState
+ * @property {boolean} power - On/off state
+ */
+
+/**
+ * @typedef {Object} CoverState
+ * @property {number} position - Position 0-100 (0=closed, 100=open)
+ * @property {string} state - State: open, closed, opening, closing, stopped
+ */
+
+/**
+ * @typedef {LightState|ThermostatState|ContactState|TempHumidityState|RelayState|OutletState|CoverState} DeviceState
+ */
+
+/**
+ * @typedef {Object} RealtimeEvent
+ * @property {string} device_id - Device that changed
+ * @property {string} type - Device type
+ * @property {DeviceState} state - New device state
+ */
+
+/**
+ * @typedef {Object} Scene
+ * @property {string} scene_id - Unique scene identifier
+ * @property {string} name - Human-readable scene name
+ * @property {Object<string, Object>} devices - Map of device_id to desired state
+ */
+
+/**
+ * @typedef {Object} LightPayload
+ * @property {boolean} [power] - Turn on/off
+ * @property {number} [brightness] - Set brightness 0-100
+ * @property {Object} [color_hsb] - Set HSB color
+ * @property {number} color_hsb.hue - Hue 0-360
+ * @property {number} color_hsb.saturation - Saturation 0-100
+ * @property {number} color_hsb.brightness - Brightness 0-100
+ */
+
+/**
+ * @typedef {Object} ThermostatPayload
+ * @property {number} [target_temp] - Set target temperature
+ * @property {string} [mode] - Set mode: heat, cool, auto, off
+ */
+
+/**
+ * @typedef {Object} RelayPayload
+ * @property {boolean} power - Turn on/off
+ */
+
+/**
+ * @typedef {Object} OutletPayload
+ * @property {boolean} power - Turn on/off
+ */
+
+/**
+ * @typedef {Object} CoverPayload
+ * @property {number} [position] - Set position 0-100
+ * @property {string} [action] - Action: open, close, stop
+ */
+
+/**
+ * Example usage:
+ * 
+ * // Get layout data
+ * const layout = await window.apiClient.getLayout();
+ * // layout is typed as Layout
+ * 
+ * // Get devices
+ * const devices = await window.apiClient.getDevices();
+ * // devices is typed as Device[]
+ * 
+ * // Get device state
+ * const state = await window.apiClient.getDeviceState('kitchen_light');
+ * // state is typed as DeviceState
+ * 
+ * // Set device state
+ * await window.apiClient.setDeviceState('kitchen_light', 'light', {
+ *     power: true,
+ *     brightness: 80
+ * });
+ * 
+ * // Connect to realtime events
+ * window.apiClient.connectRealtime((event) => {
+ *     console.log('Device update:', event.device_id, event.state);
+ * });
+ * 
+ * // Listen to specific device
+ * const unsubscribe = window.apiClient.onDeviceUpdate('kitchen_light', (event) => {
+ *     console.log('Kitchen light changed:', event.state);
+ * });
+ * 
+ * // Later: cleanup
+ * unsubscribe();
+ * window.apiClient.disconnectRealtime();
+ */

apps/ui/templates/garage.html

@@ -0,0 +1,693 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Garage - Home Automation</title>
+    
+    <!-- Apple Touch Icon -->
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/garage-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/garage-icon.png">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="default">
+    <meta name="apple-mobile-web-app-title" content="Garage">
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            min-height: 100vh;
+            padding: 20px;
+        }
+
+        .container {
+            max-width: 800px;
+            margin: 0 auto;
+            padding-top: 20px;
+        }
+
+        .devices-container {
+            display: grid;
+            grid-template-columns: 1fr;
+            gap: 20px;
+        }
+
+        .device-section {
+            background: rgba(255, 255, 255, 0.95);
+            border-radius: 12px;
+            padding: 16px;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .device-header {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+            margin-bottom: 20px;
+        }
+
+        .device-icon {
+            font-size: 32px;
+        }
+
+        .device-info {
+            flex: 1;
+        }
+
+        .device-name {
+            font-size: 18px;
+            font-weight: 600;
+            color: #333;
+            margin: 0 0 4px 0;
+        }
+
+        .device-type {
+            font-size: 14px;
+            color: #666;
+            margin: 0;
+        }
+
+        .card {
+            background: #f8f9fa;
+            border-radius: 8px;
+            padding: 16px;
+            margin-bottom: 16px;
+        }
+
+        .card:last-child {
+            margin-bottom: 0;
+        }
+
+        .card-title {
+            font-size: 16px;
+            font-weight: 600;
+            color: #333;
+            margin-bottom: 12px;
+        }
+
+        .state-grid {
+            display: grid;
+            grid-template-columns: repeat(2, 1fr);
+            gap: 16px;
+        }
+
+        .state-item {
+            text-align: center;
+        }
+
+        .state-value {
+            font-size: 20px;
+            font-weight: 600;
+            color: #667eea;
+            margin-bottom: 2px;
+        }
+
+        .state-label {
+            font-size: 14px;
+            color: #666;
+        }
+
+        .control-group {
+            margin-bottom: 20px;
+        }
+
+        .control-group:last-child {
+            margin-bottom: 0;
+        }
+
+        .control-label {
+            font-size: 14px;
+            font-weight: 500;
+            color: #333;
+            margin-bottom: 8px;
+            display: block;
+        }
+
+        .button-group {
+            display: flex;
+            gap: 8px;
+        }
+
+        .toggle-switch {
+            position: relative;
+            display: inline-block;
+            width: 100px;
+            height: 50px;
+            background: #e0e0e0;
+            border-radius: 25px;
+            cursor: pointer;
+            transition: background 0.3s ease;
+            border: none;
+            outline: none;
+        }
+
+        .toggle-switch.on {
+            background: #34c759;
+        }
+
+        .toggle-switch::after {
+            content: '';
+            position: absolute;
+            top: 4px;
+            left: 4px;
+            width: 42px;
+            height: 42px;
+            background: white;
+            border-radius: 50%;
+            transition: transform 0.3s ease;
+            box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
+        }
+
+        .toggle-switch.on::after {
+            transform: translateX(50px);
+        }
+
+        .toggle-switch:hover {
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+        }
+
+        .toggle-switch:active::after {
+            width: 50px;
+        }
+
+        .toggle-label {
+            display: block;
+            text-align: center;
+            margin-top: 8px;
+            font-size: 14px;
+            font-weight: 500;
+            color: #666;
+        }
+
+        .phase-grid {
+            display: grid;
+            grid-template-columns: repeat(3, 1fr);
+            gap: 12px;
+        }
+
+        .phase-section h4 {
+            color: #333;
+            margin-bottom: 8px;
+            text-align: center;
+            font-size: 14px;
+        }
+
+        .phase-values {
+            display: flex;
+            flex-direction: column;
+            gap: 6px;
+        }
+
+        .phase-row {
+            display: flex;
+            gap: 6px;
+        }
+
+        .phase-value.full-width {
+            flex: 1;
+        }
+
+        .phase-value.half-width {
+            flex: 1;
+        }
+
+        .phase-value {
+            display: flex;
+            justify-content: space-between;
+            padding: 6px 10px;
+            background: rgba(102, 126, 234, 0.1);
+            border-radius: 6px;
+        }
+
+        .phase-value .value {
+            font-weight: 600;
+            color: #667eea;
+        }
+
+        .phase-value .unit {
+            color: #666;
+            font-size: 14px;
+        }
+
+        @media (max-width: 768px) {
+            .phase-grid {
+                grid-template-columns: 1fr;
+                gap: 8px;
+            }
+            
+            .container {
+                padding: 8px;
+                gap: 8px;
+            }
+            
+            .device-section {
+                padding: 12px;
+            }
+            
+            .state-value {
+                font-size: 18px;
+            }
+            
+            .phase-value {
+                padding: 4px 8px;
+            }
+            
+            .phase-values {
+                gap: 4px;
+            }
+            
+            .phase-row {
+                gap: 4px;
+            }
+        }
+
+        .loading {
+            text-align: center;
+            color: white;
+            font-size: 18px;
+            padding: 40px;
+        }
+
+        .error {
+            background: rgba(255, 59, 48, 0.9);
+            color: white;
+            padding: 16px;
+            border-radius: 8px;
+            text-align: center;
+            margin-bottom: 20px;
+        }
+        
+        #error-container:empty {
+            margin-bottom: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div id="error-container"></div>
+        <div id="loading" class="loading">Lade Geräte...</div>
+        <div id="devices-container" class="devices-container" style="display: none;"></div>
+    </div>
+
+    <script>
+        // API configuration from backend
+        window.API_BASE = '{{ api_base }}';
+    </script>
+    
+    <!-- Load API client AFTER API_BASE is set -->
+    <script src="/static/types.js"></script>
+    <script src="/static/api-client.js"></script>
+    
+    <script>
+        // Device IDs for garage devices
+        const GARAGE_DEVICES = [
+            'power_relay_caroutlet',
+            'powermeter_caroutlet'
+        ];
+
+        // Device states
+        const deviceStates = {};
+        let devicesData = {};
+
+        async function loadGarageDevices() {
+            const loading = document.getElementById('loading');
+            const container = document.getElementById('devices-container');
+            const errorContainer = document.getElementById('error-container');
+
+            try {
+                // Load all devices using API client
+                const allDevices = await window.apiClient.getDevices();
+                console.log('All devices loaded:', allDevices.length);
+
+                // Filter garage devices
+                const garageDevices = allDevices.filter(device => 
+                    GARAGE_DEVICES.includes(device.device_id)
+                );
+
+                console.log('Garage devices found:', garageDevices);
+
+                if (garageDevices.length === 0) {
+                    throw new Error('Keine Garage-Geräte gefunden');
+                }
+
+                // Create device lookup
+                garageDevices.forEach(device => {
+                    devicesData[device.device_id] = device;
+                });
+
+                // Load device states
+                for (const device of garageDevices) {
+                    try {
+                        deviceStates[device.device_id] = await window.apiClient.getDeviceState(device.device_id);
+                        console.log(`State for ${device.device_id}:`, deviceStates[device.device_id]);
+                    } catch (err) {
+                        console.warn(`Failed to load state for ${device.device_id}:`, err);
+                        deviceStates[device.device_id] = null;
+                    }
+                }
+
+                loading.style.display = 'none';
+                container.style.display = 'grid';
+
+                // Render only the relay device (it will include the powermeter)
+                const relayDevice = garageDevices.find(d => d.device_id === 'power_relay_caroutlet');
+                if (relayDevice) {
+                    const deviceSection = createDeviceSection(relayDevice);
+                    container.appendChild(deviceSection);
+                }
+
+                // Start SSE for live updates
+                connectRealtime();
+
+            } catch (error) {
+                console.error('Error loading garage devices:', error);
+                loading.style.display = 'none';
+                errorContainer.innerHTML = `
+                    <div class="error">
+                        ⚠️ Fehler beim Laden: ${error.message}
+                    </div>
+                `;
+            }
+        }
+
+        function createDeviceSection(device) {
+            const fragment = document.createDocumentFragment();
+            
+            // Create separate sections for each component
+            renderDeviceContent(fragment, device);
+            
+            return fragment;
+        }
+
+        function renderDeviceContent(container, device) {
+            // Render all content as separate device sections for Car Outlet
+            if (device.device_id === 'power_relay_caroutlet') {
+                // 1. Header section
+                const headerSection = document.createElement('div');
+                headerSection.className = 'device-section';
+                headerSection.innerHTML = `
+                    <div style="display: flex; align-items: center; justify-content: center; gap: 12px;">
+                        <div style="font-size: 32px;">⚡</div>
+                        <div style="font-size: 20px; font-weight: 600; color: #333;">Car Outlet</div>
+                    </div>
+                `;
+                container.appendChild(headerSection);
+
+                // 2. Control section
+                const controlSection = document.createElement('div');
+                controlSection.className = 'device-section';
+                controlSection.dataset.deviceId = device.device_id;
+                renderOutletControls(controlSection, device);
+                container.appendChild(controlSection);
+
+                // 3. Powermeter section
+                const powermeterDevice = Object.values(devicesData).find(d => d.device_id === 'powermeter_caroutlet');
+                if (powermeterDevice) {
+                    const powermeterSection = document.createElement('div');
+                    powermeterSection.className = 'device-section';
+                    renderThreePhasePowerDisplay(powermeterSection, powermeterDevice);
+                    container.appendChild(powermeterSection);
+                }
+            }
+        }
+
+        function renderOutletControls(container, device) {
+            const controlGroup = document.createElement('div');
+            controlGroup.style.textAlign = 'center';
+            // controlGroup.style.marginBottom = '8px';
+
+            const state = deviceStates[device.device_id];
+            const currentPower = state?.power === 'on';
+
+            const toggleSwitch = document.createElement('button');
+            toggleSwitch.className = `toggle-switch ${currentPower ? 'on' : ''}`;
+            toggleSwitch.onclick = () => {
+                const currentState = deviceStates[device.device_id]?.power === 'on';
+                toggleOutlet(device.device_id, currentState ? 'off' : 'on');
+            };
+
+            const label = document.createElement('div');
+            label.className = 'toggle-label';
+            label.textContent = currentPower ? 'Ein' : 'Aus';
+
+            // Status display
+            // const stateDisplay = document.createElement('div');
+            // stateDisplay.style.marginTop = '16px';
+            // stateDisplay.style.fontSize = '18px';
+            // stateDisplay.style.fontWeight = '600';
+            // stateDisplay.style.color = currentPower ? '#34c759' : '#666';
+            // stateDisplay.textContent = `Status: ${currentPower ? 'Eingeschaltet' : 'Ausgeschaltet'}`;
+
+            controlGroup.appendChild(toggleSwitch);
+            controlGroup.appendChild(label);
+            // controlGroup.appendChild(stateDisplay);
+
+            container.appendChild(controlGroup);
+        }
+
+
+
+        function renderThreePhasePowerDisplay(container, device) {
+            const state = deviceStates[device.device_id] || {};
+
+            // Leistungsmessung Title
+            // const title = document.createElement('h3');
+            // title.style.margin = '0 0 20px 0';
+            // title.style.fontSize = '18px';
+            // title.style.fontWeight = '600';
+            // title.style.color = '#333';
+            // title.textContent = 'Leistungsmessung';
+            // container.appendChild(title);
+
+            // Übersicht
+            const overviewGrid = document.createElement('div');
+            overviewGrid.className = 'state-grid';
+            overviewGrid.innerHTML = `
+                <div class="state-item">
+                    <div class="state-value" id="total-power-${device.device_id}">${state.total_power?.toFixed(0) || '--'} W</div>
+                    <div class="state-label">Gesamtleistung</div>
+                </div>
+                <div class="state-item">
+                    <div class="state-value" id="energy-${device.device_id}">${state.energy?.toFixed(2) || '--'} kWh</div>
+                    <div class="state-label">Energie</div>
+                </div>
+            `;
+            container.appendChild(overviewGrid);
+
+            // Phasen Title
+            const phaseTitle = document.createElement('h4');
+            phaseTitle.style.margin = '20px 0 8px 0';
+            phaseTitle.style.fontSize = '16px';
+            phaseTitle.style.fontWeight = '600';
+            phaseTitle.style.color = '#333';
+            // phaseTitle.textContent = 'Phasen';
+            container.appendChild(phaseTitle);
+
+            // Phasen Details
+            const phaseGrid = document.createElement('div');
+            phaseGrid.className = 'phase-grid';
+            phaseGrid.innerHTML = `
+                <div class="phase-section">
+                    <h4>Phase 1</h4>
+                    <div class="phase-values">
+                        <div class="phase-value full-width">
+                            <span class="value" id="phase1-power-${device.device_id}">${state.phase1_power?.toFixed(0) || '--'}</span>
+                            <span class="unit">W</span>
+                        </div>
+                        <div class="phase-row">
+                            <div class="phase-value half-width">
+                                <span class="value" id="phase1-voltage-${device.device_id}">${state.phase1_voltage?.toFixed(1) || '--'}</span>
+                                <span class="unit">V</span>
+                            </div>
+                            <div class="phase-value half-width">
+                                <span class="value" id="phase1-current-${device.device_id}">${state.phase1_current?.toFixed(2) || '--'}</span>
+                                <span class="unit">A</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="phase-section">
+                    <h4>Phase 2</h4>
+                    <div class="phase-values">
+                        <div class="phase-value full-width">
+                            <span class="value" id="phase2-power-${device.device_id}">${state.phase2_power?.toFixed(0) || '--'}</span>
+                            <span class="unit">W</span>
+                        </div>
+                        <div class="phase-row">
+                            <div class="phase-value half-width">
+                                <span class="value" id="phase2-voltage-${device.device_id}">${state.phase2_voltage?.toFixed(1) || '--'}</span>
+                                <span class="unit">V</span>
+                            </div>
+                            <div class="phase-value half-width">
+                                <span class="value" id="phase2-current-${device.device_id}">${state.phase2_current?.toFixed(2) || '--'}</span>
+                                <span class="unit">A</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="phase-section">
+                    <h4>Phase 3</h4>
+                    <div class="phase-values">
+                        <div class="phase-value full-width">
+                            <span class="value" id="phase3-power-${device.device_id}">${state.phase3_power?.toFixed(0) || '--'}</span>
+                            <span class="unit">W</span>
+                        </div>
+                        <div class="phase-row">
+                            <div class="phase-value half-width">
+                                <span class="value" id="phase3-voltage-${device.device_id}">${state.phase3_voltage?.toFixed(1) || '--'}</span>
+                                <span class="unit">V</span>
+                            </div>
+                            <div class="phase-value half-width">
+                                <span class="value" id="phase3-current-${device.device_id}">${state.phase3_current?.toFixed(2) || '--'}</span>
+                                <span class="unit">A</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            `;
+            container.appendChild(phaseGrid);
+        }
+
+        async function toggleOutlet(deviceId, newState) {
+            try {
+                const device = devicesData[deviceId];
+                await sendCommand(deviceId, {
+                    type: device.type,
+                    payload: { power: newState }
+                });
+                console.log(`Set ${deviceId} to ${newState}`);
+            } catch (error) {
+                console.error('Error toggling outlet:', error);
+                alert('Fehler beim Schalten des Geräts: ' + error.message);
+            }
+        }
+
+        async function sendCommand(deviceId, payload) {
+            const device = devicesData[deviceId];
+            await window.apiClient.setDeviceState(deviceId, device.type, payload.payload);
+        }
+
+        function connectRealtime() {
+            try {
+                window.apiClient.connectRealtime((event) => {
+                    console.log('SSE event received:', event);
+                    if (event.device_id && event.state && GARAGE_DEVICES.includes(event.device_id)) {
+                        console.log('Updating garage device state for:', event.device_id);
+                        deviceStates[event.device_id] = { ...deviceStates[event.device_id], ...event.state };
+                        updateDeviceUI(event.device_id);
+                    }
+                }, (error) => {
+                    console.error('SSE connection error:', error);
+                });
+            } catch (error) {
+                console.error('Failed to connect to realtime events:', error);
+            }
+        }
+
+        function updateDeviceUI(deviceId) {
+            const device = devicesData[deviceId];
+            if (!device) return;
+
+            const state = deviceStates[deviceId];
+            console.log(`Updating UI for ${deviceId}:`, state);
+
+            switch (device.type) {
+                case 'relay':
+                case 'outlet':
+                    updateOutletUI(deviceId, state);
+                    break;
+                case 'three_phase_powermeter':
+                    updateThreePhasePowerUI(deviceId, state);
+                    break;
+            }
+        }
+
+        function updateOutletUI(deviceId, state) {
+            const section = document.querySelector(`[data-device-id="${deviceId}"]`);
+            if (!section) return;
+
+            const toggleSwitch = section.querySelector('.toggle-switch');
+            const label = section.querySelector('.toggle-label');
+
+            if (toggleSwitch && label && state.power) {
+                const isOn = state.power === 'on';
+                toggleSwitch.className = `toggle-switch ${isOn ? 'on' : ''}`;
+                label.textContent = isOn ? 'Ein' : 'Aus';
+
+                // Update state display in separate card
+                const cards = section.querySelectorAll('.card');
+                if (cards.length >= 3) { // Header, Control, State
+                    const stateCard = cards[2];
+                    stateCard.innerHTML = `
+                        <div style="font-size: 18px; font-weight: 600; color: ${isOn ? '#34c759' : '#666'};">
+                            Status: ${isOn ? 'Eingeschaltet' : 'Ausgeschaltet'}
+                        </div>
+                    `;
+                }
+            }
+        }
+
+        function updateThreePhasePowerUI(deviceId, state) {
+            // Update overview
+            const totalPower = document.getElementById(`total-power-${deviceId}`);
+            const energy = document.getElementById(`energy-${deviceId}`);
+            
+            if (totalPower && state.total_power != null) {
+                totalPower.textContent = state.total_power.toFixed(0) + ' W';
+            }
+            if (energy && state.energy != null) {
+                energy.textContent = state.energy.toFixed(2) + ' kWh';
+            }
+
+            // Update phases
+            const phases = ['phase1', 'phase2', 'phase3'];
+            phases.forEach(phase => {
+                const power = document.getElementById(`${phase}-power-${deviceId}`);
+                const voltage = document.getElementById(`${phase}-voltage-${deviceId}`);
+                const current = document.getElementById(`${phase}-current-${deviceId}`);
+                
+                if (power && state[`${phase}_power`] != null) {
+                    power.textContent = state[`${phase}_power`].toFixed(0);
+                }
+                if (voltage && state[`${phase}_voltage`] != null) {
+                    voltage.textContent = state[`${phase}_voltage`].toFixed(1);
+                }
+                if (current && state[`${phase}_current`] != null) {
+                    current.textContent = state[`${phase}_current`].toFixed(2);
+                }
+            });
+        }
+
+        function getDeviceIcon(type) {
+            const icons = {
+                'relay': '⚡',
+                'outlet': '⚡',
+                'three_phase_powermeter': '📊'
+            };
+            return icons[type] || '📱';
+        }
+
+        function getTypeLabel(type) {
+            const labels = {
+                'relay': 'Relais',
+                'outlet': 'Steckdose',
+                'three_phase_powermeter': 'Dreiphasen-Stromzähler'
+            };
+            return labels[type] || 'Unbekannt';
+        }
+
+        // Cleanup on page unload
+        window.addEventListener('beforeunload', () => {
+            window.apiClient.disconnectRealtime();
+        });
+
+        // Load garage devices on page load
+        document.addEventListener('DOMContentLoaded', loadGarageDevices);
+    </script>
+</body>
+</html>

apps/ui/templates/index.html

@@ -464,3 +464,4 @@
     </script>
 </body>
 </html>
+

apps/ui/templates/room.html

@@ -0,0 +1,476 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{ room_name }} - Home Automation</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            min-height: 100vh;
+            padding: 20px;
+        }
+
+        .container {
+            max-width: 1200px;
+            margin: 0 auto;
+        }
+
+        h1 {
+            color: #333;
+            font-size: 28px;
+            margin-bottom: 8px;
+        }
+
+        .header {
+            background: rgba(255, 255, 255, 0.95);
+            border-radius: 12px;
+            padding: 20px;
+            margin-bottom: 20px;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .back-button {
+            background: none;
+            border: none;
+            color: #667eea;
+            font-size: 16px;
+            cursor: pointer;
+            padding: 8px 0;
+            margin-bottom: 12px;
+            display: inline-block;
+            text-decoration: none;
+        }
+
+        .back-button:hover {
+            text-decoration: underline;
+        }
+
+        
+
+        .room-info {
+            color: #666;
+            font-size: 14px;
+        }
+
+
+        .devices-grid {
+            display: grid;
+            grid-template-columns: repeat(2, 1fr);
+            gap: 16px;
+            margin-bottom: 20px;
+        }
+
+        @media (min-width: 600px) {
+            .devices-grid {
+                grid-template-columns: repeat(3, 1fr);
+            }
+        }
+
+        @media (min-width: 900px) {
+            .devices-grid {
+                grid-template-columns: repeat(4, 1fr);
+            }
+        }
+
+        .device-card {
+            background: rgba(255, 255, 255, 0.95);
+            border-radius: 12px;
+            padding: 16px;
+            text-align: center;
+            cursor: pointer;
+            transition: all 0.2s ease;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+            min-height: 110px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            text-decoration: none;
+            color: inherit;
+            width: 100%;
+        }
+
+        .device-card:hover {
+            transform: translateY(-4px);
+            box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
+        }
+
+        .device-card:active {
+            transform: translateY(-2px);
+        }
+
+        .device-header {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+            margin-bottom: 12px;
+        }
+
+        .device-icon {
+            font-size: 24px;
+        }
+
+        .device-title {
+            font-size: 14px;
+            font-weight: 600;
+            color: #333;
+            flex: 1;
+            line-height: 1.3;
+        }
+
+        .device-state {
+            margin-top: auto;
+        }
+
+        .state-primary {
+            font-size: 20px;
+            font-weight: 600;
+            color: #667eea;
+            margin-bottom: 4px;
+        }
+
+        .state-secondary {
+            font-size: 14px;
+            color: #666;
+        }
+
+        .state-badge {
+            display: inline-block;
+            padding: 4px 12px;
+            border-radius: 12px;
+            font-size: 13px;
+            font-weight: 500;
+        }
+
+        .state-badge.on {
+            background: #34c759;
+            color: white;
+        }
+
+        .state-badge.off {
+            background: #e0e0e0;
+            color: #666;
+        }
+
+        .state-badge.open {
+            background: #ff9500;
+            color: white;
+        }
+
+        .state-badge.closed {
+            background: #34c759;
+            color: white;
+        }
+
+        .loading {
+            text-align: center;
+            color: white;
+            font-size: 18px;
+            padding: 40px;
+        }
+
+        .error {
+            background: rgba(255, 59, 48, 0.9);
+            color: white;
+            padding: 16px;
+            border-radius: 8px;
+            text-align: center;
+            margin-bottom: 20px;
+        }
+
+        .no-devices {
+            background: rgba(255, 255, 255, 0.95);
+            border-radius: 12px;
+            padding: 40px;
+            text-align: center;
+            color: #666;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <a href="/rooms" class="back-button">← Zurück zu Räumen</a>
+            <h1 id="room-name">Raum wird geladen...</h1>
+            <div class="room-info" id="room-info"></div>
+        </div>
+        
+        <div id="error-container"></div>
+        <div id="loading" class="loading">Lade Geräte...</div>
+        <div id="devices-grid" class="devices-grid" style="display: none;"></div>
+        <div id="no-devices" class="no-devices" style="display: none;">
+            Keine Geräte in diesem Raum gefunden.
+        </div>
+    </div>
+
+    <script>
+        // API configuration from backend
+        window.API_BASE = '{{ api_base }}';
+    </script>
+    
+    <!-- Load API client AFTER API_BASE is set -->
+    <script src="/static/types.js"></script>
+    <script src="/static/api-client.js"></script>
+    
+    <script>
+        // Get room name from URL
+        const pathParts = window.location.pathname.split('/');
+        const roomName = decodeURIComponent(pathParts[pathParts.length - 1]);
+
+        // Device type to icon mapping
+        const deviceIcons = {
+            'light': '💡',
+            'thermostat': '🌡️',
+            'contact': '🚪',
+            'temp_humidity_sensor': '🌡️',
+            'three_phase_powermeter': '📊',
+            'relay': '💡',
+            'outlet': '💡',
+            'cover': '🪟'
+        };
+
+        // Device states
+        const deviceStates = {};
+
+        async function loadRoom() {
+            const loading = document.getElementById('loading');
+            const grid = document.getElementById('devices-grid');
+            const noDevices = document.getElementById('no-devices');
+            const errorContainer = document.getElementById('error-container');
+            const roomNameEl = document.getElementById('room-name');
+            const roomInfoEl = document.getElementById('room-info');
+
+            try {
+                // Load layout and devices using API client
+                // NEW: Use device layout endpoint for each device in this room
+                const layoutData = await window.apiClient.getLayout();
+                const devicesData = await window.apiClient.getDevices();
+                // Example: For each device in room.devices, you could fetch layout info via
+                // await window.apiClient.fetch(window.apiClient.api(`/devices/${device_id}/layout`));
+
+                console.log('Room name from URL:', roomName);
+                console.log('Available rooms:', layoutData.rooms.map(r => r.name));
+                console.log('Total devices:', devicesData.length);
+
+                // Find the room using API client helper
+                const room = window.apiClient.findRoom(layoutData, roomName);
+                if (!room) {
+                    console.error('Room not found:', roomName);
+                    throw new Error(`Raum "${roomName}" nicht gefunden`);
+                }
+
+                console.log('Found room:', room);
+                console.log('Room devices:', room.devices);
+
+                // Update header
+                roomNameEl.textContent = room.name;
+                roomInfoEl.textContent = `${room.devices.length} Gerät${room.devices.length !== 1 ? 'e' : ''}`;
+
+                // Create device lookup
+                const deviceMap = {};
+                devicesData.forEach(device => {
+                    deviceMap[device.device_id] = device;
+                });
+
+                // Extract device IDs from room devices (they are objects now)
+                const deviceIds = room.devices.map(d => d.device_id);
+                console.log('Device IDs from room:', deviceIds);
+
+                // Filter devices for this room
+                const roomDevices = deviceIds
+                    .map(deviceId => deviceMap[deviceId])
+                    .filter(device => device != null);
+
+                console.log('Filtered room devices:', roomDevices);
+
+                loading.style.display = 'none';
+
+                if (roomDevices.length === 0) {
+                    noDevices.style.display = 'block';
+                    return;
+                }
+
+                // Lade nur die States für die Geräte im aktuellen Raum
+                for (const device of roomDevices) {
+                    try {
+                        deviceStates[device.device_id] = await window.apiClient.getDeviceState(device.device_id);
+                    } catch (err) {
+                        deviceStates[device.device_id] = null;
+                    }
+                }
+                console.log('Device states:', deviceStates);
+
+                // Render devices
+                grid.style.display = 'grid';
+                roomDevices.forEach(device => {
+                    const card = createDeviceCard(device);
+                    grid.appendChild(card);
+                });
+
+                // Start SSE for live updates
+                connectRealtime();
+
+            } catch (error) {
+                console.error('Error loading room:', error);
+                loading.style.display = 'none';
+                errorContainer.innerHTML = `
+                    <div class="error">
+                        ⚠️ Fehler beim Laden: ${error.message}
+                    </div>
+                `;
+            }
+        }
+
+        function createDeviceCard(device) {
+            const card = document.createElement('a');
+            card.className = 'device-card';
+            card.href = `/device/${device.device_id}`;
+            card.dataset.deviceId = device.device_id;
+
+            const header = document.createElement('div');
+            header.className = 'device-header';
+
+            const icon = document.createElement('div');
+            icon.className = 'device-icon';
+            icon.textContent = deviceIcons[device.type] || '📱';
+
+            const title = document.createElement('div');
+            title.className = 'device-title';
+            title.textContent = device.name;
+
+            header.appendChild(icon);
+            header.appendChild(title);
+
+            const stateDiv = document.createElement('div');
+            stateDiv.className = 'device-state';
+            updateDeviceCardState(stateDiv, device);
+
+            card.appendChild(header);
+            card.appendChild(stateDiv);
+
+            return card;
+        }
+
+        function updateDeviceCardState(stateDiv, device) {
+            const state = deviceStates[device.device_id];
+            if (!state) {
+                stateDiv.innerHTML = '<div class="state-secondary">Status unbekannt</div>';
+                return;
+            }
+
+            let html = '';
+
+            switch (device.type) {
+                case 'light':
+                    if (state.power) {
+                        const powerState = state.power === 'on';
+                        html = `<span class="state-badge ${powerState ? 'on' : 'off'}">${powerState ? 'An' : 'Aus'}</span>`;
+                        if (powerState && state.brightness != null) {
+                            html += `<div class="state-secondary">${state.brightness}% Helligkeit</div>`;
+                        }
+                    }
+                    break;
+
+                case 'thermostat':
+                    if (state.target != null) {
+                        html = `<div class="state-primary">${state.target.toFixed(1)}°C</div>`;
+                        if (state.current != null) {
+                            html += `<div class="state-secondary">Ist: ${state.current}°C</div>`;
+                        }
+                    }
+                    break;
+
+                case 'contact':
+                    if (state.contact != null) {
+                        const isOpen = state.contact === 'open';
+                        html = `<span class="state-badge ${isOpen ? 'open' : 'closed'}">${isOpen ? 'Offen' : 'Geschlossen'}</span>`;
+                    }
+                    break;
+
+                case 'temp_humidity_sensor':
+                    if (state.temperature != null) {
+                        html = `<div class="state-primary">${state.temperature.toFixed(1)}°C</div>`;
+                        if (state.humidity != null) {
+                            html += `<div class="state-secondary">${state.humidity}% Luftfeuchte</div>`;
+                        }
+                    }
+                    break;
+
+                case 'three_phase_powermeter':
+                    if (state.total_power != null) {
+                        html = `<div class="state-primary">${state.total_power.toFixed(0)} W</div>`;
+                        if (state.energy != null) {
+                            html += `<div class="state-secondary">${state.energy.toFixed(2)} kWh</div>`;
+                        }
+                    }
+                    break;
+
+                case 'relay':
+                case 'outlet':
+                    if (state.power) {
+                        const powerState = state.power === 'on';
+                        html = `<span class="state-badge ${powerState ? 'on' : 'off'}">${powerState ? 'An' : 'Aus'}</span>`;
+                    }
+                    break;
+
+                case 'cover':
+                    if (state.position != null) {
+                        html = `<div class="state-primary">${state.position}%</div>`;
+                        html += `<div class="state-secondary">Position</div>`;
+                    }
+                    break;
+
+                default:
+                    html = '<div class="state-secondary">Kein Status</div>';
+            }
+
+            stateDiv.innerHTML = html;
+        }
+
+        function connectRealtime() {
+            try {
+                // Use API client's connectRealtime method
+                window.apiClient.connectRealtime((event) => {
+                    // Update device state
+                    if (event.device_id && event.state) {
+                        deviceStates[event.device_id] = event.state;
+                        
+                        // Update card if visible
+                        const card = document.querySelector(`[data-device-id="${event.device_id}"]`);
+                        if (card) {
+                            const stateDiv = card.querySelector('.device-state');
+                            window.apiClient.getDevices().then(devices => {
+                                const device = window.apiClient.findDevice(devices, event.device_id);
+                                if (device) {
+                                    updateDeviceCardState(stateDiv, device);
+                                }
+                            });
+                        }
+                    }
+                }, (error) => {
+                    console.error('SSE connection error:', error);
+                });
+
+            } catch (error) {
+                console.error('Failed to connect to realtime events:', error);
+            }
+        }
+
+        // Cleanup on page unload
+        window.addEventListener('beforeunload', () => {
+            window.apiClient.disconnectRealtime();
+        });
+
+        // Load room on page load
+        document.addEventListener('DOMContentLoaded', loadRoom);
+    </script>
+</body>
+</html>

apps/ui/templates/rooms.html

@@ -0,0 +1,315 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Räume - Home Automation</title>
+    
+    <!-- Apple Touch Icon -->
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/apple-touch-icon.png">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="default">
+    <meta name="apple-mobile-web-app-title" content="Home Automation">
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            min-height: 100vh;
+            padding: 20px;
+        }
+
+        .container {
+            max-width: 1200px;
+            margin: 0 auto;
+        }
+
+        h1 {
+            color: white;
+            font-size: 28px;
+            margin-bottom: 24px;
+            text-align: center;
+        }
+
+        .rooms-grid {
+            display: grid;
+            grid-template-columns: repeat(2, 1fr);
+            gap: 16px;
+            margin-bottom: 20px;
+        }
+
+        @media (min-width: 600px) {
+            .rooms-grid {
+                grid-template-columns: repeat(3, 1fr);
+            }
+        }
+
+        @media (min-width: 900px) {
+            .rooms-grid {
+                grid-template-columns: repeat(4, 1fr);
+            }
+        }
+
+        .room-card {
+            background: rgba(255, 255, 255, 0.95);
+            border-radius: 12px;
+            padding: 16px;
+            text-align: center;
+            cursor: pointer;
+            transition: all 0.2s ease;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+            min-height: 110px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            text-decoration: none;
+            color: inherit;
+        }
+
+        .room-card:hover {
+            transform: translateY(-4px);
+            box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
+        }
+
+        .room-card:active {
+            transform: translateY(-2px);
+        }
+
+        .room-icon {
+            font-size: 32px;
+            margin-bottom: 8px;
+        }
+
+        .room-name {
+            font-size: 16px;
+            font-weight: 600;
+            color: #333;
+            margin-bottom: 4px;
+        }
+
+        .room-device-count {
+            font-size: 14px;
+            color: #666;
+        }
+
+        .room-stats {
+            font-size: 12px;
+            color: #999;
+            margin-top: 4px;
+        }
+
+        .loading {
+            text-align: center;
+            color: white;
+            font-size: 18px;
+            padding: 40px;
+        }
+
+        .error {
+            background: rgba(255, 59, 48, 0.9);
+            color: white;
+            padding: 16px;
+            border-radius: 8px;
+            text-align: center;
+            margin-bottom: 20px;
+        }
+
+        .back-button {
+            position: fixed;
+            top: 20px;
+            left: 20px;
+            background: rgba(255, 255, 255, 0.9);
+            color: #667eea;
+            border: none;
+            padding: 10px 20px;
+            border-radius: 8px;
+            font-size: 16px;
+            cursor: pointer;
+            text-decoration: none;
+            display: inline-block;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        .back-button:hover {
+            background: white;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>🏠 Zuhause</h1>
+        
+        <div id="error-container"></div>
+        <div id="loading" class="loading">Lade Räume...</div>
+        <div id="rooms-grid" class="rooms-grid" style="display: none;"></div>
+    </div>
+
+    <script>
+        // API configuration from backend
+        window.API_BASE = '{{ api_base }}';
+    </script>
+    
+    <!-- Load API client AFTER API_BASE is set -->
+    <script src="/static/types.js"></script>
+    <script src="/static/api-client.js"></script>
+    
+    <script>
+        // Room icon mapping
+        const roomIcons = {
+            'wohnzimmer': '🛋️',
+            'küche': '🍳',
+            'kueche': '🍳',
+            'schlafzimmer': '🛏️',
+            'bad': '🚿',
+            'badezimmer': '🚿',
+            'bad oben': '🚿',
+            'bad unten': '🚿',
+            'flur': '🚪',
+            'büro': '💼',
+            'buero': '💼',
+            'arbeitszimmer': '💼',
+            'studierzimmer': '📚',
+            'esszimmer': '🍽️',
+            'garten': '🌳',
+            'terrasse': '🌿',
+            'garage': '🚗',
+            'keller': '🔧',
+            'dachboden': '📦',
+            'kinderzimmer': '🧸',
+            'patty': '👤',
+            'wolfgang': '👤',
+            'default': '🏡'
+        };
+
+        function getRoomIcon(roomName) {
+            const normalized = roomName.toLowerCase().trim();
+            return roomIcons[normalized] || roomIcons['default'];
+        }
+
+        async function loadRooms() {
+            const loading = document.getElementById('loading');
+            const grid = document.getElementById('rooms-grid');
+            const errorContainer = document.getElementById('error-container');
+
+            try {
+                // Load layout and devices using API client
+                // NEW: Use device layout endpoint for each device
+                // Fallback: load all rooms as before
+                const layoutData = await window.apiClient.getLayout();
+                const devicesData = await window.apiClient.getDevices();
+                // Example: For each device, you could also fetch layout info via
+                // await window.apiClient.fetch(window.apiClient.api(`/devices/${device_id}/layout`));
+
+                // Create device lookup
+                const deviceMap = {};
+                devicesData.forEach(device => {
+                    deviceMap[device.device_id] = device;
+                });
+
+                // Render rooms
+                loading.style.display = 'none';
+                grid.style.display = 'grid';
+
+                layoutData.rooms.forEach(room => {
+                    const card = createRoomCard(room, deviceMap);
+                    grid.appendChild(card);
+                });
+
+            } catch (error) {
+                console.error('Error loading rooms:', error);
+                loading.style.display = 'none';
+                errorContainer.innerHTML = `
+                    <div class="error">
+                        ⚠️ Fehler beim Laden der Räume: ${error.message}
+                    </div>
+                `;
+            }
+        }
+
+        function createRoomCard(room, deviceMap) {
+            const card = document.createElement('a');
+            card.className = 'room-card';
+            card.href = `/room/${encodeURIComponent(room.name)}`;
+
+            const icon = document.createElement('div');
+            icon.className = 'room-icon';
+            icon.textContent = getRoomIcon(room.name);
+
+            const name = document.createElement('div');
+            name.className = 'room-name';
+            name.textContent = room.name;
+
+            const deviceCount = document.createElement('div');
+            deviceCount.className = 'room-device-count';
+            deviceCount.textContent = `${room.devices.length} Gerät${room.devices.length !== 1 ? 'e' : ''}`;
+
+            // Optional: Calculate stats (lights on, windows open, etc.)
+            const stats = calculateRoomStats(room.devices, deviceMap);
+            if (stats) {
+                const statsDiv = document.createElement('div');
+                statsDiv.className = 'room-stats';
+                statsDiv.textContent = stats;
+                card.appendChild(icon);
+                card.appendChild(name);
+                card.appendChild(deviceCount);
+                card.appendChild(statsDiv);
+            } else {
+                card.appendChild(icon);
+                card.appendChild(name);
+                card.appendChild(deviceCount);
+            }
+
+            return card;
+        }
+
+        function calculateRoomStats(roomDevices, deviceMap) {
+            // Extract device IDs from room devices (they are objects now)
+            const deviceIds = roomDevices.map(d => d.device_id || d);
+            
+            // Count device types
+            let lights = 0;
+            let thermostats = 0;
+            let contacts = 0;
+            let sensors = 0;
+
+            deviceIds.forEach(deviceId => {
+                const device = deviceMap[deviceId];
+                if (!device) return;
+
+                switch(device.type) {
+                    case 'light':
+                        lights++;
+                        break;
+                    case 'thermostat':
+                        thermostats++;
+                        break;
+                    case 'contact':
+                        contacts++;
+                        break;
+                    case 'temp_humidity_sensor':
+                        sensors++;
+                        break;
+                }
+            });
+
+            // Build compact stats string
+            const parts = [];
+            if (lights > 0) parts.push(`💡${lights}`);
+            if (thermostats > 0) parts.push(`🌡️${thermostats}`);
+            if (contacts > 0) parts.push(`🚪${contacts}`);
+            
+            return parts.length > 0 ? parts.join(' ') : null;
+        }
+
+        // Load rooms on page load
+        document.addEventListener('DOMContentLoaded', loadRooms);
+    </script>
+</body>
+</html>

config/devices.yaml

@@ -1,44 +1,795 @@
 version: 1
-
-mqtt:
-  broker: "172.16.2.16"
-  port: 1883
-  client_id: "home-automation-abstraction"
-  username: null
-  password: null
-  keepalive: 60
-
-redis:
-  url: "redis://172.23.1.116:6379/8"
-  channel: "ui:updates"
-
 devices:
-  - device_id: test_lampe_1
-    type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    features:
-      power: true
-      brightness: true
-    topics:
-      set: "vendor/test_lampe_1/set"
-      state: "vendor/test_lampe_1/state"
-  - device_id: test_lampe_2
-    type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    features:
-      power: true
-    topics:
-      set: "vendor/test_lampe_2/set"
-      state: "vendor/test_lampe_2/state"
-  - device_id: test_lampe_3
-    type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    features:
-      power: true
-      brightness: true
-    topics:
-      set: "vendor/test_lampe_3/set"
-      state: "vendor/test_lampe_3/state"
+- device_id: lampe_semeniere_wohnzimmer
+  name: Semeniere
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b8000015480b"
+    set: "zigbee2mqtt/0xf0d1b8000015480b/set"
+  metadata:
+    friendly_name: "Lampe Semeniere Wohnzimmer"
+    ieee_address: "0xf0d1b8000015480b"
+    model: "AC10691"
+    vendor: "OSRAM"
+- device_id: stehlampe_esszimmer_spiegel
+  name: Stehlampe Spiegel
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x001788010d06ea09"
+    set: "zigbee2mqtt/0x001788010d06ea09/set"
+- device_id: stehlampe_esszimmer_schrank
+  name: Stehlampe Schrank
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x001788010d09176c"
+    set: "zigbee2mqtt/0x001788010d09176c/set"
+- device_id: grosse_lampe_wohnzimmer
+  name: grosse Lampe
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000151aca"
+    set: "zigbee2mqtt/0xf0d1b80000151aca/set"
+  metadata:
+    friendly_name: "grosse Lampe Wohnzimmer"
+    ieee_address: "0xf0d1b80000151aca"
+    model: "AC10691"
+    vendor: "OSRAM"
+- device_id: lampe_naehtischchen_wohnzimmer
+  name: Nähtischchen
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0x842e14fffee560ee"
+    set: "zigbee2mqtt/0x842e14fffee560ee/set"
+  metadata:
+    friendly_name: "Lampe Naehtischchen Wohnzimmer"
+    ieee_address: "0x842e14fffee560ee"
+    model: "HG06337"
+    vendor: "Lidl"
+- device_id: kleine_lampe_links_esszimmer
+  name: kleine Lampe
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000153099"
+    set: "zigbee2mqtt/0xf0d1b80000153099/set"
+  metadata:
+    friendly_name: "kleine Lampe links Esszimmer"
+    ieee_address: "0xf0d1b80000153099"
+    model: "AC10691"
+    vendor: "OSRAM"
+- device_id: leselampe_esszimmer
+  name: Leselampe
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xec1bbdfffe7b84f2"
+    set: "zigbee2mqtt/0xec1bbdfffe7b84f2/set"
+  metadata:
+    friendly_name: "Leselampe Esszimmer"
+    ieee_address: "0xec1bbdfffe7b84f2"
+    model: "LED1842G3"
+    vendor: "IKEA"
+- device_id: medusalampe_schlafzimmer
+  name: Medusa-Lampe
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000154c7c"
+    set: "zigbee2mqtt/0xf0d1b80000154c7c/set"
+  metadata:
+    friendly_name: "Medusa-Lampe Schlafzimmer"
+    ieee_address: "0xf0d1b80000154c7c"
+    model: "AC10691"
+    vendor: "OSRAM"
+- device_id: sportlicht_am_fernseher_studierzimmer
+  type: light
+  name: am Fernseher
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+    color_temperature: true
+  topics:
+    state: "zigbee2mqtt/0x842e14fffe76a23a"
+    set: "zigbee2mqtt/0x842e14fffe76a23a/set"
+  metadata:
+    friendly_name: "Sportlicht am Fernseher, Studierzimmer"
+    ieee_address: "0x842e14fffe76a23a"
+    model: "LED1733G7"
+    vendor: "IKEA"
+- device_id: deckenlampe_schlafzimmer
+  name: Deckenlampe
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x0017880108a406a7"
+    set: "zigbee2mqtt/0x0017880108a406a7/set"
+  metadata:
+    friendly_name: "Deckenlampe Schlafzimmer"
+    ieee_address: "0x0017880108a406a7"
+    model: "8718699688882"
+    vendor: "Philips"
+- device_id: bettlicht_wolfgang
+  name: Bettlicht Wolfgang
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x00178801081570bf"
+    set: "zigbee2mqtt/0x00178801081570bf/set"
+  metadata:
+    friendly_name: "Bettlicht Wolfgang"
+    ieee_address: "0x00178801081570bf"
+    model: "9290020399"
+    vendor: "Philips"
+- device_id: bettlicht_patty
+  name: Bettlicht Patty
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x0017880108158b32"
+    set: "zigbee2mqtt/0x0017880108158b32/set"
+  metadata:
+    friendly_name: "Bettlicht Patty"
+    ieee_address: "0x0017880108158b32"
+    model: "9290020399"
+    vendor: "Philips"
+- device_id: schranklicht_hinten_patty
+  name: Schranklicht hinten
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x0017880106e29571"
+    set: "zigbee2mqtt/0x0017880106e29571/set"
+  metadata:
+    friendly_name: "Schranklicht hinten Patty"
+    ieee_address: "0x0017880106e29571"
+    model: "8718699673147"
+    vendor: "Philips"
+- device_id: schranklicht_vorne_patty
+  name: Schranklicht vorne
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000154cf5"
+    set: "zigbee2mqtt/0xf0d1b80000154cf5/set"
+  metadata:
+    friendly_name: "Schranklicht vorne Patty"
+    ieee_address: "0xf0d1b80000154cf5"
+    model: "AC10691"
+    vendor: "OSRAM"
+- device_id: leselampe_patty
+  name: Leselampe
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x001788010600ec9d"
+    set: "zigbee2mqtt/0x001788010600ec9d/set"
+  metadata:
+    friendly_name: "Leselampe Patty"
+    ieee_address: "0x001788010600ec9d"
+    model: "8718699673147"
+    vendor: "Philips"
+- device_id: deckenlampe_esszimmer
+  name: Deckenlampe
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x0017880108a03e45"
+    set: "zigbee2mqtt/0x0017880108a03e45/set"
+  metadata:
+    friendly_name: "Deckenlampe Esszimmer"
+    ieee_address: "0x0017880108a03e45"
+    model: "929002241201"
+    vendor: "Philips"
+- device_id: haustuer
+  name: Haustür-Lampe
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xec1bbdfffea6a3da"
+    set: "zigbee2mqtt/0xec1bbdfffea6a3da/set"
+  metadata:
+    friendly_name: "Haustür"
+    ieee_address: "0xec1bbdfffea6a3da"
+    model: "LED1842G3"
+    vendor: "IKEA"
+- device_id: deckenlampe_flur_oben
+  name: Deckenlampe oben
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+    color_temperature: true
+  topics:
+    state: "zigbee2mqtt/0x001788010d2123a7"
+    set: "zigbee2mqtt/0x001788010d2123a7/set"
+  metadata:
+    friendly_name: "Deckenlampe Flur oben"
+    ieee_address: "0x001788010d2123a7"
+    model: "929003099001"
+    vendor: "Philips"
+- device_id: kueche_deckenlampe
+  name: Deckenlampe
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0x001788010d2c40c4"
+    set: "zigbee2mqtt/0x001788010d2c40c4/set"
+  metadata:
+    friendly_name: "Küche Deckenlampe"
+    ieee_address: "0x001788010d2c40c4"
+    model: "929002469202"
+    vendor: "Philips"
+- device_id: sportlicht_tisch
+  name: am Tisch
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b8be2409f31b"
+    set: "zigbee2mqtt/0xf0d1b8be2409f31b/set"
+  metadata:
+    friendly_name: "Sportlicht Tisch"
+    ieee_address: "0xf0d1b8be2409f31b"
+    model: "4058075729063"
+    vendor: "LEDVANCE"
+- device_id: sportlicht_regal
+  name: am Regal
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b8be2409f569"
+    set: "zigbee2mqtt/0xf0d1b8be2409f569/set"
+  metadata:
+    friendly_name: "Sportlicht Regal"
+    ieee_address: "0xf0d1b8be2409f569"
+    model: "4058075729063"
+    vendor: "LEDVANCE"
+- device_id: licht_flur_oben_am_spiegel
+  name: Spiegel
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+    color_temperature: true
+  topics:
+    state: "zigbee2mqtt/0x842e14fffefe4ba4"
+    set: "zigbee2mqtt/0x842e14fffefe4ba4/set"
+  metadata:
+    friendly_name: "Licht Flur oben am Spiegel"
+    ieee_address: "0x842e14fffefe4ba4"
+    model: "LED1732G11"
+    vendor: "IKEA"
+- device_id: experimentlabtest
+  name: Test Lampe
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000195038"
+    set: "zigbee2mqtt/0xf0d1b80000195038/set"
+  metadata:
+    friendly_name: "ExperimentLabTest"
+    ieee_address: "0xf0d1b80000195038"
+    model: "4058075208421"
+    vendor: "LEDVANCE"
+- device_id: thermostat_wolfgang
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    heating: true
+    temperature_range:
+    - 5
+    - 30
+    temperature_step: 0.5
+  topics:
+    state: "zigbee2mqtt/0x540f57fffe7e3cfe"
+    set: "zigbee2mqtt/0x540f57fffe7e3cfe/set"
+  metadata:
+    friendly_name: "Wolfgang"
+    ieee_address: "0x540f57fffe7e3cfe"
+    model: "GS361A-H04"
+    vendor: "Siterwell"
+- device_id: thermostat_kueche
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    heating: true
+    temperature_range:
+    - 5
+    - 30
+    temperature_step: 0.5
+  topics:
+    state: "zigbee2mqtt/0x94deb8fffe2e5c06"
+    set: "zigbee2mqtt/0x94deb8fffe2e5c06/set"
+  metadata:
+    friendly_name: "Kueche"
+    ieee_address: "0x94deb8fffe2e5c06"
+    model: "GS361A-H04"
+    vendor: "Siterwell"
+- device_id: thermostat_schlafzimmer
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: max
+  features:
+    mode: true
+    target: true
+    current: false
+  topics:
+    set: "homegear/instance1/set/42/1/SET_TEMPERATURE"
+    state: "homegear/instance1/plain/42/1/SET_TEMPERATURE"
+  metadata:
+    friendly_name: "Thermostat Schlafzimmer"
+    location: "Schlafzimmer"
+    vendor: "eQ-3"
+    model: "MAX! Thermostat"
+    peer_id: "42"
+    channel: "1"
+- device_id: thermostat_esszimmer
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: max
+  features:
+    mode: true
+    target: true
+    current: false
+  topics:
+    set: "homegear/instance1/set/45/1/SET_TEMPERATURE"
+    state: "homegear/instance1/plain/45/1/SET_TEMPERATURE"
+  metadata:
+    friendly_name: "Thermostat Esszimmer"
+    location: "Esszimmer"
+    vendor: "eQ-3"
+    model: "MAX! Thermostat"
+    peer_id: "45"
+    channel: "1"
+- device_id: thermostat_wohnzimmer
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: max
+  features:
+    mode: true
+    target: true
+    current: false
+  topics:
+    set: "homegear/instance1/set/46/1/SET_TEMPERATURE"
+    state: "homegear/instance1/plain/46/1/SET_TEMPERATURE"
+  metadata:
+    friendly_name: "Thermostat Wohnzimmer"
+    location: "Wohnzimmer"
+    vendor: "eQ-3"
+    model: "MAX! Thermostat"
+    peer_id: "46"
+    channel: "1"
+- device_id: thermostat_patty
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: max
+  features:
+    mode: true
+    target: true
+    current: false
+  topics:
+    set: "homegear/instance1/set/39/1/SET_TEMPERATURE"
+    state: "homegear/instance1/plain/39/1/SET_TEMPERATURE"
+  metadata:
+    friendly_name: "Thermostat Patty"
+    location: "Arbeitszimmer Patty"
+    vendor: "eQ-3"
+    model: "MAX! Thermostat"
+    peer_id: "39"
+    channel: "1"
+- device_id: thermostat_bad_oben
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: max
+  features:
+    mode: true
+    target: true
+    current: false
+  topics:
+    set: "homegear/instance1/set/41/1/SET_TEMPERATURE"
+    state: "homegear/instance1/plain/41/1/SET_TEMPERATURE"
+  metadata:
+    friendly_name: "Thermostat Bad Oben"
+    location: "Bad Oben"
+    vendor: "eQ-3"
+    model: "MAX! Thermostat"
+    peer_id: "41"
+    channel: "1"
+- device_id: thermostat_bad_unten
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: max
+  features:
+    mode: true
+    target: true
+    current: false
+  topics:
+    set: "homegear/instance1/set/48/1/SET_TEMPERATURE"
+    state: "homegear/instance1/plain/48/1/SET_TEMPERATURE"
+  metadata:
+    friendly_name: "Thermostat Bad Unten"
+    location: "Bad Unten"
+    vendor: "eQ-3"
+    model: "MAX! Thermostat"
+    peer_id: "48"
+    channel: "1"
+- device_id: sterne_wohnzimmer
+  name: Sterne
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000155fc2"
+    set: "zigbee2mqtt/0xf0d1b80000155fc2/set"
+  metadata:
+    friendly_name: "Sterne Wohnzimmer"
+    ieee_address: "0xf0d1b80000155fc2"
+    model: "AC10691"
+    vendor: "OSRAM"
+- device_id: kontakt_schlafzimmer_strasse
+  name: Fenster
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/52/1/STATE
+  features: {}
+- device_id: kontakt_esszimmer_strasse_rechts
+  type: contact
+  name: Fenster rechts
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/26/1/STATE
+  features: {}
+- device_id: kontakt_esszimmer_strasse_links
+  name: Fenster links
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/27/1/STATE
+  features: {}
+- device_id: kontakt_wohnzimmer_garten_rechts
+  name: Fenster rechts
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/28/1/STATE
+  features: {}
+- device_id: kontakt_wohnzimmer_garten_links
+  name: Fenster links
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/29/1/STATE
+  features: {}
+- device_id: kontakt_kueche_garten_fenster
+  name: Fenster Garten
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d008b332785
+  features: {}
+- device_id: kontakt_kueche_garten_tuer
+  type: contact
+  name: Terrassentür
+  cap_version: contact_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d008b332788
+  features: {}
+- device_id: kontakt_kueche_strasse_rechts
+  name: Fenster Straße rechts
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d008b151803
+  features: {}
+- device_id: kontakt_kueche_strasse_links
+  name: Fenster Straße links
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d008b331d0b
+  features: {}
+- device_id: kontakt_patty_garten_rechts
+  type: contact
+  name: Fenster Garten rechts
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/18/1/STATE
+  features: {}
+- device_id: kontakt_patty_garten_links
+  type: contact
+  name: Fenster Garten links
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/22/1/STATE
+  features: {}
+- device_id: kontakt_patty_strasse
+  type: contact
+  name: Fenster Straße
+  cap_version: contact_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d000af457cf
+  features: {}
+- device_id: kontakt_wolfgang_garten
+  type: contact
+  name: Fenster
+  cap_version: contact_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d008b3328da
+  features: {}
+- device_id: kontakt_bad_oben_strasse
+  type: contact
+  name: Fenster
+  cap_version: contact_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d008b333aec
+  features: {}
+- device_id: kontakt_bad_unten_strasse
+  type: contact
+  name: Fenster
+  cap_version: contact_sensor@1.0.0
+  technology: max
+  topics:
+    state: homegear/instance1/plain/44/1/STATE
+  features: {}
+- device_id: sensor_schlafzimmer
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d00043292dc
+  features: {}
+- device_id: sensor_wohnzimmer
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d0008975707
+  features: {}
+- device_id: sensor_kueche
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d00083299bb
+  features: {}
+- device_id: sensor_arbeitszimmer_patty
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d0003f052b7
+  features: {}
+- device_id: sensor_arbeitszimmer_wolfgang
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d000543fb99
+  features: {}
+- device_id: sensor_bad_oben
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d00093e8987
+  features: {}
+- device_id: sensor_bad_unten
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d00093e662a
+  features: {}
+- device_id: sensor_flur
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d000836ccc6
+  features: {}
+- device_id: sensor_waschkueche
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d000449f3bc
+  features: {}
+- device_id: sensor_sportzimmer
+  type: temp_humidity_sensor
+  name: Thermometer
+  cap_version: temp_humidity_sensor@1.0.0
+  technology: zigbee2mqtt
+  topics:
+    state: zigbee2mqtt/0x00158d0009421422
+  features: {}
+- device_id: licht_spuele_kueche
+  name: Spüle
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: shelly
+  features:
+    power: true
+  topics:
+    set: "shellies/LightKitchenSink/relay/0/command"
+    state: "shellies/LightKitchenSink/relay/0"
+- device_id: licht_schrank_esszimmer
+  name: Schrank
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: shelly
+  features:
+    power: true
+  topics:
+    set: "shellies/schrankesszimmer/relay/0/command"
+    state: "shellies/schrankesszimmer/relay/0"
+- device_id: licht_regal_wohnzimmer
+  type: relay
+  name: Regal
+  cap_version: "relay@1.0.0"
+  technology: shelly
+  features:
+    power: true
+  topics:
+    set: "shellies/wohnzimmer-regal/relay/0/command"
+    state: "shellies/wohnzimmer-regal/relay/0"
+- device_id: licht_flur_schrank
+  type: relay
+  name: Schrank
+  cap_version: "relay@1.0.0"
+  technology: shelly
+  features:
+    power: true
+  topics:
+    set: "shellies/schrankflur/relay/0/command"
+    state: "shellies/schrankflur/relay/0"
+- device_id: licht_terasse
+  name: Terrasse
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: shelly
+  features:
+    power: true
+  topics:
+    set: "shellies/lichtterasse/relay/0/command"
+    state: "shellies/lichtterasse/relay/0"
+
+- device_id: power_relay_caroutlet
+  name: Car Outlet
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_modbus
+  features:
+    power: true
+  topics:
+    set: "caroutlet/cmd"
+    state: "caroutlet/state"
+
+- device_id: powermeter_caroutlet
+  name: Car Outlet
+  type: three_phase_powermeter
+  cap_version: "three_phase_powermeter@1.0.0"
+  technology: hottis_modbus
+  topics:
+    state: "caroutlet/powermeter"
+
+

config/groups.yaml

@@ -0,0 +1,36 @@
+version: 1
+groups:
+  - id: "kueche_lichter"
+    name: "Küche – alle Lampen"
+    selector:
+      type: "light"
+      room: "Küche"
+    capabilities:
+      power: true
+      brightness: true
+
+  - id: "alles_lichter"
+    name: "Alle Lichter"
+    selector:
+      type: "light"
+    capabilities:
+      power: true
+
+  - id: "schlafzimmer_lichter"
+    name: "Schlafzimmer – alle Lampen"
+    selector:
+      type: "light"
+      room: "Schlafzimmer"
+    capabilities:
+      power: true
+      brightness: true
+
+  - id: "schlafzimmer_schlummer_licht"
+    name: "Schlafzimmer – Schlummerlicht"
+    device_ids:
+      - bettlicht_patty
+      - bettlicht_wolfgang
+      - medusalampe_schlafzimmer
+    capabilities:
+      power: true
+      brightness: true

config/layout.yaml

@@ -1,25 +1,293 @@
-# UI Layout Configuration
-# Defines rooms and device tiles for the home automation UI
-
 rooms:
-  - name: Wohnzimmer
-    devices:
-      - device_id: test_lampe_2
-        title: Deckenlampe
-        icon: "💡"
-        rank: 5
-      - device_id: test_lampe_1
-        title: Stehlampe
-        icon: "<22>"
-        rank: 10
-        
-  - name: Schlafzimmer
-    devices:
-      - device_id: test_lampe_3
-        title: Nachttischlampe
-        icon: "🛏️"
-        rank: 10
-      
-
+- name: Schlafzimmer
+  devices:
+  - device_id: bettlicht_patty
+    title: Bettlicht Patty
+    icon: 🛏️
+    rank: 10
+  - device_id: bettlicht_wolfgang
+    title: Bettlicht Wolfgang
+    icon: 🛏️
+    rank: 20
+  - device_id: deckenlampe_schlafzimmer
+    title: Deckenlampe Schlafzimmer
+    icon: 💡
+    rank: 30
+  - device_id: medusalampe_schlafzimmer
+    title: Medusa-Lampe Schlafzimmer
+    icon: 💡
+    rank: 40
+  - device_id: thermostat_schlafzimmer
+    title: Thermostat Schlafzimmer
+    icon: 🌡️
+    rank: 45
+  - device_id: kontakt_schlafzimmer_strasse
+    title: Kontakt Straße
+    icon: 🪟
+    rank: 46
+  - device_id: sensor_schlafzimmer
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 47
+- name: Esszimmer
+  devices:
+  - device_id: deckenlampe_esszimmer
+    title: Deckenlampe Esszimmer
+    icon: 💡
+    rank: 50
+  - device_id: leselampe_esszimmer
+    title: Leselampe Esszimmer
+    icon: 💡
+    rank: 60
+#  - device_id: standlampe_esszimmer
+#    title: Standlampe Esszimmer
+#    icon: 💡
+#    rank: 70
+  - device_id: kleine_lampe_links_esszimmer
+    title: kleine Lampe links Esszimmer
+    icon: 💡
+    rank: 80
+  - device_id: stehlampe_esszimmer_spiegel
+    title: Stehlampe Esszimmer Spiegel
+    icon: 💡
+    rank: 81
+  - device_id: stehlampe_esszimmer_schrank
+    title: Stehlampe Esszimmer Schrank
+    icon: 💡
+    rank: 82
+#  - device_id: kleine_lampe_rechts_esszimmer
+#    title: kleine Lampe rechts Esszimmer
+#    icon: 💡
+#    rank: 90
+  - device_id: licht_schrank_esszimmer
+    title: Schranklicht Esszimmer
+    icon: 💡
+    rank: 92
+  - device_id: thermostat_esszimmer
+    title: Thermostat Esszimmer
+    icon: 🌡️
+    rank: 95
+  - device_id: kontakt_esszimmer_strasse_rechts
+    title: Kontakt Straße rechtsFtest
+    icon: 🪟
+    rank: 96
+  - device_id: kontakt_esszimmer_strasse_links
+    title: Kontakt Straße links
+    icon: 🪟
+    rank: 97
+- name: Wohnzimmer
+  devices:
+  - device_id: lampe_naehtischchen_wohnzimmer
+    title: Lampe Naehtischchen Wohnzimmer
+    icon: 💡
+    rank: 100
+  - device_id: lampe_semeniere_wohnzimmer
+    title: Lampe Semeniere Wohnzimmer
+    icon: 💡
+    rank: 110
+  - device_id: sterne_wohnzimmer
+    title: Sterne Wohnzimmer
+    icon: 💡
+    rank: 120
+  - device_id: grosse_lampe_wohnzimmer
+    title: grosse Lampe Wohnzimmer
+    icon: 💡
+    rank: 130
+  - device_id: licht_regal_wohnzimmer
+    title: Regallicht Wohnzimmer
+    icon: 💡
+    rank: 132
+  - device_id: thermostat_wohnzimmer
+    title: Thermostat Wohnzimmer
+    icon: 🌡️
+    rank: 135
+  - device_id: kontakt_wohnzimmer_garten_rechts
+    title: Kontakt Garten rechts
+    icon: 🪟
+    rank: 136
+  - device_id: kontakt_wohnzimmer_garten_links
+    title: Kontakt Garten links
+    icon: 🪟
+    rank: 137
+  - device_id: sensor_wohnzimmer
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 138
+- name: Küche
+  devices:
+  - device_id: kueche_deckenlampe
+    title: Küche Deckenlampe
+    icon: 💡
+    rank: 140
+  - device_id: licht_spuele_kueche
+    title: Küche Spüle
+    icon: 💡
+    rank: 142
+  - device_id: thermostat_kueche
+    title: Kueche
+    icon: 🌡️
+    rank: 150
+  - device_id: kontakt_kueche_garten_fenster
+    title: Kontakt Garten Fenster
+    icon: 🪟
+    rank: 151
+  - device_id: kontakt_kueche_garten_tuer
+    title: Kontakt Garten Tür
+    icon: 🪟
+    rank: 152
+  - device_id: kontakt_kueche_strasse_rechts
+    title: Kontakt Straße rechts
+    icon: 🪟
+    rank: 153
+  - device_id: kontakt_kueche_strasse_links
+    title: Kontakt Straße links
+    icon: 🪟
+    rank: 154
+  - device_id: sensor_kueche
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 155
+- name: Arbeitszimmer Patty
+  devices:
+  - device_id: leselampe_patty
+    title: Leselampe Patty
+    icon: 💡
+    rank: 160
+  - device_id: schranklicht_hinten_patty
+    title: Schranklicht hinten Patty
+    icon: 💡
+    rank: 170
+  - device_id: schranklicht_vorne_patty
+    title: Schranklicht vorne Patty
+    icon: 💡
+    rank: 180
+  - device_id: thermostat_patty
+    title: Thermostat Patty
+    icon: 🌡️
+    rank: 185
+  - device_id: kontakt_patty_garten_rechts
+    title: Kontakt Garten rechts
+    icon: 🪟
+    rank: 186
+  - device_id: kontakt_patty_garten_links
+    title: Kontakt Garten links
+    icon: 🪟
+    rank: 187
+  - device_id: kontakt_patty_strasse
+    title: Kontakt Straße
+    icon: 🪟
+    rank: 188
+  - device_id: sensor_arbeitszimmer_patty
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 189
+- name: Arbeitszimmer Wolfgang
+  devices:
+  - device_id: thermostat_wolfgang
+    title: Wolfgang
+    icon: 🌡️
+    rank: 190
+  - device_id: experimentlabtest
+    title: ExperimentLabTest
+    icon: 💡
+    rank: 200
+  - device_id: kontakt_wolfgang_garten
+    title: Kontakt Garten
+    icon: 🪟
+    rank: 201
+  - device_id: sensor_arbeitszimmer_wolfgang
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 202
+- name: Flur
+  devices:
+  - device_id: deckenlampe_flur_oben
+    title: Deckenlampe Flur oben
+    icon: 💡
+    rank: 210
+  - device_id: haustuer
+    title: Haustür
+    icon: 💡
+    rank: 220
+  - device_id: licht_flur_schrank
+    title: Schranklicht Flur
+    icon: 💡
+    rank: 222
+  - device_id: licht_flur_oben_am_spiegel
+    title: Licht Flur oben am Spiegel
+    icon: 💡
+    rank: 230
+  - device_id: sensor_flur
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 235
+- name: Sportzimmer
+  devices:
+  - device_id: sportlicht_regal
+    title: Sportlicht Regal
+    icon: 🏃
+    rank: 240
+  - device_id: sportlicht_tisch
+    title: Sportlicht Tisch
+    icon: 🏃
+    rank: 250
+  - device_id: sportlicht_am_fernseher_studierzimmer
+    title: Sportlicht am Fernseher, Studierzimmer
+    icon: 🏃
+    rank: 260
+  - device_id: sensor_sportzimmer
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 265
+- name: Bad Oben
+  devices:
+  - device_id: thermostat_bad_oben
+    title: Thermostat Bad Oben
+    icon: 🌡️
+    rank: 270
+  - device_id: kontakt_bad_oben_strasse
+    title: Kontakt Straße
+    icon: 🪟
+    rank: 271
+  - device_id: sensor_bad_oben
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 272
+- name: Bad Unten
+  devices:
+  - device_id: thermostat_bad_unten
+    title: Thermostat Bad Unten
+    icon: 🌡️
+    rank: 280
+  - device_id: kontakt_bad_unten_strasse
+    title: Kontakt Straße
+    icon: 🪟
+    rank: 281
+  - device_id: sensor_bad_unten
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 282
+- name: Waschküche
+  devices:
+  - device_id: sensor_waschkueche
+    title: Temperatur & Luftfeuchte
+    icon: 🌡️
+    rank: 290
+- name: Outdoor
+  devices:
+  - device_id: licht_terasse
+    title: Licht Terasse
+    icon: 💡
+    rank: 290
+- name: Garage
+  devices:
+  - device_id: power_relay_caroutlet
+    title: Ladestrom
+    icon: ⚡
+    rank: 310
+  - device_id: powermeter_caroutlet
+    title: Ladestrom
+    icon: 📊
+    rank: 320
 
 

config/rules.yaml

@@ -0,0 +1,94 @@
+# Rules Configuration
+# Auto-generated from devices.yaml
+
+rules:
+- id: window_setback_esszimmer
+  enabled: false
+  name: Fensterabsenkung Esszimmer
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_esszimmer_strasse_links
+    - kontakt_esszimmer_strasse_rechts
+    thermostats:
+    - thermostat_esszimmer
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
+    previous_target_ttl_secs: 86400
+- id: window_setback_kueche
+  enabled: false
+  name: Fensterabsenkung Küche
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_kueche_garten_fenster
+    - kontakt_kueche_garten_tuer
+    - kontakt_kueche_strasse_links
+    - kontakt_kueche_strasse_rechts
+    thermostats:
+    - thermostat_kueche
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
+    previous_target_ttl_secs: 86400
+- id: window_setback_patty
+  enabled: false
+  name: Fensterabsenkung Arbeitszimmer Patty
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_patty_garten_links
+    - kontakt_patty_garten_rechts
+    - kontakt_patty_strasse
+    thermostats:
+    - thermostat_patty
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
+    previous_target_ttl_secs: 86400
+- id: window_setback_schlafzimmer
+  enabled: false
+  name: Fensterabsenkung Schlafzimmer
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_schlafzimmer_strasse
+    thermostats:
+    - thermostat_schlafzimmer
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
+    previous_target_ttl_secs: 86400
+- id: window_setback_wohnzimmer
+  enabled: false
+  name: Fensterabsenkung Wohnzimmer
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_wohnzimmer_garten_links
+    - kontakt_wohnzimmer_garten_rechts
+    thermostats:
+    - thermostat_wohnzimmer
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
+    previous_target_ttl_secs: 86400
+- id: window_setback_wolfgang
+  enabled: true
+  name: Fensterabsenkung Arbeitszimmer Wolfgang
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_wolfgang_garten
+    thermostats:
+    - thermostat_wolfgang
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20

config/scenes.yaml

@@ -0,0 +1,24 @@
+version: 1
+scenes:
+  - id: "alles_aus"
+    name: "Alles aus"
+    steps:
+      - selector: { type: "light" }
+        action:
+          type: "light"
+          payload: { power: "off" }
+      - selector: { type: "relay" }
+        action:
+          type: "relay"
+          payload: { power: "off" }
+
+  - id: "kueche_gemuetlich"
+    name: "Küche gemütlich"
+    steps:
+      - group_id: "kueche_lichter"
+        action:
+          type: "light"
+          payload:
+            power: "on"
+            brightness: 35
+              

deployment/abstraction-deployment.yaml

@@ -0,0 +1,73 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: abstraction
+  labels:
+    app: abstraction
+    component: home-automation
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: abstraction
+  template:
+    metadata:
+      annotations:
+        reloader.stakater.com/auto: "true"
+        configmap.reloader.stakater.com/reload: "home-automation-environment,home-automation-config"
+      labels:
+        app: abstraction
+        component: home-automation
+    spec:
+      containers:
+      - name: abstraction
+        image: %IMAGE%
+        env:
+        - name: MQTT_BROKER
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_MQTT_BROKER
+        - name: MQTT_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_MQTT_PORT
+        - name: REDIS_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_HOST
+        - name: REDIS_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_PORT
+        - name: REDIS_DB
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_DB
+        volumeMounts:
+        - name: config-volume
+          mountPath: /app/config
+          readOnly: true
+        livenessProbe:
+          exec:
+            command:
+            - /bin/sh
+            - -c
+            - "ps aux | grep -v grep | grep python"
+          initialDelaySeconds: 30
+          periodSeconds: 10
+        resources:
+          limits:
+            cpu: 500m
+            memory: 512Mi
+          requests:
+            cpu: 100m
+            memory: 128Mi
+      volumes:
+      - name: config-volume
+        configMap:
+          name: home-automation-config

deployment/api-deployment.yaml

@@ -0,0 +1,102 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: api
+  namespace: homea2
+  labels:
+    app: api
+    component: home-automation
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: api
+  template:
+    metadata:
+      annotations:
+        reloader.stakater.com/auto: "true"
+        configmap.reloader.stakater.com/reload: "home-automation-environment,home-automation-config"
+      labels:
+        app: api
+        component: home-automation
+    spec:
+      containers:
+      - name: api
+        image: %IMAGE%
+        ports:
+        - containerPort: 8001
+          name: http
+        env:
+        - name: MQTT_BROKER
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_MQTT_BROKER
+        - name: MQTT_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_MQTT_PORT
+        - name: REDIS_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_HOST
+        - name: REDIS_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_PORT
+        - name: REDIS_DB
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_DB
+        - name: REDIS_CHANNEL
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: API_REDIS_CHANNEL
+        volumeMounts:
+        - name: config-volume
+          mountPath: /app/config
+          readOnly: true
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8001
+          initialDelaySeconds: 30
+          periodSeconds: 10
+        readinessProbe:
+          httpGet:
+            path: /health
+            port: 8001
+          initialDelaySeconds: 5
+          periodSeconds: 5
+        resources:
+          limits:
+            cpu: 1000m
+            memory: 1Gi
+          requests:
+            cpu: 200m
+            memory: 256Mi
+      volumes:
+      - name: config-volume
+        configMap:
+          name: home-automation-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: api
+  labels:
+    app: api
+    component: home-automation
+spec:
+  selector:
+    app: api
+  ports:
+  - port: 80
+    targetPort: 8001
+    name: http
+  type: ClusterIP

deployment/configmap.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: home-automation-environment
+  namespace: homea2
+data:
+  # Default environment variables
+  SHARED_MQTT_BROKER: "emqx01-anonymous-cluster-internal.broker.svc.cluster.local"
+  SHARED_MQTT_PORT: "1883"
+  SHARED_REDIS_HOST: "redis-master.redis.svc.cluster.local"
+  SHARED_REDIS_PORT: "6379"
+  SHARED_REDIS_DB: "8"
+  
+  # UI specific environment variables
+  UI_UI_PORT: "8002"
+  UI_API_BASE: "https://homea2-api.hottis.de"
+  UI_BASE_PATH: "/"
+  
+  # API specific environment variables
+  API_REDIS_CHANNEL: "ui:updates"
+  
+  # Rules specific environment variables
+  RULES_RULES_CONFIG: "/app/config/rules.yaml"

deployment/ingress.yaml

@@ -0,0 +1,62 @@
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: homea2-cert
+spec:
+  secretName: homea2-cert
+  issuerRef:
+    name: letsencrypt-production-http
+    kind: ClusterIssuer
+  commonName: homea2.hottis.de
+  dnsNames:
+    - homea2.hottis.de
+    - homea2-api.hottis.de
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: TLSOption
+metadata:
+  name: mtls-required
+spec:
+  clientAuth:
+    clientAuthType: RequireAndVerifyClientCert
+    secretNames:
+      - mtls-ca-cert
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: ui
+spec:
+  entryPoints:
+    - websecure
+  tls:
+    secretName: homea2-cert
+    options:
+      name: mtls-required
+      namespace: homea2
+  routes:
+    - match: Host(`homea2.hottis.de`)
+      kind: Rule
+      services:
+        - name: ui
+          port: 80
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: api
+spec:
+  entryPoints:
+    - websecure
+  tls:
+    secretName: homea2-cert
+    options:
+      name: mtls-required
+      namespace: homea2
+  routes:
+    - match: Host(`homea2-api.hottis.de`)
+      kind: Rule
+      services:
+        - name: api
+          port: 80
+

deployment/rules-deployment.yaml

@@ -0,0 +1,78 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: rules
+  labels:
+    app: rules
+    component: home-automation
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: rules
+  template:
+    metadata:
+      annotations:
+        reloader.stakater.com/auto: "true"
+        configmap.reloader.stakater.com/reload: "home-automation-environment,home-automation-config"
+      labels:
+        app: rules
+        component: home-automation
+    spec:
+      containers:
+      - name: rules
+        image: %IMAGE%
+        env:
+        - name: MQTT_BROKER
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_MQTT_BROKER
+        - name: MQTT_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_MQTT_PORT
+        - name: REDIS_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_HOST
+        - name: REDIS_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_PORT
+        - name: REDIS_DB
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: SHARED_REDIS_DB
+        - name: RULES_CONFIG
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: RULES_RULES_CONFIG
+        volumeMounts:
+        - name: config-volume
+          mountPath: /app/config
+          readOnly: true
+        livenessProbe:
+          exec:
+            command:
+            - /bin/sh
+            - -c
+            - "ps aux | grep -v grep | grep python"
+          initialDelaySeconds: 30
+          periodSeconds: 10
+        resources:
+          limits:
+            cpu: 500m
+            memory: 512Mi
+          requests:
+            cpu: 100m
+            memory: 128Mi
+      volumes:
+      - name: config-volume
+        configMap:
+          name: home-automation-config

deployment/ui-deployment.yaml

@@ -0,0 +1,79 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ui
+  namespace: homea2
+  labels:
+    app: ui
+    component: home-automation
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: ui
+  template:
+    metadata:
+      annotations:
+        reloader.stakater.com/auto: "true"
+        configmap.reloader.stakater.com/reload: "home-automation-environment"
+      labels:
+        app: ui
+        component: home-automation
+    spec:
+      containers:
+      - name: ui
+        image: %IMAGE%
+        ports:
+        - containerPort: 8002
+          name: http
+        env:
+        - name: UI_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: UI_UI_PORT
+        - name: API_BASE
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: UI_API_BASE
+        - name: BASE_PATH
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: UI_BASE_PATH
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 8002
+          initialDelaySeconds: 30
+          periodSeconds: 10
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 8002
+          initialDelaySeconds: 5
+          periodSeconds: 5
+        resources:
+          limits:
+            cpu: 500m
+            memory: 512Mi
+          requests:
+            cpu: 100m
+            memory: 128Mi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ui
+  labels:
+    app: ui
+    component: home-automation
+spec:
+  selector:
+    app: ui
+  ports:
+  - port: 80
+    targetPort: 8002
+    name: http
+  type: ClusterIP

docker-compose.yaml

@@ -0,0 +1,60 @@
+x-environment: &default-env
+  MQTT_BROKER: "172.23.1.102"
+  MQTT_PORT: 1883
+  REDIS_HOST: "172.23.1.116"
+  REDIS_PORT: 6379
+  REDIS_DB: 8
+
+services:
+
+  ui:
+    build:
+      context: .
+      dockerfile: apps/ui/Dockerfile
+    container_name: ui
+    environment:
+      UI_PORT: 8002
+      API_BASE: "http://172.19.1.11:8001"
+      BASE_PATH: "/"
+    ports:
+      - "8002:8002"
+    depends_on:
+      - api
+
+  api:
+    build:
+      context: .
+      dockerfile: apps/api/Dockerfile
+    container_name: api
+    environment:
+      <<: *default-env
+      REDIS_CHANNEL: "ui:updates"
+    volumes:
+      - ./config:/app/config:ro
+    ports:
+      - "8001:8001"
+    depends_on:
+      - abstraction
+
+  abstraction:
+    build:
+      context: .
+      dockerfile: apps/abstraction/Dockerfile
+    container_name: abstraction
+    environment:
+      <<: *default-env
+    volumes:
+      - ./config:/app/config:ro
+
+  rules:
+    build:
+      context: .
+      dockerfile: apps/rules/Dockerfile
+    container_name: rules
+    environment:
+      <<: *default-env
+      RULES_CONFIG: "/app/config/rules.yaml"
+    volumes:
+      - ./config:/app/config:ro
+    depends_on:
+      - abstraction

icon-generator.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Icon Generator</title>
+</head>
+<body>
+    <canvas id="homeCanvas" width="180" height="180" style="border: 1px solid #ccc;"></canvas>
+    <canvas id="garageCanvas" width="180" height="180" style="border: 1px solid #ccc;"></canvas>
+    <br><br>
+    <button onclick="downloadHome()">Download Home Icon</button>
+    <button onclick="downloadGarage()">Download Garage Icon</button>
+
+    <script>
+        // Home Icon
+        const homeCanvas = document.getElementById('homeCanvas');
+        const homeCtx = homeCanvas.getContext('2d');
+        
+        // Fill background
+        homeCtx.fillStyle = '#667EEA';
+        homeCtx.fillRect(0, 0, 180, 180);
+        
+        // Add house emoji
+        homeCtx.font = '80px Arial';
+        homeCtx.fillStyle = 'white';
+        homeCtx.textAlign = 'center';
+        homeCtx.textBaseline = 'middle';
+        homeCtx.fillText('🏡', 90, 90);
+
+        // Garage Icon
+        const garageCanvas = document.getElementById('garageCanvas');
+        const garageCtx = garageCanvas.getContext('2d');
+        
+        // Fill background
+        garageCtx.fillStyle = '#667EEA';
+        garageCtx.fillRect(0, 0, 180, 180);
+        
+        // Add car emoji
+        garageCtx.font = '80px Arial';
+        garageCtx.fillStyle = 'white';
+        garageCtx.textAlign = 'center';
+        garageCtx.textBaseline = 'middle';
+        garageCtx.fillText('🚗', 90, 90);
+
+        function downloadHome() {
+            const link = document.createElement('a');
+            link.download = 'apple-touch-icon.png';
+            link.href = homeCanvas.toDataURL();
+            link.click();
+        }
+
+        function downloadGarage() {
+            const link = document.createElement('a');
+            link.download = 'garage-icon.png';
+            link.href = garageCanvas.toDataURL();
+            link.click();
+        }
+    </script>
+</body>
+</html>

infra/README.md

@@ -1,23 +0,0 @@
-# Infrastructure
-
-This directory contains infrastructure-related files for the home automation project.
-
-## Files
-
-- `docker-compose.yml`: Docker Compose configuration for running services
-
-## Usage
-
-```bash
-# Start services
-docker-compose up -d
-
-# Stop services
-docker-compose down
-```
-
-## TODO
-
-- Add service definitions to docker-compose.yml
-- Add deployment configurations
-- Add monitoring and logging setup

infra/docker-compose.yml

@@ -1,15 +0,0 @@
-version: '3.8'
-
-services:
-  # Placeholder for future services
-  # Example:
-  # api:
-  #   build:
-  #     context: ..
-  #     dockerfile: apps/api/Dockerfile
-  #   ports:
-  #     - "8000:8000"
-  
-  placeholder:
-    image: alpine:latest
-    command: echo "Docker Compose placeholder - add your services here"

packages/home_capabilities/__init__.py

@@ -1,6 +1,63 @@
 """Home capabilities package."""
 
-from packages.home_capabilities.light import CAP_VERSION, LightState
-from packages.home_capabilities.layout import DeviceTile, Room, UiLayout, load_layout
+from packages.home_capabilities.light import CAP_VERSION as LIGHT_VERSION
+from packages.home_capabilities.light import LightState
+from packages.home_capabilities.thermostat import CAP_VERSION as THERMOSTAT_VERSION
+from packages.home_capabilities.thermostat import ThermostatState
+from packages.home_capabilities.contact_sensor import CAP_VERSION as CONTACT_SENSOR_VERSION
+from packages.home_capabilities.contact_sensor import ContactState
+from packages.home_capabilities.temp_humidity_sensor import CAP_VERSION as TEMP_HUMIDITY_SENSOR_VERSION
+from packages.home_capabilities.temp_humidity_sensor import TempHumidityState
+from packages.home_capabilities.relay import CAP_VERSION as RELAY_VERSION
+from packages.home_capabilities.relay import RelayState
+from packages.home_capabilities.three_phase_powermeter import CAP_VERSION as THREE_PHASE_POWERMETER_VERSION
+from packages.home_capabilities.three_phase_powermeter import ThreePhasePowerState
 
-__all__ = ["LightState", "CAP_VERSION", "DeviceTile", "Room", "UiLayout", "load_layout"]
+from packages.home_capabilities.layout import (
+    DeviceTile,
+    Room,
+    UiLayout,
+    load_layout,
+)
+from packages.home_capabilities.groups_scenes import (
+    GroupConfig,
+    GroupsConfigRoot,
+    GroupSelector,
+    SceneConfig,
+    ScenesConfigRoot,
+    SceneSelector,
+    SceneStep,
+    get_group_by_id,
+    get_scene_by_id,
+    load_groups,
+    load_scenes,
+)
+
+__all__ = [
+    "LightState",
+    "LIGHT_VERSION",
+    "ThermostatState",
+    "THERMOSTAT_VERSION",
+    "ContactState",
+    "CONTACT_SENSOR_VERSION",
+    "TempHumidityState",
+    "TEMP_HUMIDITY_SENSOR_VERSION",
+    "RelayState",
+    "RELAY_VERSION",
+    "DeviceTile",
+    "Room",
+    "UiLayout",
+    "load_layout",
+    "GroupConfig",
+    "GroupsConfigRoot",
+    "GroupSelector",
+    "SceneConfig",
+    "ScenesConfigRoot",
+    "SceneSelector",
+    "SceneStep",
+    "get_group_by_id",
+    "get_scene_by_id",
+    "load_groups",
+    "load_scenes",
+    "ThreePhasePowerState",
+]

packages/home_capabilities/contact_sensor.py

@@ -0,0 +1,96 @@
+"""Contact Sensor Capability - Fensterkontakt (read-only).
+
+This module defines the ContactState model for door/window contact sensors.
+These sensors report their open/closed state and are read-only devices.
+
+Capability Version: contact_sensor@1.0.0
+"""
+
+from datetime import datetime
+from typing import Annotated, Literal
+
+from pydantic import BaseModel, Field, field_validator
+
+
+# Capability metadata
+CAP_VERSION = "contact_sensor@1.0.0"
+DISPLAY_NAME = "Contact Sensor"
+
+
+class ContactState(BaseModel):
+    """State model for contact sensors (door/window sensors).
+    
+    Contact sensors are read-only devices that report whether a door or window
+    is open or closed. They typically also report battery level and signal quality.
+    
+    Attributes:
+        contact: Current state of the contact ("open" or "closed")
+        battery: Battery level percentage (0-100), optional
+        linkquality: MQTT link quality indicator, optional
+        device_temperature: Internal device temperature in °C, optional
+        voltage: Battery voltage in mV, optional
+        ts: Timestamp of the state reading, optional
+    
+    Examples:
+        >>> ContactState(contact="open")
+        ContactState(contact='open', battery=None, ...)
+        
+        >>> ContactState(contact="closed", battery=95, linkquality=87)
+        ContactState(contact='closed', battery=95, linkquality=87, ...)
+    """
+    
+    contact: Literal["open", "closed"] = Field(
+        ...,
+        description="Contact state: 'open' for open door/window, 'closed' for closed"
+    )
+    
+    battery: Annotated[int, Field(ge=0, le=100)] | None = Field(
+        None,
+        description="Battery level in percent (0-100)"
+    )
+    
+    linkquality: int | None = Field(
+        None,
+        description="Link quality indicator (typically 0-255)"
+    )
+    
+    device_temperature: float | None = Field(
+        None,
+        description="Internal device temperature in degrees Celsius"
+    )
+    
+    voltage: int | None = Field(
+        None,
+        description="Battery voltage in millivolts"
+    )
+    
+    ts: datetime | None = Field(
+        None,
+        description="Timestamp of the state reading"
+    )
+    
+    @staticmethod
+    def normalize_bool(is_open: bool) -> "ContactState":
+        """Convert boolean to ContactState.
+        
+        Helper method to convert a boolean value to a ContactState instance.
+        Useful when integrating with systems that use True/False for contact state.
+        
+        Args:
+            is_open: True if contact is open, False if closed
+        
+        Returns:
+            ContactState instance with appropriate contact value
+        
+        Examples:
+            >>> ContactState.normalize_bool(True)
+            ContactState(contact='open', ...)
+            
+            >>> ContactState.normalize_bool(False)
+            ContactState(contact='closed', ...)
+        """
+        return ContactState(contact="open" if is_open else "closed")
+
+
+# Public API
+__all__ = ["ContactState", "CAP_VERSION", "DISPLAY_NAME"]

packages/home_capabilities/groups_scenes.py

@@ -0,0 +1,229 @@
+"""
+Configuration models and loaders for groups and scenes.
+
+This module provides Pydantic models for validating groups.yaml and scenes.yaml,
+along with loader functions that parse YAML files into typed configuration objects.
+"""
+
+from pathlib import Path
+from typing import Any
+
+import yaml
+from pydantic import BaseModel, Field, field_validator, model_validator
+
+
+# ============================================================================
+# GROUP MODELS
+# ============================================================================
+
+class GroupSelector(BaseModel):
+    """Selector for automatically adding devices to a group."""
+    type: str = Field(..., description="Device type (e.g., 'light', 'thermostat')")
+    room: str | None = Field(None, description="Filter by room name")
+    tags: list[str] | None = Field(None, description="Filter by device tags")
+
+
+class GroupConfig(BaseModel):
+    """Configuration for a device group."""
+    id: str = Field(..., description="Unique group identifier")
+    name: str = Field(..., description="Human-readable group name")
+    selector: GroupSelector | None = Field(None, description="Auto-select devices by criteria")
+    device_ids: list[str] = Field(default_factory=list, description="Explicit device IDs")
+    capabilities: dict[str, bool] = Field(
+        default_factory=dict,
+        description="Supported capabilities (e.g., {'brightness': True})"
+    )
+
+
+class GroupsConfigRoot(BaseModel):
+    """Root configuration for groups.yaml."""
+    version: int = Field(..., description="Configuration schema version")
+    groups: list[GroupConfig] = Field(default_factory=list, description="List of groups")
+    
+    @field_validator('groups')
+    @classmethod
+    def validate_unique_ids(cls, groups: list[GroupConfig]) -> list[GroupConfig]:
+        """Ensure all group IDs are unique."""
+        ids = [g.id for g in groups]
+        duplicates = [id for id in ids if ids.count(id) > 1]
+        if duplicates:
+            raise ValueError(f"Duplicate group IDs found: {set(duplicates)}")
+        return groups
+
+
+# ============================================================================
+# SCENE MODELS
+# ============================================================================
+
+class SceneSelector(BaseModel):
+    """Selector for targeting devices in a scene step."""
+    type: str | None = Field(None, description="Device type (e.g., 'light', 'outlet')")
+    room: str | None = Field(None, description="Filter by room name")
+    tags: list[str] | None = Field(None, description="Filter by device tags")
+
+
+class SceneStep(BaseModel):
+    """A single step in a scene execution."""
+    selector: SceneSelector | None = Field(None, description="Select devices by criteria")
+    group_id: str | None = Field(None, description="Target a specific group")
+    action: dict[str, Any] = Field(..., description="Action to execute (type + payload)")
+    delay_ms: int | None = Field(None, description="Delay before next step (milliseconds)")
+    
+    @model_validator(mode='after')
+    def validate_selector_or_group(self) -> 'SceneStep':
+        """Ensure either selector OR group_id is specified, but not both."""
+        has_selector = self.selector is not None
+        has_group = self.group_id is not None
+        
+        if not has_selector and not has_group:
+            raise ValueError("SceneStep must have either 'selector' or 'group_id'")
+        
+        if has_selector and has_group:
+            raise ValueError("SceneStep cannot have both 'selector' and 'group_id'")
+        
+        return self
+
+
+class SceneConfig(BaseModel):
+    """Configuration for a scene."""
+    id: str = Field(..., description="Unique scene identifier")
+    name: str = Field(..., description="Human-readable scene name")
+    steps: list[SceneStep] = Field(..., description="Ordered list of actions")
+
+
+class ScenesConfigRoot(BaseModel):
+    """Root configuration for scenes.yaml."""
+    version: int = Field(..., description="Configuration schema version")
+    scenes: list[SceneConfig] = Field(default_factory=list, description="List of scenes")
+    
+    @field_validator('scenes')
+    @classmethod
+    def validate_unique_ids(cls, scenes: list[SceneConfig]) -> list[SceneConfig]:
+        """Ensure all scene IDs are unique."""
+        ids = [s.id for s in scenes]
+        duplicates = [id for id in ids if ids.count(id) > 1]
+        if duplicates:
+            raise ValueError(f"Duplicate scene IDs found: {set(duplicates)}")
+        return scenes
+
+
+# ============================================================================
+# LOADER FUNCTIONS
+# ============================================================================
+
+def load_groups(path: Path | str) -> GroupsConfigRoot:
+    """
+    Load and validate groups configuration from YAML file.
+    
+    Args:
+        path: Path to groups.yaml file
+        
+    Returns:
+        Validated GroupsConfigRoot object
+        
+    Raises:
+        FileNotFoundError: If config file doesn't exist
+        ValidationError: If configuration is invalid
+        ValueError: If duplicate group IDs are found or YAML is empty
+    """
+    path = Path(path)
+    
+    if not path.exists():
+        raise FileNotFoundError(f"Groups config file not found: {path}")
+    
+    with open(path, 'r', encoding='utf-8') as f:
+        data = yaml.safe_load(f)
+    
+    if data is None:
+        raise ValueError(f"Groups config file is empty: {path}")
+    
+    return GroupsConfigRoot.model_validate(data)
+
+
+def load_scenes(path: Path | str) -> ScenesConfigRoot:
+    """
+    Load and validate scenes configuration from YAML file.
+    
+    Args:
+        path: Path to scenes.yaml file
+        
+    Returns:
+        Validated ScenesConfigRoot object
+        
+    Raises:
+        FileNotFoundError: If config file doesn't exist
+        ValidationError: If configuration is invalid
+        ValueError: If duplicate scene IDs, invalid steps, or empty YAML are found
+    """
+    path = Path(path)
+    
+    if not path.exists():
+        raise FileNotFoundError(f"Scenes config file not found: {path}")
+    
+    with open(path, 'r', encoding='utf-8') as f:
+        data = yaml.safe_load(f)
+    
+    if data is None:
+        raise ValueError(f"Scenes config file is empty: {path}")
+    
+    return ScenesConfigRoot.model_validate(data)
+
+
+# ============================================================================
+# CONVENIENCE FUNCTIONS
+# ============================================================================
+
+def get_group_by_id(config: GroupsConfigRoot, group_id: str) -> GroupConfig | None:
+    """Find a group by its ID."""
+    for group in config.groups:
+        if group.id == group_id:
+            return group
+    return None
+
+
+def get_scene_by_id(config: ScenesConfigRoot, scene_id: str) -> SceneConfig | None:
+    """Find a scene by its ID."""
+    for scene in config.scenes:
+        if scene.id == scene_id:
+            return scene
+    return None
+
+
+# ============================================================================
+# EXAMPLE USAGE
+# ============================================================================
+
+if __name__ == "__main__":
+    from pathlib import Path
+    
+    # Example: Load groups configuration
+    try:
+        groups_path = Path(__file__).parent.parent / "config" / "groups.yaml"
+        groups = load_groups(groups_path)
+        print(f"✓ Loaded {len(groups.groups)} groups (version {groups.version})")
+        for group in groups.groups:
+            print(f"  - {group.id}: {group.name}")
+            if group.selector:
+                print(f"    Selector: type={group.selector.type}, room={group.selector.room}")
+            if group.device_ids:
+                print(f"    Devices: {', '.join(group.device_ids)}")
+    except Exception as e:
+        print(f"✗ Error loading groups: {e}")
+    
+    print()
+    
+    # Example: Load scenes configuration
+    try:
+        scenes_path = Path(__file__).parent.parent / "config" / "scenes.yaml"
+        scenes = load_scenes(scenes_path)
+        print(f"✓ Loaded {len(scenes.scenes)} scenes (version {scenes.version})")
+        for scene in scenes.scenes:
+            print(f"  - {scene.id}: {scene.name} ({len(scene.steps)} steps)")
+            for i, step in enumerate(scene.steps, 1):
+                if step.selector:
+                    print(f"    Step {i}: selector type={step.selector.type}")
+                elif step.group_id:
+                    print(f"    Step {i}: group_id={step.group_id}")
+                print(f"      Action: {step.action}")
+    except Exception as e:
+        print(f"✗ Error loading scenes: {e}")

packages/home_capabilities/relay.py

@@ -0,0 +1,21 @@
+"""
+Relay capability model.
+A relay is essentially a simple on/off switch, like a light with only power control.
+"""
+
+from pydantic import BaseModel, Field
+from typing import Literal
+
+# Capability version
+CAP_VERSION = "relay@1.0.0"
+DISPLAY_NAME = "Relay"
+
+
+class RelayState(BaseModel):
+    """State model for relay devices (on/off only)"""
+    power: Literal["on", "off"] = Field(..., description="Power state: on or off")
+
+
+class RelaySetPayload(BaseModel):
+    """Payload for setting relay state"""
+    power: Literal["on", "off"] = Field(..., description="Desired power state: on or off")

packages/home_capabilities/temp_humidity_sensor.py

@@ -0,0 +1,37 @@
+"""
+Temperature & Humidity Sensor Capability - temp_humidity_sensor@1.0.0
+
+Read-only sensor for temperature and humidity measurements.
+"""
+
+from datetime import datetime
+from typing import Annotated
+
+from pydantic import BaseModel, Field
+
+
+class TempHumidityState(BaseModel):
+    """
+    State model for temperature & humidity sensors.
+    
+    Required fields:
+    - temperature: Temperature in degrees Celsius
+    - humidity: Relative humidity in percent
+    
+    Optional fields:
+    - battery: Battery level 0-100%
+    - linkquality: Signal quality indicator
+    - voltage: Battery voltage in mV
+    - ts: Timestamp of measurement
+    """
+    temperature: float = Field(..., description="Temperature in degrees Celsius")
+    humidity: float = Field(..., description="Relative humidity in percent (0-100)")
+    battery: Annotated[int, Field(ge=0, le=100)] | None = None
+    linkquality: int | None = None
+    voltage: int | None = None
+    ts: datetime | None = None
+
+
+# Capability metadata
+CAP_VERSION = "temp_humidity_sensor@1.0.0"
+DISPLAY_NAME = "Temperature & Humidity Sensor"

packages/home_capabilities/thermostat.py

@@ -0,0 +1,77 @@
+"""
+Thermostat Capability Model
+Pydantic v2 model for thermostat device state and commands.
+"""
+
+from decimal import Decimal
+from typing import Literal
+
+from pydantic import BaseModel, Field
+
+CAP_VERSION = "thermostat@2.0.0"
+
+
+class ThermostatState(BaseModel):
+    """
+    Thermostat state model with validation.
+    
+    Attributes:
+        mode: Operating mode (off, heat, auto) - optional for SET commands
+        target: Target temperature in °C [5.0..30.0]
+        current: Current temperature in °C (optional in SET, required in STATE)
+        battery: Battery level 0-100% (optional)
+        window_open: Window open detection (optional)
+    """
+    
+    mode: Literal["off", "heat", "auto"] | None = Field(
+        None,
+        description="Operating mode of the thermostat (optional for SET commands)"
+    )
+    
+    target: float | Decimal = Field(
+        ...,
+        ge=5.0,
+        le=30.0,
+        description="Target temperature in degrees Celsius"
+    )
+    
+    current: float | Decimal | None = Field(
+        None,
+        ge=0.0,
+        description="Current measured temperature in degrees Celsius"
+    )
+    
+    battery: int | None = Field(
+        None,
+        ge=0,
+        le=100,
+        description="Battery level percentage"
+    )
+    
+    window_open: bool | None = Field(
+        None,
+        description="Window open detection status"
+    )
+    
+    model_config = {
+        "json_schema_extra": {
+            "examples": [
+                {
+                    "mode": "heat",
+                    "target": 21.0,
+                    "current": 20.2,
+                    "battery": 85,
+                    "window_open": False
+                },
+                {
+                    "mode": "auto",
+                    "target": 22.5
+                },
+                {
+                    "mode": "off",
+                    "target": 5.0,
+                    "current": 18.0
+                }
+            ]
+        }
+    }

packages/home_capabilities/three_phase_powermeter.py

@@ -0,0 +1,29 @@
+from pydantic import BaseModel, Field
+
+class ThreePhasePowerState(BaseModel):
+    """
+    State model for a three-phase power meter.
+    
+    Required fields:
+    - energy: Total energy in kWh
+    - total_power: Total power in W
+    - phase1_power, phase2_power, phase3_power: Power per phase in W
+    - phase1_voltage, phase2_voltage, phase3_voltage: Voltage per phase in V
+    - phase1_current, phase2_current, phase3_current: Current per phase in A
+    """
+    energy: float = Field(..., description="Total energy in kWh")
+    total_power: float = Field(..., description="Total power in W")
+    phase1_power: float = Field(..., description="Power for phase 1 in W")
+    phase2_power: float = Field(..., description="Power for phase 2 in W")
+    phase3_power: float = Field(..., description="Power for phase 3 in W")
+    phase1_voltage: float = Field(..., description="Voltage for phase 1 in V")
+    phase2_voltage: float = Field(..., description="Voltage for phase 2 in V")
+    phase3_voltage: float = Field(..., description="Voltage for phase 3 in V")
+    phase1_current: float = Field(..., description="Current for phase 1 in A")
+    phase2_current: float = Field(..., description="Current for phase 2 in A")
+    phase3_current: float = Field(..., description="Current for phase 3 in A")
+
+
+# Capability metadata
+CAP_VERSION = "three_phase_powermeter@1.0.0"
+DISPLAY_NAME = "Three-Phase Power Meter"

tools/certificates.asc

@@ -0,0 +1,693 @@
+-----BEGIN PGP MESSAGE-----
+
+jA0ECQMIvcxCfrertFn90v8AAID+ASqxcvgoVWTsLJvACtmb7XYOQWfNQINjnHsz
+8mdEMR18Qyj/z981Yo/MgjY4V+jDChHdaTRGNnWkQ08lvGax3pN9NfxTsfc//OoZ
+cTxm/VutVyTh5u/kXezTr0RObDZUSIEg0VnoogxFJodPzkQxR/W3sCn+d/GnDROH
+udh/MNiS/a5Q9JdNSu9mmMKIrvkdxJn5JplgzrRjXpX3LqxaJwr2jMIz0u1MnsUM
+4GqDgof+WYI/fHKUie9dMxQdhYDYOFdCSjEZ2NOPQkID/XCR2tQ/GbrCpCVRUA2Z
+tjCk3S0CflVYUyw2yPfVEP6QPGgfWcdjBgdX1reWCYC5sKMnW39k2k9BUfJ9EDNx
+jvWwJ82xMwTjCmNzWUTznSP5EX1VEV8IockytkNiqwecwmW9XIkNbw/KN+SOxlfj
+4wvOGvueYVUePf+3xveghXwCD7kjGmYkKweU241177suqIRvfGsOiiKSTqVHAfHH
+zPvVsz6ix5QPsze0SSPNHFR6025s89OEzdOgjHbTmdVaDsnxdg7NCyGgYpXK0CwY
+Dmusoe4dVJzPVBvyGCse8SQ9dFWuR5joa4N2HxgfwO/69kIqmSWWYL4Tvgp1J90i
+HcM0xH2QJFQpWEkLkUaxDGrdkSHkzS5kmZpjkbVpf1qihdIfnSENVc/xkZoHgZKx
+G2Zp6sVtTdWgYJhF884ygCvXUwlRyYIs+XgVN0zpr2UmWNrGa1WBGdbr62ZcF/DJ
+c6aMrpOel6u0GDYsrIsTpiCmD99P/VHYXgxqE80+WL1nJh52PrBy8giqDDl57BSH
+aW3xCke0eF7/hrhohHbRM3pIi7700gr3CJU03BqLpaGFLo2YF88L9N+Udylr+bBx
+hQG4gqWoKp/lKx+9zn214w/h01FA1c+gbM187JGh5KTYZeIpbftgpC55UH3n/Awy
+dL78XRfPm6EDjIhjmD1sNIw6P3wk7YiO58lfT2zLjVM9Pslh7VMUiOWJHcKmY9vP
+w5geylCBRqIOXwzcJn0Klu8ZAimG6cUmWgfW/FoStR8iKyAVIgK0bUcc8ItMARlU
+933HUrmk/GL9ioEOfdIHwiGdLK8MhbRpZwpgcnTYktZjvatqZlxN/ZVDdoQ6JG1z
+Wd3LHk/Q9j7mW+oZb3o32zGfZvAwAPKGcUEEHHtbqW1C4SimzELflH5rfsIL5O2O
+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
+swNOfIucci2SoV/IhTA+Ljp2YHKlSf4b3U+qPfhOJMvb5lGM26CKx9+DqvXNSWe0
+BrrTRAmyT6M1NtIp6IWmr3Pc4hOpfKCSOitYUzy39x977WCvRG+Wn26ftHOr04IU
+ziSMZj49i8jHW60jqJ3Ueoz1UHyA6h6i/FBlXlo8GrWvxNT8WBttkOclwUe5AsMS
+rtlN/4SVCZ147MmMxn6qnYs6i/V6YasHY3S7mmWqbSa6qRaZ8kmyHrXdNTSHDfZw
+ZH5UkdcnjPbDhGFzdXDhxFqRPASuF3UPbI/P7bRFOqyr2iaPYoC0o5JKtKYkr9ly
+njdMxUY42IpavLbAtBTr3HwFcUBxqSufxN6osp69b5UJU9bn5lS6XuVx4YbtDa2N
+YXU8zE0rLIezOI6Xi5PmoenOACnu2SismLIINyWn+NS6aINVKQSoAyi/30qsdYli
+y55B2ixsc3e82AYzDAbqYCS8/Yxkir5SaocVfMryMAkGMbmBnazORPcGOlpb/i6h
+KKYKvZiAq23mYkVeFCNjctZb82AMQWWKkTPkEdj3L9mQjvIZOCnMBmZEPxqyTsRn
+OLVbl5BtNn9O59Wv7K/Wl5ItUGUIYtBKS3Hr/xAUe7RParzi3uX9G07ZD2+Xka2r
+H2SUCsTlUuBvGJT/0BmcumwxYpgF9aypoNdCtvcN9Xp8BMoMPeMvvPIyWCr0DlrF
++85rfl8QJxGlRKibhCfrrfJH7ZL8Xd2ITh/RSjgbaw/SN8ZZnA2IVlKZSCTmKyuW
+XnvbH3BmgXPG7L8rKi537a11O9LRduRwZbsqOdAurQk/ehRw6CddV+BRvMmTEW1E
+4I04u94tLGw5TLVnademSro1RVzBIb2zfG0C2kP/0V7/yWUaLqNJR5LzCXqDx4BN
+FY14IY0A10dOR2PAF4hrXYCMmvc+yJQXnX1OQFIgCuqFugovRKuwxKjVwJlYk+/U
+xNx0fPlmtXu4nXuMRbtw5kPXAh/mrMDWVEAULfE0NMDjNhvKeLzYFNp64Om2Yh7j
+453j3SBuKL0mZ9pVrwty0hzNwdgfE6mBhu6KPgpDpa2F21wqJlxvcheVGaqEg+iv
+JoT5NksEoiur8bEYQj6BNlbfDwQszL47TlnfExoWk41VQtljsMHsqFNevAZLXu78
+lTysCe7aHu/tOnp4cN24/U5ZiBtGrBrEvW7fmZlDiZHVPM9+4bBw6b+0gkCLn1cc
+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
+weJlzvZk7gLaVw6ey1/Io/uNQw==
+=7Zeo
+-----END PGP MESSAGE-----

tools/create-client-cert.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+set -e
+
+# Check if client name and password are provided
+if [ $# -lt 2 ]; then
+    echo "Usage: $0 <client-name> <p12-password>"
+    echo "Example: $0 john.doe mySecurePassword123"
+    exit 1
+fi
+
+CLIENT_NAME="$1"
+P12_PASSWORD="$2"
+
+# Check if CA exists
+if [ ! -f "certificates/ca/ca.crt" ] || [ ! -f "certificates/ca/ca.key" ]; then
+    echo "Error: CA not found. Please run setup-ca.sh first."
+    exit 1
+fi
+
+echo "=== Creating Client Certificate ==="
+echo "Client Name: $CLIENT_NAME"
+
+# Create client directory
+mkdir -p certificates/clients/$CLIENT_NAME
+
+# Generate client private key
+echo "Generating client private key..."
+openssl genrsa -out certificates/clients/$CLIENT_NAME/$CLIENT_NAME.key 2048
+# Generate client certificate signing request
+echo "Generating client certificate signing request..."
+openssl req -new -key certificates/clients/$CLIENT_NAME/$CLIENT_NAME.key \
+    -out certificates/clients/$CLIENT_NAME/$CLIENT_NAME.csr \
+    -subj "/DC=de/DC=hottis/DC=homea2/CN=$CLIENT_NAME"
+
+# Sign the client certificate
+echo "Signing client certificate..."
+openssl x509 -req -in certificates/clients/$CLIENT_NAME/$CLIENT_NAME.csr \
+    -CA certificates/ca/ca.crt -CAkey certificates/ca/ca.key -CAcreateserial \
+    -out certificates/clients/$CLIENT_NAME/$CLIENT_NAME.crt \
+    -days 365 -sha256
+
+# Create PKCS#12 bundle
+echo "Creating PKCS#12 bundle..."
+openssl pkcs12 -export \
+    -out certificates/clients/$CLIENT_NAME/$CLIENT_NAME.p12 \
+    -inkey certificates/clients/$CLIENT_NAME/$CLIENT_NAME.key \
+    -in certificates/clients/$CLIENT_NAME/$CLIENT_NAME.crt \
+    -certfile certificates/ca/ca.crt \
+    -name "$CLIENT_NAME Home Automation Client" \
+    -passout pass:$P12_PASSWORD
+
+# Set appropriate permissions
+chmod 400 certificates/clients/$CLIENT_NAME/$CLIENT_NAME.key
+chmod 644 certificates/clients/$CLIENT_NAME/$CLIENT_NAME.crt
+chmod 644 certificates/clients/$CLIENT_NAME/$CLIENT_NAME.p12
+
+# Verify client certificate
+echo "Verifying client certificate..."
+openssl x509 -noout -text -in certificates/clients/$CLIENT_NAME/$CLIENT_NAME.crt
+echo ""
+echo "=== Client Certificate Created ==="
+echo "Client Certificate: certificates/clients/$CLIENT_NAME/$CLIENT_NAME.crt"
+echo "Client Private Key: certificates/clients/$CLIENT_NAME/$CLIENT_NAME.key"
+echo "PKCS#12 Bundle: certificates/clients/$CLIENT_NAME/$CLIENT_NAME.p12"
+echo ""
+echo "Installation Instructions:"
+echo "1. Import the PKCS#12 file into your browser/application"
+echo "2. The bundle contains both the client certificate and CA certificate"
+echo "3. Password for PKCS#12 file: $P12_PASSWORD"
+echo ""
+echo "For testing with curl:"
+echo "curl --cert certificates/clients/$CLIENT_NAME/$CLIENT_NAME.crt --key certificates/clients/$CLIENT_NAME/$CLIENT_NAME.key https://homea2.hottis.de/"

tools/decrypt-certificates.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+
+
+set -e
+
+gpg --decrypt --pinentry-mode=loopback --output certificates.tgz certificates.asc
+
+tar -xzvf certificates.tgz ./certificates/
+
+rm certificates.tgz
+

tools/encrypt-certificates.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+
+
+set -e
+
+tar -czvf certificates.tgz ./certificates/
+
+gpg --symmetric --cipher-algo AES256 --armor --pinentry-mode=loopback --output certificates.asc certificates.tgz
+
+rm certificates.tgz
+
+

tools/setup-ca.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+echo "=== mTLS CA Setup ==="
+
+# Create CA directory
+mkdir -p certificates/ca
+
+# Generate CA private key
+echo "Generating CA private key..."
+openssl genrsa -out certificates/ca/ca.key 2048
+# Generate CA certificate
+echo "Generating CA certificate..."
+openssl req -new -x509 -days 3650 -key certificates/ca/ca.key -out certificates/ca/ca.crt \
+    -subj "/DC=de/DC=hottis/DC=homea2/CN=Home Automation CA"
+
+echo ""
+echo "=== CA Setup Complete ==="
+echo "CA Certificate: certificates/ca/ca.crt"
+echo "CA Private Key: certificates/ca/ca.key"
+echo ""
+echo "Deploy to Kubernetes:"
+echo "kubectl create secret generic mtls-ca-cert --from-file=ca.crt=certificates/ca/ca.crt -n homea2"

tools/sim_test_lampe.py

@@ -1,215 +0,0 @@
-#!/usr/bin/env python3
-"""MQTT Simulator for multiple test_lampe devices.
-
-This simulator acts as virtual light devices that:
-- Subscribe to vendor/test_lampe_*/set
-- Maintain local state for each device
-- Publish state changes to vendor/test_lampe_*/state (retained)
-"""
-
-import json
-import logging
-import os
-import signal
-import sys
-import time
-
-import paho.mqtt.client as mqtt
-
-# Configure logging
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-)
-logger = logging.getLogger(__name__)
-
-# Configuration
-BROKER_HOST = os.environ.get("MQTT_HOST", "172.16.2.16")
-BROKER_PORT = int(os.environ.get("MQTT_PORT", "1883"))
-
-# Devices to simulate
-DEVICES = ["test_lampe_1", "test_lampe_2", "test_lampe_3"]
-
-# Device states (one per device)
-device_states = {
-    "test_lampe_1": {
-        "power": "off",
-        "brightness": 50
-    },
-    "test_lampe_2": {
-        "power": "off",
-        "brightness": 50
-    },
-    "test_lampe_3": {
-        "power": "off",
-        "brightness": 50
-    }
-}
-
-# Global client for signal handler
-client_global = None
-
-
-def on_connect(client, userdata, flags, rc, properties=None):
-    """Callback when connected to MQTT broker.
-    
-    Args:
-        client: MQTT client instance
-        userdata: User data
-        flags: Connection flags
-        rc: Connection result code
-        properties: Connection properties (MQTT v5)
-    """
-    if rc == 0:
-        logger.info(f"Connected to MQTT broker {BROKER_HOST}:{BROKER_PORT}")
-        
-        # Subscribe to SET topics for all devices
-        for device_id in DEVICES:
-            set_topic = f"vendor/{device_id}/set"
-            client.subscribe(set_topic, qos=1)
-            logger.info(f"Subscribed to {set_topic}")
-        
-        # Publish initial states (retained)
-        for device_id in DEVICES:
-            publish_state(client, device_id)
-            logger.info(f"Simulator started for {device_id}, initial state: {device_states[device_id]}")
-    else:
-        logger.error(f"Connection failed with code {rc}")
-
-
-def on_message(client, userdata, msg):
-    """Callback when message received on subscribed topic.
-    
-    Args:
-        client: MQTT client instance
-        userdata: User data
-        msg: MQTT message
-    """
-    # Extract device_id from topic (vendor/test_lampe_X/set)
-    topic_parts = msg.topic.split('/')
-    if len(topic_parts) != 3 or topic_parts[0] != "vendor" or topic_parts[2] != "set":
-        logger.warning(f"Unexpected topic format: {msg.topic}")
-        return
-    
-    device_id = topic_parts[1]
-    
-    if device_id not in device_states:
-        logger.warning(f"Unknown device: {device_id}")
-        return
-    
-    try:
-        payload = json.loads(msg.payload.decode())
-        logger.info(f"[{device_id}] Received SET command: {payload}")
-        
-        # Update device state
-        updated = False
-        device_state = device_states[device_id]
-        
-        if "power" in payload:
-            old_power = device_state["power"]
-            device_state["power"] = payload["power"]
-            if old_power != device_state["power"]:
-                updated = True
-                logger.info(f"[{device_id}] Power changed: {old_power} -> {device_state['power']}")
-        
-        if "brightness" in payload:
-            old_brightness = device_state["brightness"]
-            device_state["brightness"] = int(payload["brightness"])
-            if old_brightness != device_state["brightness"]:
-                updated = True
-                logger.info(f"[{device_id}] Brightness changed: {old_brightness} -> {device_state['brightness']}")
-        
-        # Publish updated state if changed
-        if updated:
-            publish_state(client, device_id)
-            logger.info(f"[{device_id}] Published new state: {device_state}")
-        
-    except json.JSONDecodeError as e:
-        logger.error(f"[{device_id}] Invalid JSON in message: {e}")
-    except Exception as e:
-        logger.error(f"[{device_id}] Error processing message: {e}")
-
-
-def publish_state(client, device_id):
-    """Publish current device state to STATE topic.
-    
-    Args:
-        client: MQTT client instance
-        device_id: Device identifier
-    """
-    device_state = device_states[device_id]
-    state_topic = f"vendor/{device_id}/state"
-    state_json = json.dumps(device_state)
-    result = client.publish(state_topic, state_json, qos=1, retain=True)
-    
-    if result.rc == mqtt.MQTT_ERR_SUCCESS:
-        logger.debug(f"[{device_id}] Published state to {state_topic}: {state_json}")
-    else:
-        logger.error(f"[{device_id}] Failed to publish state: {result.rc}")
-
-
-def signal_handler(sig, frame):
-    """Handle shutdown signals gracefully.
-    
-    Args:
-        sig: Signal number
-        frame: Current stack frame
-    """
-    logger.info(f"Received signal {sig}, shutting down...")
-    
-    if client_global:
-        # Publish offline state for all devices before disconnecting
-        for device_id in DEVICES:
-            offline_state = device_states[device_id].copy()
-            offline_state["power"] = "off"
-            state_topic = f"vendor/{device_id}/state"
-            client_global.publish(state_topic, json.dumps(offline_state), qos=1, retain=True)
-            logger.info(f"[{device_id}] Published offline state")
-        
-        client_global.disconnect()
-        client_global.loop_stop()
-    
-    sys.exit(0)
-
-
-def main():
-    """Main entry point for the simulator."""
-    global client_global
-    
-    # Setup signal handlers
-    signal.signal(signal.SIGINT, signal_handler)
-    signal.signal(signal.SIGTERM, signal_handler)
-    
-    # Create MQTT client
-    client = mqtt.Client(
-        client_id="simulator-test-lampes",
-        protocol=mqtt.MQTTv5,
-        callback_api_version=mqtt.CallbackAPIVersion.VERSION2
-    )
-    client_global = client
-    
-    # Set callbacks
-    client.on_connect = on_connect
-    client.on_message = on_message
-    
-    # Connect to broker
-    logger.info(f"Connecting to MQTT broker {BROKER_HOST}:{BROKER_PORT}...")
-    
-    try:
-        client.connect(BROKER_HOST, BROKER_PORT, keepalive=60)
-        
-        # Start network loop
-        client.loop_forever()
-        
-    except KeyboardInterrupt:
-        logger.info("Interrupted by user")
-    except Exception as e:
-        logger.error(f"Error: {e}")
-    finally:
-        if client.is_connected():
-            client.disconnect()
-        client.loop_stop()
-
-
-if __name__ == "__main__":
-    main()

tools/test_api_client.py

@@ -1,169 +0,0 @@
-"""
-Acceptance tests for API Client (fetch_devices).
-
-Tests:
-1. API running: fetch_devices() returns list with test_lampe_1, test_lampe_2
-2. API down: fetch_devices() returns empty list without crash
-"""
-import sys
-import time
-import subprocess
-from apps.ui.api_client import fetch_devices
-
-
-def test_api_running():
-    """Test 1: API is running -> fetch_devices() returns devices."""
-    print("Test 1: API running")
-    print("-" * 60)
-    
-    devices = fetch_devices("http://localhost:8001")
-    
-    if not devices:
-        print("  ✗ FAILED: Expected devices, got empty list")
-        return False
-    
-    print(f"  ✓ Received {len(devices)} devices")
-    
-    # Check structure
-    for device in devices:
-        device_id = device.get("device_id")
-        device_type = device.get("type")
-        name = device.get("name")
-        
-        if not device_id:
-            print(f"  ✗ FAILED: Device missing 'device_id': {device}")
-            return False
-        
-        if not device_type:
-            print(f"  ✗ FAILED: Device missing 'type': {device}")
-            return False
-        
-        if not name:
-            print(f"  ✗ FAILED: Device missing 'name': {device}")
-            return False
-        
-        print(f"    • {device_id} (type={device_type}, name={name})")
-    
-    # Check for expected devices
-    device_ids = {d["device_id"] for d in devices}
-    expected = {"test_lampe_1", "test_lampe_2"}
-    
-    if not expected.issubset(device_ids):
-        missing = expected - device_ids
-        print(f"  ✗ FAILED: Missing devices: {missing}")
-        return False
-    
-    print("  ✓ All expected devices present")
-    print()
-    return True
-
-
-def test_api_down():
-    """Test 2: API is down -> fetch_devices() returns empty list without crash."""
-    print("Test 2: API down (invalid port)")
-    print("-" * 60)
-    
-    try:
-        devices = fetch_devices("http://localhost:9999")
-        
-        if devices != []:
-            print(f"  ✗ FAILED: Expected empty list, got {len(devices)} devices")
-            return False
-        
-        print("  ✓ Returns empty list without crash")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: Exception raised: {e}")
-        print()
-        return False
-
-
-def test_api_timeout():
-    """Test 3: API timeout -> fetch_devices() returns empty list."""
-    print("Test 3: API timeout")
-    print("-" * 60)
-    
-    # Use httpbin.org delay endpoint to simulate slow API
-    try:
-        start = time.time()
-        devices = fetch_devices("https://httpbin.org/delay/5")  # 5s delay, but 3s timeout
-        elapsed = time.time() - start
-        
-        if devices != []:
-            print(f"  ✗ FAILED: Expected empty list, got {len(devices)} devices")
-            return False
-        
-        if elapsed >= 4.0:
-            print(f"  ✗ FAILED: Timeout not enforced (took {elapsed:.1f}s)")
-            return False
-        
-        print(f"  ✓ Returns empty list after timeout ({elapsed:.1f}s)")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: Exception raised: {e}")
-        print()
-        return False
-
-
-def main():
-    """Run all acceptance tests."""
-    print("=" * 60)
-    print("Testing API Client (fetch_devices)")
-    print("=" * 60)
-    print()
-    
-    # Check if API is running
-    print("Prerequisites: Checking if API is running on port 8001...")
-    try:
-        devices = fetch_devices("http://localhost:8001")
-        if devices:
-            print(f"✓ API is running ({len(devices)} devices found)")
-            print()
-        else:
-            print("⚠ API might not be running (no devices returned)")
-            print("  Start API with: poetry run uvicorn apps.api.main:app --port 8001")
-            print()
-    except Exception as e:
-        print(f"✗ Cannot reach API: {e}")
-        print("  Start API with: poetry run uvicorn apps.api.main:app --port 8001")
-        print()
-        sys.exit(1)
-    
-    results = []
-    
-    # Test 1: API running
-    results.append(("API running", test_api_running()))
-    
-    # Test 2: API down
-    results.append(("API down", test_api_down()))
-    
-    # Test 3: Timeout
-    results.append(("API timeout", test_api_timeout()))
-    
-    # Summary
-    print("=" * 60)
-    passed = sum(1 for _, result in results if result)
-    total = len(results)
-    print(f"Results: {passed}/{total} tests passed")
-    print("=" * 60)
-    
-    for name, result in results:
-        status = "✓" if result else "✗"
-        print(f"  {status} {name}")
-    
-    if passed == total:
-        print()
-        print("All tests passed!")
-        sys.exit(0)
-    else:
-        print()
-        print("Some tests failed.")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()

tools/test_config_loader.py

@@ -1,253 +0,0 @@
-#!/usr/bin/env python3
-"""Test configuration loader with different YAML formats."""
-
-import sys
-import tempfile
-from pathlib import Path
-
-# Add parent directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent))
-
-from apps.abstraction.main import load_config, validate_devices
-
-
-def test_device_id_format():
-    """Test YAML with 'device_id' key."""
-    yaml_content = """version: 1
-
-mqtt:
-  broker: "172.16.2.16"
-  port: 1883
-  client_id: "test"
-
-redis:
-  url: "redis://localhost:6379/8"
-  channel: "ui:updates"
-
-devices:
-  - device_id: test_lampe
-    type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    features:
-      power: true
-    topics:
-      set: "vendor/test_lampe/set"
-      state: "vendor/test_lampe/state"
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        config = load_config(temp_path)
-        devices = config.get("devices", [])
-        validate_devices(devices)
-        print("✓ Test 1 passed: YAML with 'device_id' loaded successfully")
-        print(f"  Device ID: {devices[0]['device_id']}")
-        return True
-    except Exception as e:
-        print(f"✗ Test 1 failed: {e}")
-        return False
-    finally:
-        temp_path.unlink()
-
-
-def test_id_format():
-    """Test YAML with 'id' key (legacy format)."""
-    yaml_content = """version: 1
-
-mqtt:
-  broker: "172.16.2.16"
-  port: 1883
-  client_id: "test"
-
-redis:
-  url: "redis://localhost:6379/8"
-  channel: "ui:updates"
-
-devices:
-  - id: test_lampe
-    type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    features:
-      power: true
-    topics:
-      set: "vendor/test_lampe/set"
-      state: "vendor/test_lampe/state"
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        config = load_config(temp_path)
-        devices = config.get("devices", [])
-        validate_devices(devices)
-        print("✓ Test 2 passed: YAML with 'id' loaded successfully")
-        print(f"  Device ID: {devices[0]['device_id']}")
-        return True
-    except Exception as e:
-        print(f"✗ Test 2 failed: {e}")
-        return False
-    finally:
-        temp_path.unlink()
-
-
-def test_missing_id():
-    """Test YAML without 'id' or 'device_id' key."""
-    yaml_content = """version: 1
-
-mqtt:
-  broker: "172.16.2.16"
-  port: 1883
-
-devices:
-  - type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    topics:
-      set: "vendor/test_lampe/set"
-      state: "vendor/test_lampe/state"
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        config = load_config(temp_path)
-        devices = config.get("devices", [])
-        validate_devices(devices)
-        print("✗ Test 3 failed: Should have raised ValueError for missing device_id")
-        return False
-    except ValueError as e:
-        if "requires 'id' or 'device_id'" in str(e):
-            print(f"✓ Test 3 passed: Correct error for missing device_id")
-            print(f"  Error: {e}")
-            return True
-        else:
-            print(f"✗ Test 3 failed: Wrong error message: {e}")
-            return False
-    except Exception as e:
-        print(f"✗ Test 3 failed: Unexpected error: {e}")
-        return False
-    finally:
-        temp_path.unlink()
-
-
-def test_missing_topics_set():
-    """Test YAML without 'topics.set'."""
-    yaml_content = """version: 1
-
-mqtt:
-  broker: "172.16.2.16"
-  port: 1883
-
-devices:
-  - device_id: test_lampe
-    type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    topics:
-      state: "vendor/test_lampe/state"
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        config = load_config(temp_path)
-        devices = config.get("devices", [])
-        validate_devices(devices)
-        print("✗ Test 4 failed: Should have raised ValueError for missing topics.set")
-        return False
-    except ValueError as e:
-        if "missing 'topics.set'" in str(e):
-            print(f"✓ Test 4 passed: Correct error for missing topics.set")
-            print(f"  Error: {e}")
-            return True
-        else:
-            print(f"✗ Test 4 failed: Wrong error message: {e}")
-            return False
-    except Exception as e:
-        print(f"✗ Test 4 failed: Unexpected error: {e}")
-        return False
-    finally:
-        temp_path.unlink()
-
-
-def test_missing_topics_state():
-    """Test YAML without 'topics.state'."""
-    yaml_content = """version: 1
-
-mqtt:
-  broker: "172.16.2.16"
-  port: 1883
-
-devices:
-  - device_id: test_lampe
-    type: light
-    cap_version: "light@1.2.0"
-    technology: zigbee2mqtt
-    topics:
-      set: "vendor/test_lampe/set"
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        config = load_config(temp_path)
-        devices = config.get("devices", [])
-        validate_devices(devices)
-        print("✗ Test 5 failed: Should have raised ValueError for missing topics.state")
-        return False
-    except ValueError as e:
-        if "missing 'topics.state'" in str(e):
-            print(f"✓ Test 5 passed: Correct error for missing topics.state")
-            print(f"  Error: {e}")
-            return True
-        else:
-            print(f"✗ Test 5 failed: Wrong error message: {e}")
-            return False
-    except Exception as e:
-        print(f"✗ Test 5 failed: Unexpected error: {e}")
-        return False
-    finally:
-        temp_path.unlink()
-
-
-def main():
-    """Run all tests."""
-    print("Testing Configuration Loader")
-    print("=" * 60)
-    
-    tests = [
-        test_device_id_format,
-        test_id_format,
-        test_missing_id,
-        test_missing_topics_set,
-        test_missing_topics_state,
-    ]
-    
-    results = []
-    for test in tests:
-        results.append(test())
-        print()
-    
-    print("=" * 60)
-    passed = sum(results)
-    total = len(results)
-    print(f"Results: {passed}/{total} tests passed")
-    
-    return 0 if all(results) else 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())

tools/test_dashboard.py

@@ -1,210 +0,0 @@
-"""
-Acceptance tests for Dashboard Route.
-
-Tests:
-1. GET /dashboard loads without errors
-2. Rooms are shown in layout.yaml order
-3. Devices within each room are sorted by rank (ascending)
-4. GET / redirects to dashboard
-"""
-import sys
-import httpx
-
-
-def test_dashboard_loads():
-    """Test 1: Dashboard loads without errors."""
-    print("Test 1: Dashboard loads")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=5.0)
-        response.raise_for_status()
-        
-        html = response.text
-        
-        # Check for essential elements
-        if "Home Automation" not in html:
-            print("  ✗ FAILED: Missing title 'Home Automation'")
-            return False
-        
-        if "Wohnzimmer" not in html:
-            print("  ✗ FAILED: Missing room 'Wohnzimmer'")
-            return False
-        
-        if "Schlafzimmer" not in html:
-            print("  ✗ FAILED: Missing room 'Schlafzimmer'")
-            return False
-        
-        print("  ✓ Dashboard loads successfully")
-        print("  ✓ Contains expected rooms")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def test_room_order():
-    """Test 2: Rooms appear in layout.yaml order."""
-    print("Test 2: Room order matches layout.yaml")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=5.0)
-        response.raise_for_status()
-        
-        html = response.text
-        
-        # Find positions of room titles
-        wohnzimmer_pos = html.find('class="room-title">Wohnzimmer<')
-        schlafzimmer_pos = html.find('class="room-title">Schlafzimmer<')
-        
-        if wohnzimmer_pos == -1:
-            print("  ✗ FAILED: Room 'Wohnzimmer' not found")
-            return False
-        
-        if schlafzimmer_pos == -1:
-            print("  ✗ FAILED: Room 'Schlafzimmer' not found")
-            return False
-        
-        # Wohnzimmer should appear before Schlafzimmer
-        if wohnzimmer_pos > schlafzimmer_pos:
-            print("  ✗ FAILED: Room order incorrect")
-            print(f"    Wohnzimmer at position {wohnzimmer_pos}")
-            print(f"    Schlafzimmer at position {schlafzimmer_pos}")
-            return False
-        
-        print("  ✓ Rooms appear in correct order:")
-        print("    1. Wohnzimmer")
-        print("    2. Schlafzimmer")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def test_device_rank_sorting():
-    """Test 3: Devices are sorted by rank (ascending)."""
-    print("Test 3: Devices sorted by rank")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=5.0)
-        response.raise_for_status()
-        
-        html = response.text
-        
-        # In Wohnzimmer: Deckenlampe (rank=5) should come before Stehlampe (rank=10)
-        deckenlampe_pos = html.find('device-title">Deckenlampe<')
-        stehlampe_pos = html.find('device-title">Stehlampe<')
-        
-        if deckenlampe_pos == -1:
-            print("  ✗ FAILED: Device 'Deckenlampe' not found")
-            return False
-        
-        if stehlampe_pos == -1:
-            print("  ✗ FAILED: Device 'Stehlampe' not found")
-            return False
-        
-        if deckenlampe_pos > stehlampe_pos:
-            print("  ✗ FAILED: Devices not sorted by rank")
-            print(f"    Deckenlampe (rank=5) at position {deckenlampe_pos}")
-            print(f"    Stehlampe (rank=10) at position {stehlampe_pos}")
-            return False
-        
-        print("  ✓ Devices sorted by rank (ascending):")
-        print("    Wohnzimmer: Deckenlampe (rank=5) → Stehlampe (rank=10)")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def test_root_redirect():
-    """Test 4: GET / shows dashboard."""
-    print("Test 4: Root path (/) shows dashboard")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/", timeout=5.0, follow_redirects=True)
-        response.raise_for_status()
-        
-        html = response.text
-        
-        # Should contain dashboard elements
-        if "Home Automation" not in html:
-            print("  ✗ FAILED: Root path doesn't show dashboard")
-            return False
-        
-        if "Wohnzimmer" not in html:
-            print("  ✗ FAILED: Root path missing rooms")
-            return False
-        
-        print("  ✓ Root path shows dashboard")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def main():
-    """Run all acceptance tests."""
-    print("=" * 60)
-    print("Testing Dashboard Route")
-    print("=" * 60)
-    print()
-    
-    # Check if UI is running
-    print("Prerequisites: Checking if UI is running on port 8002...")
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=3.0)
-        print("✓ UI is running")
-        print()
-    except Exception as e:
-        print(f"✗ Cannot reach UI: {e}")
-        print("  Start UI with: poetry run uvicorn apps.ui.main:app --port 8002")
-        print()
-        sys.exit(1)
-    
-    results = []
-    
-    # Run tests
-    results.append(("Dashboard loads", test_dashboard_loads()))
-    results.append(("Room order", test_room_order()))
-    results.append(("Device rank sorting", test_device_rank_sorting()))
-    results.append(("Root redirect", test_root_redirect()))
-    
-    # Summary
-    print("=" * 60)
-    passed = sum(1 for _, result in results if result)
-    total = len(results)
-    print(f"Results: {passed}/{total} tests passed")
-    print("=" * 60)
-    
-    for name, result in results:
-        status = "✓" if result else "✗"
-        print(f"  {status} {name}")
-    
-    if passed == total:
-        print()
-        print("All tests passed!")
-        sys.exit(0)
-    else:
-        print()
-        print("Some tests failed.")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()

tools/test_layout_loader.py

@@ -1,288 +0,0 @@
-#!/usr/bin/env python3
-"""Test layout loader and models."""
-
-import sys
-import tempfile
-from pathlib import Path
-
-# Add parent directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent))
-
-from packages.home_capabilities.layout import DeviceTile, Room, UiLayout, load_layout
-
-
-def test_device_tile_creation():
-    """Test DeviceTile model creation."""
-    print("Test 1: DeviceTile Creation")
-    
-    tile = DeviceTile(
-        device_id="test_lamp",
-        title="Test Lamp",
-        icon="💡",
-        rank=10
-    )
-    
-    assert tile.device_id == "test_lamp"
-    assert tile.title == "Test Lamp"
-    assert tile.icon == "💡"
-    assert tile.rank == 10
-    
-    print("  ✓ DeviceTile created successfully")
-    return True
-
-
-def test_room_creation():
-    """Test Room model creation."""
-    print("\nTest 2: Room Creation")
-    
-    tiles = [
-        DeviceTile(device_id="lamp1", title="Lamp 1", icon="💡", rank=1),
-        DeviceTile(device_id="lamp2", title="Lamp 2", icon="💡", rank=2)
-    ]
-    
-    room = Room(name="Living Room", devices=tiles)
-    
-    assert room.name == "Living Room"
-    assert len(room.devices) == 2
-    assert room.devices[0].rank == 1
-    
-    print("  ✓ Room with 2 devices created")
-    return True
-
-
-def test_ui_layout_creation():
-    """Test UiLayout model creation."""
-    print("\nTest 3: UiLayout Creation")
-    
-    rooms = [
-        Room(
-            name="Room 1",
-            devices=[DeviceTile(device_id="d1", title="D1", icon="💡", rank=1)]
-        ),
-        Room(
-            name="Room 2",
-            devices=[DeviceTile(device_id="d2", title="D2", icon="💡", rank=1)]
-        )
-    ]
-    
-    layout = UiLayout(rooms=rooms)
-    
-    assert len(layout.rooms) == 2
-    assert layout.total_devices() == 2
-    
-    print("  ✓ UiLayout with 2 rooms created")
-    print(f"  ✓ Total devices: {layout.total_devices()}")
-    return True
-
-
-def test_layout_validation_empty_rooms():
-    """Test that layout validation rejects empty rooms list."""
-    print("\nTest 4: Validation - Empty Rooms")
-    
-    try:
-        UiLayout(rooms=[])
-        print("  ✗ Should have raised ValueError")
-        return False
-    except ValueError as e:
-        if "at least one room" in str(e):
-            print(f"  ✓ Correct validation error: {e}")
-            return True
-        else:
-            print(f"  ✗ Wrong error message: {e}")
-            return False
-
-
-def test_load_layout_from_file():
-    """Test loading layout from YAML file."""
-    print("\nTest 5: Load Layout from YAML")
-    
-    yaml_content = """
-rooms:
-  - name: Wohnzimmer
-    devices:
-      - device_id: test_lampe_1
-        title: Stehlampe
-        icon: "💡"
-        rank: 10
-      - device_id: test_lampe_2
-        title: Tischlampe
-        icon: "💡"
-        rank: 20
-        
-  - name: Schlafzimmer
-    devices:
-      - device_id: test_lampe_3
-        title: Nachttischlampe
-        icon: "🛏️"
-        rank: 5
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        layout = load_layout(str(temp_path))
-        
-        assert len(layout.rooms) == 2
-        assert layout.rooms[0].name == "Wohnzimmer"
-        assert len(layout.rooms[0].devices) == 2
-        assert layout.total_devices() == 3
-        
-        # Check device sorting by rank
-        wohnzimmer_devices = layout.rooms[0].devices
-        assert wohnzimmer_devices[0].rank == 10
-        assert wohnzimmer_devices[1].rank == 20
-        
-        print("  ✓ Layout loaded from YAML")
-        print(f"  ✓ Rooms: {len(layout.rooms)}")
-        print(f"  ✓ Total devices: {layout.total_devices()}")
-        print(f"  ✓ Room order preserved: {[r.name for r in layout.rooms]}")
-        
-        return True
-        
-    finally:
-        temp_path.unlink()
-
-
-def test_load_layout_missing_file():
-    """Test error handling for missing file."""
-    print("\nTest 6: Missing File Error")
-    
-    try:
-        load_layout("/nonexistent/path/layout.yaml")
-        print("  ✗ Should have raised FileNotFoundError")
-        return False
-    except FileNotFoundError as e:
-        if "not found" in str(e):
-            print(f"  ✓ Correct error for missing file")
-            return True
-        else:
-            print(f"  ✗ Wrong error message: {e}")
-            return False
-
-
-def test_load_layout_invalid_yaml():
-    """Test error handling for invalid YAML."""
-    print("\nTest 7: Invalid YAML Error")
-    
-    yaml_content = """
-rooms:
-  - name: Room1
-    devices: [invalid yaml structure
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        load_layout(str(temp_path))
-        print("  ✗ Should have raised YAMLError")
-        temp_path.unlink()
-        return False
-    except Exception as e:
-        temp_path.unlink()
-        if "YAML" in str(type(e).__name__) or "parse" in str(e).lower():
-            print(f"  ✓ Correct YAML parsing error")
-            return True
-        else:
-            print(f"  ✗ Unexpected error: {type(e).__name__}: {e}")
-            return False
-
-
-def test_load_layout_missing_required_fields():
-    """Test validation for missing required fields."""
-    print("\nTest 8: Missing Required Fields")
-    
-    yaml_content = """
-rooms:
-  - name: Room1
-    devices:
-      - device_id: lamp1
-        title: Lamp
-        # Missing: icon, rank
-"""
-    
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
-        f.write(yaml_content)
-        temp_path = Path(f.name)
-    
-    try:
-        load_layout(str(temp_path))
-        print("  ✗ Should have raised ValueError")
-        temp_path.unlink()
-        return False
-    except ValueError as e:
-        temp_path.unlink()
-        if "icon" in str(e) or "rank" in str(e) or "required" in str(e).lower():
-            print(f"  ✓ Validation error for missing fields")
-            return True
-        else:
-            print(f"  ✗ Wrong error: {e}")
-            return False
-
-
-def test_load_default_layout():
-    """Test loading default layout from workspace."""
-    print("\nTest 9: Load Default Layout (config/layout.yaml)")
-    
-    try:
-        layout = load_layout()
-        
-        print(f"  ✓ Default layout loaded")
-        print(f"  ✓ Rooms: {len(layout.rooms)} ({', '.join(r.name for r in layout.rooms)})")
-        print(f"  ✓ Total devices: {layout.total_devices()}")
-        
-        for room in layout.rooms:
-            print(f"    - {room.name}: {len(room.devices)} devices")
-            for device in room.devices:
-                print(f"      • {device.title} (id={device.device_id}, rank={device.rank})")
-        
-        return True
-        
-    except FileNotFoundError:
-        print("  ⚠ Default layout.yaml not found (expected at config/layout.yaml)")
-        return True  # Not a failure if file doesn't exist yet
-    except Exception as e:
-        print(f"  ✗ Error loading default layout: {e}")
-        return False
-
-
-def main():
-    """Run all tests."""
-    print("=" * 60)
-    print("Testing Layout Loader and Models")
-    print("=" * 60)
-    
-    tests = [
-        test_device_tile_creation,
-        test_room_creation,
-        test_ui_layout_creation,
-        test_layout_validation_empty_rooms,
-        test_load_layout_from_file,
-        test_load_layout_missing_file,
-        test_load_layout_invalid_yaml,
-        test_load_layout_missing_required_fields,
-        test_load_default_layout,
-    ]
-    
-    results = []
-    for test in tests:
-        try:
-            results.append(test())
-        except Exception as e:
-            print(f"  ✗ Unexpected exception: {e}")
-            results.append(False)
-    
-    print("\n" + "=" * 60)
-    passed = sum(results)
-    total = len(results)
-    print(f"Results: {passed}/{total} tests passed")
-    print("=" * 60)
-    
-    return 0 if all(results) else 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())

tools/test_responsive_dashboard.py

@@ -1,296 +0,0 @@
-"""
-Acceptance tests for Responsive Dashboard.
-
-Tests:
-1. Desktop: 4 columns grid
-2. Tablet: 2 columns grid
-3. Mobile: 1 column grid
-4. POST requests work (via API check)
-5. No horizontal scrolling on any viewport
-"""
-import sys
-import httpx
-from bs4 import BeautifulSoup
-
-
-def test_dashboard_html_structure():
-    """Test 1: Dashboard has correct HTML structure."""
-    print("Test 1: Dashboard HTML Structure")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=5.0)
-        response.raise_for_status()
-        
-        html = response.text
-        soup = BeautifulSoup(html, 'html.parser')
-        
-        # Check for grid container
-        grid = soup.find('div', class_='devices-grid')
-        if not grid:
-            print("  ✗ FAILED: Missing .devices-grid container")
-            return False
-        
-        # Check for device tiles
-        tiles = soup.find_all('div', class_='device-tile')
-        if len(tiles) < 2:
-            print(f"  ✗ FAILED: Expected at least 2 device tiles, found {len(tiles)}")
-            return False
-        
-        # Check for state spans
-        state_spans = soup.find_all('span', id=lambda x: x and x.startswith('state-'))
-        if len(state_spans) < 2:
-            print(f"  ✗ FAILED: Expected state spans, found {len(state_spans)}")
-            return False
-        
-        # Check for ON/OFF buttons
-        btn_on = soup.find_all('button', class_='btn-on')
-        btn_off = soup.find_all('button', class_='btn-off')
-        
-        if not btn_on or not btn_off:
-            print("  ✗ FAILED: Missing ON/OFF buttons")
-            return False
-        
-        print(f"  ✓ Found {len(tiles)} device tiles")
-        print(f"  ✓ Found {len(state_spans)} state indicators")
-        print(f"  ✓ Found {len(btn_on)} ON buttons and {len(btn_off)} OFF buttons")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def test_responsive_css():
-    """Test 2: CSS has responsive grid rules."""
-    print("Test 2: Responsive CSS")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/static/style.css", timeout=5.0)
-        response.raise_for_status()
-        
-        css = response.text
-        
-        # Check for desktop 4 columns
-        if 'grid-template-columns: repeat(4, 1fr)' not in css:
-            print("  ✗ FAILED: Missing desktop grid (4 columns)")
-            return False
-        
-        # Check for tablet media query (2 columns)
-        if 'max-width: 1024px' not in css or 'repeat(2, 1fr)' not in css:
-            print("  ✗ FAILED: Missing tablet media query (2 columns)")
-            return False
-        
-        # Check for mobile media query (1 column)
-        if 'max-width: 640px' not in css:
-            print("  ✗ FAILED: Missing mobile media query")
-            return False
-        
-        print("  ✓ Desktop: 4 columns (grid-template-columns: repeat(4, 1fr))")
-        print("  ✓ Tablet: 2 columns (@media max-width: 1024px)")
-        print("  ✓ Mobile: 1 column (@media max-width: 640px)")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def test_javascript_functions():
-    """Test 3: JavaScript POST function exists."""
-    print("Test 3: JavaScript POST Function")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=5.0)
-        response.raise_for_status()
-        
-        html = response.text
-        
-        # Check for setDeviceState function
-        if 'function setDeviceState' not in html and 'async function setDeviceState' not in html:
-            print("  ✗ FAILED: Missing setDeviceState function")
-            return False
-        
-        # Check for fetch POST call
-        if 'fetch(' not in html or 'method: \'POST\'' not in html:
-            print("  ✗ FAILED: Missing fetch POST call")
-            return False
-        
-        # Check for correct API endpoint pattern
-        if '/devices/${deviceId}/set' not in html and '/devices/' not in html:
-            print("  ✗ FAILED: Missing correct API endpoint")
-            return False
-        
-        # Check for JSON payload
-        if 'type: \'light\'' not in html and '"type":"light"' not in html:
-            print("  ✗ FAILED: Missing correct JSON payload")
-            return False
-        
-        print("  ✓ setDeviceState function defined")
-        print("  ✓ Uses fetch with POST method")
-        print("  ✓ Correct endpoint: /devices/{deviceId}/set")
-        print("  ✓ Correct payload: {type:'light', payload:{power:...}}")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def test_device_controls():
-    """Test 4: Devices have correct controls."""
-    print("Test 4: Device Controls")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=5.0)
-        response.raise_for_status()
-        
-        html = response.text
-        soup = BeautifulSoup(html, 'html.parser')
-        
-        # Find device tiles
-        tiles = soup.find_all('div', class_='device-tile')
-        
-        for tile in tiles:
-            device_id = tile.get('data-device-id')
-            
-            # Check for device header
-            header = tile.find('div', class_='device-header')
-            if not header:
-                print(f"  ✗ FAILED: Device {device_id} missing header")
-                return False
-            
-            # Check for icon and title
-            icon = tile.find('div', class_='device-icon')
-            title = tile.find('h3', class_='device-title')
-            device_id_elem = tile.find('p', class_='device-id')
-            
-            if not icon or not title or not device_id_elem:
-                print(f"  ✗ FAILED: Device {device_id} missing icon/title/id")
-                return False
-            
-            # Check for state indicator
-            state_span = tile.find('span', id=f'state-{device_id}')
-            if not state_span:
-                print(f"  ✗ FAILED: Device {device_id} missing state indicator")
-                return False
-        
-        print(f"  ✓ All {len(tiles)} devices have:")
-        print("    • Icon, title, and device_id")
-        print("    • State indicator (span#state-{{device_id}})")
-        print("    • ON/OFF buttons (for lights with power feature)")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def test_rank_sorting():
-    """Test 5: Devices sorted by rank."""
-    print("Test 5: Device Rank Sorting")
-    print("-" * 60)
-    
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=5.0)
-        response.raise_for_status()
-        
-        html = response.text
-        
-        # In Wohnzimmer: Deckenlampe (rank=5) should come before Stehlampe (rank=10)
-        deckenlampe_pos = html.find('device-title">Deckenlampe<')
-        stehlampe_pos = html.find('device-title">Stehlampe<')
-        
-        if deckenlampe_pos == -1 or stehlampe_pos == -1:
-            print("  ℹ INFO: Test devices not found (expected for test)")
-            print()
-            return True
-        
-        if deckenlampe_pos > stehlampe_pos:
-            print("  ✗ FAILED: Devices not sorted by rank")
-            return False
-        
-        print("  ✓ Devices sorted by rank (Deckenlampe before Stehlampe)")
-        print()
-        return True
-        
-    except Exception as e:
-        print(f"  ✗ FAILED: {e}")
-        print()
-        return False
-
-
-def main():
-    """Run all acceptance tests."""
-    print("=" * 60)
-    print("Testing Responsive Dashboard")
-    print("=" * 60)
-    print()
-    
-    # Check if UI is running
-    print("Prerequisites: Checking if UI is running on port 8002...")
-    try:
-        response = httpx.get("http://localhost:8002/dashboard", timeout=3.0)
-        print("✓ UI is running")
-        print()
-    except Exception as e:
-        print(f"✗ Cannot reach UI: {e}")
-        print("  Start UI with: poetry run uvicorn apps.ui.main:app --port 8002")
-        print()
-        sys.exit(1)
-    
-    results = []
-    
-    # Run tests
-    results.append(("HTML Structure", test_dashboard_html_structure()))
-    results.append(("Responsive CSS", test_responsive_css()))
-    results.append(("JavaScript POST", test_javascript_functions()))
-    results.append(("Device Controls", test_device_controls()))
-    results.append(("Rank Sorting", test_rank_sorting()))
-    
-    # Summary
-    print("=" * 60)
-    passed = sum(1 for _, result in results if result)
-    total = len(results)
-    print(f"Results: {passed}/{total} tests passed")
-    print("=" * 60)
-    
-    for name, result in results:
-        status = "✓" if result else "✗"
-        print(f"  {status} {name}")
-    
-    print()
-    print("Manual Tests Required:")
-    print("  1. Open http://localhost:8002/dashboard in browser")
-    print("  2. Resize browser window to test responsive breakpoints:")
-    print("     - Desktop (>1024px): Should show 4 columns")
-    print("     - Tablet (640-1024px): Should show 2 columns")
-    print("     - Mobile (<640px): Should show 1 column")
-    print("  3. Click ON/OFF buttons and check Network tab in DevTools")
-    print("     - Should see POST to http://localhost:8001/devices/.../set")
-    print("     - No JavaScript errors in Console")
-    print("  4. Verify no horizontal scrolling at any viewport size")
-    
-    if passed == total:
-        print()
-        print("All automated tests passed!")
-        sys.exit(0)
-    else:
-        print()
-        print("Some tests failed.")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()