utim-cli 1.0.0__tar.gz → 1.43.9__tar.gz

{utim_cli-1.0.0/utim_cli.egg-info → utim_cli-1.43.9}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: utim-cli
-Version: 1.0.0
+Version: 1.43.9
 Summary: UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal.
 License: MIT
-Project-URL: Homepage, https://utim.ai
-Project-URL: Documentation, https://utim.ai/docs
+Project-URL: Homepage, https://utim.dev
+Project-URL: Documentation, https://utim.dev/docs
 Project-URL: Changelog, https://github.com/emendai/utim/blob/main/CHANGELOG.md
 Project-URL: Issues, https://github.com/emendai/utim/issues
 Classifier: Programming Language :: Python :: 3

{utim_cli-1.0.0 → utim_cli-1.43.9}/pyproject.toml

@@ -1,75 +1,75 @@
-[build-system]
-requires = ["setuptools>=61.0.0", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "utim-cli"
-version = "1.0.0"
-description = "UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal."
-readme = "README.md"
-requires-python = ">=3.9"
-license = { text = "MIT" }
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-    "Development Status :: 4 - Beta",
-    "Environment :: Console",
-    "Intended Audience :: Developers",
-]
-dependencies = [
-    "openai>=1.30.0",
-    "requests==2.31.0",
-    "aiohttp>=3.9.5",
-    "python-dotenv==1.0.1",
-    "urllib3==1.26.18",
-    "charset-normalizer==3.3.2",
-    "chardet==4.0.0",
-    "typer>=0.9.0",
-    "rich>=13.0.0",
-    "prompt_toolkit>=3.0.0",
-    "tree-sitter>=0.21.0",
-    "tree-sitter-python>=0.21.0",
-    "tree-sitter-javascript>=0.21.0",
-    "tree-sitter-typescript>=0.21.0",
-    "mcp>=0.1.0",
-    "nest-asyncio>=1.5.0",
-    "python-multipart>=0.0.7",
-]
-
-[project.urls]
-Homepage = "https://utim.ai"
-Documentation = "https://utim.ai/docs"
-Changelog = "https://github.com/emendai/utim/blob/main/CHANGELOG.md"
-Issues = "https://github.com/emendai/utim/issues"
-
-[project.optional-dependencies]
-# Optional features
-search = [
-    "scrapy>=2.11.0",
-    "scrapy-playwright>=0.0.34",
-    "beautifulsoup4>=4.12.0",
-]
-images = [
-    "pillow>=9.0.0",
-]
-full = [
-    "scrapy>=2.11.0",
-    "scrapy-playwright>=0.0.34",
-    "beautifulsoup4>=4.12.0",
-    "pillow>=9.0.0",
-]
-
-[project.scripts]
-utim = "utim_cli.utim:app"
-
-[tool.setuptools.packages.find]
-include = ["utim_cli*"]
-exclude = ["utim_cli.server*", "tests*", "landing*", "scripts*"]
-
-[tool.setuptools.package-data]
-utim_cli = ["mcp_registry.json"]
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "utim-cli"
+version = "1.43.9"
+description = "UTIM – Universal Terminal Intelligence Manager. A powerful agentic AI coding assistant for your terminal."
+readme = "README.md"
+requires-python = ">=3.9"
+license = { text = "MIT" }
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Development Status :: 4 - Beta",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+]
+dependencies = [
+    "openai>=1.30.0",
+    "requests==2.31.0",
+    "aiohttp>=3.9.5",
+    "python-dotenv==1.0.1",
+    "urllib3==1.26.18",
+    "charset-normalizer==3.3.2",
+    "chardet==4.0.0",
+    "typer>=0.9.0",
+    "rich>=13.0.0",
+    "prompt_toolkit>=3.0.0",
+    "tree-sitter>=0.21.0",
+    "tree-sitter-python>=0.21.0",
+    "tree-sitter-javascript>=0.21.0",
+    "tree-sitter-typescript>=0.21.0",
+    "mcp>=0.1.0",
+    "nest-asyncio>=1.5.0",
+    "python-multipart>=0.0.7",
+]
+
+[project.urls]
+Homepage = "https://utim.dev"
+Documentation = "https://utim.dev/docs"
+Changelog = "https://github.com/emendai/utim/blob/main/CHANGELOG.md"
+Issues = "https://github.com/emendai/utim/issues"
+
+[project.optional-dependencies]
+# Optional features
+search = [
+    "scrapy>=2.11.0",
+    "scrapy-playwright>=0.0.34",
+    "beautifulsoup4>=4.12.0",
+]
+images = [
+    "pillow>=9.0.0",
+]
+full = [
+    "scrapy>=2.11.0",
+    "scrapy-playwright>=0.0.34",
+    "beautifulsoup4>=4.12.0",
+    "pillow>=9.0.0",
+]
+
+[project.scripts]
+utim = "utim_cli.utim:app"
+
+[tool.setuptools.packages.find]
+include = ["utim_cli*"]
+exclude = ["utim_cli.server*", "tests*", "landing*", "scripts*"]
+
+[tool.setuptools.package-data]
+utim_cli = ["mcp_registry.json"]

