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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tokensaver-cli
-Version: 0.3.2
+Version: 0.3.4
 Summary: TokenSaver CLI — route AI agents (Claude Code, Cursor, Codex) through the control plane
 Author: TokenSaver
 License-Expression: MIT
@@ -69,6 +69,10 @@ pip install -e ".[dev]"
 | `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 models` | List profiles + catalogue models |
+| `tokensaver use <profile\|model>` | Set Claude model (sticky) + approve |
+| `tokensaver flows [--open]` | Flux IA URL + recent runs |
+| `tokensaver catalog …` | List / approve Agent Registry |
 | `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 |
@@ -84,6 +88,7 @@ pip install -e ".[dev]"
 | `tokensaver doctor [--claude] [--local]` | Health checks |
 | `tokensaver status [--line\|--hook]` | Route status + Flux IA |
 | `tokensaver profiles` | cheap / default / strong (plan-aware) |
+| Claude plugin slash | `/tokensaver-router:models\|use\|flows\|quota\|cache\|catalog\|…` |
 
 ### Claude Code options
 

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

@@ -42,6 +42,10 @@ pip install -e ".[dev]"
 | `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 models` | List profiles + catalogue models |
+| `tokensaver use <profile\|model>` | Set Claude model (sticky) + approve |
+| `tokensaver flows [--open]` | Flux IA URL + recent runs |
+| `tokensaver catalog …` | List / approve Agent Registry |
 | `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 |
@@ -57,6 +61,7 @@ pip install -e ".[dev]"
 | `tokensaver doctor [--claude] [--local]` | Health checks |
 | `tokensaver status [--line\|--hook]` | Route status + Flux IA |
 | `tokensaver profiles` | cheap / default / strong (plan-aware) |
+| Claude plugin slash | `/tokensaver-router:models\|use\|flows\|quota\|cache\|catalog\|…` |
 
 ### Claude Code options
 

{tokensaver_cli-0.3.2 → tokensaver_cli-0.3.4}/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.2"
+__version__ = "0.3.4"

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

