ai-project-manage-cli 6.0.95 → 6.0.97

package/dist/index.js

@@ -3878,7 +3878,20 @@ function runNpm2(args, options = {}) {
     shell: useNpmShell2
   });
 }
+function verifyPm2Bin(pm2Bin) {
+  if (!pm2Bin.trim() || !existsSync14(pm2Bin)) {
+    return false;
+  }
+  const result = spawnSync2(pm2Bin, ["--version"], {
+    encoding: "utf8",
+    shell: useNpmShell2,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: 15e3
+  });
+  return !result.error && result.status === 0;
+}
 function findGlobalPm2() {
+  const candidates = [];
   const whichResult = spawnSync2(useNpmShell2 ? "where" : "which", ["pm2"], {
     encoding: "utf8",
     shell: useNpmShell2,
@@ -3888,8 +3901,8 @@ function findGlobalPm2() {
     const lines = whichResult.stdout?.toString().trim().split(/\r?\n/) ?? [];
     for (const line of lines) {
       const candidate = line.trim();
-      if (candidate && existsSync14(candidate)) {
-        return candidate;
+      if (candidate) {
+        candidates.push(candidate);
       }
     }
   }
@@ -3900,10 +3913,15 @@ function findGlobalPm2() {
   if (binResult.status === 0) {
     const globalBin = binResult.stdout?.toString().trim();
     if (globalBin) {
-      const candidate = join15(globalBin, useNpmShell2 ? "pm2.cmd" : "pm2");
-      if (existsSync14(candidate)) {
-        return candidate;
-      }
+      candidates.push(join15(globalBin, useNpmShell2 ? "pm2.cmd" : "pm2"));
+    }
+  }
+  const seen = /* @__PURE__ */ new Set();
+  for (const candidate of candidates) {
+    if (seen.has(candidate)) continue;
+    seen.add(candidate);
+    if (verifyPm2Bin(candidate)) {
+      return candidate;
     }
   }
   return null;
@@ -3919,9 +3937,60 @@ function installGlobalPm2() {
     process.exit(result.status ?? 1);
   }
 }
-function ensureGlobalPm2() {
+function readPm2Version(pm2Bin) {
+  const result = spawnSync2(pm2Bin, ["--version"], {
+    encoding: "utf8",
+    shell: useNpmShell2,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: 15e3
+  });
+  if (result.error || result.status !== 0) {
+    return null;
+  }
+  return result.stdout?.toString().trim() || null;
+}
+function logPm2Ready(pm2Bin, installed2) {
+  const version = readPm2Version(pm2Bin);
+  const versionSuffix = version ? ` ${version}` : "";
+  if (installed2) {
+    console.log(`[apm] \u5168\u5C40 pm2 \u5DF2\u5B89\u88C5${versionSuffix}: ${pm2Bin}`);
+  } else {
+    console.log(`[apm] \u5DF2\u68C0\u6D4B\u5230\u5168\u5C40 pm2${versionSuffix}: ${pm2Bin}`);
+  }
+}
+function isPm2DaemonOutOfDate(output) {
+  return /In-memory PM2 is out-of-date/i.test(output);
+}
+function ensurePm2DaemonUpdated(pm2Bin) {
+  const probe = spawnSync2(pm2Bin, ["jlist"], {
+    encoding: "utf8",
+    shell: useNpmShell2,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: 15e3
+  });
+  const combined = `${probe.stdout ?? ""}
+${probe.stderr ?? ""}`;
+  if (!isPm2DaemonOutOfDate(combined)) {
+    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 = spawnSync2(pm2Bin, ["update"], {
+    encoding: "utf8",
+    shell: useNpmShell2,
+    stdio: "inherit",
+    timeout: 6e4
+  });
+  if (update.error || update.status !== 0) {
+    console.error("[apm] pm2 update \u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u6267\u884C: pm2 update");
+  }
+}
+function ensureGlobalPm2(options) {
   const existing = findGlobalPm2();
   if (existing) {
+    ensurePm2DaemonUpdated(existing);
+    if (!options?.quiet) {
+      logPm2Ready(existing, false);
+    }
     return existing;
   }
   installGlobalPm2();
@@ -3932,6 +4001,10 @@ function ensureGlobalPm2() {
     );
     process.exit(1);
   }
+  ensurePm2DaemonUpdated(installed2);
+  if (!options?.quiet) {
+    logPm2Ready(installed2, true);
+  }
   return installed2;
 }
 function resolveApmEntryPath(entryArg = process.argv[1]) {
@@ -3963,7 +4036,7 @@ function isRunningUnderPm2() {
   return process.env.name === PM2_APP_NAME && process.env.pm_id !== void 0;
 }
 function runPm2(args, options) {
-  const pm2Bin = ensureGlobalPm2();
+  const pm2Bin = ensureGlobalPm2({ quiet: true });
   const spawnOptions = {
     encoding: "utf8",
     stdio: options?.inherit ? "inherit" : ["ignore", "pipe", "pipe"],
@@ -3987,6 +4060,7 @@ function runPm2Json(args) {
   if (!pm2Bin) {
     return "[]";
   }
+  ensurePm2DaemonUpdated(pm2Bin);
   const result = spawnSync2(pm2Bin, args, {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"],
@@ -3996,16 +4070,24 @@ function runPm2Json(args) {
   return result.stdout?.toString() ?? "[]";
 }
 function isPm2ConnectOnline() {
+  const app = findPm2ConnectProcess();
+  if (!app) return false;
+  const status = app.pm2_env?.status;
+  return status === "online" || status === "launching";
+}
+function findPm2ConnectProcess() {
   try {
     const raw = runPm2Json(["jlist"]);
     const list = JSON.parse(raw);
-    return list.some(
-      (app) => app.name === PM2_APP_NAME && (app.pm2_env?.status === "online" || app.pm2_env?.status === "launching")
-    );
+    return list.find((app) => app.name === PM2_APP_NAME) ?? null;
   } catch {
-    return false;
+    return null;
   }
 }
+function printConnectNotRunningHint() {
+  console.log(`[apm] ${PM2_APP_NAME} \u672A\u5728\u8FD0\u884C`);
+  console.log("[apm] \u542F\u52A8\u5B88\u62A4: apm connect --daemon");
+}
 function assertConnectNotRunning() {
   pruneStaleConnectLock();
   const lock = readConnectLock();
@@ -4086,8 +4168,8 @@ async function prepareEcosystem(server) {
 }
 async function runDaemonStart(options) {
   assertConnectNotRunning();
-  ensureGlobalPm2();
   await runUpdate();
+  ensureGlobalPm2();
   const cfg = await prepareEcosystem(options.server);
   runPm2(["start", PM2_ECOSYSTEM_PATH, "--update-env"], { inherit: true });
   console.log(
@@ -4160,14 +4242,29 @@ async function runDaemonRestart(options) {
   console.log(`[apm] ${PM2_APP_NAME} \u5DF2\u91CD\u542F`);
 }
 async function runDaemonDelete() {
+  ensureGlobalPm2();
+  if (!findPm2ConnectProcess()) {
+    console.log(`[apm] ${PM2_APP_NAME} \u672A\u5728 PM2 \u4E2D\u6CE8\u518C`);
+    return;
+  }
   runPm2(["delete", PM2_APP_NAME], { inherit: true });
   forceReleaseConnectLock();
   console.log(`[apm] ${PM2_APP_NAME} \u5DF2\u4ECE PM2 \u79FB\u9664`);
 }
 async function runDaemonStatus() {
+  ensureGlobalPm2();
+  if (!findPm2ConnectProcess()) {
+    printConnectNotRunningHint();
+    return;
+  }
   runPm2(["describe", PM2_APP_NAME], { inherit: true });
 }
 async function runDaemonLogs(options) {
+  ensureGlobalPm2();
+  if (!findPm2ConnectProcess()) {
+    printConnectNotRunningHint();
+    return;
+  }
   const args = ["logs", PM2_APP_NAME, "--lines", String(options.lines ?? 100)];
   if (!options.follow) {
     args.push("--nostream");

package/package.json

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