@oneciel-ai/claude-any 0.1.91 → 0.1.93

package/claude_any.py

@@ -105,7 +105,7 @@ OFFICIAL_CHANNEL_PLUGINS = {
     "fakechat": "plugin:fakechat@claude-plugins-official",
 }
 APP_NAME = "Claude Any"
-VERSION = "0.1.91"
+VERSION = "0.1.93"
 CREDITS = "Credits: One Ciel LLC"
 
 LOG_LEVELS = {"SILENT": 0, "ERROR": 1, "WARN": 2, "INFO": 3, "DEBUG": 4, "TRACE": 5}
@@ -1675,6 +1675,11 @@ def executable_candidates(name: str) -> list[str]:
 
 def executable_extra_dirs() -> list[Path]:
     dirs = [HOME / ".local" / "bin"]
+    for env_name in ("UV_INSTALL_DIR", "CARGO_HOME"):
+        root = os.environ.get(env_name)
+        if root:
+            path = Path(root)
+            dirs.append(path if path.name == "bin" else path / "bin")
     if os.name == "nt":
         pyver = f"Python{sys.version_info.major}{sys.version_info.minor}"
         for env_name in ("APPDATA", "LOCALAPPDATA"):
@@ -1688,7 +1693,27 @@ def executable_extra_dirs() -> list[Path]:
         except Exception:
             pass
         dirs.append(Path(sys.executable).resolve().parent / "Scripts")
-    return dirs
+    else:
+        dirs.extend(
+            [
+                HOME / ".cargo" / "bin",
+                HOME / ".npm-global" / "bin",
+                HOME / ".bun" / "bin",
+                Path(sys.executable).resolve().parent,
+                Path("/usr/local/bin"),
+                Path("/usr/bin"),
+                Path("/bin"),
+                Path("/opt/homebrew/bin"),
+            ]
+        )
+    out: list[Path] = []
+    seen: set[str] = set()
+    for directory in dirs:
+        key = str(directory)
+        if key and key not in seen:
+            seen.add(key)
+            out.append(directory)
+    return out
 
 
 def find_executable(name: str) -> str | None:
@@ -1704,6 +1729,29 @@ def find_executable(name: str) -> str | None:
     return None
 
 
+def resolve_executable_for_subprocess(command: str) -> str:
+    command = str(command or "").strip()
+    if not command:
+        return command
+    pathish = Path(command).is_absolute() or os.sep in command or bool(os.altsep and os.altsep in command)
+    if pathish:
+        return command
+    return find_executable(command) or command
+
+
+def resolve_mcp_server_process(command: str, args: list[str]) -> tuple[str, list[str]]:
+    command = str(command or "").strip()
+    resolved = resolve_executable_for_subprocess(command)
+    name = Path(command).name.lower()
+    if resolved == command and name in ("uvx", "uvx.exe", "uvx.cmd", "uvx.bat"):
+        uv = find_executable("uv")
+        if uv:
+            return uv, ["tool", "run", *args]
+        if importlib.util.find_spec("uv") is not None:
+            return sys.executable, ["-m", "uv", "tool", "run", *args]
+    return resolved, args
+
+
 def shell_command_string(args: list[str]) -> str:
     if os.name == "nt":
         # Claude Code on Windows runs hook commands through sh/bash, which treats
@@ -5035,6 +5083,45 @@ def _channel_mcp_update_cursor(last_id: int) -> None:
             router_log("WARN", f"channel_mcp_cursor_write_failed error={type(exc).__name__}: {exc}")
 
 
