mcp-probe-kit 3.0.11 → 3.0.12

package/build/lib/__tests__/gitnexus-bridge.unit.test.js

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import spawn from "cross-spawn";
 import { afterEach, describe, expect, test } from "vitest";
 import { prepareBridgeWorkspace, resolveExecutableCommand, resolveSpawnCommand } from "../gitnexus-bridge.js";
 const tempRoots = [];
@@ -17,6 +18,23 @@ function makeTempDir(prefix) {
     tempRoots.push(dir);
     return dir;
 }
+async function runSpawned(command, args) {
+    return await new Promise((resolve, reject) => {
+        const child = spawn(command, args, { windowsHide: true });
+        let stdout = "";
+        let stderr = "";
+        child.stdout?.on("data", (chunk) => {
+            stdout += String(chunk);
+        });
+        child.stderr?.on("data", (chunk) => {
+            stderr += String(chunk);
+        });
+        child.on("error", reject);
+        child.on("close", (code) => {
+            resolve({ code, stdout, stderr });
+        });
+    });
+}
 describe("gitnexus-bridge workspace preparation", () => {
     test("Windows 下将 npx/git 解析为 cmd 可执行文件", () => {
         const npxResolved = resolveExecutableCommand("npx", "win32").toLowerCase();
@@ -27,34 +45,39 @@ describe("gitnexus-bridge workspace preparation", () => {
         expect(resolveExecutableCommand("git", "win32").toLowerCase()).toContain("git");
         expect(resolveExecutableCommand("npx", "linux").toLowerCase()).toContain("npx");
     });
-    test("Windows 下将 cmd 工具包装为 cmd.exe /c 启动", () => {
+    test("Windows 下 npx 命令直接交给底层 spawn 处理", () => {
         const wrapped = resolveSpawnCommand("npx", ["-y", "gitnexus@latest", "mcp"], "win32");
-        expect(wrapped.command.toLowerCase()).toContain("cmd");
-        expect(wrapped.args.slice(0, 3)).toEqual(["/d", "/s", "/c"]);
-        expect(String(wrapped.args[3]).toLowerCase()).toContain("npx");
+        expect(wrapped.command.toLowerCase()).not.toContain("cmd.exe");
+        expect(wrapped.command.toLowerCase()).toContain("npx");
+        expect(wrapped.args).toEqual(["-y", "gitnexus@latest", "mcp"]);
     });
-    test("Windows 下带空格路径的 cmd 可执行文件会被正确加引号", () => {
+    test.runIf(process.platform === "win32")("Windows 下带空格路径的 cmd 可执行文件可以真实启动", async () => {
         const root = makeTempDir("gitnexus-space-");
-        const executable = path.join(root, "Program Files", "nodejs", "npx.cmd");
+        const executable = path.join(root, "Program Files", "tool.cmd");
         fs.mkdirSync(path.dirname(executable), { recursive: true });
-        fs.writeFileSync(executable, "@echo off\r\n", "utf-8");
+        fs.writeFileSync(executable, "@echo off\r\necho ok %*\r\n", "utf-8");
         const wrapped = resolveSpawnCommand(executable, ["-y", "gitnexus@latest", "mcp"], "win32");
-        expect(wrapped.command.toLowerCase()).toContain("cmd");
-        expect(wrapped.args.slice(0, 3)).toEqual(["/d", "/s", "/c"]);
-        expect(wrapped.args[3]).toBe(`"${executable}"`);
+        const result = await runSpawned(wrapped.command, wrapped.args);
+        expect(wrapped.command).toBe(executable);
+        expect(wrapped.args).toEqual(["-y", "gitnexus@latest", "mcp"]);
+        expect(result.code).toBe(0);
+        expect(result.stdout).toContain("ok");
+        expect(result.stdout).toContain("-y");
+        expect(result.stdout).toContain("gitnexus@latest");
+        expect(result.stdout).toContain("mcp");
+    });
+    test.runIf(process.platform === "win32")("Windows 下 resolveSpawnCommand 生成的 npx 命令可真实执行", async () => {
+        const spawned = resolveSpawnCommand("npx", ["--version"], "win32");
+        const result = await runSpawned(spawned.command, spawned.args);
+        expect(result.code).toBe(0);
+        expect(result.stdout.trim().length).toBeGreaterThan(0);
     });
     test("Windows 下 git.exe 直接启动，不走 git.cmd 壳层", () => {
         const resolved = resolveExecutableCommand("git", "win32").toLowerCase();
         const spawned = resolveSpawnCommand("git", ["init", "-q"], "win32");
         expect(resolved).toContain("git");
-        expect(resolved.endsWith(".exe") || resolved === "git").toBe(true);
-        expect(spawned.command.toLowerCase()).not.toContain("cmd.exe /d /s /c git.cmd");
-        if (spawned.command.toLowerCase().includes("cmd")) {
-            expect(String(spawned.args[3]).toLowerCase()).not.toContain("git.cmd");
-        }
-        else {
-            expect(spawned.command.toLowerCase()).toContain("git");
-        }
+        expect(resolved.endsWith(".exe") || resolved === "git" || resolved === "git.cmd").toBe(true);
+        expect(spawned.command.toLowerCase()).toContain("git");
     });
     test("git 目录直接使用源仓库", async () => {
         const repoRoot = makeTempDir("gitnexus-direct-");

package/build/lib/gitnexus-bridge.js

@@ -1,6 +1,7 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
-import { execFileSync, spawn } from "node:child_process";
+import { execFileSync } from "node:child_process";
+import spawn from "cross-spawn";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -239,44 +240,11 @@ function findExecutablePath(command, platform = process.platform) {
     }
     return undefined;
 }
-function shouldWrapWithCmd(rawCommand, executable, platform = process.platform) {
-    if (platform !== "win32") {
-        return false;
-    }
-    const rawLower = (rawCommand || "").trim().toLowerCase();
-    const executableLower = (executable || "").trim().toLowerCase();
-    const ext = path.extname(executableLower);
-    if (!rawLower && !executableLower) {
-        return true;
-    }
-    if (ext === ".cmd" || ext === ".bat") {
-        return true;
-    }
-    if (ext === ".exe") {
-        return false;
-    }
-    return rawLower === "npx" || rawLower === "npm";
-}
-function quoteForCmd(executable) {
-    if (!executable.includes(" ")) {
-        return executable;
-    }
-    if (executable.startsWith("\"") && executable.endsWith("\"")) {
-        return executable;
-    }
-    return `"${executable}"`;
-}
 export function resolveSpawnCommand(command, args, platform = process.platform) {
     const executable = resolveExecutableCommand(command, platform);
-    if (!shouldWrapWithCmd(command, executable, platform)) {
-        return {
-            command: executable,
-            args,
-        };
-    }
     return {
-        command: process.env.ComSpec || "cmd.exe",
-        args: ["/d", "/s", "/c", quoteForCmd(executable), ...args],
+        command: executable,
+        args,
     };
 }
 function extractText(result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-probe-kit",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "AI-Powered Development Toolkit - MCP Server with 22 tools covering code quality, development efficiency, project management, and UI/UX design. Features: Structured Output, Workflow Orchestration, UI/UX Pro Max, and Requirements Interview.",
   "mcpName": "io.github.mybolide/mcp-probe-kit",
   "type": "module",
@@ -64,10 +64,12 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.27.1",
+    "cross-spawn": "^7.0.6",
     "csv-parse": "^6.1.0",
     "tar": "^7.5.6"
   },
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
     "@types/node": "^20.0.0",
     "@types/tar": "^6.1.13",
     "@vitest/ui": "^4.0.18",