proxyagent 0.5.0__tar.gz → 0.6.0__tar.gz

{proxyagent-0.5.0 → proxyagent-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxyagent
-Version: 0.5.0
+Version: 0.6.0
 Summary: Run any agent (Claude, Codex, custom) on any machine — with no API key on the machine. A secure, self-hosted proxy for models and tools.
 Project-URL: Homepage, https://github.com/teddyoweh/proxyagent
 Author-email: Spawn Labs <teddy@spawnlabs.ai>
@@ -183,6 +183,18 @@ Bedrock / Vertex / OAuth-refresh (the cloud-credential paths enterprises actuall
 being built out — the proxy holds the AWS/GCP creds and signs upstream, so the machine needs
 none. The model providers below are the *backends* for model-agnostic harnesses (aider, Cline…).
 
+## Credential pools & failover
+A provider isn't one key — it's a **pool**. Add as many credentials as you want, across
+auth types (several API keys, OAuth tokens, …); each is managed individually in the
+dashboard. The proxy rotates through the pool, **failing over** to the next credential on
+any `429` / `5xx` — so a rate-limited or dead key never takes you down.
+
+```bash
+proxyagent provider add anthropic --key sk-ant-aaa        # additive — builds the pool
+proxyagent provider add anthropic --key sk-ant-bbb
+proxyagent provider add anthropic --key <oauth> --kind oauth
+```
+
 ## Per-token budgets
 Cap what any token can spend; once its summed cost crosses the cap, the proxy returns **402**.
 ```bash

{proxyagent-0.5.0 → proxyagent-0.6.0}/README.md

@@ -151,6 +151,18 @@ Bedrock / Vertex / OAuth-refresh (the cloud-credential paths enterprises actuall
 being built out — the proxy holds the AWS/GCP creds and signs upstream, so the machine needs
 none. The model providers below are the *backends* for model-agnostic harnesses (aider, Cline…).
 
+## Credential pools & failover
+A provider isn't one key — it's a **pool**. Add as many credentials as you want, across
+auth types (several API keys, OAuth tokens, …); each is managed individually in the
+dashboard. The proxy rotates through the pool, **failing over** to the next credential on
+any `429` / `5xx` — so a rate-limited or dead key never takes you down.
+
+```bash
+proxyagent provider add anthropic --key sk-ant-aaa        # additive — builds the pool
+proxyagent provider add anthropic --key sk-ant-bbb
+proxyagent provider add anthropic --key <oauth> --kind oauth
+```
+
 ## Per-token budgets
 Cap what any token can spend; once its summed cost crosses the cap, the proxy returns **402**.
 ```bash

{proxyagent-0.5.0 → proxyagent-0.6.0}/proxyagent/__init__.py

@@ -16,7 +16,7 @@ from typing import Optional
 
 from .harness import run  # noqa: F401  (the headline SDK call)
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"
 __all__ = ["run", "serve", "create_app", "Config", "Admin", "__version__"]
 
 

{proxyagent-0.5.0 → proxyagent-0.6.0}/proxyagent/providers.py

@@ -16,19 +16,35 @@ from . import pricing
 from .config import Config, PROVIDERS
 from .store import Store, now_ms
 
+FAILOVER_STATUS = {429, 500, 502, 503, 504, 529}
+
+
+def _headers_for(provider, secret: str, kind: str) -> dict:
+    if kind != "api_key":  # oauth / bearer
+        return {"Authorization": f"Bearer {secret}", **provider.extra_headers}
+    if provider.auth_style == "x-api-key":
+        return {"x-api-key": secret, **provider.extra_headers}
+    return {"Authorization": f"Bearer {secret}", **provider.extra_headers}
+
+
+def resolve_candidates(provider, store: Store | None) -> list[dict]:
+    """Every usable auth header-set for a provider, in rotation order: the stored pool
+    (api_key then oauth creds), then the env key as a last resort. The forwarder tries
+    them in turn, rotating past any that 429/5xx — that's the failover."""
+    out: list[dict] = []
+    if store:
+        for c in store.get_credentials(provider.name, kind="api_key"):
+            out.append(_headers_for(provider, c["secret"], "api_key"))
+        for c in store.get_credentials(provider.name, kind="oauth"):
+            out.append(_headers_for(provider, c["secret"], "oauth"))
+    if provider.key:
+        out.append(provider.auth_headers())
+    return out
+
+
 def resolve_auth(provider, store: Store | None) -> tuple[dict, bool]:
-    """Auth headers for an upstream call. A stored credential (proxy_agent_keys) wins
-    over the env key; returns ({}, False) when nothing is configured."""
-    cred = store.get_credential(provider.name) if store else None
-    if cred:
-        secret, kind = cred["secret"], cred["kind"]
-        if kind == "oauth":
-            return {"Authorization": f"Bearer {secret}", **provider.extra_headers}, True
-        if provider.auth_style == "x-api-key":
-            return {"x-api-key": secret, **provider.extra_headers}, True
-        return {"Authorization": f"Bearer {secret}", **provider.extra_headers}, True
-    headers = provider.auth_headers()
-    return headers, bool(headers)
+    cands = resolve_candidates(provider, store)
+    return (cands[0], True) if cands else ({}, False)
 
 
 def scope_allows(scope: list[str], provider: str, model: str) -> bool:
@@ -70,15 +86,14 @@ async def forward(
             return 200, {"content-type": "text/event-stream"}, _mock_stream(provider.shape, payload), None
         return 200, {"content-type": "application/json"}, payload, None
 
-    auth, ok = resolve_auth(provider, store)
-    if not ok:
+    candidates = resolve_candidates(provider, store)
+    if not candidates:
         return 502, {}, {"error": f"provider '{provider_name}' not configured on the proxy "
                                   f"(set {provider.key_env} or `proxyagent provider add {provider_name}`)"}, None
 
     url = provider.endpoint
-    headers = {"content-type": "application/json", **auth}
 
-    def _log(status, ptok, ctok, err=None):
+    def _log(status, ptok, ctok, err=None, attempt=0):
         store.log_request(
             token_id=token["id"], token_label=token.get("label"), provider=provider_name,
             model=model, status=status, prompt_tokens=ptok, completion_tokens=ctok,
@@ -93,36 +108,49 @@ async def forward(
             status = 200
             try:
                 async with httpx.AsyncClient(timeout=config.request_timeout) as client:
-                    async with client.stream("POST", url, headers=headers, json=body) as resp:
-                        status = resp.status_code
-                        async for chunk in resp.aiter_raw():
-                            # Best-effort usage capture from the final SSE event.
-                            text = chunk.decode("utf-8", "ignore")
-                            if '"output_tokens"' in text or '"completion_tokens"' in text:
-                                try:
-                                    for line in text.splitlines():
-                                        if line.startswith("data:"):
-                                            d = json.loads(line[5:].strip())
-                                            usage = d.get("usage") or (d.get("message") or {}).get("usage") or {}
-                                            ptok = usage.get("input_tokens") or usage.get("prompt_tokens") or ptok
-                                            ctok = usage.get("output_tokens") or usage.get("completion_tokens") or ctok
-                                except Exception:
-                                    pass
-                            yield chunk
+                    for i, auth in enumerate(candidates):
+                        async with client.stream(
+                            "POST", url, headers={"content-type": "application/json", **auth}, json=body
+                        ) as resp:
+                            status = resp.status_code
+                            if status in FAILOVER_STATUS and i < len(candidates) - 1:
+                                await resp.aread()  # drain + rotate to the next credential
+                                continue
+                            async for chunk in resp.aiter_raw():
+                                text = chunk.decode("utf-8", "ignore")
+                                if '"output_tokens"' in text or '"completion_tokens"' in text:
+                                    try:
+                                        for line in text.splitlines():
+                                            if line.startswith("data:"):
+                                                d = json.loads(line[5:].strip())
+                                                usage = d.get("usage") or (d.get("message") or {}).get("usage") or {}
+                                                ptok = usage.get("input_tokens") or usage.get("prompt_tokens") or ptok
+                                                ctok = usage.get("output_tokens") or usage.get("completion_tokens") or ctok
+                                    except Exception:
+                                        pass
+                                yield chunk
+                            break
             finally:
                 _log(status, ptok, ctok)
         return 200, {"content-type": "text/event-stream"}, _gen(), None
 
-    # Non-streaming.
+    # Non-streaming, with credential failover.
+    last_status, last_payload = 502, {"error": "all credentials failed"}
     async with httpx.AsyncClient(timeout=config.request_timeout) as client:
-        resp = await client.post(url, headers=headers, json=body)
-    try:
-        payload = resp.json()
-    except Exception:
-        payload = {"error": resp.text}
-    ptok, ctok = _extract_usage(provider.shape, payload if isinstance(payload, dict) else {})
-    _log(resp.status_code, ptok, ctok, None if resp.is_success else str(payload)[:300])
-    return resp.status_code, {"content-type": "application/json"}, payload, None
+        for i, auth in enumerate(candidates):
+            resp = await client.post(url, headers={"content-type": "application/json", **auth}, json=body)
+            if resp.status_code in FAILOVER_STATUS and i < len(candidates) - 1:
+                last_status = resp.status_code
+                continue
+            try:
+                payload = resp.json()
+            except Exception:
+                payload = {"error": resp.text}
+            ptok, ctok = _extract_usage(provider.shape, payload if isinstance(payload, dict) else {})
+            _log(resp.status_code, ptok, ctok, None if resp.is_success else str(payload)[:300])
+            return resp.status_code, {"content-type": "application/json"}, payload, None
+    _log(last_status, None, None, "all credentials failed")
+    return last_status, {"content-type": "application/json"}, last_payload, None
 
 
 # ------------------------------------------------------------------ #

{proxyagent-0.5.0 → proxyagent-0.6.0}/proxyagent/server.py

@@ -247,18 +247,21 @@ def create_app(config: Config | None = None) -> FastAPI:
     async def catalog(authorization: str | None = Header(None),
                       x_admin_token: str | None = Header(None)):
         require_admin(authorization, x_admin_token)
-        stored = {c["provider"]: c for c in store.list_credentials() if c["active"]}
+        pool: dict[str, list] = {}
+        for c in store.list_credentials():
+            if c["active"]:
+                pool.setdefault(c["provider"], []).append(c)
         out = []
         for name, prov in PROVIDERS.items():
             meta = CATALOG.get(name, {})
-            cred = stored.get(name)
+            creds = pool.get(name, [])
             out.append({
                 "name": name, "label": meta.get("label", name.title()),
                 "kinds": meta.get("kinds", ["api_key"]), "color": meta.get("color", "#888"),
                 "models": meta.get("models", []), "shape": prov.shape,
-                "via_env": bool(prov.key), "via_store": bool(cred),
-                "cred_id": cred["id"] if cred else None,
-                "cred_kind": cred["kind"] if cred else None,
+                "via_env": bool(prov.key), "via_store": bool(creds),
+                "creds": [{"id": c["id"], "kind": c["kind"], "masked": c.get("masked"),
+                           "label": c.get("label")} for c in creds],
                 "endpoint": prov.endpoint,
             })
         return {"providers": out, "encryption": crypto.encryption_available()}

{proxyagent-0.5.0 → proxyagent-0.6.0}/proxyagent/store.py

@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS proxy_agent_tokens (
 CREATE TABLE IF NOT EXISTS proxy_agent_keys (
     id TEXT PRIMARY KEY, provider TEXT NOT NULL, kind TEXT NOT NULL DEFAULT 'api_key',
     secret TEXT NOT NULL, refresh TEXT, expires_ms BIGINT, label TEXT,
-    created_ms BIGINT, meta_json TEXT, active INTEGER NOT NULL DEFAULT 1
+    created_ms BIGINT, meta_json TEXT, active INTEGER NOT NULL DEFAULT 1, masked TEXT
 );
 CREATE TABLE IF NOT EXISTS proxy_agent_calls (
     id TEXT PRIMARY KEY, ts_ms BIGINT, token_id TEXT, token_label TEXT,
@@ -48,10 +48,12 @@ class Store:
         self.db.executescript(_SCHEMA)
         self.backend = "postgres" if self.db.pg else "sqlite"
         # migrate older DBs created before budget_usd existed
-        try:
-            self.db.execute("ALTER TABLE proxy_agent_tokens ADD COLUMN budget_usd DOUBLE PRECISION")
-        except Exception:
-            pass
+        for stmt in ("ALTER TABLE proxy_agent_tokens ADD COLUMN budget_usd DOUBLE PRECISION",
+                     "ALTER TABLE proxy_agent_keys ADD COLUMN masked TEXT"):
+            try:
+                self.db.execute(stmt)
+            except Exception:
+                pass
 
     # -- machine tokens ---------------------------------------------------- #
 
@@ -98,40 +100,55 @@ class Store:
     # -- provider credentials (proxy_agent_keys) --------------------------- #
 
     def add_credential(self, provider, secret, *, kind="api_key", refresh=None,
-                       expires_ms=None, label=None, meta=None, replace=True):
+                       expires_ms=None, label=None, meta=None, replace=False):
+        """Add a credential to a provider's POOL. A provider can hold many credentials
+        across auth types (several api_keys, oauth tokens, bedrock, vertex…). replace=True
+        swaps out other creds of the SAME kind; default keeps them (for failover/rotation)."""
         cid = "key_" + uuid.uuid4().hex[:12]
-        # replace=True (default, the UI "connect"): swap the key. replace=False adds an
-        # ADDITIONAL active key to the provider's pool for failover/rotation.
         if replace:
-            self.db.execute("UPDATE proxy_agent_keys SET active=0 WHERE provider=?", (provider,))
+            self.db.execute("UPDATE proxy_agent_keys SET active=0 WHERE provider=? AND kind=?",
+                            (provider, kind))
         self.db.execute(
             """INSERT INTO proxy_agent_keys
-               (id, provider, kind, secret, refresh, expires_ms, label, created_ms, meta_json, active)
-               VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1)""",
+               (id, provider, kind, secret, refresh, expires_ms, label, created_ms, meta_json, active, masked)
+               VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?)""",
             (cid, provider, kind, crypto.encrypt(secret),
              crypto.encrypt(refresh) if refresh else None, expires_ms, label, now_ms(),
-             json.dumps(meta or {})),
+             json.dumps(meta or {}), mask(secret)),
         )
         return cid
 
-    def get_credential(self, provider):
-        """Active credential for a provider, decrypted. None → fall back to env."""
-        r = self.db.fetchone(
-            "SELECT * FROM proxy_agent_keys WHERE provider=? AND active=1 ORDER BY created_ms DESC",
-            (provider,))
-        if not r:
-            return None
+    def _decrypt_row(self, r):
         r = dict(r)
         r["secret"] = crypto.decrypt(r["secret"])
         if r.get("refresh"):
             r["refresh"] = crypto.decrypt(r["refresh"])
+        if r.get("meta_json"):
+            try:
+                r["meta"] = json.loads(r["meta_json"])
+            except Exception:
+                r["meta"] = {}
         return r
 
+    def get_credential(self, provider, kind=None):
+        """Most-recent active credential (optionally of a kind), decrypted."""
+        creds = self.get_credentials(provider, kind=kind)
+        return creds[-1] if creds else None
+
+    def get_credentials(self, provider, kind=None):
+        """The provider's whole active pool, decrypted, oldest→newest (rotation order)."""
+        q = "SELECT * FROM proxy_agent_keys WHERE provider=? AND active=1"
+        args = [provider]
+        if kind:
+            q += " AND kind=?"
+            args.append(kind)
+        return [self._decrypt_row(r) for r in self.db.fetchall(q + " ORDER BY created_ms", tuple(args))]
+
     def list_credentials(self):
         rows = self.db.fetchall("SELECT * FROM proxy_agent_keys ORDER BY created_ms DESC")
         # never return the secret material
         return [{"id": r["id"], "provider": r["provider"], "kind": r["kind"],
-                 "label": r["label"], "active": bool(r["active"]),
+                 "label": r["label"], "active": bool(r["active"]), "masked": r.get("masked"),
                  "created_ms": r["created_ms"]} for r in rows]
 
     def remove_credential(self, cid):

{proxyagent-0.5.0 → proxyagent-0.6.0}/proxyagent/ui/index.html

@@ -5,44 +5,47 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>proxyagent</title>
 <style>
-  :root{--bg:#0a0b0d;--panel:#141619;--panel2:#1a1d21;--line:#23262c;--txt:#eceef1;--dim:#878d96;--grn:#34d39e;--red:#f87171;--yel:#fbbf24;--blu:#6ea8fe}
-  *{box-sizing:border-box}html,body{margin:0;background:var(--bg);color:var(--txt);font:14px/1.55 ui-sans-serif,system-ui,-apple-system,"Segoe UI",Roboto}
+  :root{--bg:#08090b;--panel:#16181d;--panel2:#1e2127;--soft:#22262e;--txt:#eef0f3;--dim:#888e98;--grn:#34d39e;--red:#f6788a}
+  *{box-sizing:border-box}html,body{margin:0;background:var(--bg);color:var(--txt);font:14px/1.55 ui-sans-serif,system-ui,-apple-system,"Segoe UI",Roboto;-webkit-font-smoothing:antialiased}
   code,.mono{font-family:ui-monospace,SFMono-Regular,Menlo,monospace}
   a{color:var(--grn);text-decoration:none}
-  header{position:sticky;top:0;z-index:10;display:flex;align-items:center;justify-content:space-between;padding:14px 26px;border-bottom:1px solid var(--line);background:rgba(10,11,13,.8);backdrop-filter:blur(12px)}
+  header{position:sticky;top:0;z-index:10;display:flex;align-items:center;justify-content:space-between;padding:16px 28px;background:rgba(8,9,11,.72);backdrop-filter:blur(14px)}
   .brand{display:flex;align-items:center;gap:10px;font-weight:650;font-size:16px}
-  .logo{width:26px;height:26px;border-radius:7px;background:linear-gradient(135deg,#34d39e,#2563eb);display:grid;place-items:center;color:#04130d;font-weight:800}
-  main{max-width:1120px;margin:0 auto;padding:26px}
-  .stats{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:14px;margin-bottom:24px}
-  .card{background:var(--panel);border:1px solid var(--line);border-radius:14px;padding:18px}
-  .stat .n{font-size:30px;font-weight:680;letter-spacing:-.02em}.stat .l{color:var(--dim);font-size:11px;text-transform:uppercase;letter-spacing:.09em;margin-top:5px}
-  .tabs{display:flex;gap:4px;margin-bottom:18px;border-bottom:1px solid var(--line)}
-  .tab{padding:9px 15px;color:var(--dim);cursor:pointer;border-bottom:2px solid transparent;font-weight:550}
-  .tab.on{color:var(--txt);border-bottom-color:var(--grn)}
-  .grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(248px,1fr));gap:14px}
-  .prov{background:var(--panel);border:1px solid var(--line);border-radius:16px;padding:16px;transition:border-color .15s}
-  .prov:hover{border-color:#33383f}
-  .prov .top{display:flex;align-items:center;gap:12px}
-  .tile{width:40px;height:40px;border-radius:11px;display:grid;place-items:center;flex:none;font-weight:800;font-size:17px}
-  .prov h3{margin:0;font-size:15px;font-weight:620}.prov .ep{color:var(--dim);font-size:11px;margin-top:1px}
-  .badges{display:flex;gap:6px;flex-wrap:wrap;margin:12px 0}
-  .badge{font-size:10.5px;padding:2px 8px;border-radius:99px;background:#1f2329;color:var(--dim);text-transform:uppercase;letter-spacing:.04em}
-  .badge.on{background:rgba(52,211,158,.13);color:var(--grn)}
-  .models{color:var(--dim);font-size:11.5px;margin:6px 0 12px;min-height:16px}
-  input,button,select{font:inherit;border-radius:9px;border:1px solid var(--line);background:#0e1013;color:var(--txt);padding:8px 11px;outline:none}
-  input:focus,select:focus{border-color:#3a4048}
-  button{background:var(--grn);color:#04130d;border:none;font-weight:640;cursor:pointer}button:hover{filter:brightness(1.07)}
-  button.ghost{background:transparent;color:var(--dim);border:1px solid var(--line)}button.ghost:hover{color:var(--txt)}
-  button.danger{background:transparent;color:var(--red);border:1px solid #3a2626}
-  button.sm{padding:6px 11px;font-size:12.5px;border-radius:8px}
+  .logo{width:27px;height:27px;border-radius:8px;background:linear-gradient(135deg,#34d39e,#3b82f6);display:grid;place-items:center;color:#04130d;font-weight:800}
+  main{max-width:1140px;margin:0 auto;padding:8px 28px 60px}
+  .stats{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:14px;margin-bottom:26px}
+  .card{background:var(--panel);border-radius:18px;padding:20px}
+  .stat .n{font-size:31px;font-weight:700;letter-spacing:-.02em}.stat .l{color:var(--dim);font-size:11px;text-transform:uppercase;letter-spacing:.09em;margin-top:6px}
+  .tabs{display:flex;gap:6px;margin-bottom:20px}
+  .tab{padding:8px 15px;color:var(--dim);cursor:pointer;font-weight:560;border-radius:10px}
+  .tab:hover{color:var(--txt);background:var(--panel)}
+  .tab.on{color:var(--txt);background:var(--panel)}
+  .grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(258px,1fr));gap:16px}
+  .prov{background:var(--panel);border-radius:18px;padding:18px;transition:background .15s,transform .15s}
+  .prov:hover{background:#1a1d23}
+  .prov .top{display:flex;align-items:center;gap:13px}
+  .tile{width:42px;height:42px;border-radius:12px;display:grid;place-items:center;flex:none;font-weight:800;font-size:18px;overflow:hidden}
+  .tile img{width:23px;height:23px;display:block}.tile .fbm{display:none}.tile.fb img{display:none}.tile.fb .fbm{display:flex;align-items:center;justify-content:center}
+  .prov h3{margin:0;font-size:15px;font-weight:640}.prov .ep{color:var(--dim);font-size:11.5px;margin-top:1px}
+  .badges{display:flex;gap:6px;flex-wrap:wrap;margin:13px 0}
+  .badge{font-size:10.5px;padding:3px 9px;border-radius:8px;background:var(--soft);color:var(--dim);text-transform:uppercase;letter-spacing:.04em}
+  .badge.on{background:rgba(52,211,158,.14);color:var(--grn)}
+  .models{color:var(--dim);font-size:11.5px;margin:8px 0 13px;min-height:16px}
+  input,select{font:inherit;border-radius:11px;border:none;background:var(--panel2);color:var(--txt);padding:9px 12px;outline:none;box-shadow:inset 0 0 0 1px transparent}
+  input:focus,select:focus{box-shadow:inset 0 0 0 1px rgba(52,211,158,.45)}
+  input::placeholder{color:#5a606b}
+  button{font:inherit;background:var(--grn);color:#04130d;border:none;border-radius:11px;padding:9px 14px;font-weight:660;cursor:pointer}button:hover{filter:brightness(1.07)}
+  button.ghost{background:var(--soft);color:var(--dim)}button.ghost:hover{color:var(--txt)}
+  button.danger{background:rgba(246,120,138,.12);color:var(--red)}button.danger:hover{background:rgba(246,120,138,.2)}
+  button.sm{padding:7px 12px;font-size:12.5px;border-radius:9px}
   .row{display:flex;gap:9px;flex-wrap:wrap;align-items:center}
-  .connect{margin-top:4px;display:none;gap:8px;flex-direction:column}
-  .connect.open{display:flex}
-  table{width:100%;border-collapse:collapse}th,td{text-align:left;padding:10px;border-bottom:1px solid var(--line);font-size:13px}
-  th{color:var(--dim);font-weight:520;font-size:11px;text-transform:uppercase;letter-spacing:.06em}
-  .pill{padding:2px 9px;border-radius:99px;font-size:11px}.pill.ok{background:rgba(52,211,158,.12);color:var(--grn)}.pill.no{background:rgba(248,113,113,.12);color:var(--red)}
-  .gate{max-width:430px;margin:96px auto;text-align:center}.gate input{width:100%;margin:14px 0}
-  .tok{background:#0e1013;border:1px dashed var(--grn);padding:12px;border-radius:10px;word-break:break-all;margin-top:12px;font-size:13px}
+  .connect{margin-top:4px;display:none;gap:9px;flex-direction:column}.connect.open{display:flex}
+  table{width:100%;border-collapse:collapse}td,th{text-align:left;padding:11px 12px;font-size:13px}
+  thead th{color:var(--dim);font-weight:520;font-size:11px;text-transform:uppercase;letter-spacing:.06em}
+  tbody tr{transition:background .12s}tbody tr:hover{background:#1a1d23}
+  .pill{padding:3px 10px;border-radius:8px;font-size:11px}.pill.ok{background:rgba(52,211,158,.13);color:var(--grn)}.pill.no{background:rgba(246,120,138,.13);color:var(--red)}
+  .gate{max-width:430px;margin:100px auto;text-align:center}.gate input{width:100%;margin:14px 0}
+  .tok{background:var(--panel2);padding:13px;border-radius:12px;word-break:break-all;margin-top:13px;font-size:13px}
   .hide{display:none}.muted{color:var(--dim)}.h{display:flex;justify-content:space-between;align-items:center;margin:0 0 12px}
   h2{font-size:13px;text-transform:uppercase;letter-spacing:.08em;color:var(--dim);margin:0}
 </style>
@@ -143,8 +146,16 @@ const MARK={
   xai:'<path d="M4 4h3.2l4 5.6L15.8 4H19l-6 8 6.2 8h-3.2l-4.4-6L7 20H4l6.4-8.4L4 4Z"/>',
   together:'<path d="M8 5a3.5 3.5 0 1 1 0 7 3.5 3.5 0 0 1 0-7Zm8 7a3.5 3.5 0 1 1 0 7 3.5 3.5 0 0 1 0-7ZM10.5 12.5l3-1.5" fill="none" stroke="currentColor" stroke-width="2"/>',
 };
-function logo(name,color){const m=MARK[name]||`<text x="12" y="16" text-anchor="middle" font-size="13" font-weight="800" fill="currentColor">${(name[0]||"?").toUpperCase()}</text>`;
-  return `<div class="tile" style="background:${hexa(color,.16)};color:${color}"><svg viewBox="0 0 24 24" width="22" height="22" fill="currentColor">${m}</svg></div>`}
+// real brand logos via the Simple Icons CDN, tinted to the brand colour; falls back to
+// the drawn mark / letter if a slug is missing or the CDN is unreachable (offline).
+const SLUG={anthropic:"anthropic",openai:"openai",gemini:"googlegemini",groq:"groq",mistral:"mistralai",deepseek:"deepseek",xai:"x"};
+function logo(name,color){
+  const mark=MARK[name]?`<svg viewBox="0 0 24 24" width="22" height="22" fill="currentColor">${MARK[name]}</svg>`:`<b>${(name[0]||"?").toUpperCase()}</b>`;
+  const inner=SLUG[name]
+    ?`<img src="https://cdn.simpleicons.org/${SLUG[name]}/${color.replace("#","")}" alt="${name}" onerror="this.closest('.tile').classList.add('fb')"/><span class="fbm">${mark}</span>`
+    :`<span class="fbm" style="display:flex">${mark}</span>`;
+  return `<div class="tile" style="background:${hexa(color,.14)};color:${color}">${inner}</div>`;
+}
 function hexa(h,a){const n=h.replace("#","");const x=parseInt(n.length===3?n.split("").map(c=>c+c).join(""):n,16);return `rgba(${(x>>16)&255},${(x>>8)&255},${x&255},${a})`}
 
 async function boot(){
@@ -181,20 +192,19 @@ async function connectHarness(name,provider){const key=document.getElementById("
 async function refreshProviders(){
   const d=await(await api("/admin/catalog")).json();const g=document.getElementById("provgrid");
   let connected=0;
-  g.innerHTML=d.providers.map(p=>{const on=p.via_env||p.via_store;if(on)connected++;
-    const how=p.via_store?`stored ${p.cred_kind}`:(p.via_env?"env":"");
+  g.innerHTML=d.providers.map(p=>{const creds=p.creds||[];const on=p.via_env||creds.length;if(on)connected++;
+    const credrows=creds.map(c=>`<div class="row" style="justify-content:space-between;gap:6px"><span class="badge on">${c.kind} · ${c.masked||""}</span><button class="danger sm" onclick="disconnect('${c.id}')">remove</button></div>`).join("");
     return `<div class="prov"><div class="top">${logo(p.name,p.color)}<div style="flex:1"><h3>${p.label}</h3><div class="ep">${p.shape} · ${p.name}</div></div>
       ${on?'<span class="pill ok">on</span>':'<span class="pill no">off</span>'}</div>
-      <div class="badges">${p.kinds.map(k=>`<span class="badge">${k}</span>`).join("")}${on?`<span class="badge on">${how}</span>`:""}</div>
-      <div class="models">${(p.models||[]).slice(0,2).join(" · ")}</div>
-      <div class="row">${p.via_store?`<button class="danger sm" onclick="disconnect('${p.cred_id}')">Disconnect</button>`:`<button class="sm" onclick="openConnect('${p.name}')">${p.via_env?"Override key":"Connect"}</button>`}</div>
+      <div class="badges">${p.kinds.map(k=>`<span class="badge">${k}</span>`).join("")}${p.via_env?'<span class="badge on">env</span>':''}</div>
+      <div style="display:flex;flex-direction:column;gap:6px;margin:6px 0 11px">${credrows||'<span class="muted" style="font-size:11.5px">No keys yet</span>'}</div>
+      <div class="row"><button class="sm" onclick="openConnect('${p.name}')">+ Add credential</button></div>
       <div class="connect" id="c_${p.name}">
-        <input id="k_${p.name}" type="password" placeholder="${p.name} API key${p.kinds.includes('oauth')?' / OAuth token':''}"/>
-        <div class="row">${p.kinds.length>1?`<select id="kind_${p.name}">${p.kinds.map(k=>`<option value="${k}">${k}</option>`).join("")}</select>`:`<input id="kind_${p.name}" type="hidden" value="api_key"/>`}
-          <button class="sm" onclick="connect('${p.name}')">Save</button><button class="ghost sm" onclick="openConnect('${p.name}')">Cancel</button></div>
+        ${p.kinds.length>1?`<select id="kind_${p.name}">${p.kinds.map(k=>`<option value="${k}">${k}</option>`).join("")}</select>`:`<input id="kind_${p.name}" type="hidden" value="api_key"/>`}
+        <input id="k_${p.name}" type="password" placeholder="${p.name} key / token"/>
+        <div class="row"><button class="sm" onclick="connect('${p.name}')">Add</button><button class="ghost sm" onclick="openConnect('${p.name}')">Cancel</button></div>
       </div></div>`}).join("");
   document.getElementById("s_prov").textContent=connected;
-  document.getElementById("enc2")&&0;
 }
 function openConnect(n){document.getElementById("c_"+n).classList.toggle("open")}
 async function connect(n){const key=document.getElementById("k_"+n).value.trim();if(!key)return;

{proxyagent-0.5.0 → proxyagent-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "proxyagent"
-version = "0.5.0"
+version = "0.6.0"
 description = "Run any agent (Claude, Codex, custom) on any machine — with no API key on the machine. A secure, self-hosted proxy for models and tools."
 readme = "README.md"
 requires-python = ">=3.10"

{proxyagent-0.5.0 → proxyagent-0.6.0}/tests/test_proxy.py

@@ -188,3 +188,17 @@ def test_harness_catalog():
     cc = next(x for x in h if x["name"] == "claude-code")
     assert {a["mode"] for a in cc["auth"]} == {"api_key", "oauth", "bedrock", "vertex"}
     assert any(a["mode"] == "api_key" and a["ready"] for a in cc["auth"])
+
+
+def test_credential_pool_and_failover_order():
+    from proxyagent.providers import resolve_candidates
+    s = Store(":memory:")
+    s.add_credential("openai", "sk-1", kind="api_key")     # additive by default →
+    s.add_credential("openai", "sk-2", kind="api_key")     # a pool of two keys
+    creds = s.get_credentials("openai", kind="api_key")
+    assert [c["secret"] for c in creds] == ["sk-1", "sk-2"]   # oldest→newest rotation order
+    cands = resolve_candidates(PROVIDERS["openai"], s)
+    assert cands[0]["Authorization"] == "Bearer sk-1"
+    assert cands[1]["Authorization"] == "Bearer sk-2"        # failover tries #2 next
+    listed = s.list_credentials()
+    assert len(listed) == 2 and all("secret" not in c and c["masked"] for c in listed)