redeploy 0.2.36__tar.gz → 0.2.38__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.36
+Version: 0.2.38
 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.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)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.38-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.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (57 commits)
-- 👤 **Human dev:** ~$1815 (18.1h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (59 commits)
+- 👤 **Human dev:** ~$1944 (19.4h @ $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.36-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.38-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.36 → redeploy-0.2.38}/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.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)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.38-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.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (57 commits)
-- 👤 **Human dev:** ~$1815 (18.1h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (59 commits)
+- 👤 **Human dev:** ~$1944 (19.4h @ $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.36-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.38-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.36 → redeploy-0.2.38}/pyproject.toml

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

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

{redeploy-0.2.36 → redeploy-0.2.38}/redeploy/apply/executor.py

@@ -15,6 +15,7 @@ from .handlers import (
     run_ssh, run_scp, run_rsync, run_docker_build, run_podman_build,
     run_docker_health_wait, run_container_log_tail, run_http_check,
     run_version_check, run_plugin, run_wait, run_inline_script,
+    run_ensure_config_line, run_raspi_config,
 )
 from .progress import ProgressEmitter
 from .rollback import rollback_steps
@@ -227,6 +228,8 @@ class Executor:
             StepAction.WAIT:                lambda s: run_wait(s),
             StepAction.PLUGIN:              lambda s: run_plugin(s, self.probe, self.plan, self._emitter, self.dry_run),
             StepAction.INLINE_SCRIPT:       lambda s: run_inline_script(s, self.probe, self.plan),
+            StepAction.ENSURE_CONFIG_LINE:  lambda s: run_ensure_config_line(s, self.probe),
+            StepAction.RASPI_CONFIG:        lambda s: run_raspi_config(s, self.probe),
         }
 
         handler = dispatch.get(step.action)

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

@@ -338,3 +338,63 @@ def _resolve_command_ref(command_ref: str, step: MigrationStep, plan: MigrationP
         raise StepError(step, f"Could not find bash script for ref '{section_id}' in {file_path} (tried markpact:ref and section heading)")
 
     return script
+
+
+# ── hardware-specific handlers ────────────────────────────────────────────────
+
+def run_ensure_config_line(step: MigrationStep, probe: "RemoteProbe") -> None:
+    """Idempotent add/replace a line in a remote config.txt."""
+    from ..hardware.config_txt import ensure_line
+
+    if not step.config_file or not step.config_line:
+        raise StepError(step, "ensure_config_line requires config_file and config_line")
+
+    config_path = step.config_file
+    r = probe.run(f"sudo cat {config_path}", timeout=10)
+    if not r.ok:
+        raise StepError(step, f"Cannot read {config_path}: {r.stderr[:200]}")
+
+    edit = ensure_line(
+        r.out,
+        step.config_line,
+        section=step.config_section or "all",
+        replaces_pattern=step.config_replaces_pattern,
+    )
+
+    if not edit.changed:
+        step.status = StepStatus.DONE
+        step.result = f"no-op: {edit.diff_summary}"
+        return
+
+    # Write atomically: base64-encode to avoid shell quoting issues
+    encoded = base64.b64encode(edit.new_content.encode()).decode()
+    tmp = f"/tmp/redeploy-cfg-{step.id}.txt"
+    write_r = probe.run(
+        f"echo '{encoded}' | base64 -d | sudo tee {tmp} > /dev/null && sudo mv {tmp} {config_path}",
+        timeout=15,
+    )
+    if not write_r.ok:
+        raise StepError(step, f"Cannot write {config_path}: {write_r.stderr[:200]}")
+
+    step.status = StepStatus.DONE
+    step.result = edit.diff_summary
+
+
+def run_raspi_config(step: MigrationStep, probe: "RemoteProbe") -> None:
+    """Run raspi-config nonint to enable/disable an interface."""
+    from ..hardware.raspi_config import build_raspi_config_command
+
+    if not step.raspi_interface or not step.raspi_state:
+        raise StepError(step, "raspi_config requires raspi_interface and raspi_state")
+
+    try:
+        cmd = build_raspi_config_command(step.raspi_interface, step.raspi_state)
+    except ValueError as exc:
+        raise StepError(step, str(exc))
+
+    r = probe.run(cmd, timeout=30)
+    if not r.ok:
+        raise StepError(step, f"raspi-config failed: {r.stderr[:200]}")
+
+    step.status = StepStatus.DONE
+    step.result = f"applied: {cmd}"

{redeploy-0.2.36 → redeploy-0.2.38}/redeploy/cli/commands/hardware.py

@@ -177,32 +177,42 @@ def _print_diagnostics(console, hw, show_fix):
         )
 
 
