ai-project-manage-cli 6.0.100 → 6.0.101

package/dist/index.js

@@ -4241,48 +4241,109 @@ function runNpm2(args, options = {}) {
     shell: useNpmShell2
   });
 }
+function resolveNpmGlobalBin() {
+  const binResult = runNpm2(["bin", "-g"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  if (binResult.status !== 0) return null;
+  return binResult.stdout?.toString().trim() || null;
+}
+function resolvePm2FromNpmRoot() {
+  const rootResult = runNpm2(["root", "-g"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  if (rootResult.status !== 0) return null;
+  const root = rootResult.stdout?.toString().trim();
+  if (!root) return null;
+  for (const rel of ["pm2/bin/pm2", "pm2/bin/pm2.js"]) {
+    const candidate = join15(root, ...rel.split("/"));
+    if (existsSync14(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function isPm2NodeScript(path13) {
+  return path13.endsWith(".js") || /[\\/]pm2[\\/]bin[\\/]pm2$/.test(path13);
+}
+function buildPm2SpawnTarget(binPath) {
+  if (isPm2NodeScript(binPath)) {
+    return {
+      command: process.execPath,
+      prefixArgs: [binPath],
+      displayPath: binPath
+    };
+  }
+  return {
+    command: binPath,
+    prefixArgs: [],
+    displayPath: binPath
+  };
+}
+function spawnPm2Target(target, args, options = {}) {
+  const useShell = useNpmShell2 && target.prefixArgs.length === 0;
+  return spawnSync3(target.command, [...target.prefixArgs, ...args], {
+    encoding: "utf8",
+    env: process.env,
+    shell: useShell,
+    windowsHide: useNpmShell2,
+    ...options
+  });
+}
+function spawnPm2At(binPath, args, options = {}) {
+  return spawnPm2Target(buildPm2SpawnTarget(binPath), args, options);
+}
 function verifyPm2Bin(pm2Bin) {
   if (!pm2Bin.trim() || !existsSync14(pm2Bin)) {
     return false;
   }
-  const result = spawnSync3(pm2Bin, ["--version"], {
-    encoding: "utf8",
-    shell: useNpmShell2,
-    stdio: ["ignore", "pipe", "pipe"],
-    timeout: 15e3
+  const result = spawnPm2At(pm2Bin, ["--version"], {
+    stdio: ["ignore", "pipe", "pipe"]
   });
   return !result.error && result.status === 0;
 }
-function findGlobalPm2() {
+function collectPm2Candidates() {
   const candidates = [];
+  const globalBin = resolveNpmGlobalBin();
+  if (globalBin) {
+    if (useNpmShell2) {
+      candidates.push(join15(globalBin, "pm2.cmd"));
+      candidates.push(join15(globalBin, "pm2"));
+    } else {
+      candidates.push(join15(globalBin, "pm2"));
+    }
+  }
+  const fromRoot = resolvePm2FromNpmRoot();
+  if (fromRoot) {
+    candidates.push(fromRoot);
+  }
   const whichResult = spawnSync3(useNpmShell2 ? "where" : "which", ["pm2"], {
     encoding: "utf8",
     shell: useNpmShell2,
+    env: process.env,
     stdio: ["ignore", "pipe", "pipe"]
   });
   if (whichResult.status === 0) {
-    const lines = whichResult.stdout?.toString().trim().split(/\r?\n/) ?? [];
-    for (const line of lines) {
-      const candidate = line.trim();
-      if (candidate) {
-        candidates.push(candidate);
-      }
-    }
-  }
-  const binResult = runNpm2(["bin", "-g"], {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  if (binResult.status === 0) {
-    const globalBin = binResult.stdout?.toString().trim();
-    if (globalBin) {
-      candidates.push(join15(globalBin, useNpmShell2 ? "pm2.cmd" : "pm2"));
+    const fromPath = whichResult.stdout?.toString().trim().split(/\r?\n/).map((line) => line.trim()).filter(Boolean) ?? [];
+    if (useNpmShell2) {
+      fromPath.sort((a, b) => {
+        const aCmd = a.toLowerCase().endsWith(".cmd") ? 0 : 1;
+        const bCmd = b.toLowerCase().endsWith(".cmd") ? 0 : 1;
+        return aCmd - bCmd;
+      });
     }
+    candidates.push(...fromPath);
   }
+  return candidates;
+}
+function findGlobalPm2() {
   const seen = /* @__PURE__ */ new Set();
-  for (const candidate of candidates) {
-    if (seen.has(candidate)) continue;
-    seen.add(candidate);
+  for (const candidate of collectPm2Candidates()) {
+    const key = useNpmShell2 ? candidate.toLowerCase() : candidate;
+    if (seen.has(key)) continue;
+    seen.add(key);
     if (verifyPm2Bin(candidate)) {
       return candidate;
     }
@@ -4301,11 +4362,8 @@ function installGlobalPm2() {
   }
 }
 function readPm2Version(pm2Bin) {
-  const result = spawnSync3(pm2Bin, ["--version"], {
-    encoding: "utf8",
-    shell: useNpmShell2,
-    stdio: ["ignore", "pipe", "pipe"],
-    timeout: 15e3
+  const result = spawnPm2At(pm2Bin, ["--version"], {
+    stdio: ["ignore", "pipe", "pipe"]
   });
   if (result.error || result.status !== 0) {
     return null;
@@ -4325,11 +4383,8 @@ function isPm2DaemonOutOfDate(output) {
   return /In-memory PM2 is out-of-date/i.test(output);
 }
 function ensurePm2DaemonUpdated(pm2Bin) {
-  const probe = spawnSync3(pm2Bin, ["jlist"], {
-    encoding: "utf8",
-    shell: useNpmShell2,
-    stdio: ["ignore", "pipe", "pipe"],
-    timeout: 15e3
+  const probe = spawnPm2At(pm2Bin, ["jlist"], {
+    stdio: ["ignore", "pipe", "pipe"]
   });
   const combined = `${probe.stdout ?? ""}
 ${probe.stderr ?? ""}`;
@@ -4337,11 +4392,8 @@ ${probe.stderr ?? ""}`;
     return;
   }
   console.log("[apm] \u68C0\u6D4B\u5230 PM2 \u5185\u5B58\u7248\u672C\u4E0E\u672C\u5730\u4E0D\u4E00\u81F4\uFF0C\u6B63\u5728\u6267\u884C pm2 update \u2026");
-  const update = spawnSync3(pm2Bin, ["update"], {
-    encoding: "utf8",
-    shell: useNpmShell2,
-    stdio: "inherit",
-    timeout: 6e4
+  const update = spawnPm2At(pm2Bin, ["update"], {
+    stdio: "inherit"
   });
   if (update.error || update.status !== 0) {
     console.error("[apm] pm2 update \u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u6267\u884C: pm2 update");
@@ -4359,9 +4411,20 @@ function ensureGlobalPm2(options) {
   installGlobalPm2();
   const installed2 = findGlobalPm2();
   if (!installed2) {
+    const globalBin = resolveNpmGlobalBin();
+    const moduleEntry = resolvePm2FromNpmRoot();
     console.error(
       "[apm] \u5B89\u88C5 pm2 \u540E\u4ECD\u65E0\u6CD5\u627E\u5230\u53EF\u6267\u884C\u6587\u4EF6\uFF0C\u8BF7\u624B\u52A8\u6267\u884C: npm install -g pm2"
     );
+    if (globalBin) {
+      console.error(`[apm] npm \u5168\u5C40 bin: ${globalBin}`);
+    }
+    if (moduleEntry) {
+      console.error(`[apm] \u5DF2\u68C0\u6D4B\u5230 pm2 \u6A21\u5757: ${moduleEntry}`);
+      console.error(
+        "[apm] \u82E5 pm2 --version \u53EF\u7528\uFF0C\u8BF7\u68C0\u67E5 Node/npm \u5168\u5C40\u5B89\u88C5\u6743\u9650\u6216 PATH"
+      );
+    }
     process.exit(1);
   }
   ensurePm2DaemonUpdated(installed2);
@@ -4431,11 +4494,8 @@ function deletePm2AppIfExists(name) {
     return;
   }
   ensurePm2DaemonUpdated(pm2Bin);
-  spawnSync3(pm2Bin, ["delete", name], {
-    encoding: "utf8",
-    shell: useNpmShell2,
-    stdio: "ignore",
-    windowsHide: useNpmShell2
+  spawnPm2At(pm2Bin, ["delete", name], {
+    stdio: "ignore"
   });
 }
 function removePm2ConnectProcesses() {
@@ -4454,13 +4514,9 @@ function removePm2ConnectProcesses() {
 }
 function runPm2(args, options) {
   const pm2Bin = ensureGlobalPm2({ quiet: true });
-  const spawnOptions = {
-    encoding: "utf8",
-    stdio: options?.inherit ? "inherit" : ["ignore", "pipe", "pipe"],
-    shell: useNpmShell2,
-    windowsHide: useNpmShell2
-  };
-  const result = spawnSync3(pm2Bin, args, spawnOptions);
+  const result = spawnPm2At(pm2Bin, args, {
+    stdio: options?.inherit ? "inherit" : ["ignore", "pipe", "pipe"]
+  });
   if (result.error) {
     console.error("[apm] \u6267\u884C pm2 \u5931\u8D25:", result.error.message);
     process.exit(1);
@@ -4479,11 +4535,8 @@ function runPm2Json(args) {
     return "[]";
   }
   ensurePm2DaemonUpdated(pm2Bin);
-  const result = spawnSync3(pm2Bin, args, {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "pipe"],
-    shell: useNpmShell2,
-    windowsHide: useNpmShell2
+  const result = spawnPm2At(pm2Bin, args, {
+    stdio: ["ignore", "pipe", "pipe"]
   });
   if (result.status !== 0) return "[]";
   return result.stdout?.toString() ?? "[]";
@@ -4729,7 +4782,7 @@ async function runDaemonLogs(options) {
 // src/commands/deploy/internal/deploy-shell-env.ts
 var PATH_SEP = process.platform === "win32" ? ";" : ":";
 var useNpmShell3 = process.platform === "win32";
-function resolveNpmGlobalBin() {
+function resolveNpmGlobalBin2() {
   const result = spawnSync4(useNpmShell3 ? "npm.cmd" : "npm", ["bin", "-g"], {
     encoding: "utf8",
     shell: useNpmShell3,
@@ -4757,7 +4810,7 @@ function prependPath(pathValue, segment) {
 function buildDeployShellEnv(extra) {
   const env = { ...process.env, ...extra };
   const pathSegments = [dirname4(process.execPath)];
-  const globalBin = resolveNpmGlobalBin();
+  const globalBin = resolveNpmGlobalBin2();
   if (globalBin) {
     pathSegments.push(globalBin);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "6.0.100",
+  "version": "6.0.101",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,