winterm-mcp 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

winterm_mcp/store.py

@@ -0,0 +1,92 @@
+"""
+命令存储管理 - winterm-mcp
+"""
+
+import threading
+import logging
+from typing import Optional
+from .models import CommandInfo
+
+logger = logging.getLogger("winterm-mcp")
+
+
+class CommandStore:
+    """
+    命令存储管理类，线程安全
+    """
+
+    def __init__(self) -> None:
+        self._commands: dict[str, CommandInfo] = {}
+        self._lock = threading.Lock()
+
+    def add_command(self, token: str, info: CommandInfo) -> None:
+        """
+        添加命令信息到存储
+
+        Args:
+            token: 命令令牌
+            info: 命令信息对象
+        """
+        with self._lock:
+            self._commands[token] = info
+            logger.debug(f"Added command to store: token={token}")
+
+    def get_command(self, token: str) -> Optional[CommandInfo]:
+        """
+        获取命令信息
+
+        Args:
+            token: 命令令牌
+
+        Returns:
+            命令信息对象，如果不存在则返回 None
+        """
+        with self._lock:
+            return self._commands.get(token)
+
+    def remove_command(self, token: str) -> bool:
+        """
+        移除命令信息
+
+        Args:
+            token: 命令令牌
+
+        Returns:
+            如果命令存在并被移除返回 True，否则返回 False
+        """
+        with self._lock:
+            if token in self._commands:
+                del self._commands[token]
+                logger.debug(f"Removed command from store: token={token}")
+                return True
+            return False
+
+    def get_all_tokens(self) -> list[str]:
+        """
+        获取所有命令令牌
+
+        Returns:
+            令牌列表
+        """
+        with self._lock:
+            return list(self._commands.keys())
+
+    def update_command(self, token: str, **kwargs) -> bool:
+        """
+        更新命令信息
+
+        Args:
+            token: 命令令牌
+            **kwargs: 要更新的字段
+
+        Returns:
+            如果命令存在并被更新返回 True，否则返回 False
+        """
+        with self._lock:
+            if token in self._commands:
+                for key, value in kwargs.items():
+                    if hasattr(self._commands[token], key):
+                        setattr(self._commands[token], key, value)
+                logger.debug(f"Updated command in store: token={token}, fields={list(kwargs.keys())}")
+                return True
+            return False

winterm_mcp/utils.py

