pi-web-ui 0.19.1 → 0.20.0

package/dist/server/terminals.js

@@ -103,16 +103,50 @@ export async function saveCommandsFile(workspaceRoot, commands) {
     }
 }
 const isWindows = process.platform === "win32";
+/** `-i` makes bash interactive; cmd.exe / powershell.exe are interactive on their own. */
+function bashArgs(shell) {
+    return /[\\/]bash(\.exe)?$/i.test(shell) ? ["-i"] : [];
+}
 /**
- * Interactive shell for PTYs. Windows has no $SHELL: use Git Bash if the user
- * has it, otherwise the console host from $COMSPEC (always set → cmd.exe).
- * POSIX uses the user's login shell, falling back to bash.
+ * Interactive shell for PTYs.
+ * - Windows: prefer bash — it matches the SDK's bash tool, so the agent and
+ *   the terminal speak the same shell language (no more PowerShell/bash
+ *   混用 that leaves heredocs / `&&` / `<<` hanging or erroring). Order:
+ *   1. PI_WEB_SHELL (explicit override)
+ *   2. $SHELL when it exists on disk (user launched from a Git Bash session)
+ *   3. Git Bash install paths (ProgramFiles / ProgramFiles(x86))
+ *   4. busybox-w32 fallback in <home>/.pi-web/bin/bash.exe (ensure-bash.ts
+ *      downloads it automatically when 2–3 are absent)
+ *   5. $COMSPEC (cmd.exe — always set)
+ *   6. powershell.exe (last resort)
+ * - POSIX: the user's login shell, falling back to bash.
+ * Resolved per terminal spawn (not at module load) so a busybox download that
+ * finishes after startup is picked up by the next terminal.
  */
