pi-webapp 0.1.8 → 0.1.10

package/bin/npm-command.d.mts

@@ -0,0 +1,2 @@
+export function resolveNpmCli(options?: { execPath?: string; env?: NodeJS.ProcessEnv }): string;
+export function npmCommand(args: readonly string[]): { file: string; args: string[] };

package/bin/npm-command.mjs

@@ -0,0 +1,36 @@
+import { realpathSync, statSync } from "node:fs";
+import { basename, delimiter, dirname, join, resolve } from "node:path";
+
+function npmEntry(path) {
+  if (!path) return null;
+  try {
+    const real = realpathSync(path);
+    return basename(real) === "npm-cli.js" && statSync(real).isFile() ? real : null;
+  } catch { return null; }
+}
+
+/** Find npm's JavaScript entry point without relying on executable shell shims. */
+export function resolveNpmCli({ execPath = process.execPath, env = process.env } = {}) {
+  const inherited = npmEntry(env.npm_execpath);
+  if (inherited) return inherited;
+
+  const directories = new Set([dirname(execPath)]);
+  try { directories.add(dirname(realpathSync(execPath))); } catch { /* Try the original path. */ }
+  const searchPath = Object.entries(env).find(([key]) => key.toLowerCase() === "path")?.[1] ?? "";
+  for (const directory of searchPath.split(delimiter).filter(Boolean)) directories.add(resolve(directory));
+  for (const directory of directories) {
+    for (const candidate of [
+      join(directory, "node_modules", "npm", "bin", "npm-cli.js"),
+      join(directory, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js"),
+      join(directory, "npm"),
+    ]) {
+      const cli = npmEntry(candidate);
+      if (cli) return cli;
+    }
+  }
+  throw new Error("找不到 npm 入口 npm-cli.js；请安装包含 npm 的 Node.js，或将 npm 所在目录加入 PATH 后重启服务。");
+}
+
+export function npmCommand(args) {
+  return { file: process.execPath, args: [resolveNpmCli(), ...args] };
+}

package/bin/pi-webapp.mjs

@@ -8,6 +8,7 @@ import { delimiter, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import spawn from "cross-spawn";
 import { openWebPage } from "./open-web-page.mjs";
+import { npmCommand } from "./npm-command.mjs";
 
 const minimum = [0, 87, 1];
 const launcher = fileURLToPath(import.meta.url);
@@ -47,13 +48,15 @@ function probe(command) {
 
 function installPi() {
   console.error("未找到 Pi，正在通过 npm 安装 @earendil-works/pi-coding-agent …");
-  const result = spawn.sync("npm", ["install", "-g", "--ignore-scripts", "@earendil-works/pi-coding-agent"], { stdio: "inherit" });
+  const install = npmCommand(["install", "-g", "--ignore-scripts", "@earendil-works/pi-coding-agent"]);
+  const result = spawn.sync(install.file, install.args, { stdio: "inherit", windowsHide: true });
   if (result.error || result.status !== 0) {
     throw new Error(`Pi 安装失败。请手动运行 npm install -g --ignore-scripts @earendil-works/pi-coding-agent${result.error ? `（${result.error.message}）` : ""}`);
   }
   const inPath = probe("pi");
   if (inPath) return inPath;
-  const prefix = spawn.sync("npm", ["prefix", "-g"], { encoding: "utf8" });
+  const prefixCommand = npmCommand(["prefix", "-g"]);
+  const prefix = spawn.sync(prefixCommand.file, prefixCommand.args, { encoding: "utf8", windowsHide: true });
   if (prefix.status === 0) {
     const installed = process.platform === "win32" ? join(prefix.stdout.trim(), "pi.cmd") : join(prefix.stdout.trim(), "bin", "pi");
     if (existsSync(installed)) return probe(installed);