@agxnte/reidx 2.0.3 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agxnte/reidx",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Terminal-native personal intelligence and coding CLI (agent-first runtime)",
   "bin": {
     "reid": "bin/reidx.js"

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reidx"
-version = "2.0.3"
+version = "2.0.5"
 description = "Terminal-native personal intelligence and coding CLI (agent-first runtime)"
 readme = "README.md"
 requires-python = ">=3.12"

package/src/reidx/__init__.py

@@ -1,3 +1,3 @@
 """ReidX: terminal-native agent-first CLI runtime."""
 
-__version__ = "2.0.3"
+__version__ = "2.0.5"

package/src/reidx/app/commands.py

@@ -207,7 +207,7 @@ def doctor() -> None:
     console.print(f"storage   {cfg.storage_root}")
     console.print(f"provider  {cfg.default_provider}")
     console.print(f"mode      {cfg.policy.default_mode.value}")
-    console.print(f"providers {orch.provider.name} (active), {orch.tools.definitions().__len__()} tools")
+    console.print(f"providers {orch.provider.name} (active), {len(orch.tools.definitions())} tools")
     import os
 
     has_key = bool(os.environ.get("ANTHROPIC_API_KEY", "").strip())

package/src/reidx/config/models.py

@@ -19,6 +19,7 @@ class ProviderConfig(BaseModel):
     base_url: str | None = None
     api_key: SecretStr | None = None
     default_model: str = ""
+    auth_method: str = "bearer"
 
 
 class PolicyConfig(BaseModel):

package/src/reidx/config/settings.py

@@ -10,13 +10,14 @@ ignored harmlessly.
 Path resolution (first hit wins):
   1. $REIDCHAT_SETTINGS                (explicit override)
   2. ./settings.json                   (project-local, when it exists)
-  3. E:/leech/Reidchat.json            (legacy default — the shared Reidchat file)
-
-Project-local wins over the shared Reidchat file so a project can bake in a
-different backend, permission mode, or provider set without editing the
-global file. The env block is authoritative for the process (overrides any
-ambient env) — this is how ReidX picks up the Reidchat proxy credentials
-even when the shell's ANTHROPIC_* vars point somewhere else.
+  3. ~/.reidx/settings.json            (global default)
+  4. ~/Reidchat.json                    (legacy fallback)
+
+Project-local wins over the global file so a project can bake in a different
+backend, permission mode, or provider set without editing the global file.
+The env block is authoritative for the process (overrides any ambient env)
+— this is how ReidX picks up proxy credentials even when the shell's
+ANTHROPIC_* vars point somewhere else.
 """
 from __future__ import annotations
 
@@ -29,9 +30,9 @@ from reidx.diagnostics.logger import get_logger
 
 log = get_logger("reidx.config.settings")
 
-LEGACY_SETTINGS_PATH = Path("E:/leech/Reidchat.json")
 GLOBAL_SETTINGS_PATH = app_data_dir() / "settings.json"
 PROJECT_SETTINGS_FILENAME = "settings.json"
+LEGACY_SETTINGS_PATH = Path.home() / "Reidchat.json"
 
 
 def _walk_upward_for_project_settings(start: Path) -> Path | None:
@@ -62,7 +63,7 @@ def settings_path() -> Path:
       1. $REIDCHAT_SETTINGS                    (explicit override)
       2. project settings.json (walk upward from CWD)
       3. ~/.reidx/settings.json              (global default)
-      4. E:/leech/Reidchat.json                (legacy shared file)
+      4. ~/Reidchat.json                      (legacy fallback)
 
     Returns the last fallback even if it doesn't exist, so `doctor` can
     report it as "missing" rather than crashing on a None.

package/src/reidx/provider/anthropic.py

@@ -11,13 +11,11 @@ Env vars consumed:
 """
 from __future__ import annotations
 
-import json
 import os
-import urllib.error
-import urllib.request
 from typing import Any
 
 from reidx.diagnostics.logger import get_logger
+from reidx.provider._http import get_json, post_json
 from reidx.provider.base import BaseProvider, Message, ProviderResponse, ToolCall, Usage
 
 log = get_logger("reidx.provider.anthropic")
@@ -25,7 +23,6 @@ log = get_logger("reidx.provider.anthropic")
 DEFAULT_BASE_URL = "https://api.anthropic.com"
 API_VERSION = "2023-06-01"
 MAX_TOKENS = 4096
-TIMEOUT_SECONDS = 120
 
 
 class AnthropicProvider(BaseProvider):
@@ -53,6 +50,12 @@ class AnthropicProvider(BaseProvider):
         model = os.environ.get("ANTHROPIC_MODEL", "").strip()
         return cls(api_key=key, base_url=base, default_model=model)
 
+    def _headers(self) -> dict[str, str]:
+        return {
+            "x-api-key": self.api_key,
+            "anthropic-version": API_VERSION,
+        }
+
     def _to_anthropic_messages(self, messages: list[Message]) -> tuple[str | None, list[dict]]:
         """Convert ReidX Messages to Anthropic format. Returns (system, messages)."""
         system: str | None = None
@@ -62,7 +65,6 @@ class AnthropicProvider(BaseProvider):
                 system = m.content
                 continue
             if m.role == "tool":
-                # Tool results -> Anthropic tool_result content block.
                 out.append({
                     "role": "user",
                     "content": [{
@@ -73,7 +75,6 @@ class AnthropicProvider(BaseProvider):
                 })
                 continue
             if m.role == "assistant" and m.tool_calls:
-                # Assistant turn with tool calls -> content blocks.
                 blocks: list[dict] = []
                 if m.content:
                     blocks.append({"type": "text", "text": m.content})
@@ -86,7 +87,6 @@ class AnthropicProvider(BaseProvider):
                     })
                 out.append({"role": "assistant", "content": blocks})
                 continue
-            # Plain user or assistant text.
             out.append({"role": m.role, "content": m.content})
         return system, out
 
@@ -150,27 +150,20 @@ class AnthropicProvider(BaseProvider):
         if anthropic_tools:
             payload["tools"] = anthropic_tools
 
-        body = json.dumps(payload).encode("utf-8")
         url = f"{self.base_url}/v1/messages"
-        req = urllib.request.Request(
-            url,
-            data=body,
-            headers={
-                "x-api-key": self.api_key,
-                "anthropic-version": API_VERSION,
-                "content-type": "application/json",
-            },
-            method="POST",
-        )
         try:
-            with urllib.request.urlopen(req, timeout=TIMEOUT_SECONDS) as resp:
-                raw = resp.read().decode("utf-8")
-        except urllib.error.HTTPError as exc:
-            err_body = exc.read().decode("utf-8", errors="replace")[:500]
-            log.error("Anthropic API error %s: %s", exc.code, err_body)
-            raise RuntimeError(f"Anthropic API error {exc.code}: {err_body}") from exc
-        except urllib.error.URLError as exc:
-            log.error("Anthropic connection error: %s", exc)
-            raise RuntimeError(f"connection error: {exc}") from exc
-
-        return self._parse_response(json.loads(raw), model)
+            body = post_json(url, payload, self._headers())
+        except RuntimeError:
+            log.exception("Anthropic API request failed")
+            raise
+        return self._parse_response(body, model)
+
+    def fetch_models(self) -> list[str]:
+        url = f"{self.base_url}/v1/models"
+        body = get_json(url, self._headers())
+        models: list[str] = []
+        for item in body.get("data", []):
+            mid = item.get("id", "")
+            if mid:
+                models.append(mid)
+        return sorted(models)

package/src/reidx/provider/ollama.py

@@ -109,11 +109,7 @@ class OllamaProvider(BaseProvider):
         )
 
     def fetch_models(self) -> list[str]:
-        try:
-            body = get_json(f"{self.base_url}/api/tags", {})
-        except RuntimeError:
-            log.debug("failed to fetch models from ollama")
-            return []
+        body = get_json(f"{self.base_url}/api/tags", {})
         models: list[str] = []
         for item in body.get("models", []):
             name = item.get("name", "")

package/src/reidx/provider/openai.py

@@ -127,11 +127,7 @@ class OpenAIProvider(BaseProvider):
 
     def fetch_models(self) -> list[str]:
         url = f"{self.base_url}/v1/models"
-        try:
-            body = get_json(url, self._headers())
-        except RuntimeError:
-            log.debug("failed to fetch models from %s", url)
-            return []
+        body = get_json(url, self._headers())
         models: list[str] = []
         for item in body.get("data", []):
             mid = item.get("id", "")
@@ -144,14 +140,37 @@ class OpenAICompatibleProvider(OpenAIProvider):
     """OpenAI-compatible endpoints (llama.cpp server, LM Studio, vLLM, etc.).
 
     Same wire format as OpenAI; only default base_url differs and the API key
-    is optional. Kept as a subclass so `/providers` can show the kind
-    separately in the list.
+    is optional. Auth method is configurable so providers that use x-api-key
+    instead of Bearer are handled correctly. Kept as a subclass so `/providers`
+    can show the kind separately in the list.
     """
 
     name = "openai-compatible"
     DEFAULT_BASE_URL = "http://localhost:8080"
     DEFAULT_MODEL = "local"
 