@@ -0,0 +1,206 @@
+"""
+工具函数 - winterm-mcp
+"""
+
+import os
+import re
+import shutil
+import logging
+from typing import Optional
+from .constants import (
+    ENV_POWERSHELL_PATH,
+    ENV_CMD_PATH,
+    POWERSHELL_PATHS,
+    PWSH_PATHS,
+    CMD_PATHS,
+)
+
+logger = logging.getLogger("winterm-mcp")
+
+
+def find_powershell() -> str:
+    """
+    查找 PowerShell 可执行文件路径
+
+    优先级:
+    1. WINTERM_POWERSHELL_PATH 环境变量
+    2. 标准 PowerShell 路径
+    3. PowerShell Core 路径
+    4. PATH 环境变量
+    5. 抛出 FileNotFoundError
+
+    Returns:
+        PowerShell 可执行文件的绝对路径
+
+    Raises:
+        FileNotFoundError: 如果找不到 PowerShell
+    """
+    logger.debug("Starting PowerShell path discovery...")
+
+    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"
+            )
+
+    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
+
+    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
+
+    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
+    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 find_cmd() -> str:
+    """
+    查找 CMD 可执行文件路径
+
+    优先级:
+    1. WINTERM_CMD_PATH 环境变量
+    2. 标准 CMD 路径
+    3. PATH 环境变量
+    4. 抛出 FileNotFoundError
+
+    Returns:
+        CMD 可执行文件的绝对路径
+
+    Raises:
+        FileNotFoundError: 如果找不到 CMD
+    """
+    logger.debug("Starting CMD path discovery...")
+
+    custom_path = os.environ.get(ENV_CMD_PATH)
+    if custom_path:
+        logger.debug(f"Found env var {ENV_CMD_PATH}={custom_path}")
+        if os.path.isfile(custom_path):
+            logger.info(f"Using custom CMD path: {custom_path}")
+            return custom_path
+        else:
+            logger.warning(
+                f"Custom CMD path not found: {custom_path}, "
+                "falling back to standard paths"
+            )
+
+    for path in CMD_PATHS:
+        logger.debug(f"Checking standard path: {path}")
+        if os.path.isfile(path):
+            logger.info(f"Found CMD: {path}")
+            return path
+
+    logger.debug("Checking PATH environment variable...")
+    cmd_path = shutil.which("cmd")
+    if cmd_path:
+        logger.info(f"Found CMD in PATH: {cmd_path}")
+        return cmd_path
+
+    error_msg = (
+        f"CMD not found. "
+        f"Set {ENV_CMD_PATH} environment variable or "
+        f"ensure CMD is installed. "
+        f"Checked paths: {', '.join(CMD_PATHS)}"
+    )
+    logger.error(error_msg)
+    raise FileNotFoundError(error_msg)
+
+
+def resolve_executable_path(executable: str) -> str:
+    """
+    解析可执行文件路径
+
+    Args:
+        executable: 可执行文件名称或路径
+
+    Returns:
+        解析后的可执行文件路径
+
+    规则:
+    - 如果是绝对路径，直接返回
+    - 检查当前目录
+    - 在 PATH 中搜索（支持 .exe, .bat, .cmd, .com, .ps1）
+    - 返回原始名称（让系统处理错误）
+    """
+    if os.path.isabs(executable):
+        logger.debug(f"Executable is absolute path: {executable}")
+        return executable
+
+    if os.path.isfile(executable):
+        logger.debug(f"Executable found in current directory: {executable}")
+        return os.path.abspath(executable)
+
+    extensions = [".exe", ".bat", ".cmd", ".com", ".ps1"]
+
+    for ext in extensions:
+        if executable.lower().endswith(ext):
+            path = shutil.which(executable)
+            if path:
+                logger.debug(f"Found executable in PATH: {path}")
+                return path
+            break
+    else:
+        for ext in extensions:
+            full_path = shutil.which(executable + ext)
+            if full_path:
+                logger.debug(f"Found executable in PATH: {full_path}")
+                return full_path
+
+    logger.debug(f"Executable not found in PATH, returning original: {executable}")
+    return executable
+
+
+def strip_ansi_codes(text: str) -> str:
+    """
+    移除 ANSI 转义序列
+
+    Args:
+        text: 包含 ANSI 转义序列的文本
+
+    Returns:
+        清理后的文本
+
+    支持的转义序列:
+    - CSI 序列: \x1b[... 或 \u001b[...
+    - OSC 序列: \x1b]...\x07
+    - BEL 字符: \x07
+    """
+    ansi_escape = re.compile(
+        r"""
+        \x1b\[[0-9;]*[mGKHfABCDsuJK]  |  # CSI sequences
+        \x1b\][0-9;]*\x07              |  # OSC sequences
+        \x07                            |  # BEL character
+        \x1b.                              # Other ESC sequences
+        """,
+        re.VERBOSE,
+    )
+    return ansi_escape.sub("", text)