-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:
+def _apply_fix(console, p, hw, apply_fix_component, panel_id=None):
+    """Apply fix for a specific component using fix plan generator."""
+    from ...hardware.fixes import generate_fix_plan
+    from ...hardware.panels import get
+
+    # Get panel if specified
+    panel = get(panel_id) if panel_id else None
+
+    # Generate fix plan
+    steps = generate_fix_plan(hw, apply_fix_component, panel)
+    if not steps:
         console.print(f"[yellow]No fix available for component: {apply_fix_component}[/yellow]")
+        if panel_id:
+            console.print(f"[dim]Panel: {panel_id}[/dim]")
         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]")
+    console.print(f"[bold]Fix plan for {apply_fix_component}[/bold]")
+    if panel:
+        console.print(f"  Panel: {panel.name}")
+
+    # Execute steps via Executor (simplified version)
+    from ...apply.executor import Executor
+
+    executor = Executor(probe=p, console=console, dry_run=False)
+    for step in steps:
+        console.print(f"[cyan]→ {step.description}[/cyan]")
+        try:
+            executor._run_single_step(step)
+            console.print(f"[green]  ✓ done[/green]")
+        except Exception as exc:
+            console.print(f"[red]  ✗ failed: {exc}[/red]")
+            sys.exit(1)
 
 
 @click.command()
-@click.argument("host")
+@click.argument("host", required=False, default=None)
 @click.option(
     "--format", "output_fmt",
     default="rich",
@@ -223,8 +233,19 @@ def _apply_fix(console, p, hw, apply_fix_component):
         "(e.g. 'backlight', 'overlay'). Requires sudo on target."
     ),
 )
+@click.option(
+    "--panel", "panel_id",
+    default=None,
+    metavar="PANEL_ID",
+    help="Specify panel ID explicitly (use --list-panels to see available)",
+)
+@click.option(
+    "--list-panels",
+    is_flag=True,
+    help="List available panel definitions and exit",
+)
 @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):
+def hardware(host, output_fmt, show_fix, apply_fix_component, panel_id, list_panels, ssh_key):
     """Probe and diagnose hardware on a remote host.
 
     Checks DSI display, DRM connectors, backlight controller, I2C buses,
@@ -236,8 +257,29 @@ def hardware(host, output_fmt, show_fix, apply_fix_component, ssh_key):
         redeploy hardware pi@192.168.188.109
         redeploy hardware pi@192.168.188.109 --fix
         redeploy hardware pi@192.168.188.109 --format yaml
+        redeploy hardware --list-panels
     """
     console = Console()
+
+    # Handle --list-panels
+    if list_panels:
+        from ...hardware.panels import all_panels
+        panels = all_panels()
+        t = Table(show_header=True, box=box.ROUNDED)
+        t.add_column("ID", style="cyan")
+        t.add_column("Name", style="bold")
+        t.add_column("Vendor", style="dim")
+        t.add_column("Resolution", style="dim")
+        t.add_column("Overlay", style="dim")
+        for p in panels:
+            res = f"{p.resolution[0]}×{p.resolution[1]}" if p.resolution else "—"
+            t.add_row(p.id, p.name, p.vendor, res, p.overlay)
+        console.print(t)
+        return
+
+    if not host:
+        raise click.UsageError("HOST argument is required unless --list-panels is used.")
+
     hw, p = _probe_hardware(host, ssh_key, console)
 
     if _format_output(hw, output_fmt):
@@ -264,7 +306,7 @@ def hardware(host, output_fmt, show_fix, apply_fix_component, ssh_key):
     _print_diagnostics(console, hw, show_fix)
 
     if apply_fix_component:
-        _apply_fix(console, p, hw, apply_fix_component)
+        _apply_fix(console, p, hw, apply_fix_component, panel_id)
 
     # Exit code based on errors
     errors = hw.errors

{redeploy-0.2.36 → redeploy-0.2.38}/redeploy/detect/hardware.py

@@ -53,13 +53,16 @@ def probe_board(p: RemoteProbe) -> tuple[Optional[str], Optional[str]]:
     return board, kernel
 
 
-def probe_config_txt(p: RemoteProbe) -> str:
-    """Read /boot/firmware/config.txt (RPi5) or /boot/config.txt."""
+def probe_config_txt(p: RemoteProbe) -> tuple[str, str]:
+    """Read /boot/firmware/config.txt (RPi5) or /boot/config.txt.
+
+    Returns (content, path) — path is needed for idempotent edits later.
+    """
     for path in ("/boot/firmware/config.txt", "/boot/config.txt"):
         r = p.run(f"cat {path} 2>/dev/null")
         if r.ok and r.out.strip():
