refactorai-cli 0.2.3__tar.gz → 0.2.5__tar.gz

{refactorai_cli-0.2.3 → refactorai_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.2.3
+Version: 0.2.5
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{refactorai_cli-0.2.3 → refactorai_cli-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "refactorai-cli"
-version = "0.2.3"
+version = "0.2.5"
 description = "Local-first CLI for the refactor platform"
 readme = "README.md"
 requires-python = ">=3.11"

{refactorai_cli-0.2.3 → refactorai_cli-0.2.5}/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.3"
+__version__ = "0.2.5"

{refactorai_cli-0.2.3 → refactorai_cli-0.2.5}/refactorai_cli/commands/setup_cmds.py

@@ -53,6 +53,7 @@ def setup(
             resume=resume,
             from_stage=from_stage,
             ask_approval=lambda prompt: _ask_approval(yes, prompt),
+            on_progress=lambda message: console.print(f"[cyan]{message}[/cyan]"),
         )
     except SetupError as exc:
         console.print(f"[red]Setup failed:[/red] {exc}")

{refactorai_cli-0.2.3 → refactorai_cli-0.2.5}/refactorai_cli/local_engine_runtime.py

@@ -7,6 +7,7 @@ remain usable without a separate ``refactor-core`` package dependency.
 from __future__ import annotations
 
 import json
+import re
 import shutil
 import subprocess
 from datetime import datetime, timezone
@@ -14,7 +15,7 @@ from pathlib import Path
 
 from refactorai_cli.local_paths import ensure_dir, refactor_home
 
-DEFAULT_ENGINE_IMAGE = "docker.io/library/alpine:3.20"
+DEFAULT_ENGINE_IMAGE = "docker.io/ollama/ollama:latest"
 DEFAULT_ENGINE_CONTAINER = "refactor-engine"
 DEFAULT_ENGINE_PORT = 17777
 DEFAULT_ENGINE_PROFILE = "cpu-small"
@@ -22,6 +23,8 @@ ENGINE_DIR = "engine"
 ENGINE_STATE_FILE = "engine.json"
 ENGINE_MODELS_DIR = "models"
 ENGINE_CACHE_DIR = "cache/ollama"
+_ANSI_RE = re.compile(r"\x1b\[[0-9;?]*[A-Za-z]")
+_CONTROL_RE = re.compile(r"[\x00-\x08\x0b-\x1f\x7f]")
 
 
 def _now_iso() -> str:
@@ -85,6 +88,13 @@ def _run(cmd: list[str]) -> subprocess.CompletedProcess:
     return subprocess.run(cmd, capture_output=True, text=True)
 
 
+def _clean_output(text: str) -> str:
+    cleaned = _ANSI_RE.sub("", text or "")
+    cleaned = cleaned.replace("\r", "\n")
+    cleaned = _CONTROL_RE.sub("", cleaned)
+    return "\n".join(line.strip() for line in cleaned.splitlines() if line.strip())
+
+
 def _exists(runtime: str, name: str) -> bool:
     proc = _run([runtime, "container", "exists", name])
     return proc.returncode == 0
@@ -96,10 +106,22 @@ def _running(runtime: str, name: str) -> bool:
 
 
 def _health(runtime: str, name: str) -> bool:
-    proc = _run([runtime, "exec", name, "sh", "-lc", "command -v ollama >/dev/null 2>&1"])
+    has_binary = _run([runtime, "exec", name, "sh", "-lc", "command -v ollama >/dev/null 2>&1"])
+    if has_binary.returncode != 0:
+        return False
+    proc = _run([runtime, "exec", name, "sh", "-lc", "ollama list >/dev/null 2>&1"])
     return proc.returncode == 0
 
 
+def _run_args_for_image(image: str) -> list[str]:
+    normalized = str(image or "").strip().lower()
+    if "ollama/ollama" in normalized:
+        # Let the container run its default command (ollama serve), which keeps
+        # the model API available for pull/show operations.
+        return []
+    return ["sleep", "infinity"]
+
+
 def ensure_engine_up(
     *,
     runtime: str,
@@ -114,6 +136,7 @@ def ensure_engine_up(
     if rebuild and _exists(runtime, container_name):
         _run([runtime, "rm", "-f", container_name])
     if not _exists(runtime, container_name):
+        command_args = _run_args_for_image(image)
         proc = _run(
             [
                 runtime,
@@ -128,8 +151,7 @@ def ensure_engine_up(
                 "-v",
                 f"{cache_dir}:/root/.cache/ollama:Z",
                 image,
-                "sleep",
-                "infinity",
+                *command_args,
             ]
         )
         if proc.returncode != 0:
@@ -223,7 +245,7 @@ def pull_model(*, runtime: str, container_name: str, model_id: str) -> tuple[boo
     if probe.returncode != 0:
         return False, "Engine image does not include `ollama`; use a model-capable engine image."
     proc = _run([runtime, "exec", container_name, "sh", "-lc", f"ollama pull {model_id}"])
-    text = (proc.stdout or proc.stderr or "").strip()
+    text = _clean_output(proc.stdout or proc.stderr or "")
     if proc.returncode != 0:
         return False, text or "Model pull failed."
     return True, text or "Model pull complete."

{refactorai_cli-0.2.3 → refactorai_cli-0.2.5}/refactorai_cli/setup_flow.py

@@ -7,10 +7,12 @@ import shutil
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
+from inspect import signature
 from typing import Callable
 
 from refactorai_cli.local_engine_runtime import (
     DEFAULT_ENGINE_CONTAINER,
+    DEFAULT_ENGINE_IMAGE,
     engine_status,
     ensure_engine_up,
     pull_model,
@@ -141,7 +143,7 @@ def get_setup_diagnostics() -> dict:
     return {"state": state, "stages": stages}
 
 
-def _stage_s1_precheck(_ask_approval: Callable[[str], bool]) -> dict:
+def _stage_s1_precheck(_ask_approval: Callable[[str], bool], _emit: Callable[[str], None] | None = None) -> dict:
     profile = detect_machine_profile()
     runtime, reason = resolve_engine_runtime("podman")
     disk = shutil.disk_usage(str(refactor_home()))
@@ -158,7 +160,7 @@ def _stage_s1_precheck(_ask_approval: Callable[[str], bool]) -> dict:
     }
 
 
-def _stage_s2_auth(_ask_approval: Callable[[str], bool]) -> dict:
+def _stage_s2_auth(_ask_approval: Callable[[str], bool], _emit: Callable[[str], None] | None = None) -> dict:
     auth = ensure_authenticated(force_remote=True)
     lease = ensure_lease(force_refresh=True)
     return {
@@ -170,11 +172,17 @@ def _stage_s2_auth(_ask_approval: Callable[[str], bool]) -> dict:
     }
 
 
-def _stage_s3_runtime(ask_approval: Callable[[str], bool]) -> dict:
+def _stage_s3_runtime(ask_approval: Callable[[str], bool], emit: Callable[[str], None] | None = None) -> dict:
+    if emit:
+        emit("Resolving runtime manifest from control plane...")
     manifest = resolve_runtime_manifest(channel="stable")
     if not ask_approval(f"Install runtime artifact version {manifest.runtime_version}?"):
         raise SetupError("Runtime installation was not approved.")
+    if emit:
+        emit(f"Downloading runtime artifact {manifest.runtime_version}...")
     artifact = download_artifact(manifest.artifact_url)
+    if emit:
+        emit("Verifying and activating runtime artifact...")
     path = activate_runtime(manifest, artifact, channel="stable")
     status = runtime_status()
     return {
@@ -199,7 +207,9 @@ def _selected_backend() -> str:
     return backend
 
 
-def _stage_s4_backend_choice(ask_approval: Callable[[str], bool]) -> dict:
+def _stage_s4_backend_choice(
+    ask_approval: Callable[[str], bool], _emit: Callable[[str], None] | None = None
+) -> dict:
     if ask_approval("Install local refactor-server and local model now?"):
         backend = BACKEND_LOCAL_SERVER
     else:
@@ -210,7 +220,7 @@ def _stage_s4_backend_choice(ask_approval: Callable[[str], bool]) -> dict:
     }
 
 
-def _stage_s5_backend_bootstrap(ask_approval: Callable[[str], bool]) -> dict:
+def _stage_s5_backend_bootstrap(ask_approval: Callable[[str], bool], emit: Callable[[str], None] | None = None) -> dict:
     backend = _selected_backend()
     if backend == BACKEND_BYOK:
         return {
@@ -221,16 +231,39 @@ def _stage_s5_backend_bootstrap(ask_approval: Callable[[str], bool]) -> dict:
         }
     if not ask_approval("Install/start local refactor-server and bootstrap model now?"):
         raise SetupError("Local server bootstrap was not approved.")
+    if emit:
+        emit("Checking local engine runtime availability...")
     runtime, reason = resolve_engine_runtime("podman")
     if not runtime:
         raise SetupError(reason or "Engine runtime unavailable.")
+    if emit:
+        emit("Starting local refactor-engine container...")
     ok, message, state = ensure_engine_up(runtime=runtime)
     if not ok:
         raise SetupError(f"Local server bootstrap failed: {message}")
     estatus = engine_status(runtime=runtime, container_name=DEFAULT_ENGINE_CONTAINER)
     if str(estatus.get("status") or "").lower() != "ready":
-        raise SetupError("Local server is not ready. Run `refactor engine status` and retry from S5.")
+        # If a stale container from older installs exists (for example an image
+        # without ollama), rebuild once with the default engine image.
+        if emit:
+            emit("Detected non-ready engine container. Rebuilding once with default model runtime image...")
+        ok, message, _state = ensure_engine_up(
+            runtime=runtime,
+            image=DEFAULT_ENGINE_IMAGE,
+            container_name=DEFAULT_ENGINE_CONTAINER,
+            rebuild=True,
+        )
+        if not ok:
+            raise SetupError(f"Local server bootstrap failed: {message}")
+        estatus = engine_status(runtime=runtime, container_name=DEFAULT_ENGINE_CONTAINER)
+        if str(estatus.get("status") or "").lower() != "ready":
+            raise SetupError(
+                f"Local server is not ready (status={estatus.get('status')}). "
+                "Run `refactor engine status` and retry from S5."
+            )
 
+    if emit:
+        emit("Resolving signed model policy...")
     policy = resolve_policy(force_refresh=False)
     profile = detect_machine_profile()
     model_id = recommended_model_id(policy, profile=str(profile["profile"]))
@@ -245,6 +278,11 @@ def _stage_s5_backend_bootstrap(ask_approval: Callable[[str], bool]) -> dict:
     runtime, reason = resolve_engine_runtime("podman")
     if not runtime:
         raise SetupError(reason or "Engine runtime unavailable.")
+    if emit:
+        emit(
+            f"Pulling recommended model '{model_id}' in local engine "
+            "(this can take several minutes on first download)..."
+        )
     ok, message = pull_model(runtime=runtime, container_name=DEFAULT_ENGINE_CONTAINER, model_id=model_id)
     if not ok:
         raise SetupError(f"Model pull failed: {message}")
@@ -257,7 +295,7 @@ def _stage_s5_backend_bootstrap(ask_approval: Callable[[str], bool]) -> dict:
     }
 
 
-def _stage_s6_validate(_ask_approval: Callable[[str], bool]) -> dict:
+def _stage_s6_validate(_ask_approval: Callable[[str], bool], _emit: Callable[[str], None] | None = None) -> dict:
     backend = _selected_backend()
     runtime_status_data = runtime_status()
     if not runtime_status_data.get("active_version") or not runtime_status_data.get("active_artifact_exists"):
@@ -293,7 +331,7 @@ def _stage_s6_validate(_ask_approval: Callable[[str], bool]) -> dict:
     }
 
 
-STAGE_HANDLERS: dict[str, Callable[[Callable[[str], bool]], dict]] = {
+STAGE_HANDLERS: dict[str, Callable[..., dict]] = {
     "S1": _stage_s1_precheck,
     "S2": _stage_s2_auth,
     "S3": _stage_s3_runtime,
@@ -303,12 +341,24 @@ STAGE_HANDLERS: dict[str, Callable[[Callable[[str], bool]], dict]] = {
 }
 
 
+def _invoke_stage_handler(
+    handler: Callable,
+    ask_approval: Callable[[str], bool],
+    on_progress: Callable[[str], None] | None,
+) -> dict:
+    param_names = list(signature(handler).parameters.keys())
+    if any(name in {"emit", "_emit", "on_progress"} for name in param_names):
+        return handler(ask_approval, on_progress)
+    return handler(ask_approval)
+
+
 def run_setup(
     *,
     auto_approve: bool = False,
     resume: bool = False,
     from_stage: str | None = None,
     ask_approval: Callable[[str], bool] | None = None,
+    on_progress: Callable[[str], None] | None = None,
 ) -> SetupResult:
     if ask_approval is None:
         ask_approval = lambda _prompt: bool(auto_approve)
@@ -344,6 +394,8 @@ def run_setup(
         }
     )
     for stage_id in STAGE_IDS[start_index:]:
+        if on_progress:
+            on_progress(f"Running stage {stage_id} ({STAGE_NAMES.get(stage_id, stage_id)})...")
         write_setup_state(
             {
                 "status": "in_progress",
@@ -355,7 +407,7 @@ def run_setup(
         )
         handler = STAGE_HANDLERS[stage_id]
         try:
-            output = handler(ask_approval)
+            output = _invoke_stage_handler(handler, ask_approval, on_progress)
         except SetupError as exc:
             write_setup_state(
                 {
@@ -394,6 +446,8 @@ def run_setup(
         write_stage_output(stage_id, output)
         if stage_id not in completed:
             completed.append(stage_id)
+        if on_progress:
+            on_progress(f"Completed stage {stage_id}.")
     final_backend = _normalize_backend(read_setup_state().get("execution_backend"))
     write_setup_state(
         {

{refactorai_cli-0.2.3 → refactorai_cli-0.2.5}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.2.3
+Version: 0.2.5
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown