redeploy 0.2.40__tar.gz → 0.2.42__tar.gz

{redeploy-0.2.40 → redeploy-0.2.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.40
+Version: 0.2.42
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -12,6 +12,7 @@ Requires-Dist: loguru>=0.7
 Requires-Dist: paramiko>=3.0
 Requires-Dist: httpx>=0.25
 Requires-Dist: rich>=13.0
+Requires-Dist: jmespath>=1.0
 Requires-Dist: goal>=2.1.0
 Requires-Dist: costs>=0.1.20
 Requires-Dist: pfix>=0.1.60
@@ -27,17 +28,17 @@ Requires-Dist: pfix>=0.1.60; extra == "dev"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.40-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-19.7h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.42-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-20.9h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (61 commits)
-- 👤 **Human dev:** ~$1974 (19.7h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (63 commits)
+- 👤 **Human dev:** ~$2088 (20.9h @ $100/h, 30min dedup)
 
 Generated on 2026-04-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.40-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.42-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 
@@ -152,6 +153,72 @@ redeploy device-rm root@10.0.0.5
 
 Registry is stored at `~/.config/redeploy/devices.yaml` (chmod 600 — safe for SSH key paths).
 
+## Declarative config workflow
+
+redeploy supports a declarative configuration workflow for hardware settings — scan to YAML, edit locally, and apply to device:
+
+```bash
+# 1. Scan hardware state to YAML
+redeploy hardware pi@192.168.188.109 > hardware.yaml
+redeploy device-map pi@192.168.188.109 > device-map.yaml
+
+# 2. Edit YAML locally (e.g., change display rotation)
+# hardware.yaml:
+#   drm_outputs:
+#   - name: card0-DSI-2
+#     connector: DSI-2
+#     transform: '270'  # ← edit this value
+
+# 3. Apply config to remote device
+redeploy hardware pi@192.168.188.109 --apply-config hardware.yaml
+redeploy device-map pi@192.168.188.109 --apply-config device-map.yaml
+```
+
+**What `--apply-config` does:**
+- Applies display transforms via `wlr-randr` (Wayland compositor)
+- Updates kanshi config (`~/.config/kanshi/config`) for persistent display rotation
+- Sets backlight brightness and power state
+- Supports both YAML and JSON config files
+
+**Supported commands:**
+- `redeploy hardware --apply-config FILE`
+- `redeploy device-map --apply-config FILE`
+- `redeploy blueprint show FILE --apply-config FILE`
+
+## JMESPath query support
+
+Extract specific values from YAML/JSON output using JMESPath query language (similar to XPath for XML):
+
+```bash
+# Simple path queries
+redeploy hardware pi@192.168.188.109 --query "drm_outputs[0].transform"
+redeploy hardware pi@192.168.188.109 --query "kernel"
+redeploy device-map pi@192.168.188.109 --query "host"
+
+# Filter queries
+redeploy hardware pi@192.168.188.109 --query "backlights[?name==\`11-0045\`].brightness"
+redeploy hardware pi@192.168.188.109 --query "drm_outputs[?connector==\`DSI-2\`].transform"
+
+# From saved YAML files
+redeploy blueprint show blueprint.yaml --query "hardware.drm_outputs[0].transform"
+redeploy device-map --show device-map.yaml --query "tags"
+
+# JSON output
+redeploy hardware pi@192.168.188.109 --query "tags" --format json
+```
+
+**JMESPath features:**
+- **Simple paths:** `kernel`, `host`, `board`
+- **Array indexing:** `drm_outputs[0].transform`
+- **Filtering:** `[?name==\`11-0045\`]`
+- **Projections:** `backlights[0].[name,brightness]`
+- **Wildcards:** `drm_outputs[*].transform`
+
+**Supported commands:**
+- `redeploy hardware --query EXPR`
+- `redeploy device-map --query EXPR`
+- `redeploy blueprint show FILE --query EXPR`
+
 ## CLI reference
 
 ### `redeploy run SPEC [options]`
@@ -614,6 +681,90 @@ redeploy run examples/01-vps-version-bump/migration.yaml --plan-only
 redeploy run examples/04-rpi-kiosk/migration.yaml --plan-only
 ```
 
+## Hardware diagnostics commands
+
+### `redeploy hardware HOST [options]`
+
+Probe and diagnose hardware on a remote host (DSI display, DRM connectors, backlight, I2C, config.txt, Wayland compositor).
+
+| Option | Description |
+|--------|-------------|
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--fix` | Print fix commands for all issues found |
+| `--apply-fix COMPONENT` | Run fix for specific component via SSH |
+| `--panel PANEL_ID` | Specify panel ID explicitly |
+| `--list-panels` | List available panel definitions |
+| `--set-transform TRANSFORM` | Set display rotation for DSI output (normal, 90, 180, 270, flipped, etc.) |
+| `--apply-config FILE` | Apply display settings from YAML/JSON config file |
+| `--query EXPR` | Extract specific values using JMESPath query |
+| `--ssh-key PATH` | SSH private key path |
+
+```bash
+redeploy hardware pi@192.168.188.109
+redeploy hardware pi@192.168.188.109 --fix
+redeploy hardware pi@192.168.188.109 --set-transform 270
+redeploy hardware pi@192.168.188.109 --apply-config hardware.yaml
+redeploy hardware pi@192.168.188.109 --query "drm_outputs[0].transform"
+```
+
+### `redeploy device-map HOST [options]`
+
+Generate full device snapshot (hardware + infra + diagnostics).
+
+| Option | Description |
+|--------|-------------|
+| `--name TEXT` | Human-friendly device label |
+| `--tag TEXT` | Tag(s) to attach (repeatable) |
+| `--save` | Persist map to `~/.config/redeploy/device-maps/` |
+| `--out PATH` | Save to specific file |
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--no-infra` | Skip infra probe (hardware only) |
+| `--list` | List saved device maps |
+| `--show PATH` | Load and display saved device-map file |
+| `--diff PATH...` | Diff two saved device-map files |
+| `--apply-config FILE` | Apply hardware/infra settings from YAML config file |
+| `--query EXPR` | Extract specific values using JMESPath query |
+| `--ssh-key PATH` | SSH private key path |
+
+```bash
+redeploy device-map pi@192.168.188.109 --save --name "kiosk-lab"
+redeploy device-map --list
+redeploy device-map --show ~/.config/redeploy/device-maps/pi_at_192.168.188.109.yaml
+redeploy device-map pi@192.168.188.109 --apply-config device-map.yaml
+redeploy device-map pi@192.168.188.109 --query "hardware.drm_outputs[0].transform"
+```
+
+### `redeploy blueprint [command]`
+
+Manage device blueprints (capture, show, list, twin, migrate).
+
+#### `redeploy blueprint capture HOST [options]`
+
+Capture device state as blueprint.
+
+| Option | Description |
+|--------|-------------|
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--save` | Persist to `~/.config/redeploy/blueprints/` |
+| `--out PATH` | Save to specific file |
+| `--ssh-key PATH` | SSH private key path |
+
+#### `redeploy blueprint show FILE [options]`
+
+Display saved blueprint.
+
+| Option | Description |
+|--------|-------------|
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--apply-config FILE` | Apply blueprint settings from YAML config file |
+| `--query EXPR` | Extract specific values using JMESPath query |
+
+```bash
+redeploy blueprint capture pi@192.168.188.109 > blueprint.yaml
+redeploy blueprint show blueprint.yaml --apply-config blueprint.yaml
+redeploy blueprint show blueprint.yaml --query "hardware.drm_outputs[0].transform"
+```
+
 ## License
 
 Licensed under Apache-2.0.

{redeploy-0.2.40 → redeploy-0.2.42}/README.md

@@ -3,17 +3,17 @@
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.40-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-19.7h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.42-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-20.9h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (61 commits)
-- 👤 **Human dev:** ~$1974 (19.7h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (63 commits)
+- 👤 **Human dev:** ~$2088 (20.9h @ $100/h, 30min dedup)
 
 Generated on 2026-04-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.40-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.42-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 
@@ -128,6 +128,72 @@ redeploy device-rm root@10.0.0.5
 
 Registry is stored at `~/.config/redeploy/devices.yaml` (chmod 600 — safe for SSH key paths).
 
+## Declarative config workflow
+
+redeploy supports a declarative configuration workflow for hardware settings — scan to YAML, edit locally, and apply to device:
+
+```bash
+# 1. Scan hardware state to YAML
+redeploy hardware pi@192.168.188.109 > hardware.yaml
+redeploy device-map pi@192.168.188.109 > device-map.yaml
+
+# 2. Edit YAML locally (e.g., change display rotation)
+# hardware.yaml:
+#   drm_outputs:
+#   - name: card0-DSI-2
+#     connector: DSI-2
+#     transform: '270'  # ← edit this value
+
+# 3. Apply config to remote device
+redeploy hardware pi@192.168.188.109 --apply-config hardware.yaml
+redeploy device-map pi@192.168.188.109 --apply-config device-map.yaml
+```
+
+**What `--apply-config` does:**
+- Applies display transforms via `wlr-randr` (Wayland compositor)
+- Updates kanshi config (`~/.config/kanshi/config`) for persistent display rotation
+- Sets backlight brightness and power state
+- Supports both YAML and JSON config files
+
+**Supported commands:**
+- `redeploy hardware --apply-config FILE`
+- `redeploy device-map --apply-config FILE`
+- `redeploy blueprint show FILE --apply-config FILE`
+
+## JMESPath query support
+
+Extract specific values from YAML/JSON output using JMESPath query language (similar to XPath for XML):
+
+```bash
+# Simple path queries
+redeploy hardware pi@192.168.188.109 --query "drm_outputs[0].transform"
+redeploy hardware pi@192.168.188.109 --query "kernel"
+redeploy device-map pi@192.168.188.109 --query "host"
+
+# Filter queries
+redeploy hardware pi@192.168.188.109 --query "backlights[?name==\`11-0045\`].brightness"
+redeploy hardware pi@192.168.188.109 --query "drm_outputs[?connector==\`DSI-2\`].transform"
+
+# From saved YAML files
+redeploy blueprint show blueprint.yaml --query "hardware.drm_outputs[0].transform"
+redeploy device-map --show device-map.yaml --query "tags"
+
+# JSON output
+redeploy hardware pi@192.168.188.109 --query "tags" --format json
+```
+
+**JMESPath features:**
+- **Simple paths:** `kernel`, `host`, `board`
+- **Array indexing:** `drm_outputs[0].transform`
+- **Filtering:** `[?name==\`11-0045\`]`
+- **Projections:** `backlights[0].[name,brightness]`
+- **Wildcards:** `drm_outputs[*].transform`
+
+**Supported commands:**
+- `redeploy hardware --query EXPR`
+- `redeploy device-map --query EXPR`
+- `redeploy blueprint show FILE --query EXPR`
+
 ## CLI reference
 
 ### `redeploy run SPEC [options]`
@@ -590,6 +656,90 @@ redeploy run examples/01-vps-version-bump/migration.yaml --plan-only
 redeploy run examples/04-rpi-kiosk/migration.yaml --plan-only
 ```
 
+## Hardware diagnostics commands
+
+### `redeploy hardware HOST [options]`
+
+Probe and diagnose hardware on a remote host (DSI display, DRM connectors, backlight, I2C, config.txt, Wayland compositor).
+
+| Option | Description |
+|--------|-------------|
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--fix` | Print fix commands for all issues found |
+| `--apply-fix COMPONENT` | Run fix for specific component via SSH |
+| `--panel PANEL_ID` | Specify panel ID explicitly |
+| `--list-panels` | List available panel definitions |
+| `--set-transform TRANSFORM` | Set display rotation for DSI output (normal, 90, 180, 270, flipped, etc.) |
+| `--apply-config FILE` | Apply display settings from YAML/JSON config file |
+| `--query EXPR` | Extract specific values using JMESPath query |
+| `--ssh-key PATH` | SSH private key path |
+
+```bash
+redeploy hardware pi@192.168.188.109
+redeploy hardware pi@192.168.188.109 --fix
+redeploy hardware pi@192.168.188.109 --set-transform 270
+redeploy hardware pi@192.168.188.109 --apply-config hardware.yaml
+redeploy hardware pi@192.168.188.109 --query "drm_outputs[0].transform"
+```
+
+### `redeploy device-map HOST [options]`
+
+Generate full device snapshot (hardware + infra + diagnostics).
+
+| Option | Description |
+|--------|-------------|
+| `--name TEXT` | Human-friendly device label |
+| `--tag TEXT` | Tag(s) to attach (repeatable) |
+| `--save` | Persist map to `~/.config/redeploy/device-maps/` |
+| `--out PATH` | Save to specific file |
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--no-infra` | Skip infra probe (hardware only) |
+| `--list` | List saved device maps |
+| `--show PATH` | Load and display saved device-map file |
+| `--diff PATH...` | Diff two saved device-map files |
+| `--apply-config FILE` | Apply hardware/infra settings from YAML config file |
+| `--query EXPR` | Extract specific values using JMESPath query |
+| `--ssh-key PATH` | SSH private key path |
+
+```bash
+redeploy device-map pi@192.168.188.109 --save --name "kiosk-lab"
+redeploy device-map --list
+redeploy device-map --show ~/.config/redeploy/device-maps/pi_at_192.168.188.109.yaml
+redeploy device-map pi@192.168.188.109 --apply-config device-map.yaml
+redeploy device-map pi@192.168.188.109 --query "hardware.drm_outputs[0].transform"
+```
+
+### `redeploy blueprint [command]`
+
+Manage device blueprints (capture, show, list, twin, migrate).
+
+#### `redeploy blueprint capture HOST [options]`
+
+Capture device state as blueprint.
+
+| Option | Description |
+|--------|-------------|
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--save` | Persist to `~/.config/redeploy/blueprints/` |
+| `--out PATH` | Save to specific file |
+| `--ssh-key PATH` | SSH private key path |
+
+#### `redeploy blueprint show FILE [options]`
+
+Display saved blueprint.
+
+| Option | Description |
+|--------|-------------|
+| `--format [yaml|json]` | Output format (default: yaml) |
+| `--apply-config FILE` | Apply blueprint settings from YAML config file |
+| `--query EXPR` | Extract specific values using JMESPath query |
+
+```bash
+redeploy blueprint capture pi@192.168.188.109 > blueprint.yaml
+redeploy blueprint show blueprint.yaml --apply-config blueprint.yaml
+redeploy blueprint show blueprint.yaml --query "hardware.drm_outputs[0].transform"
+```
+
 ## License
 
 Licensed under Apache-2.0.

{redeploy-0.2.40 → redeploy-0.2.42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redeploy"
-version = "0.2.40"
+version = "0.2.42"
 description = "Infrastructure migration toolkit: detect → plan → apply"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -17,6 +17,7 @@ dependencies = [
     "paramiko>=3.0",
     "httpx>=0.25",
     "rich>=13.0",
+    "jmespath>=1.0",
     "goal>=2.1.0",
     "costs>=0.1.20",
     "pfix>=0.1.60",

{redeploy-0.2.40 → redeploy-0.2.42}/redeploy/__init__.py

@@ -7,7 +7,7 @@ Public API (stable from 0.2.0, semver guaranteed)::
 
 Everything not listed in ``__all__`` is internal and may change without notice.
 """
-__version__ = "0.2.40"
+__version__ = "0.2.42"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401

redeploy-0.2.42/redeploy/apply/state_apply.py

@@ -0,0 +1,222 @@
+"""Declarative state apply — push a desired-state YAML/JSON to a remote host.
+
+Pattern:
+    redeploy hardware pi@host > device.yaml   # scan
+    # edit device.yaml                        # declare desired state
+    redeploy push pi@host device.yaml         # apply diff
+
+The module is extensible: register a new :class:`StateHandler` for every new
+file schema.  Each handler says whether it can handle a given dict (``accept``)
+and then applies the desired state (``apply``).
+"""
+from __future__ import annotations
+
+import re
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from typing import Any
+
+from rich.console import Console
+
+from ..detect.remote import RemoteProbe
+
+
+# ── handler base ──────────────────────────────────────────────────────────────
+
+
+@dataclass
+class ApplyResult:
+    handler: str
+    applied: list[str]
+    skipped: list[str]
+    errors: list[str]
+
+    @property
+    def ok(self) -> bool:
+        return not self.errors
+
+
+class StateHandler(ABC):
+    """Base class for a declarative state applier."""
+
+    name: str = "base"
+
+    @abstractmethod
+    def accept(self, data: dict) -> bool:
+        """Return True if this handler knows how to apply *data*."""
+
+    @abstractmethod
+    def apply(self, data: dict, p: RemoteProbe, console: Console) -> ApplyResult:
+        """Apply *data* to the host behind *p*."""
+
+
+# ── hardware handler ──────────────────────────────────────────────────────────
+
+
+class HardwareStateHandler(StateHandler):
+    """Applies HardwareInfo-shaped YAML: display transforms, backlight, etc."""
+
+    name = "hardware"
+
+    def accept(self, data: dict) -> bool:
+        # HardwareInfo always has drm_outputs or backlights
+        return "drm_outputs" in data or "backlights" in data
+
+    def apply(self, data: dict, p: RemoteProbe, console: Console) -> ApplyResult:
+        applied: list[str] = []
+        skipped: list[str] = []
+        errors: list[str] = []
+
+        # ── display transforms ────────────────────────────────────────────────
+        for output in data.get("drm_outputs", []):
+            connector = output.get("connector", "")
+            transform = output.get("transform", "normal")
+            enabled = output.get("enabled", "enabled")
+
+            if not connector or ("DSI" not in connector and "HDMI" not in connector):
+                continue
+
+            # Apply via wlr-randr
+            on_off = "--on" if enabled == "enabled" else "--off"
+            transform_arg = f"--transform {transform}" if transform != "normal" else ""
+            wlr_cmd = (
+                f"WAYLAND_DISPLAY=wayland-0 XDG_RUNTIME_DIR=/run/user/$(id -u) "
+                f"wlr-randr --output {connector} {on_off} {transform_arg} 2>&1"
+            ).strip()
+            r = p.run(wlr_cmd)
+            if r.ok:
+                applied.append(f"display/{connector}: transform={transform} enabled={enabled}")
+                console.print(f"[green]  ✓ {connector}: transform={transform}[/green]")
+            else:
+                msg = r.out.strip()
+                # wlr-randr unavailable (no compositor) — not fatal
+                if msg:
+                    console.print(f"[yellow]  ⚠ {connector} wlr-randr: {msg}[/yellow]")
+                skipped.append(f"display/{connector}: wlr-randr unavailable")
+
+        # ── persist DSI transform in kanshi ──────────────────────────────────
+        dsi_outputs = [o for o in data.get("drm_outputs", []) if "DSI" in o.get("connector", "")]
+        if dsi_outputs:
+            _update_kanshi(dsi_outputs, p, console, applied, errors)
+
+        # ── backlight ─────────────────────────────────────────────────────────
+        for bl in data.get("backlights", []):
+            name = bl.get("name", "")
+            if not name:
+                continue
+            brightness = bl.get("brightness")
+            bl_power = bl.get("bl_power")
+            if brightness is not None:
+                r = p.run(
+                    f"echo {brightness} | sudo tee /sys/class/backlight/{name}/brightness > /dev/null"
+                )
+                if r.ok:
+                    applied.append(f"backlight/{name}: brightness={brightness}")
+                    console.print(f"[green]  ✓ backlight/{name}: brightness={brightness}[/green]")
+                else:
+                    errors.append(f"backlight/{name}: brightness set failed")
+            if bl_power is not None:
+                r = p.run(
+                    f"echo {bl_power} | sudo tee /sys/class/backlight/{name}/bl_power > /dev/null"
+                )
+                if r.ok:
+                    applied.append(f"backlight/{name}: bl_power={bl_power}")
+                    console.print(f"[green]  ✓ backlight/{name}: bl_power={bl_power}[/green]")
+                else:
+                    errors.append(f"backlight/{name}: bl_power set failed")
+
+        return ApplyResult(handler=self.name, applied=applied, skipped=skipped, errors=errors)
+
+
+def _update_kanshi(dsi_outputs: list, p: RemoteProbe, console: Console,
+                   applied: list, errors: list) -> None:
+    """Rewrite ~/.config/kanshi/config from desired dsi_outputs state."""
+    kanshi_cfg_path = "~/.config/kanshi/config"
+    read_r = p.run(f"cat {kanshi_cfg_path} 2>/dev/null")
+    current = read_r.out if read_r.ok else ""
+
+    for output in dsi_outputs:
+        connector = output.get("connector", "")
+        transform = output.get("transform", "normal")
+
+        line_pat = re.compile(
+            rf'(\s*output\s+{re.escape(connector)}\s+enable)(\s+transform\s+\S+)?'
+        )
+        if re.search(line_pat, current):
+            if transform == "normal":
+                current = re.sub(line_pat, r'\1', current)
+            else:
+                current = re.sub(line_pat, rf'\1 transform {transform}', current)
+        elif current.strip():
+            current = re.sub(
+                rf'(\s*output\s+{re.escape(connector)}\b)',
+                (rf'\1 transform {transform}' if transform != "normal" else r'\1'),
+                current,
+            )
+        else:
+            current = (
+                f"profile waveshare-only {{\n"
+                f"    output {connector} enable"
+                + (f" transform {transform}" if transform != "normal" else "")
+                + "\n    output HDMI-A-2 disable\n}\n"
+            )
+
+    escaped = current.replace("'", "'\\''")
+    write_r = p.run(
+        f"mkdir -p ~/.config/kanshi && printf '%s' '{escaped}' > {kanshi_cfg_path}"
+    )
+    if write_r.ok:
+        applied.append(f"kanshi: config updated")
+        console.print(f"[green]  ✓ kanshi config saved ({kanshi_cfg_path})[/green]")
+    else:
+        errors.append("kanshi: config write failed")
+
+    # Reload kanshi if running — SIGUSR1 = reload profiles
+    p.run("pkill -SIGUSR1 kanshi 2>/dev/null || true")
+
+
+# ── future handlers registered here ──────────────────────────────────────────
+
+
+class InfraStateHandler(StateHandler):
+    """Placeholder — applies InfraState-shaped YAML (services, ports, etc.)."""
+
+    name = "infra"
+
+    def accept(self, data: dict) -> bool:
+        return "runtime" in data and "services" in data
+
+    def apply(self, data: dict, p: RemoteProbe, console: Console) -> ApplyResult:
+        # TODO: implement service-level desired state reconciliation
+        console.print("[yellow]  infra state apply not yet implemented[/yellow]")
+        return ApplyResult(handler=self.name, applied=[], skipped=["not implemented"], errors=[])
+
+
+# ── registry ──────────────────────────────────────────────────────────────────
+
+_HANDLERS: list[StateHandler] = [
+    HardwareStateHandler(),
+    InfraStateHandler(),
+]
+
+
+def detect_handler(data: dict) -> StateHandler | None:
+    """Return the first handler that accepts *data*, or None."""
+    for h in _HANDLERS:
+        if h.accept(data):
+            return h
+    return None
+
+
+def apply_state(data: dict, p: RemoteProbe, console: Console) -> ApplyResult:
+    """Auto-detect file type and apply desired state."""
+    handler = detect_handler(data)
+    if handler is None:
+        return ApplyResult(
+            handler="unknown",
+            applied=[],
+            skipped=[],
+            errors=["No handler found for this file format"],
+        )
+    console.print(f"[dim]handler: {handler.name}[/dim]")
+    return handler.apply(data, p, console)

{redeploy-0.2.40 → redeploy-0.2.42}/redeploy/cli/__init__.py

@@ -49,6 +49,7 @@ from .commands.exec_ import exec_cmd, exec_multi_cmd
 from .commands.plan_apply import plan, apply, migrate, run
 from .commands.state import state_cmd
 from .commands.hardware import hardware
+from .commands.push import push
 from .commands.device_map import device_map_cmd
 from .commands.blueprint import blueprint_cmd
 from .commands.init import init
@@ -68,6 +69,7 @@ cli.add_command(exec_multi_cmd)
 cli.add_command(export_cmd)
 cli.add_command(import_cmd)
 cli.add_command(hardware)
+cli.add_command(push)
 cli.add_command(device_map_cmd, name="device-map")
 cli.add_command(blueprint_cmd, name="blueprint")
 cli.add_command(init)