redeploy 0.2.16__tar.gz → 0.2.17__tar.gz

{redeploy-0.2.16 → redeploy-0.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.16
+Version: 0.2.17
 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.16-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.25-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-11.3h-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.17-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.40-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-11.3h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $5.2500 (35 commits)
-- 👤 **Human dev:** ~$1128 (11.3h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.4000 (36 commits)
+- 👤 **Human dev:** ~$1130 (11.3h @ $100/h, 30min dedup)
 
-Generated on 2026-04-20 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
+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.16-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.17-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.
 
@@ -401,6 +401,33 @@ def notify_slack(ctx: PluginContext) -> None:
 | `params` | `dict` | Shortcut for `step.plugin_params` |
 | `dry_run` | `bool` | Skip side-effects if True |
 
+## Inline Scripts
+
+Execute multiline bash scripts directly from YAML without external files:
+
+```yaml
+extra_steps:
+  - id: configure_kiosk
+    action: inline_script
+    description: "Deploy kiosk launch script"
+    command: |
+      #!/bin/bash
+      mkdir -p ~/c2004/config
+      cat > ~/c2004/config/kiosk-launch.sh << 'EOF'
+      #!/bin/bash
+      if command -v chromium-browser >/dev/null 2>&1; then
+        chromium-browser --kiosk http://localhost:8100
+      elif command -v firefox >/dev/null 2>&1; then
+        firefox --kiosk http://localhost:8100
+      fi
+      EOF
+      chmod +x ~/c2004/config/kiosk-launch.sh
+    risk: medium
+    timeout: 60
+```
+
+The script is base64-encoded and executed via SSH with automatic temp file cleanup. Use `command` field for multiline script content (YAML `|` preserves newlines).
+
 
 
 Place in project root — `redeploy run` (no args) uses it automatically.

{redeploy-0.2.16 → redeploy-0.2.17}/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.16-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.25-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-11.3h-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.17-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.40-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-11.3h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $5.2500 (35 commits)
-- 👤 **Human dev:** ~$1128 (11.3h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.4000 (36 commits)
+- 👤 **Human dev:** ~$1130 (11.3h @ $100/h, 30min dedup)
 
-Generated on 2026-04-20 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
+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.16-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.17-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.
 
@@ -377,6 +377,33 @@ def notify_slack(ctx: PluginContext) -> None:
 | `params` | `dict` | Shortcut for `step.plugin_params` |
 | `dry_run` | `bool` | Skip side-effects if True |
 
+## Inline Scripts
+
+Execute multiline bash scripts directly from YAML without external files:
+
+```yaml
+extra_steps:
+  - id: configure_kiosk
+    action: inline_script
+    description: "Deploy kiosk launch script"
+    command: |
+      #!/bin/bash
+      mkdir -p ~/c2004/config
+      cat > ~/c2004/config/kiosk-launch.sh << 'EOF'
+      #!/bin/bash
+      if command -v chromium-browser >/dev/null 2>&1; then
+        chromium-browser --kiosk http://localhost:8100
+      elif command -v firefox >/dev/null 2>&1; then
+        firefox --kiosk http://localhost:8100
+      fi
+      EOF
+      chmod +x ~/c2004/config/kiosk-launch.sh
+    risk: medium
+    timeout: 60
+```
+
+The script is base64-encoded and executed via SSH with automatic temp file cleanup. Use `command` field for multiline script content (YAML `|` preserves newlines).
+
 
 
 Place in project root — `redeploy run` (no args) uses it automatically.

{redeploy-0.2.16 → redeploy-0.2.17}/pyproject.toml

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

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

redeploy-0.2.17/redeploy/apply/__init__.py

@@ -0,0 +1,16 @@
+"""apply — Execute a MigrationPlan step by step."""
+from .executor import Executor
+from .state import (
+    DEFAULT_STATE_DIR,
+    ResumeState,
+    default_state_path,
+    state_key,
+)
+
+__all__ = [
+    "Executor",
+    "ResumeState",
+    "default_state_path",
+    "state_key",
+    "DEFAULT_STATE_DIR",
+]

{redeploy-0.2.16 → redeploy-0.2.17}/redeploy/apply/executor.py

@@ -15,6 +15,7 @@ from loguru import logger
 from ..detect.remote import RemoteProbe
 from ..models import MigrationPlan, MigrationStep, StepAction, StepStatus
 from ..plugins import PluginContext, registry as _plugin_registry
+from .state import ResumeState, default_state_path
 
 
 class ProgressEmitter:
@@ -124,7 +125,11 @@ class Executor:
                  progress_yaml: bool = False,
                  progress_stream: IO[str] = None,
                  audit_log: bool = True,
-                 audit_path: Optional["Path"] = None):
+                 audit_path: Optional["Path"] = None,
+                 resume: bool = False,
+                 from_step: Optional[str] = None,
+                 state_path: Optional["Path"] = None,
+                 spec_path: Optional[str] = None):
         self.plan = plan
         self.dry_run = dry_run
         self.probe = RemoteProbe(plan.host)
@@ -138,10 +143,39 @@ class Executor:
         self._audit_path = audit_path
         self._t0: float = 0.0
 
+        # ── resume / checkpoint ──────────────────────────────────────────────
+        self._resume = resume
+        self._from_step = from_step
+        spec_id = spec_path or plan.target_file or plan.infra_file or plan.app
+        if state_path is None and not dry_run:
+            state_path = default_state_path(spec_id, plan.host)
+        self._state_path: Optional[Path] = (
+            Path(state_path) if state_path is not None else None
+        )
+        self._state: Optional[ResumeState] = None
+        if self._state_path is not None and not dry_run:
+            self._state = ResumeState.load_or_new(
+                self._state_path,
+                spec_path=str(spec_id),
+                host=plan.host,
+                total_steps=len(plan.steps),
+            )
+            # Keep total_steps in sync if the spec changed between runs.
+            self._state.total_steps = len(plan.steps)
+
     @property
     def completed_steps(self) -> list[MigrationStep]:
         return list(self._completed)
 
+    @property
+    def state(self) -> Optional[ResumeState]:
+        """Current ResumeState (None when dry_run or disabled)."""
+        return self._state
+
+    @property
+    def state_path(self) -> Optional[Path]:
+        return self._state_path
+
     def run(self) -> bool:
         """Execute all steps. Returns True if all passed."""
         self._t0 = time.monotonic()
@@ -151,19 +185,34 @@ class Executor:
         if self._emitter:
             self._emitter.start(self.plan)
 
+        skip_ids = self._compute_skip_set()
+        if skip_ids:
+            logger.info(f"resume: skipping {len(skip_ids)} already-completed step(s): "
+                        f"{', '.join(sorted(skip_ids))}")
+
         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)
