utim-cli 1.46.35__tar.gz → 1.46.36__tar.gz

{utim_cli-1.46.35 → utim_cli-1.46.36}/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to the UTIM CLI Agent will be documented in this file.
 
+## [1.46.36] - 2026-07-12
+
+### Added
+- **Reciprocal Server URL Fallbacks**: Integrated automatic fallback routing in the request session patcher to dynamically swap and retry calls between `api.utim.dev` and `utim-cli-production.up.railway.app` in case of connection timeouts or proxy blocking errors.
+
 ## [1.46.35] - 2026-07-11
 
 ### Added

{utim_cli-1.46.35/utim_cli.egg-info → utim_cli-1.46.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utim-cli
-Version: 1.46.35
+Version: 1.46.36
 Summary: UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal.
 License: MIT
 Project-URL: Homepage, https://utim.dev
@@ -20,7 +20,6 @@ Classifier: Intended Audience :: Developers
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: openai>=1.30.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: aiohttp>=3.9.5
 Requires-Dist: python-dotenv==1.0.1
@@ -30,9 +29,10 @@ Requires-Dist: chardet==4.0.0
 Requires-Dist: typer>=0.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: prompt_toolkit>=3.0.0
-Requires-Dist: mcp>=0.1.0
 Requires-Dist: nest-asyncio>=1.5.0
 Requires-Dist: sqlalchemy>=2.0.0
+Requires-Dist: openai>=1.30.0; platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")
+Requires-Dist: mcp>=0.1.0; platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")
 Provides-Extra: search
 Requires-Dist: scrapy>=2.11.0; extra == "search"
 Requires-Dist: scrapy-playwright>=0.0.34; extra == "search"
@@ -44,6 +44,8 @@ Requires-Dist: tree-sitter>=0.21.0; extra == "parsers"
 Requires-Dist: tree-sitter-python>=0.21.0; extra == "parsers"
 Requires-Dist: tree-sitter-javascript>=0.21.0; extra == "parsers"
 Requires-Dist: tree-sitter-typescript>=0.21.0; extra == "parsers"
+Provides-Extra: mcp
+Requires-Dist: mcp>=0.1.0; extra == "mcp"
 Provides-Extra: full
 Requires-Dist: scrapy>=2.11.0; extra == "full"
 Requires-Dist: scrapy-playwright>=0.0.34; extra == "full"
@@ -53,6 +55,10 @@ Requires-Dist: tree-sitter>=0.21.0; extra == "full"
 Requires-Dist: tree-sitter-python>=0.21.0; extra == "full"
 Requires-Dist: tree-sitter-javascript>=0.21.0; extra == "full"
 Requires-Dist: tree-sitter-typescript>=0.21.0; extra == "full"
+Requires-Dist: mcp>=0.1.0; (platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")) and extra == "full"
+Requires-Dist: openai>=1.30.0; (platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")) and extra == "full"
+Provides-Extra: legacy-agent
+Requires-Dist: openai>=1.30.0; extra == "legacy-agent"
 
 # UTIM CLI Agent: Enterprise Coder Assistant
 
@@ -194,6 +200,12 @@ pip install utim-cli
 pip install "utim-cli[full]"
 ```
 
+Desktop installs include the normal SDK/MCP path automatically. Mobile/Termux
+installs keep those native-heavy pieces optional to avoid `pydantic-core`; use
+`utim-cli[mcp]` or `utim-cli[legacy-agent]` only if you explicitly need them.
+Do not install `utim_cli/server/requirements.txt` unless you are deploying the
+server.
+
 ### Source install (development)
 ```bash
 git clone https://github.com/emendai/utim.git

{utim_cli-1.46.35 → utim_cli-1.46.36}/README.md

@@ -131,18 +131,24 @@ Inside the interactive chat terminal, type these slash commands for direct works
 npm install -g @emend-ai/utim
 ```
 
-### pip (from PyPI)
-```bash
-pip install utim-cli
-# Full install with optional features (web search, images, parsers)
-pip install "utim-cli[full]"
-```
-
-### Source install (development)
-```bash
-git clone https://github.com/emendai/utim.git
-cd utim
-pip install -e ".[full]"
+### pip (from PyPI)
+```bash
+pip install utim-cli
+# Full install with optional features (web search, images, parsers)
+pip install "utim-cli[full]"
+```
+
+Desktop installs include the normal SDK/MCP path automatically. Mobile/Termux
+installs keep those native-heavy pieces optional to avoid `pydantic-core`; use
+`utim-cli[mcp]` or `utim-cli[legacy-agent]` only if you explicitly need them.
+Do not install `utim_cli/server/requirements.txt` unless you are deploying the
+server.
+
+### Source install (development)
+```bash
+git clone https://github.com/emendai/utim.git
+cd utim
+pip install -e ".[full]"
 ```
 
 ### Smoke-test your install

{utim_cli-1.46.35 → utim_cli-1.46.36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utim-cli"
-version = "1.46.35"
+version = "1.46.36"
 description = "UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -22,7 +22,6 @@ classifiers = [
     "Intended Audience :: Developers",
 ]
 dependencies = [
-    "openai>=1.30.0",
     "requests==2.31.0",
     "aiohttp>=3.9.5",
     "python-dotenv==1.0.1",
@@ -32,9 +31,10 @@ dependencies = [
     "typer>=0.9.0",
     "rich>=13.0.0",
     "prompt_toolkit>=3.0.0",
-    "mcp>=0.1.0",
     "nest-asyncio>=1.5.0",
     "sqlalchemy>=2.0.0",
+    "openai>=1.30.0; platform_system != 'Linux' or (platform_machine != 'aarch64' and platform_machine != 'arm64')",
+    "mcp>=0.1.0; platform_system != 'Linux' or (platform_machine != 'aarch64' and platform_machine != 'arm64')",
 ]
 
 [project.urls]
@@ -59,6 +59,9 @@ parsers = [
     "tree-sitter-javascript>=0.21.0",
     "tree-sitter-typescript>=0.21.0",
 ]
+mcp = [
+    "mcp>=0.1.0",
+]
 full = [
     "scrapy>=2.11.0",
     "scrapy-playwright>=0.0.34",
@@ -68,6 +71,11 @@ full = [
     "tree-sitter-python>=0.21.0",
     "tree-sitter-javascript>=0.21.0",
     "tree-sitter-typescript>=0.21.0",
+    "mcp>=0.1.0; platform_system != 'Linux' or (platform_machine != 'aarch64' and platform_machine != 'arm64')",
+    "openai>=1.30.0; platform_system != 'Linux' or (platform_machine != 'aarch64' and platform_machine != 'arm64')",
+]
+legacy-agent = [
+    "openai>=1.30.0",
 ]
 
 [project.scripts]

{utim_cli-1.46.35 → utim_cli-1.46.36}/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__ = "1.46.35"
+    __version__ = "1.46.36"
 
 import builtins, os, pathlib, urllib.parse, re
 

{utim_cli-1.46.35 → utim_cli-1.46.36}/utim_cli/_version.py

@@ -11,4 +11,4 @@
 # from here so every surface stays in sync automatically.
 # ─────────────────────────────────────────────────────────────────────────────
 
-VERSION = "1.46.35"
+VERSION = "1.46.36"

{utim_cli-1.46.35 → utim_cli-1.46.36}/utim_cli/agent.py

@@ -1,9 +1,8 @@
 import os
-import json
-import sys
-import time
-from openai import OpenAI
-from .tools import get_tools
+import json
+import sys
+import time
+from .tools import get_tools
 from rich.console import Console
 from rich.live import Live
 from rich.spinner import Spinner
@@ -52,10 +51,18 @@ class ReActAgent:
         if not api_key:
             self.console.print("[dim]⚠  Warning: OPENROUTER_API_KEY is not set.[/dim]")
 
-        self.client = OpenAI(
-            base_url="https://openrouter.ai/api/v1",
-            api_key=api_key or "sk-fake-key-for-init",
-        )
+        try:
+            from openai import OpenAI
+        except ImportError as exc:
+            raise RuntimeError(
+                "The legacy ReActAgent requires the optional OpenAI SDK. "
+                "Install it with: pip install 'utim-cli[legacy-agent]'"
+            ) from exc
+
+        self.client = OpenAI(
+            base_url="https://openrouter.ai/api/v1",
+            api_key=api_key or "sk-fake-key-for-init",
+        )
         self.messages = [{"role": "system", "content": system_prompt}]
         self.start_time = None
 

{utim_cli-1.46.35 → utim_cli-1.46.36}/utim_cli/doctor.py

@@ -21,8 +21,8 @@ def run_diagnostics(console: Console = None):
     # 2. Dependency Check
     console.print("\n  [bold #42bcf5]Core Dependencies:[/bold #42bcf5]")
     core_dependencies = [
-        "openai", "requests", "aiohttp", "typer", "rich", 
-        "prompt_toolkit", "mcp", "nest_asyncio"
+        "requests", "aiohttp", "typer", "rich",
+        "prompt_toolkit", "nest_asyncio"
     ]
     for dep in core_dependencies:
         try:
@@ -40,6 +40,8 @@ def run_diagnostics(console: Console = None):
         "scrapy": "Scrapy search crawler",
         "scrapy-playwright": "Playwright JS crawler",
         "pillow": "Image utilities (generate_image)",
+        "openai": "Legacy ReActAgent SDK client",
+        "mcp": "Model Context Protocol server integrations",
     }
     for dep, feat in optional_dependencies.items():
         try:

{utim_cli-1.46.35 → utim_cli-1.46.36}/utim_cli/orchestrator.py

@@ -750,10 +750,11 @@ class Orchestrator:
                 f"or .env file (looked in {_cwd_env!r} then .utim/.env).[/bold yellow]\n"
             )
 
-        self._local_client: bool = bool(self._local_api_key)  
-
-        # OpenRouter base URL (can be overridden per-model for custom providers)
-        self._openrouter_base_url = "https://openrouter.ai/api/v1/chat/completions"
+        self._local_client: bool = bool(self._local_api_key)  
+
+        # OpenRouter base URL (can be overridden per-model for custom providers)
+        self._openrouter_base_url = "https://openrouter.ai/api/v1/chat/completions"
+        self.model_source: Optional[str] = config.get("main_model_source")
 
         # Cancellation flag
         self.cancel_event = threading.Event()
@@ -854,13 +855,14 @@ class Orchestrator:
                 )
                 
                 # Write current active session state to session_state.json
-                state_data = {
-                    "session_id": self.session_id,
-                    "messages": clean_messages,
-                    "turn_history": clean_turn_history,
-                    "redo_history": clean_redo_history,
-                    "model_id": self.model_id
-                }
+                state_data = {
+                    "session_id": self.session_id,
+                    "messages": clean_messages,
+                    "turn_history": clean_turn_history,
+                    "redo_history": clean_redo_history,
+                    "model_id": self.model_id,
+                    "model_source": self.model_source,
+                }
                 os.makedirs(".utim", exist_ok=True)
                 with open(".utim/session_state.json", "w", encoding="utf-8") as f:
                     json.dump(state_data, f, ensure_ascii=False, indent=4)
@@ -880,15 +882,37 @@ class Orchestrator:
     )
 
     # ── Custom-provider endpoint resolution ─────────────────────────────────
-    def _resolve_model_endpoint(self, model_id: str) -> tuple:
-        """Return (chat_completions_url, api_key) for *model_id*.
-
-        Custom models (added via /model add) carry their own base_url and
-        api_key; everything else falls back to OpenRouter.
-        """
-        custom = config.get_custom_model(model_id)
-        if custom:
-            base = custom.get("base_url", "").rstrip("/")
+    def _get_configured_model_source(self, model_id: str, *, is_primary: bool = False) -> Optional[str]:
+        """Return the selected source for a model id when the picker recorded one."""
+        if is_primary:
+            source = getattr(self, "model_source", None) or config.get("main_model_source")
+            if source in ("custom", "utim", "openrouter"):
+                return source
+
+        for key, value in config._data.items():
+            if key.startswith("subagent_model_") and not key.endswith("_source") and value == model_id:
+                source = config.get(f"{key}_source")
+                if source in ("custom", "utim", "openrouter"):
+                    return source
+        return None
+
+    def _is_custom_model_selection(self, model_id: str, *, is_primary: bool = False) -> bool:
+        source = self._get_configured_model_source(model_id, is_primary=is_primary)
+        if source in ("utim", "openrouter"):
+            return False
+        if source == "custom":
+            return bool(config.get_custom_model(model_id))
+        return bool(config.get_custom_model(model_id))
+
+    def _resolve_model_endpoint(self, model_id: str, *, is_primary: bool = False) -> tuple:
+        """Return (chat_completions_url, api_key) for *model_id*.
+
+        Custom models (added via /model add) carry their own base_url and
+        api_key; everything else falls back to OpenRouter.
+        """
+        custom = config.get_custom_model(model_id) if self._is_custom_model_selection(model_id, is_primary=is_primary) else None
+        if custom:
+            base = custom.get("base_url", "").rstrip("/")
             # Append /chat/completions if the caller gave us just the base path
             if not base.endswith("/chat/completions"):
                 url = base + "/chat/completions"
@@ -923,7 +947,7 @@ class Orchestrator:
                 if resp.status_code == 200:
                     quota = resp.json()
                     chosen_model = override_model if override_model else self.model_id
-                    is_custom = bool(config.get_custom_model(chosen_model))
+                    is_custom = self._is_custom_model_selection(chosen_model, is_primary=not override_model)
 
                     # 1. Check if quota is exhausted (only for non-custom models)
                     used = quota.get("credits_used", quota.get("requests_used", 0.0))
@@ -950,7 +974,7 @@ class Orchestrator:
                     models_allowed = quota["models_allowed"]
                     free_bonus_balance = quota.get("free_bonus_balance", 0.0) or 0.0
                     chosen_model = override_model if override_model else self.model_id
-                    is_custom = bool(config.get_custom_model(chosen_model))
+                    is_custom = self._is_custom_model_selection(chosen_model, is_primary=not override_model)
 
                     # If user has active bonus credits, all models are unlocked — skip gating entirely
                     if not is_custom and free_bonus_balance <= 0.0 and models_allowed != ["all"] and chosen_model not in models_allowed and not chosen_model.endswith(":free"):
@@ -960,18 +984,22 @@ class Orchestrator:
                             self.console.print("  Top up at [bold]utim.dev/pricing[/bold] or run [bold]utim upgrade[/bold].\n")
                             fallback_model = DEFAULT_MODEL
                             self.console.print(f"  Falling back to: [bold]{fallback_model}[/bold]")
-                            if override_model:
-                                override_model = fallback_model
-                            else:
-                                self.model_id = fallback_model
-                        else:
-                            fallback_model = DEFAULT_MODEL  # default free fallback
+                            if override_model:
+                                override_model = fallback_model
+                            else:
+                                self.model_id = fallback_model
+                                self.model_source = "utim"
+                                config.set("main_model_source", "utim")
+                        else:
+                            fallback_model = DEFAULT_MODEL  # default free fallback
                             self.console.print(f"\n[bold yellow]⚠ Model '{chosen_model}' is gated under your current '{quota['display_name']}' plan.[/bold yellow]")
                             self.console.print(f"  Downgrading to default allowed model: '{fallback_model}' for this request.")
-                            if override_model:
-                                override_model = fallback_model
-                            else:
-                                self.model_id = fallback_model
+                            if override_model:
+                                override_model = fallback_model
+                            else:
+                                self.model_id = fallback_model
+                                self.model_source = "utim"
+                                config.set("main_model_source", "utim")
             except SystemExit:
                 raise
             except Exception:
@@ -994,7 +1022,8 @@ class Orchestrator:
             if self.cancel_event.is_set():
                 break
                 
-            current_is_custom = bool(config.get_custom_model(current_model))
+            current_is_primary = model_idx == 0
+            current_is_custom = self._is_custom_model_selection(current_model, is_primary=current_is_primary and not override_model)
             # Check for API key only if we need it for this built-in/OpenRouter model
             if not current_is_custom and not self._local_api_key and not config.get("api_key"):
                 continue
@@ -1061,7 +1090,10 @@ class Orchestrator:
                             "session_id": self.session_id,
                         }
                     else:
-                        _endpoint_url, _endpoint_key = self._resolve_model_endpoint(current_model)
+                        _endpoint_url, _endpoint_key = self._resolve_model_endpoint(
+                            current_model,
+                            is_primary=current_is_primary and not override_model,
+                        )
                         _headers = {
                             "Authorization": f"Bearer {_endpoint_key}",
                             "Content-Type": "application/json",

{utim_cli-1.46.35 → utim_cli-1.46.36}/utim_cli/tui/model_dialog.py

@@ -1,8 +1,9 @@
-import os
-import json
-import httpx
-import re
-from utim_cli.config import config
+import os
+import json
+import httpx
+import re
+import textwrap
+from utim_cli.config import config
 
 def _safe_prompt(prompt_text: str, color: str = None, is_password: bool = False) -> str:
     """Bulletproof replacement for prompt_toolkit's prompt() when nested inside run_in_terminal context.
@@ -609,12 +610,12 @@ def _dialog_model_main(orchestrator, target="main"):
             if "free" not in tags_val:
                 tags_val = list(tags_val) + ["free"]
                 
-        primary_models.append({
-            "model_id": mid,
-            "desc": desc_val,
-            "tags": tags_val,
-            "source": "openrouter"
-        })
+        primary_models.append({
+            "model_id": mid,
+            "desc": desc_val,
+            "tags": tags_val,
+            "source": "utim"
+        })
 
     # Sort based on cost hierarchy
     primary_models = sorted(primary_models, key=lambda x: (cost_hierarchy.get(x["model_id"], (9, ""))[0], x["model_id"]))
@@ -661,62 +662,147 @@ def _dialog_model_main(orchestrator, target="main"):
             "label": "⬜  None  (main agent writes prompt directly)",
         })
 
-    # Hoist the currently selected model to the top of the list so it is highlighted by default
-    current_model = None
-    if target == 'main':
-        current_model = orchestrator.model_id
-    elif target.startswith('subagent_'):
-        subkey = target.split('_', 1)[1]
-        current_model = config.get(f"subagent_model_{subkey}")
-
-    if current_model:
-        current_item = None
-        for item in models:
-            if item["model_id"] == current_model:
-                current_item = item
-                break
-        if current_item:
-            models.remove(current_item)
-            models.insert(0, current_item)
-
-    if not models:
-        console.print("\n[red]No models available.[/red]\n")
-        return
-
-    def render_model(i, m, sel):
-        bg  = 'bg:#a6e3a1 bold #1e1e2e' if sel else ''
-        mid = m['model_id']
-        source = m.get('source', 'openrouter')
-
-        # Sentinel items: Non-Agent Tool / None
-        if source == 'sentinel':
-            label = m.get('label', mid)
-            sentinel_style = 'bg:#f9e2af bold #1e1e2e' if sel else 'bold #f9e2af'
-            desc_style = bg or 'fg:#585b70'
-            current_mark = ''
-            subkey = target.split('_', 1)[1] if target.startswith('subagent_') else ''
-            if config.get(f"subagent_model_{subkey}") == mid:
-                current_mark = '  ◀ current'
-            if is_paid_plan:
-                return [
-                    (sentinel_style, f"  {label:<26}"),
-                    (sentinel_style, f"{'':<12}"),
-                    (sentinel_style, f"{'':<14}"),
-                    (desc_style, f" {m['desc']}{current_mark}\n\n"),
-                ]
-            else:
-                return [
-                    (sentinel_style, f"  {label}"),
-                    (sentinel_style, f"{current_mark}\n"),
-                    (desc_style, f"     {m['desc']}\n\n"),
-                ]
-
-        # Clean display ID (remove provider prefix and ':free' suffix)
-        display_id = mid
-        if source == 'openrouter':
-            display_id = mid.split('/', 1)[-1]
-            if display_id.endswith(':free'):
-                display_id = display_id[:-5]
+
+    # Sort based on cost hierarchy
+    primary_models = sorted(primary_models, key=lambda x: (cost_hierarchy.get(x["model_id"], (9, ""))[0], x["model_id"]))
+
+    # ── Prepend user-defined custom models ───────────────────────────────────
+    custom_entries = [
+        {
+            "model_id": m["model_id"],
+            "tags": ["custom", m.get("provider_name", "")],
+            "source": "custom",
+            "desc": f"Custom model via {m.get('provider_name', 'Custom')}."
+        }
+        for m in config.custom_models
+    ]
+    models = custom_entries + primary_models
+
+    # ── Inject sentinel options for subagent targets ───────────────────────────
+    # "Non-Agent Tool" — disables the LLM loop, tool runs in simple direct mode
+    # "None" — only available for generate_image, so main agent writes the prompt
+    _BLENDER_TARGETS = ('subagent_blender_vision', 'subagent_blender_code')
+    if target.startswith('subagent_') and target not in ('subagent_image_gen',) + _BLENDER_TARGETS:
+        non_agent_desc = (
+            "Disable the LLM subagent loop. Tool runs in direct/simple mode (e.g. web search = raw results, "
+            "codebase investigator = file content only, planner = task list from main agent)."
+        )
+        sentinel_label = "🚫  Non-Agent Tool  (direct mode)"
+        if target in ("subagent_generate_image",):
+            sentinel_label = "⬜  None  (main agent writes the image prompt)"
+            non_agent_desc = "Disable the prompt expander entirely — the main agent writes the image prompt directly."
+        models.insert(0, {
+            "model_id": "__non_agent__",
+            "desc": non_agent_desc,
+            "tags": ["sentinel"],
+            "source": "sentinel",
+            "label": sentinel_label,
+        })
+    if target == 'subagent_generate_image':
+        # Also offer a 2nd sentinel: __none__ = no prompt expander at all
+        models.insert(0, {
+            "model_id": "__none__",
+            "desc": "Disable the prompt expander entirely — the main agent writes the image prompt directly.",
+            "tags": ["sentinel"],
+            "source": "sentinel",
+            "label": "⬜  None  (main agent writes prompt directly)",
+        })
+
+    # Hoist the currently selected model to the top of the list so it is highlighted by default
+    current_model = None
+    current_source = None
+    if target == 'main':
+        current_model = orchestrator.model_id
+        current_source = getattr(orchestrator, 'model_source', None) or config.get("main_model_source")
+    elif target.startswith('subagent_'):
+        subkey = target.split('_', 1)[1]
+        current_model = config.get(f"subagent_model_{subkey}")
+        current_source = config.get(f"subagent_model_{subkey}_source")
+
+    def _normalize_source(source: str | None) -> str:
+        return "utim" if source in (None, "", "openrouter") else source
+
+    if current_model in ("__non_agent__", "__none__"):
+        current_source = "sentinel"
+    else:
+        current_source = _normalize_source(current_source)
+
+    if current_model:
+        current_item = None
+        for item in models:
+            if item["model_id"] == current_model and _normalize_source(item.get("source")) == current_source:
+                current_item = item
+                break
+        if current_item:
+            models.remove(current_item)
+            models.insert(0, current_item)
+
+    if not models:
+        console.print("\n[red]No models available.[/red]\n")
+        return
+
+    def render_model(i, m, sel):
+        bg  = 'bg:#a6e3a1 bold #1e1e2e' if sel else ''
+        mid = m['model_id']
+        source = _normalize_source(m.get('source'))
+
+        def _compact_desc(text: str, width: int) -> list[str]:
+            text = re.sub(r"\s+", " ", str(text or "Fast, efficient model.")).strip()
+            text = re.sub(r"\bThis model\b", "It", text, flags=re.IGNORECASE)
+            parts = re.split(r"(?<=[.!?])\s+", text)
+            compact = parts[0] if parts and parts[0] else text
+            if len(compact) < 48 and len(parts) > 1:
+                compact = f"{compact} {parts[1]}"
+            max_chars = max(width, min(120, width * 2))
+            if len(compact) > max_chars:
+                compact = compact[:max_chars].rsplit(" ", 1)[0].rstrip(" ,;:")
+                compact += "..."
+            return textwrap.wrap(
+                compact,
+                width=width,
+                max_lines=2,
+                placeholder="...",
+                break_long_words=False,
+            ) or [""]
+
+        # Sentinel items: Non-Agent Tool / None
+        if source == 'sentinel':
+            label = m.get('label', mid)
+            sentinel_style = 'bg:#f9e2af bold #1e1e2e' if sel else 'bold #f9e2af'
+            desc_style = bg or 'fg:#585b70'
+            current_mark = ''
+            subkey = target.split('_', 1)[1] if target.startswith('subagent_') else ''
+            if config.get(f"subagent_model_{subkey}") == mid:
+                current_mark = '  ◀ current'
+            if is_paid_plan:
+                desc_width = max(24, min(54, (console.size.width or 100) - 62))
+                desc_lines = _compact_desc(m['desc'], desc_width)
+                desc_text = f" {desc_lines[0]}{current_mark}\n"
+                for extra in desc_lines[1:]:
+                    desc_text += f"{'':<55}{extra}\n"
+                desc_text += "\n"
+                return [
+                    (sentinel_style, f"  {label:<26}"),
+                    (sentinel_style, f"{'':<12}"),
+                    (sentinel_style, f"{'':<14}"),
+                    (desc_style, desc_text),
+                ]
+            else:
+                desc_width = max(24, min(72, (console.size.width or 100) - 10))
+                desc_lines = _compact_desc(m['desc'], desc_width)
+                desc_text = "".join(f"     {line}\n" for line in desc_lines) + "\n"
+                return [
+                    (sentinel_style, f"  {label}"),
+                    (sentinel_style, f"{current_mark}\n"),
+                    (desc_style, desc_text),
+                ]
+
+        # Clean display ID (remove provider prefix and ':free' suffix)
+        display_id = mid
+        if source == 'utim':
+            display_id = mid.split('/', 1)[-1]
+            if display_id.endswith(':free'):
+                display_id = display_id[:-5]
                 
         if display_id == "gemini-3.1-pro-preview-customtools":
             display_id = "gemini-3.1-pro-preview"
@@ -727,9 +813,9 @@ def _dialog_model_main(orchestrator, target="main"):
 
         
         current = ''
-        if target == 'main' and mid == orchestrator.model_id:
+        if target == 'main' and mid == orchestrator.model_id and source == current_source:
             current = '  ◀ current'
-        elif target.startswith('subagent_') and mid == config.get(f"subagent_model_{target.split('_', 1)[1]}"):
+        elif target.startswith('subagent_') and mid == config.get(f"subagent_model_{target.split('_', 1)[1]}") and source == current_source:
             current = '  ◀ current'
 
         desc = m.get("desc", "Fast, efficient model for daily tasks.")
@@ -759,18 +845,28 @@ def _dialog_model_main(orchestrator, target="main"):
                 else:
                     cost_style = "fg:#f38ba8"
 
-            return [
-                (style,      col_model),
-                (cost_style, col_cost),
-                (rec_style,  col_rec),
-                (desc_style, f" {desc}{current}\n\n"),
-            ]
-        else:
-            return [
-                (style,      f"  {display_id}"),
-                (style,      f"{current}\n"),
-                (desc_style, f"     {desc}\n\n"),
-            ]
+            desc_width = max(24, min(54, (console.size.width or 100) - 62))
+            desc_lines = _compact_desc(desc, desc_width)
+            desc_text = f" {desc_lines[0]}{current}\n"
+            for extra in desc_lines[1:]:
+                desc_text += f"{'':<55}{extra}\n"
+            desc_text += "\n"
+
+            return [
+                (style,      col_model),
+                (cost_style, col_cost),
+                (rec_style,  col_rec),
+                (desc_style, desc_text),
+            ]
+        else:
+            desc_width = max(24, min(72, (console.size.width or 100) - 10))
+            desc_lines = _compact_desc(desc, desc_width)
+            desc_text = "".join(f"     {line}\n" for line in desc_lines) + "\n"
+            return [
+                (style,      f"  {display_id}"),
+                (style,      f"{current}\n"),
+                (desc_style, desc_text),
+            ]
 
     title_str = 'Select Model  [dim](a=Add Custom  b=BYOK Import  d=Delete Custom  x=Disconnect Provider  q=Cancel)[/dim]'
     if is_paid_plan:
@@ -785,20 +881,23 @@ def _dialog_model_main(orchestrator, target="main"):
 
     if action == 'select':
         selected_model = models[idx]['model_id']
-        source = models[idx].get('source', 'openrouter')
+        source = _normalize_source(models[idx].get('source'))
         label = '[yellow](custom)[/yellow] ' if source == 'custom' else ''
         
-        if target == 'main':
-            orchestrator.model_id = selected_model
+        if target == 'main':
+            orchestrator.model_id = selected_model
+            orchestrator.model_source = source
+            config.set("main_model_source", source)
             console.print(f"\n[bold #f9e2af]✓ Main Agent model set to {label}{selected_model}[/bold #f9e2af]\n")
             # Update compression threshold for new model
             try:
                 orchestrator._update_model_threshold(orchestrator.model_id)
             except Exception:
                 pass
-        elif target.startswith('subagent_'):
-            subkey = target.split('_', 1)[1]
-            config.set(f"subagent_model_{subkey}", selected_model)
+        elif target.startswith('subagent_'):
+            subkey = target.split('_', 1)[1]
+            config.set(f"subagent_model_{subkey}", selected_model)
+            config.set(f"subagent_model_{subkey}_source", source)
             console.print(f"\n[bold #f9e2af]✓ {subkey} subagent model set to {label}{selected_model}[/bold #f9e2af]\n")
 
     elif action == 'add_custom':
@@ -1111,10 +1210,12 @@ def _dialog_add_custom_model(orchestrator):
     except (EOFError, KeyboardInterrupt):
         switch = "n"
 
-    if switch in ("", "y", "yes"):
-        orchestrator.model_id = model_id
-        try:
-            orchestrator._update_model_threshold(model_id)
+    if switch in ("", "y", "yes"):
+        orchestrator.model_id = model_id
+        orchestrator.model_source = "custom"
+        config.set("main_model_source", "custom")
+        try:
+            orchestrator._update_model_threshold(model_id)
         except Exception:
             pass
         add_console.print(f"\n[bold #a6e3a1]✓ Now using {model_id}[/bold #a6e3a1]\n")
@@ -1144,10 +1245,12 @@ def _dialog_delete_custom_model(orchestrator, model_id: str):
         if removed:
             del_console.print(f"\n[bold #a6e3a1]✓ Removed {model_id}[/bold #a6e3a1]\n")
             # If the deleted model was active, reset to default
-            if orchestrator.model_id == model_id:
-                from utim_cli.constants import DEFAULT_MODEL
-                orchestrator.model_id = DEFAULT_MODEL
-                del_console.print(f"[dim]Switched back to {DEFAULT_MODEL}[/dim]\n")
+            if orchestrator.model_id == model_id and (getattr(orchestrator, "model_source", None) or config.get("main_model_source")) == "custom":
+                from utim_cli.constants import DEFAULT_MODEL
+                orchestrator.model_id = DEFAULT_MODEL
+                orchestrator.model_source = "utim"
+                config.set("main_model_source", "utim")
+                del_console.print(f"[dim]Switched back to {DEFAULT_MODEL}[/dim]\n")
         else:
             del_console.print("[yellow]Model not found in custom list.[/yellow]\n")
     else:
@@ -1226,17 +1329,20 @@ def _dialog_disconnect_provider(orchestrator):
         )
         # If active model was deleted, reset to DEFAULT_MODEL
         active_model = orchestrator.model_id
-        active_still_exists = any(m["model_id"] == active_model for m in config.custom_models)
-        if not active_still_exists and active_model not in [DEFAULT_MODEL, "anthropic/claude-sonnet-4.6"]:
+        active_source = getattr(orchestrator, "model_source", None) or config.get("main_model_source")
+        active_still_exists = any(m["model_id"] == active_model for m in config.custom_models)
+        if active_source == "custom" and not active_still_exists and active_model not in [DEFAULT_MODEL, "anthropic/claude-sonnet-4.6"]:
             is_custom_removed = True
             # Hardcoded check since we cannot import utim_cli.server in production CLI builds
             # (as the server module is excluded from the package in pyproject.toml)
             if active_model.startswith("openai/") or active_model.startswith("anthropic/") or active_model.startswith("google/") or active_model.startswith("cohere/"):
                 is_custom_removed = False
             
-            if is_custom_removed:
-                orchestrator.model_id = DEFAULT_MODEL
-                disc_console.print(f"[dim]Active model removed. Switched back to cohere/north-mini-code:free[/dim]\n")
+            if is_custom_removed:
+                orchestrator.model_id = DEFAULT_MODEL
+                orchestrator.model_source = "utim"
+                config.set("main_model_source", "utim")
+                disc_console.print(f"[dim]Active model removed. Switched back to cohere/north-mini-code:free[/dim]\n")
     else:
         disc_console.print("\n[dim]Cancelled.[/dim]\n")
 

{utim_cli-1.46.35 → utim_cli-1.46.36}/utim_cli/utim.py

@@ -883,7 +883,7 @@ def _print_animated_banner(animated: bool = True):
     else:
         console.print(f"[bold {color}]{BANNER_BIG}[/bold {color}]")
             
-    console.print(f" [bold white]U Think I Make[/bold white] [dim]v1.46.35[/dim]")
+    console.print(f" [bold white]U Think I Make[/bold white] [dim]v1.46.36[/dim]")
     user_email = config.email
     user_type = "UTIM Community"
     api_key = config.get("api_key")
@@ -1783,10 +1783,7 @@ def _handle_command(cmd: str, orchestrator: Orchestrator, app_ref) -> None:
             # Activate immediately in this session
             import os as _os2
             _os2.environ["OPENROUTER_API_KEY"] = new_key
-            from openai import OpenAI as _OAI
-            orchestrator._local_client = _OAI(
-                base_url="https://openrouter.ai/api/v1", api_key=new_key
-            )
+            orchestrator._local_client = True
             console.print("\n[bold #f9e2af]✓ API key saved and active.[/bold #f9e2af]\n")
 
     else:
@@ -3143,7 +3140,7 @@ def check_and_update_background():
                 return
 
             latest_ver = resp.json().get("version", "")
-            current_ver = "1.46.35"
+            current_ver = "1.46.36"
 
             def parse_ver(v):
                 return [int(x) for x in v.split(".") if x.isdigit()]
@@ -3264,8 +3261,10 @@ def start_chat():
             orchestrator.messages = saved.get("messages", [])
             orchestrator.turn_history = saved.get("turn_history", [])
             orchestrator.redo_history = saved.get("redo_history", [])
-            if "model_id" in saved:
-                orchestrator.model_id = saved["model_id"]
+            if "model_id" in saved:
+                orchestrator.model_id = saved["model_id"]
+            if "model_source" in saved:
+                orchestrator.model_source = saved["model_source"]
                 
             STATE["session_id"] = saved.get("session_id")
             if "queue" in saved:

{utim_cli-1.46.35 → utim_cli-1.46.36/utim_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utim-cli
-Version: 1.46.35
+Version: 1.46.36
 Summary: UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal.
 License: MIT
 Project-URL: Homepage, https://utim.dev
@@ -20,7 +20,6 @@ Classifier: Intended Audience :: Developers
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: openai>=1.30.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: aiohttp>=3.9.5
 Requires-Dist: python-dotenv==1.0.1
@@ -30,9 +29,10 @@ Requires-Dist: chardet==4.0.0
 Requires-Dist: typer>=0.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: prompt_toolkit>=3.0.0
-Requires-Dist: mcp>=0.1.0
 Requires-Dist: nest-asyncio>=1.5.0
 Requires-Dist: sqlalchemy>=2.0.0
+Requires-Dist: openai>=1.30.0; platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")
+Requires-Dist: mcp>=0.1.0; platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")
 Provides-Extra: search
 Requires-Dist: scrapy>=2.11.0; extra == "search"
 Requires-Dist: scrapy-playwright>=0.0.34; extra == "search"
@@ -44,6 +44,8 @@ Requires-Dist: tree-sitter>=0.21.0; extra == "parsers"
 Requires-Dist: tree-sitter-python>=0.21.0; extra == "parsers"
 Requires-Dist: tree-sitter-javascript>=0.21.0; extra == "parsers"
 Requires-Dist: tree-sitter-typescript>=0.21.0; extra == "parsers"
+Provides-Extra: mcp
+Requires-Dist: mcp>=0.1.0; extra == "mcp"
 Provides-Extra: full
 Requires-Dist: scrapy>=2.11.0; extra == "full"
 Requires-Dist: scrapy-playwright>=0.0.34; extra == "full"
@@ -53,6 +55,10 @@ Requires-Dist: tree-sitter>=0.21.0; extra == "full"
 Requires-Dist: tree-sitter-python>=0.21.0; extra == "full"
 Requires-Dist: tree-sitter-javascript>=0.21.0; extra == "full"
 Requires-Dist: tree-sitter-typescript>=0.21.0; extra == "full"
+Requires-Dist: mcp>=0.1.0; (platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")) and extra == "full"
+Requires-Dist: openai>=1.30.0; (platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")) and extra == "full"
+Provides-Extra: legacy-agent
+Requires-Dist: openai>=1.30.0; extra == "legacy-agent"
 
 # UTIM CLI Agent: Enterprise Coder Assistant
 
@@ -194,6 +200,12 @@ pip install utim-cli
 pip install "utim-cli[full]"
 ```
 
+Desktop installs include the normal SDK/MCP path automatically. Mobile/Termux
+installs keep those native-heavy pieces optional to avoid `pydantic-core`; use
+`utim-cli[mcp]` or `utim-cli[legacy-agent]` only if you explicitly need them.
+Do not install `utim_cli/server/requirements.txt` unless you are deploying the
+server.
+
 ### Source install (development)
 ```bash
 git clone https://github.com/emendai/utim.git

{utim_cli-1.46.35 → utim_cli-1.46.36}/utim_cli.egg-info/requires.txt

@@ -1,4 +1,3 @@
-openai>=1.30.0
 requests==2.31.0
 aiohttp>=3.9.5
 python-dotenv==1.0.1
@@ -8,10 +7,13 @@ chardet==4.0.0
 typer>=0.9.0
 rich>=13.0.0
 prompt_toolkit>=3.0.0
-mcp>=0.1.0
 nest-asyncio>=1.5.0
 sqlalchemy>=2.0.0
 
+[:platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")]
+openai>=1.30.0
+mcp>=0.1.0
+
 [full]
 scrapy>=2.11.0
 scrapy-playwright>=0.0.34
@@ -22,9 +24,19 @@ tree-sitter-python>=0.21.0
 tree-sitter-javascript>=0.21.0
 tree-sitter-typescript>=0.21.0
 
+[full:platform_system != "Linux" or (platform_machine != "aarch64" and platform_machine != "arm64")]
+mcp>=0.1.0
+openai>=1.30.0
+
 [images]
 pillow>=9.0.0
 
+[legacy-agent]
+openai>=1.30.0
+
+[mcp]
+mcp>=0.1.0
+
 [parsers]
 tree-sitter>=0.21.0
 tree-sitter-python>=0.21.0