redeploy 0.2.51__tar.gz → 0.2.52__tar.gz

{redeploy-0.2.51 → redeploy-0.2.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.51
+Version: 0.2.52
 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.51-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-25.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.52-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-27.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (71 commits)
-- 👤 **Human dev:** ~$2496 (25.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (72 commits)
+- 👤 **Human dev:** ~$2695 (27.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.51-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.52-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.
 
@@ -684,6 +684,43 @@ Parser plugin extension:
 - Project-local parsers: `./redeploy_iac_parsers/*.py`
 - User-global parsers: `~/.redeploy/iac_parsers/*.py`
 
+Built-in template generator:
+- `redeploy import --list-plugin-templates`
+- `redeploy import --plugin-template helm-kustomize`
+- `redeploy import --plugin-template argocd-flux --plugin-dir redeploy_iac_parsers`
+
+Example external plugin (Helm + Ansible):
+- Source template: `examples/redeploy_iac_parsers/helm_ansible.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/helm_ansible.py redeploy_iac_parsers/`
+  3. `redeploy import path/to/Chart.yaml`
+  4. `redeploy import path/to/playbook.yml`
+
+Example external plugin (Helm templates + Kustomize):
+- Source template: `examples/redeploy_iac_parsers/helm_kustomize.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/helm_kustomize.py redeploy_iac_parsers/`
+  3. `redeploy import path/to/chart/templates/deployment.yaml`
+  4. `redeploy import path/to/kustomization.yaml`
+
+Example external plugin (ArgoCD Application + Flux Kustomization):
+- Source template: `examples/redeploy_iac_parsers/argocd_flux.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/argocd_flux.py redeploy_iac_parsers/`
+  3. `redeploy import path/to/argocd-application.yaml`
+  4. `redeploy import path/to/flux-kustomization.yaml`
+
+Example external plugin (GitOps CI for ArgoCD/Flux):
+- Source template: `examples/redeploy_iac_parsers/gitops_ci.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/gitops_ci.py redeploy_iac_parsers/`
+  3. `redeploy import .github/workflows/deploy-gitops.yml`
+  4. `redeploy import .gitlab-ci.yml`
+
 ## Examples
 
 | Directory | Scenario | Strategy |

{redeploy-0.2.51 → redeploy-0.2.52}/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.51-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-25.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.52-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-27.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (71 commits)
-- 👤 **Human dev:** ~$2496 (25.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (72 commits)
+- 👤 **Human dev:** ~$2695 (27.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.51-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.52-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.
 
@@ -655,6 +655,43 @@ Parser plugin extension:
 - Project-local parsers: `./redeploy_iac_parsers/*.py`
 - User-global parsers: `~/.redeploy/iac_parsers/*.py`
 
+Built-in template generator:
+- `redeploy import --list-plugin-templates`
+- `redeploy import --plugin-template helm-kustomize`
+- `redeploy import --plugin-template argocd-flux --plugin-dir redeploy_iac_parsers`
+
+Example external plugin (Helm + Ansible):
+- Source template: `examples/redeploy_iac_parsers/helm_ansible.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/helm_ansible.py redeploy_iac_parsers/`
+  3. `redeploy import path/to/Chart.yaml`
+  4. `redeploy import path/to/playbook.yml`
+
+Example external plugin (Helm templates + Kustomize):
+- Source template: `examples/redeploy_iac_parsers/helm_kustomize.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/helm_kustomize.py redeploy_iac_parsers/`
+  3. `redeploy import path/to/chart/templates/deployment.yaml`
+  4. `redeploy import path/to/kustomization.yaml`
+
+Example external plugin (ArgoCD Application + Flux Kustomization):
+- Source template: `examples/redeploy_iac_parsers/argocd_flux.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/argocd_flux.py redeploy_iac_parsers/`
+  3. `redeploy import path/to/argocd-application.yaml`
+  4. `redeploy import path/to/flux-kustomization.yaml`
+
+Example external plugin (GitOps CI for ArgoCD/Flux):
+- Source template: `examples/redeploy_iac_parsers/gitops_ci.py`
+- Quick start:
+  1. `mkdir -p redeploy_iac_parsers`
+  2. `cp examples/redeploy_iac_parsers/gitops_ci.py redeploy_iac_parsers/`
+  3. `redeploy import .github/workflows/deploy-gitops.yml`
+  4. `redeploy import .gitlab-ci.yml`
+
 ## Examples
 
 | Directory | Scenario | Strategy |

{redeploy-0.2.51 → redeploy-0.2.52}/pyproject.toml

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

{redeploy-0.2.51 → redeploy-0.2.52}/redeploy/__init__.py

@@ -7,17 +7,19 @@ Public API (stable from 0.2.0, semver guaranteed)::
 
 Everything not listed in ``__all__`` is internal and may change without notice.
 """
-__version__ = "0.2.51"
+__version__ = "0.2.52"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401
     ConflictSeverity,
     DeployStrategy,
+    Hook,
     InfraSpec,
     InfraState,
     MigrationPlan,
     MigrationSpec,
     MigrationStep,
+    PipelinePhase,
     StepAction,
     StepStatus,
     TargetConfig,
@@ -91,11 +93,13 @@ __all__ = [
     # models
     "ConflictSeverity",
     "DeployStrategy",
+    "Hook",
     "InfraSpec",
     "InfraState",
     "MigrationPlan",
     "MigrationSpec",
     "MigrationStep",
+    "PipelinePhase",
     "StepAction",
     "StepStatus",
     "TargetConfig",

{redeploy-0.2.51 → redeploy-0.2.52}/redeploy/apply/executor.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 
 import time
 from pathlib import Path
-from typing import IO, Optional
+from typing import IO, Any, Optional
 
 import yaml
 from loguru import logger
 
 from ..detect.remote import RemoteProbe
-from ..models import MigrationPlan, MigrationStep, StepAction, StepStatus
+from ..models import Hook, MigrationPlan, MigrationStep, StepAction, StepStatus
 from .exceptions import StepError
 from .handlers import (
     run_ssh, run_scp, run_rsync, run_docker_build, run_podman_build,
@@ -100,11 +100,13 @@ class Executor:
             logger.info(f"resume: skipping {len(skip_ids)} already-completed step(s): "
                         f"{', '.join(sorted(skip_ids))}")
 
+        self._fire_hooks("before_apply")
         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)
+        self._fire_hooks("always", ok=ok, elapsed_s=elapsed)
         return ok
 
     def _execute_steps_loop(self, skip_ids: set[str]) -> bool:
@@ -118,13 +120,16 @@ class Executor:
             try:
                 if self._emitter:
                     self._emitter.step_start(i, step)
+                self._fire_hooks("before_step", step=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)
+                self._fire_hooks("after_step", step=step)
             except StepError as e:
+                self._fire_hooks("on_step_failure", step=step, error=str(e))
                 self._handle_step_failure(i, step, e)
                 ok = False
                 break
@@ -159,10 +164,91 @@ class Executor:
             # Plan finished cleanly — drop the checkpoint.
             if self._state is not None:
                 self._state.remove()
+            self._fire_hooks("after_apply", elapsed_s=elapsed)
         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._fire_hooks("on_failure", elapsed_s=elapsed)
+
+    # ── Pipeline hooks (generic) ─────────────────────────────────────────────
+
+    def _fire_hooks(self, phase: str, **context: Any) -> None:
+        """Fire all hooks registered for a given phase. Honors ``when`` + ``on_failure``."""
+        hooks = [h for h in getattr(self.plan, "hooks", []) if h.phase == phase]
+        if not hooks:
+            return
+        for hook in hooks:
+            if hook.when and not self._eval_hook_condition(hook.when, context):
+                continue
+            try:
+                self._execute_hook(hook, context)
+            except Exception as exc:  # noqa: BLE001
+                self._handle_hook_failure(hook, exc)
+
+    def _eval_hook_condition(self, expr: str, context: dict) -> bool:
+        """Evaluate a simple hook condition against the context.
+
+        Supports only ``step.id == 'foo'`` / ``step.id != 'foo'`` for now to avoid
+        executing arbitrary expressions. Extend with jmespath when needed.
+        """
+        step = context.get("step")
+        step_id = getattr(step, "id", None)
+        expr = expr.strip()
+        for op in ("==", "!="):
+            if op in expr:
+                left, right = [p.strip() for p in expr.split(op, 1)]
+                right = right.strip("'\"")
+                if left == "step.id":
+                    return (step_id == right) if op == "==" else (step_id != right)
+        logger.warning(f"hook: unsupported when expression: {expr!r}")
+        return True
+
+    def _execute_hook(self, hook: "Hook", context: dict) -> None:
+        """Execute a hook. Built-in actions handled inline; rest delegated to step runners."""
+        action = hook.action
+        extra = hook.model_dump(exclude={"id", "phase", "action", "description", "when", "on_failure"})
+        logger.info(f"hook[{hook.phase}] {hook.id}: {action}")
+        if self.dry_run:
+            return
+
+        # Built-in: local_cmd — run a command on the controller machine (opens browser, clears local cache, etc.)
+        if action == "local_cmd":
+            import subprocess
+            cmd = extra.get("command") or ""
+            if not cmd:
+                raise ValueError(f"hook {hook.id}: local_cmd requires 'command'")
+            subprocess.run(cmd, shell=True, check=True)
+            return
+
+        # Built-in: open_url — open a URL in the default browser (controller machine)
+        if action == "open_url":
+            import webbrowser
+            url = extra.get("url") or extra.get("command") or ""
+            if not url:
+                raise ValueError(f"hook {hook.id}: open_url requires 'url'")
+            webbrowser.open(url)
+            return
+
+        # Fallback: treat hook like a MigrationStep and let existing runners handle it.
+        step = MigrationStep(
+            id=hook.id,
+            action=action,  # pydantic will validate against StepAction enum
+            description=hook.description or f"hook:{hook.phase}:{hook.id}",
+            **extra,
+        )
+        self._execute_step(step)
+
+    def _handle_hook_failure(self, hook: "Hook", exc: Exception) -> None:
+        policy = hook.on_failure
+        msg = f"hook {hook.id} ({hook.phase}) failed: {exc}"
+        if policy == "abort":
+            logger.error(msg)
+            raise exc
+        if policy == "warn":
+            logger.warning(msg)
+        else:  # continue
+            logger.debug(msg)
 
     def _compute_skip_set(self) -> set[str]:
         """Determine which step ids should be skipped this run.

{redeploy-0.2.51 → redeploy-0.2.52}/redeploy/cli/commands/detect.py

@@ -105,7 +105,26 @@ def detect(
 
     try:
         d = Detector(host=host, app=app_name, domain=domain)
-        state = d.run()
+        from ...integrations.op3_bridge import should_use_op3
+        if should_use_op3():
+            from ...integrations.op3_bridge import (
+                make_scanner,
+                make_ssh_context,
+                snapshot_to_infra_state,
+            )
+            scanner = make_scanner(
+                [
+                    "runtime.container",
+                    "service.containers",
+                    "endpoint.http",
+                    "business.health",
+                ]
+            )
+            ctx = make_ssh_context(target=host)
+            snapshot = scanner.scan(host, ctx.execute)
+            state = snapshot_to_infra_state(snapshot, host=host)
+        else:
+            state = d.run()
         d.save(state, out_path)
     except ConnectionError as e:
         console.print(f"[red]✗ {e}[/red]")

{redeploy-0.2.51 → redeploy-0.2.52}/redeploy/cli/commands/import_.py

@@ -1,6 +1,7 @@
 """import command — Parse IaC/CI-CD file and produce migration.yaml scaffold."""
 from __future__ import annotations
 
+import shutil
 import sys
 from pathlib import Path
 
@@ -10,7 +11,7 @@ from rich.table import Table
 
 
 @click.command(name="import")
-@click.argument("source", type=click.Path(exists=True))
+@click.argument("source", required=False, type=click.Path())
 @click.option(
     "-o", "--output", default=None, type=click.Path(),
     help="Output migration.yaml path (default: <source-stem>.migration.yaml)"
@@ -36,7 +37,36 @@ from rich.table import Table
     "--parser", default=None,
     help="Force specific parser (e.g. docker_compose). Default: auto-detect"
 )
-def import_cmd(source, output, target_host, target_strategy, dry_run, out_format, parser):
+@click.option(
+    "--plugin-template",
+    type=click.Choice(["helm-ansible", "helm-kustomize", "argocd-flux", "gitops-ci"]),
+    default=None,
+    help="Copy a ready-made parser plugin template into the project instead of parsing SOURCE.",
+)
+@click.option(
+    "--plugin-dir",
+    default="redeploy_iac_parsers",
+    type=click.Path(),
+    show_default=True,
+    help="Destination directory for --plugin-template.",
+)
+@click.option(
+    "--list-plugin-templates",
+    is_flag=True,
+    help="List built-in parser plugin templates and exit.",
+)
+def import_cmd(
+    source,
+    output,
+    target_host,
+    target_strategy,
+    dry_run,
+    out_format,
+    parser,
+    plugin_template,
+    plugin_dir,
+    list_plugin_templates,
+):
     """Parse an IaC/CI-CD file and produce a migration.yaml scaffold.
 
         Auto-detects format from filename. Built-in parsers cover:
@@ -55,12 +85,34 @@ def import_cmd(source, output, target_host, target_strategy, dry_run, out_format
         redeploy import docker-compose.yml --target-host root@vps.example.com
         redeploy import . --dry-run               # parse whole directory
         redeploy import docker-compose.yml --format summary
+        redeploy import --plugin-template helm-kustomize
     """
     import json as _json
     from ...iac import parse_file, parse_dir, parser_registry
 
     console = Console()
+
+    if list_plugin_templates:
+        _print_plugin_templates(console)
+        return
+
+    if plugin_template:
+        _copy_plugin_template(
+            console,
+            plugin_template=plugin_template,
+            plugin_dir=Path(plugin_dir),
+            dry_run=dry_run,
+        )
+        return
+
+    if not source:
+        console.print("[red]✗ SOURCE is required unless --plugin-template is used[/red]")
+        sys.exit(1)
+
     src_path = Path(source)
+    if not src_path.exists():
+        console.print(f"[red]✗ source does not exist: {source}[/red]")
+        sys.exit(1)
 
     # Parse
     if parser:
@@ -190,6 +242,55 @@ def _default_output(src: Path, spec) -> Path:
     return src.parent / f"{stem}.yaml"
 
 
+def _plugin_templates() -> dict[str, str]:
+    return {
+        "helm-ansible": "helm_ansible.py",
+        "helm-kustomize": "helm_kustomize.py",
+        "argocd-flux": "argocd_flux.py",
+        "gitops-ci": "gitops_ci.py",
+    }
+
+
+def _examples_plugin_dir() -> Path:
+    return Path(__file__).resolve().parents[3] / "examples" / "redeploy_iac_parsers"
+
+
+def _print_plugin_templates(console: Console) -> None:
+    console.print("[bold]Available parser plugin templates[/bold]")
+    for name, filename in _plugin_templates().items():
+        console.print(f"  - [cyan]{name}[/cyan]  ({filename})")
+
+
+def _copy_plugin_template(
+    console: Console,
+    *,
+    plugin_template: str,
+    plugin_dir: Path,
+    dry_run: bool,
+) -> Path:
+    templates = _plugin_templates()
+    filename = templates[plugin_template]
+    src = _examples_plugin_dir() / filename
+    dst = plugin_dir / filename
+
+    if not src.exists():
+        console.print(f"[red]✗ built-in plugin template not found: {src}[/red]")
+        sys.exit(1)
+
+    console.print(f"[bold]plugin template[/bold]  {plugin_template}")
+    console.print(f"  source:      {src}")
+    console.print(f"  destination: {dst}")
+
+    if dry_run:
+        console.print("\n[dim][DRY RUN] No file written.[/dim]")
+        return dst
+
+    dst.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copy2(src, dst)
+    console.print(f"\n  [green]✓[/green] copied → [bold]{dst}[/bold]")
+    return dst
+
+
 def _spec_to_migration_yaml(
     spec, *, target_host: str = None, target_strategy: str = None
 ) -> dict:

{redeploy-0.2.51 → redeploy-0.2.52}/redeploy/cli/commands/prompt_cmd.py

@@ -35,6 +35,7 @@ You will receive a JSON schema describing the current workspace with:
 - git_branch  : current git branch
 - specs       : list of discovered migration specs (path, version, target, name)
 - commands    : catalogue of available redeploy commands with descriptions and examples
+- iac         : parser/plugin-template info for IaC/CI-CD imports
 
 Your task: map the user's instruction to a single redeploy command.
 
@@ -49,9 +50,23 @@ Output ONLY valid JSON (no markdown fences, no extra text) with this structure:
 Rules:
 - argv[0] MUST be "redeploy".
 - Use relative paths for specs (relative to cwd).
+- If the user asks about Dockerfile, nginx, Kubernetes, Terraform, TOML, Vite, GitHub Actions, GitLab CI, Jenkinsfile, Helm, Kustomize, ArgoCD, Flux, or GitOps configs, prefer `redeploy import ...`.
+- If the user asks to add support for a new IaC/CI/CD format and a matching template exists in schema["iac"]["plugin_templates"], prefer `redeploy import --plugin-template <name>`.
+- If the user asks what plugin templates or parsers are available, prefer `redeploy import --list-plugin-templates`.
 - If the user's intent is unclear, pick the safest command (e.g. "plan" with --dry-run=true).
 - Set confirm=false ONLY for read-only/safe commands (plan, inspect, status, audit, diff, diagnose).
-- Set confirm=true for commands that change state (fix, run, bump, push, init).
+- Set confirm=false for `import --list-plugin-templates` and `import --dry-run`.
+- Set confirm=true for `import --plugin-template ...` because it writes files.
+- Set confirm=false for "run --dry-run" (previewing a spec is safe, no changes made).
+- Set confirm=true for "fix" commands (even with --dry-run flag - repair operations need confirmation for safety).
+- Set confirm=true for "run" without --dry-run (actual deployment changes state).
+- Set confirm=true for "bump", "push", "init" (these change project state).
+- Examples:
+  * "pokaż plan" → argv=["redeploy", "run", "spec.md", "--dry-run"], confirm=false
+  * "deploy to pi109" → argv=["redeploy", "run", "spec.md"], confirm=true
+  * "napraw kiosk" → argv=["redeploy", "fix", "spec.md", "--dry-run"], confirm=true
+    * "dodaj parser helm + kustomize" → argv=["redeploy", "import", "--plugin-template", "helm-kustomize"], confirm=true
+    * "jakie plugin templates są dostępne" → argv=["redeploy", "import", "--list-plugin-templates"], confirm=false
 - If the user explicitly says "dry run" / "pokaż" / "sprawdź" / "plan", prefer --dry-run.
 - Never invent spec paths — use only paths from the schema["specs"] list.
 - If no matching spec exists, return argv=["redeploy", "plan", "--help"] and explain in human_summary.
@@ -102,7 +117,7 @@ def _call_llm(schema: dict, user_prompt: str) -> str:
 
 
 def _parse_llm_response(raw: str) -> dict:
-    """Parse JSON from LLM response, strip accidental fences."""
+    """Parse JSON from LLM response, strip accidental fences and escape control characters."""
     # Strip ```json ... ``` if present
     clean = raw.strip()
     if clean.startswith("```"):
@@ -111,6 +126,17 @@ def _parse_llm_response(raw: str) -> dict:
             line for line in lines
             if not line.strip().startswith("```")
         )
+    # Escape control characters (except \n, \r, \t) for JSON safety
+    def escape_control_char(match):
+        char = match.group(0)
+        # Keep allowed whitespace, escape others as \uXXXX
+        if char in "\n\r\t":
+            return char
+        return f"\\u{ord(char):04x}"
+    
+    # Match any control character (ord < 32) except \n, \r, \t
+    import re
+    clean = re.sub(r"[\x00-\x08\x0b\x0c\x0e-\x1f]", escape_control_char, clean)
     return json.loads(clean)
 
 

{redeploy-0.2.51 → redeploy-0.2.52}/redeploy/heal.py

@@ -19,6 +19,7 @@ import os
 import re
 import textwrap
 import datetime
+from collections import defaultdict
 from pathlib import Path
 from typing import Optional
 
@@ -248,6 +249,33 @@ def parse_failed_step(executor_summary: str, executor=None) -> tuple[str | None,
     return None, ""
 
 
+class HealLoopDetector:
+    """Detect repeated non-converging heal hints for a given step."""
+
+    def __init__(self, max_identical_hints: int = 3):
+        self.max_identical_hints = max_identical_hints
+        self._history: dict[str, list[str]] = defaultdict(list)
+
+    def observe(self, step_id: str, hint: str) -> bool:
+        """Return True when the latest hints indicate a heal loop.
+
+        A loop is defined as ``max_identical_hints`` identical non-empty hints
+        in a row for the same failed step.
+        """
+        normalized = (hint or "").strip()
+        if not normalized:
+            return False
+
+        history = self._history[step_id]
+        history.append(normalized)
+
+        if len(history) < self.max_identical_hints:
+            return False
+
+        recent = history[-self.max_identical_hints :]
+        return all(item == recent[0] for item in recent)
+
+
 class HealRunner:
     """
     Wraps Executor with self-healing loop.
@@ -296,6 +324,7 @@ class HealRunner:
         self._state_file = executor_kwargs.pop("state_file", None)
         self._no_state = executor_kwargs.pop("no_state", False)
         self.repairs: list[dict] = []
+        self._loop_detector = HealLoopDetector(max_identical_hints=3)
 
         from rich.console import Console
         self.console = console or Console()
@@ -402,6 +431,14 @@ class HealRunner:
             })
             write_repair_log(self.spec_path, self.version, self.repairs)
 
+            loop_hint = f"{summary} | {diag_hint}".strip()
+            if self._loop_detector.observe(failed_step, loop_hint):
+                self.console.print(
+                    "[yellow]heal: detected repeating non-converging hint pattern; "
+                    "stopping auto-retry to avoid loop[/yellow]"
+                )
+                break
+
             # Retry
             executor = self._make_executor(resume=True)
             ok = executor.run()