+                continue
             try:
                 if self._emitter:
                     self._emitter.step_start(i, step)
                 self._execute_step(step)
                 self._completed.append(step)
+                if self._state is not None:
+                    self._state.mark_done(step.id)
                 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))
@@ -177,9 +226,40 @@ class Executor:
             logger.info(f"{'[DRY RUN] ' if self.dry_run else ''}All {len(self.plan.steps)} steps completed")
             if self._emitter:
                 self._emitter.done(len(self.plan.steps))
+            # Plan finished cleanly — drop the checkpoint.
+            if self._state is not None:
+                self._state.remove()
+        else:
+            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.
+
+        Sources (in priority order):
+          1. ``--from-step <id>``: skip every step BEFORE that id.
+          2. ``--resume`` + persisted state: skip every previously completed id.
+        """
+        skip: set[str] = set()
+        ids = [s.id for s in self.plan.steps]
+
+        if self._from_step:
+            if self._from_step not in ids:
+                logger.warning(
+                    f"--from-step '{self._from_step}' not found in plan; running full plan"
+                )
+            else:
+                idx = ids.index(self._from_step)
+                skip.update(ids[:idx])
+
+        if self._resume and self._state is not None:
+            skip.update(self._state.completed_step_ids)
+
+        return skip
+
     def _write_audit(self, *, ok: bool, elapsed_s: float) -> None:
         if not self._audit_log:
             return
@@ -219,6 +299,7 @@ class Executor:
             StepAction.VERSION_CHECK:       self._run_version_check,
             StepAction.WAIT:                self._run_wait,
             StepAction.PLUGIN:              self._run_plugin,
+            StepAction.INLINE_SCRIPT:       self._run_inline_script,
         }
 
         handler = dispatch.get(step.action)
@@ -456,16 +537,95 @@ class Executor:
         step.status = StepStatus.DONE
         step.result = f"waited {total}s"
 
+    def _run_inline_script(self, step: MigrationStep) -> None:
+        """Execute multiline bash script via SSH using base64 encoding."""
+        import base64
+        from pathlib import Path
+
+        script = step.command
+        
+        # If command_ref is set, extract script from markdown file
+        if step.command_ref:
+            script = self._resolve_command_ref(step.command_ref, step)
+        
+        if not script:
+            raise StepError(step, "inline_script requires command field or command_ref with script content")
+
+        # Base64 encode the script to safely pass it through SSH
+        encoded = base64.b64encode(script.encode()).decode()
+        timeout = step.timeout or 300
+
+        # Create temp file, decode script, run it, then clean up
+        cmd = (
+            f"tmpfile=$(mktemp) && "
+            f"echo '{encoded}' | base64 -d > \"$tmpfile\" && "
+            f"chmod +x \"$tmpfile\" && "
+            f"\"$tmpfile\"; "
+            f"rc=$?; "
+            f"rm -f \"$tmpfile\"; "
+            f"exit $rc"
+        )
+
+        r = self.probe.run(cmd, timeout=timeout)
+        step.result = r.out[:500] if r.out else "script executed"
+        if not r.ok:
+            raise StepError(step, f"script failed with exit={r.exit_code}: {r.stderr[:200]}")
+        step.status = StepStatus.DONE
+
+    def _resolve_command_ref(self, command_ref: str, step: MigrationStep) -> str:
+        """Resolve command_ref to script content from markdown file.
+        
+        command_ref formats:
+        - "./file.md#section-id" - script from section in specific file
+        - "#section-id" - script from section in current spec file
+        """
+        from pathlib import Path
+        from ..markpact.parser import extract_script_from_markdown
+        
+        # Parse command_ref
+        if "#" in command_ref:
+            file_part, section_id = command_ref.split("#", 1)
+            file_path = file_part if file_part else getattr(self.plan, 'spec_path', None)
+        else:
+            section_id = command_ref
+            file_path = getattr(self.plan, 'spec_path', None)
+        
+        if not file_path:
+            raise StepError(step, f"Cannot resolve command_ref '{command_ref}': no file path available")
+        
+        file_path = Path(file_path)
+        if not file_path.exists():
+            raise StepError(step, f"Command ref file not found: {file_path}")
+        
+        # Extract script from markdown
+        markdown_content = file_path.read_text(encoding="utf-8")
+        script = extract_script_from_markdown(markdown_content, section_id, language="bash")
+        
+        if script is None:
+            raise StepError(step, f"Could not find bash script in section '{section_id}' of {file_path}")
+        
+        return script
+
     # ── rollback ──────────────────────────────────────────────────────────────
 
     def _rollback(self) -> None:
         logger.warning("Rolling back completed steps...")
+        rolled_back: list[str] = []
         for step in reversed(self._completed):
             if step.rollback_command:
                 logger.info(f"  ↩ rollback [{step.id}]: {step.rollback_command}")
                 r = self.probe.run(step.rollback_command, timeout=120)
                 if not r.ok:
                     logger.warning(f"    rollback failed: {r.stderr[:100]}")
+                else:
+                    rolled_back.append(step.id)
+        # Forget rolled-back steps so a subsequent --resume re-executes them.
+        if rolled_back and self._state is not None:
+            self._state.completed_step_ids = [
+                sid for sid in self._state.completed_step_ids
+                if sid not in set(rolled_back)
+            ]
+            self._state.save()
 
     # ── summary ───────────────────────────────────────────────────────────────
 

redeploy-0.2.17/redeploy/apply/state.py

@@ -0,0 +1,161 @@
+"""Persistent execution state — enables resuming an interrupted MigrationPlan.
+
+State files live under ``.redeploy/state/<key>.yaml`` (relative to CWD by
+default). The key is derived from the spec path + host so multiple plans can
+checkpoint independently without colliding.
+
+After every successful step the executor calls :meth:`ResumeState.mark_done`
+which atomically rewrites the file. On the next run with ``--resume`` the
+executor loads the file, marks the listed steps as ``SKIPPED`` and continues
+from the first un-completed step.
+
+When the plan completes successfully the state file is removed (no stale
+checkpoints to confuse future runs).
+"""
+from __future__ import annotations
+
+import hashlib
+import os
+import tempfile
+from datetime import datetime, timezone
+from pathlib import Path
+from typing import Iterable, Optional
+
+import yaml
+from pydantic import BaseModel, Field
+
+
+DEFAULT_STATE_DIR = Path(".redeploy") / "state"
+
+
+def _now_iso() -> str:
+    return datetime.now(timezone.utc).isoformat(timespec="seconds")
+
+
+def _slug(value: str) -> str:
+    safe = "".join(c if c.isalnum() or c in "-._" else "_" for c in value)
+    return safe.strip("_") or "spec"
+
+
+def state_key(spec_path: str | os.PathLike[str], host: str) -> str:
+    """Stable, filesystem-safe identifier for one (spec, host) checkpoint."""
+    spec_str = str(spec_path)
+    digest = hashlib.sha1(f"{spec_str}|{host}".encode()).hexdigest()[:8]
+    return f"{_slug(Path(spec_str).stem)}-{_slug(host)}-{digest}"
+
+
+def default_state_path(spec_path: str | os.PathLike[str], host: str,
+                       base_dir: Optional[Path] = None) -> Path:
+    base = Path(base_dir) if base_dir else DEFAULT_STATE_DIR
+    return base / f"{state_key(spec_path, host)}.yaml"
+
+
+class ResumeState(BaseModel):
+    """Checkpoint for a single MigrationPlan execution."""
+
+    spec_path: str = ""
+    host: str = ""
+    total_steps: int = 0
+    completed_step_ids: list[str] = Field(default_factory=list)
+    failed_step_id: Optional[str] = None
+    failed_error: Optional[str] = None
+    started_at: str = Field(default_factory=_now_iso)
+    updated_at: str = Field(default_factory=_now_iso)
+
+    # Not persisted to disk — runtime helper.
+    path: Optional[Path] = None
+
+    model_config = {"arbitrary_types_allowed": True}
+
+    # ── construction / IO ────────────────────────────────────────────────────
+
+    @classmethod
+    def load(cls, path: str | os.PathLike[str]) -> "ResumeState":
+        p = Path(path)
+        with p.open() as f:
+            data = yaml.safe_load(f) or {}
+        data.pop("path", None)
+        state = cls(**data)
+        state.path = p
+        return state
+
+    @classmethod
+    def load_or_new(cls, path: str | os.PathLike[str], *,
+                    spec_path: str = "", host: str = "",
+                    total_steps: int = 0) -> "ResumeState":
+        p = Path(path)
+        if p.exists():
+            return cls.load(p)
+        state = cls(spec_path=spec_path, host=host, total_steps=total_steps)
+        state.path = p
+        return state
+
+    def save(self, path: Optional[str | os.PathLike[str]] = None) -> Path:
+        target = Path(path) if path else self.path
+        if target is None:
+            raise ValueError("ResumeState.save: no path configured")
+        target.parent.mkdir(parents=True, exist_ok=True)
+        self.updated_at = _now_iso()
+        payload = self.model_dump(exclude={"path"})
+        # Atomic write: tmp file + rename keeps readers consistent.
+        fd, tmp_name = tempfile.mkstemp(prefix=".state-", suffix=".yaml",
+                                        dir=str(target.parent))
+        try:
+            with os.fdopen(fd, "w") as f:
+                yaml.safe_dump(payload, f, sort_keys=False, allow_unicode=True)
+            os.replace(tmp_name, target)
+        except Exception:
+            try:
+                os.unlink(tmp_name)
+            except OSError:
+                pass
+            raise
+        self.path = target
+        return target
+
+    def remove(self) -> None:
+        if self.path and self.path.exists():
+            try:
+                self.path.unlink()
+            except OSError:
+                pass
+
+    # ── mutators ─────────────────────────────────────────────────────────────
+
+    def mark_done(self, step_id: str) -> None:
+        if step_id not in self.completed_step_ids:
+            self.completed_step_ids.append(step_id)
+        self.failed_step_id = None
+        self.failed_error = None
+        self.save()
+
+    def mark_failed(self, step_id: str, error: str) -> None:
+        self.failed_step_id = step_id
+        self.failed_error = error
+        self.save()
+
+    def reset(self) -> None:
+        self.completed_step_ids = []
+        self.failed_step_id = None
+        self.failed_error = None
+        self.started_at = _now_iso()
+        self.save()
+
+    # ── queries ──────────────────────────────────────────────────────────────
+
+    def is_done(self, step_id: str) -> bool:
+        return step_id in self.completed_step_ids
+
+    @property
+    def completed_count(self) -> int:
+        return len(self.completed_step_ids)
+
+    @property
+    def remaining(self) -> int:
+        return max(0, self.total_steps - self.completed_count)
+
+
+def filter_resumable(step_ids: Iterable[str], state: ResumeState) -> list[str]:
+    """Return ids that are NOT yet completed (preserves order)."""
+    done = set(state.completed_step_ids)
+    return [sid for sid in step_ids if sid not in done]