+def _channel_mcp_parse_event_id(value: Any) -> int | None:
+    text = str(value or "").strip()
+    if not text:
+        return None
+    try:
+        return max(0, int(text))
+    except Exception:
+        return None
+
+
+def _channel_mcp_client_last_event_id(handler: BaseHTTPRequestHandler) -> int | None:
+    try:
+        event_id = _channel_mcp_parse_event_id(handler.headers.get("Last-Event-ID"))
+        if event_id is not None:
+            return event_id
+    except Exception:
+        pass
+    try:
+        params = _query_params(handler)
+        for key in ("lastEventId", "last_event_id", "last_id"):
+            event_id = _channel_mcp_parse_event_id(_first_param(params, key))
+            if event_id is not None:
+                return event_id
+    except Exception:
+        pass
+    return None
+
+
+def _channel_mcp_session_start_last_id(handler: BaseHTTPRequestHandler) -> int:
+    cursor_last_id = _channel_mcp_ensure_cursor_initialized()
+    client_last_id = _channel_mcp_client_last_event_id(handler)
+    if client_last_id is None:
+        return cursor_last_id
+    if client_last_id > cursor_last_id:
+        _channel_mcp_update_cursor(client_last_id)
+    router_log("INFO", f"channel_mcp_resume client_last_id={client_last_id} cursor_last_id={cursor_last_id}")
+    return client_last_id
+
+
 def _channel_mcp_notifications_for_messages(
     messages: list[dict[str, Any]],
     session: str = "",
@@ -5054,7 +5141,7 @@ def _channel_mcp_notifications_for_messages(
         events.append((last_id, _channel_mcp_notification(message)))
         router_log(
             "INFO",
-            f"channel_mcp_notification_sent session={session or '-'} message_id={message.get('id')} channel={message.get('channel')}",
+            f"channel_mcp_notification_prepared session={session or '-'} message_id={message.get('id')} channel={message.get('channel')}",
         )
     return last_id, events
 
@@ -5066,7 +5153,7 @@ def handle_channel_mcp_get(handler: BaseHTTPRequestHandler, path: str) -> bool:
     if path != "/ca/mcp/sse":
         return False
     session = _channel_mcp_session_id()
-    last_id = _channel_mcp_ensure_cursor_initialized()
+    last_id = _channel_mcp_session_start_last_id(handler)
     with _CHANNEL_MCP_LOCK:
         _CHANNEL_MCP_SESSIONS[session] = {"created_at": time.time(), "last_id": last_id, "initialized": False, "outbox": []}
     router_log("INFO", f"channel_mcp_session_started session={session} last_id={last_id}")
@@ -5101,7 +5188,9 @@ def handle_channel_mcp_get(handler: BaseHTTPRequestHandler, path: str) -> bool:
                 last_id = max(last_id, delivered_last_id)
                 for event_id, notification in events:
                     _write_sse_event(handler, "message", notification, event_id)
-                _channel_mcp_update_cursor(last_id)
+                    router_log("INFO", f"channel_mcp_notification_written session={session} message_id={event_id}")
+                if not events:
+                    _channel_mcp_update_cursor(last_id)
                 with _CHANNEL_MCP_LOCK:
                     state = _CHANNEL_MCP_SESSIONS.get(session)
                     if state:
@@ -9392,7 +9481,7 @@ def _mcp_server_is_stdio(server: dict[str, Any]) -> bool:
     server_type = str(server.get("type") or "").strip().lower()
     if server_type and server_type not in ("stdio", "command"):
         return False
-    command = str(server.get("command") or "").strip()
+    command = resolve_executable_for_subprocess(str(server.get("command") or "").strip())
     if not command:
         return False
     args = [str(item) for item in server.get("args", []) if item is not None] if isinstance(server.get("args", []), list) else []
@@ -13854,7 +13943,6 @@ def write_web_tools_mcp_config(cfg: dict[str, Any]) -> Path:
     web = cfg.get("web_search", {})
     package = web.get("package") or "ddg-mcp-search"
     npx = find_executable("npx") or ("npx.cmd" if os.name == "nt" else "npx")
-    uvx = find_executable("uvx") or "uvx"
     servers: dict[str, Any] = {
         "duckduckgo": {
             "command": npx,
@@ -13867,11 +13955,29 @@ def write_web_tools_mcp_config(cfg: dict[str, Any]) -> Path:
             fetch_args.extend(["--user-agent", str(web["fetch_user_agent"])])
         if web.get("fetch_ignore_robots_txt", False):
             fetch_args.append("--ignore-robots-txt")
-        servers["web_fetch"] = {
-            "command": uvx,
-            "args": fetch_args,
-            "claude_any_stdio": "jsonl",
-        }
+        fetch_command = find_executable("uvx")
+        fetch_command_args = fetch_args
+        if not fetch_command:
+            uv = find_executable("uv")
+            if uv:
+                fetch_command = uv
+                fetch_command_args = ["tool", "run", *fetch_args]
+            elif importlib.util.find_spec("uv") is not None:
+                fetch_command = sys.executable
+                fetch_command_args = ["-m", "uv", "tool", "run", *fetch_args]
+            else:
+                pipx = find_executable("pipx")
+                if pipx:
+                    fetch_command = pipx
+                    fetch_command_args = ["run", *fetch_args]
+        if fetch_command:
+            servers["web_fetch"] = {
+                "command": fetch_command,
+                "args": fetch_command_args,
+                "claude_any_stdio": "jsonl",
+            }
+        else:
+            router_log("WARN", "web_fetch_disabled_missing_runner install=uvx_or_uv")
     data = {"mcpServers": servers}
     CONFIG_DIR.mkdir(parents=True, exist_ok=True)
     WEB_TOOLS_MCP_CONFIG.write_text(json.dumps(data, indent=2) + "\n")
@@ -14600,6 +14706,7 @@ def run_mcp_stdio_proxy(server_name: str, server_config_path: Path) -> int:
         return 2
     command = str(server.get("command") or "").strip()
     args = [str(item) for item in server.get("args", [])] if isinstance(server.get("args"), list) else []
+    command, args = resolve_mcp_server_process(command, args)
     env = os.environ.copy()
     raw_env = server.get("env")
     if isinstance(raw_env, dict):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneciel-ai/claude-any",
-  "version": "0.1.91",
+  "version": "0.1.93",
   "description": "Claude Code provider selector for Anthropic, Ollama, Ollama Cloud, vLLM, NVIDIA hosted, and self-hosted NIM.",
   "license": "MIT",
   "author": "One Ciel LLC",