refactorai-cli 0.7.16__tar.gz → 0.7.17__tar.gz

{refactorai_cli-0.7.16 → refactorai_cli-0.7.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.7.16
+Version: 0.7.17
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,7 +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.2.23
+Requires-Dist: refactorai-core>=3.2.24
 
 # refactorai-cli
 

{refactorai_cli-0.7.16 → refactorai_cli-0.7.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "refactorai-cli"
-version = "0.7.16"
+version = "0.7.17"
 description = "Local-first CLI for the refactor platform"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ dependencies = [
   "httpx>=0.27.0",
   "rich>=13.7.0",
   "PyYAML>=6.0.1",
-  "refactorai-core>=3.2.23",
+  "refactorai-core>=3.2.24",
 ]
 
 [project.scripts]

{refactorai_cli-0.7.16 → refactorai_cli-0.7.17}/refactorai_cli/mode_sync.py

@@ -17,9 +17,10 @@ from typing import Callable
 
 from refactor_core.constitution import (
     CONFIG_FILENAME,
+    MANAGED_BLOCK_BEGIN,
+    MANAGED_BLOCK_END,
     MANAGED_KEYS,
     find_project_files,
-    load_config,
     upsert_managed_block,
 )
 from refactor_core.execution_variant import normalize_execution_variant
@@ -38,33 +39,90 @@ def _local_config_path(project_root: Path) -> Path | None:
 
 
 def _current_managed_values(project_root: Path) -> dict:
-    """Current values of the managed keys as parsed from refactor.config."""
+    """Current values from the raw managed block (no env interpolation)."""
     config_path = _local_config_path(project_root)
     if config_path is None:
         return {}
     try:
-        settings = getattr(load_config(config_path), "settings", {}) or {}
-    except Exception:
+        text = config_path.read_text(encoding="utf-8")
+    except OSError:
+        return {}
+    begin = text.find(MANAGED_BLOCK_BEGIN)
+    if begin == -1:
+        return {}
+    end = text.find(MANAGED_BLOCK_END, begin)
+    if end == -1:
         return {}
+    body = text[begin + len(MANAGED_BLOCK_BEGIN) : end]
     values: dict = {}
-    for key in MANAGED_KEYS:
-        raw = settings.get(key)
-        if raw is None:
+    for line in body.splitlines():
+        stripped = line.strip()
+        if not stripped or stripped.startswith("#") or ":" not in stripped:
             continue
-        text = str(raw).strip()
-        if text:
-            values[key] = text
+        key, raw = stripped.split(":", 1)
+        key = key.strip()
+        if key not in MANAGED_KEYS:
+            continue
+        value = raw.strip()
+        if value:
+            values[key] = value
     return values
 
 
+_LOCAL_BYOK_ENV_DEFAULTS: dict[str, dict[str, str]] = {
+    "openai": {
+        "provider_key": "${OPENAI_API_KEY}",
+        "model_id": "${OPENAI_MODEL_ID}",
+        "base_url": "${OPENAI_BASE_URL}",
+    },
+    "anthropic": {
+        "provider_key": "${ANTHROPIC_API_KEY}",
+        "model_id": "${ANTHROPIC_MODEL_ID}",
+    },
+    "openrouter": {
+        "provider_key": "${OPENROUTER_API_KEY}",
+        "model_id": "${OPENROUTER_MODEL_ID}",
+        "base_url": "${OPENROUTER_BASE_URL}",
+    },
+    "nvidia": {
+        "provider_key": "${NVIDIA_API_KEY}",
+        "model_id": "${NVIDIA_MODEL_ID}",
+        "base_url": "${NVIDIA_BASE_URL}",
+    },
+    "azure_openai": {
+        "provider_key": "${AZURE_OPENAI_API_KEY}",
+        "model_id": "${AZURE_OPENAI_DEPLOYMENT}",
+        "base_url": "${AZURE_OPENAI_ENDPOINT}",
+        "api_version": "${AZURE_OPENAI_API_VERSION}",
+    },
+    "vertex_ai": {
+        "provider_key": "${GOOGLE_OAUTH_ACCESS_TOKEN}",
+        "model_id": "${VERTEX_MODEL_ID}",
+        "project": "${GOOGLE_CLOUD_PROJECT}",
+        "region": "${GOOGLE_CLOUD_LOCATION}",
+    },
+    "bedrock": {
+        "provider_key": "${AWS_BEARER_TOKEN_BEDROCK}",
+        "model_id": "${BEDROCK_MODEL_ID}",
+        "region": "${AWS_REGION}",
+    },
+    "ollama": {
+        "model_id": "${OLLAMA_MODEL_ID}",
+        "base_url": "${OLLAMA_BASE_URL}",
+    },
+}
+
+
 def _desired_managed_fields(record: dict, current: dict, server_variant: str) -> dict:
     """Compute the managed-block fields from the server record (server-wins).
 
     When the server carries a remote provider (BYOK/managed set from the UI), the
-    provider/model/credential come from the server and any local ``base_url`` is
-    dropped. Otherwise (heuristic / terminal-set local_model, where the server has
-    no provider) the local provider/model/base_url are preserved and only the
-    variant is reconciled.
+    provider/model/credential come from the server. Provider-local extras
+    (``provider_key`` env token, region/project/base_url/api_version) are preserved
+    from the local managed block so sync does not strip local BYOK readiness.
+    Otherwise (heuristic / terminal-set local_model, where the server has no
+    provider) local provider-scoped values are preserved and only the variant is
+    reconciled.
     """
     provider = str(record.get("inference_provider") or "").strip()
     model_id = str(record.get("model_id") or "").strip()
@@ -77,8 +135,20 @@ def _desired_managed_fields(record: dict, current: dict, server_variant: str) ->
             fields["model_id"] = model_id
         if credential_ref:
             fields["credential_ref"] = credential_ref
+        # Preserve local provider-scoped values when server record doesn't carry
+        # them. This keeps local BYOK config/env wiring stable across syncs.
+        for key in ("model_id", "provider_key", "base_url", "region", "project", "api_version"):
+            if key not in fields and current.get(key):
+                fields[key] = current[key]
+        # Local BYOK should be immediately runnable from env after sync. Seed
+        # provider-specific env-token placeholders when missing.
+        if server_variant == "local_byok":
+            defaults = _LOCAL_BYOK_ENV_DEFAULTS.get(provider, {})
+            for key, value in defaults.items():
+                if not str(fields.get(key) or "").strip():
+                    fields[key] = value
     else:
-        for key in ("provider", "model_id", "base_url", "credential_ref"):
+        for key in ("provider", "model_id", "provider_key", "base_url", "region", "project", "api_version", "credential_ref"):
             if current.get(key):
                 fields[key] = current[key]
     return fields
@@ -92,10 +162,11 @@ def sync_execution_variant_from_server(
 ) -> str | None:
     """Pull the server project's execution settings into the managed config block.
 
-    Server-wins for the managed keys (execution_variant / provider / model_id /
-    credential_ref). Secrets (``provider_key``) are never written -- they stay in
-    the environment. Returns the applied variant when the local config changed,
-    else ``None`` (already in sync, offline, unauthenticated, or unbound project).
+    Server-wins for mode/provider identity, while preserving provider-local env
+    wiring in the managed block. ``provider_key`` is written only as an env token
+    placeholder (for example ``${OPENAI_API_KEY}``) and never as a raw secret.
+    Returns the applied variant when the local config changed, else ``None``
+    (already in sync, offline, unauthenticated, or unbound project).
     """
     try:
         project_id = resolve_project_id(project_root)

{refactorai_cli-0.7.16 → refactorai_cli-0.7.17}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.7.16
+Version: 0.7.17
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,7 +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.2.23
+Requires-Dist: refactorai-core>=3.2.24
 
 # refactorai-cli
 

{refactorai_cli-0.7.16 → refactorai_cli-0.7.17}/refactorai_cli.egg-info/requires.txt

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