+    def __init__(
+        self,
+        api_key: str,
+        base_url: str = "",
+        default_model: str = "",
+        auth_method: str = "bearer",
+    ) -> None:
+        self.auth_method = auth_method
+        super().__init__(api_key=api_key, base_url=base_url, default_model=default_model)
+
+    def _headers(self) -> dict[str, str]:
+        h = {}
+        if not self.api_key:
+            return h
+        if self.auth_method == "x-api-key":
+            h["x-api-key"] = self.api_key
+        elif self.auth_method == "none":
+            pass
+        else:
+            h["authorization"] = f"Bearer {self.api_key}"
+        return h
+
 
 def _json_dump(obj) -> str:  # type: ignore[no-untyped-def]
     import json

package/src/reidx/provider/registry.py

@@ -79,6 +79,7 @@ def default_registry(config: Config) -> ProviderRegistry:
                 base_url=pc.base_url or "",
                 api_key=pc.api_key.get_secret_value() if pc.api_key else "",
                 default_model=pc.default_model,
+                auth_method=pc.auth_method,
             ))
         except (ValueError, TypeError):
             log.warning("provider '%s' (kind=%s) configured but could not be built; skipping", name, kind)

package/src/reidx/provider/store.py

@@ -39,6 +39,7 @@ class ProviderRecord:
     base_url: str = ""
     api_key: str = ""
     default_model: str = ""
+    auth_method: str = "bearer"
 
 
 def build_provider(record: ProviderRecord) -> BaseProvider:
@@ -60,6 +61,7 @@ def build_provider(record: ProviderRecord) -> BaseProvider:
             api_key=record.api_key,
             base_url=record.base_url,
             default_model=record.default_model,