-            return r.out
-    return ""
+            return r.out, path
+    return "", "/boot/firmware/config.txt"
 
 
 def probe_drm_outputs(p: RemoteProbe) -> list[DrmOutput]:
@@ -232,7 +235,7 @@ def _analyze(hw: HardwareInfo) -> list[HardwareDiagnostic]:
 def probe_hardware(p: RemoteProbe) -> HardwareInfo:
     """Probe hardware state of the remote host and return HardwareInfo with diagnostics."""
     board, kernel = probe_board(p)
-    config_txt = probe_config_txt(p)
+    config_txt, config_txt_path = probe_config_txt(p)
 
     # Parse active DSI overlays from config.txt
     dsi_overlays = [
@@ -266,6 +269,7 @@ def probe_hardware(p: RemoteProbe) -> HardwareInfo:
         board=board,
         kernel=kernel,
         config_txt=config_txt,
+        config_txt_path=config_txt_path,
         dsi_overlays=dsi_overlays,
         drm_outputs=drm_outputs,
         wlr_outputs=wlr_outputs,

redeploy-0.2.38/redeploy/hardware/__init__.py

@@ -0,0 +1,8 @@
+"""Hardware configuration support for Raspberry Pi."""
+from __future__ import annotations
+
+from .panels import PanelDefinition, get, all_panels, infer_from_hardware, register
+from . import data as _data  # noqa: F401 — populates panel registry
+
+__all__ = ["PanelDefinition", "get", "all_panels", "infer_from_hardware", "register"]
+

redeploy-0.2.38/redeploy/hardware/data/__init__.py

@@ -0,0 +1,4 @@
+"""Auto-import all panel data files to populate the registry."""
+from __future__ import annotations
+
+from . import waveshare, official, hyperpixel  # noqa: F401

redeploy-0.2.38/redeploy/hardware/data/hyperpixel.py

@@ -0,0 +1,41 @@
+"""HyperPixel panel definitions."""
+from __future__ import annotations
+
+from redeploy.hardware.panels import PanelDefinition, register
+
+register(PanelDefinition(
+    id="hyperpixel4-square",
+    name="HyperPixel 4.0 Square 720×720",
+    vendor="hyperpixel",
+    overlay="vc4-kms-dpi-hyperpixel4sq",
+    overlay_params=(),
+    resolution=(720, 720),
+    requires_spi_touch=True,
+    notes=[
+        "Dotyk przez SPI — raspi-config → SPI → enable",
+        "Nie wymaga I2C",
+    ],
+))
+
+register(PanelDefinition(
+    id="hyperpixel4",
+    name="HyperPixel 4.0 800×480",
+    vendor="hyperpixel",
+    overlay="vc4-kms-dpi-hyperpixel4",
+    overlay_params=(),
+    resolution=(800, 480),
+    requires_spi_touch=True,
+    notes=[
+        "Dotyk przez SPI — raspi-config → SPI → enable",
+    ],
+))
+
+register(PanelDefinition(
+    id="hyperpixel2r",
+    name="HyperPixel 2.1 Round 480×480",
+    vendor="hyperpixel",
+    overlay="vc4-kms-dpi-hyperpixel2r",
+    overlay_params=(),
+    resolution=(480, 480),
+    requires_spi_touch=True,
+))

redeploy-0.2.38/redeploy/hardware/data/official.py

@@ -0,0 +1,18 @@
+"""Official Raspberry Pi display panel definitions."""
+from __future__ import annotations
+
+from redeploy.hardware.panels import PanelDefinition, register
+
+register(PanelDefinition(
+    id="rpi-dsi-7-inch",
+    name='Official Raspberry Pi 7" DSI 800×480',
+    vendor="official",
+    overlay="vc4-kms-dsi-rpi-touchscreen",
+    overlay_params=(),
+    resolution=(800, 480),
+    requires_i2c_touch=True,
+    notes=[
+        "Oryginalny ekran RPi — sterownik vc4-kms-dsi-rpi-touchscreen",
+        "Podłączenie zasilania przez 4-pin JST na module ekranu",
+    ],
+))

redeploy-0.2.38/redeploy/hardware/fixes.py

@@ -0,0 +1,203 @@
+"""Fix-plan generators: HardwareInfo + PanelDefinition → list[MigrationStep]."""
+from __future__ import annotations
+
+from typing import Callable
+
+from redeploy.models import ConflictSeverity, MigrationStep, StepAction, HardwareInfo
+from redeploy.hardware.panels import PanelDefinition, infer_from_hardware
+
+
+def _step(
+    id: str,
+    action: StepAction,
+    description: str,
+    risk: ConflictSeverity = ConflictSeverity.LOW,
+    **kw,
+) -> MigrationStep:
+    return MigrationStep(id=id, action=action, description=description, risk=risk, **kw)
+
+
+def _detect_port(hw: HardwareInfo) -> str:
+    """Detect which DSI port has a connected display."""
+    for output in hw.drm_outputs:
+        if "DSI" in output.name and output.status == "connected":
+            if "DSI-1" in output.name:
+                return "dsi1"
+            if "DSI-0" in output.name:
+                return "dsi0"
+    return "dsi1"  # safe default
+
+
+# ── fix generators ────────────────────────────────────────────────────────────
+
+def fix_dsi_not_enabled(
+    hw: HardwareInfo,
+    panel: PanelDefinition | None = None,
+) -> list[MigrationStep]:
+    """Generate steps to configure DSI panel + reboot + verify."""
+    panel = panel or infer_from_hardware(hw)
+    if panel is None:
+        raise ValueError(
+            "Cannot infer panel from hardware — specify --panel <id> explicitly. "
+            "Run 'redeploy hardware --list-panels' for available IDs."
+        )
+
+    port = _detect_port(hw)
+    config_path = hw.config_txt_path
+    steps: list[MigrationStep] = []
+
+    # 1. Backup
+    steps.append(_step(
+        id="backup_config_txt",
+        action=StepAction.SSH_CMD,
+        description="Backup config.txt before editing",
+        command=(
+            f"sudo cp {config_path} {config_path}.bak.$(date +%Y%m%d_%H%M%S)"
+        ),
+        risk=ConflictSeverity.LOW,
+    ))
+
+    # 2. KMS overlay (if not already present)
+    if panel.requires_kms:
+        steps.append(_step(
+            id="ensure_kms",
+            action=StepAction.ENSURE_CONFIG_LINE,
+            description="Enable KMS driver (vc4-kms-v3d)",
+            config_file=config_path,
+            config_line="dtoverlay=vc4-kms-v3d",
+            config_replaces_pattern=r"^#?\s*dtoverlay=vc4-kms-v3d",
+            config_section="all",
+            risk=ConflictSeverity.MEDIUM,
+        ))
+
+    # 3. Panel overlay
+    steps.append(_step(
+        id="set_panel_overlay",
+        action=StepAction.ENSURE_CONFIG_LINE,
+        description=f"Set overlay for {panel.name}",
+        config_file=config_path,
+        config_line=panel.overlay_line(port=port),
+        config_replaces_pattern=r"^dtoverlay=vc4-kms-dsi-.*",
+        config_section="all",
+        risk=ConflictSeverity.MEDIUM,
+    ))
+
+    # 4. I2C for touch (if needed)
+    if panel.requires_i2c_touch:
+        steps.append(_step(
+            id="enable_i2c",
+            action=StepAction.RASPI_CONFIG,
+            description="Enable I2C for touch controller",
+            raspi_interface="i2c",
+            raspi_state="enable",
+            risk=ConflictSeverity.LOW,
+        ))
+
+    # 5. SPI for touch (if needed)
+    if panel.requires_spi_touch:
+        steps.append(_step(
+            id="enable_spi",
+            action=StepAction.RASPI_CONFIG,
+            description="Enable SPI for touch controller",
+            raspi_interface="spi",
+            raspi_state="enable",
+            risk=ConflictSeverity.LOW,
+        ))
+
+    # 6. Reboot
+    steps.append(_step(
+        id="reboot_rpi",
+        action=StepAction.SSH_CMD,
+        description="Reboot — required by overlay change",
+        command="sudo reboot",
+        risk=ConflictSeverity.HIGH,
+    ))
+
+    # 7. Wait
+    steps.append(_step(
+        id="wait_for_rpi",
+        action=StepAction.WAIT,
+        description="Wait for RPi to come back online",
+        seconds=90,
+        risk=ConflictSeverity.MEDIUM,
+    ))
+
+    # 8. Verify
+    steps.append(_step(
+        id="verify_dsi_initialized",
+        action=StepAction.SSH_CMD,
+        description="Verify DSI initialized in dmesg",
+        command="dmesg | grep -iE 'dsi|vc4|panel' | tail -20",
+        risk=ConflictSeverity.LOW,
+    ))
+
+    return steps
+
+
+def fix_enable_i2c(
+    hw: HardwareInfo,
+    panel: PanelDefinition | None = None,
+) -> list[MigrationStep]:
+    """Enable I2C interface via raspi-config."""
+    return [_step(
+        id="enable_i2c",
+        action=StepAction.RASPI_CONFIG,
+        description="Enable I2C",
+        raspi_interface="i2c",
+        raspi_state="enable",
+        risk=ConflictSeverity.LOW,
+    )]
+
+
+def fix_enable_spi(
+    hw: HardwareInfo,
+    panel: PanelDefinition | None = None,
+) -> list[MigrationStep]:
+    """Enable SPI interface via raspi-config."""
+    return [_step(
+        id="enable_spi",
+        action=StepAction.RASPI_CONFIG,
+        description="Enable SPI",
+        raspi_interface="spi",
+        raspi_state="enable",
+        risk=ConflictSeverity.LOW,
+    )]
+
+
+# ── fix registry ──────────────────────────────────────────────────────────────
+
+# Maps hardware_rules rule name / diagnostic component → fix generator
+FixGenerator = Callable[[HardwareInfo, PanelDefinition | None], list[MigrationStep]]
+
+FIX_REGISTRY: dict[str, FixGenerator] = {
+    "no_dsi_overlay":            fix_dsi_not_enabled,
+    "dsi_overlay_no_drm_connector": fix_dsi_not_enabled,
+    "dsi_connector_not_connected":  fix_dsi_not_enabled,
+    "dsi_connected_no_backlight":   fix_dsi_not_enabled,
+    "i2c": fix_enable_i2c,
+    "spi": fix_enable_spi,
+}
+
+
+def generate_fix_plan(
+    hw: HardwareInfo,
+    component: str,
+    panel: PanelDefinition | None = None,
+) -> list[MigrationStep]:
+    """From a component name or rule name, return fix steps."""
+    # Direct rule name match first
+    if component in FIX_REGISTRY:
+        return FIX_REGISTRY[component](hw, panel)
+
+    # Fall back: find diagnostics for this component and use their rule_name
+    for diag in hw.diagnostics:
+        if diag.component == component:
+            # Try to find a matching rule by message keywords
+            for key in FIX_REGISTRY:
+                if key in diag.message.lower().replace(" ", "_"):
+                    return FIX_REGISTRY[key](hw, panel)
+            # The DSI-related diagnostics all resolve to dsi_not_enabled
+            if component in ("dsi", "overlay", "backlight"):
+                return fix_dsi_not_enabled(hw, panel)
+
+    return []

{redeploy-0.2.36 → redeploy-0.2.38}/redeploy/models.py

@@ -1,6 +1,7 @@
 """Shared data models for redeploy: InfraState, MigrationPlan, Target."""
 from __future__ import annotations
 
+import re
 from datetime import datetime, timezone
 from enum import Enum
 from pathlib import Path
@@ -185,6 +186,7 @@ class HardwareInfo(BaseModel):
     board: Optional[str] = None         # e.g. "Raspberry Pi 5 Model B Rev 1.0"
     kernel: Optional[str] = None        # uname -r
     config_txt: str = ""                # full /boot/firmware/config.txt
+    config_txt_path: str = "/boot/firmware/config.txt"  # probed path, varies by OS
 
     # Display
     drm_outputs: list[DrmOutput] = Field(default_factory=list)
@@ -209,6 +211,15 @@ class HardwareInfo(BaseModel):
     def has_dsi(self) -> bool:
         return any("DSI" in o.name for o in self.drm_outputs)
 
+    @property
+    def kms_enabled(self) -> bool:
+        """True if vc4-kms-v3d overlay is present in config.txt."""
+        return any(
+            re.match(r'\s*dtoverlay=vc4-kms-v3d', line)
+            for line in self.config_txt.splitlines()
+            if not line.strip().startswith("#")
+        )
+
     @property
     def dsi_connected(self) -> bool:
         return any("DSI" in o.name and o.status == "connected" for o in self.drm_outputs)
@@ -316,6 +327,16 @@ class MigrationStep(BaseModel):
     plugin_type: Optional[str] = None    # e.g. "browser_reload"
     plugin_params: dict = Field(default_factory=dict)  # passed to plugin
 
+    # ensure_config_line params
+    config_file: Optional[str] = None              # remote path, e.g. /boot/firmware/config.txt
+    config_line: Optional[str] = None              # line to ensure presence of
+    config_section: str = "all"                    # [all], [pi5], etc.
+    config_replaces_pattern: Optional[str] = None  # regex — replace matching line
+
+    # raspi_config params
+    raspi_interface: Optional[str] = None   # i2c, spi, camera, onewire, ssh, vnc, serial
+    raspi_state: Optional[str] = None       # enable, disable
+
     result: Optional[str] = None         # filled after apply
     error: Optional[str] = None