redeploy 0.2.45__tar.gz → 0.2.46__tar.gz

{redeploy-0.2.45 → redeploy-0.2.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.45
+Version: 0.2.46
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -30,17 +30,17 @@ Requires-Dist: op3>=0.1.4; extra == "op3"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.45-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-23.2h-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.46-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-23.6h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (66 commits)
-- 👤 **Human dev:** ~$2318 (23.2h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (67 commits)
+- 👤 **Human dev:** ~$2360 (23.6h @ $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.45-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.46-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.
 

{redeploy-0.2.45 → redeploy-0.2.46}/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.45-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-23.2h-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.46-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-23.6h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (66 commits)
-- 👤 **Human dev:** ~$2318 (23.2h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (67 commits)
+- 👤 **Human dev:** ~$2360 (23.6h @ $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.45-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.46-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.
 

{redeploy-0.2.45 → redeploy-0.2.46}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redeploy"
-version = "0.2.45"
+version = "0.2.46"
 description = "Infrastructure migration toolkit: detect → plan → apply"
 readme = "README.md"
 requires-python = ">=3.11"

{redeploy-0.2.45 → redeploy-0.2.46}/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.45"
+__version__ = "0.2.46"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401

{redeploy-0.2.45 → redeploy-0.2.46}/redeploy/apply/__init__.py

@@ -5,10 +5,15 @@ from .handlers import (
     run_container_log_tail,
     run_docker_build,
     run_docker_health_wait,
+    run_ensure_autostart_entry,
+    run_ensure_browser_kiosk_script,
+    run_ensure_config_line,
+    run_ensure_kanshi_profile,
     run_http_check,
     run_inline_script,
     run_plugin,
     run_podman_build,
+    run_raspi_config,
     run_rsync,
     run_scp,
     run_ssh,
@@ -37,10 +42,15 @@ __all__ = [
     "run_container_log_tail",
     "run_docker_build",
     "run_docker_health_wait",
+    "run_ensure_autostart_entry",
+    "run_ensure_browser_kiosk_script",
+    "run_ensure_config_line",
+    "run_ensure_kanshi_profile",
     "run_http_check",
     "run_inline_script",
     "run_plugin",
     "run_podman_build",
+    "run_raspi_config",
     "run_rsync",
     "run_scp",
     "run_ssh",

{redeploy-0.2.45 → redeploy-0.2.46}/redeploy/apply/handlers.py

@@ -405,14 +405,36 @@ def run_raspi_config(step: MigrationStep, probe: "RemoteProbe") -> None:
 def run_ensure_kanshi_profile(step: MigrationStep, probe: "RemoteProbe") -> None:
     """Idempotently write or replace a named kanshi output profile.
 
-    step.command   — the profile block to write (rendered kanshi syntax)
-    step.config_file — kanshi config path (default: ~/.config/kanshi/config)
+    Declarative mode (preferred)::
+
+        profile_name: waveshare-only
+        outputs_on: [DSI-2]
+        outputs_off: [HDMI-A-2]
+
+    Legacy mode (pre-rendered block)::
+
+        step.command   — the profile block to write (rendered kanshi syntax)
+        step.config_file — kanshi config path (default: ~/.config/kanshi/config)
     """
     from ..hardware.kiosk.output_profiles import OutputProfile
 
-    profile_block = step.command
+    # Declarative mode: build profile from semantic fields
+    if step.profile_name:
+        profile = OutputProfile(
+            name=step.profile_name,
+            enabled=list(step.outputs_on),
+            disabled=list(step.outputs_off),
+        )
+        profile_block = profile.to_kanshi_config()
+    else:
+        profile_block = step.command
+
     if not profile_block:
-        raise StepError(step, "ensure_kanshi_profile requires step.command with profile block")
+        raise StepError(
+            step,
+            "ensure_kanshi_profile requires profile_name+outputs_on/outputs_off "
+            "or step.command with pre-rendered profile block",
+        )
 
     config_path = step.config_file or "~/.config/kanshi/config"
     mkdir_cmd = f"mkdir -p $(dirname {config_path})"
@@ -462,56 +484,116 @@ def run_ensure_kanshi_profile(step: MigrationStep, probe: "RemoteProbe") -> None
 
 
 def run_ensure_autostart_entry(step: MigrationStep, probe: "RemoteProbe") -> None:
-    """Idempotently add or replace a keyed entry in a compositor autostart file.
+    """Idempotently add or replace keyed entries in a compositor autostart file.
 
-    step.config_file — path to autostart file
-    step.config_line — the line to write (the entry body)
-    step.config_section — used as the entry key for idempotent marker
-    """
-    from ..hardware.kiosk.autostart import AutostartEntry, ensure_autostart_entry
+    Declarative mode (preferred)::
 
-    if not step.config_file or not step.config_line:
-        raise StepError(step, "ensure_autostart_entry requires config_file and config_line")
+        compositor: labwc
+        entries:
+          - "kanshid &"
+          - "sleep 3"
+          - "bash /home/pi/c2004/scripts/kiosk-launch.sh &"
 
-    key = step.config_section or "redeploy"
-    entry = AutostartEntry(key=key, line=step.config_line)
+    Legacy mode (single entry)::
 
-    r = probe.run(f"cat {step.config_file} 2>/dev/null || echo ''", timeout=10)
+        step.config_file — path to autostart file
+        step.config_line — the line to write (the entry body)
+        step.config_section — used as the entry key for idempotent marker
+    """
+    from ..hardware.kiosk.autostart import AutostartEntry, ensure_autostart_entry
+    from ..hardware.kiosk.compositors import COMPOSITORS
+
+    # Determine autostart path
+    config_file = step.config_file
+    if not config_file and step.compositor:
+        comp = COMPOSITORS.get(step.compositor)
+        if not comp:
+            raise StepError(step, f"Unknown compositor '{step.compositor}'")
+        config_file = comp.autostart_abs()
+    if not config_file:
+        raise StepError(step, "ensure_autostart_entry requires config_file or compositor")
+
+    # Collect entries to apply
+    entries: list[AutostartEntry] = []
+    if step.entries:
+        for i, line in enumerate(step.entries):
+            key = f"redeploy-{i}-{line.split()[0] if line else 'entry'}"
+            entries.append(AutostartEntry(key=key, line=line))
+    elif step.config_line:
+        key = step.config_section or "redeploy"
+        entries.append(AutostartEntry(key=key, line=step.config_line))
+
+    if not entries:
+        raise StepError(step, "ensure_autostart_entry requires entries or config_line")
+
+    r = probe.run(f"cat {config_file} 2>/dev/null || echo ''", timeout=10)
     existing = r.out if r.ok else ""
 
-    new_content, changed = ensure_autostart_entry(existing, entry)
-    if not changed:
+    changed_any = False
+    new_content = existing
+    for entry in entries:
+        new_content, changed = ensure_autostart_entry(new_content, entry)
+        if changed:
+            changed_any = True
+
+    if not changed_any:
         step.status = StepStatus.DONE
-        step.result = f"no-op: entry [{key}] already correct"
+        step.result = f"no-op: {len(entries)} autostart entry(ies) already correct"
         return
 
-    mkdir_cmd = f"mkdir -p $(dirname {step.config_file})"
+    mkdir_cmd = f"mkdir -p $(dirname {config_file})"
     probe.run(mkdir_cmd, timeout=10)
 
     encoded = base64.b64encode(new_content.encode()).decode()
     tmp = f"/tmp/redeploy-autostart-{step.id}.txt"
     write_r = probe.run(
-        f"echo '{encoded}' | base64 -d | tee {tmp} > /dev/null && mv {tmp} {step.config_file}",
+        f"echo '{encoded}' | base64 -d | tee {tmp} > /dev/null && mv {tmp} {config_file}",
         timeout=15,
     )
     if not write_r.ok:
-        raise StepError(step, f"Cannot write {step.config_file}: {write_r.stderr[:200]}")
+        raise StepError(step, f"Cannot write {config_file}: {write_r.stderr[:200]}")
 
     step.status = StepStatus.DONE
-    step.result = f"entry [{key}] written to {step.config_file}"
+    step.result = f"{len(entries)} autostart entry(ies) written to {config_file}"
 
 
 def run_ensure_browser_kiosk_script(step: MigrationStep, probe: "RemoteProbe") -> None:
     """Write a kiosk-launch.sh script to the remote device.
 
-    step.command   — the full script content to write
-    step.dst       — destination path (default: ~/kiosk-launch.sh)
+    Declarative mode (preferred)::
+
+        browser_profile: chromium_wayland_kiosk
+        url: "http://localhost:8100/connect-id?font=xlarge&theme=dark"
+        kiosk_script_path: /home/pi/c2004/scripts/kiosk-launch.sh
+
+    Legacy mode (pre-rendered script)::
+
+        step.command   — the full script content to write
+        step.dst       — destination path (default: ~/kiosk-launch.sh)
     """
-    script_content = step.command
+    from ..hardware.kiosk.browsers import CHROMIUM_WAYLAND_KIOSK
+
+    # Declarative mode: build script from profile + URL
+    if step.browser_profile:
+        # Registry lookup (extend when more profiles exist)
+        if step.browser_profile == "chromium_wayland_kiosk":
+            profile = CHROMIUM_WAYLAND_KIOSK
+        else:
+            raise StepError(step, f"Unknown browser_profile '{step.browser_profile}'")
+        if not step.url:
+            raise StepError(step, "browser_profile mode requires 'url' field")
+        script_content = profile.build_launch_cmd(step.url)
+    else:
+        script_content = step.command
+
     if not script_content:
-        raise StepError(step, "ensure_browser_kiosk_script requires step.command with script body")
+        raise StepError(
+            step,
+            "ensure_browser_kiosk_script requires browser_profile+url "
+            "or step.command with pre-rendered script body",
+        )
 
-    dst = step.dst or "~/kiosk-launch.sh"
+    dst = step.kiosk_script_path or step.dst or "~/kiosk-launch.sh"
 
     r = probe.run(f"cat {dst} 2>/dev/null || echo ''", timeout=10)
     existing = r.out if r.ok else ""

{redeploy-0.2.45 → redeploy-0.2.46}/redeploy/cli/commands/blueprint.py

@@ -95,68 +95,6 @@ def capture(host, name, compose_files, migration_file, device_map_file,
         console.print(f"\n[green]✓ saved:[/green] {saved}")
 
 
-def _apply_blueprint_config(bp, config_path):
-    """Apply blueprint settings from YAML config file to the remote host.
-
-    Reads blueprint YAML/JSON and applies hardware settings (transforms, backlight, etc.).
-    """
-    import yaml
-    import json as _json
-
-    from ...remote import Remote
-
-    with open(config_path) as f:
-        raw = f.read()
-
-    try:
-        cfg = yaml.safe_load(raw)
-    except Exception:
-        cfg = _json.loads(raw)
-
-    host = cfg.get("host") or getattr(bp, "host", None)
-    if not host:
-        print("[red]✗ No 'host' field in config file[/red]")
-        return
-
-    print(f"[cyan]→ Applying blueprint config from {config_path} to {host}[/cyan]")
-
-    p = Remote(host)
-
-    # Apply hardware settings (reuse logic from device-map)
-    hardware = cfg.get("hardware", {})
-    applied = 0
-
-    for output in hardware.get("drm_outputs", []):
-        connector = output.get("connector", "")
-        transform = output.get("transform", "normal")
-        if not connector or not ("DSI" in connector or "HDMI" in connector):
-            continue
-
-        if transform != "normal":
-            wlr_cmd = (
-                f"WAYLAND_DISPLAY=wayland-0 XDG_RUNTIME_DIR=/run/user/$(id -u) "
-                f"wlr-randr --output {connector} --transform {transform} 2>&1"
-            )
-            r = p.run(wlr_cmd)
-            if r.ok:
-                print(f"[green]  ✓ {connector}: transform={transform}[/green]")
-                applied += 1
-
-    for bl in hardware.get("backlights", []):
-        name = bl.get("name", "")
-        brightness = bl.get("brightness")
-        if name and brightness is not None:
-            r = p.run(f"echo {brightness} | sudo tee /sys/class/backlight/{name}/brightness > /dev/null")
-            if r.ok:
-                print(f"[green]  ✓ backlight {name}: brightness={brightness}[/green]")
-                applied += 1
-
-    if applied > 0:
-        print(f"[bold green]✓ Blueprint config applied from {config_path}[/bold green]")
-    else:
-        print("[yellow]Nothing to apply[/yellow]")
-
-
 def _execute_query_blueprint(bp, query_expr, output_fmt):
     """Execute JMESPath query on DeviceBlueprint model and output result."""
     import jmespath
@@ -299,7 +237,9 @@ def show(blueprint_file, fmt, apply_config, query_expr):
         click.echo(bp.to_yaml())
 
     if apply_config:
-        _apply_blueprint_config(bp, apply_config)
+        from ...config_apply import apply_config_file
+        from rich.console import Console
+        apply_config_file(apply_config, host=bp.host, console=Console())
 
 
 # ── list ──────────────────────────────────────────────────────────────────────

{redeploy-0.2.45 → redeploy-0.2.46}/redeploy/cli/commands/device_map.py

@@ -29,7 +29,6 @@ from pathlib import Path
 import click
 from rich import box
 from rich.console import Console
-from rich.panel import Panel
 from rich.table import Table
 
 
@@ -196,143 +195,6 @@ def device_map_cmd(
         sys.exit(1)
 
 
-def _apply_config_from_file(console, config_path, ssh_key):
-    """Apply hardware/infra settings from YAML/JSON config file to the remote host.
-
-    Reads DeviceMap YAML/JSON and applies:
-    - Display transforms via wlr-randr + kanshi
-    - Backlight settings
-    - Other configurable hardware parameters
-    """
-    import yaml
-    import json as _json
-
-    from ...detect.remote import RemoteProbe
-
-    with open(config_path) as f:
-        raw = f.read()
-
-    try:
-        cfg = yaml.safe_load(raw)
-    except Exception:
-        cfg = _json.loads(raw)
-
-    # Extract host from config or prompt
-    host = cfg.get("host")
-    if not host:
-        console.print("[red]✗ No 'host' field in config file[/red]")
-        sys.exit(1)
-
-    console.print(f"[cyan]→ Applying config from {config_path} to {host}[/cyan]")
-
-    # Connect to remote
-    p = RemoteProbe(host, ssh_key=ssh_key)
-
-    applied = 0
-
-    # ── display transforms ────────────────────────────────────────────────────
-    hardware = cfg.get("hardware", {})
-    for output in hardware.get("drm_outputs", []):
-        connector = output.get("connector", "")
-        transform = output.get("transform", "normal")
-        if not connector or not ("DSI" in connector or "HDMI" in connector):
-            continue
-
-        if transform == "normal":
-            console.print(f"[dim]  skip {connector}: transform=normal (default)[/dim]")
-            continue
-
-        console.print(f"[cyan]→ {connector}: transform={transform}[/cyan]")
-
-        # Apply via wlr-randr
-        wlr_cmd = (
-            f"WAYLAND_DISPLAY=wayland-0 XDG_RUNTIME_DIR=/run/user/$(id -u) "
-            f"wlr-randr --output {connector} --transform {transform} 2>&1"
-        )
-        r = p.run(wlr_cmd)
-        if r.ok:
-            console.print(f"[green]  ✓ wlr-randr applied[/green]")
-            applied += 1
-        else:
-            console.print(f"[yellow]  ⚠ wlr-randr: {r.out.strip() or 'no output'}[/yellow]")
-
-    # ── persist DSI transforms in kanshi ─────────────────────────────────────────
-    dsi_outputs = [
-        o for o in hardware.get("drm_outputs", [])
-        if "DSI" in o.get("connector", "")
-    ]
-    if dsi_outputs:
-        _update_kanshi_from_cfg(console, p, dsi_outputs)
-
-    # ── backlight ─────────────────────────────────────────────────────────────
-    for bl in hardware.get("backlights", []):
-        name = bl.get("name", "")
-        brightness = bl.get("brightness")
-        bl_power = bl.get("bl_power")
-        if not name:
-            continue
-
-        if brightness is not None:
-            r = p.run(f"echo {brightness} | sudo tee /sys/class/backlight/{name}/brightness > /dev/null")
-            if r.ok:
-                console.print(f"[green]  ✓ backlight {name}: brightness={brightness}[/green]")
-                applied += 1
-
-        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:
-                console.print(f"[green]  ✓ backlight {name}: bl_power={bl_power}[/green]")
-                applied += 1
-
-    if applied == 0:
-        console.print("[yellow]Nothing to apply — no relevant settings found in config[/yellow]")
-    else:
-        console.print(f"\n[bold green]✓ Config applied from {config_path}[/bold green]")
-
-
-def _update_kanshi_from_cfg(console, p, dsi_outputs: list):
-    """Rebuild kanshi profile from drm_outputs list and write to ~/.config/kanshi/config."""
-    import re as _re
-
-    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")
-
-        output_line_pat = _re.compile(
-            rf'(\s*output\s+{_re.escape(connector)}\s+enable)(\s+transform\s+\S+)?'
-        )
-        if _re.search(output_line_pat, current):
-            if transform == "normal":
-                current = _re.sub(output_line_pat, r'\1', current)
-            else:
-                current = _re.sub(output_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:
-        console.print(f"[green]  ✓ kanshi config updated ({kanshi_cfg_path})[/green]")
-    p.run("pkill -SIGUSR1 kanshi 2>/dev/null || true")
-
-
 def _execute_query_device_map(console, dm, query_expr, output_fmt):
     """Execute JMESPath query on DeviceMap model and output result."""
     import jmespath
@@ -360,122 +222,16 @@ def _execute_query_device_map(console, dm, query_expr, output_fmt):
 # ── rendering helpers ─────────────────────────────────────────────────────────
 
 
-_SEV_COLOR = {"info": "green", "warning": "yellow", "error": "red", "critical": "bold red"}
-_SEV_ICON = {"info": "✓", "warning": "⚠", "error": "✗", "critical": "✗✗"}
-
-
 def _render(console: Console, dm: "DeviceMap", fmt: str) -> None:
-    from ...models import DeviceMap
+    """Dispatch to the appropriate renderer for *fmt*."""
+    from .device_map_renderers import render_json, render_rich, render_yaml
 
     if fmt == "yaml":
-        click.echo(dm.to_yaml())
-        return
-    if fmt == "json":
-        import json as _json
-        click.echo(_json.dumps(dm.model_dump(mode="json"), indent=2))
-        return
-
-    # Rich
-    console.print()
-    tags_str = " ".join(f"[dim cyan]{t}[/dim cyan]" for t in dm.tags) or "[dim]-[/dim]"
-    console.print(Panel(
-        f"[bold]device-map[/bold]  [cyan]{dm.host}[/cyan]\n"
-        f"Name: [white]{dm.name or '—'}[/white]   "
-        f"Tags: {tags_str}   "
-        f"Scanned: [dim]{dm.scanned_at.strftime('%Y-%m-%d %H:%M UTC')}[/dim]",
-        box=box.ROUNDED,
-        expand=False,
-    ))
-
-    # Hardware section
-    hw = dm.hardware
-    if hw:
-        console.print(f"\n[bold]Board[/bold]  {hw.board or '?'}   Kernel: {hw.kernel or '?'}")
-
-        if hw.drm_outputs:
-            t = Table(title="Display (DRM)", show_header=True, box=box.SIMPLE, padding=(0, 1))
-            t.add_column("Connector")
-            t.add_column("Status")
-            t.add_column("Mode")
-            t.add_column("Transform")
-            t.add_column("Backlight")
-            for o in hw.drm_outputs:
-                sc = "green" if o.status == "connected" else "dim"
-                bl = next((b for b in hw.backlights if b.display_name == o.connector), None)
-                bl_str = f"{bl.brightness}/{bl.max_brightness}" if bl else "—"
-                t.add_row(
-                    o.connector,
-                    f"[{sc}]{o.status}[/{sc}]",
-                    o.modes[0] if o.modes else "—",
-                    o.transform,
-                    bl_str,
-                )
-            console.print(t)
-
-        if hw.dsi_overlays:
-            console.print(f"[dim]Overlays:[/dim]  {', '.join(hw.dsi_overlays)}")
-        if hw.i2c_buses:
-            buses = ", ".join(
-                f"i2c-{b.bus}" + (f"[{','.join(b.devices)}]" if b.devices else "")
-                for b in hw.i2c_buses
-            )
-            console.print(f"[dim]I2C:[/dim]  {buses}")
-
-    # Infra section
-    infra = dm.infra
-    if infra:
-        rt = infra.runtime
-        runtimes = [
-            f"podman {rt.podman}" if rt.podman else None,
-            f"docker {rt.docker}" if rt.docker else None,
-            f"k3s {rt.k3s}" if rt.k3s else None,
-        ]
-        rt_str = "  ".join(r for r in runtimes if r) or "—"
-        console.print(f"\n[bold]Infra[/bold]  strategy=[cyan]{infra.detected_strategy.value}[/cyan]"
-                      f"  version={infra.current_version or '?'}  {rt_str}")
-
-        # Running services
-        podman_svcs = infra.services.get("podman", [])
-        systemd_svcs = infra.services.get("systemd", [])
-        all_svcs = podman_svcs + systemd_svcs
-        if all_svcs:
-            t = Table(title="Services", show_header=True, box=box.SIMPLE, padding=(0, 1))
-            t.add_column("Name")
-            t.add_column("Status")
-            t.add_column("Type")
-            for s in all_svcs:
-                sc = "green" if "running" in s.status.lower() or "active" in s.status.lower() else "red"
-                kind = "podman" if s in podman_svcs else "systemd"
-                t.add_row(s.name, f"[{sc}]{s.status}[/{sc}]", kind)
-            console.print(t)
-
-    # Issues
-    console.print()
-    if not dm.issues:
-        console.print("[green]✓ No issues detected[/green]")
+        render_yaml(dm)
+    elif fmt == "json":
+        render_json(dm)
     else:
-        t = Table(title="Issues", show_header=True, box=box.SIMPLE, padding=(0, 1))
-        t.add_column("", width=3)
-        t.add_column("Source", style="dim")
-        t.add_column("Component")
-        t.add_column("Message")
-
-        for issue in dm.issues:
-            sev = issue.get("severity", "info")
-            color = _SEV_COLOR.get(sev, "white")
-            icon = _SEV_ICON.get(sev, "?")
-            t.add_row(
-                f"[{color}]{icon}[/{color}]",
-                issue.get("source", ""),
-                f"[{color}]{issue.get('component', '')}[/{color}]",
-                issue.get("message", ""),
-            )
-        console.print(t)
-
-        fixes = [i for i in dm.issues if i.get("fix")]
-        if fixes:
-            console.print(f"[dim]  {len(fixes)} fix suggestion(s) — rerun with:[/dim]  "
-                          f"[cyan]redeploy hardware {dm.host} --fix[/cyan]")
+        render_rich(console, dm)
 
 
 def _print_list(console: Console) -> None: