redeploy 0.2.70__tar.gz → 0.2.72__tar.gz

{redeploy-0.2.70 → redeploy-0.2.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.70
+Version: 0.2.72
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -32,17 +32,17 @@ Requires-Dist: mcp>=1.0; extra == "mcp"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.70-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-36.8h-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.72-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-38.5h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (91 commits)
-- 👤 **Human dev:** ~$3684 (36.8h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (93 commits)
+- 👤 **Human dev:** ~$3848 (38.5h @ $100/h, 30min dedup)
 
-Generated on 2026-04-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
+Generated on 2026-04-24 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.70-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.72-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.70 → redeploy-0.2.72}/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.70-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-36.8h-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.72-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-38.5h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (91 commits)
-- 👤 **Human dev:** ~$3684 (36.8h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (93 commits)
+- 👤 **Human dev:** ~$3848 (38.5h @ $100/h, 30min dedup)
 
-Generated on 2026-04-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
+Generated on 2026-04-24 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.70-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.72-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.70 → redeploy-0.2.72}/pyproject.toml

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

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

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/analyze/preflight_schema.py

@@ -124,7 +124,7 @@ def save_preflight_schema(schema: dict[str, Any], output_path: Path) -> None:
 
 
 def _resolve_command_refs(spec, spec_path: Path, blockers: list[dict[str, Any]]) -> list[dict[str, Any]]:
-    from ..markpact.parser import extract_script_by_ref, extract_script_from_markdown
+    from ..markpact.parser import resolve_script_ref
 
     out: list[dict[str, Any]] = []
     for step in spec.extra_steps:
@@ -156,14 +156,11 @@ def _resolve_command_refs(spec, spec_path: Path, blockers: list[dict[str, Any]])
                 })
                 continue
             text = ref_file.read_text(encoding="utf-8", errors="replace")
-            by_ref = extract_script_by_ref(text, ref_id, language="bash")
-            by_heading = extract_script_from_markdown(text, ref_id, language="bash")
-            if by_ref is not None:
+            result = resolve_script_ref(text, ref_id, language="bash")
+            if result is not None:
                 entry["resolved"] = True
-                entry["mode"] = "markpact_ref"
-            elif by_heading is not None:
-                entry["resolved"] = True
-                entry["mode"] = "heading"
+                _, lookup_method = result
+                entry["mode"] = "markpact_ref" if lookup_method == "markpact:ref" else "heading"
             else:
                 blockers.append({
                     "type": "missing_command_ref",
@@ -178,14 +175,11 @@ def _resolve_command_refs(spec, spec_path: Path, blockers: list[dict[str, Any]])
         entry["file"] = str(ref_file)
         entry["ref"] = cref
         text = ref_file.read_text(encoding="utf-8", errors="replace") if ref_file.exists() else ""
-        by_ref = extract_script_by_ref(text, cref, language="bash")
-        by_heading = extract_script_from_markdown(text, cref, language="bash")
-        if by_ref is not None:
-            entry["resolved"] = True
-            entry["mode"] = "markpact_ref"
-        elif by_heading is not None:
+        result = resolve_script_ref(text, cref, language="bash")
+        if result is not None:
             entry["resolved"] = True
-            entry["mode"] = "heading"
+            _, lookup_method = result
+            entry["mode"] = "markpact_ref" if lookup_method == "markpact:ref" else "heading"
         else:
             blockers.append({
                 "type": "missing_command_ref",

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/analyze/spec_analyzer.py

@@ -523,7 +523,7 @@ class _CommandRefChecker(_Checker):
     """Validate command_ref references for nested markdown/script dependencies."""
 
     def check(self, spec, document, base_dir, result):
-        from ..markpact.parser import extract_script_by_ref, extract_script_from_markdown
+        from ..markpact.parser import resolve_script_ref
 
         in_doc_refs: set[str] = set()
         if document:
@@ -551,10 +551,7 @@ class _CommandRefChecker(_Checker):
                         )
                         continue
                     text = file_path.read_text(encoding="utf-8", errors="replace")
-                    if not (
-                        extract_script_by_ref(text, ref_id, language="bash")
-                        or extract_script_from_markdown(text, ref_id, language="bash")
-                    ):
+                    if resolve_script_ref(text, ref_id, language="bash") is None:
                         result.add(
                             IssueSeverity.ERROR,
                             "command_ref",

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/apply/handlers.py

@@ -350,7 +350,7 @@ def _resolve_command_ref(command_ref: str, step: MigrationStep, plan: MigrationP
     - "#section-id" - script from section in current spec file
     - "#kiosk-browser-configuration-script" - markpact:ref block
     """
-    from ..markpact.parser import extract_script_from_markdown, extract_script_by_ref
+    from ..markpact import resolve_script_ref
 
     # Parse command_ref
     if "#" in command_ref:
@@ -367,21 +367,15 @@ def _resolve_command_ref(command_ref: str, step: MigrationStep, plan: MigrationP
     if not file_path.exists():
         raise StepError(step, f"Command ref file not found: {file_path}")
 
-    # 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")
+    result = resolve_script_ref(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 for ref '{section_id}' in {file_path} (tried markpact:ref and section heading)")
-
+    if result is None:
+        raise StepError(
+            step,
+            f"Could not find bash script for ref '{section_id}' in {file_path} (tried markpact:ref and section heading)"
+        )
+    script, _ = result
     return script
 
 

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/cli/commands/exec_.py

@@ -34,7 +34,6 @@ def exec_cmd(ctx, ref, host, markdown_file, dry_run, timeout):
         redeploy exec '#install-deps' --host root@server.com --file deploy.md --dry-run
         redeploy exec 'kiosk-browser-configuration-script' --host pi@192.168.188.108 --file migration.md
     """
-    from ...markpact.parser import extract_script_by_ref
     from ...apply.executor import Executor, MigrationPlan, MigrationStep, StepAction
 
     console = Console()
@@ -65,15 +64,14 @@ def exec_cmd(ctx, ref, host, markdown_file, dry_run, timeout):
     console.print(f"[dim]Reading {md_path}...[/dim]")
     md_content = md_path.read_text(encoding="utf-8")
 
-    script = extract_script_by_ref(md_content, ref_id, language="bash")
-    lookup_method = "markpact:ref"
-
-    if script is None:
+    result = _extract_script_for_ref(md_content, ref_id)
+    if result is None:
         console.print(f"[red]✗ Could not find bash script with ref '#{ref_id}'[/red]")
         console.print("[dim]  Make sure there's either:[/dim]")
         console.print("[dim]    - A codeblock: ```bash markpact:ref {ref_id}[/dim]")
         console.print("[dim]    - Or a ## section heading and ```bash codeblock[/dim]")
         sys.exit(1)
+    script, lookup_method = result
 
     console.print(f"[green]✓[/green] Found script ({len(script)} chars) via {lookup_method} '#{ref_id}'")
 
@@ -183,8 +181,6 @@ def exec_multi_cmd(ctx, refs, host, markdown_file, dry_run, timeout, parallel):
 
 def _extract_all_scripts(md_path, ref_list, console) -> list[tuple[str, str, str]]:
     """Extract all scripts from markdown by ref list."""
-    from ...markpact.parser import extract_script_from_markdown, extract_script_by_ref
-
     md_content = md_path.read_text(encoding="utf-8")
     scripts: list[tuple[str, str, str]] = []
 
@@ -202,19 +198,12 @@ def _extract_all_scripts(md_path, ref_list, console) -> list[tuple[str, str, str
 
 def _extract_script_for_ref(md_content, ref_id) -> tuple[str, str] | None:
     """Extract script for a single ref."""
-    from ...markpact.parser import extract_script_from_markdown, extract_script_by_ref
-
-    # Try markpact:ref first
-    script = extract_script_by_ref(md_content, ref_id, language="bash")
-    lookup_method = "markpact:ref"
-
-    if script is None and ref_id.startswith("#"):
-        script = extract_script_from_markdown(md_content, ref_id[1:], language="bash")
-        lookup_method = "section"
+    from ...markpact import resolve_script_ref
 
-    if script is None:
+    result = resolve_script_ref(md_content, ref_id, language="bash")
+    if result is None:
         return None
-    return script, lookup_method
+    return result
 
 
 def _execute_single_script(ref_id, script, host, timeout) -> bool:

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/config_apply/handlers/display.py

@@ -2,12 +2,34 @@
 from __future__ import annotations
 
 import re
+import shlex
 import sys
 
 from rich.console import Console
 
 from ...detect.remote import RemoteProbe
-from ...hardware.kiosk.compositors import DSI_OUTPUT_NAME
+
+
+_SAFE_OUTPUT_RE = re.compile(r"^[A-Za-z0-9_.:-]+$")
+_ALLOWED_TRANSFORMS = {
+    "normal",
+    "90",
+    "180",
+    "270",
+    "flipped",
+    "flipped-90",
+    "flipped-180",
+    "flipped-270",
+}
+
+
+def _validate_display_inputs(output_name: str, transform: str) -> None:
+    if not _SAFE_OUTPUT_RE.match(output_name):
+        raise ValueError(f"Unsafe display output name: {output_name!r}")
+    if transform not in _ALLOWED_TRANSFORMS:
+        raise ValueError(
+            f"Unsupported transform: {transform!r}. Allowed: {sorted(_ALLOWED_TRANSFORMS)}"
+        )
 
 
 def apply_display_transform(
@@ -30,12 +52,15 @@ def apply_display_transform(
         One of the wlr-randr transforms (``normal``, ``90``, ``180``, ``270``,
         ``flipped``, …).
     """
+    _validate_display_inputs(output_name, transform)
+
     console.print(f"[cyan]→ Setting transform {transform} on {output_name}[/cyan]")
 
     # 1. Apply immediately via wlr-randr
     wlr_cmd = (
         f"WAYLAND_DISPLAY=wayland-0 XDG_RUNTIME_DIR=/run/user/$(id -u) "
-        f"wlr-randr --output {output_name} --transform {transform} 2>&1"
+        f"wlr-randr --output {shlex.quote(output_name)} "
+        f"--transform {shlex.quote(transform)} 2>&1"
     )
     r = probe.run(wlr_cmd)
     if r.ok:
@@ -48,7 +73,8 @@ def apply_display_transform(
 
     # 2. Persist in kanshi config — update or create transform line
     kanshi_cfg_path = "~/.config/kanshi/config"
-    read_r = probe.run(f"cat {kanshi_cfg_path} 2>/dev/null")
+    quoted_cfg_path = shlex.quote(kanshi_cfg_path)
+    read_r = probe.run(f"cat {quoted_cfg_path} 2>/dev/null")
 
     if read_r.ok and read_r.out.strip():
         current = read_r.out
@@ -77,7 +103,7 @@ def apply_display_transform(
     # Write updated config
     escaped = new_cfg.replace("'", "'\\''")
     write_r = probe.run(
-        f"mkdir -p ~/.config/kanshi && printf '%s' '{escaped}' > {kanshi_cfg_path}"
+        f"mkdir -p ~/.config/kanshi && printf '%s' '{escaped}' > {quoted_cfg_path}"
     )
     if write_r.ok:
         console.print(f"[green]  ✓ kanshi config updated ({kanshi_cfg_path})[/green]")

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/detect/probes.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import json
 import re
+import shlex
 from typing import Optional
 
 from ..models import (
@@ -12,6 +13,9 @@ from ..models import (
 from .remote import RemoteProbe
 
 
+_SAFE_K8S_NS_RE = re.compile(r"^[a-z0-9]([-a-z0-9]*[a-z0-9])?$")
+
+
 def probe_runtime(p: RemoteProbe) -> RuntimeInfo:
     """Detect installed runtimes: docker, k3s, podman, systemd."""
     def ver(cmd: str) -> Optional[str]:
@@ -126,8 +130,10 @@ def probe_k3s_services(p: RemoteProbe, namespaces: list[str]) -> list[ServiceInf
     for ns in namespaces:
         if ns in ("kube-system", "kube-public", "kube-node-lease", "cert-manager"):
             continue
+        if not _SAFE_K8S_NS_RE.match(ns):
+            continue
         r = p.run(
-            f"k3s kubectl get pods -n {ns} --no-headers 2>/dev/null"
+            f"k3s kubectl get pods -n {shlex.quote(ns)} --no-headers 2>/dev/null"
             " | awk '{print $1\"|\"$2\"|\"$3}'"
         )
         if not r.ok:

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/heal/runner.py

@@ -228,8 +228,25 @@ class HealRunner:
             if decision.action is Action.ABORT:
                 break
             if decision.action is Action.SKIP:
-                # TODO: mark step as skipped in executor state and continue
-                break
+                if not failed_step or executor.state is None:
+                    self.console.print(
+                        "  [yellow]cannot skip without checkpointed state; aborting heal loop[/yellow]"
+                    )
+                    break
+
+                executor.state.mark_done(failed_step)
+                self.console.print(
+                    f"  [yellow]marking step as skipped in checkpoint:[/yellow] `{failed_step}`"
+                )
+
+                executor = self._make_executor(resume=True)
+                ok = executor.run()
+                self.console.print(f"\n{executor.summary()}")
+                if ok:
+                    self._loop_detector.reset_all()
+                    write_repair_log(self.spec_path, self.version, self.repairs)
+                    return True
+                continue
 
             # Retry
             executor = self._make_executor(resume=True)

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/markpact/__init__.py

@@ -7,6 +7,7 @@ from .parser import (
     parse_markpact_file,
     parse_markpact_file_with_refs,
     parse_markpact_text,
+    resolve_script_ref,
 )
 
 __all__ = [
@@ -21,4 +22,5 @@ __all__ = [
     "parse_markpact_file",
     "parse_markpact_file_with_refs",
     "parse_markpact_text",
+    "resolve_script_ref",
 ]

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/markpact/parser.py

@@ -278,3 +278,33 @@ def _handle_fence_line(
                 return None, script_lines, True, "\n".join(script_lines)
             return None, script_lines, False, None
     return code_block_lang, script_lines, False, None
+
+
+def resolve_script_ref(
+    md_content: str,
+    ref_id: str,
+    language: str = "bash",
+) -> tuple[str, str] | None:
+    """Resolve a script reference in markdown, trying markpact:ref then section heading.
+
+    Returns ``(script_text, lookup_method)`` or ``None`` if not found.
+    """
+    script = extract_script_by_ref(md_content, ref_id, language=language)
+    if script is not None:
+        return script, "markpact:ref"
+
+    # Try section heading fallback (ref may already have # stripped)
+    section_name = ref_id[1:] if ref_id.startswith("#") else ref_id
+    script = extract_script_from_markdown(md_content, section_name, language=language)
+    if script is not None:
+        return script, "section"
+
+    # Kebab-case fallback: "test-script-section" -> "Test Script Section"
+    if "-" in section_name:
+        script = extract_script_from_markdown(
+            md_content, section_name.replace("-", " "), language=language
+        )
+        if script is not None:
+            return script, "section"
+
+    return None

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/mcp_server.py

@@ -24,6 +24,7 @@ from __future__ import annotations
 
 import io
 import os
+import re
 import subprocess
 import sys
 from pathlib import Path
@@ -45,6 +46,20 @@ mcp = FastMCP(
 # Helpers
 # ---------------------------------------------------------------------------
 
+_SAFE_HOST_RE = re.compile(r"^[A-Za-z0-9_.@:-]+$")
+_UNSAFE_SSH_TOKENS = (
+    "&&",
+    "||",
+    ";",
+    "|",
+    "`",
+    "$(",
+    ">",
+    "<",
+    "\n",
+    "\r",
+)
+
 def _redeploy_bin() -> str:
     """Resolve the redeploy binary path (same venv as this process)."""
     import shutil
@@ -80,6 +95,24 @@ def _run(*args: str, cwd: str | None = None, timeout: int = 120) -> dict:
         return {"returncode": -1, "stdout": "", "stderr": str(exc), "success": False}
 
 
+def _validate_exec_ssh_inputs(host: str, command: str) -> str | None:
+    """Return validation error message for unsafe exec_ssh inputs, or None."""
+    if not _SAFE_HOST_RE.match(host):
+        return f"Unsafe host format: {host!r}"
+
+    # Allow opting out explicitly for trusted environments.
+    if os.getenv("REDEPLOY_MCP_ALLOW_UNSAFE_SSH", "").lower() in {"1", "true", "yes"}:
+        return None
+
+    for token in _UNSAFE_SSH_TOKENS:
+        if token in command:
+            return (
+                "Unsafe command token detected "
+                f"({token!r}). Set REDEPLOY_MCP_ALLOW_UNSAFE_SSH=1 to bypass explicitly."
+            )
+    return None
+
+
 # ---------------------------------------------------------------------------
 # Tools
 # ---------------------------------------------------------------------------
@@ -218,6 +251,15 @@ def exec_ssh(
     Returns stdout, stderr and return code.
     CAUTION: this executes arbitrary commands — confirm with user before use.
     """
+    validation_error = _validate_exec_ssh_inputs(host, command)
+    if validation_error:
+        return {
+            "returncode": -1,
+            "stdout": "",
+            "stderr": validation_error,
+            "success": False,
+        }
+
     try:
         proc = subprocess.run(
             ["ssh", "-o", "ConnectTimeout=10", "-o", "BatchMode=yes", host, command],

{redeploy-0.2.70 → redeploy-0.2.72}/redeploy/tests/test_heal.py

@@ -1,4 +1,5 @@
 from redeploy.heal import HealLoopDetector
+from redeploy.heal.decider import Action, Decision
 
 
 def test_loop_detector_triggers_on_identical_hint_streak():
@@ -124,3 +125,58 @@ def test_heal_runner_reverts_invalid_llm_patch_without_crash(monkeypatch, tmp_pa
 
     assert runner.run() is False
     assert spec_path.read_text() == original
+
+
+def test_heal_runner_skip_marks_state_and_resumes(monkeypatch, tmp_path):
+    from redeploy.heal import HealRunner
+
+    spec_path = tmp_path / "spec.md"
+    spec_path.write_text("steps:\n  - id: sync_env\n")
+
+    class _State:
+        def __init__(self):
+            self.marked: list[str] = []
+
+        def mark_done(self, step_id: str):
+            self.marked.append(step_id)
+
+    class _FakeExecutor:
+        def __init__(self, ok: bool, state):
+            self._ok = ok
+            self.state = state
+
+        def run(self):
+            return self._ok
+
+        def summary(self):
+            return "Step failed: [sync_env] exit=1: boom"
+
+    state = _State()
+    make_calls: list[bool] = []
+
+    def _fake_make_executor(self, resume=False):
+        make_calls.append(resume)
+        if not resume:
+            return _FakeExecutor(False, state)
+        return _FakeExecutor(True, state)
+
+    monkeypatch.setattr(HealRunner, "_make_executor", _fake_make_executor)
+    monkeypatch.setattr(
+        HealRunner,
+        "_heal_step",
+        lambda *_a, **_k: (Decision(Action.SKIP, "skip"), "sync_env", "hint"),
+    )
+    monkeypatch.setattr("redeploy.heal.runner.write_repair_log", lambda *_a, **_k: None)
+
+    runner = HealRunner(
+        migration=object(),
+        spec_path=spec_path,
+        host="pi@test",
+        max_retries=2,
+        dry_run=True,
+        version="0.0.0",
+    )
+
+    assert runner.run() is True
+    assert state.marked == ["sync_env"]
+    assert make_calls == [False, True]

redeploy-0.2.72/redeploy/tests/test_security_hardening.py

@@ -0,0 +1,93 @@
+"""Security hardening tests for command construction and MCP guards."""
+from __future__ import annotations
+
+import io
+from unittest.mock import patch
+
+import pytest
+from rich.console import Console
+
+from redeploy.config_apply.handlers.display import apply_display_transform
+from redeploy.detect.probes import probe_k3s_services
+
+
+class _Result:
+    def __init__(self, ok: bool = True, out: str = ""):
+        self.ok = ok
+        self.out = out
+
+
+class _Probe:
+    def __init__(self):
+        self.commands: list[str] = []
+
+    def run(self, cmd: str):
+        self.commands.append(cmd)
+        if cmd.startswith("cat "):
+            return _Result(ok=False, out="")
+        return _Result(ok=True, out="")
+
+
+def test_apply_display_transform_rejects_unsafe_output_name():
+    probe = _Probe()
+    console = Console(file=io.StringIO(), force_terminal=False)
+
+    with pytest.raises(ValueError, match="Unsafe display output name"):
+        apply_display_transform(
+            console,
+            probe,
+            "DSI-2; rm -rf /",
+            "270",
+        )
+
+
+def test_apply_display_transform_rejects_unsupported_transform():
+    probe = _Probe()
+    console = Console(file=io.StringIO(), force_terminal=False)
+
+    with pytest.raises(ValueError, match="Unsupported transform"):
+        apply_display_transform(console, probe, "DSI-2", "drop-table")
+
+
+def test_probe_k3s_services_skips_unsafe_namespace():
+    commands: list[str] = []
+
+    class Probe:
+        def run(self, cmd: str):
+            commands.append(cmd)
+            return _Result(ok=True, out="pod-a|1/1|Running")
+
+    services = probe_k3s_services(Probe(), ["default; rm -rf /", "c2004"])
+
+    assert len(services) == 1
+    assert services[0].name == "pod-a"
+    assert all("default; rm -rf /" not in c for c in commands)
+
+
+def test_exec_ssh_rejects_unsafe_command_tokens(monkeypatch):
+    pytest.importorskip("mcp.server.fastmcp")
+    from redeploy import mcp_server
+
+    with patch("redeploy.mcp_server.subprocess.run") as run:
+        result = mcp_server.exec_ssh("pi@192.168.1.10", "echo ok && whoami")
+
+    assert result["success"] is False
+    assert "Unsafe command token" in result["stderr"]
+    run.assert_not_called()
+
+
+def test_exec_ssh_allows_override_for_trusted_environments(monkeypatch):
+    pytest.importorskip("mcp.server.fastmcp")
+    from redeploy import mcp_server
+
+    monkeypatch.setenv("REDEPLOY_MCP_ALLOW_UNSAFE_SSH", "1")
+
+    class Proc:
+        returncode = 0
+        stdout = "ok"
+        stderr = ""
+
+    with patch("redeploy.mcp_server.subprocess.run", return_value=Proc()):
+        result = mcp_server.exec_ssh("pi@192.168.1.10", "echo ok && whoami")
+
+    assert result["success"] is True