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

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

@@ -2,6 +2,19 @@
 
 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
+- **Instant SSL Verification Toggle**: Upgraded the `/sslverify` session patcher to dynamically apply and remove the `verify=False` wrapper live on the running `requests.Session` class, eliminating the need to restart the CLI when toggling proxy security.
+
+### Fixed
+- **CLI Tips Correctness**: Refined all CLI and ReAct Agent usage tips to only feature verified, public commands and actual hotkeys, removing any references to internal or hidden commands.
+
 ## [1.46.34] - 2026-07-11
 
 ### Added

{utim_cli-1.46.34/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.34
+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.34 → 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.34 → utim_cli-1.46.36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utim-cli"
-version = "1.46.34"
+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.34 → 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.34"
+    __version__ = "1.46.36"
 
 import builtins, os, pathlib, urllib.parse, re
 

{utim_cli-1.46.34 → 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.34"
+VERSION = "1.46.36"

{utim_cli-1.46.34 → 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
@@ -31,11 +30,11 @@ TOOL_META = {
 }
 
 TIPS = [
-    "Tip: Copy the last response to your clipboard with /copy",
+    "Tip: Use /help to see all available commands and the help panel",
     "Tip: Save your current conversation with /resume save <tag>",
     "Tip: Clear conversation history with /clear",
-    "Tip: Check your credit balance with /balance",
-    "Tip: List available tools with /tools",
+    "Tip: Check your quota limits and credit usage with /usage",
+    "Tip: Enable or disable individual tools with /tools",
     "Tip: Switch models with /model",
 ]
 
@@ -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.34 → utim_cli-1.46.36}/utim_cli/config.py

@@ -7,6 +7,48 @@ from typing import Any, Dict, Optional
 
 logger = logging.getLogger("utim.config")
 
+# ── SSL session patch ─────────────────────────────────────────────────────────
+# Keeps a reference to the true original so toggling works correctly in both
+# directions without chaining patches on top of each other.
+_ORIGINAL_SESSION_REQUEST = None
+_SSL_PATCH_ACTIVE = False
+
+def _apply_ssl_session_patch(disable: bool) -> None:
+    """Apply or remove the verify=False monkey-patch on requests.Session.request.
+
+    Safe to call multiple times. Does nothing when the requested state already
+    matches the current state.
+    """
+    global _ORIGINAL_SESSION_REQUEST, _SSL_PATCH_ACTIVE
+    try:
+        import requests as _req_mod
+        import urllib3
+
+        # Capture the true original exactly once.
+        if _ORIGINAL_SESSION_REQUEST is None:
+            _ORIGINAL_SESSION_REQUEST = _req_mod.Session.request
+
+        if disable and not _SSL_PATCH_ACTIVE:
+            # Suppress noisy InsecureRequestWarning lines.
+            try:
+                urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+            except Exception:
+                pass
+            _orig = _ORIGINAL_SESSION_REQUEST
+            def _ssl_off(self, method, url, *args, **kwargs):
+                kwargs.setdefault('verify', False)
+                return _orig(self, method, url, *args, **kwargs)
+            _req_mod.Session.request = _ssl_off
+            _SSL_PATCH_ACTIVE = True
+
+        elif not disable and _SSL_PATCH_ACTIVE:
+            # Restore the true original so verify defaults to True again.
+            _req_mod.Session.request = _ORIGINAL_SESSION_REQUEST
+            _SSL_PATCH_ACTIVE = False
+
+    except Exception:
+        pass
+
 class Config:
     def __init__(self):
         import sys
@@ -44,28 +86,33 @@ class Config:
                     hdrs = dict(hdrs)
                 hdrs.setdefault("User-Agent", _BROWSER_UA)
                 kwargs["headers"] = hdrs
+
+                primary_host = "api.utim.dev"
+                fallback_host = "utim-cli-production.up.railway.app"
+
+                if primary_host in url:
+                    try:
+                        return _original_request(self, method, url, *args, **kwargs)
+                    except _req_mod.exceptions.RequestException as e:
+                        fallback_url = url.replace(primary_host, fallback_host)
+                        logger.warning(f"Connection to {primary_host} failed, trying fallback {fallback_host}: {e}")
+                        return _original_request(self, method, fallback_url, *args, **kwargs)
+                elif fallback_host in url:
+                    try:
+                        return _original_request(self, method, url, *args, **kwargs)
+                    except _req_mod.exceptions.RequestException as e:
+                        fallback_url = url.replace(fallback_host, primary_host)
+                        logger.warning(f"Connection to {fallback_host} failed, trying fallback {primary_host}: {e}")
+                        return _original_request(self, method, fallback_url, *args, **kwargs)
+
                 return _original_request(self, method, url, *args, **kwargs)
 
             _req_mod.Session.request = _ua_patched_request
         except Exception:
             pass
 
-        # Suppress warnings and patch requests if SSL verification is disabled
-        if not self.verify_ssl:
-            try:
-                import urllib3
-                urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-            except Exception:
-                pass
-            try:
-                import requests as _req_mod2
-                _original_request2 = _req_mod2.Session.request
-                def _ssl_patched_request(self, method, url, *args, **kwargs):
-                    kwargs.setdefault('verify', False)
-                    return _original_request2(self, method, url, *args, **kwargs)
-                _req_mod2.Session.request = _ssl_patched_request
-            except Exception:
-                pass
+        # Apply SSL patch immediately if already disabled in config.
+        _apply_ssl_session_patch(disable=not self.verify_ssl)
 
     def _load(self):
         # Load global config

{utim_cli-1.46.34 → 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.34 → 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",