-const SHELL = isWindows
-    ? process.env.SHELL || process.env.COMSPEC || "powershell.exe"
-    : process.env.SHELL || "bash";
-/** `-i` is POSIX-only; cmd.exe / powershell.exe start interactively on their own. */
-const SHELL_ARGS = isWindows ? [] : ["-i"];
+function resolveShell() {
+    if (isWindows) {
+        const explicit = process.env.PI_WEB_SHELL;
+        if (explicit)
+            return { shell: explicit, args: bashArgs(explicit) };
+        const she = process.env.SHELL;
+        if (she && existsSync(she))
+            return { shell: she, args: bashArgs(she) };
+        const pf = process.env.ProgramFiles;
+        const pf86 = process.env["ProgramFiles(x86)"];
+        for (const cand of [
+            pf ? join(pf, "Git", "bin", "bash.exe") : "",
+            pf86 ? join(pf86, "Git", "bin", "bash.exe") : "",
+        ]) {
+            if (cand && existsSync(cand))
+                return { shell: cand, args: ["-i"] };
+        }
+        const busybox = join(homedir(), ".pi-web", "bin", "bash.exe");
+        if (existsSync(busybox))
+            return { shell: busybox, args: ["-i"] };
+        return { shell: process.env.COMSPEC || "powershell.exe", args: [] };
+    }
+    return { shell: process.env.SHELL || "bash", args: ["-i"] };
+}
 /**
  * Environment for spawned shells. System services (launchd/systemd) run with
  * no locale variables, which puts the shell in the C locale: its line editor
@@ -302,7 +336,8 @@ export class TerminalManager {
         repairSpawnHelperPermissions();
         let pty;
         try {
-            pty = spawn(SHELL, SHELL_ARGS, {
+            const { shell, args } = resolveShell();
+            pty = spawn(shell, args, {
                 name: "xterm-256color",
                 cols: Math.max(2, Math.floor(cols) || 80),
                 rows: Math.max(2, Math.floor(rows) || 24),

package/package.json

@@ -1,87 +1,87 @@
-{
-  "name": "pi-web-ui",
-  "version": "0.19.1",
-  "description": "Web chat interface for the pi coding agent, powered by the pi SDK (@earendil-works/pi-coding-agent) — one-command run, Docker/systemd/launchd deployable",
-  "license": "MIT",
-  "type": "module",
-  "bin": {
-    "pi-web-ui": "bin/pi-web-ui.mjs"
-  },
-  "main": "dist/server/index.js",
-  "files": [
-    "bin/",
-    "dist/",
-    "web/dist/",
-    "web/public/",
-    "deploy/",
-    "extensions/",
-    "README.md",
-    "LICENSE"
-  ],
-  "keywords": [
-    "pi",
-    "pi-package",
-    "coding-agent",
-    "ai",
-    "chat",
-    "web-ui",
-    "terminal",
-    "llm"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xing-shuyin/pi-web-ui.git"
-  },
-  "pi": {
-    "extensions": [
-      "./extensions"
-    ]
-  },
-  "engines": {
-    "node": ">=22.19.0"
-  },
-  "scripts": {
-    "prepublishOnly": "npm run build",
-    "dev": "concurrently -k -n server,web -c blue,green \"npm:dev:server\" \"npm:dev:web\"",
-    "dev:server": "node --watch --import tsx server/index.ts",
-    "dev:web": "vite --config web/vite.config.ts",
-    "build": "npm run build:web && npm run build:server",
-    "build:web": "vite build --config web/vite.config.ts",
-    "build:server": "tsc -p tsconfig.server.json",
-    "typecheck": "tsc -p tsconfig.server.json --noEmit && tsc -p web/tsconfig.json --noEmit",
-    "test:freeze": "node freeze-test.mjs",
-    "start": "node dist/server/index.js"
-  },
-  "dependencies": {
-    "@earendil-works/pi-coding-agent": "^0.83.0",
-    "@xterm/addon-fit": "^0.11.0",
-    "@xterm/xterm": "^6.0.0",
-    "express": "^4.21.2",
-    "highlight.js": "^11.10.0",
-    "node-pty": "^1.1.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-icons": "^5.7.0",
-    "react-markdown": "^9.0.1",
-    "rehype-highlight": "^7.0.1",
-    "remark-gfm": "^4.0.0",
-    "typebox": "^1.3.14",
-    "ws": "^8.18.0"
-  },
-  "devDependencies": {
-    "@types/express": "^4.17.21",
-    "@types/node": "^22.10.0",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@types/ws": "^8.5.13",
-    "@vitejs/plugin-react": "^4.3.4",
-    "concurrently": "^9.1.0",
-    "playwright-core": "^1.62.1",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
-    "vite": "^6.0.3"
-  },
-  "allowScripts": {
-    "node-pty@1.1.0": true
-  }
-}
+{
+  "name": "pi-web-ui",
+  "version": "0.20.0",
+  "description": "Web chat interface for the pi coding agent, powered by the pi SDK (@earendil-works/pi-coding-agent) — one-command run, Docker/systemd/launchd deployable",
+  "license": "MIT",
+  "type": "module",
+  "bin": {
+    "pi-web-ui": "bin/pi-web-ui.mjs"
+  },
+  "main": "dist/server/index.js",
+  "files": [
+    "bin/",
+    "dist/",
+    "web/dist/",
+    "web/public/",
+    "deploy/",
+    "extensions/",
+    "README.md",
+    "LICENSE"
+  ],
+  "keywords": [
+    "pi",
+    "pi-package",
+    "coding-agent",
+    "ai",
+    "chat",
+    "web-ui",
+    "terminal",
+    "llm"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/xing-shuyin/pi-web-ui.git"
+  },
+  "pi": {
+    "extensions": [
+      "./extensions"
+    ]
+  },
+  "engines": {
+    "node": ">=22.19.0"
+  },
+  "scripts": {
+    "prepublishOnly": "npm run build",
+    "dev": "concurrently -k -n server,web -c blue,green \"npm:dev:server\" \"npm:dev:web\"",
+    "dev:server": "node --watch --import tsx server/index.ts",
+    "dev:web": "vite --config web/vite.config.ts",
+    "build": "npm run build:web && npm run build:server",
+    "build:web": "vite build --config web/vite.config.ts",
+    "build:server": "tsc -p tsconfig.server.json",
+    "typecheck": "tsc -p tsconfig.server.json --noEmit && tsc -p web/tsconfig.json --noEmit",
+    "test:freeze": "node freeze-test.mjs",
+    "start": "node dist/server/index.js"
+  },
+  "dependencies": {
+    "@earendil-works/pi-coding-agent": "^0.83.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
+    "express": "^4.21.2",
+    "highlight.js": "^11.10.0",
+    "node-pty": "^1.1.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-icons": "^5.7.0",
+    "react-markdown": "^9.0.1",
+    "rehype-highlight": "^7.0.1",
+    "remark-gfm": "^4.0.0",
+    "typebox": "^1.3.14",
+    "ws": "^8.18.0"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.21",
+    "@types/node": "^22.10.0",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "@types/ws": "^8.5.13",
+    "@vitejs/plugin-react": "^4.3.4",
+    "concurrently": "^9.1.0",
+    "playwright-core": "^1.62.1",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2",
+    "vite": "^6.0.3"
+  },
+  "allowScripts": {
+    "node-pty@1.1.0": true
+  }
+}