refactorai-cli 0.2.9__tar.gz → 0.2.11__tar.gz

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.2.9
+Version: 0.2.11
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -53,6 +53,6 @@ python -m twine upload ./refactorai-cli/dist/*
 ## Install test (local)
 
 ```bash
-python -m pip install ./refactorai-cli/dist/refactorai_cli-0.1.0-py3-none-any.whl
+python -m pip install ./refactorai-cli/dist/refactorai_cli-0.2.11-py3-none-any.whl
 refactor --version
 ```

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/README.md

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

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/pyproject.toml

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

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/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.9"
+__version__ = "0.2.11"

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/refactorai_cli/commands/run_cmds.py

@@ -8,6 +8,7 @@ generation and application.
 from __future__ import annotations
 
 import os
+import json
 import re
 import shlex
 import shutil
@@ -92,10 +93,62 @@ from refactor_core.store import (
 from refactor_core.testcmd import resolve_test_command
 
 from refactorai_cli.auth import AuthError, ensure_authenticated
+from refactorai_cli.local_engine_runtime import DEFAULT_ENGINE_PORT, read_engine_state
 from refactorai_cli.settings import platform_url
+from refactorai_cli.setup_flow import (
+    BACKEND_BYOK,
+    BACKEND_LOCAL_SERVER,
+    read_setup_state,
+    stage_output_path,
+)
 
 console = Console()
 
+
+def _read_stage_output(stage_id: str) -> dict:
+    path = stage_output_path(stage_id)
+    if not path.is_file():
+        return {}
+    try:
+        payload = json.loads(path.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, OSError):
+        return {}
+    output = payload.get("output")
+    return output if isinstance(output, dict) else {}
+
+
+def _setup_recommended_model_id() -> str:
+    s5_output = _read_stage_output("S5")
+    model_id = str(s5_output.get("recommended_model_id") or "").strip()
+    return model_id or "qwen2.5-coder:1.5b-instruct"
+
+
+def _setup_engine_base_url() -> str:
+    state = read_engine_state()
+    try:
+        port = int(state.get("port", DEFAULT_ENGINE_PORT))
+    except (TypeError, ValueError):
+        port = DEFAULT_ENGINE_PORT
+    return f"http://127.0.0.1:{port}/v1"
+
+
+def _default_config_for_init() -> tuple[str, str]:
+    setup_state = read_setup_state()
+    backend = str(setup_state.get("execution_backend") or "").strip().lower()
+    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(
+            "model_id: heuristic-local-v1",
+            f"model_id: {model_id}\nbase_url: {base_url}",
+            1,
+        )
+        return config_text, "local_server"
+    if backend == BACKEND_BYOK:
+        return DEFAULT_CONFIG, "byok"
+    return DEFAULT_CONFIG, "default"
+
 _SEVERITY_STYLE = {
     "critical": "bold red",
     "high": "red",
@@ -603,12 +656,23 @@ def init(
         )
         raise typer.Exit(code=1)
     consti_target.write_text(DEFAULT_CONSTITUTION, encoding="utf-8")
-    config_target.write_text(DEFAULT_CONFIG, encoding="utf-8")
+    config_text, config_profile = _default_config_for_init()
+    config_target.write_text(config_text, encoding="utf-8")
 
     constitution = load_constitution(consti_target)
     record = register_project(project_root, constitution_hash=constitution.content_hash)
     console.print(f"[green]Created[/green] {consti_target}")
     console.print(f"[green]Created[/green] {config_target}")
+    if config_profile == "local_server":
+        console.print(
+            "[green]Configured[/green] refactor.config for local server setup "
+            "(provider=ollama with setup-recommended model)."
+        )
+    elif config_profile == "byok":
+        console.print(
+            "[green]Configured[/green] refactor.config for BYOK setup "
+            "(provider=heuristic; uncomment a provider block to use your key)."
+        )
     console.print(
         f"[green]Registered[/green] project in central store: {project_store_dir(project_root)}"
     )

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/refactorai_cli/control_plane.py

@@ -12,6 +12,7 @@ from pathlib import Path
 
 import httpx
 
+from refactorai_cli import __version__
 from refactorai_cli.local_paths import ensure_dir, refactor_home
 
 from refactorai_cli.credentials import resolve_developer_key
@@ -115,7 +116,7 @@ def read_cached_lease() -> LeaseContext | None:
     return _from_cached(payload)
 
 
-def request_lease(*, timeout: float = 20.0, cli_version: str = "0.1.0") -> LeaseContext:
+def request_lease(*, timeout: float = 20.0, cli_version: str = __version__) -> LeaseContext:
     resolved = resolve_developer_key()
     if not resolved:
         raise RuntimeError(

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/refactorai_cli/local_engine_runtime.py

@@ -10,6 +10,9 @@ import json
 import re
 import shutil
 import subprocess
+import time
+import urllib.error
+import urllib.request
 from datetime import datetime, timezone
 from pathlib import Path
 
@@ -18,6 +21,8 @@ from refactorai_cli.local_paths import ensure_dir, refactor_home
 DEFAULT_ENGINE_IMAGE = "docker.io/ollama/ollama:latest"
 DEFAULT_ENGINE_CONTAINER = "refactor-engine"
 DEFAULT_ENGINE_PORT = 17777
+# Ollama serves inside the container on 11434.
+ENGINE_API_PORT = 11434
 DEFAULT_ENGINE_PROFILE = "cpu-small"
 ENGINE_DIR = "engine"
 ENGINE_STATE_FILE = "engine.json"
@@ -105,12 +110,56 @@ def _running(runtime: str, name: str) -> bool:
     return proc.returncode == 0 and proc.stdout.strip().lower() == "true"
 
 
-def _health(runtime: str, name: str) -> bool:
+def _http_health(host_port: int, *, retries: int = 8, delay_s: float = 0.25) -> bool:
+    url = f"http://127.0.0.1:{int(host_port)}/api/tags"
+    for attempt in range(max(1, int(retries))):
+        try:
+            with urllib.request.urlopen(url, timeout=2.0) as response:
+                code = int(getattr(response, "status", 0) or 0)
+                if 200 <= code < 500:
+                    return True
+        except (urllib.error.URLError, OSError, ValueError):
+            if attempt + 1 < retries:
+                time.sleep(delay_s)
+    return False
+
+
+def _health(runtime: str, name: str, *, host_port: int | None = None) -> bool:
     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
+    if proc.returncode != 0:
+        return False
+    if host_port is None:
+        return True
+    return _http_health(int(host_port))
+
+
+def _published_host_port(runtime: str, name: str, container_port: int = ENGINE_API_PORT) -> int | None:
+    proc = _run([runtime, "port", name, str(int(container_port))])
+    if proc.returncode != 0:
+        return None
+    line = (proc.stdout or "").strip().splitlines()
+    if not line:
+        return None
+    candidate = line[0].strip()
+    # Typical outputs:
+    #  - "127.0.0.1:17777"
+    #  - "[::1]:17777"
+    #  - "0.0.0.0:17777"
+    if ":" not in candidate:
+        return None
+    port_text = candidate.rsplit(":", 1)[-1].strip()
+    try:
+        return int(port_text)
+    except (TypeError, ValueError):
+        return None
+
+
+def _port_mapping_matches(runtime: str, name: str, host_port: int) -> bool:
+    published = _published_host_port(runtime, name, ENGINE_API_PORT)
+    return published == int(host_port)
 
 
 def _run_args_for_image(image: str) -> list[str]:
@@ -131,11 +180,17 @@ def ensure_engine_up(
     port: int = DEFAULT_ENGINE_PORT,
     rebuild: bool = False,
 ) -> tuple[bool, str, dict]:
+    resolved_port = int(port)
     models_dir = ensure_dir(refactor_home() / ENGINE_MODELS_DIR)
     cache_dir = ensure_dir(refactor_home() / ENGINE_CACHE_DIR)
-    if rebuild and _exists(runtime, container_name):
+    exists = _exists(runtime, container_name)
+    if rebuild and exists:
         _run([runtime, "rm", "-f", container_name])
-    if not _exists(runtime, container_name):
+        exists = False
+    if exists and not _port_mapping_matches(runtime, container_name, resolved_port):
+        _run([runtime, "rm", "-f", container_name])
+        exists = False
+    if not exists:
         command_args = _run_args_for_image(image)
         proc = _run(
             [
@@ -145,7 +200,7 @@ def ensure_engine_up(
                 "--name",
                 container_name,
                 "-p",
-                f"127.0.0.1:{int(port)}:{int(port)}",
+                f"127.0.0.1:{resolved_port}:{ENGINE_API_PORT}",
                 "-v",
                 f"{models_dir}:/root/.ollama/models:Z",
                 "-v",
@@ -162,16 +217,19 @@ def ensure_engine_up(
         if proc.returncode != 0:
             detail = (proc.stderr or proc.stdout or "").strip()
             return False, f"Failed to start engine container: {detail}", {}
+    status = "ready" if _health(runtime, container_name, host_port=resolved_port) else "degraded"
     state = {
         "runtime": runtime,
         "container_name": container_name,
         "image": image,
-        "port": int(port),
+        "port": resolved_port,
         "profile": profile,
-        "status": "ready" if _health(runtime, container_name) else "degraded",
+        "status": status,
     }
     write_engine_state(state)
-    return True, "Engine ready.", state
+    if status == "ready":
+        return True, "Engine ready.", state
+    return False, "Engine container is running but local API health checks failed.", state
 
 
 def stop_engine(*, runtime: str, container_name: str = DEFAULT_ENGINE_CONTAINER) -> tuple[bool, str]:
@@ -192,6 +250,7 @@ def stop_engine(*, runtime: str, container_name: str = DEFAULT_ENGINE_CONTAINER)
 def engine_status(*, runtime: str | None = None, container_name: str = DEFAULT_ENGINE_CONTAINER) -> dict:
     state = read_engine_state()
     resolved_runtime = runtime or str(state.get("runtime") or "podman")
+    resolved_port = int(state.get("port", DEFAULT_ENGINE_PORT))
     exists = False
     running = False
     healthy = False
@@ -199,7 +258,7 @@ def engine_status(*, runtime: str | None = None, container_name: str = DEFAULT_E
     try:
         exists = _exists(resolved_runtime, container_name)
         running = _running(resolved_runtime, container_name) if exists else False
-        healthy = _health(resolved_runtime, container_name) if running else False
+        healthy = _health(resolved_runtime, container_name, host_port=resolved_port) if running else False
         if running and healthy:
             status = "ready"
         elif running and not healthy:
@@ -212,7 +271,7 @@ def engine_status(*, runtime: str | None = None, container_name: str = DEFAULT_E
         "runtime": resolved_runtime,
         "container_name": container_name,
         "image": state.get("image", DEFAULT_ENGINE_IMAGE),
-        "port": int(state.get("port", DEFAULT_ENGINE_PORT)),
+        "port": resolved_port,
         "profile": state.get("profile", DEFAULT_ENGINE_PROFILE),
         "status": status,
         "exists": exists,

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/refactorai_cli/runtime_manager.py

@@ -17,6 +17,7 @@ from pathlib import Path
 
 import httpx
 
+from refactorai_cli import __version__
 from refactorai_cli.local_paths import ensure_dir, refactor_home
 
 from refactorai_cli.control_plane import ensure_lease
@@ -129,7 +130,7 @@ def resolve_runtime_manifest(*, channel: str = "stable", timeout: float = 20.0)
     os_name = str(platform.system() or "linux").lower()
     arch = str(platform.machine() or "x86_64").lower()
     payload = {
-        "cli_version": "0.1.0",
+        "cli_version": __version__,
         "os": os_name,
         "arch": arch,
         "channel": channel,

{refactorai_cli-0.2.9 → refactorai_cli-0.2.11}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.2.9
+Version: 0.2.11
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -53,6 +53,6 @@ python -m twine upload ./refactorai-cli/dist/*
 ## Install test (local)
 
 ```bash
-python -m pip install ./refactorai-cli/dist/refactorai_cli-0.1.0-py3-none-any.whl
+python -m pip install ./refactorai-cli/dist/refactorai_cli-0.2.11-py3-none-any.whl
 refactor --version
 ```