utim-cli 2.3.18__tar.gz → 2.3.19__tar.gz

{utim_cli-2.3.18 → utim_cli-2.3.19}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.3.19] - 2026-09-02
+
+### 🛠️ Model Dialog Tier Sync & Free Model Preservation
+- Synchronized user plan resolution on account switch to prevent paid models leaking on free accounts
+- Fixed free models disappearing when bonus quota is active
+- Removed default selected model on fresh startup and added configuration prompts
+
 ## [2.3.18] - 2026-09-02
 
 ### 🎁 New Free Models Added & Tool Sanitization Fixes

{utim_cli-2.3.18/utim_cli.egg-info → utim_cli-2.3.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utim-cli
-Version: 2.3.18
+Version: 2.3.19
 Summary: UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal.
 License: Emend AI Proprietary EULA
 Project-URL: Homepage, https://utim.dev

{utim_cli-2.3.18 → utim_cli-2.3.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utim-cli"
-version = "2.3.18"
+version = "2.3.19"
 
 description = "UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal."
 readme = "README.md"

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim/__init__.py

@@ -14,7 +14,7 @@ Quickstart:
 try:
     from utim_cli._version import VERSION as __version__
 except ImportError:
-    __version__ = "2.3.18"
+    __version__ = "2.3.19"
 
 # Developer-friendly core classes (similar to `import genai` / `import openai`)
 from utim_cli.sdk.session import UtimSession as Session

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim_cli/__init__.py

@@ -5,7 +5,7 @@ try:
     from utim_cli._version import VERSION as __version__
 except ImportError:
     # Fallback during first-install / editable-install edge cases
-    __version__ = "2.3.18"
+    __version__ = "2.3.19"
 
 
 import builtins, os, pathlib, urllib.parse, re

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim_cli/_version.py

@@ -11,6 +11,6 @@
 # from here so every surface stays in sync automatically.
 # ─────────────────────────────────────────────────────────────────────────────
 
-VERSION = "2.3.18"
+VERSION = "2.3.19"
 
 

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim_cli/auth.py

@@ -495,8 +495,20 @@ def login(restart: bool = False) -> None:
             config.set("token", "device_flow")
             config.set("email", body.get("email", ""))
             config.set("uid", body.get("user_id", ""))
-            config.set("firebase_uid", body.get("firebase_uid", ""))
             config.set("name", body.get("display_name") or (body.get("email", "") or "").split("@")[0])
+            plan_name = body.get("plan")
+            if not plan_name and body.get("api_key"):
+                try:
+                    _vr = requests.get(
+                        f"{SERVER_URL}/api/user-plan",
+                        headers={"X-API-Key": body["api_key"]},
+                        timeout=3.0,
+                    )
+                    if _vr.status_code == 200:
+                        plan_name = (_vr.json() or {}).get("plan")
+                except Exception:
+                    pass
+            config.set("user_plan", (plan_name or "free").lower())
             if body.get("api_key"):
                 config.set("api_key", body["api_key"])
             raw_print("")

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim_cli/client_utils.py

@@ -181,10 +181,10 @@ def fetch_remote_models_catalog(timeout: float = 3.0) -> dict:
         params = {}
         try:
             from utim_cli.config import config
-            _plan = (config.get("user_plan") or "all")
-            params["tier"] = str(_plan).lower().strip()
+            _plan = str(config.get("user_plan") or "free").lower().strip()
+            params["tier"] = _plan
         except Exception:
-            params["tier"] = "all"
+            params["tier"] = "free"
         resp = requests.get(url, params=params, headers=get_auth_headers(), timeout=timeout)
         if resp.status_code == 200:
             data = resp.json()

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim_cli/orchestrator.py

@@ -139,9 +139,9 @@ class Orchestrator(LLMTransportMixin, TurnHistoryMixin, ToolExecutionMixin):
             pass
         self.server_url = "https://api.utim.dev"
         self.session_id: Optional[str] = None
-        # Primary model — load from config or fall back to DEFAULT_MODEL
+        # Primary model — load from config (no default model selected on first startup)
         saved_main_model = config.get("main_model") or config.get("model")
-        self.model_id: str = saved_main_model if saved_main_model else DEFAULT_MODEL
+        self.model_id: Optional[str] = saved_main_model if saved_main_model else None
         self._current_line_len = 0
         self.tool_results: List[Dict[str, Any]] = []
         self.turn_step_timings: List[Dict[str, Any]] = []
@@ -501,6 +501,11 @@ class Orchestrator(LLMTransportMixin, TurnHistoryMixin, ToolExecutionMixin):
             self._subagent_tool_override = override_tools
         max_iterations = 500  # Continuous execution mode with milestone nudges instead of hard pauses
 
+        # If no model is configured for the main agent, prompt the user to select one
+        if not self.model_id or not str(self.model_id).strip():
+            self.console.print('\nPlease select a model by running "/model Then main agent"\n')
+            return
+
         self.turn_step_timings = []
         self._tool_failure_counts = {}
         self._tool_name_failure_counts = {}

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim_cli/tui/model_dialog.py

@@ -10,22 +10,22 @@ _LIVE_OPENROUTER_FREE_CACHE: set = set()
 _LAST_LIVE_FETCH_TIME = 0.0
 _LIVE_FETCH_LOCK = threading.Lock()  # single-flight: only one thread fetches at a time
 
-_BONUS_CREDITS_CACHE: bool | None = None
-_BONUS_CREDITS_TS: float = 0.0
+_USER_TIER_CACHE: tuple[str, bool] | None = None
+_USER_TIER_TS: float = 0.0
 
-def user_has_bonus_credits() -> bool:
-    """True when the user's account holds an available bonus-credit balance.
-
-    Per business rule: free-plan users with bonus credits must SEE and USE
-    premium models (billed against the bonus balance) until it is exhausted.
-    Cached for 90 s to keep dialogs snappy. Never raises.
+def resolve_user_tier_and_bonus(force_refresh: bool = False) -> tuple[str, bool]:
+    """Deterministically resolve the active user's plan ('free' vs paid) and bonus eligibility.
+    Refreshes config['user_plan'] using the live API key so switching accounts
+    immediately synchronizes plan gating.
     """
     import time as _time
-    global _BONUS_CREDITS_CACHE, _BONUS_CREDITS_TS
+    global _USER_TIER_CACHE, _USER_TIER_TS
     now = _time.time()
-    if _BONUS_CREDITS_CACHE is not None and (now - _BONUS_CREDITS_TS) < 90.0:
-        return bool(_BONUS_CREDITS_CACHE)
-    ok = False
+    if not force_refresh and _USER_TIER_CACHE is not None and (now - _USER_TIER_TS) < 30.0:
+        return _USER_TIER_CACHE
+
+    plan_name = "free"
+    has_bonus = False
     try:
         api_key = config.get("api_key")
         if api_key:
@@ -38,18 +38,46 @@ def user_has_bonus_credits() -> bool:
             )
             if resp.status_code == 200:
                 data = resp.json() or {}
+                is_subscribed = bool(data.get("is_subscribed", False))
+                raw_plan = str(data.get("plan", "free")).lower().strip()
+
+                bonus_balance = 0.0
                 for _k in ("free_bonus_balance", "bonus_balance", "bonus"):
                     try:
-                        if float(data.get(_k) or 0.0) > 0.0:
-                            ok = True
+                        val = float(data.get(_k) or 0.0)
+                        if val > 0.0:
+                            bonus_balance = val
                             break
                     except (TypeError, ValueError):
-                        continue
+                        pass
+                has_bonus = bonus_balance > 0.0
+
+                if is_subscribed and raw_plan != "free":
+                    plan_name = raw_plan
+                else:
+                    plan_name = "free"
+
+                config.set("user_plan", plan_name)
+                _USER_TIER_CACHE = (plan_name, has_bonus)
+                _USER_TIER_TS = now
+                return _USER_TIER_CACHE
     except Exception:
-        ok = False
-    _BONUS_CREDITS_CACHE = ok
-    _BONUS_CREDITS_TS = now
-    return ok
+        pass
+
+    cached = str(config.get("user_plan") or "free").lower().strip()
+    _USER_TIER_CACHE = (cached, False)
+    _USER_TIER_TS = now
+    return _USER_TIER_CACHE
+
+def user_has_bonus_credits() -> bool:
+    """True when the user's account holds an available bonus-credit balance.
+
+    Per business rule: free-plan users with bonus credits must SEE and USE
+    premium models (billed against the bonus balance) until it is exhausted.
+    Cached for snappy response. Never raises.
+    """
+    _, has_bonus = resolve_user_tier_and_bonus()
+    return has_bonus
 
 def fetch_active_openrouter_free_models() -> set[str]:
     """Fetch live free models directly from OpenRouter API to filter out removed/stale models."""
@@ -428,6 +456,9 @@ def _dialog_modelsettings(orchestrator):
     import copy
     
     model_id = orchestrator.model_id
+    if not model_id:
+        console.print('\n[yellow]Please select a model by running "/model Then main agent"[/yellow]\n')
+        return
     
     init_model_settings(model_id)
     initial_settings = config.get(f"model_settings_{model_id}") or {}
@@ -567,7 +598,7 @@ def _dialog_model(orchestrator):
     from utim_cli.utim import _run_mcp_search_list_dialog
 
     while True:
-        main_model = orchestrator.model_id
+        main_model = orchestrator.model_id or "Not Selected"
 
         rows = [
             {"key": "main", "label": "Configure Main Agent Model", "desc": f"Currently: {main_model}"},
@@ -624,8 +655,9 @@ def _dialog_subagents_menu(orchestrator):
                 return "None (main agent writes prompt)"
             return val or default
 
+        plan_name, has_bonus = resolve_user_tier_and_bonus()
         has_custom_key = bool(os.getenv("OPENROUTER_API_KEY") or config.get("openrouter_api_key"))
-        is_paid = is_user_paid() or (str(config.get("user_plan") or "free").lower() != "free") or has_custom_key
+        is_paid = (plan_name != "free") or has_bonus or has_custom_key
 
         rows = [
             {"key": "web_search", "label": "Deep Research Agent (web_search)",
@@ -755,8 +787,7 @@ def _dialog_model_main(orchestrator, target="main"):
         return
 
     # ── Define allowed primary and helper models based on target ──────────────
-    plan_name = str(config.get("user_plan") or "free").lower()
-    _has_bonus = user_has_bonus_credits()
+    plan_name, _has_bonus = resolve_user_tier_and_bonus(force_refresh=True)
     # Business rule: bonus credits unlock premium model VISIBILITY (and usage,
     # billed exclusively against the bonus balance) for free-plan users until
     # the balance is exhausted.
@@ -773,12 +804,18 @@ def _dialog_model_main(orchestrator, target="main"):
 
     # ── Fetch model catalog directly from Server DB ─────────────────────────
     from utim_cli.constants import SERVER_URL
+    from utim_cli.auth import get_auth_headers
     server_catalog: dict = {}
     db_models_raw: list = []
 
     try:
         import requests as _req
-        cat_resp = _req.get(f"{SERVER_URL.rstrip('/')}/models/catalog", timeout=3.5)
+        cat_resp = _req.get(
+            f"{SERVER_URL.rstrip('/')}/models/catalog",
+            params={"tier": "all" if is_paid_plan else "free"},
+            headers=get_auth_headers(),
+            timeout=3.5,
+        )
         if cat_resp.status_code == 200:
             server_catalog = cat_resp.json() or {}
     except Exception:
@@ -841,25 +878,32 @@ def _dialog_model_main(orchestrator, target="main"):
         # is from a local fallback), restrict paid-tier models for free users,
         # and hide APINEX models from paid users.
         from utim_cli.constants import APINEX_MODEL_IDS
-        if not is_paid_plan:
-            def _is_free_item(item: dict) -> bool:
-                if not item:
-                    return True
-                mid = str(item.get("model_id") or item.get("id") or "")
-                # APINEX models are designated exclusively for free plan users
-                if str(item.get("provider", "")).lower() == "apinex" or mid in APINEX_MODEL_IDS:
-                    return True
-                if item.get("is_free"):
-                    return True
-                if str(item.get("tier", "")).lower() == "free":
-                    return True
-                if mid.endswith(":free") or mid.startswith("free/"):
-                    return True
-                return False
-            _before = len(candidates)
-            candidates = [c for c in candidates if _is_free_item(c)]
-            if len(candidates) < _before:
-                pass  # filtered silently; no logger in this module
+        is_actual_paid_subscription = (plan_name != "free")
+        if not is_actual_paid_subscription:
+            # User is on the Free plan:
+            if not _has_bonus:
+                # No bonus credits: restrict list to free models + APINEX models only
+                def _is_free_item(item: dict) -> bool:
+                    if not item:
+                        return True
+                    mid = str(item.get("model_id") or item.get("id") or "")
+                    # APINEX models are designated exclusively for free plan users
+                    if str(item.get("provider", "")).lower() == "apinex" or mid in APINEX_MODEL_IDS:
+                        return True
+                    if item.get("is_free"):
+                        return True
+                    if str(item.get("tier", "")).lower() == "free":
+                        return True
+                    if mid.endswith(":free") or mid.startswith("free/"):
+                        return True
+                    return False
+                _before = len(candidates)
+                candidates = [c for c in candidates if _is_free_item(c)]
+                if len(candidates) < _before:
+                    pass  # filtered silently; no logger in this module
+            else:
+                # Free plan with bonus quota: retain ALL free and APINEX models, plus unlocked premium models
+                pass
         else:
             # Paid plan users: APINEX models only show up for free plan users, hidden on paid plans
             candidates = [
@@ -903,16 +947,20 @@ def _dialog_model_main(orchestrator, target="main"):
                 if has_text_output:
                     candidates.append(sm)
 
-        if not is_paid_plan:
-            candidates = [
-                c for c in candidates
-                if str(c.get("provider", "")).lower() == "apinex"
-                or str(c.get("model_id") or c.get("id") or "") in APINEX_MODEL_IDS
-                or c.get("is_free")
-                or str(c.get("tier", "")).lower() == "free"
-                or str(c.get("model_id", "")).endswith(":free")
-                or str(c.get("model_id", "")).startswith("free/")
-            ]
+        is_actual_paid_subscription = (plan_name != "free")
+        if not is_actual_paid_subscription:
+            if not _has_bonus:
+                candidates = [
+                    c for c in candidates
+                    if str(c.get("provider", "")).lower() == "apinex"
+                    or str(c.get("model_id") or c.get("id") or "") in APINEX_MODEL_IDS
+                    or c.get("is_free")
+                    or str(c.get("tier", "")).lower() == "free"
+                    or str(c.get("model_id", "")).endswith(":free")
+                    or str(c.get("model_id", "")).startswith("free/")
+                ]
+            else:
+                pass
         else:
             candidates = [
                 c for c in candidates

{utim_cli-2.3.18 → utim_cli-2.3.19}/utim_cli/utim.py

@@ -1384,8 +1384,10 @@ def _get_footer_line2_right():
         or STATE.get("model")
         or config.get("main_model")
         or config.get("model")
-        or DEFAULT_MODEL
+        or ""
     )
+    if not curr_model:
+        return [('class:ft-cwd', 'No Model Selected ')]
     settings = config.get(f"model_settings_{curr_model}") or {}
     effort = (
         settings.get("reasoning_effort")

{utim_cli-2.3.18 → utim_cli-2.3.19/utim_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utim-cli
-Version: 2.3.18
+Version: 2.3.19
 Summary: UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal.
 License: Emend AI Proprietary EULA
 Project-URL: Homepage, https://utim.dev