redeploy 0.2.17__tar.gz → 0.2.19__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.17
+Version: 0.2.19
 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.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)
+![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)
 
-- 🤖 **LLM usage:** $5.4000 (36 commits)
-- 👤 **Human dev:** ~$1130 (11.3h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.7000 (38 commits)
+- 👤 **Human dev:** ~$1297 (13.0h @ $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.17-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.19-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.
 
@@ -428,6 +428,108 @@ extra_steps:
 
 The script is base64-encoded and executed via SSH with automatic temp file cleanup. Use `command` field for multiline script content (YAML `|` preserves newlines).
 
+### Script References (`command_ref`)
+
+Instead of duplicating scripts in YAML, reference a script defined in a markdown codeblock:
+
+```yaml
+extra_steps:
+  - id: configure_kiosk
+    action: inline_script
+    description: "Execute kiosk script from markdown"
+    command_ref: "#kiosk-browser-configuration-script"
+    risk: medium
+```
+
+In your migration markdown file, define the script in a section:
+
+```markdown
+## Kiosk Browser Configuration Script
+
+```bash
+#!/bin/bash
+# Auto-detect browser...
+if command -v chromium-browser >/dev/null 2>&1; then
+  chromium-browser --kiosk http://localhost:8100
+fi
+```
+```
+
+**Benefits:**
+- Single source of truth — script lives in one place (markdown codeblock)
+- No duplication between markdown documentation and YAML
+- Easy to read and maintain
+- Changes to the codeblock automatically apply to the deployment
+
+**Reference formats:**
+- `"#section-id"` — script from section in current spec file
+- `"./file.md#section-id"` — script from section in specific file
+
+The section ID is derived from the heading: spaces become hyphens, lowercase.
+Example: `## Kiosk Browser Configuration Script` → `#kiosk-browser-configuration-script`
+
+### Execute Script by Reference (`redeploy exec`)
+
+Run a single script from markdown without running the full migration:
+
+```bash
+# Execute script from codeblock on remote host
+redeploy exec '#kiosk-browser-configuration-script' \
+    --host pi@192.168.188.108 \
+    --file migration.podman-rpi5-resume.md
+
+# With file in reference
+redeploy exec './migration.md#install-deps' --host root@server.com
+
+# Using markpact:ref (more explicit)
+redeploy exec 'kiosk-script-id' --host pi@192.168.188.108 --file migration.md
+
+# Dry-run to preview script
+redeploy exec '#backup-script' --host pi@192.168.188.108 --file ops.md --dry-run
+```
+
+This is useful for:
+- One-off operations defined in markdown docs
+- Testing individual scripts before full migration
+- Running maintenance tasks
+
+### Execute Multiple Scripts (`redeploy exec-multi`)
+
+Test multiple scripts at once:
+
+```bash
+# Execute multiple scripts by ref
+redeploy exec-multi 'kiosk-script,install-deps,cleanup' \
+    --host pi@192.168.188.108 \
+    --file migration.md
+
+# Mix of markpact:ref and section headings
+redeploy exec-multi 'script1,#section2,script3' \
+    --host root@server.com \
+    --file deploy.md \
+    --dry-run
+```
+
+### Marking Codeblocks with `markpact:ref`
+
+For more explicit script identification, use `markpact:ref <id>` in codeblock:
+
+```markdown
+```bash markpact:ref kiosk-browser-configuration-script
+#!/bin/bash
+# Auto-detect browser...
+if command -v chromium-browser >/dev/null 2>&1; then
+  chromium-browser --kiosk http://localhost:8100
+fi
+```
+```
+
+Benefits of `markpact:ref`:
+- Explicit ID assignment (not derived from heading)
+- Multiple scripts per section
+- Can reference by simple ID instead of full heading
+- Self-documenting in markdown
+
 
 
 Place in project root — `redeploy run` (no args) uses it automatically.

{redeploy-0.2.17 → redeploy-0.2.19}/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.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)
+![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)
 
-- 🤖 **LLM usage:** $5.4000 (36 commits)
-- 👤 **Human dev:** ~$1130 (11.3h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.7000 (38 commits)
+- 👤 **Human dev:** ~$1297 (13.0h @ $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.17-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.19-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.
 
@@ -404,6 +404,108 @@ extra_steps:
 
 The script is base64-encoded and executed via SSH with automatic temp file cleanup. Use `command` field for multiline script content (YAML `|` preserves newlines).
 
+### Script References (`command_ref`)
+
+Instead of duplicating scripts in YAML, reference a script defined in a markdown codeblock:
+
+```yaml
+extra_steps:
+  - id: configure_kiosk
+    action: inline_script
+    description: "Execute kiosk script from markdown"
+    command_ref: "#kiosk-browser-configuration-script"
+    risk: medium
+```
+
+In your migration markdown file, define the script in a section:
+
+```markdown
+## Kiosk Browser Configuration Script
+
+```bash
+#!/bin/bash
+# Auto-detect browser...
+if command -v chromium-browser >/dev/null 2>&1; then
+  chromium-browser --kiosk http://localhost:8100
+fi
+```
+```
+
+**Benefits:**
+- Single source of truth — script lives in one place (markdown codeblock)
+- No duplication between markdown documentation and YAML
+- Easy to read and maintain
+- Changes to the codeblock automatically apply to the deployment
+
+**Reference formats:**
+- `"#section-id"` — script from section in current spec file
+- `"./file.md#section-id"` — script from section in specific file
+
+The section ID is derived from the heading: spaces become hyphens, lowercase.
+Example: `## Kiosk Browser Configuration Script` → `#kiosk-browser-configuration-script`
+
+### Execute Script by Reference (`redeploy exec`)
+
+Run a single script from markdown without running the full migration:
+
+```bash
+# Execute script from codeblock on remote host
+redeploy exec '#kiosk-browser-configuration-script' \
+    --host pi@192.168.188.108 \
+    --file migration.podman-rpi5-resume.md
+
+# With file in reference
+redeploy exec './migration.md#install-deps' --host root@server.com
+
+# Using markpact:ref (more explicit)
+redeploy exec 'kiosk-script-id' --host pi@192.168.188.108 --file migration.md
+
+# Dry-run to preview script
+redeploy exec '#backup-script' --host pi@192.168.188.108 --file ops.md --dry-run
+```
+
+This is useful for:
+- One-off operations defined in markdown docs
+- Testing individual scripts before full migration
+- Running maintenance tasks
+
+### Execute Multiple Scripts (`redeploy exec-multi`)
+
+Test multiple scripts at once:
+
+```bash
+# Execute multiple scripts by ref
+redeploy exec-multi 'kiosk-script,install-deps,cleanup' \
+    --host pi@192.168.188.108 \
+    --file migration.md
+
+# Mix of markpact:ref and section headings
+redeploy exec-multi 'script1,#section2,script3' \
+    --host root@server.com \
+    --file deploy.md \
+    --dry-run
+```
+
+### Marking Codeblocks with `markpact:ref`
+
+For more explicit script identification, use `markpact:ref <id>` in codeblock:
+
+```markdown
+```bash markpact:ref kiosk-browser-configuration-script
+#!/bin/bash
+# Auto-detect browser...
+if command -v chromium-browser >/dev/null 2>&1; then
+  chromium-browser --kiosk http://localhost:8100
+fi
+```
+```
+
+Benefits of `markpact:ref`:
+- Explicit ID assignment (not derived from heading)
+- Multiple scripts per section
+- Can reference by simple ID instead of full heading
+- Self-documenting in markdown
+
 
 
 Place in project root — `redeploy run` (no args) uses it automatically.

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

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

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

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

@@ -143,10 +143,14 @@ class Executor:
         self._audit_path = audit_path
         self._t0: float = 0.0
 
+        # ── spec path for command_ref resolution ─────────────────────────────
+        if spec_path and not plan.spec_path:
+            plan.spec_path = spec_path
+
         # ── 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
+        spec_id = spec_path or plan.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] = (
@@ -292,6 +296,7 @@ class Executor:
             StepAction.DOCKER_BUILD:        self._run_docker_build,
             StepAction.DOCKER_HEALTH_WAIT:  self._run_docker_health_wait,
             StepAction.CONTAINER_LOG_TAIL:  self._run_container_log_tail,
+            StepAction.PODMAN_BUILD:        self._run_podman_build,
             StepAction.SSH_CMD:             self._run_ssh,
             StepAction.SCP:                 self._run_scp,
             StepAction.RSYNC:               self._run_rsync,
@@ -399,6 +404,54 @@ class Executor:
         logger.debug(f"    build completed in {elapsed + poll_interval}s")
         step.status = StepStatus.DONE
 
+    def _run_podman_build(self, step: MigrationStep) -> 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 = self.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 = self.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 self._emitter:
+                    self._emitter.progress(step.id, msg)
+            else:
+                msg = f"[{elapsed}s] podman build in progress..."
+                logger.debug(f"    {msg}")
+                if self._emitter:
+                    self._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
+
     def _run_docker_health_wait(self, step: MigrationStep) -> None:
         """Wait until all containers reach 'healthy' or 'running' status.
 
@@ -578,9 +631,10 @@ class Executor:
         command_ref formats:
         - "./file.md#section-id" - script from section in specific file
         - "#section-id" - script from section in current spec file
+        - "#kiosk-browser-configuration-script" - markpact:ref block
         """
         from pathlib import Path
-        from ..markpact.parser import extract_script_from_markdown
+        from ..markpact.parser import extract_script_from_markdown, extract_script_by_ref
         
         # Parse command_ref
         if "#" in command_ref:
@@ -597,12 +651,20 @@ class Executor:
         if not file_path.exists():
             raise StepError(step, f"Command ref file not found: {file_path}")
         
-        # Extract script from markdown
+        # Extract script from markdown - try both methods:
+        # 1. First try markpact:ref codeblock (new format)
+        # 2. Then try section heading (old format)
         markdown_content = file_path.read_text(encoding="utf-8")
-        script = extract_script_from_markdown(markdown_content, section_id, language="bash")
+        
+        # Try markpact:ref format first
+        script = extract_script_by_ref(markdown_content, section_id, language="bash")
+        
+        # Fallback to section heading format
+        if script is None:
+            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}")
+            raise StepError(step, f"Could not find bash script for ref '{section_id}' in {file_path} (tried markpact:ref and section heading)")
         
         return script