{utim_cli-1.0.0 → utim_cli-1.43.9}/utim_cli/orchestrator.py

@@ -550,8 +550,7 @@ class Orchestrator:
             if not current_is_custom and not self._local_api_key and not config.get("api_key"):
                 continue
 
-            if model_idx > 0 and not silent:
-                self.console.print(f"\n[bold yellow]🔄 Falling back to model: {current_model}...[/bold yellow]")
+            pass
 
 
             model_retries = 2
@@ -892,8 +891,6 @@ class Orchestrator:
 
                 except (requests.exceptions.ConnectionError, requests.exceptions.Timeout) as exc:
                     last_exc = exc
-                    if not silent:
-                        self.console.print(f"\n[yellow]⚠ Model {current_model} failed (Connection/Timeout error: {exc}). Trying next model...[/yellow]")
                     break  # try next model
                 except requests.exceptions.HTTPError as exc:
                     last_exc = exc
@@ -905,28 +902,18 @@ class Orchestrator:
                         except Exception:
                             self.console.print(f"\n[red]HTTP 400 Error Details from {current_model}: {exc.response.text}[/red]")
                     if code == 429:
-                        if not silent:
-                            self.console.print(f"\n[yellow]⚠ Model {current_model} rate-limited (429). Trying next model...[/yellow]")
                         break
                     if attempt < model_retries:
                         delay = 3 * (attempt + 1)
-                        if not silent:
-                            self.console.print(f"\n[dim yellow]⟳ Model {current_model} returned HTTP {code}. Retrying in {delay}s (attempt {attempt+1}/{model_retries})...[/dim yellow]")
                         time.sleep(delay)
                         continue
-                    if not silent:
-                        self.console.print(f"\n[yellow]⚠ Model {current_model} failed (HTTP {code}). Trying next model...[/yellow]")
                     break  # try next model
                 except RuntimeError as exc:
                     # Mid-stream API errors (e.g. model overloaded) or custom empty response error
                     last_exc = exc
-                    if not silent:
-                        self.console.print(f"\n[yellow]⚠ Model {current_model} failed: {exc}. Trying next model...[/yellow]")
                     break  # try next model
                 except Exception as exc:
                     last_exc = exc
-                    if not silent:
-                        self.console.print(f"\n[yellow]⚠ Model {current_model} failed (unexpected error: {exc}). Trying next model...[/yellow]")
                     break  # try next model
 
         # If we exit the loop, all models failed

{utim_cli-1.0.0 → utim_cli-1.43.9}/utim_cli/share.py

@@ -34,7 +34,7 @@ EXPIRY_OPTIONS = [
 ]
 
 class ShareRecord:
-    def __init__(self, id: str, name: str, created_at: str, expires_at: str, link: str, file_path: str, excluded: List[str]):
+    def __init__(self, id: str, name: str, created_at: str, expires_at: str, link: str, file_path: str, excluded: List[str], share_type: str = "chat_project"):
         self.id = id
         self.name = name
         self.created_at = created_at
@@ -42,6 +42,7 @@ class ShareRecord:
         self.link = link
         self.file_path = file_path
         self.excluded = excluded
+        self.share_type = share_type
 
     def to_dict(self) -> Dict:
         return {
@@ -51,7 +52,8 @@ class ShareRecord:
             "expires_at": self.expires_at,
             "link": self.link,
             "file_path": self.file_path,
-            "excluded": self.excluded
+            "excluded": self.excluded,
+            "share_type": self.share_type
         }
 
     @classmethod
@@ -63,7 +65,8 @@ class ShareRecord:
             expires_at=data["expires_at"],
             link=data["link"],
             file_path=data["file_path"],
