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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: winterm-mcp
-Version: 0.1.2
+Version: 0.1.4
 Summary: A Model Context Protocol (MCP) service for executing Windows terminal commands asynchronously
 Author-email: winterm-mcp contributors <maintainer@example.com>
 License: MIT
@@ -27,8 +27,8 @@ Dynamic: license-file
 
 # winterm-mcp
 
-**更新日期**: 2026-01-16  
-**版本**: 0.1.1
+**更新日期**: 2026-01-16
+**版本**: 0.1.4
 
 Windows Terminal MCP Service - 专门支持 Windows 终端的异步命令执行工具。
 
@@ -58,8 +58,50 @@ pip install -e .
 ```json
 {
   "mcpServers": {
-    "winterm-mcp": {
-      "command": "winterm-mcp"
+    "winterm": {
+      "command": "uvx",
+      "args": [
+        "winterm-mcp"
+      ]
+    }
+  }
+}
+```
+
+### 环境配置
+
+#### PowerShell 路径配置
+
+在某些受限环境（如沙箱环境）中，系统 PATH 可能不包含 PowerShell 路径。winterm-mcp 会自动探测以下位置：
+
+1. `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
+2. `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`
+3. `C:\Program Files\PowerShell\7\pwsh.exe`（PowerShell Core）
+4. `C:\Program Files (x86)\PowerShell\7\pwsh.exe`
+
+如果 PowerShell 安装在非标准位置，可通过环境变量指定：
+
+**方式一：系统环境变量**
+
+```bash
+# Windows CMD
+set WINTERM_POWERSHELL_PATH=D:\CustomPath\powershell.exe
+
+# Windows PowerShell
+$env:WINTERM_POWERSHELL_PATH = "D:\CustomPath\powershell.exe"
+```
+
+**方式二：MCP 配置**
+
+```json
+{
+  "mcpServers": {
+    "winterm": {
+      "command": "uvx",
+      "args": ["winterm-mcp"],
+      "env": {
+        "WINTERM_POWERSHELL_PATH": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"
+      }
     }
   }
 }

{winterm_mcp-0.1.2 → winterm_mcp-0.1.4}/README.md

@@ -1,7 +1,7 @@
 # winterm-mcp
 
-**更新日期**: 2026-01-16  
-**版本**: 0.1.1
+**更新日期**: 2026-01-16
+**版本**: 0.1.4
 
 Windows Terminal MCP Service - 专门支持 Windows 终端的异步命令执行工具。
 
@@ -31,8 +31,50 @@ pip install -e .
 ```json
 {
   "mcpServers": {
-    "winterm-mcp": {
-      "command": "winterm-mcp"
+    "winterm": {
+      "command": "uvx",
+      "args": [
+        "winterm-mcp"
+      ]
+    }
+  }
+}
+```
+
+### 环境配置
+
+#### PowerShell 路径配置
+
+在某些受限环境（如沙箱环境）中，系统 PATH 可能不包含 PowerShell 路径。winterm-mcp 会自动探测以下位置：
+
+1. `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
+2. `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`
+3. `C:\Program Files\PowerShell\7\pwsh.exe`（PowerShell Core）
+4. `C:\Program Files (x86)\PowerShell\7\pwsh.exe`
+
+如果 PowerShell 安装在非标准位置，可通过环境变量指定：
+
+**方式一：系统环境变量**
+
+```bash
+# Windows CMD
+set WINTERM_POWERSHELL_PATH=D:\CustomPath\powershell.exe
+
+# Windows PowerShell
+$env:WINTERM_POWERSHELL_PATH = "D:\CustomPath\powershell.exe"
+```
+
+**方式二：MCP 配置**
+
+```json
+{
+  "mcpServers": {
+    "winterm": {
+      "command": "uvx",
+      "args": ["winterm-mcp"],
+      "env": {
+        "WINTERM_POWERSHELL_PATH": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"
+      }
     }
   }
 }

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "winterm-mcp"
-version = "0.1.2"
+version = "0.1.4"
 description = "A Model Context Protocol (MCP) service for executing Windows terminal commands asynchronously"
 readme = "README.md"
 license = {text = "MIT"}
