tokensaver-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{tokensaver_cli-0.3.0/src/tokensaver_cli.egg-info → tokensaver_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tokensaver-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: TokenSaver CLI — route AI agents (Claude Code, Cursor, Codex) through the control plane
 Author: TokenSaver
 License-Expression: MIT
@@ -68,6 +68,7 @@ pip install -e ".[dev]"
 | `tokensaver login --key ts_…` | Import an existing key (no JWT) |
 | `tokensaver logout` | Remove local credentials |
 | `tokensaver whoami` | Email, plan, key prefix, Flux IA link |
+| `tokensaver approve [model]` | Approve model in Agent Registry (zero-trust) |
 | `tokensaver keys list` | List API keys |
 | `tokensaver keys create --name CLI --use` | Create key and set as default |
 | `tokensaver keys revoke <id>` | Delete a key |
@@ -82,7 +83,7 @@ pip install -e ".[dev]"
 | `tokensaver unroute <target>` | Restore backups |
 | `tokensaver doctor [--claude] [--local]` | Health checks |
 | `tokensaver status [--line\|--hook]` | Route status + Flux IA |
-| `tokensaver profiles` | cheap / default / strong |
+| `tokensaver profiles` | cheap / default / strong (plan-aware) |
 
 ### Claude Code options
 
@@ -94,11 +95,14 @@ pip install -e ".[dev]"
 | `--no-plugin` | Skip `~/.claude/skills/tokensaver-router` |
 | `--local` | Self-host URL defaults |
 
+On **Free**, default profile uses `openrouter/z-ai/glm-4.7-flash` (allowlist). Paid keeps Sonnet/Opus. Plan is stored at login (`plan_slug`); refresh with `tokensaver whoami`.
+
 ## Environment
 
 ```bash
 export TOKENSAVER_API_KEY=ts_…   # optional if logged in
 export TOKENSAVER_MODE=local     # or --local
+export TOKENSAVER_PLAN=free      # optional override for Free defaults
 export TOKENSAVER_CONSOLE_URL=…
 ```
 

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/README.md

@@ -41,6 +41,7 @@ pip install -e ".[dev]"
 | `tokensaver login --key ts_…` | Import an existing key (no JWT) |
 | `tokensaver logout` | Remove local credentials |
 | `tokensaver whoami` | Email, plan, key prefix, Flux IA link |
+| `tokensaver approve [model]` | Approve model in Agent Registry (zero-trust) |
 | `tokensaver keys list` | List API keys |
 | `tokensaver keys create --name CLI --use` | Create key and set as default |
 | `tokensaver keys revoke <id>` | Delete a key |
@@ -55,7 +56,7 @@ pip install -e ".[dev]"
 | `tokensaver unroute <target>` | Restore backups |
 | `tokensaver doctor [--claude] [--local]` | Health checks |
 | `tokensaver status [--line\|--hook]` | Route status + Flux IA |
-| `tokensaver profiles` | cheap / default / strong |
+| `tokensaver profiles` | cheap / default / strong (plan-aware) |
 
 ### Claude Code options
 
@@ -67,11 +68,14 @@ pip install -e ".[dev]"
 | `--no-plugin` | Skip `~/.claude/skills/tokensaver-router` |
 | `--local` | Self-host URL defaults |
 
+On **Free**, default profile uses `openrouter/z-ai/glm-4.7-flash` (allowlist). Paid keeps Sonnet/Opus. Plan is stored at login (`plan_slug`); refresh with `tokensaver whoami`.
+
 ## Environment
 
 ```bash
 export TOKENSAVER_API_KEY=ts_…   # optional if logged in
 export TOKENSAVER_MODE=local     # or --local
+export TOKENSAVER_PLAN=free      # optional override for Free defaults
 export TOKENSAVER_CONSOLE_URL=…
 ```
 

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/__init__.py

@@ -5,4 +5,4 @@ Published on PyPI as ``tokensaver-cli``; installs the ``tokensaver`` console com
 No server-side pipeline code — configures local agents to call api.tokensaver.fr.
 """
 
-__version__ = "0.3.0"
+__version__ = "0.3.2"

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/agents.py

@@ -17,8 +17,9 @@ from tokensaver_cli.config import (
     RouteConfig,
 )
 from tokensaver_cli.json_merge import deep_merge, read_json, write_json
+from tokensaver_cli.credentials import resolve_plan_slug
 from tokensaver_cli.plugin_install import install_claude_plugin
-from tokensaver_cli.profiles import resolve_model
+from tokensaver_cli.profiles import is_free_plan, resolve_model
 from tokensaver_cli.route_frame import print_route_frame
 from tokensaver_cli.state import RoutedFile, backup_file, clear_route, load_state, record_route, restore_file
 
@@ -205,7 +206,12 @@ def _tokensaver_hooks_patch() -> dict[str, Any]:
                     {
                         "type": "command",
                         "command": "tokensaver status --hook",
-                    }
+                    },
+                    {
+                        "type": "command",
+                        # Unblock zero-trust before the first LLM call (shell, no model needed).
+                        "command": "tokensaver approve --current --quiet || true",
+                    },
                 ]
             }
         ]
@@ -260,11 +266,17 @@ def route_claude(
     with_fs: bool = False,
     install_plugin: bool = True,
 ) -> int:
+    plan_slug = resolve_plan_slug()
     try:
-        model_id, profile_name = resolve_model(model=model, profile=profile)
+        model_id, profile_name = resolve_model(model=model, profile=profile, plan_slug=plan_slug)
     except ValueError as exc:
         print(str(exc), file=sys.stderr)
         return 2
+    if is_free_plan(plan_slug) and not (model and model.strip()):
+        print(
+            f"Free plan → default model {model_id} (override with --model / --profile)",
+            file=sys.stderr,
+        )
 
     settings_path = _claude_settings_path(scope)
     mcp_path = _claude_mcp_path(scope)
@@ -283,6 +295,22 @@ def route_claude(
         # Optional full-capture hint; user can unset. Documented in frame.
         env_patch.setdefault("HTTPS_PROXY", cfg.egress_proxy_url)
 
+    if model_id:
+        try:
+            from tokensaver_cli.approve_cmd import approve_catalog_ref
+
+            approve_catalog_ref(
+                model_id,
+                force_local=cfg.deploy_mode == "local",
+            )
+            print(f"Agent Registry → approved {model_id}", file=sys.stderr)
+        except Exception as exc:
+            print(
+                f"WARN  could not auto-approve {model_id} ({exc}). "
+                f"Run: tokensaver approve {model_id}",
+                file=sys.stderr,
+            )
+
     settings = read_json(settings_path)
     settings = deep_merge(
         settings,

tokensaver_cli-0.3.2/src/tokensaver_cli/approve_cmd.py

@@ -0,0 +1,206 @@
+"""Approve Agent Registry (catalog) models from the CLI — unblocks zero-trust 403."""
+
+from __future__ import annotations
+
+import json
+import os
+import sys
+from pathlib import Path
+from typing import Any
+from urllib.parse import quote
+
+from tokensaver_cli.api_client import ApiError, request_json
+from tokensaver_cli.auth_cmd import _api_host, _api_v1
+from tokensaver_cli.config import resolve_route_config
+from tokensaver_cli.credentials import load_credentials, resolve_api_key
+
+
+def _auth_headers() -> dict[str, str]:
+    key = resolve_api_key()
+    if not key:
+        raise ApiError(401, "No API key. Run: tokensaver login")
+    return {"Authorization": f"Bearer {key}"}
+
+
+def _api_base(*, force_local: bool = False) -> str:
+    creds = load_credentials()
+    host = (creds.api_host if creds and creds.api_host else None) or _api_host(force_local=force_local)
+    # Prefer resolved route host when env/credentials agree (local vs SaaS).
+    try:
+        host = resolve_route_config(force_local=force_local).api_host
+    except Exception:
+        pass
+    return _api_v1(host)
+
+
+def resolve_current_model_ref() -> str | None:
+    """ANTHROPIC_MODEL env, else ~/.claude/settings.json env patch."""
+    env = (os.environ.get("ANTHROPIC_MODEL") or "").strip()
+    if env:
+        return env
+    settings = Path.home() / ".claude" / "settings.json"
+    if not settings.is_file():
+        return None
+    try:
+        data = json.loads(settings.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, OSError):
+        return None
+    env_block = data.get("env") if isinstance(data, dict) else None
+    if isinstance(env_block, dict):
+        mid = env_block.get("ANTHROPIC_MODEL")
+        if isinstance(mid, str) and mid.strip():
+            return mid.strip()
+    return None
+
+
+def find_catalog_asset(
+    api_v1: str,
+    ref: str,
+    *,
+    asset_type: str = "model",
+) -> dict[str, Any] | None:
+    url = f"{api_v1}/sdk/catalog/assets?q={quote(ref)}&type={quote(asset_type)}&limit=20"
+    data = request_json("GET", url, headers=_auth_headers())
+    items = data.get("items") if isinstance(data, dict) else None
+    if not isinstance(items, list):
+        return None
+    exact = [
+        i
+        for i in items
+        if isinstance(i, dict) and str(i.get("ref") or "").lower() == ref.lower()
+    ]
+    if exact:
+        return exact[0]
+    return items[0] if items and isinstance(items[0], dict) else None
+
+
+def _find_via_jwt(api_v1: str, ref: str, *, asset_type: str) -> dict[str, Any] | None:
+    from tokensaver_cli.credentials import resolve_access_token
+
+    token = resolve_access_token()
+    if not token:
+        return None
+    url = f"{api_v1}/catalog/assets?q={quote(ref)}&type={quote(asset_type)}&limit=20"
+    data = request_json("GET", url, headers={"Authorization": f"Bearer {token}"})
+    items = data.get("items") if isinstance(data, dict) else None
+    if not isinstance(items, list):
+        return None
+    exact = [
+        i
+        for i in items
+        if isinstance(i, dict) and str(i.get("ref") or "").lower() == ref.lower()
+    ]
+    if exact:
+        return exact[0]
+    return items[0] if items and isinstance(items[0], dict) else None
+
+
+def approve_catalog_ref(
+    ref: str,
+    *,
+    asset_type: str = "model",
+    force_local: bool = False,
+) -> dict[str, Any]:
+    """Create (approved) or patch status=approved for ``ref``. Returns asset dict."""
+    api_v1 = _api_base(force_local=force_local)
+    headers = _auth_headers()
+    ref = ref.strip()
+    if not ref:
+        raise ApiError(400, "Empty model ref")
+
+    existing: dict[str, Any] | None = None
+    try:
+        existing = find_catalog_asset(api_v1, ref, asset_type=asset_type)
+    except ApiError:
+        existing = _find_via_jwt(api_v1, ref, asset_type=asset_type)
+
+    if existing and existing.get("status") == "approved":
+        return existing
+
+    if existing and existing.get("id"):
+        asset_id = str(existing["id"])
+        if existing.get("status") == "disabled":
+            raise ApiError(
+                403,
+                f"Asset {ref!r} is disabled — re-enable from Agent Registry first.",
+            )
+        return request_json(
+            "PATCH",
+            f"{api_v1}/sdk/catalog/assets/{asset_id}",
+            headers=headers,
+            body={"status": "approved"},
+        )
+
+    try:
+        return request_json(
+            "POST",
+            f"{api_v1}/sdk/catalog/assets",
+            headers=headers,
+            body={
+                "type": asset_type,
+                "ref": ref,
+                "display_name": ref,
+                "status": "approved",
+                "description": "Approved via tokensaver CLI",
+            },
+        )
+    except ApiError as exc:
+        # Race / already observed as quarantined
+        detail = str(exc.detail).lower() if exc.detail else str(exc).lower()
+        if exc.status not in (409, 400) and "already exists" not in detail:
+            raise
+        existing = None
+        try:
+            existing = find_catalog_asset(api_v1, ref, asset_type=asset_type)
+        except ApiError:
+            existing = _find_via_jwt(api_v1, ref, asset_type=asset_type)
+        if not existing or not existing.get("id"):
+            raise
+        return request_json(
+            "PATCH",
+            f"{api_v1}/sdk/catalog/assets/{existing['id']}",
+            headers=headers,
+            body={"status": "approved"},
+        )
+
+
+def run_approve(
+    ref: str | None = None,
+    *,
+    current: bool = False,
+    asset_type: str = "model",
+    force_local: bool = False,
+    quiet: bool = False,
+) -> int:
+    target = (ref or "").strip()
+    if current or not target:
+        target = resolve_current_model_ref() or target
+    if not target:
+        print(
+            "Usage: tokensaver approve <provider/model>\n"
+            "   or: tokensaver approve --current\n"
+            "Example: tokensaver approve openrouter/z-ai/glm-4.7-flash",
+            file=sys.stderr,
+        )
+        return 2
+
+    try:
+        asset = approve_catalog_ref(target, asset_type=asset_type, force_local=force_local)
+    except ApiError as exc:
+        if not quiet:
+            print(f"FAIL  approve {target} — {exc}", file=sys.stderr)
+            print(
+                "Need admin API key (tokensaver login). Console: Governance → Agent Registry.",
+                file=sys.stderr,
+            )
+        return 1
+
+    status = asset.get("status") or "approved"
+    asset_id = asset.get("id") or "?"
+    if quiet:
+        print(f"approved:{target}:{status}")
+    else:
+        print(f"OK  Agent Registry → {target}")
+        print(f"    status={status}  id={asset_id}")
+        print("    Retry your Claude Code message — zero-trust should allow this model.")
+    return 0

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/auth_cmd.py

@@ -209,12 +209,17 @@ def run_login(
 
     workspace_id = None
     organisation_id = None
+    plan_slug = None
     try:
         me = _fetch_me(api_v1, str(access_token))
         ws = me.get("workspace") if isinstance(me.get("workspace"), dict) else {}
         org = me.get("organisation") if isinstance(me.get("organisation"), dict) else {}
+        plan = me.get("plan") if isinstance(me.get("plan"), dict) else {}
         workspace_id = ws.get("id")
         organisation_id = org.get("id")
+        plan_slug = plan.get("slug") or plan.get("name")
+        if isinstance(plan_slug, str):
+            plan_slug = plan_slug.strip().lower() or None
         if me.get("email"):
             email = str(me["email"])
     except ApiError as exc:
@@ -232,12 +237,17 @@ def run_login(
         key_prefix=key_prefix,
         api_host=api_host,
         console_url=console,
+        plan_slug=str(plan_slug) if plan_slug else None,
     )
     path = save_credentials(creds)
 
     print()
     print(f"OK  Logged in as {email}")
     print(f"    Credentials → {path}")
+    if plan_slug:
+        print(f"    Plan        → {plan_slug}")
+        if plan_slug == "free":
+            print("    Default model for Free → openrouter/z-ai/glm-4.7-flash")
     if plain_key:
         print(f"    API key     → {key_prefix}… (saved; shown once at create)")
     if data.get("email_verified") is False:
@@ -298,8 +308,16 @@ def run_whoami(*, force_local: bool = False) -> int:
                 print(f"  Org:       {org.get('name')} ({org.get('id', '')})")
             if ws.get("name"):
                 print(f"  Workspace: {ws.get('name')} ({ws.get('id', '')})")
-            if plan.get("name") or plan.get("slug"):
-                print(f"  Plan:      {plan.get('name') or plan.get('slug')}")
+            slug = plan.get("slug") or plan.get("name")
+            if isinstance(slug, str) and slug.strip():
+                slug_norm = slug.strip().lower()
+                print(f"  Plan:      {plan.get('name') or slug_norm}")
+                if creds is not None and creds.plan_slug != slug_norm:
+                    from tokensaver_cli.credentials import update_credentials
+
+                    update_credentials(plan_slug=slug_norm)
+                if slug_norm == "free":
+                    print("  Default:   openrouter/z-ai/glm-4.7-flash (Free allowlist)")
             trial = org.get("free_trial") if isinstance(org.get("free_trial"), dict) else None
             if trial:
                 print(f"  Trial:     ends {trial.get('ends_at') or trial.get('free_trial_ends_at') or '—'}")
@@ -308,5 +326,7 @@ def run_whoami(*, force_local: bool = False) -> int:
             print(f"  Session:   JWT present but /users/me failed ({exc})")
     else:
         print("  Session:   API key only (no JWT — run tokensaver login for keys management)")
+        if creds and creds.plan_slug:
+            print(f"  Plan:      {creds.plan_slug} (from credentials)")
 
     return 0

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/claude_plugin/.claude-plugin/plugin.json

@@ -1,8 +1,8 @@
 {
   "name": "tokensaver-router",
   "displayName": "TokenSaver Router",
-  "version": "0.3.0",
-  "description": "Route Claude Code through TokenSaver — login, model profiles, MCP Trust Gateway, Flux IA traces.",
+  "version": "0.3.2",
+  "description": "Route Claude Code through TokenSaver — login, model profiles, Agent Registry approve, MCP Trust Gateway, Flux IA traces.",
   "author": {
     "name": "TokenSaver",
     "url": "https://tokensaver.fr"

tokensaver_cli-0.3.2/src/tokensaver_cli/claude_plugin/commands/approve.md

@@ -0,0 +1,25 @@
+---
+description: Approve a model in TokenSaver Agent Registry (unblocks zero-trust 403)
+argument-hint: "[provider/model]"
+---
+
+Zero-trust blocks LLM calls until the model is **approved** in the Agent Registry.
+Approving does **not** need a working chat model — use the CLI (shell).
+
+If the user named a model (or `$ARGUMENTS` is set), run:
+
+```bash
+tokensaver approve $ARGUMENTS
+```
+
+Otherwise approve the currently routed Claude model:
+
+```bash
+tokensaver approve --current
+```
+
+Also available via MCP (when tools MCP is connected):
+
+- `tokensaver_approve_catalog_asset` with `ref` = `openrouter/z-ai/glm-4.7-flash` (creates then approves if missing)
+
+After success, tell the user to retry their message. Optional: open Flux IA / Agent Registry from `tokensaver status`.

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/claude_plugin/commands/model.md

@@ -17,4 +17,13 @@ tokensaver route claude --profile strong
 tokensaver route claude --model openai/gpt-4.1-mini
 ```
 
-After changing, run `tokensaver status --line` and tell the user which model is now active.
+After changing, **approve** the model in the Agent Registry (required under zero-trust):
+
+```bash
+tokensaver approve --current
+# or: tokensaver approve openrouter/z-ai/glm-4.7-flash
+```
+
+Slash command: `/tokensaver-router:approve` (or with a ref argument).
+
+Then run `tokensaver status --line` and tell the user which model is now active.

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/claude_plugin/hooks/hooks.json

@@ -5,6 +5,10 @@
         {
           "type": "command",
           "command": "tokensaver status --hook"
+        },
+        {
+          "type": "command",
+          "command": "tokensaver approve --current --quiet || true"
         }
       ]
     }

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/credentials.py

@@ -35,6 +35,7 @@ class Credentials:
     key_prefix: str | None = None
     api_host: str | None = None
     console_url: str | None = None
+    plan_slug: str | None = None
     updated_at: str = field(default_factory=lambda: datetime.now(UTC).isoformat())
 
     def to_dict(self) -> dict[str, Any]:
@@ -113,3 +114,26 @@ def resolve_access_token() -> str | None:
     if creds and creds.access_token:
         return creds.access_token.strip() or None
     return None
+
+
+def resolve_plan_slug() -> str | None:
+    """Env ``TOKENSAVER_PLAN`` wins, then credentials ``plan_slug``."""
+    env = (os.environ.get("TOKENSAVER_PLAN") or "").strip().lower()
+    if env:
+        return env
+    creds = load_credentials()
+    if creds and creds.plan_slug:
+        return creds.plan_slug.strip().lower() or None
+    return None
+
+
+def update_credentials(**kwargs: Any) -> Credentials | None:
+    """Merge fields into the credentials file (no-op if missing)."""
+    creds = load_credentials()
+    if creds is None:
+        return None
+    for key, value in kwargs.items():
+        if hasattr(creds, key):
+            setattr(creds, key, value)
+    save_credentials(creds)
+    return creds

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/main.py

@@ -17,6 +17,7 @@ from tokensaver_cli.agents import (
     unroute_mcp,
     unroute_proxy,
 )
+from tokensaver_cli.approve_cmd import run_approve
 from tokensaver_cli.auth_cmd import run_login, run_logout, run_whoami
 from tokensaver_cli.banner import print_banner
 from tokensaver_cli.config import RouteConfigError, resolve_route_config
@@ -37,6 +38,7 @@ COMMANDS = (
     "logout",
     "whoami",
     "keys",
+    "approve",
     "help",
 )
 KEYS_ACTIONS = ("list", "create", "revoke")
@@ -52,6 +54,7 @@ Usage:
   tokensaver login [--email …] [--signup|--key ts_…]
   tokensaver logout | whoami
   tokensaver keys list | create [--name …] [--use] | revoke <id>
+  tokensaver approve [<provider/model>] [--current]
   tokensaver route <target> [options] [-- extra-args...]
   tokensaver unroute <target>
   tokensaver doctor [--claude] [--local]
@@ -63,6 +66,7 @@ Auth (no UI required):
   logout    Remove local credentials
   whoami    Show email, plan, API key prefix
   keys      List / create / revoke TokenSaver API keys (needs login JWT)
+  approve   Agent Registry: approve a model (unblocks zero-trust 403)
 
 Route targets:
   claude    Claude Code — settings + MCP (+ optional launch / plugin)
@@ -132,6 +136,13 @@ def build_parser() -> argparse.ArgumentParser:
     parser.add_argument("--key", default=None, help="Import existing ts_… API key")
     parser.add_argument("--description", default=None)
     parser.add_argument("--use", action="store_true", help="keys create: set as default")
+    parser.add_argument(
+        "--current",
+        action="store_true",
+        help="approve: use ANTHROPIC_MODEL / Claude settings model",
+    )
+    parser.add_argument("--quiet", action="store_true", help="approve: compact output")
+    parser.add_argument("--type", dest="asset_type", default="model", help="approve asset type")
     parser.add_argument("-y", "--yes", action="store_true")
     parser.add_argument("-h", "--help", action="store_true")
     return parser
@@ -215,6 +226,22 @@ def _parse_unknown_route_flags(unknown: list[str]) -> tuple[bool, list[str], dic
             extras["use"] = True
             i += 1
             continue
+        if tok == "--current":
+            extras["current"] = True
+            i += 1
+            continue
+        if tok == "--quiet":
+            extras["quiet"] = True
+            i += 1
+            continue
+        if tok == "--type" and i + 1 < len(unknown):
+            extras["asset_type"] = unknown[i + 1]
+            i += 2
+            continue
+        if tok.startswith("--type="):
+            extras["asset_type"] = tok.split("=", 1)[1]
+            i += 1
+            continue
         if tok == "--email" and i + 1 < len(unknown):
             extras["email"] = unknown[i + 1]
             i += 2
@@ -254,9 +281,19 @@ def _parse_route_tail(*, launch_flag: bool, remainder: list[str]) -> tuple[bool,
 
 
 def _print_profiles() -> int:
+    from tokensaver_cli.credentials import resolve_plan_slug
+    from tokensaver_cli.profiles import is_free_plan
+
+    plan = resolve_plan_slug()
     print("TokenSaver model profiles")
+    if is_free_plan(plan):
+        print(f"  (plan: {plan} — Free allowlist defaults)")
+    elif plan:
+        print(f"  (plan: {plan})")
+    else:
+        print("  (plan unknown — paid/BYOK defaults; login to detect Free)")
     print()
-    for row in profiles_summary():
+    for row in profiles_summary(plan_slug=plan):
         tag = "builtin" if row["builtin"] else "custom"
         print(f"  {row['name']:12}  {row['model']}  ({tag})")
     print()
@@ -332,6 +369,22 @@ def main(argv: list[str] | None = None) -> None:
             raise SystemExit(2)
         raise SystemExit(run_keys_revoke(key_id, force_local=force_local))
 
+    if args.command == "approve":
+        quiet = bool(args.quiet or extras.get("quiet"))
+        if not quiet:
+            print_banner()
+        # `tokensaver approve openrouter/…` → target; `--current` uses settings model
+        ref = args.target or args.arg or (extra_unknown[0] if extra_unknown else None)
+        raise SystemExit(
+            run_approve(
+                ref,
+                current=bool(args.current or extras.get("current") or not ref),
+                asset_type=str(extras.get("asset_type") or args.asset_type or "model"),
+                force_local=force_local,
+                quiet=quiet,
+            )
+        )
+
     if args.command == "status":
         line = bool(args.line or extras.get("line"))
         hook = bool(args.hook or extras.get("hook"))

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli/profiles.py

@@ -8,13 +8,23 @@ from typing import Any
 
 from tokensaver_cli.state import route_state_dir
 
-# Sensible defaults aligned with TokenSaver catalogue ids (provider/model_id).
+# Paid / BYOK defaults (catalogue provider/model_id).
 BUILTIN_PROFILES: dict[str, str] = {
     "cheap": "openai/gpt-4.1-mini",
     "default": "anthropic/claude-sonnet-4-6",
     "strong": "anthropic/claude-opus-4-6",
 }
 
+# Hosted Free allowlist — must stay inside apps/backend/data/plan_model_access.json.
+# Default Free chat UX: GLM 4.7 Flash (openrouter/z-ai/glm-4.7-flash).
+FREE_PROFILES: dict[str, str] = {
+    "cheap": "openrouter/openai/gpt-5-nano",
+    "default": "openrouter/z-ai/glm-4.7-flash",
+    "strong": "openrouter/deepseek/deepseek-chat-v3-0324",
+}
+
+FREE_DEFAULT_MODEL = FREE_PROFILES["default"]
+
 PROFILE_NAMES = ("cheap", "default", "strong")
 
 
@@ -22,19 +32,26 @@ def profiles_file() -> Path:
     return route_state_dir() / "profiles.json"
 
 
-def load_profiles() -> dict[str, str]:
+def is_free_plan(plan_slug: str | None) -> bool:
+    if not plan_slug:
+        return False
+    return plan_slug.strip().lower() in {"free", "trial", "free_trial"}
+
+
+def load_profiles(*, plan_slug: str | None = None) -> dict[str, str]:
+    """Merge builtins (plan-aware) with optional user overrides in profiles.json."""
+    base = dict(FREE_PROFILES) if is_free_plan(plan_slug) else dict(BUILTIN_PROFILES)
     path = profiles_file()
-    merged = dict(BUILTIN_PROFILES)
     if path.is_file():
         try:
             raw = json.loads(path.read_text(encoding="utf-8"))
         except json.JSONDecodeError:
-            return merged
+            return base
         if isinstance(raw, dict):
             for key, value in raw.items():
                 if isinstance(key, str) and isinstance(value, str) and value.strip():
-                    merged[key.strip().lower()] = value.strip()
-    return merged
+                    base[key.strip().lower()] = value.strip()
+    return base
 
 
 def save_profiles(profiles: dict[str, str]) -> None:
@@ -42,9 +59,14 @@ def save_profiles(profiles: dict[str, str]) -> None:
     path.write_text(json.dumps(profiles, indent=2) + "\n", encoding="utf-8")
 
 
-def resolve_model(*, model: str | None, profile: str | None) -> tuple[str | None, str | None]:
+def resolve_model(
+    *,
+    model: str | None,
+    profile: str | None,
+    plan_slug: str | None = None,
+) -> tuple[str | None, str | None]:
     """Return ``(model_id, profile_name)``. Explicit ``--model`` wins over ``--profile``."""
-    profiles = load_profiles()
+    profiles = load_profiles(plan_slug=plan_slug)
     if model and model.strip():
         mid = model.strip()
         matched = next((name for name, value in profiles.items() if value == mid), None)
@@ -58,15 +80,17 @@ def resolve_model(*, model: str | None, profile: str | None) -> tuple[str | None
     return profiles.get("default"), "default"
 
 
-def profiles_summary() -> list[dict[str, Any]]:
-    profiles = load_profiles()
+def profiles_summary(*, plan_slug: str | None = None) -> list[dict[str, Any]]:
+    profiles = load_profiles(plan_slug=plan_slug)
+    reference = FREE_PROFILES if is_free_plan(plan_slug) else BUILTIN_PROFILES
     rows: list[dict[str, Any]] = []
     for name in sorted(profiles):
         rows.append(
             {
                 "name": name,
                 "model": profiles[name],
-                "builtin": name in BUILTIN_PROFILES and profiles[name] == BUILTIN_PROFILES[name],
+                "builtin": name in reference and profiles[name] == reference[name],
+                "plan": "free" if is_free_plan(plan_slug) else (plan_slug or "paid"),
             }
         )
     return rows

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2/src/tokensaver_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tokensaver-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: TokenSaver CLI — route AI agents (Claude Code, Cursor, Codex) through the control plane
 Author: TokenSaver
 License-Expression: MIT
@@ -68,6 +68,7 @@ pip install -e ".[dev]"
 | `tokensaver login --key ts_…` | Import an existing key (no JWT) |
 | `tokensaver logout` | Remove local credentials |
 | `tokensaver whoami` | Email, plan, key prefix, Flux IA link |
+| `tokensaver approve [model]` | Approve model in Agent Registry (zero-trust) |
 | `tokensaver keys list` | List API keys |
 | `tokensaver keys create --name CLI --use` | Create key and set as default |
 | `tokensaver keys revoke <id>` | Delete a key |
@@ -82,7 +83,7 @@ pip install -e ".[dev]"
 | `tokensaver unroute <target>` | Restore backups |
 | `tokensaver doctor [--claude] [--local]` | Health checks |
 | `tokensaver status [--line\|--hook]` | Route status + Flux IA |
-| `tokensaver profiles` | cheap / default / strong |
+| `tokensaver profiles` | cheap / default / strong (plan-aware) |
 
 ### Claude Code options
 
@@ -94,11 +95,14 @@ pip install -e ".[dev]"
 | `--no-plugin` | Skip `~/.claude/skills/tokensaver-router` |
 | `--local` | Self-host URL defaults |
 
+On **Free**, default profile uses `openrouter/z-ai/glm-4.7-flash` (allowlist). Paid keeps Sonnet/Opus. Plan is stored at login (`plan_slug`); refresh with `tokensaver whoami`.
+
 ## Environment
 
 ```bash
 export TOKENSAVER_API_KEY=ts_…   # optional if logged in
 export TOKENSAVER_MODE=local     # or --local
+export TOKENSAVER_PLAN=free      # optional override for Free defaults
 export TOKENSAVER_CONSOLE_URL=…
 ```
 

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/src/tokensaver_cli.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 src/tokensaver_cli/__init__.py
 src/tokensaver_cli/agents.py
 src/tokensaver_cli/api_client.py
+src/tokensaver_cli/approve_cmd.py
 src/tokensaver_cli/auth_cmd.py
 src/tokensaver_cli/banner.py
 src/tokensaver_cli/config.py
@@ -27,12 +28,14 @@ src/tokensaver_cli.egg-info/top_level.txt
 src/tokensaver_cli/claude_plugin/.mcp.json
 src/tokensaver_cli/claude_plugin/.claude-plugin/marketplace.json
 src/tokensaver_cli/claude_plugin/.claude-plugin/plugin.json
+src/tokensaver_cli/claude_plugin/commands/approve.md
 src/tokensaver_cli/claude_plugin/commands/model.md
 src/tokensaver_cli/claude_plugin/commands/pipeline.md
 src/tokensaver_cli/claude_plugin/commands/setup.md
 src/tokensaver_cli/claude_plugin/commands/status.md
 src/tokensaver_cli/claude_plugin/commands/unroute.md
 src/tokensaver_cli/claude_plugin/hooks/hooks.json
+tests/test_approve_cli.py
 tests/test_auth_cli.py
 tests/test_banner.py
 tests/test_deploy_mode.py

tokensaver_cli-0.3.2/tests/test_approve_cli.py

@@ -0,0 +1,83 @@
+"""Tests for tokensaver approve (Agent Registry)."""
+
+from __future__ import annotations
+
+from typing import Any
+from pathlib import Path
+
+import pytest
+
+from tokensaver_cli.approve_cmd import approve_catalog_ref, resolve_current_model_ref, run_approve
+
+
+@pytest.fixture
+def api_home(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path:
+    monkeypatch.setenv("HOME", str(tmp_path / "home"))
+    monkeypatch.setenv("TOKENSAVER_API_KEY", "ts_test_key_approve")
+    monkeypatch.setenv("TOKENSAVER_API_URL", "https://api.example.test")
+    monkeypatch.delenv("TOKENSAVER_MODE", raising=False)
+    return tmp_path
+
+
+def test_resolve_current_model_from_settings(api_home: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.delenv("ANTHROPIC_MODEL", raising=False)
+    settings = Path.home() / ".claude" / "settings.json"
+    settings.parent.mkdir(parents=True)
+    settings.write_text(
+        '{"env": {"ANTHROPIC_MODEL": "openrouter/z-ai/glm-4.7-flash"}}\n',
+        encoding="utf-8",
+    )
+    assert resolve_current_model_ref() == "openrouter/z-ai/glm-4.7-flash"
+
+
+def test_approve_creates_when_missing(api_home: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    calls: list[tuple[str, str, Any]] = []
+
+    def fake_request(method: str, url: str, *, headers=None, body=None, timeout=30.0):
+        calls.append((method, url, body))
+        if method == "GET":
+            return {"items": []}
+        if method == "POST":
+            return {"id": "asset-1", "ref": body["ref"], "status": "approved", "type": "model"}
+        raise AssertionError(f"unexpected {method} {url}")
+
+    monkeypatch.setattr("tokensaver_cli.approve_cmd.request_json", fake_request)
+    out = approve_catalog_ref("openrouter/z-ai/glm-4.7-flash")
+    assert out["status"] == "approved"
+    assert any(c[0] == "POST" for c in calls)
+
+
+def test_approve_patches_quarantined(api_home: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    def fake_request(method: str, url: str, *, headers=None, body=None, timeout=30.0):
+        if method == "GET":
+            return {
+                "items": [
+                    {
+                        "id": "uuid-q",
+                        "ref": "openrouter/z-ai/glm-4.7-flash",
+                        "status": "quarantined",
+                        "type": "model",
+                    }
+                ]
+            }
+        if method == "PATCH":
+            assert "uuid-q" in url
+            assert body == {"status": "approved"}
+            return {"id": "uuid-q", "ref": "openrouter/z-ai/glm-4.7-flash", "status": "approved"}
+        raise AssertionError(method)
+
+    monkeypatch.setattr("tokensaver_cli.approve_cmd.request_json", fake_request)
+    out = approve_catalog_ref("openrouter/z-ai/glm-4.7-flash")
+    assert out["status"] == "approved"
+
+
+def test_run_approve_current(api_home: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("ANTHROPIC_MODEL", "openrouter/openai/gpt-5-nano")
+
+    def fake_request(method: str, url: str, *, headers=None, body=None, timeout=30.0):
+        if method == "GET":
+            return {"items": []}
+        return {"id": "x", "ref": body["ref"], "status": "approved"}
+
+    monkeypatch.setattr("tokensaver_cli.approve_cmd.request_json", fake_request)
+    assert run_approve(None, current=True, quiet=True) == 0

{tokensaver_cli-0.3.0 → tokensaver_cli-0.3.2}/tests/test_route_cli.py

@@ -11,7 +11,7 @@ import pytest
 from tokensaver_cli.agents import route_claude, route_cursor, unroute_claude, unroute_cursor
 from tokensaver_cli.config import RouteConfig, RouteConfigError, resolve_route_config
 from tokensaver_cli.plugin_install import install_claude_plugin, plugin_install_dir
-from tokensaver_cli.profiles import BUILTIN_PROFILES, resolve_model
+from tokensaver_cli.profiles import BUILTIN_PROFILES, FREE_PROFILES, resolve_model
 from tokensaver_cli.state import load_state, route_state_dir
 
 
@@ -48,7 +48,12 @@ def test_resolve_route_config_requires_api_key(monkeypatch: pytest.MonkeyPatch,
         resolve_route_config()
 
 
-def test_resolve_route_config_strips_api_v1_suffix(monkeypatch: pytest.MonkeyPatch) -> None:
+def test_resolve_route_config_strips_api_v1_suffix(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    monkeypatch.setenv("HOME", str(tmp_path / "home"))
+    monkeypatch.delenv("TOKENSAVER_MODE", raising=False)
+    monkeypatch.delenv("TOKENSAVER_API_URL", raising=False)
     monkeypatch.setenv("TOKENSAVER_API_KEY", "ts_x")
     monkeypatch.setenv("TOKENSAVER_API_BASE_URL", "https://api.example.test/api/v1")
     resolved = resolve_route_config()
@@ -65,6 +70,15 @@ def test_resolve_model_profile_and_override() -> None:
     assert profile2 is None
 
 
+def test_resolve_model_free_plan_defaults() -> None:
+    model, profile = resolve_model(model=None, profile=None, plan_slug="free")
+    assert model == FREE_PROFILES["default"]
+    assert model == "openrouter/z-ai/glm-4.7-flash"
+    assert profile == "default"
+    cheap, _ = resolve_model(model=None, profile="cheap", plan_slug="free")
+    assert cheap == FREE_PROFILES["cheap"]
+
+
 def test_route_claude_writes_settings_and_mcp(route_home: Path, cfg: RouteConfig, tmp_path: Path) -> None:
     project = tmp_path / "project"
     project.mkdir()
@@ -96,6 +110,25 @@ def test_route_claude_writes_settings_and_mcp(route_home: Path, cfg: RouteConfig
     assert route_state_dir().is_dir()
 
 
+def test_route_claude_free_plan_default_model(
+    route_home: Path,
+    cfg: RouteConfig,
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("TOKENSAVER_PLAN", "free")
+    project = tmp_path / "project"
+    project.mkdir()
+    old_cwd = os.getcwd()
+    try:
+        os.chdir(project)
+        assert route_claude(cfg, launch=False, extra_args=[], install_plugin=False) == 0
+    finally:
+        os.chdir(old_cwd)
+    settings = json.loads((route_home / ".claude" / "settings.json").read_text())
+    assert settings["env"]["ANTHROPIC_MODEL"] == FREE_PROFILES["default"]
+
+
 def test_route_claude_project_scope(route_home: Path, cfg: RouteConfig, tmp_path: Path) -> None:
     project = tmp_path / "project"
     project.mkdir()