winterm-mcp 0.1.4__tar.gz → 0.1.5__tar.gz

{winterm_mcp-0.1.4/src/winterm_mcp.egg-info → winterm_mcp-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: winterm-mcp
-Version: 0.1.4
+Version: 0.1.5
 Summary: A Model Context Protocol (MCP) service for executing Windows terminal commands asynchronously
 Author-email: winterm-mcp contributors <maintainer@example.com>
 License: MIT

{winterm_mcp-0.1.4 → winterm_mcp-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "winterm-mcp"
-version = "0.1.4"
+version = "0.1.5"
 description = "A Model Context Protocol (MCP) service for executing Windows terminal commands asynchronously"
 readme = "README.md"
 license = {text = "MIT"}

winterm_mcp-0.1.5/src/winterm_mcp/__init__.py

@@ -0,0 +1,9 @@
+"""
+winterm-mcp - Windows Terminal MCP Service
+"""
+
+from .service import __version__, get_version, setup_logging
+
+__author__ = "winterm-mcp contributors"
+
+__all__ = ["__version__", "get_version", "setup_logging"]

winterm_mcp-0.1.5/src/winterm_mcp/__main__.py

@@ -0,0 +1,42 @@
+"""
+winterm-mcp 主入口
+"""
+
+from .server import app, init_service
+from .service import RunCmdService, setup_logging, __version__
+import logging
+import os
+import tempfile
+
+
+def main():
+    """
+    主函数，启动 MCP 服务器
+    """
+    # 初始化日志
+    setup_logging(logging.INFO)
+    
+    logger = logging.getLogger("winterm-mcp")
+    
+    # 获取日志文件路径并记录
+    log_file = os.environ.get("WINTERM_LOG_FILE") or os.path.join(
+        tempfile.gettempdir(), "winterm-mcp.log"
+    )
+    
+    logger.info("=" * 60)
+    logger.info(f"winterm-mcp v{__version__} starting...")
+    logger.info(f"Log file: {log_file}")
+    logger.info(f"Temp dir: {tempfile.gettempdir()}")
+    logger.info(f"Working dir: {os.getcwd()}")
+    logger.info(f"WINTERM_POWERSHELL_PATH: {os.environ.get('WINTERM_POWERSHELL_PATH', '(not set)')}")
+    logger.info("=" * 60)
+    
+    service = RunCmdService()
+    init_service(service)
+    
+    logger.info("Service initialized, starting MCP server...")
+    app.run()
+
+
+if __name__ == "__main__":
+    main()

{winterm_mcp-0.1.4 → winterm_mcp-0.1.5}/src/winterm_mcp/server.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Annotated, Optional, Dict, Any
 from mcp.server.fastmcp import FastMCP
-from .service import RunCmdService
+from .service import RunCmdService, get_version, setup_logging, __version__
 from pydantic import Field
 
 CommandStr = Annotated[
@@ -124,3 +124,50 @@ def query_command_status(token: str) -> Dict[str, Any]:
         return result
     except Exception as e:
         return {"error": str(e)}
+
+
+@app.tool(
+    name="get_version",
+    description="获取 winterm-mcp 服务的版本信息和运行状态。",
+    annotations={
+        "title": "版本信息",
+        "readOnlyHint": True,
+        "destructiveHint": False,
+        "idempotentHint": True,
+        "openWorldHint": False,
+    },
+)
+def get_version_tool() -> Dict[str, Any]:
+    """
+    获取 winterm-mcp 版本信息
+    
+    Returns:
+        包含版本号和服务状态的字典
+    """
+    import os
+    import sys
+    
+    try:
+        # 尝试获取 PowerShell 路径信息
+        ps_path = None
+        ps_error = None
+        try:
+            from .service import _find_powershell
+            ps_path = _find_powershell()
+        except FileNotFoundError as e:
+            ps_error = str(e)
+        
+        return {
+            "version": get_version(),
+            "service_status": "running",
+            "python_version": sys.version,
+            "platform": sys.platform,
+            "powershell_path": ps_path,
+            "powershell_error": ps_error,
+            "env": {
+                "WINTERM_POWERSHELL_PATH": os.environ.get("WINTERM_POWERSHELL_PATH"),
+                "WINTERM_LOG_LEVEL": os.environ.get("WINTERM_LOG_LEVEL"),
+            }
+        }
+    except Exception as e:
+        return {"error": str(e), "version": __version__}

{winterm_mcp-0.1.4 → winterm_mcp-0.1.5}/src/winterm_mcp/service.py

@@ -8,9 +8,65 @@ import uuid
 import time
 import os
 import shutil
+import logging
 from datetime import datetime
 from typing import Dict, Optional, Any, List
 
+# 版本号
+__version__ = "0.1.5"
+
+# 配置日志
+logger = logging.getLogger("winterm-mcp")
+
+
+def setup_logging(level: int = logging.INFO) -> None:
+    """
+    配置日志输出
+    
+    Args:
+        level: 日志级别，默认 INFO
+    
+    日志输出位置：
+    1. 控制台 (stderr)
+    2. 文件: %TEMP%/winterm-mcp.log 或 /tmp/winterm-mcp.log
+    
+    可通过环境变量配置：
+    - WINTERM_LOG_LEVEL: 日志级别 (DEBUG/INFO/WARNING/ERROR/CRITICAL)
+    - WINTERM_LOG_FILE: 自定义日志文件路径
+    """
+    import tempfile
+    
+    formatter = logging.Formatter(
+        "[%(asctime)s] [%(name)s] [%(levelname)s] %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S"
+    )
+    
+    # 控制台输出
+    console_handler = logging.StreamHandler()
+    console_handler.setFormatter(formatter)
+    logger.addHandler(console_handler)
+    
+    # 文件输出
+    log_file = os.environ.get("WINTERM_LOG_FILE")
+    if not log_file:
+        # 默认日志文件路径
+        log_file = os.path.join(tempfile.gettempdir(), "winterm-mcp.log")
+    
+    try:
+        file_handler = logging.FileHandler(log_file, encoding="utf-8")
+        file_handler.setFormatter(formatter)
+        logger.addHandler(file_handler)
+        logger.info(f"Log file: {log_file}")
+    except Exception as e:
+        logger.warning(f"Failed to create log file {log_file}: {e}")
+    
+    logger.setLevel(level)
+    
+    # 检查环境变量设置日志级别
+    env_level = os.environ.get("WINTERM_LOG_LEVEL", "").upper()
+    if env_level in ("DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"):
+        logger.setLevel(getattr(logging, env_level))
+
 
 # PowerShell 可执行文件的标准路径（按优先级排序）
 POWERSHELL_PATHS: List[str] = [
@@ -44,40 +100,67 @@ def _find_powershell() -> str:
     Raises:
         FileNotFoundError: 如果找不到 PowerShell
     """
+    logger.debug("Starting PowerShell path discovery...")
+    
     # 1. 检查用户配置的环境变量
     custom_path = os.environ.get(ENV_POWERSHELL_PATH)
     if custom_path:
+        logger.debug(f"Found env var {ENV_POWERSHELL_PATH}={custom_path}")
         if os.path.isfile(custom_path):
+            logger.info(f"Using custom PowerShell path: {custom_path}")
             return custom_path
-        # 用户配置了但路径无效，记录警告但继续查找
+        else:
+            logger.warning(
+                f"Custom PowerShell path not found: {custom_path}, "
+                "falling back to standard paths"
+            )
 
     # 2. 检查 Windows PowerShell 标准路径
     for path in POWERSHELL_PATHS:
+        logger.debug(f"Checking standard path: {path}")
         if os.path.isfile(path):
+            logger.info(f"Found Windows PowerShell: {path}")
             return path
 
     # 3. 检查 PowerShell Core 标准路径
     for path in PWSH_PATHS:
+        logger.debug(f"Checking PowerShell Core path: {path}")
         if os.path.isfile(path):
+            logger.info(f"Found PowerShell Core: {path}")
             return path
 
     # 4. 尝试 PATH 环境变量（兼容正常环境）
+    logger.debug("Checking PATH environment variable...")
     ps_path = shutil.which("powershell")
     if ps_path:
+        logger.info(f"Found PowerShell in PATH: {ps_path}")
         return ps_path
 
     pwsh_path = shutil.which("pwsh")
     if pwsh_path:
+        logger.info(f"Found pwsh in PATH: {pwsh_path}")
         return pwsh_path
 
     # 所有方法都失败
     checked_paths = POWERSHELL_PATHS + PWSH_PATHS
-    raise FileNotFoundError(
+    error_msg = (
         f"PowerShell not found. "
         f"Set {ENV_POWERSHELL_PATH} environment variable or "
         f"ensure PowerShell is installed. "
         f"Checked paths: {', '.join(checked_paths)}"
     )
+    logger.error(error_msg)
+    raise FileNotFoundError(error_msg)
+
+
+def get_version() -> str:
+    """
+    获取 winterm-mcp 版本号
+    
+    Returns:
+        版本号字符串
+    """
+    return __version__
 
 
 class RunCmdService:
@@ -104,6 +187,7 @@ class RunCmdService:
         """
         if self._powershell_path is None:
             self._powershell_path = _find_powershell()
+            logger.debug(f"PowerShell path cached: {self._powershell_path}")
         return self._powershell_path
 
     def run_command(
@@ -126,6 +210,12 @@ class RunCmdService:
             命令执行的token
         """
         token = str(uuid.uuid4())
+        
+        logger.info(
+            f"Submitting command: token={token}, shell={shell_type}, "
+            f"timeout={timeout}, cwd={working_directory}"
+        )
+        logger.debug(f"Command content: {command[:100]}{'...' if len(command) > 100 else ''}")
 
         cmd_info = {
             "token": token,
@@ -167,6 +257,7 @@ class RunCmdService:
         """
         try:
             start_time = time.time()
+            logger.debug(f"[{token}] Starting command execution...")
 
             with self.lock:
                 if token in self.commands:
@@ -177,6 +268,7 @@ class RunCmdService:
             if shell_type == "powershell":
                 # 使用绝对路径调用 PowerShell，避免 PATH 环境变量限制
                 ps_path = self._get_powershell_path()
+                logger.info(f"[{token}] Using PowerShell: {ps_path}")
                 cmd_args = [
                     ps_path,
                     "-NoProfile",
@@ -188,8 +280,11 @@ class RunCmdService:
                     command,
                 ]
             else:
+                logger.debug(f"[{token}] Using cmd.exe")
                 cmd_args = ["cmd", "/c", command]
 
+            logger.debug(f"[{token}] Executing: {cmd_args}")
+            
             result = subprocess.run(
                 cmd_args,
                 capture_output=True,
@@ -201,6 +296,13 @@ class RunCmdService:
             )
 
             execution_time = time.time() - start_time
+            
+            logger.info(
+                f"[{token}] Command completed: exit_code={result.returncode}, "
+                f"time={execution_time:.3f}s"
+            )
+            logger.debug(f"[{token}] stdout: {result.stdout[:200] if result.stdout else '(empty)'}")
+            logger.debug(f"[{token}] stderr: {result.stderr[:200] if result.stderr else '(empty)'}")
 
             with self.lock:
                 if token in self.commands:
@@ -216,6 +318,7 @@ class RunCmdService:
 
         except FileNotFoundError as e:
             execution_time = time.time() - start_time
+            logger.error(f"[{token}] PowerShell not found: {e}")
             with self.lock:
                 if token in self.commands:
                     self.commands[token].update(
@@ -230,6 +333,7 @@ class RunCmdService:
                     )
         except subprocess.TimeoutExpired:
             execution_time = time.time() - start_time
+            logger.warning(f"[{token}] Command timed out after {timeout}s")
             with self.lock:
                 if token in self.commands:
                     self.commands[token].update(
@@ -246,6 +350,7 @@ class RunCmdService:
                     )
         except Exception as e:
             execution_time = time.time() - start_time
+            logger.error(f"[{token}] Command failed with exception: {e}")
             with self.lock:
                 if token in self.commands:
                     self.commands[token].update(
@@ -269,8 +374,11 @@ class RunCmdService:
         Returns:
             包含命令状态的字典
         """
+        logger.debug(f"Querying status for token: {token}")
+        
         with self.lock:
             if token not in self.commands:
+                logger.warning(f"Token not found: {token}")
                 return {
                     "token": token,
                     "status": "not_found",
@@ -278,6 +386,7 @@ class RunCmdService:
                 }
 
             cmd_info = self.commands[token].copy()
+            logger.debug(f"[{token}] Status: {cmd_info['status']}")
 
             if cmd_info["status"] == "running":
                 return {"token": cmd_info["token"], "status": "running"}

{winterm_mcp-0.1.4 → winterm_mcp-0.1.5/src/winterm_mcp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: winterm-mcp
-Version: 0.1.4
+Version: 0.1.5
 Summary: A Model Context Protocol (MCP) service for executing Windows terminal commands asynchronously
 Author-email: winterm-mcp contributors <maintainer@example.com>
 License: MIT

winterm_mcp-0.1.4/src/winterm_mcp/__init__.py

@@ -1,6 +0,0 @@
-"""
-winterm-mcp - Windows Terminal MCP Service
-"""
-
-__version__ = "0.1.1"
-__author__ = "winterm-mcp contributors"

winterm_mcp-0.1.4/src/winterm_mcp/__main__.py

@@ -1,19 +0,0 @@
-"""
-winterm-mcp 主入口
-"""
-
-from .server import app, init_service
-from .service import RunCmdService
-
-
-def main():
-    """
-    主函数，启动 MCP 服务器
-    """
-    service = RunCmdService()
-    init_service(service)
-    app.run()
-
-
-if __name__ == "__main__":
-    main()