redeploy 0.2.34__tar.gz → 0.2.36__tar.gz

{redeploy-0.2.34 → redeploy-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.34
+Version: 0.2.36
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -27,17 +27,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.34-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-17.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.36-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-18.1h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (54 commits)
-- 👤 **Human dev:** ~$1769 (17.7h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (57 commits)
+- 👤 **Human dev:** ~$1815 (18.1h @ $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.34-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.36-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.34 → redeploy-0.2.36}/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.34-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-17.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.36-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-18.1h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (54 commits)
-- 👤 **Human dev:** ~$1769 (17.7h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (57 commits)
+- 👤 **Human dev:** ~$1815 (18.1h @ $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.34-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.36-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.34 → redeploy-0.2.36}/pyproject.toml

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

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

{redeploy-0.2.34 → redeploy-0.2.36}/redeploy/apply/handlers.py

@@ -36,6 +36,10 @@ def run_scp(step: MigrationStep, probe: RemoteProbe, plan: MigrationPlan) -> Non
     """Copy file via SCP."""
     if not step.src or not step.dst:
         raise StepError(step, "scp requires src and dst")
+    if probe.is_local and Path(step.src).resolve() == Path(step.dst).resolve():
+        step.status = StepStatus.DONE
+        step.result = "skipped (same file)"
+        return
     if probe.is_local:
         cmd = ["cp", step.src, step.dst]
     else:
@@ -73,51 +77,8 @@ def run_docker_build(
     emitter: ProgressEmitter | None,
 ) -> None:
     """Run docker compose build on remote with periodic progress polling."""
-    cmd = step.command
-    if not cmd:
-        raise StepError(step, "No command specified")
-
-    timeout = step.timeout or 1800  # 30 min default for first ARM64 build
-    poll_interval = 15              # seconds between progress snapshots
-    done_event = threading.Event()
-    result_holder: list = []
-
-    def _ssh_build() -> None:
-        r = probe.run(cmd, timeout=timeout)
-        result_holder.append(r)
-        done_event.set()
-
-    thread = threading.Thread(target=_ssh_build, daemon=True)
-    thread.start()
-
-    elapsed = 0
-    while not done_event.wait(timeout=poll_interval):
-        elapsed += poll_interval
-        snap = probe.run(
-            "docker system df 2>/dev/null | grep -E 'Image|Cache' | "
-            "awk '{print $1, $3, $4}'",
-            timeout=10,
-        )
-        if snap.ok and snap.out.strip():
-            lines = " | ".join(snap.out.strip().splitlines())
-            msg = f"[{elapsed}s] build cache: {lines}"
-            logger.debug(f"    {msg}")
-            if emitter:
-                emitter.progress(step.id, msg)
-        else:
-            msg = f"[{elapsed}s] build in progress..."
-            logger.debug(f"    {msg}")
-            if emitter:
-                emitter.progress(step.id, msg)
-
-    if not result_holder:
-        raise StepError(step, "Build thread did not return a result")
-    r = result_holder[0]
-    step.result = r.out[:500]
-    if not r.ok:
-        raise StepError(step, f"exit={r.exit_code}: {r.stderr[:300]}")
-    logger.debug(f"    build completed in {elapsed + poll_interval}s")
-    step.status = StepStatus.DONE
+    from .utils import run_container_build
+    run_container_build(step, probe, emitter, engine="docker")
 
 
 def run_podman_build(
@@ -126,51 +87,8 @@ def run_podman_build(
     emitter: ProgressEmitter | None,
 ) -> None:
     """Run podman build on remote with periodic progress polling."""
-    cmd = step.command
-    if not cmd:
-        raise StepError(step, "No command specified")
-
-    timeout = step.timeout or 1800  # 30 min default for ARM64 builds
-    poll_interval = 15              # seconds between progress snapshots
-    done_event = threading.Event()
-    result_holder: list = []
-
-    def _ssh_build() -> None:
-        r = probe.run(cmd, timeout=timeout)
-        result_holder.append(r)
-        done_event.set()
-
-    thread = threading.Thread(target=_ssh_build, daemon=True)
-    thread.start()
-
-    elapsed = 0
-    while not done_event.wait(timeout=poll_interval):
-        elapsed += poll_interval
-        snap = probe.run(
-            "podman system df 2>/dev/null | grep -E 'Image|Cache' | "
-            "awk '{print $1, $3, $4}'",
-            timeout=10,
-        )
-        if snap.ok and snap.out.strip():
-            lines = " | ".join(snap.out.strip().splitlines())
-            msg = f"[{elapsed}s] podman cache: {lines}"
-            logger.debug(f"    {msg}")
-            if emitter:
-                emitter.progress(step.id, msg)
-        else:
-            msg = f"[{elapsed}s] podman build in progress..."
-            logger.debug(f"    {msg}")
-            if emitter:
-                emitter.progress(step.id, msg)
-
-    if not result_holder:
-        raise StepError(step, "Podman build thread did not return a result")
-    r = result_holder[0]
-    step.result = r.out[:500]
-    if not r.ok:
-        raise StepError(step, f"exit={r.exit_code}: {r.stderr[:300]}")
-    logger.debug(f"    podman build completed in {elapsed + poll_interval}s")
-    step.status = StepStatus.DONE
+    from .utils import run_container_build
+    run_container_build(step, probe, emitter, engine="podman")
 
 
 def run_docker_health_wait(

redeploy-0.2.36/redeploy/apply/utils/__init__.py

@@ -0,0 +1,6 @@
+"""Apply utilities package."""
+from __future__ import annotations
+
+from .run_container_build import run_container_build
+
+__all__ = ["run_container_build"]

redeploy-0.2.36/redeploy/apply/utils/run_container_build.py

@@ -0,0 +1,69 @@
+"""Container build handler with progress polling (docker/podman)."""
+from __future__ import annotations
+
+import threading
+import time
+from typing import TYPE_CHECKING, Literal
+
+from loguru import logger
+
+from ...models import StepStatus
+
+if TYPE_CHECKING:
+    from ..models import MigrationStep
+    from ..progress import ProgressEmitter
+    from ...detect.remote import RemoteProbe
+
+
+def run_container_build(
+    step: "MigrationStep",
+    probe: "RemoteProbe",
+    emitter: "ProgressEmitter | None",
+    engine: Literal["docker", "podman"],
+) -> None:
+    """Run container build on remote with periodic progress polling."""
+    cmd = step.command
+    if not cmd:
+        from ..exceptions import StepError
+        raise StepError(step, "No command specified")
+
+    timeout = step.timeout or 1800  # 30 min default for ARM64 builds
+    poll_interval = 15
+    done_event = threading.Event()
+    result_holder: list = []
+
+    def _ssh_build() -> None:
+        r = probe.run(cmd, timeout=timeout)
+        result_holder.append(r)
+        done_event.set()
+
+    thread = threading.Thread(target=_ssh_build, daemon=True)
+    thread.start()
+
+    elapsed = 0
+    while not done_event.wait(timeout=poll_interval):
+        elapsed += poll_interval
+        cache_cmd = f"{engine} system df 2>/dev/null | grep -E 'Image|Cache' | awk '{{print $1, $3, $4}}'"
+        snap = probe.run(cache_cmd, timeout=10)
+        if snap.ok and snap.out.strip():
+            lines = " | ".join(snap.out.strip().splitlines())
+            msg = f"[{elapsed}s] {engine} cache: {lines}"
+            logger.debug(f"    {msg}")
+            if emitter:
+                emitter.progress(step.id, msg)
+        else:
+            msg = f"[{elapsed}s] {engine} build in progress..."
+            logger.debug(f"    {msg}")
+            if emitter:
+                emitter.progress(step.id, msg)
+
+    if not result_holder:
+        from ..exceptions import StepError
+        raise StepError(step, f"{engine.capitalize()} build thread did not return a result")
+    r = result_holder[0]
+    step.result = r.out[:500]
+    if not r.ok:
+        from ..exceptions import StepError
+        raise StepError(step, f"exit={r.exit_code}: {r.stderr[:300]}")
+    logger.debug(f"    {engine} build completed in {elapsed + poll_interval}s")
+    step.status = StepStatus.DONE

redeploy-0.2.36/redeploy/cli/commands/hardware.py

@@ -0,0 +1,272 @@
+"""hardware command — Probe and diagnose hardware on a remote host.
+
+Detects DSI displays, DRM connectors, backlight, I2C buses,
+GPIO, config.txt overlays and reports problems with fix suggestions.
+
+Examples::
+
+    redeploy hardware pi@192.168.188.109
+    redeploy hardware pi@192.168.188.109 --format json
+    redeploy hardware pi@192.168.188.109 --fix        # print all fix commands
+    redeploy hardware pi@192.168.188.109 --apply-fix dsi  # run fix for component
+"""
+from __future__ import annotations
+
+import sys
+
+import click
+from rich.console import Console
+from rich.panel import Panel
+from rich.table import Table
+from rich import box
+
+
+_SEVERITY_COLOR = {
+    "info":     "green",
+    "warning":  "yellow",
+    "error":    "red",
+    "critical": "bold red",
+}
+
+_SEVERITY_ICON = {
+    "info":     "✓",
+    "warning":  "⚠",
+    "error":    "✗",
+    "critical": "✗✗",
+}
+
+
+def _probe_hardware(host, ssh_key, console):
+    """Probe hardware on remote host."""
+    from ...detect.hardware import probe_hardware
+    from ...detect.remote import RemoteProbe
+
+    p = RemoteProbe(host, ssh_key=ssh_key) if ssh_key else RemoteProbe(host)
+
+    with console.status(f"[cyan]Probing hardware on {host}…[/cyan]"):
+        try:
+            hw = probe_hardware(p)
+        except ConnectionError as exc:
+            console.print(f"[red]✗ {exc}[/red]")
+            sys.exit(2)
+        except Exception as exc:
+            console.print(f"[red]✗ hardware probe failed: {exc}[/red]")
+            raise
+
+    return hw, p
+
+
+def _format_output(hw, output_fmt):
+    """Format output as yaml/json, return True if formatted."""
+    if output_fmt == "yaml":
+        import yaml
+        click.echo(yaml.safe_dump(hw.model_dump(mode="json"), sort_keys=False))
+        return True
+
+    if output_fmt == "json":
+        import json as _json
+        click.echo(_json.dumps(hw.model_dump(mode="json"), indent=2))
+        return True
+
+    return False
+
+
+def _print_drm_connectors(console, hw):
+    """Print DRM connectors table."""
+    if not hw.drm_outputs:
+        return
+
+    t = Table(title="DRM Connectors", show_header=True, box=box.SIMPLE, padding=(0, 1))
+    t.add_column("Connector")
+    t.add_column("Status")
+    t.add_column("Enabled")
+    t.add_column("Mode")
+    t.add_column("Transform")
+    for o in hw.drm_outputs:
+        status_color = "green" if o.status == "connected" else "red"
+        mode = o.modes[0] if o.modes else "—"
+        t.add_row(
+            o.connector,
+            f"[{status_color}]{o.status}[/{status_color}]",
+            o.enabled,
+            mode,
+            o.transform,
+        )
+    console.print(t)
+
+
+def _print_backlights(console, hw):
+    """Print backlights table."""
+    if not hw.backlights:
+        return
+
+    t = Table(title="Backlight", show_header=True, box=box.SIMPLE, padding=(0, 1))
+    t.add_column("Device")
+    t.add_column("Brightness")
+    t.add_column("Max")
+    t.add_column("Power")
+    t.add_column("Display")
+    for b in hw.backlights:
+        pw_color = "green" if b.bl_power == 0 else "red"
+        br_color = "green" if b.brightness > 0 else "red"
+        t.add_row(
+            b.name,
+            f"[{br_color}]{b.brightness}[/{br_color}]",
+            str(b.max_brightness),
+            f"[{pw_color}]{'ON' if b.bl_power == 0 else 'OFF'}[/{pw_color}]",
+            b.display_name or "—",
+        )
+    console.print(t)
+
+
+def _print_dsi_overlays(console, hw):
+    """Print DSI overlays."""
+    if hw.dsi_overlays:
+        console.print(f"[dim]DSI overlays:[/dim]  {', '.join(hw.dsi_overlays)}")
+    else:
+        console.print("[red]DSI overlays: none found[/red]")
+
+
+def _print_i2c_buses(console, hw):
+    """Print I2C buses summary."""
+    if not hw.i2c_buses:
+        return
+
+    bus_summary = ", ".join(
+        f"i2c-{b.bus}" + (f" [{','.join(b.devices)}]" if b.devices else "")
+        for b in hw.i2c_buses
+    )
+    console.print(f"[dim]I2C buses:[/dim]  {bus_summary}")
+
+
+def _print_diagnostics(console, hw, show_fix):
+    """Print diagnostics table and fix suggestions."""
+    if not hw.diagnostics:
+        console.print("[green]✓ No hardware issues detected[/green]")
+        return
+
+    t = Table(title="Diagnostics", show_header=True, box=box.SIMPLE, padding=(0, 1))
+    t.add_column("", width=3)
+    t.add_column("Component", style="bold")
+    t.add_column("Message")
+
+    for d in hw.diagnostics:
+        color = _SEVERITY_COLOR.get(d.severity, "white")
+        icon = _SEVERITY_ICON.get(d.severity, "?")
+        t.add_row(
+            f"[{color}]{icon}[/{color}]",
+            f"[{color}]{d.component}[/{color}]",
+            d.message,
+        )
+    console.print(t)
+
+    # Fix hints
+    fixable = [d for d in hw.diagnostics if d.fix]
+    if fixable and show_fix:
+        console.print()
+        console.print("[bold]Fix suggestions:[/bold]")
+        for d in fixable:
+            color = _SEVERITY_COLOR.get(d.severity, "white")
+            console.print(
+                f"\n  [{color}][{d.component}][/{color}] {d.message}\n"
+                + "\n".join(f"    [dim]{line}[/dim]" for line in (d.fix or "").splitlines())
+            )
+    elif fixable and not show_fix:
+        console.print(
+            f"\n[dim]  {len(fixable)} fix suggestion(s) available — rerun with --fix[/dim]"
+        )
+
+
+def _apply_fix(console, p, hw, apply_fix_component):
+    """Apply fix for a specific component."""
+    matching = [d for d in hw.diagnostics if d.component == apply_fix_component and d.fix]
+    if not matching:
+        console.print(f"[yellow]No fix available for component: {apply_fix_component}[/yellow]")
+        sys.exit(1)
+
+    for d in matching:
+        # Extract just the command lines (skip explanatory text)
+        fix_lines = [
+            line.strip()
+            for line in (d.fix or "").splitlines()
+            if line.strip() and not line.strip().startswith("#")
+            and ":" not in line[:20]  # skip lines like "Check: ..."
+        ]
+        for cmd in fix_lines:
+            console.print(f"[cyan]→ {cmd}[/cyan]")
+            result = p.run(cmd)
+            if result.ok:
+                console.print(f"[green]  ✓ done[/green]")
+            else:
+                console.print(f"[red]  ✗ failed: {result.err}[/red]")
+
+
+@click.command()
+@click.argument("host")
+@click.option(
+    "--format", "output_fmt",
+    default="rich",
+    type=click.Choice(["rich", "yaml", "json"]),
+    help="Output format",
+)
+@click.option(
+    "--fix", "show_fix",
+    is_flag=True,
+    help="Print fix commands for all issues found",
+)
+@click.option(
+    "--apply-fix", "apply_fix_component",
+    default=None,
+    metavar="COMPONENT",
+    help=(
+        "Run the fix for a specific component via SSH "
+        "(e.g. 'backlight', 'overlay'). Requires sudo on target."
+    ),
+)
+@click.option("--ssh-key", default=None, type=click.Path(), help="SSH private key path")
+def hardware(host, output_fmt, show_fix, apply_fix_component, ssh_key):
+    """Probe and diagnose hardware on a remote host.
+
+    Checks DSI display, DRM connectors, backlight controller, I2C buses,
+    config.txt overlays and Wayland compositor — then reports issues with
+    actionable fix suggestions.
+
+    \b
+    Examples:
+        redeploy hardware pi@192.168.188.109
+        redeploy hardware pi@192.168.188.109 --fix
+        redeploy hardware pi@192.168.188.109 --format yaml
+    """
+    console = Console()
+    hw, p = _probe_hardware(host, ssh_key, console)
+
+    if _format_output(hw, output_fmt):
+        return
+
+    # ── rich output ─────────────────────────────────────────────────────────
+
+    console.print()
+    console.print(Panel(
+        f"[bold]hardware probe[/bold]  [cyan]{host}[/cyan]\n"
+        f"Board: [white]{hw.board or 'unknown'}[/white]  "
+        f"Kernel: [white]{hw.kernel or 'unknown'}[/white]",
+        box=box.ROUNDED,
+        expand=False,
+    ))
+
+    _print_drm_connectors(console, hw)
+    _print_backlights(console, hw)
+    _print_dsi_overlays(console, hw)
+    _print_i2c_buses(console, hw)
+
+    console.print()
+
+    _print_diagnostics(console, hw, show_fix)
+
+    if apply_fix_component:
+        _apply_fix(console, p, hw, apply_fix_component)
+
+    # Exit code based on errors
+    errors = hw.errors
+    if errors:
+        sys.exit(1)

redeploy-0.2.36/redeploy/cli/commands/version/__init__.py

@@ -0,0 +1,6 @@
+"""version command group — Declarative version management."""
+from __future__ import annotations
+
+from .commands import version_cmd
+
+__all__ = ["version_cmd"]