ssh-licco 2.7.2__tar.gz → 2.7.3__tar.gz

{ssh_licco-2.7.2/ssh_licco.egg-info → ssh_licco-2.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssh-licco
-Version: 2.7.2
+Version: 2.7.3
 Summary: SSH Model Context Protocol Server - Enable SSH functionality for AI models
 Author-email: SSH LICCO Team <contact@ssh-licco.dev>
 License: MIT
@@ -47,6 +47,7 @@ Dynamic: license-file
 ## 📚 文档导航
 
 ### 快速开始
+- **[🐣 新手指南](docs/BEGINNER_GUIDE.md)** - 零基础上手（推荐从这开始）
 - **[⬇️ 安装指南](#-快速安装)** - 2 种安装方式
 - **[🚀 快速开始](#-快速开始)** - 5 分钟上手
 - **[📋 配置模板](#-完整配置示例)** - 开箱即用的配置

{ssh_licco-2.7.2 → ssh_licco-2.7.3}/README.md

@@ -14,6 +14,7 @@
 ## 📚 文档导航
 
 ### 快速开始
+- **[🐣 新手指南](docs/BEGINNER_GUIDE.md)** - 零基础上手（推荐从这开始）
 - **[⬇️ 安装指南](#-快速安装)** - 2 种安装方式
 - **[🚀 快速开始](#-快速开始)** - 5 分钟上手
 - **[📋 配置模板](#-完整配置示例)** - 开箱即用的配置

{ssh_licco-2.7.2 → ssh_licco-2.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssh-licco"
-version = "2.7.2"
+version = "2.7.3"
 description = "SSH Model Context Protocol Server - Enable SSH functionality for AI models"
 readme = "README.md"
 requires-python = ">=3.10"

{ssh_licco-2.7.2 → ssh_licco-2.7.3/ssh_licco.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssh-licco
-Version: 2.7.2
+Version: 2.7.3
 Summary: SSH Model Context Protocol Server - Enable SSH functionality for AI models
 Author-email: SSH LICCO Team <contact@ssh-licco.dev>
 License: MIT
@@ -47,6 +47,7 @@ Dynamic: license-file
 ## 📚 文档导航
 
 ### 快速开始
+- **[🐣 新手指南](docs/BEGINNER_GUIDE.md)** - 零基础上手（推荐从这开始）
 - **[⬇️ 安装指南](#-快速安装)** - 2 种安装方式
 - **[🚀 快速开始](#-快速开始)** - 5 分钟上手
 - **[📋 配置模板](#-完整配置示例)** - 开箱即用的配置

{ssh_licco-2.7.2 → ssh_licco-2.7.3}/ssh_licco.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ ssh_mcp/__init__.py
 ssh_mcp/__main__.py
 ssh_mcp/audit_logger.py
 ssh_mcp/batch_executor.py
-ssh_mcp/cli.py
 ssh_mcp/config_manager.py
 ssh_mcp/connection_config.py
 ssh_mcp/connection_pool.py

{ssh_licco-2.7.2 → ssh_licco-2.7.3}/ssh_mcp/__init__.py

@@ -1,8 +1,8 @@
 # SSH-LICCO 版本信息
 # 所有代码中的版本信息都从这里读取
-# 版本号：2.7.2
+# 版本号：2.7.3
 
-__version__ = "2.7.2"
+__version__ = "2.7.3"
 __author__ = "Li Qi"
 __email__ = "1985694657@qq.com"
 __license__ = "MIT"

{ssh_licco-2.7.2 → ssh_licco-2.7.3}/ssh_mcp/server.py

@@ -11,7 +11,14 @@ from typing import Any
 
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
-from mcp.types import TextContent, Tool
+from mcp.types import (
+    CallToolRequestParams,
+    CallToolResult,
+    ListToolsResult,
+    PaginatedRequestParams,
+    TextContent,
+    Tool,
+)
 
 from .audit_logger import get_audit_logger
 from .config_manager import ConfigManager, SSHConfig, SSHHost
@@ -212,24 +219,45 @@ class SSHMCPServer:
         return True, ""
 
     def _setup_handlers(self):
-        @self.server.list_tools()
-        async def list_tools() -> list[Tool]:
-            return list(schemas.TOOLS.values())
+        self.server.add_request_handler(
+            "tools/list", PaginatedRequestParams, self._handle_list_tools
+        )
+        self.server.add_request_handler(
+            "tools/call", CallToolRequestParams, self._handle_call_tool
+        )
 
-        @self.server.call_tool()
-        async def call_tool(name: str, arguments: Any) -> list[TextContent]:
-            allowed, msg = self._check_rate_limit()
-            if not allowed:
-                return [TextContent(type="text", text=msg)]
+    async def _handle_list_tools(
+        self, ctx: Any, params: PaginatedRequestParams
+    ) -> ListToolsResult:
+        return ListToolsResult(tools=list(schemas.TOOLS.values()))
+
+    async def _handle_call_tool(
+        self, ctx: Any, params: CallToolRequestParams
+    ) -> CallToolResult:
+        allowed, msg = self._check_rate_limit()
+        if not allowed:
+            return CallToolResult(
+                content=[TextContent(type="text", text=msg)], is_error=False
+            )
 
-            handler = HANDLERS.get(name)
-            if handler is None:
-                return [TextContent(type="text", text=f"Unknown tool: {name}")]
+        handler = HANDLERS.get(params.name)
+        if handler is None:
+            return CallToolResult(
+                content=[
+                    TextContent(type="text", text=f"Unknown tool: {params.name}")
+                ],
+                is_error=True,
+            )
 
-            try:
-                return await handler(self._ctx, arguments)
-            except Exception as e:
-                return [TextContent(type="text", text=f"Error: {str(e)}")]
+        try:
+            result = await handler(self._ctx, params.arguments or {})
+            content = result if isinstance(result, list) else [result]
+            return CallToolResult(content=content, is_error=False)
+        except Exception as e:
+            return CallToolResult(
+                content=[TextContent(type="text", text=f"Error: {str(e)}")],
+                is_error=True,
+            )
 
     async def _handle_connect(self, args: dict) -> list[TextContent]:
         """合并 ssh_config + ssh_login + ssh_connect"""

ssh_licco-2.7.2/ssh_mcp/cli.py

@@ -1,135 +0,0 @@
-"""SSH-LICCO command line interface."""
-from __future__ import annotations
-
-import argparse
-import os
-import sys
-from pathlib import Path
-
-from ssh_mcp import __version__
-
-
-def _build_parser() -> argparse.ArgumentParser:
-    """Build the CLI argument parser."""
-    parser = argparse.ArgumentParser(
-        prog="ssh-licco",
-        description="SSH-LICCO: Remote server management via MCP and CLI.",
-    )
-    parser.add_argument(
-        "--version",
-        action="version",
-        version=f"ssh-licco {__version__}",
-    )
-
-    subparsers = parser.add_subparsers(dest="subcommand", required=False)
-
-    # exec
-    exec_parser = subparsers.add_parser("exec", help="Execute a remote command")
-    exec_parser.add_argument("cmd", help="Command to execute")
-    exec_parser.add_argument("--host", default=None, help="Remote host")
-    exec_parser.add_argument("-u", "--username", default=None, help="SSH username")
-    exec_parser.add_argument("--password", default=None, help="SSH password")
-    exec_parser.add_argument(
-        "--connect-timeout", type=int, default=None, help="Connection timeout in seconds"
-    )
-
-    # upload
-    upload_parser = subparsers.add_parser("upload", help="Upload a file")
-    upload_parser.add_argument("local", help="Local file path")
-    upload_parser.add_argument("remote", help="Remote file path")
-    upload_parser.add_argument("--host", default=None, help="Remote host")
-    upload_parser.add_argument("-u", "--username", default=None, help="SSH username")
-    upload_parser.add_argument("--password", default=None, help="SSH password")
-
-    # download
-    download_parser = subparsers.add_parser("download", help="Download a file")
-    download_parser.add_argument("remote", help="Remote file path")
-    download_parser.add_argument("local", help="Local file path")
-    download_parser.add_argument("--host", default=None, help="Remote host")
-    download_parser.add_argument("-u", "--username", default=None, help="SSH username")
-    download_parser.add_argument("--password", default=None, help="SSH password")
-
-    # docker-build
-    docker_build_parser = subparsers.add_parser("docker-build", help="Build a Docker image")
-    docker_build_parser.add_argument("image", help="Image tag")
-    docker_build_parser.add_argument("-c", "--context", default=".", help="Build context")
-    docker_build_parser.add_argument("-f", "--dockerfile", default="Dockerfile", help="Dockerfile path")
-    docker_build_parser.add_argument("-t", "--timeout", type=int, default=600, help="Build timeout")
-
-    # serve
-    subparsers.add_parser("serve", help="Start the MCP server")
-
-    # list-hosts
-    subparsers.add_parser("list-hosts", help="List configured hosts")
-
-    return parser
-
-
-def _load_connection_config(args: argparse.Namespace) -> dict:
-    """Load connection config from CLI args or environment variables."""
-    host = args.host or os.getenv("SSH_HOST")
-    username = args.username or os.getenv("SSH_USER")
-    password = args.password or os.getenv("SSH_PASSWORD")
-    port = args.port if getattr(args, "port", None) else 22
-    timeout = args.connect_timeout if getattr(args, "connect_timeout", None) else 30
-
-    return {
-        "host": host,
-        "port": port,
-        "username": username,
-        "password": password,
-        "timeout": timeout,
-    }
-
-
-def main(argv: list[str] | None = None) -> int:
-    """CLI entry point."""
-    parser = _build_parser()
-    args = parser.parse_args(argv)
-
-    if args.subcommand is None:
-        parser.print_help()
-        return 0
-
-    if args.subcommand == "serve":
-        from ssh_mcp.server import run_server
-
-        run_server()
-        return 0
-
-    if args.subcommand == "list-hosts":
-        from ssh_mcp.config_manager import ConfigManager
-
-        manager = ConfigManager()
-        hosts = manager.list_hosts()
-        if not hosts:
-            print("No hosts configured.")
-            return 0
-        for name, config in hosts.items():
-            print(f"{name}: {config.host}:{config.port} ({config.username})")
-        return 0
-
-    if args.subcommand == "exec":
-        config = _load_connection_config(args)
-        print(f"Would execute on {config['host']}: {args.cmd}")
-        return 0
-
-    if args.subcommand == "upload":
-        config = _load_connection_config(args)
-        print(f"Would upload {args.local} -> {config['host']}:{args.remote}")
-        return 0
-
-    if args.subcommand == "download":
-        config = _load_connection_config(args)
-        print(f"Would download {config['host']}:{args.remote} -> {args.local}")
-        return 0
-
-    if args.subcommand == "docker-build":
-        print(f"Would build Docker image {args.image} from {args.context}/{args.dockerfile}")
-        return 0
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())