cade-cli 0.4.0__tar.gz → 0.5.0__tar.gz

cade_cli-0.5.0/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Arcade AI Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{cade_cli-0.4.0 → cade_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cade-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: Cade - The CLI Agent from Arcade.dev
 Project-URL: Homepage, https://arcade.dev
 Project-URL: Documentation, https://docs.arcade.dev
@@ -8,7 +8,28 @@ Project-URL: Repository, https://github.com/arcadeai-labs/cade
 Project-URL: Issues, https://github.com/arcadeai-labs/cade/issues
 Project-URL: Changelog, https://github.com/arcadeai-labs/cade/releases
 Author-email: "Arcade AI Inc." <dev@arcade.dev>
-License: MIT
+License: MIT License
+        
+        Copyright (c) 2024 Arcade AI Inc.
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+License-File: LICENSE
 Keywords: agent,ai,arcade,cli,coding-assistant,llm,mcp
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
@@ -29,12 +50,12 @@ Requires-Dist: arcade-tdk>=2.0.0
 Requires-Dist: authlib<2.0.0,>=1.6.0
 Requires-Dist: httpx<1.0.0,>=0.27.0
 Requires-Dist: openai<2.0.0,>=1.0.0
-Requires-Dist: prompt-toolkit>=3.0.52
+Requires-Dist: prompt-toolkit<4.0.0,>=3.0.52
 Requires-Dist: pydantic[email]<3.0.0,>=2.0.0
 Requires-Dist: pyperclip<2.0.0,>=1.8.0
 Requires-Dist: pyyaml<7.0.0,>=6.0
 Requires-Dist: rich<14.0.0,>=13.0.0
-Requires-Dist: tiktoken>=0.11.0
+Requires-Dist: tiktoken<1.0.0,>=0.11.0
 Requires-Dist: toml<1.0.0,>=0.10.0
 Requires-Dist: typer>0.10.0
 Requires-Dist: ulid==1.1

{cade_cli-0.4.0 → cade_cli-0.5.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "cade-cli"
-version = "0.4.0"
+version = "0.5.0"
 description = "Cade - The CLI Agent from Arcade.dev"
 readme = "README.md"
 requires-python = ">=3.11"
-license = {text = "MIT"}
+license = {file = "LICENSE"}
 authors = [
     { name = "Arcade AI Inc.", email = "dev@arcade.dev" },
 ]
@@ -36,8 +36,8 @@ dependencies = [
     "arcade-core>=4.1.0,<5.0.0",
     "authlib>=1.6.0,<2.0.0",
     "pyperclip>=1.8.0,<2.0.0",
-    "prompt-toolkit>=3.0.52",
-    "tiktoken>=0.11.0",
+    "prompt-toolkit>=3.0.52,<4.0.0",
+    "tiktoken>=0.11.0,<1.0.0",
     "httpx>=0.27.0,<1.0.0",
 ]
 

cade_cli-0.5.0/src/cadecoder/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.0"

{cade_cli-0.4.0 → cade_cli-0.5.0}/src/cadecoder/cli/auth.py

@@ -10,7 +10,6 @@ import threading
 import uuid
 import webbrowser
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from pathlib import Path
 from typing import Any
 from urllib.parse import parse_qs
 
@@ -452,32 +451,3 @@ def get_access_token(coordinator_url: str | None = None) -> str:
         ValueError: If not logged in or token refresh fails
     """
     return get_valid_access_token(coordinator_url)
-
-
-# For backward compatibility with legacy API key format
-def _check_legacy_credentials() -> tuple[str, str] | None:
-    """Check for legacy API key credentials.
-
-    Returns:
-        Tuple of (api_key, email) if found, None otherwise.
-    """
-    import yaml
-
-    creds_path = Path.home() / ".arcade" / "credentials.yaml"
-    if not creds_path.exists():
-        return None
-
-    try:
-        with creds_path.open() as f:
-            data = yaml.safe_load(f) or {}
-
-        cloud = data.get("cloud", {})
-        if isinstance(cloud, dict) and "api" in cloud:
-            api_key = cloud.get("api", {}).get("key")
-            email = cloud.get("user", {}).get("email")
-            if api_key and email:
-                return api_key, email
-    except Exception:
-        pass
-
-    return None

{cade_cli-0.4.0 → cade_cli-0.5.0}/src/cadecoder/cli/commands/context.py

@@ -14,7 +14,17 @@ from rich.table import Table
 from cadecoder.core.logging import log
 
 console = Console(stderr=True)
-context_app = typer.Typer(help="Manage organization and project context", no_args_is_help=True)
+context_app = typer.Typer(
+    help="Manage organization and project context", invoke_without_command=True
+)
+
+
+@context_app.callback()
+def context_callback(ctx: typer.Context) -> None:
+    """Manage organization and project context"""
+    if ctx.invoked_subcommand is None:
+        console.print(ctx.get_help())
+        raise typer.Exit(0)
 
 
 @context_app.command(name="show")

{cade_cli-0.4.0 → cade_cli-0.5.0}/src/cadecoder/cli/commands/mcp.py

@@ -17,17 +17,26 @@ from cadecoder.tools.manager import (
     MCPServerStore,
     MCPToolManager,
 )
+from cadecoder.tools.manager.mcp import MCP_PROTOCOL_VERSION
 
 # Create MCP command group
 mcp_app = typer.Typer(
     name="mcp",
     help="Manage MCP (Model Context Protocol) servers",
-    no_args_is_help=True,
+    invoke_without_command=True,
 )
 
 console = Console()
 
 
+@mcp_app.callback()
+def mcp_callback(ctx: typer.Context) -> None:
+    """Manage MCP (Model Context Protocol) servers"""
+    if ctx.invoked_subcommand is None:
+        console.print(ctx.get_help())
+        raise typer.Exit(0)
+
+
 @mcp_app.command("list")
 def list_servers() -> None:
     """List all configured MCP servers."""
@@ -379,7 +388,7 @@ def authorize_server(
                 await manager._send_request(
                     "initialize",
                     {
-                        "protocolVersion": "2024-11-05",
+                        "protocolVersion": MCP_PROTOCOL_VERSION,
                         "capabilities": {},
                         "clientInfo": {"name": "cade", "version": "1.0.0"},
                     },

{cade_cli-0.4.0 → cade_cli-0.5.0}/src/cadecoder/cli/commands/thread.py

@@ -11,12 +11,20 @@ from cadecoder.storage.threads import get_thread_history
 thread_app = typer.Typer(
     name="thread",
     help="Manage chat threads",
-    no_args_is_help=True,
+    invoke_without_command=True,
 )
 
 console = Console()
 
 
+@thread_app.callback()
+def thread_callback(ctx: typer.Context) -> None:
+    """Manage chat threads"""
+    if ctx.invoked_subcommand is None:
+        console.print(ctx.get_help())
+        raise typer.Exit(0)
+
+
 @thread_app.command("list")
 def list_threads(
     limit: Annotated[

{cade_cli-0.4.0 → cade_cli-0.5.0}/src/cadecoder/tools/manager/mcp.py

@@ -21,6 +21,9 @@ from cadecoder.tools.manager.config import (
     MCPTransportType,
 )
 
+# MCP protocol version - client's preferred version for negotiation
+MCP_PROTOCOL_VERSION = "2025-11-25"
+
 
 class StdioMCPConnection:
     """Manages stdio subprocess for MCP server."""
@@ -110,7 +113,10 @@ class MCPOAuthHandler:
     async def _ensure_client(self) -> httpx.AsyncClient:
         """Ensure HTTP client exists."""
         if self._client is None:
-            self._client = httpx.AsyncClient(timeout=httpx.Timeout(30.0))
+            self._client = httpx.AsyncClient(
+                timeout=httpx.Timeout(30.0),
+                follow_redirects=True,
+            )
         return self._client
 
     def parse_www_authenticate(self, header: str) -> dict[str, str]:
@@ -428,6 +434,7 @@ class MCPToolManager(ToolManager):
             self._client: httpx.AsyncClient | None = None
 
         self._session_id: str | None = None
+        self._negotiated_protocol_version: str | None = None
         self._oauth_handler = MCPOAuthHandler(server_config)
         self._auth_server_metadata: dict[str, Any] | None = None
 
@@ -441,6 +448,9 @@ class MCPToolManager(ToolManager):
         if self._session_id:
             headers["Mcp-Session-Id"] = self._session_id
 
+        if self._negotiated_protocol_version:
+            headers["MCP-Protocol-Version"] = self._negotiated_protocol_version
+
         if self.config.auth_type == MCPAuthType.BEARER and self.config.auth_value:
             headers["Authorization"] = f"Bearer {self.config.auth_value}"
         elif self.config.auth_type == MCPAuthType.API_KEY and self.config.auth_value:
@@ -456,6 +466,7 @@ class MCPToolManager(ToolManager):
         if self._client is None:
             self._client = httpx.AsyncClient(
                 timeout=httpx.Timeout(60.0, connect=10.0),
+                follow_redirects=True,
             )
         return self._client
 
@@ -609,7 +620,9 @@ class MCPToolManager(ToolManager):
             log.error(f"MCP stdio request failed for {self.config.name}: {e}")
             raise
 
-    async def _send_http_request(self, method: str, params: dict[str, Any] | None = None) -> Any:
+    async def _send_http_request(
+        self, method: str, params: dict[str, Any] | None = None, _retry: bool = False
+    ) -> Any:
         """Send a JSON-RPC request via HTTP transport."""
         await self._maybe_refresh_oauth_token()
 
@@ -634,6 +647,19 @@ class MCPToolManager(ToolManager):
                     f"Captured MCP session ID for '{self.config.name}': {self._session_id[:8]}..."
                 )
 
+            # Per MCP spec: 404 with active session means session expired, reinitialize
+            if response.status_code == 404 and self._session_id and not _retry:
+                log.warning(f"MCP server '{self.config.name}' session expired, reinitializing")
+                self._session_id = None
+                self._negotiated_protocol_version = None
+                self._initialized = False
+                self._tools_cache = None
+                if await self.initialize():
+                    return await self._send_http_request(method, params, _retry=True)
+                raise Exception(
+                    f"MCP server '{self.config.name}' session expired and reinitialization failed"
+                )
+
             if response.status_code == 401:
                 auth_url = await self._handle_401_response(response)
                 raise ToolAuthorizationRequired(
@@ -696,16 +722,22 @@ class MCPToolManager(ToolManager):
             result = await self._send_request(
                 "initialize",
                 {
-                    "protocolVersion": "2024-11-05",
+                    "protocolVersion": MCP_PROTOCOL_VERSION,
                     "capabilities": {"tools": {}},
                     "clientInfo": {"name": "cade", "version": "1.0.0"},
                 },
             )
 
             if result:
+                self._negotiated_protocol_version = result.get(
+                    "protocolVersion", MCP_PROTOCOL_VERSION
+                )
                 self._initialized = True
                 await self._send_notification("notifications/initialized")
-                log.info(f"MCP server '{self.config.name}' initialized")
+                log.info(
+                    f"MCP server '{self.config.name}' initialized "
+                    f"(protocol: {self._negotiated_protocol_version})"
+                )
                 return True
 
             return False
@@ -789,7 +821,6 @@ class MCPToolManager(ToolManager):
 
     def _parse_arcade_error(self, error_text: str) -> str:
         """Parse arcade-mcp-server error object string to extract clean error message."""
-        import re
 
         # Try to extract message field: message="..."
         message_match = re.search(r'message="([^"]*)"', error_text)
@@ -861,6 +892,7 @@ class MCPToolManager(ToolManager):
         try:
             self._initialized = False
             self._session_id = None
+            self._negotiated_protocol_version = None
 
             success = await self.initialize()
             if success:
@@ -923,5 +955,6 @@ class MCPToolManager(ToolManager):
             await self._client.aclose()
             self._client = None
         self._session_id = None
+        self._negotiated_protocol_version = None
         self._initialized = False
         await self._oauth_handler.close()

cade_cli-0.4.0/src/cadecoder/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.0"