cwm-assistant 0.3.2 → 0.3.4

package/dist/main.js

@@ -7,7 +7,7 @@ if (major < 22 || major === 22 && minor < 13) {
   console.error("Workspace \u52A9\u624B\u9700\u8981 Node.js 22.13 \u6216\u66F4\u9AD8\u7248\u672C\uFF08\u63A8\u8350 24 LTS\uFF09\u3002");
   process.exitCode = 1;
 } else {
-  const { cli } = await import("./cli-D7E7V2UP.js");
+  const { cli } = await import("./cli-33QBXY2G.js");
   cli(process.argv.slice(2), fileURLToPath(import.meta.url)).catch((error) => {
     console.error(error instanceof Error ? error.message : String(error));
     process.exitCode = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cwm-assistant",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Local Git and workspace assistant for the CWM browser workbench",
   "keywords": [
     "cwm",

package/scripts/upgrade.mjs

@@ -48,6 +48,36 @@ function record(stateDirectory, value) {
   }
 }
 
+/**
+ * Find npm without relying on PATH.
+ *
+ * A login item starts with a minimal environment — no Homebrew, no nvm — so a bare `npm` spawn
+ * fails with ENOENT even though the shell that installed the package finds it. Every candidate is
+ * checked for existence; the bare name is the last resort for setups that do export PATH.
+ */
+export function npmCandidates(platform = process.platform, execPath = process.execPath) {
+  const names = platform === "win32" ? ["npm.cmd"] : ["npm"];
+  const beside = path.dirname(execPath);
+  const candidates = names.map((name) => path.join(beside, name));
+  // npm's own entry point, present in every Node distribution regardless of the shim.
+  candidates.push(path.join(beside, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js"));
+  if (platform !== "win32") candidates.push("/opt/homebrew/bin/npm", "/usr/local/bin/npm");
+  candidates.push(...names);
+  return candidates;
+}
+
+export function resolveNpm(platform = process.platform, execPath = process.execPath) {
+  for (const candidate of npmCandidates(platform, execPath)) {
+    if (!candidate.includes(path.sep) && !path.isAbsolute(candidate)) return candidate;
+    try {
+      if (fs.statSync(candidate).isFile()) return candidate;
+    } catch {
+      /* Try the next location. */
+    }
+  }
+  return platform === "win32" ? "npm.cmd" : "npm";
+}
+
 async function main() {
   const { version, stateDirectory } = parseArgs(process.argv.slice(2));
   if (!version) throw new Error("缺少目标版本");
@@ -55,12 +85,23 @@ async function main() {
   const finished = await waitForExit(path.join(directory, "process.lock"));
   if (!finished) throw new Error("助手未在预期时间内退出");
 
-  const npm = process.platform === "win32" ? "npm.cmd" : "npm";
+  const npm = resolveNpm();
+  // Running npm-cli.js directly needs Node, and a spawned npm still shells out for lifecycle
+  // scripts; export the directory Node lives in so both find it.
+  const command = npm.endsWith(".js") ? process.execPath : npm;
+  const args = npm.endsWith(".js")
+    ? [npm, "install", "-g", "cwm-assistant@" + version]
+    : ["install", "-g", "cwm-assistant@" + version];
+  const nodeDirectory = path.dirname(process.execPath);
   const installed = await new Promise((resolve) => {
-    const child = spawn(npm, ["install", "-g", "cwm-assistant@" + version], {
+    const child = spawn(command, args, {
       stdio: ["ignore", "pipe", "pipe"],
       shell: false,
       windowsHide: true,
+      env: {
+        ...process.env,
+        PATH: [nodeDirectory, process.env.PATH].filter(Boolean).join(path.delimiter),
+      },
     });
     let output = "";
     const collect = (chunk) => {