{winterm_mcp-0.1.6.dist-info → winterm_mcp-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: winterm-mcp
-Version: 0.1.6
+Version: 0.1.7
 Summary: A Model Context Protocol (MCP) service for executing Windows terminal commands asynchronously
 Author-email: winterm-mcp contributors <maintainer@example.com>
 License: MIT
@@ -19,6 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastmcp>=0.1.0
 Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pywinpty>=2.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: black>=23.0.0; extra == "dev"

winterm_mcp-0.1.7.dist-info/RECORD

@@ -0,0 +1,14 @@
+winterm_mcp/__init__.py,sha256=y-6DZGsz4wX5rCZPBH5uQv0S3RYlxt2bB5RyiEe1ts8,859
+winterm_mcp/__main__.py,sha256=jtZWUuc5hQpO5xU_YFak21QXrCM9nKEB2dGScXovJPc,1044
+winterm_mcp/constants.py,sha256=-n1_WlNpAsfn6lp4D3SQW3xFwZsWOFnIp1UIFC3sTGs,647
+winterm_mcp/models.py,sha256=zfzAd7k2a8nTmyM3QWuqPFr2ArELf5SgNyjTeWKcgAQ,1721
+winterm_mcp/server.py,sha256=tz3JT6jpko-tv34rSIRLunLl1z5sZInT9wdmkDM2zNs,7613
+winterm_mcp/service.py,sha256=HO1rPL4UyG2XxdT1rVdrs203tFd6FY-6S2pbhFYEPtg,22370
+winterm_mcp/store.py,sha256=obHzcTP1c7_6r2DzgbUBysx2XpA7Esfl00wLsPSOqS4,2421
+winterm_mcp/utils.py,sha256=uIjNFKP3T3q5ztNtxtquWKFhiWo4gjecOdHl8X3pXxA,5763
+winterm_mcp-0.1.7.dist-info/licenses/LICENSE,sha256=GPZ4VAbf_gxeFMSUHCmNQING30GK0kNduK8EJIO5-gc,1081
+winterm_mcp-0.1.7.dist-info/METADATA,sha256=4apHA0um7BT2WPWcl6mrqLyppveJCpENeQ-ODAxfVcc,5138
+winterm_mcp-0.1.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+winterm_mcp-0.1.7.dist-info/entry_points.txt,sha256=0OGioH1DKGxuxvSFD1OCRcbLoutfqdEPmJy_j2GhJTA,113
+winterm_mcp-0.1.7.dist-info/top_level.txt,sha256=S7w96DR3MB-CMIuXLnrMOvs5ApqPF-2PsAcfVCphCHw,12
+winterm_mcp-0.1.7.dist-info/RECORD,,

{winterm_mcp-0.1.6.dist-info → winterm_mcp-0.1.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

winterm_mcp-0.1.6.dist-info/RECORD

@@ -1,10 +0,0 @@
-winterm_mcp/__init__.py,sha256=SKtzW0lc0ixl5FUdEaJA6J7tryL-JYTvsPG8wUi5Dxk,222
-winterm_mcp/__main__.py,sha256=u-6txqlMEl-1TP5yQq5LEvGM8ppY4cODmMiTPGlllcQ,1106
-winterm_mcp/server.py,sha256=5DFC9bKBdePtf1GK6iCXC3QFBpQIjwpxNe_ov7Dlvhg,4839
-winterm_mcp/service.py,sha256=GyE3cBgKheWRviB-y7RtTwZuTj1zA4vX3-nznQA4slc,14281
-winterm_mcp-0.1.6.dist-info/licenses/LICENSE,sha256=GPZ4VAbf_gxeFMSUHCmNQING30GK0kNduK8EJIO5-gc,1081
-winterm_mcp-0.1.6.dist-info/METADATA,sha256=6Hyewzr6asiHtQkSdtMSfVr21HCw7yCZUjOzHwsam88,5106
-winterm_mcp-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-winterm_mcp-0.1.6.dist-info/entry_points.txt,sha256=0OGioH1DKGxuxvSFD1OCRcbLoutfqdEPmJy_j2GhJTA,113
-winterm_mcp-0.1.6.dist-info/top_level.txt,sha256=S7w96DR3MB-CMIuXLnrMOvs5ApqPF-2PsAcfVCphCHw,12
-winterm_mcp-0.1.6.dist-info/RECORD,,