@@ -47,3 +47,9 @@ include = ["winterm_mcp*"]
 
 [project.entry-points."mcp.servers"]
 winterm-mcp = "winterm_mcp.__main__:main"
+
+[tool.black]
+line-length = 88
+
+[tool.flake8]
+max-line-length = 88

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

@@ -54,8 +54,7 @@ def init_service(service: RunCmdService) -> None:
 def _svc() -> RunCmdService:
     if _service is None:
         raise RuntimeError(
-            "Service not initialized. "
-            "Call init_service() before running the server."
+            "Service not initialized. " "Call init_service() before running the server."
         )
     return _service
 
@@ -93,9 +92,7 @@ def run_command(
         包含token和状态信息的字典
     """
     try:
-        token = _svc().run_command(
-            command, shell_type, timeout, working_directory
-        )
+        token = _svc().run_command(command, shell_type, timeout, working_directory)
         return {"token": token, "status": "pending", "message": "submitted"}
     except Exception as e:
         return {"error": str(e)}

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

@@ -6,8 +6,78 @@ import subprocess
 import threading
 import uuid
 import time
+import os
+import shutil
 from datetime import datetime
-from typing import Dict, Optional, Any
+from typing import Dict, Optional, Any, List
+
+
+# PowerShell 可执行文件的标准路径（按优先级排序）
+POWERSHELL_PATHS: List[str] = [
+    r"C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe",
+    r"C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe",
+]
+
+# PowerShell Core (pwsh) 的常见路径
+PWSH_PATHS: List[str] = [
+    r"C:\Program Files\PowerShell\7\pwsh.exe",
+    r"C:\Program Files (x86)\PowerShell\7\pwsh.exe",
+]
+
+# 环境变量名称
+ENV_POWERSHELL_PATH = "WINTERM_POWERSHELL_PATH"
+
+
+def _find_powershell() -> str:
+    """
+    查找可用的 PowerShell 可执行文件路径
+
+    查找顺序：
+    1. 环境变量 WINTERM_POWERSHELL_PATH（用户自定义）
+    2. Windows PowerShell 标准路径
+    3. PowerShell Core 标准路径
+    4. PATH 环境变量中的 powershell/pwsh（兼容正常环境）
+
+    Returns:
+        PowerShell 可执行文件的绝对路径
+
+    Raises:
+        FileNotFoundError: 如果找不到 PowerShell
+    """
+    # 1. 检查用户配置的环境变量
+    custom_path = os.environ.get(ENV_POWERSHELL_PATH)
+    if custom_path:
+        if os.path.isfile(custom_path):
+            return custom_path
+        # 用户配置了但路径无效，记录警告但继续查找
+
+    # 2. 检查 Windows PowerShell 标准路径
+    for path in POWERSHELL_PATHS:
+        if os.path.isfile(path):
+            return path
+
+    # 3. 检查 PowerShell Core 标准路径
+    for path in PWSH_PATHS:
+        if os.path.isfile(path):
+            return path
+
+    # 4. 尝试 PATH 环境变量（兼容正常环境）
+    ps_path = shutil.which("powershell")
+    if ps_path:
+        return ps_path
+
+    pwsh_path = shutil.which("pwsh")
+    if pwsh_path:
+        return pwsh_path
+
+    # 所有方法都失败
+    checked_paths = POWERSHELL_PATHS + PWSH_PATHS
+    raise FileNotFoundError(
+        f"PowerShell not found. "
+        f"Set {ENV_POWERSHELL_PATH} environment variable or "
+        f"ensure PowerShell is installed. "
+        f"Checked paths: {', '.join(checked_paths)}"
+    )
 
 
 class RunCmdService:
@@ -18,6 +88,23 @@ class RunCmdService:
     def __init__(self):
         self.commands: Dict[str, Dict[str, Any]] = {}
         self.lock = threading.Lock()
+        self._powershell_path: Optional[str] = None
+
+    def _get_powershell_path(self) -> str:
+        """
+        获取 PowerShell 可执行文件路径（带缓存）
+
+        首次调用时查找并缓存路径，后续调用直接返回缓存值。
+
+        Returns:
+            PowerShell 可执行文件的绝对路径
+
+        Raises:
+            FileNotFoundError: 如果找不到 PowerShell
+        """
+        if self._powershell_path is None:
+            self._powershell_path = _find_powershell()
+        return self._powershell_path
 
     def run_command(
         self,
@@ -88,7 +175,18 @@ class RunCmdService:
             encoding = "gbk"
 
             if shell_type == "powershell":
-                cmd_args = ["powershell", "-NoProfile", "-NonInteractive", "-Command", command]
+                # 使用绝对路径调用 PowerShell，避免 PATH 环境变量限制
+                ps_path = self._get_powershell_path()
+                cmd_args = [
+                    ps_path,
+                    "-NoProfile",
+                    "-NoLogo",
+                    "-NonInteractive",
+                    "-ExecutionPolicy",
+                    "Bypass",
+                    "-Command",
+                    command,
+                ]
             else:
                 cmd_args = ["cmd", "/c", command]
 
@@ -99,6 +197,7 @@ class RunCmdService:
                 timeout=timeout,
                 cwd=working_directory,
                 encoding=encoding,
+                stdin=subprocess.DEVNULL,  # 防止等待输入导致挂起
             )
 
             execution_time = time.time() - start_time
@@ -115,6 +214,20 @@ class RunCmdService:
                         }
                     )
 
+        except FileNotFoundError as e:
+            execution_time = time.time() - start_time
+            with self.lock:
+                if token in self.commands:
+                    self.commands[token].update(
+                        {
+                            "status": "completed",
+                            "stdout": "",
+                            "stderr": f"PowerShell not found: {e}",
+                            "exit_code": -2,
+                            "execution_time": execution_time,
+                            "timeout_occurred": False,
+                        }
+                    )
         except subprocess.TimeoutExpired:
             execution_time = time.time() - start_time
             with self.lock:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: winterm-mcp
-Version: 0.1.2
+Version: 0.1.4
 Summary: A Model Context Protocol (MCP) service for executing Windows terminal commands asynchronously
 Author-email: winterm-mcp contributors <maintainer@example.com>
 License: MIT
@@ -27,8 +27,8 @@ Dynamic: license-file
 
 # winterm-mcp
 
-**更新日期**: 2026-01-16  
-**版本**: 0.1.1
+**更新日期**: 2026-01-16
+**版本**: 0.1.4
 
 Windows Terminal MCP Service - 专门支持 Windows 终端的异步命令执行工具。
 
@@ -58,8 +58,50 @@ pip install -e .
 ```json
 {
   "mcpServers": {
-    "winterm-mcp": {
-      "command": "winterm-mcp"
+    "winterm": {
+      "command": "uvx",
+      "args": [
+        "winterm-mcp"
+      ]
+    }
+  }
+}
+```
+
+### 环境配置
+
+#### PowerShell 路径配置
+
+在某些受限环境（如沙箱环境）中，系统 PATH 可能不包含 PowerShell 路径。winterm-mcp 会自动探测以下位置：
+
+1. `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
+2. `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`
+3. `C:\Program Files\PowerShell\7\pwsh.exe`（PowerShell Core）
+4. `C:\Program Files (x86)\PowerShell\7\pwsh.exe`
+
+如果 PowerShell 安装在非标准位置，可通过环境变量指定：
+
+**方式一：系统环境变量**
+
+```bash
+# Windows CMD
+set WINTERM_POWERSHELL_PATH=D:\CustomPath\powershell.exe
+
+# Windows PowerShell
+$env:WINTERM_POWERSHELL_PATH = "D:\CustomPath\powershell.exe"
+```
+
+**方式二：MCP 配置**
+
+```json
+{
+  "mcpServers": {
+    "winterm": {
+      "command": "uvx",
+      "args": ["winterm-mcp"],
+      "env": {
+        "WINTERM_POWERSHELL_PATH": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"
+      }
     }
   }
 }