@@ -255,6 +255,18 @@ def _restore_routed_files(files: list[RoutedFile], *, strip_if_no_backup: bool =
             path.unlink(missing_ok=True)
 
 
+def _sticky_claude_model() -> str | None:
+    """Last model chosen via ``--model`` / ``--profile`` (survives bare ``route --launch``)."""
+    rec = load_state().get("claude")
+    if not rec or not isinstance(rec.meta, dict):
+        return None
+    for key in ("sticky_model", "model"):
+        value = rec.meta.get(key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
 def route_claude(
     cfg: RouteConfig,
     *,
@@ -267,12 +279,25 @@ def route_claude(
     install_plugin: bool = True,
 ) -> int:
     plan_slug = resolve_plan_slug()
+    explicit_model = bool(model and model.strip())
+    explicit_profile = bool(profile and profile.strip())
+    sticky = None if (explicit_model or explicit_profile) else _sticky_claude_model()
     try:
-        model_id, profile_name = resolve_model(model=model, profile=profile, plan_slug=plan_slug)
+        model_id, profile_name = resolve_model(
+            model=model,
+            profile=profile,
+            plan_slug=plan_slug,
+            sticky_model=sticky,
+        )
     except ValueError as exc:
         print(str(exc), file=sys.stderr)
         return 2
-    if is_free_plan(plan_slug) and not (model and model.strip()):
+    if sticky and model_id == sticky and not explicit_model and not explicit_profile:
+        print(
+            f"Keeping previous model {model_id} (set with --model / --profile to change)",
+            file=sys.stderr,
+        )
+    elif is_free_plan(plan_slug) and not explicit_model and not sticky:
         print(
             f"Free plan → default model {model_id} (override with --model / --profile)",
             file=sys.stderr,
@@ -357,15 +382,19 @@ def route_claude(
                 file=sys.stderr,
             )
 
+    prev_sticky = _sticky_claude_model()
+    sticky_model = model_id if (explicit_model or explicit_profile) else (prev_sticky or model_id)
     meta = {
         "scope": scope,
         "model": model_id,
+        "sticky_model": sticky_model,
         "profile": profile_name,
         "with_fs": fs_ok,
         "console_url": cfg.console_url,
         "flows_url": cfg.flows_url(),
         "plugin_dir": str(plugin_dir) if plugin_dir else None,
         "deploy_mode": cfg.deploy_mode,
+        "plan_slug": plan_slug,
     }
     record_route("claude", routed, meta=meta)
 

tokensaver_cli-0.3.4/src/tokensaver_cli/catalog_cmd.py

@@ -0,0 +1,113 @@
+"""Agent Registry helpers from the CLI."""
+
+from __future__ import annotations
+
+import sys
+from typing import Any
+from urllib.parse import quote
+
+from tokensaver_cli.api_client import ApiError, request_json
+from tokensaver_cli.approve_cmd import _api_base, _auth_headers, approve_catalog_ref
+from tokensaver_cli.credentials import resolve_access_token
+
+
+def _list_assets(
+    api_v1: str,
+    *,
+    status: str | None = None,
+    asset_type: str = "model",
+    q: str | None = None,
+    limit: int = 50,
+) -> list[dict[str, Any]]:
+    params = [f"type={quote(asset_type)}", f"limit={limit}"]
+    if status:
+        params.append(f"status={quote(status)}")
+    if q:
+        params.append(f"q={quote(q)}")
+    qs = "&".join(params)
+    headers = _auth_headers()
+    try:
+        data = request_json("GET", f"{api_v1}/sdk/catalog/assets?{qs}", headers=headers)
+    except ApiError:
+        token = resolve_access_token()
+        if not token:
+            raise
+        data = request_json(
+            "GET",
+            f"{api_v1}/catalog/assets?{qs}",
+            headers={"Authorization": f"Bearer {token}"},
+        )
+    items = data.get("items") if isinstance(data, dict) else None
+    if not isinstance(items, list):
+        return []
+    return [i for i in items if isinstance(i, dict)]
+
+
+def run_catalog(
+    action: str | None = None,
+    ref: str | None = None,
+    *,
+    force_local: bool = False,
+    status: str | None = None,
+) -> int:
+    act = (action or "list").strip().lower()
+    api_v1 = _api_base(force_local=force_local)
+
+    if act in ("approve", "allow"):
+        target = (ref or "").strip()
+        if not target:
+            print("Usage: tokensaver catalog approve <provider/model>", file=sys.stderr)
+            return 2
+        try:
+            asset = approve_catalog_ref(target, force_local=force_local)
+        except ApiError as exc:
+            print(f"FAIL  {exc}", file=sys.stderr)
+            return 1
+        print(f"OK  approved {asset.get('ref')}  status={asset.get('status')}")
+        return 0
+
+    if act not in ("list", "pending", "ls"):
+        print("Usage: tokensaver catalog [list|pending|approve <ref>]", file=sys.stderr)
+        return 2
+
+    filter_status = status
+    if act == "pending" and not filter_status:
+        # show both pending buckets
+        rows: list[dict[str, Any]] = []
+        for st in ("quarantined", "discovered"):
+            try:
+                rows.extend(_list_assets(api_v1, status=st, asset_type="model"))
+            except ApiError as exc:
+                print(f"FAIL  list catalog — {exc}", file=sys.stderr)
+                return 1
+        # de-dupe by id
+        seen: set[str] = set()
+        uniq: list[dict[str, Any]] = []
+        for row in rows:
+            aid = str(row.get("id") or "")
+            if aid and aid in seen:
+                continue
+            if aid:
+                seen.add(aid)
+            uniq.append(row)
+        rows = uniq
+    else:
+        try:
+            rows = _list_assets(api_v1, status=filter_status, asset_type="model")
+        except ApiError as exc:
+            print(f"FAIL  list catalog — {exc}", file=sys.stderr)
+            return 1
+
+    print("Agent Registry (models)")
+    if not rows:
+        print("  (empty)")
+        return 0
+    print(f"  {'STATUS':12}  REF")
+    for row in rows:
+        st = str(row.get("status") or "?")[:12]
+        ref_s = row.get("ref") or "?"
+        print(f"  {st:12}  {ref_s}")
+    print()
+    print("Approve: tokensaver catalog approve <ref>")
+    print("     or: tokensaver approve <ref>")
+    return 0

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

@@ -1,8 +1,8 @@
 {
   "name": "tokensaver-router",
   "displayName": "TokenSaver Router",
-  "version": "0.3.2",
-  "description": "Route Claude Code through TokenSaver — login, model profiles, Agent Registry approve, MCP Trust Gateway, Flux IA traces.",
+  "version": "0.3.4",
+  "description": "Route Claude Code through TokenSaver — models, use, approve, Flux IA, quotas, cache, catalog, login/keys.",
   "author": {
     "name": "TokenSaver",
     "url": "https://tokensaver.fr"
@@ -10,7 +10,7 @@
   "homepage": "https://tokensaver.fr/sdk-api",
   "repository": "https://github.com/tokensaver/tokensaver-platform",
   "license": "MIT",
-  "keywords": ["tokensaver", "router", "mcp", "governance", "cost"],
+  "keywords": ["tokensaver", "router", "mcp", "governance", "cost", "models"],
   "commands": ["./commands"],
   "hooks": "./hooks/hooks.json",
   "mcpServers": "./.mcp.json"

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/cache.md

@@ -0,0 +1,19 @@
+---
+description: Show TokenSaver cache stats (and optional purge guidance)
+argument-hint: "[stats|purge]"
+---
+
+Use MCP tools:
+
+1. Default / `stats`: call `tokensaver_cache_stats` and paste the result.
+2. Optional detail: `tokensaver_list_cache_entries` (small limit).
+3. Only if the user explicitly asks to purge: confirm, then `tokensaver_cache_purge`.
+
+Never purge without clear user consent.
+
+CLI fallback:
+
+```bash
+tokensaver status
+tokensaver flows
+```

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/catalog.md

@@ -0,0 +1,26 @@
+---
+description: List or approve Agent Registry (catalog) models — fix zero-trust 403
+argument-hint: "[pending|approve <ref>]"
+---
+
+Agent Registry governs which models may egress (zero-trust).
+
+If `$ARGUMENTS` starts with `approve`, run:
+
+```bash
+tokensaver catalog approve <ref>
+# or: tokensaver approve <ref>
+```
+
+If `$ARGUMENTS` is `pending` or empty, list pending models:
+
+```bash
+tokensaver catalog pending
+tokensaver catalog list
+```
+
+MCP alternatives:
+- `tokensaver_list_catalog_assets` with `status=quarantined` or `type=model`
+- `tokensaver_approve_catalog_asset` with `ref=…` (creates+approves if missing)
+
+After approve, tell the user to retry their message. Related: `/tokensaver-router:use` and `/tokensaver-router:approve`.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/doctor.md

@@ -0,0 +1,11 @@
+---
+description: Run TokenSaver doctor checks for Claude routing
+---
+
+```bash
+tokensaver doctor --claude
+# local stack:
+tokensaver doctor --claude --local
+```
+
+Report which checks failed (API key, Anthropic base URL, /v1/models, MCP). Suggest `tokensaver login`, `tokensaver route claude --local`, or `tokensaver approve --current` as appropriate.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/flows.md

@@ -0,0 +1,19 @@
+---
+description: Open Flux IA — recent governed runs / pipeline traces
+argument-hint: "[--open]"
+---
+
+Show TokenSaver Flux IA links and recent pipeline runs:
+
+```bash
+tokensaver flows
+# open browser:
+tokensaver flows --open
+```
+
+If MCP tools are available, also call:
+- `tokensaver_list_runs` (limit 5)
+- `tokensaver_get_last_run_detail` when the user wants step-by-step
+- `tokensaver_open_run_console` to deep-link a run
+
+Explain that each Claude message through TokenSaver can appear as a governed flow (cache, compression, PII, LLM, MCP). Do not invent token savings — only report what the tools/console show.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/help.md

@@ -0,0 +1,27 @@
+---
+description: List TokenSaver Router slash commands and CLI equivalents
+---
+
+Print this catalogue for the user:
+
+| Slash | Purpose | CLI |
+|-------|---------|-----|
+| `/tokensaver-router:models` | List profiles + catalogue | `tokensaver models` |
+| `/tokensaver-router:use` | Set model (sticky) + approve | `tokensaver use …` |
+| `/tokensaver-router:model` | Alias of use | `tokensaver use …` |
+| `/tokensaver-router:approve` | Agent Registry approve | `tokensaver approve …` |
+| `/tokensaver-router:catalog` | List/approve registry | `tokensaver catalog …` |
+| `/tokensaver-router:status` | Route statusline | `tokensaver status` |
+| `/tokensaver-router:whoami` | Identity + plan | `tokensaver whoami` |
+| `/tokensaver-router:flows` | Flux IA / recent runs | `tokensaver flows` |
+| `/tokensaver-router:pipeline` | Flux IA pipeline hint | `tokensaver status` |
+| `/tokensaver-router:quota` | Quotas / key overview | MCP `tokensaver_get_api_key_overview` |
+| `/tokensaver-router:cache` | Cache stats | MCP `tokensaver_cache_stats` |
+| `/tokensaver-router:login` | Login / signup | `tokensaver login` |
+| `/tokensaver-router:keys` | API keys | `tokensaver keys …` |
+| `/tokensaver-router:setup` | Full route setup | `tokensaver route claude` |
+| `/tokensaver-router:doctor` | Health checks | `tokensaver doctor --claude` |
+| `/tokensaver-router:unroute` | Restore Claude settings | `tokensaver unroute claude` |
+| `/tokensaver-router:help` | This list | — |
+
+Tip: if the current model is blocked (credits / 403), run the **CLI** commands in a terminal — slash prompts need a working model.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/keys.md

@@ -0,0 +1,19 @@
+---
+description: List / create / revoke TokenSaver API keys
+argument-hint: "[list|create|revoke <id>]"
+---
+
+Requires a login JWT (`tokensaver login`), not key-only import.
+
+```bash
+tokensaver keys list
+tokensaver keys create --name Claude --use
+tokensaver keys revoke <key-id>
+```
+
+If `$ARGUMENTS` is `create`, run create with `--use`.
+If it starts with `revoke`, revoke that id.
+Otherwise list keys.
+
+Warn: the plaintext key is shown once at create time — store it securely.
+Related: `/tokensaver-router:whoami`, `/tokensaver-router:login`.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/login.md

@@ -0,0 +1,26 @@
+---
+description: Log in / signup to TokenSaver (saves credentials + API key)
+argument-hint: "[--local|--key ts_…]"
+---
+
+CLI-first auth (no dashboard required):
+
+```bash
+tokensaver login
+# local API:
+tokensaver login --local
+# import existing key:
+tokensaver login --key ts_…
+# non-interactive signup example:
+tokensaver login --email you@acme.com --signup -y
+```
+
+Then route Claude:
+
+```bash
+tokensaver route claude --launch
+# or local:
+tokensaver route claude --local --launch
+```
+
+Verify with `tokensaver whoami` and `tokensaver doctor --claude`.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/model.md

@@ -0,0 +1,22 @@
+---
+description: Switch TokenSaver routing model or profile (alias of use)
+argument-hint: "<cheap|default|strong|provider/model>"
+---
+
+Alias of `/tokensaver-router:use`. Prefer that command.
+
+If `$ARGUMENTS` is set, run:
+
+```bash
+tokensaver use $ARGUMENTS
+tokensaver status --line
+```
+
+If empty, list options first:
+
+```bash
+tokensaver models
+```
+
+Then ask which profile or catalogue id to apply via `tokensaver use …`.
+After switch, approve is handled by `use`; fallback: `tokensaver approve --current`.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/models.md

@@ -0,0 +1,24 @@
+---
+description: List TokenSaver profiles and catalogue models available on your plan
+---
+
+Run (shell — works even if the chat model is blocked):
+
+```bash
+tokensaver models
+```
+
+Also show sticky Claude model via:
+
+```bash
+tokensaver status --line
+```
+
+Optional MCP (richer JSON): call `tokensaver_list_models` and paste the ids.
+
+Summarize for the user:
+1. Profiles (`cheap` / `default` / `strong`) for their plan
+2. Catalogue ids they can pass to `/tokensaver-router:use`
+3. Current sticky model if any
+
+Next step hint: `/tokensaver-router:use <profile|provider/model>`

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/quota.md

@@ -0,0 +1,17 @@
+---
+description: Show TokenSaver API key quotas and usage
+---
+
+Prefer MCP tools (paste ASCII dashboards as-is, do not rewrite into prose):
+
+1. `tokensaver_get_api_key_overview` — full key dashboard (primary)
+2. Or `tokensaver_get_quota_usage` if the user only asks for quotas
+
+If MCP is unavailable, fall back to:
+
+```bash
+tokensaver whoami
+tokensaver doctor
+```
+
+and the Flux IA / console usage pages from `tokensaver status`.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/use.md

@@ -0,0 +1,28 @@
+---
+description: Set Claude routing model or profile (sticky) and approve in Agent Registry
+argument-hint: "<cheap|default|strong|provider/model>"
+---
+
+Select a TokenSaver model for Claude Code. Prefer the CLI (updates sticky model + Agent Registry).
+
+If `$ARGUMENTS` is empty, run `tokensaver models` and ask the user which id/profile to use.
+
+Otherwise run:
+
+```bash
+# Prefer --local when status shows local
+tokensaver use $ARGUMENTS
+# equivalent:
+#   tokensaver use cheap
+#   tokensaver use openrouter/z-ai/glm-4.7-flash
+```
+
+Then verify:
+
+```bash
+tokensaver status --line
+```
+
+Tell the user to send a **new message** (or restart Claude) so the model takes effect. Statusline must show the chosen model.
+
+If approve fails (403), run `/tokensaver-router:approve $ARGUMENTS`.

tokensaver_cli-0.3.4/src/tokensaver_cli/claude_plugin/commands/whoami.md

@@ -0,0 +1,14 @@
+---
+description: Show TokenSaver identity, plan, API key, and Flux IA link
+---
+
+Run:
+
+```bash
+tokensaver whoami
+# local stack:
+tokensaver whoami --local
+```
+
+Report email, plan (Free / Pro / Enterprise), API host, key prefix, and Flux IA URL.
+Explain that Free plan profiles default to allowlisted models (e.g. GLM 4.7 Flash) while Enterprise defaults to Sonnet/Opus unless a sticky `--model` was set.

tokensaver_cli-0.3.4/src/tokensaver_cli/flows_cmd.py

@@ -0,0 +1,90 @@
+"""Flux IA deep links and recent pipeline runs."""
+
+from __future__ import annotations
+
+import sys
+import webbrowser
+from typing import Any
+
+from tokensaver_cli.api_client import ApiError, request_json
+from tokensaver_cli.config import RouteConfigError, resolve_route_config
+from tokensaver_cli.status import fetch_recent_flow_id
+
+
+def _list_recent_runs(cfg, *, limit: int = 5) -> list[dict[str, Any]]:
+    url = f"{cfg.api_v1_base}/monitoring/pipelines?days=7"
+    try:
+        data = request_json(
+            "GET",
+            url,
+            headers={"Authorization": f"Bearer {cfg.api_key}"},
+        )
+    except ApiError:
+        return []
+    if not isinstance(data, dict):
+        return []
+    out: list[dict[str, Any]] = []
+    for key in ("recent_runs", "recent_run_ids"):
+        items = data.get(key)
+        if not isinstance(items, list):
+            continue
+        for item in items:
+            if isinstance(item, str) and item.strip():
+                out.append({"id": item.strip()})
+            elif isinstance(item, dict):
+                out.append(item)
+            if len(out) >= limit:
+                return out
+    # Fallback: dig pipelines buckets
+    pipelines = data.get("pipelines") or data.get("by_pipeline") or []
+    if isinstance(pipelines, dict):
+        pipelines = list(pipelines.values())
+    if isinstance(pipelines, list):
+        for entry in pipelines:
+            if not isinstance(entry, dict):
+                continue
+            for rid in entry.get("recent_run_ids") or []:
+                if isinstance(rid, str) and rid.strip():
+                    out.append({"id": rid.strip(), "pipeline": entry.get("name") or entry.get("id")})
+                if len(out) >= limit:
+                    return out
+    return out[:limit]
+
+
+def run_flows(
+    *,
+    force_local: bool = False,
+    open_browser: bool = False,
+    limit: int = 5,
+) -> int:
+    try:
+        cfg = resolve_route_config(force_local=force_local)
+    except RouteConfigError as exc:
+        print(str(exc), file=sys.stderr)
+        return 1
+
+    flow_id = fetch_recent_flow_id(cfg)
+    url = cfg.flows_url(flow_id=flow_id)
+    print("TokenSaver Flux IA")
+    print(f"  Console: {url}")
+    if flow_id:
+        print(f"  Latest:  {flow_id}")
+    print()
+    runs = _list_recent_runs(cfg, limit=limit)
+    if runs:
+        print(f"Recent runs (up to {limit}):")
+        for row in runs:
+            rid = row.get("id") or row.get("run_id") or "?"
+            extra = row.get("pipeline") or row.get("status") or ""
+            suffix = f"  {extra}" if extra else ""
+            print(f"  {rid}{suffix}")
+        print()
+    else:
+        print("No recent runs found (send a Claude message first).")
+        print()
+
+    print("MCP: tokensaver_list_runs · tokensaver_get_last_run_detail · tokensaver_open_run_console")
+    if open_browser:
+        webbrowser.open(url)
+        print("Opened browser.")
+    return 0