cwm-assistant 0.3.3 → 0.3.5

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-ZVCMSNB3.js");
+  const { cli } = await import("./cli-VXWMAG3L.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.3",
+  "version": "0.3.5",
   "description": "Local Git and workspace assistant for the CWM browser workbench",
   "keywords": [
     "cwm",

package/scripts/upgrade.mjs

@@ -49,26 +49,36 @@ function record(stateDirectory, value) {
 }
 
 /**
- * Find npm without relying on PATH.
+ * Find npm without relying on PATH, preferring npm's own JS entry point.
  *
- * 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.
+ * Two platform traps make the shim a poor first choice:
+ * - Windows: Node refuses to spawn a `.cmd` without a shell since the 2024 command-injection fix,
+ *   so `spawn("npm.cmd")` throws EINVAL outright.
+ * - macOS: a login item runs with a bare PATH, so the shim beside node may not resolve at all.
+ * Running `node npm-cli.js` sidesteps both.
  */
 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);
+  const candidates = [
+    // Windows ships npm under <node>/node_modules; Homebrew and Linux use <node>/../lib/node_modules.
+    path.join(beside, "node_modules", "npm", "bin", "npm-cli.js"),
+    path.join(beside, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js"),
+  ];
+  if (platform === "win32") candidates.push(path.join(beside, "npm.cmd"));
+  else
+    candidates.push(
+      path.join(beside, "npm"),
+      "/opt/homebrew/bin/npm",
+      "/usr/local/bin/npm",
+      "/usr/bin/npm",
+    );
+  candidates.push(platform === "win32" ? "npm.cmd" : "npm");
   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;
+    if (!path.isAbsolute(candidate)) return candidate;
     try {
       if (fs.statSync(candidate).isFile()) return candidate;
     } catch {
@@ -78,6 +88,22 @@ export function resolveNpm(platform = process.platform, execPath = process.execP
   return platform === "win32" ? "npm.cmd" : "npm";
 }
 
+/** Restart the daemon we stopped, so a failed upgrade does not leave the machine with none. */
+function restartInstalled(stateDirectory) {
+  const entry = path.join(packageRoot, "dist", "main.js");
+  if (!fs.existsSync(entry)) return;
+  try {
+    const child = spawn(process.execPath, [entry, "start", "--state-dir", stateDirectory], {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true,
+    });
+    child.unref();
+  } catch {
+    /* Nothing more to do; the user can run cwm-assistant start. */
+  }
+}
+
 async function main() {
   const { version, stateDirectory } = parseArgs(process.argv.slice(2));
   if (!version) throw new Error("缺少目标版本");
@@ -113,7 +139,12 @@ async function main() {
     child.once("error", (error) => resolve({ ok: false, output: error.message }));
     child.once("close", (code) => resolve({ ok: code === 0, output: output.trim().slice(-2000) }));
   });
-  if (!installed.ok) throw new Error(installed.output || "npm 安装失败");
+  if (!installed.ok) {
+    // The daemon was stopped to make room for the install; put the old build back on its feet
+    // rather than leaving the machine with no assistant at all.
+    restartInstalled(directory);
+    throw new Error(installed.output || "npm 安装失败");
+  }
 
   // The reinstall ran postinstall, which starts the daemon again. Nothing else to do here.
   record(stateDirectory, {