pi-web-ui 0.2.10 → 0.2.12

package/bin/pi-web-ui.mjs

@@ -420,6 +420,12 @@ function serviceEnv(port, cwd, dataDir) {
 	// Interactive Windows tasks inherit the user's PATH; only systemd/launchd
 	// run with a minimal environment that needs an explicit PATH.
 	if (!isWin) env.PATH = process.env.PATH ?? "/usr/local/bin:/usr/bin:/bin";
+	// Same for the locale: launchd/systemd drop LANG/LC_ALL, and a C-locale
+	// shell garbles multibyte input in the terminal (UTF-8 continuation
+	// bytes 0x80–0x9F rendered as C1 control chars). Bake the installing
+	// shell's locale into the service env so spawned terminals are UTF-8.
+	if (!isWin && process.env.LANG) env.LANG = process.env.LANG;
+	if (!isWin && process.env.LC_ALL) env.LC_ALL = process.env.LC_ALL;
 	if (dataDir) env.PI_WEB_DATA_DIR = dataDir;
 	return env;
 }

package/dist/server/terminals.js

@@ -13,10 +13,11 @@
  * `${pwd}` inside cwd/command resolves to the agent session's current working
  * directory (the same directory the agent operates in — see set_cwd).
  */
-import { existsSync } from "node:fs";
+import { chmodSync, existsSync, readdirSync, statSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { homedir } from "node:os";
-import { isAbsolute, join, resolve } from "node:path";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 import { spawn } from "node-pty";
 /** Location of the command list for a project: <workspaceRoot>/.pi/commands.json */
 export function commandsFilePath(workspaceRoot) {
@@ -112,6 +113,82 @@ const SHELL = isWindows
     : process.env.SHELL || "bash";
 /** `-i` is POSIX-only; cmd.exe / powershell.exe start interactively on their own. */
 const SHELL_ARGS = isWindows ? [] : ["-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
+ * then renders UTF-8 continuation bytes 0x80–0x9F as C1 control characters
+ * (e.g. `�<0091><0098>` for 员), garbling Chinese input in the terminal.
+ * Default a UTF-8 locale so multibyte text round-trips.
+ */
+function shellEnv() {
+    const env = { ...process.env, TERM: "xterm-256color" };
+    if (!env.LANG && !env.LC_ALL)
+        env.LANG = "en_US.UTF-8";
+    return env;
+}
+// ---------------------------------------------------------------------------
+// spawn-helper permission repair (node-pty macOS prebuilds)
+// ---------------------------------------------------------------------------
+// node-pty 1.1.0 publishes its macOS prebuilds with `spawn-helper` lacking the
+// execute bit (mode 0644 in the npm tarball), so posix_spawn fails with EACCES
+// and node-pty throws the generic "posix_spawnp failed". Locally-built
+// copies (build/Release) are fine; every `npm install` that picks the prebuild
+// — e.g. `npm i -g pi-web-ui`, which is what system-service installs run — is
+// broken until the bit is restored. Self-heal at startup, best-effort.
+const require = createRequire(import.meta.url);
+/** Absolute paths of every node-pty spawn-helper this install can exec. */
+function spawnHelperPaths() {
+    try {
+        // require.resolve("node-pty") → <pkg>/lib/index.js → package root is two up.
+        const pkgDir = dirname(dirname(require.resolve("node-pty")));
+        const out = [];
+        const built = join(pkgDir, "build", "Release", "spawn-helper");
+        if (existsSync(built))
+            out.push(built);
+        const prebuildsDir = join(pkgDir, "prebuilds");
+        if (existsSync(prebuildsDir)) {
+            for (const entry of readdirSync(prebuildsDir)) {
+                const p = join(prebuildsDir, entry, "spawn-helper");
+                if (existsSync(p))
+                    out.push(p);
+            }
+        }
+        return out;
+    }
+    catch {
+        return [];
+    }
+}
+/** Restore the +x bit on node-pty's spawn-helper binaries (idempotent). */
+function repairSpawnHelperPermissions() {
+    if (isWindows)
+        return;
+    for (const p of spawnHelperPaths()) {
+        try {
+            if ((statSync(p).mode & 0o111) === 0)
+                chmodSync(p, 0o755);
+        }
+        catch {
+            // best-effort; a read-only node_modules just keeps the old failure
+        }
+    }
+}
+repairSpawnHelperPermissions();
+/** Path of a still-broken helper, for the error hint ("" when none). */
+function brokenSpawnHelper() {
+    if (isWindows)
+        return "";
+    for (const p of spawnHelperPaths()) {
+        try {
+            if ((statSync(p).mode & 0o111) === 0)
+                return p;
+        }
+        catch {
+            // ignore
+        }
+    }
+    return "";
+}
 /**
  * Owns one or more PTYs for a client. All output is forwarded as
  * `terminal_output` messages through the provided emit (broadcast to every
@@ -188,11 +265,14 @@ export class TerminalManager {
                 cols: Math.max(2, Math.floor(cols) || 80),
                 rows: Math.max(2, Math.floor(rows) || 24),
                 cwd: abs,
-                env: { ...process.env, TERM: "xterm-256color" },
+                env: shellEnv(),
             });
         }
         catch (err) {
-            this.fail(id, `启动终端失败：${err.message}`);
+            const helper = brokenSpawnHelper();
+            this.fail(id, helper
+                ? `启动终端失败：${err.message}（node-pty 的 spawn-helper 缺少执行权限，请运行：chmod +x "${helper}"）`
+                : `启动终端失败：${err.message}`);
             return false;
         }
         const entry = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-web-ui",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "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",