redeploy 0.2.19__tar.gz → 0.2.20__tar.gz

{redeploy-0.2.19 → redeploy-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.19
+Version: 0.2.20
 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.19-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-$5.70-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.0h-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.20-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-$5.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $5.7000 (38 commits)
-- 👤 **Human dev:** ~$1297 (13.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.8500 (39 commits)
+- 👤 **Human dev:** ~$1337 (13.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.19-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.20-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.19 → redeploy-0.2.20}/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.19-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-$5.70-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.0h-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.20-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-$5.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $5.7000 (38 commits)
-- 👤 **Human dev:** ~$1297 (13.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.8500 (39 commits)
+- 👤 **Human dev:** ~$1337 (13.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.19-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.20-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.19 → redeploy-0.2.20}/pyproject.toml

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

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

{redeploy-0.2.19 → redeploy-0.2.20}/redeploy/apply/executor.py

@@ -194,14 +194,21 @@ class Executor:
             logger.info(f"resume: skipping {len(skip_ids)} already-completed step(s): "
                         f"{', '.join(sorted(skip_ids))}")
 
+        ok = self._execute_steps_loop(skip_ids)
+        elapsed = time.monotonic() - self._t0
+
+        self._handle_completion(ok, elapsed)
+        self._write_audit(ok=ok, elapsed_s=elapsed)
+        return ok
+
+    def _execute_steps_loop(self, skip_ids: set[str]) -> bool:
+        """Execute steps, handling skips and errors. Returns True if all passed."""
         ok = True
         for i, step in enumerate(self.plan.steps, 1):
             if step.id in skip_ids:
-                step.status = StepStatus.SKIPPED
-                step.result = "resumed: previously completed"
-                if self._emitter:
-                    self._emitter.step_done(i, step)
+                self._skip_step(i, step)
                 continue
+
             try:
                 if self._emitter:
                     self._emitter.step_start(i, step)
@@ -212,20 +219,33 @@ class Executor:
                 if self._emitter:
                     self._emitter.step_done(i, step)
             except StepError as e:
-                logger.error(f"Step failed: {e}")
-                step.status = StepStatus.FAILED
-                step.error = str(e)
-                if self._state is not None:
-                    self._state.mark_failed(step.id, str(e))
-                if self._emitter:
-                    self._emitter.step_fail(i, step, str(e))
-                    self._emitter.failed(len(self._completed), len(self.plan.steps), str(e))
-                if not self.dry_run:
-                    self._rollback()
+                self._handle_step_failure(i, step, e)
                 ok = False
                 break
+        return ok
 
-        elapsed = time.monotonic() - self._t0
+    def _skip_step(self, i: int, step: MigrationStep) -> None:
+        """Handle a skipped step due to resume."""
+        step.status = StepStatus.SKIPPED
+        step.result = "resumed: previously completed"
+        if self._emitter:
+            self._emitter.step_done(i, step)
+
+    def _handle_step_failure(self, i: int, step: MigrationStep, error: StepError) -> None:
+        """Handle a step failure."""
+        logger.error(f"Step failed: {error}")
+        step.status = StepStatus.FAILED
+        step.error = str(error)
+        if self._state is not None:
+            self._state.mark_failed(step.id, str(error))
+        if self._emitter:
+            self._emitter.step_fail(i, step, str(error))
+            self._emitter.failed(len(self._completed), len(self.plan.steps), str(error))
+        if not self.dry_run:
+            self._rollback()
+
+    def _handle_completion(self, ok: bool, elapsed: float) -> None:
+        """Handle plan completion or failure."""
         if ok:
             logger.info(f"{'[DRY RUN] ' if self.dry_run else ''}All {len(self.plan.steps)} steps completed")
             if self._emitter:
@@ -237,8 +257,6 @@ class Executor:
             if self._state is not None and self._state_path is not None:
                 logger.info(f"resume: checkpoint saved → {self._state_path} "
                             f"({self._state.completed_count}/{self._state.total_steps} done)")
-        self._write_audit(ok=ok, elapsed_s=elapsed)
-        return ok
 
     def _compute_skip_set(self) -> set[str]:
         """Determine which step ids should be skipped this run.
@@ -470,27 +488,14 @@ class Executor:
         while elapsed < timeout:
             r = self.probe.run(cmd, timeout=20)
             if r.ok and r.out.strip():
-                lines = r.out.strip().splitlines()
-                # Parse simple table: Name | Status
-                statuses = []
-                for line in lines:
-                    if line.startswith("NAME") or not line.strip():
-                        continue
-                    parts = line.split(None, 1)
-                    name = parts[0] if parts else "?"
-                    status = parts[1].strip() if len(parts) > 1 else "?"
-                    statuses.append((name, status))
-
+                statuses = self._parse_container_statuses(r.out)
                 status_str = ", ".join(f"{n}:{s}" for n, s in statuses)
+                
                 if status_str != last_status:
                     logger.debug(f"    [{elapsed}s] containers: {status_str}")
                     last_status = status_str
 
-                unhealthy = [
-                    n for n, s in statuses
-                    if not any(kw in s.lower() for kw in ("up", "running", "healthy"))
-                ]
-                if statuses and not unhealthy:
+                if self._all_containers_healthy(statuses):
                     step.status = StepStatus.DONE
                     step.result = f"all containers healthy after {elapsed}s: {status_str}"
                     logger.debug(f"    ✓ all containers healthy ({elapsed}s)")
@@ -506,6 +511,29 @@ class Executor:
         step.result = f"timeout {timeout}s reached, last: {last_status or 'unknown'}"
         logger.warning(f"    docker_health_wait timed out after {timeout}s — proceeding to health check")
 
+    def _parse_container_statuses(self, output: str) -> list[tuple[str, str]]:
+        """Parse docker compose ps output into (name, status) tuples."""
+        lines = output.strip().splitlines()
+        statuses = []
+        for line in lines:
+            if line.startswith("NAME") or not line.strip():
+                continue
+            parts = line.split(None, 1)
+            name = parts[0] if parts else "?"
+            status = parts[1].strip() if len(parts) > 1 else "?"
+            statuses.append((name, status))
+        return statuses
+
+    def _all_containers_healthy(self, statuses: list[tuple[str, str]]) -> bool:
+        """Check if all containers are in a healthy/running state."""
+        if not statuses:
+            return False
+        unhealthy = [
+            n for n, s in statuses
+            if not any(kw in s.lower() for kw in ("up", "running", "healthy"))
+        ]
+        return not unhealthy
+
     def _run_container_log_tail(self, step: MigrationStep) -> None:
         """Fetch and log the last N lines from each container after start."""
         cmd = step.command

{redeploy-0.2.19 → redeploy-0.2.20}/redeploy/audit.py

@@ -500,36 +500,23 @@ class Auditor:
     def _probe_one(self, exp: _Expect) -> AuditCheck:
         cat = exp.category
         if cat == "binary":
-            ok, detail = self.probe.has_binary(exp.name)
+            return self._probe_binary(exp)
         elif cat == "directory":
-            ok, detail = self.probe.has_path(exp.name, kind="dir")
+            return self._probe_directory(exp)
         elif cat == "file":
-            ok, detail = self.probe.has_path(exp.name, kind="file")
+            return self._probe_file(exp)
         elif cat == "local_file":
-            local_ok = Path(exp.name).expanduser().exists()
-            return AuditCheck(
-                category=cat, name=exp.name,
-                status="pass" if local_ok else "fail",
-                detail="present" if local_ok else "missing on controller",
-                fix_hint=exp.fix_hint, source_step=exp.source_step,
-            )
+            return self._probe_local_file(exp)
         elif cat == "port_listening":
-            ok, detail = self.probe.port_listening(int(exp.name))
+            return self._probe_port_listening(exp)
         elif cat == "container_image":
-            ok, detail = self.probe.has_image(exp.name)
-            # built-by-spec images: missing = "warn" not "fail"
-            return AuditCheck(
-                category=cat, name=exp.name,
-                status="pass" if ok else "warn",
-                detail=detail or ("present" if ok else "will be built by step"),
-                fix_hint=exp.fix_hint, source_step=exp.source_step,
-            )
+            return self._probe_container_image(exp)
         elif cat == "systemd_unit":
-            ok, detail = self.probe.has_systemd_unit(exp.name, user=False)
+            return self._probe_systemd_unit(exp, user=False)
         elif cat == "systemd_user_unit":
-            ok, detail = self.probe.has_systemd_unit(exp.name, user=True)
+            return self._probe_systemd_unit(exp, user=True)
         elif cat == "apt_package":
-            ok, detail = self.probe.apt_package(exp.name)
+            return self._probe_apt_package(exp)
         else:
             return AuditCheck(
                 category=cat, name=exp.name,
@@ -537,8 +524,74 @@ class Auditor:
                 source_step=exp.source_step,
             )
 
+    def _probe_binary(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_binary(exp.name)
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_directory(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_path(exp.name, kind="dir")
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_file(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_path(exp.name, kind="file")
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_local_file(self, exp: _Expect) -> AuditCheck:
+        local_ok = Path(exp.name).expanduser().exists()
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if local_ok else "fail",
+            detail="present" if local_ok else "missing on controller",
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_port_listening(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.port_listening(int(exp.name))
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_container_image(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_image(exp.name)
+        # built-by-spec images: missing = "warn" not "fail"
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "warn",
+            detail=detail or ("present" if ok else "will be built by step"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_systemd_unit(self, exp: _Expect, user: bool) -> AuditCheck:
+        ok, detail = self.probe.has_systemd_unit(exp.name, user=user)
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_apt_package(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.apt_package(exp.name)
         return AuditCheck(
-            category=cat, name=exp.name,
+            category=exp.category, name=exp.name,
             status="pass" if ok else "fail",
             detail=detail or ("present" if ok else "missing"),
             fix_hint=exp.fix_hint, source_step=exp.source_step,

redeploy-0.2.20/redeploy/cli/__init__.py

@@ -0,0 +1,66 @@
+"""redeploy CLI — detect | plan | apply | migrate."""
+from __future__ import annotations
+
+import sys
+
+import click
+from loguru import logger
+
+from .. import __version__
+
+
+def _setup_logging(verbose: bool) -> None:
+    logger.remove()
+    level = "DEBUG" if verbose else "INFO"
+    logger.add(
+        sys.stderr,
+        level=level,
+        format="<green>{time:HH:mm:ss}</green> | <level>{level:<7}</level> | {message}",
+    )
+
+
+@click.group()
+@click.version_option(__version__)
+@click.option("-v", "--verbose", is_flag=True)
+@click.pass_context
+def cli(ctx, verbose):
+    """redeploy — Infrastructure migration toolkit: detect → plan → apply"""
+    _setup_logging(verbose)
+    ctx.ensure_object(dict)
+    ctx.obj["verbose"] = verbose
+
+
+# Import and register all commands
+from .commands import detect, diagnose, inspect, workflow, export, plugin
+from .commands import exec_, plan_apply, state, init, status, devices, target, probe
+from .commands import import_, diff, audit, patterns, version as version_cmd
+
+# Register commands
+cli.add_command(detect.detect)
+cli.add_command(diagnose.diagnose)
+cli.add_command(inspect.inspect)
+cli.add_command(workflow.workflow_cmd)
+cli.add_command(export.export_cmd)
+cli.add_command(plugin.plugin_cmd)
+cli.add_command(exec_.exec_cmd)
+cli.add_command(exec_.exec_multi_cmd)
+cli.add_command(plan_apply.plan)
+cli.add_command(plan_apply.apply)
+cli.add_command(plan_apply.migrate)
+cli.add_command(plan_apply.run)
+cli.add_command(state.state_cmd)
+cli.add_command(init.init)
+cli.add_command(status.status)
+cli.add_command(devices.devices)
+cli.add_command(devices.scan)
+cli.add_command(devices.device_add)
+cli.add_command(devices.device_rm)
+cli.add_command(target.target)
+cli.add_command(probe.probe)
+cli.add_command(import_.import_cmd)
+cli.add_command(diff.diff)
+cli.add_command(audit.audit)
+cli.add_command(patterns.patterns)
+cli.add_command(version_cmd.version_cmd)
+
+__all__ = ["cli"]

{redeploy-0.2.19 → redeploy-0.2.20}/redeploy/cli.py

@@ -1419,41 +1419,12 @@ def run(ctx, spec_file, dry_run, plan_only, do_detect, plan_out, output,
     spec = _load_spec_or_exit(console, resolved_spec)
 
     # overlay manifest values — env-specific or global
-    if manifest:
-        if env_name and env_name not in manifest.environments:
-            console.print(f"[yellow]⚠ env '{env_name}' not in redeploy.yaml — known: "
-                          f"{', '.join(manifest.environments) or 'none'}[/yellow]")
-        manifest.apply_to_spec(spec, env_name=env_name)
-        env_label = f" [cyan][env: {env_name}][/cyan]" if env_name else ""
-        console.print(f"[dim]manifest: {_find_manifest_path()}{env_label}[/dim]")
-    elif not env_name:
-        # Fallback: read DEPLOY_* from .env if no redeploy.yaml
-        dotenv_manifest = ProjectManifest.from_dotenv(Path.cwd())
-        if dotenv_manifest:
-            dotenv_manifest.apply_to_spec(spec)
-            console.print("[dim]manifest: .env (DEPLOY_* vars)[/dim]")
-
-    console.print(f"\n[bold]{spec.name}[/bold]"
-                  + (f"  [dim]{spec.description}[/dim]" if spec.description else ""))
-    console.print(f"  [dim]{spec.source.strategy.value}[/dim]  →  "
-                  f"[bold]{spec.target.strategy.value}[/bold]"
-                  f"  ({spec.source.host})")
+    _apply_manifest_to_spec(console, manifest, spec, env_name)
+    _print_spec_summary(console, spec)
 
     # ── optional live detect (overrides source in spec) ──────────────────────
     if do_detect:
-        from .detect import Detector
-        console.print(f"\n[bold]detect[/bold]  (live probe of {spec.source.host})")
-        d = Detector(
-            host=spec.source.host,
-            app=spec.source.app,
-            domain=spec.source.domain,
-        )
-        state = d.run()
-        console.print(f"  detected: {state.detected_strategy.value}  "
-                      f"version={state.current_version or '?'}  "
-                      f"conflicts={len(state.conflicts)}")
-        planner = Planner(state, spec.to_target_config())
-        planner._spec = spec
+        planner = _perform_live_detect(console, spec)
     else:
         planner = Planner.from_spec(spec)
 

{redeploy-0.2.19 → redeploy-0.2.20}/redeploy/discovery.py

@@ -527,7 +527,22 @@ def _detect_strategy_remote(
 ) -> dict:
     """Run a single SSH session to detect strategy, app, version, etc."""
     key_opts = ["-i", key] if key else []
-    probe_cmd = (
+    probe_cmd = _build_probe_command()
+    cmd = _build_ssh_command(host, port, timeout, key_opts, probe_cmd)
+
+    out = _run_ssh_probe(cmd, timeout)
+    if out is None:
+        return {}
+
+    info, services = _parse_probe_output(out)
+    info["running_services"] = services
+    info["strategy"] = _infer_strategy(info, services)
+
+    return info
+
+
+def _build_probe_command() -> str:
+    return (
         "echo __arch__=$(uname -m); "
         "echo __os__=$(. /etc/os-release 2>/dev/null && echo $PRETTY_NAME || uname -s); "
         "echo __hostname__=$(hostname); "
@@ -538,20 +553,28 @@ def _detect_strategy_remote(
         "systemctl list-units --type=service --state=running --no-pager --no-legend 2>/dev/null | awk '{print $1}' | head -30; "
         "echo __end_services__"
     )
-    cmd = ["ssh"] + [
+
+
+def _build_ssh_command(host: str, port: int, timeout: int, key_opts: list[str], probe_cmd: str) -> list[str]:
+    return ["ssh"] + [
         "-o", f"ConnectTimeout={timeout}",
         "-o", "StrictHostKeyChecking=no",
         "-o", "BatchMode=yes",
         "-p", str(port),
     ] + key_opts + [host, probe_cmd]
+
+
+def _run_ssh_probe(cmd: list[str], timeout: int) -> str | None:
     try:
         r = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout + 5)
         if r.returncode != 0:
-            return {}
-        out = r.stdout
+            return None
+        return r.stdout
     except Exception:
-        return {}
+        return None
 
+
+def _parse_probe_output(out: str) -> tuple[dict, list[str]]:
     info: dict = {}
     services: list[str] = []
     in_services = False
@@ -582,19 +605,72 @@ def _detect_strategy_remote(
             if line.endswith(".service"):
                 services.append(line)
 
-    info["running_services"] = services
+    return info, services
 
-    # Infer strategy
+
+def _infer_strategy(info: dict, services: list[str]) -> str:
     if info.get("docker_active") or info.get("has_docker"):
-        info["strategy"] = "docker_full"
+        return "docker_full"
     elif info.get("has_podman"):
-        info["strategy"] = "podman_quadlet"
+        return "podman_quadlet"
     elif info.get("has_chromium") and any("kiosk" in s or "chromium" in s for s in services):
-        info["strategy"] = "native_kiosk"
+        return "native_kiosk"
     else:
-        info["strategy"] = "systemd"
+        return "systemd"
 
-    return info
+
+def _parse_probe_input(ip_or_host: str, users: Optional[list[str]]) -> tuple[str, list[str]]:
+    if "@" in ip_or_host:
+        forced_user, ip = ip_or_host.split("@", 1)
+        return ip, [forced_user] + (users or _DEFAULT_USERS)
+    else:
+        return ip_or_host, users or _DEFAULT_USERS
+
+
+def _detect_app_from_services(services: list[str], app_hint: str) -> str:
+    if app_hint:
+        return app_hint
+    for svc in services:
+        for candidate in ("c2004", "app", "backend", "kiosk", "api"):
+            if candidate in svc.lower():
+                return candidate
+    return ""
+
+
+def _update_existing_device(existing, result, ssh_user, ssh_key, ip, host_str, port, now) -> None:
+    existing.host = host_str
+    existing.ip = ip
+    existing.ssh_user = ssh_user
+    if ssh_key:
+        existing.ssh_key = ssh_key
+    existing.ssh_port = port
+    existing.strategy = result.strategy
+    existing.hostname = result.hostname or existing.hostname
+    existing.last_seen = now
+    existing.last_ssh_ok = now
+    if result.app and not existing.app:
+        existing.app = result.app
+
+
+def _create_new_device(result, ssh_user, ssh_key, ip, host_str, port, now) -> "KnownDevice":
+    from .models import KnownDevice
+
+    return KnownDevice(
+        id=host_str,
+        host=host_str,
+        ip=ip,
+        mac="",
+        hostname=result.hostname,
+        ssh_user=ssh_user,
+        ssh_key=ssh_key if ssh_key else None,
+        ssh_port=port,
+        strategy=result.strategy,
+        app=result.app,
+        last_seen=now,
+        last_ssh_ok=now,
+        source="probe",
+        tags=["discovered"],
+    )
 
 
 def auto_probe(
@@ -622,12 +698,7 @@ def auto_probe(
         ProbeResult with all discovered fields.
     """
     # Normalise input
-    if "@" in ip_or_host:
-        forced_user, ip = ip_or_host.split("@", 1)
-        users = [forced_user] + (users or _DEFAULT_USERS)
-    else:
-        ip = ip_or_host
-        users = users or _DEFAULT_USERS
+    ip, users = _parse_probe_input(ip_or_host, users)
 
     result = ProbeResult(ip=ip, ssh_port=port)
 
@@ -659,18 +730,7 @@ def auto_probe(
         result.has_podman = bool(info.get("has_podman"))
         result.has_chromium = bool(info.get("has_chromium"))
         result.running_services = info.get("running_services", [])
-
-        # Try to detect app + version
-        app = app_hint
-        if not app:
-            for svc in result.running_services:
-                for candidate in ("c2004", "app", "backend", "kiosk", "api"):
-                    if candidate in svc.lower():
-                        app = candidate
-                        break
-                if app:
-                    break
-        result.app = app
+        result.app = _detect_app_from_services(result.running_services, app_hint)
 
     # Save to registry
     if save:
@@ -678,36 +738,10 @@ def auto_probe(
         now = datetime.utcnow()
         existing = reg.get(host_str) or reg.get(ip)
         if existing:
-            existing.host = host_str
-            existing.ip = ip
-            existing.ssh_user = ssh_user
-            if ssh_key:
-                existing.ssh_key = ssh_key
-            existing.ssh_port = port
-            existing.strategy = result.strategy
-            existing.hostname = result.hostname or existing.hostname
-            existing.last_seen = now
-            existing.last_ssh_ok = now
-            if result.app and not existing.app:
-                existing.app = result.app
+            _update_existing_device(existing, result, ssh_user, ssh_key, ip, host_str, port, now)
             reg.upsert(existing)
         else:
-            reg.upsert(KnownDevice(
-                id=host_str,
-                host=host_str,
-                ip=ip,
-                mac="",
-                hostname=result.hostname,
-                ssh_user=ssh_user,
-                ssh_key=ssh_key if ssh_key else None,
-                ssh_port=port,
-                strategy=result.strategy,
-                app=result.app,
-                last_seen=now,
-                last_ssh_ok=now,
-                source="probe",
-                tags=["discovered"],
-            ))
+            reg.upsert(_create_new_device(result, ssh_user, ssh_key, ip, host_str, port, now))
         reg.save()
         logger.info(f"[probe {ip}] saved to registry as {host_str}")
 

{redeploy-0.2.19 → redeploy-0.2.20}/redeploy/parse.py

@@ -98,28 +98,8 @@ def parse_diagnostics(output: str) -> dict:
             section = _SECTION_HEADERS[line]
         elif not line or line.startswith("__NO_"):
             continue
-        elif section == "system":
-            _apply_system_line(result["system"], line)
-        elif section == "containers":
-            c = parse_container_line(line)
-            if c:
-                result["containers"].append(c)
-        elif section == "git":
-            for prefix in ("BRANCH:", "COMMIT:", "DIRTY:"):
-                if line.startswith(prefix):
-                    result["git"][prefix[:-1].lower()] = line[len(prefix):]
-                    break
-        elif section == "health":
-            try:
-                result["health_code"] = int(line)
-            except ValueError:
-                pass
-        elif section == "network":
-            if line.startswith("PORTS:"):
-                try:
-                    result["listening_ports"] = int(line[6:])
-                except ValueError:
-                    pass
+        else:
+            _parse_section_line(section, result, line)
     return result
 
 
@@ -141,6 +121,47 @@ def _apply_system_line(sys: dict, line: str) -> None:
             }
 
 
+def _apply_git_line(git: dict, line: str) -> bool:
+    for prefix in ("BRANCH:", "COMMIT:", "DIRTY:"):
+        if line.startswith(prefix):
+            git[prefix[:-1].lower()] = line[len(prefix):]
+            return True
+    return False
+
+
+def _apply_health_line(result: dict, line: str) -> bool:
+    try:
+        result["health_code"] = int(line)
+        return True
+    except ValueError:
+        return False
+
+
+def _apply_network_line(result: dict, line: str) -> bool:
+    if line.startswith("PORTS:"):
+        try:
+            result["listening_ports"] = int(line[6:])
+            return True
+        except ValueError:
+            pass
+    return False
+
+
+def _parse_section_line(section: str, result: dict, line: str) -> None:
+    if section == "system":
+        _apply_system_line(result["system"], line)
+    elif section == "containers":
+        c = parse_container_line(line)
+        if c:
+            result["containers"].append(c)
+    elif section == "git":
+        _apply_git_line(result["git"], line)
+    elif section == "health":
+        _apply_health_line(result, line)
+    elif section == "network":
+        _apply_network_line(result, line)
+
+
 # ── health check ─────────────────────────────────────────────────────────────
 
 _HEALTH_PREFIXES: dict[str, str] = {

{redeploy-0.2.19 → redeploy-0.2.20}/redeploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.19
+Version: 0.2.20
 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.19-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-$5.70-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.0h-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.20-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-$5.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $5.7000 (38 commits)
-- 👤 **Human dev:** ~$1297 (13.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.8500 (39 commits)
+- 👤 **Human dev:** ~$1337 (13.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.19-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.20-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.19 → redeploy-0.2.20}/redeploy.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ redeploy.egg-info/top_level.txt
 redeploy/apply/__init__.py
 redeploy/apply/executor.py
 redeploy/apply/state.py
+redeploy/cli/__init__.py
 redeploy/detect/__init__.py
 redeploy/detect/detector.py
 redeploy/detect/probes.py