-            excluded=data.get("excluded", [])
+            excluded=data.get("excluded", []),
+            share_type=data.get("share_type", "chat_project")
         )
 
     def is_expired(self) -> bool:
@@ -96,6 +99,40 @@ class ShareRecord:
         except Exception:
             return "Unknown"
 
+def print_progress_bar(percentage: float, prefix: str = ""):
+    import sys
+    bar_width = 40
+    filled = int(round((percentage / 100.0) * bar_width))
+    filled = min(bar_width, max(0, filled))
+    
+    # Check if the output encoding supports the block characters
+    encoding = getattr(sys.__stdout__, 'encoding', None) or 'utf-8'
+    try:
+        "█".encode(encoding)
+        fill_char = "█"
+        empty_char = "░"
+    except UnicodeEncodeError:
+        fill_char = "#"
+        empty_char = "-"
+        
+    bar = fill_char * filled + empty_char * (bar_width - filled)
+    msg = f"\r  {prefix} [{bar}] {percentage:.2f}%"
+    try:
+        sys.__stdout__.write(msg)
+        sys.__stdout__.flush()
+    except UnicodeEncodeError:
+        # If write fails with unicode, fall back to purely ASCII representation
+        try:
+            ascii_bar = "#" * filled + "-" * (bar_width - filled)
+            ascii_msg = f"\r  {prefix} [{ascii_bar}] {percentage:.2f}%"
+            sys.__stdout__.write(ascii_msg)
+            sys.__stdout__.flush()
+        except Exception:
+            pass
+    except Exception:
+        pass
+
+
 class ShareManager:
     def __init__(self, workspace_path: str = "."):
         self.workspace_path = Path(workspace_path).resolve()
@@ -158,7 +195,7 @@ class ShareManager:
             return True
         return False
 
-    def create_share(self, exclude_keys: List[str], expiry_hours: float, chat_messages: List[Dict]) -> ShareRecord:
+    def create_share(self, exclude_keys: List[str], expiry_hours: float, chat_messages: List[Dict], share_type: str = "chat_project") -> ShareRecord:
         share_id = f"share_{uuid.uuid4().hex[:12]}"
         created_at = datetime.datetime.now(datetime.timezone.utc)
         expires_at = created_at + datetime.timedelta(hours=expiry_hours)
@@ -169,7 +206,6 @@ class ShareManager:
         zip_filepath = self.shares_dir / zip_filename
 
         # Exclude folders
-        # Resolve folders/names to exclude
         exclude_names = []
         for key in exclude_keys:
             # Map categories to actual folder names to filter
@@ -188,10 +224,16 @@ class ShareManager:
         chat_history_content = self._format_chat_history(chat_messages)
         
         # Zip files
-        self._zip_workspace(zip_filepath, exclude_names, chat_history_content)
+        self._zip_workspace(zip_filepath, exclude_names, chat_history_content, share_type, exclude_keys)
 
         # Upload and get link
+        import sys
+        size_mb = zip_filepath.stat().st_size / (1024 * 1024)
+        sys.__stdout__.write(f"  Uploading shared package to server ({size_mb:.2f} MB)...")
+        sys.__stdout__.flush()
         link = self._upload_file(zip_filepath, expiry_hours)
+        sys.__stdout__.write(" Done!\n")
+        sys.__stdout__.flush()
 
         rec = ShareRecord(
             id=share_id,
@@ -200,7 +242,8 @@ class ShareManager:
             expires_at=expires_at.isoformat(),
             link=link,
             file_path=str(zip_filepath),
-            excluded=exclude_keys
+            excluded=exclude_keys,
+            share_type=share_type
         )
 
         self.records[share_id] = rec
@@ -214,66 +257,140 @@ class ShareManager:
         md.append(f"Export Date: {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n\n")
         md.append("---\n\n")
         
+        has_messages = False
         for msg in messages:
-            role = msg.get("role", "").capitalize()
+            role = msg.get("role", "").lower()
             content = msg.get("content", "")
             
+            # Only include actual User prompts and Assistant responses
+            if role not in ("user", "assistant"):
+                continue
+                
             # Safely extract text if content is a list
             if isinstance(content, list):
                 text = "\n".join(p.get("text", "") for p in content if isinstance(p, dict) and "text" in p)
             else:
                 text = str(content)
                 