+            auth_method=record.auth_method,
         )
     if kind == "ollama":
         return OllamaProvider(
@@ -130,12 +132,15 @@ def validate_provider(record: ProviderRecord) -> tuple[bool, str]:
         provider = build_provider(record)
     except (ValueError, TypeError) as exc:
         return False, str(exc)
-    if not record.api_key and record.kind != "ollama":
+    _keyless_kinds = ("ollama", "openai-compatible")
+    if not record.api_key and record.kind not in _keyless_kinds:
+        return False, "API key required for this provider kind"
+    if not record.api_key:
         return True, "no key required"
     try:
         models = provider.fetch_models()
-    except Exception:
-        return False, "could not connect to provider"
+    except Exception as exc:
+        return False, f"could not connect to provider: {exc}"
     if models:
         return True, f"ok ({len(models)} models available)"
     if record.kind == "ollama":
@@ -170,6 +175,7 @@ def load_from_database(registry: ProviderRegistry, storage_root: Path) -> list[s
             base_url=sp.base_url,
             api_key=api_key,
             default_model=sp.default_model,
+            auth_method=sp.auth_method,
         )
         try:
             provider = build_provider(record)

package/src/reidx/provider_manager/catalog.py

@@ -113,8 +113,8 @@ _BUILTIN: list[ProviderDefinition] = [
         default_model="auto", aliases=[], auth_method="none", icon="🚀",
     ),
     ProviderDefinition(
-        id="azure-openai", name="Azure OpenAI", description="OpenAI models via Azure cloud",
-        kind="openai", base_url="", default_model="gpt-4o-mini",
+        id="azure-openai", name="Azure OpenAI", description="OpenAI models via Azure cloud (set base URL to your endpoint)",
+        kind="openai", base_url="https://api.openai.com", default_model="gpt-4o-mini",
         aliases=["azure"], icon="☁️",
     ),
     ProviderDefinition(
@@ -178,8 +178,9 @@ _BUILTIN: list[ProviderDefinition] = [
         default_model="jamba-1.5-large", aliases=[], icon="🃏",
     ),
     ProviderDefinition(
-        id="databricks", name="Databricks", description="Serving endpoints for fine-tuned models",
-        kind="openai-compatible", base_url="", default_model="databricks-dbrx-instruct",
+        id="databricks", name="Databricks", description="Serving endpoints for fine-tuned models (set base URL to your workspace)",
+        kind="openai-compatible", base_url="https://dbc-xxxxxxxx.cloud.databricks.com/serving-endpoints",
+        default_model="databricks-dbrx-instruct",
         aliases=[], icon="🧱",
     ),
     ProviderDefinition(
@@ -205,7 +206,7 @@ _BUILTIN: list[ProviderDefinition] = [
     ProviderDefinition(
         id="lambda", name="Lambda Labs", description="GPU cloud for AI training and inference",
         kind="openai-compatible", base_url="https://api.lambdalabs.com/v1",
-        default_model="", aliases=["lambda-labs"], icon="λ",
+        default_model="meta-llama/Meta-Llama-3.1-70B-Instruct", aliases=["lambda-labs"], icon="λ",
     ),
     ProviderDefinition(
         id="kluster", name="Kluster AI", description="Distributed GPU network for inference",
@@ -234,7 +235,8 @@ _BUILTIN: list[ProviderDefinition] = [
     ),
     ProviderDefinition(
         id="cloudflare-ai", name="Cloudflare Workers AI", description="Serverless AI inference at the edge",
-        kind="openai-compatible", base_url="", default_model="@cf/meta/llama-3.1-70b-instruct",
+        kind="openai-compatible", base_url="https://api.cloudflare.com/client/v4",
+        default_model="@cf/meta/llama-3.1-70b-instruct",
         aliases=["cf-ai"], icon="orange",
     ),
     ProviderDefinition(
@@ -245,7 +247,7 @@ _BUILTIN: list[ProviderDefinition] = [
     ProviderDefinition(
         id="baseten", name="Baseten", description="Model deployment and serving platform",
         kind="openai-compatible", base_url="https://inference.baseten.co/v1",
-        default_model="", aliases=[], icon="🏗️",
+        default_model="meta-llama/Meta-Llama-3.1-70B-Instruct", aliases=[], icon="🏗️",
     ),
     ProviderDefinition(
         id="anyscale", name="Anyscale", description="Ray-based scalable model serving",
@@ -264,7 +266,8 @@ _BUILTIN: list[ProviderDefinition] = [
     ),
     ProviderDefinition(
         id="watsonx", name="IBM Watsonx", description="Enterprise AI platform with Granite models",
-        kind="openai-compatible", base_url="", default_model="ibm/granite-3-8b-instruct",
+        kind="openai-compatible", base_url="https://us-south.ml.cloud.ibm.com",
+        default_model="ibm/granite-3-8b-instruct",
         aliases=["ibm"], icon="🔷",
     ),
     ProviderDefinition(

package/src/reidx/provider_manager/keychain.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
 
 import base64
+import getpass
+import hashlib
 import os
+import socket
 import sys
 from pathlib import Path
 
@@ -70,6 +73,21 @@ if _IS_WINDOWS:
             ctypes.windll.kernel32.LocalFree(blob_out.pbData)
 
 
+def _machine_key() -> bytes:
+    parts = [
+        getpass.getuser(),
+        socket.gethostname(),
+        str(Path.home()),
+        sys.platform,
+    ]
+    raw = "|".join(parts).encode("utf-8")
+    return hashlib.pbkdf2_hmac("sha256", raw, b"reidx-keychain-v1", 100000, dklen=32)
+
+
+def _xor_cipher(data: bytes, key: bytes) -> bytes:
+    return bytes(data[i] ^ key[i % len(key)] for i in range(len(data)))
+
+
 def encrypt(plaintext: str) -> str:
     if not plaintext:
         return ""
@@ -77,8 +95,7 @@ def encrypt(plaintext: str) -> str:
     if _IS_WINDOWS:
         encrypted = _dpapi_encrypt(raw)
     else:
-        log.warning("DPAPI not available on this platform; storing key without OS encryption")
-        encrypted = raw
+        encrypted = _xor_cipher(raw, _machine_key())
     return base64.b64encode(encrypted).decode("ascii")
 
 
@@ -89,7 +106,7 @@ def decrypt(ciphertext: str) -> str:
     if _IS_WINDOWS:
         decrypted = _dpapi_decrypt(raw)
     else:
-        decrypted = raw
+        decrypted = _xor_cipher(raw, _machine_key())
     return decrypted.decode("utf-8")
 
 

package/src/reidx/provider_manager/palette.py

@@ -606,6 +606,7 @@ class ProviderPalette:
             record = ProviderRecord(
                 name=name, kind=kind, base_url=base_url,
                 api_key=api_key, default_model=model,
+                auth_method=auth,
             )
             ok, msg = validate_provider(record)
             if not ok:
@@ -628,13 +629,12 @@ class ProviderPalette:
             existing.default_model = model
             existing.auth_method = auth
             if api_key:
+                from reidx.provider_manager import keychain
                 existing.keys.append(StoredKey(
                     id=uuid.uuid4().hex[:12],
                     label="Default",
-                    encrypted_key="",
+                    encrypted_key=keychain.encrypt(api_key),
                 ))
-                from reidx.provider_manager import keychain
-                existing.keys[-1].encrypted_key = keychain.encrypt(api_key)
                 if existing.active_key_id is None:
                     existing.active_key_id = existing.keys[-1].id
             self.db.save_provider(existing)
@@ -670,6 +670,7 @@ class ProviderPalette:
         record = ProviderRecord(
             name=name, kind=sp.kind, base_url=sp.base_url,
             api_key=api_key, default_model=sp.default_model,
+            auth_method=sp.auth_method,
         )
         ok, msg = validate_provider(record)
         if not ok:
@@ -708,6 +709,7 @@ class ProviderPalette:
             record = ProviderRecord(
                 name=sp.name, kind=sp.kind, base_url=sp.base_url,
                 api_key=api_key, default_model=sp.default_model,
+                auth_method=sp.auth_method,
             )
             provider = build_provider(record)
             if not sp.default_model:

package/src/reidx/ui/commands.py

@@ -502,13 +502,14 @@ def _save_to_database(orchestrator: Orchestrator, record: ProviderRecord) -> Non
                 existing.active_key_id = k.id
         existing.kind = record.kind
         existing.base_url = record.base_url
+        existing.auth_method = record.auth_method
         if record.default_model:
             existing.default_model = record.default_model
         db.save_provider(existing)
     else:
         sp = StoredProvider(
             name=record.name, kind=record.kind, base_url=record.base_url,
-            default_model=record.default_model,
+            default_model=record.default_model, auth_method=record.auth_method,
         )
         if record.api_key:
             k = StoredKey(