feat: update runtime paths and add bundled modules support

Author: DrSmoothl

.gitignore

@@ -1,3 +1,6 @@
+# macOS
+.DS_Store
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

README.md

@@ -24,7 +24,13 @@ bun run build
 
 ```text
 runtime/
-  python31211/
+  python/
+    python.exe
+    DLLs/
+    Lib/
+    Scripts/pip.exe
+  git/
+    bin/git.exe
 modules/
   MaiBot/
   MaiBot-Napcat-Adapter/

docs/release.md

@@ -13,7 +13,11 @@
 2. 准备 release payload。仓库根目录必须存在：
 
    ```text
-   runtime/python31211/bin/python.exe
+   runtime/python/python.exe
+   runtime/python/DLLs/
+   runtime/python/Lib/
+   runtime/python/Scripts/pip.exe
+   runtime/git/bin/git.exe
    modules/MaiBot/bot.py
    modules/napcat/NapCatWinBootMain.exe
    ```

package.json

@@ -93,6 +93,7 @@
     "nsis": {
       "oneClick": false,
       "perMachine": false,
+      "include": "installer.nsh",
       "allowToChangeInstallationDirectory": true,
       "createDesktopShortcut": true,
       "createStartMenuShortcut": true,

resources/installer.nsh

@@ -0,0 +1,6 @@
+!macro customHeader
+  ShowInstDetails show
+  !ifdef BUILD_UNINSTALLER
+    ShowUninstDetails show
+  !endif
+!macroend

scripts/release/check-windows-payload.ts

@@ -32,9 +32,44 @@ const requirements: Requirement[] = [
     candidates: [dir("runtime")],
   },
   {
-    label: "embedded Python",
+    label: "portable Python directory",
     required: true,
-    candidates: [file("runtime/python31211/bin/python.exe"), file("runtime/python31211/python.exe")],
+    candidates: [dir("runtime/python")],
+  },
+  {
+    label: "portable Python executable",
+    required: true,
+    candidates: [file("runtime/python/python.exe"), file("runtime/python/bin/python.exe")],
+  },
+  {
+    label: "portable Python standard library",
+    required: true,
+    candidates: [dir("runtime/python/Lib"), dir("runtime/python/lib")],
+  },
+  {
+    label: "portable Python extension modules",
+    required: true,
+    candidates: [dir("runtime/python/DLLs")],
+  },
+  {
+    label: "portable Python pip command",
+    required: true,
+    candidates: [file("runtime/python/Scripts/pip.exe"), file("runtime/python/bin/pip")],
+  },
+  {
+    label: "portable Python pip package",
+    required: true,
+    candidates: [dir("runtime/python/Lib/site-packages/pip"), dir("runtime/python/lib/site-packages/pip")],
+  },
+  {
+    label: "embedded Git directory",
+    required: true,
+    candidates: [dir("runtime/git")],
+  },
+  {
+    label: "embedded Git executable",
+    required: true,
+    candidates: [file("runtime/git/bin/git.exe"), file("runtime/git/cmd/git.exe"), file("runtime/git/git.exe")],
   },
   {
     label: "modules directory",

src/main/pty/pty-session-manager.ts

@@ -66,14 +66,6 @@ function resolveDefaultCwd(cwd: string | undefined): string {
   }
 }
 
-function quoteForCmd(value: string): string {
-  if (!/[ \t&()^|<>"]/.test(value)) {
-    return value;
-  }
-
-  return `"${value.replace(/"/g, '\\"')}"`;
-}
-
 interface ResolvedCommand {
   file: string;
   args: string[];
@@ -133,10 +125,9 @@ function resolveCommand(request: PtyStartRequest, encoding: PtyEncoding): Resolv
 
   if (requestedCommand && requestedCommand.length > 0) {
     if (process.platform === "win32") {
-      const commandLine = requestedCommand.map(quoteForCmd).join(" ");
       return {
-        file: process.env.ComSpec ?? "cmd.exe",
-        args: ["/D", "/S", "/C", `chcp ${codePage} > nul & ${commandLine}`],
+        file: requestedCommand[0],
+        args: requestedCommand.slice(1),
         displayCommand: requestedCommand,
         title: request.title ?? basename(requestedCommand[0]),
       };