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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tokensaver-cli
-Version: 0.3.2
+Version: 0.3.3
 Summary: TokenSaver CLI — route AI agents (Claude Code, Cursor, Codex) through the control plane
 Author: TokenSaver
 License-Expression: MIT

{tokensaver_cli-0.3.2 → tokensaver_cli-0.3.3}/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.3"

{tokensaver_cli-0.3.2 → tokensaver_cli-0.3.3}/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.2 → tokensaver_cli-0.3.3}/src/tokensaver_cli/profiles.py

@@ -64,8 +64,12 @@ def resolve_model(
     model: str | None,
     profile: str | None,
     plan_slug: str | None = None,
+    sticky_model: str | None = None,
 ) -> tuple[str | None, str | None]:
-    """Return ``(model_id, profile_name)``. Explicit ``--model`` wins over ``--profile``."""
+    """Return ``(model_id, profile_name)``.
+
+    Precedence: ``--model`` > ``--profile`` > sticky (last explicit choice) > plan default.
+    """
     profiles = load_profiles(plan_slug=plan_slug)
     if model and model.strip():
         mid = model.strip()
@@ -77,6 +81,10 @@ def resolve_model(
             known = ", ".join(sorted(profiles))
             raise ValueError(f"Unknown profile {profile!r}. Known: {known}")
         return profiles[name], name
+    if sticky_model and sticky_model.strip():
+        mid = sticky_model.strip()
+        matched = next((name for name, value in profiles.items() if value == mid), None)
+        return mid, matched
     return profiles.get("default"), "default"
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tokensaver-cli
-Version: 0.3.2
+Version: 0.3.3
 Summary: TokenSaver CLI — route AI agents (Claude Code, Cursor, Codex) through the control plane
 Author: TokenSaver
 License-Expression: MIT

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

@@ -129,6 +129,40 @@ def test_route_claude_free_plan_default_model(
     assert settings["env"]["ANTHROPIC_MODEL"] == FREE_PROFILES["default"]
 
 
+def test_route_claude_keeps_sticky_model_on_relaunch(
+    route_home: Path,
+    cfg: RouteConfig,
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Bare ``route --launch`` must not reset an explicit --model to plan default."""
+    monkeypatch.delenv("TOKENSAVER_PLAN", raising=False)
+    project = tmp_path / "project"
+    project.mkdir()
+    glm = "openrouter/z-ai/glm-4.7-flash"
+    old_cwd = os.getcwd()
+    try:
+        os.chdir(project)
+        assert (
+            route_claude(
+                cfg,
+                launch=False,
+                extra_args=[],
+                model=glm,
+                install_plugin=False,
+            )
+            == 0
+        )
+        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"] == glm
+    assert load_state()["claude"].meta.get("sticky_model") == glm
+
+
 def test_route_claude_project_scope(route_home: Path, cfg: RouteConfig, tmp_path: Path) -> None:
     project = tmp_path / "project"
     project.mkdir()