-            if role == "System":
-                md.append(f"### ⚙️ System Prompt\n\n```\n{text}\n```\n\n")
-            elif role == "User":
+            # Skip empty messages
+            if not text.strip():
+                continue
+                
+            has_messages = True
+            if role == "user":
                 md.append(f"### 👤 User\n\n{text}\n\n")
-            elif role == "Assistant":
+            elif role == "assistant":
                 md.append(f"### 🤖 Assistant\n\n{text}\n\n")
-            elif role == "Tool":
-                name = msg.get("name", "Tool")
-                md.append(f"### 🛠️ Tool: {name}\n\n```\n{text}\n```\n\n")
-            else:
-                md.append(f"### 📝 {role}\n\n{text}\n\n")
                 
             md.append("---\n\n")
             
+        if not has_messages:
+            md.append("*No conversation history.*")
+            
         return "".join(md)
 
-    def _zip_workspace(self, output_zip_path: Path, exclude_names: List[str], chat_history: str):
-        with zipfile.ZipFile(output_zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
-            # 1. Add the chat history first at root as chat_history.md
-            zipf.writestr("chat_history.md", chat_history)
+    def _generate_share_readme(self, exclude_keys: List[str]) -> str:
+        md = []
+        md.append("# UTIM Shared Workspace Instructions\n\n")
+        md.append("This project workspace was packaged and shared via UTIM CLI.\n")
+        md.append("To keep the package size minimal and protect sensitive secrets, some files and folders were omitted.\n\n")
+        md.append("## 📦 How to Reinstall Omitted Packages & Files\n\n")
+        
+        reinstall_guides = {
+            "node_modules": "- **node_modules**: Omitted Node.js package dependencies. Run `npm install` in the project root directory to restore them.",
+            "venv": "- **venv / .venv**: Omitted Python virtual environment. Run `python -m venv venv` to recreate, activate it, and run `pip install -r requirements.txt` to restore dependencies.",
+            ".env": "- **.env**: Omitted environment configuration secrets. Create a new local `.env` file in the root directory and define your API keys and parameters.",
+            "__pycache__": "- **__pycache__**: Omitted Python bytecode caches. These will be automatically regenerated by Python when running your scripts.",
+            "dist": "- **dist / build**: Omitted compiled distribution/build artifacts. Run your project build command (e.g. `npm run build` or `python -m build`) to rebuild.",
+            ".next": "- **.next**: Omitted Next.js/Nuxt.js build caches. These will be regenerated automatically during the next project run or build.",
+            "target": "- **target**: Omitted Rust compilation build artifacts. Run `cargo build` in the project directory to rebuild.",
+        }
 
-            # 2. Walk directory recursively
+        for key in exclude_keys:
+            guide = reinstall_guides.get(key, f"- **{key}**: Omitted file/directory.")
+            md.append(f"{guide}\n")
+            
+        md.append("\n---\n")
+        md.append("Shared with UTIM CLI (https://utim.dev)\n")
+        return "".join(md)
+
+    def _zip_workspace(self, output_zip_path: Path, exclude_names: List[str], chat_history: str, share_type: str, exclude_keys: List[str]):
+        # Calculate total files for progress calculation
+        total_files = 0
+        if share_type in ("project", "chat_project"):
             for root, dirs, files in os.walk(self.workspace_path):
-                # Filter directories in-place to prevent os.walk recursion
-                # Skip .utim directory so we don't zip previous zips
                 dirs[:] = [d for d in dirs if d not in exclude_names and d != ".utim"]
-
                 for file in files:
                     if file in exclude_names or file.endswith(('.pyc', '.pyo', '.pyd')):
                         continue
-                    
-                    # Also skip if file path directory component is excluded
                     path_parts = Path(root).relative_to(self.workspace_path).parts
                     if any(p in exclude_names or p == ".utim" for p in path_parts):
                         continue
-
-                    full_path = Path(root) / file
-                    # Skip the zip itself
-                    if full_path.resolve() == output_zip_path.resolve():
+                    if (Path(root) / file).resolve() == output_zip_path.resolve():
                         continue
+                    total_files += 1
+
+        if share_type in ("chat", "chat_project"):
+            total_files += 1
+        if share_type in ("project", "chat_project") and exclude_keys:
+            total_files += 1
+
+        total_files = max(1, total_files)
+        zipped_count = 0
+
+        with zipfile.ZipFile(output_zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
+            # 1. Add chat history if requested
+            if share_type in ("chat", "chat_project"):
+                zipf.writestr("chat_history.md", chat_history)
+                zipped_count += 1
+                print_progress_bar(100.0 * zipped_count / total_files, "Compressing:")
+
+            # 2. Add workspace files if requested
+            if share_type in ("project", "chat_project"):
+                # Write the custom README explaining how to reinstall omitted packages
+                if exclude_keys:
+                    readme_content = self._generate_share_readme(exclude_keys)
+                    zipf.writestr("README.md", readme_content)
+                    zipped_count += 1
+                    print_progress_bar(100.0 * zipped_count / total_files, "Compressing:")
+
+                for root, dirs, files in os.walk(self.workspace_path):
+                    # Filter directories in-place to prevent os.walk recursion
+                    dirs[:] = [d for d in dirs if d not in exclude_names and d != ".utim"]
+
+                    for file in files:
+                        if file in exclude_names or file.endswith(('.pyc', '.pyo', '.pyd')):
+                            continue
+                        
+                        # Also skip if file path directory component is excluded
+                        path_parts = Path(root).relative_to(self.workspace_path).parts
+                        if any(p in exclude_names or p == ".utim" for p in path_parts):
+                            continue
+
+                        full_path = Path(root) / file
+                        # Skip the zip itself
+                        if full_path.resolve() == output_zip_path.resolve():
+                            continue
+
+                        # Safe relative path inside the zip
+                        rel_path = full_path.relative_to(self.workspace_path)
+                        # Avoid overwriting our newly generated README.md if they have one
+                        if rel_path.name.lower() == "readme.md" and exclude_keys:
+                            rel_path = rel_path.with_name("ORIGINAL_README.md")
 
-                    # Safe relative path inside the zip
-                    rel_path = full_path.relative_to(self.workspace_path)
-                    try:
-                        zipf.write(str(full_path), str(rel_path))
-                    except Exception:
-                        pass
+                        try:
+                            zipf.write(str(full_path), str(rel_path))
+                        except Exception:
+                            pass
+                        zipped_count += 1
+                        print_progress_bar(100.0 * zipped_count / total_files, "Compressing:")
+
+        import sys
+        sys.__stdout__.write("\n")
+        sys.__stdout__.flush()
 
     def _upload_file(self, zip_filepath: Path, expiry_hours: float) -> str:
-        # Determine expiry string for file.io
+        # Determine expiry string for server
         if expiry_hours <= 0.25:
             exp = "15m"
         elif expiry_hours <= 1.0:
@@ -287,34 +404,25 @@ class ShareManager:
         else:
             exp = "7d"
 
-        # Check UTIM_SERVER_URL env var
-        server_url = os.getenv("UTIM_SERVER_URL", "")
-        if server_url:
-            try:
-                # Try uploading to configured server endpoint
-                url = f"{server_url}/shares/upload"
-                with open(zip_filepath, 'rb') as f:
-                    response = requests.post(url, files={"file": f}, data={"expires": exp}, timeout=30)
-                if response.status_code == 200:
-                    data = response.json()
-                    if data.get("link"):
-                        return data["link"]
-            except Exception:
-                # Fallback to public file.io if server upload fails
-                pass
+        # Check UTIM_SERVER_URL env var, defaulting to production Railway server
+        server_url = os.getenv("UTIM_SERVER_URL", "https://utim-cli-production.up.railway.app")
+        if not server_url:
+            raise RuntimeError("No share server URL configured.")
 
-        # Fallback public upload using file.io
+        url = f"{server_url}/shares/upload"
         try:
-            url = f"https://file.io/?expires={exp}"
             with open(zip_filepath, 'rb') as f:
-                response = requests.post(url, files={"file": f}, timeout=30)
+                response = requests.post(url, files={"file": f}, data={"expires": exp}, timeout=60)
+            
             if response.status_code == 200:
                 data = response.json()
-                if data.get("success") and data.get("link"):
+                if data.get("link"):
                     return data["link"]
-        except Exception:
-            pass
-
-        # Fallback to local link if offline or upload fails
-        # Return a custom local URI
-        return f"file:///{zip_filepath.resolve().as_posix()}"
+                else:
+                    raise RuntimeError("Server response missing download link.")
+            else:
+                raise RuntimeError(f"Server returned status code {response.status_code}: {response.text}")
+        except requests.exceptions.RequestException as e:
+            raise RuntimeError(f"Network error contacting Railway server: {e}")
+        except Exception as e:
+            raise RuntimeError(f"Upload failed: {e}")