refactorai-cli 0.2.30__tar.gz → 0.3.1__tar.gz

{refactorai_cli-0.2.30 → refactorai_cli-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.2.30
+Version: 0.3.1
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,6 +8,7 @@ Requires-Dist: typer>=0.12.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: PyYAML>=6.0.1
+Requires-Dist: refactorai-core>=3.0.1
 
 # refactorai-cli
 
@@ -53,7 +54,7 @@ python -m twine upload ./refactorai-cli/dist/*
 ## Install test (local)
 
 ```bash
-python -m pip install ./refactorai-cli/dist/refactorai_cli-0.2.30-py3-none-any.whl
+python -m pip install ./refactorai-cli/dist/refactorai_cli-0.3.1-py3-none-any.whl
 refactor --version
 ```
 

{refactorai_cli-0.2.30 → refactorai_cli-0.3.1}/README.md

@@ -42,7 +42,7 @@ python -m twine upload ./refactorai-cli/dist/*
 ## Install test (local)
 
 ```bash
-python -m pip install ./refactorai-cli/dist/refactorai_cli-0.2.30-py3-none-any.whl
+python -m pip install ./refactorai-cli/dist/refactorai_cli-0.3.1-py3-none-any.whl
 refactor --version
 ```
 

{refactorai_cli-0.2.30 → refactorai_cli-0.3.1}/pyproject.toml

@@ -1,14 +1,18 @@
 [project]
 name = "refactorai-cli"
-version = "0.2.30"
+version = "0.3.1"
 description = "Local-first CLI for the refactor platform"
 readme = "README.md"
 requires-python = ">=3.11"
+# R21 core split: the CLI depends on the PUBLIC client core only. The proprietary
+# engine (refactor-core-engine) is never installed on a developer's machine via
+# pip; local mode runs the engine from the downloaded runtime binary instead.
 dependencies = [
   "typer>=0.12.0",
   "httpx>=0.27.0",
   "rich>=13.7.0",
   "PyYAML>=6.0.1",
+  "refactorai-core>=3.0.1",
 ]
 
 [project.scripts]

{refactorai_cli-0.2.30 → refactorai_cli-0.3.1}/refactorai_cli/__init__.py

@@ -5,4 +5,4 @@ the shared `refactor_core` pipeline from a project folder while staying
 authenticated to the hosted platform via a developer key.
 """
 
-__version__ = "0.2.30"
+__version__ = "0.3.1"

{refactorai_cli-0.2.30 → refactorai_cli-0.3.1}/refactorai_cli/commands/run_cmds.py

@@ -52,9 +52,6 @@ from refactor_core.apply import (
 )
 from refactor_core.budgeting import compute_budget
 from refactor_core.capabilities import resolve_capabilities
-from refactor_core.execution import resolve_mode, run_with_mode
-from refactor_core.execution.rr_executor import run_refactor_requests
-from refactor_core.execution.structural_ops import structural_compatibility_matrix
 from refactor_core.gate import evaluate_gate
 from refactor_core.refactor_requests import (
     DEFERRED,
@@ -70,30 +67,10 @@ from refactor_core.refactor_requests import (
 from refactor_core.refactor_ops import remediation_hint
 from refactor_core.indexing import index_target
 from refactor_core.models import Finding, GeneratedTest, PatchGroup, RunArtifact
-from refactor_core.pipeline import build_refactor_prompt, build_review_prompt
-from refactor_core.providers import get_provider, resolve_provider_name, supported_providers
 from refactor_core.rules import annotate_documents_with_rules, filter_documents_by_rules
 from refactor_core.security import merge_refactor_findings, suppress_findings_for_rr
 from refactor_core.security.semgrep_runner import EMBEDDED_SEMGREP_SENTINEL
 from refactor_core.security.suppression import SecuritySuppression
-from refactor_core.sandbox_runtime import (
-    DEFAULT_IMAGE as SANDBOX_DEFAULT_IMAGE,
-    DEFAULT_SHELL as SANDBOX_DEFAULT_SHELL,
-    attach_shell as attach_sandbox_shell,
-    command_exists_in_container,
-    command_exists_in_sandbox,
-    detect_installer_in_container,
-    detect_installer_in_sandbox,
-    ensure_sandbox,
-    exec_in_container,
-    exec_in_container_stream,
-    exec_in_sandbox,
-    exec_in_sandbox_stream,
-    remove_sandbox_container,
-    sandbox_name,
-    resolve_runtime,
-    stop_sandbox,
-)
 from refactor_core.store import (
     append_sandbox_install_history,
     clear_sandbox_state,
@@ -125,6 +102,27 @@ from refactorai_cli.setup_flow import (
 
 console = Console()
 
+# Local mirrors of engine-only sandbox defaults (R21 core split). These are used
+# as Typer option defaults, which are evaluated at import time, so they cannot be
+# lazy-imported from the engine-only ``refactor_core.enginecore.sandbox_runtime`` module.
+# They mirror ``sandbox_runtime.DEFAULT_IMAGE`` / ``DEFAULT_SHELL`` and are only
+# meaningful in local mode (where the engine is present via the runtime binary).
+SANDBOX_DEFAULT_IMAGE = "docker.io/library/alpine:3.20"
+SANDBOX_DEFAULT_SHELL = "/bin/sh"
+
+
+def _sandbox_runtime():
+    """Lazily import the engine-only sandbox runtime module (local mode only).
+
+    Cloud modes never touch the sandbox; this import is therefore reached only on
+    the local execution path, where the engine is present (inside the runtime
+    binary). A client-only install that never runs local commands never imports
+    it, keeping engine code off the developer's disk (R21 core split).
+    """
+    from refactor_core.enginecore import sandbox_runtime as _sr
+
+    return _sr
+
 
 def _read_stage_output(stage_id: str) -> dict:
     path = stage_output_path(stage_id)
@@ -159,19 +157,25 @@ def _default_config_for_init() -> tuple[str, str]:
     if backend == BACKEND_LOCAL_SERVER:
         model_id = _setup_recommended_model_id()
         base_url = _setup_engine_base_url()
-        config_text = DEFAULT_CONFIG.replace("provider: heuristic", "provider: ollama", 1)
-        config_text = config_text.replace(
+        # local_server stays in `mode: local` but swaps the default heuristic
+        # provider block for an Ollama block pointing at the local engine.
+        config_text = DEFAULT_CONFIG.replace(
+            "# Heuristic (local, no LLM) - default for mode: local\n"
+            "provider: heuristic\n"
             "model_id: heuristic-local-v1",
-            f"model_id: {model_id}\nbase_url: {base_url}",
+            "# Ollama (local engine) - configured by `refactor init`\n"
+            "provider: ollama\n"
+            f"model_id: {model_id}\n"
+            f"base_url: {base_url}",
             1,
         )
         return config_text, "local_server"
     if backend == BACKEND_BYOK:
-        config_text = DEFAULT_CONFIG.replace("mode: local", "mode: cloud_byok", 1)
-        config_text = config_text.replace("provider: heuristic", "provider: openai", 1)
-        config_text = config_text.replace(
-            "model_id: heuristic-local-v1",
-            "model_id: gpt-4.1-mini\nprovider_key: ${OPENAI_API_KEY}\n# credential_ref: cred_01J...",
+        # BYOK only flips the execution mode. The developer chooses and
+        # uncomments a provider block in the Provider selection section.
+        config_text = DEFAULT_CONFIG.replace(
+            "mode: local\n# mode: cloud_byok",
+            "# mode: local\nmode: cloud_byok",
             1,
         )
         return config_text, "byok"
@@ -638,14 +642,14 @@ def _cloud_inference(
     documents, _scope_meta = filter_documents_by_rules(documents, project_root=Path(project_root))
     rule_meta = annotate_documents_with_rules(documents, project_root=Path(project_root))
 
-    if stage == "review":
-        system_prompt, user_prompt = build_review_prompt(constitution, documents, max_alerts)
-    else:
-        # Feed prior review findings into the refactor prompt so cloud `code`
-        # generates patches targeting the same issues (parity with local RR).
-        system_prompt, user_prompt = build_refactor_prompt(
-            constitution, documents, list(findings or []), max_alerts
-        )
+    # Server-side prompt building (R21): send raw indexed documents + the
+    # constitution body and let the platform build the prompts. The proprietary
+    # prompt engineering stays off the developer's machine. Prior review findings
+    # are forwarded for the refactor stage so cloud `code` targets the same
+    # issues (parity with local RR).
+    request_findings = [
+        f.model_dump() if hasattr(f, "model_dump") else dict(f) for f in (findings or [])
+    ]
 
     execution_mode = _cloud_execution_mode(constitution) or "cloud_managed"
     auth_ctx = ensure_authenticated(project_root)
@@ -653,8 +657,9 @@ def _cloud_inference(
         "stage": stage,
         "execution_mode": execution_mode,
         "constitution_hash": constitution.content_hash,
-        "system_prompt": system_prompt,
-        "user_prompt": user_prompt,
+        "documents": documents,
+        "constitution_body": getattr(constitution, "body", "") or "",
+        "findings": request_findings if stage != "review" else [],
         "max_alerts": max_alerts,
         "model_hint": model_hint or str(constitution.get_setting("model_id", "managed-default") or "managed-default"),
     }
@@ -1186,6 +1191,15 @@ def _sandbox_preflight(
     workdir: str | None = None,
 ) -> tuple[bool, str]:
     """Run sandbox preflight and optionally perform approved install plan."""
+    _sr = _sandbox_runtime()
+    command_exists_in_container = _sr.command_exists_in_container
+    command_exists_in_sandbox = _sr.command_exists_in_sandbox
+    exec_in_container = _sr.exec_in_container
+    exec_in_container_stream = _sr.exec_in_container_stream
+    exec_in_sandbox = _sr.exec_in_sandbox
+    exec_in_sandbox_stream = _sr.exec_in_sandbox_stream
+    detect_installer_in_container = _sr.detect_installer_in_container
+    detect_installer_in_sandbox = _sr.detect_installer_in_sandbox
 
     has_container_ctx = bool(runtime and container_name)
     resolved_workdir = str(workdir or "/workspace")
@@ -1485,6 +1499,10 @@ def _ensure_sandbox_ready(
     continue_on_preflight_failure: bool = False,
 ) -> dict | None:
     """Ensure sandbox lifecycle + preflight for stage execution."""
+    _sr = _sandbox_runtime()
+    resolve_runtime = _sr.resolve_runtime
+    sandbox_name = _sr.sandbox_name
+    ensure_sandbox = _sr.ensure_sandbox
     sandbox_cfg = _sandbox_settings(project_config)
     lifecycle = _sandbox_lifecycle(project_config)
     ephemeral = lifecycle == "per_run" and stage in {"review", "code"}
@@ -1553,6 +1571,9 @@ def _teardown_sandbox_context(project_root: Path, ctx: dict | None) -> None:
     """Clean up ephemeral per-run sandboxes."""
     if not ctx or not ctx.get("ephemeral"):
         return
+    _sr = _sandbox_runtime()
+    remove_sandbox_container = _sr.remove_sandbox_container
+    sandbox_name = _sr.sandbox_name
     runtime = str(ctx.get("runtime") or "")
     name = str(ctx.get("container_name") or "")
     ok, msg = remove_sandbox_container(runtime=runtime, container_name=name)
@@ -1587,6 +1608,10 @@ def start(
     project_root, _constitution, project_config = _load_project()
     register_project(project_root)
 
+    _sr = _sandbox_runtime()
+    resolve_runtime = _sr.resolve_runtime
+    ensure_sandbox = _sr.ensure_sandbox
+    attach_sandbox_shell = _sr.attach_shell
     sandbox_cfg = _sandbox_settings(project_config)
     preferred_runtime = str(runtime or sandbox_cfg.get("runtime", "podman") or "podman")
     resolved_runtime, reason = resolve_runtime(preferred_runtime)
@@ -1662,7 +1687,7 @@ def stop() -> None:
             "Switch to a valid directory and retry."
         )
         raise typer.Exit(code=1) from None
-    ok, message = stop_sandbox(project_root=project_root)
+    ok, message = _sandbox_runtime().stop_sandbox(project_root=project_root)
     if ok:
         console.print(f"[green]{message}[/green]")
         return
@@ -1685,7 +1710,7 @@ def shell(
     if not sys.stdin.isatty():
         console.print("[yellow]Non-interactive terminal; cannot attach shell.[/yellow]")
         raise typer.Exit(code=1)
-    ok, message = attach_sandbox_shell(project_root=project_root, shell_path=shell_path)
+    ok, message = _sandbox_runtime().attach_shell(project_root=project_root, shell_path=shell_path)
     if ok:
         return
     console.print(f"[red]Sandbox shell failed:[/red] {message}")
@@ -1797,6 +1822,9 @@ def review(
                 model_hint=provider,
             )
         else:
+            from refactor_core.execution.orchestrator import run_with_mode
+            from refactor_core.providers import get_provider
+
             selected_provider = get_provider(
                 constitution, project_root=project_root, provider_name=provider
             )
@@ -2013,6 +2041,8 @@ def code(
                 )
         selected_provider = None
         if not cloud:
+            from refactor_core.providers import get_provider
+
             selected_provider = get_provider(
                 constitution, project_root=project_root, provider_name=provider
             )
@@ -2035,6 +2065,8 @@ def code(
                 )
                 cloud_review_findings = list(review_artifact.findings or [])
             else:
+                from refactor_core.execution.orchestrator import run_with_mode
+
                 with console.status("[cyan]review[/cyan] analyzing...", spinner="dots") as status:
                     review_progress = _agent_progress_logger(
                         "review", status=status, verbose_steps=True
@@ -2158,6 +2190,8 @@ def code(
                 )
             return
 
+        from refactor_core.execution.rr_executor import run_refactor_requests
+
         with console.status("[cyan]code[/cyan] running...", spinner="dots") as status:
             rr_config = (
                 dict(getattr(project_config, "settings", {}) or {})
@@ -2234,6 +2268,9 @@ def requests(
         if not deferred_rrs:
             console.print("[dim]No deferred requests to retry.[/dim]")
         else:
+            from refactor_core.execution.rr_executor import run_refactor_requests
+            from refactor_core.providers import get_provider
+
             selected_provider = get_provider(
                 constitution, project_root=project_root, provider_name=provider
             )
@@ -3253,6 +3290,16 @@ def doctor(
         )
         return
 
+    # Local-mode doctor uses engine-only provider/execution helpers. These are
+    # lazily imported here so a client-only install (cloud modes) never requires
+    # the engine on disk (R21 core split); local mode has the engine via binary.
+    from refactor_core.execution.modes import resolve_mode
+    from refactor_core.providers import (
+        get_provider,
+        resolve_provider_name,
+        supported_providers,
+    )
+
     mode = str(constitution.get_setting("mode", "local") or "local")
     provider_name = resolve_provider_name(constitution, provider_name=provider)
 
@@ -3398,7 +3445,7 @@ def _report_sandbox(project_root: Path, config) -> None:
     enabled = True
     runtime_pref = str(sandbox_cfg.get("runtime", "podman") or "podman")
     image = str(sandbox_cfg.get("image") or SANDBOX_DEFAULT_IMAGE)
-    resolved_runtime, reason = resolve_runtime(runtime_pref)
+    resolved_runtime, reason = _sandbox_runtime().resolve_runtime(runtime_pref)
 
     console.print(f"[bold]project[/bold]: {project_root}")
     console.print(f"[bold]sandbox enabled[/bold]: {enabled} [dim](mandatory for local runs)[/dim]")
@@ -3448,6 +3495,10 @@ def _report_sandbox(project_root: Path, config) -> None:
 
 
 def _report_structural_readiness(project_root: Path, config) -> None:
+    # Engine-only structural ops (local doctor diagnostic); lazy so client-only
+    # installs never require the engine on disk (R21 core split).
+    from refactor_core.execution.structural_ops import structural_compatibility_matrix
+
     settings = dict(getattr(config, "settings", {}) or {})
     refactor_cfg = settings.get("refactor", {})
     if not isinstance(refactor_cfg, dict):

{refactorai_cli-0.2.30 → refactorai_cli-0.3.1}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.2.30
+Version: 0.3.1
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,6 +8,7 @@ Requires-Dist: typer>=0.12.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: PyYAML>=6.0.1
+Requires-Dist: refactorai-core>=3.0.1
 
 # refactorai-cli
 
@@ -53,7 +54,7 @@ python -m twine upload ./refactorai-cli/dist/*
 ## Install test (local)
 
 ```bash
-python -m pip install ./refactorai-cli/dist/refactorai_cli-0.2.30-py3-none-any.whl
+python -m pip install ./refactorai-cli/dist/refactorai_cli-0.3.1-py3-none-any.whl
 refactor --version
 ```
 

{refactorai_cli-0.2.30 → refactorai_cli-0.3.1}/refactorai_cli.egg-info/requires.txt

@@ -2,3 +2,4 @@ typer>=0.12.0
 httpx>=0.27.0
 rich>=13.7.0
 PyYAML>=6.0.1
+refactorai-core>=3.0.1