ai-project-manage-cli 6.0.97 → 6.0.98

package/dist/index.js

@@ -3829,10 +3829,18 @@ function forceReleaseConnectLock() {
 // src/commands/daemon.ts
 import { spawnSync as spawnSync2 } from "child_process";
 import { setTimeout as delay } from "node:timers/promises";
-import { existsSync as existsSync14, mkdirSync as mkdirSync7, writeFileSync as writeFileSync13 } from "fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync7, unlinkSync as unlinkSync2, writeFileSync as writeFileSync13 } from "fs";
 import { join as join15 } from "path";
 var PM2_APP_NAME = "apm-connect";
-var PM2_ECOSYSTEM_PATH = join15(APM_CONFIG_DIR, "connect.ecosystem.cjs");
+var PM2_ECOSYSTEM_PATH = join15(
+  APM_CONFIG_DIR,
+  "connect.ecosystem.config.cjs"
+);
+var LEGACY_PM2_ECOSYSTEM_PATH = join15(
+  APM_CONFIG_DIR,
+  "connect.ecosystem.cjs"
+);
+var LEGACY_PM2_APP_NAMES = ["connect.ecosystem"];
 function resolveConnectArgs(server) {
   const args = ["connect"];
   const trimmed = server?.trim();
@@ -4033,7 +4041,57 @@ function resolveApmEntryPath(entryArg = process.argv[1]) {
   process.exit(1);
 }
 function isRunningUnderPm2() {
-  return process.env.name === PM2_APP_NAME && process.env.pm_id !== void 0;
+  if (process.env.pm_id === void 0) {
+    return false;
+  }
+  const name = process.env.name;
+  return name === PM2_APP_NAME || name !== void 0 && LEGACY_PM2_APP_NAMES.includes(name);
+}
+function isConnectPm2Process(app) {
+  if (app.name === PM2_APP_NAME) {
+    return true;
+  }
+  return app.name !== void 0 && LEGACY_PM2_APP_NAMES.includes(app.name);
+}
+function listPm2Processes() {
+  try {
+    const raw = runPm2Json(["jlist"]);
+    return JSON.parse(raw);
+  } catch {
+    return [];
+  }
+}
+function findPm2ConnectProcess() {
+  return listPm2Processes().find(isConnectPm2Process) ?? null;
+}
+function resolvePm2ConnectName(app) {
+  return app?.name ?? PM2_APP_NAME;
+}
+function deletePm2AppIfExists(name) {
+  const pm2Bin = findGlobalPm2();
+  if (!pm2Bin) {
+    return;
+  }
+  ensurePm2DaemonUpdated(pm2Bin);
+  spawnSync2(pm2Bin, ["delete", name], {
+    encoding: "utf8",
+    shell: useNpmShell2,
+    stdio: "ignore"
+  });
+}
+function removePm2ConnectProcesses() {
+  const seen = /* @__PURE__ */ new Set();
+  for (const app of listPm2Processes()) {
+    if (!isConnectPm2Process(app) || !app.name || seen.has(app.name)) {
+      continue;
+    }
+    seen.add(app.name);
+    deletePm2AppIfExists(app.name);
+  }
+  for (const legacyName of LEGACY_PM2_APP_NAMES) {
+    deletePm2AppIfExists(legacyName);
+  }
+  deletePm2AppIfExists(PM2_APP_NAME);
 }
 function runPm2(args, options) {
   const pm2Bin = ensureGlobalPm2({ quiet: true });
@@ -4075,15 +4133,6 @@ function isPm2ConnectOnline() {
   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.find((app) => app.name === PM2_APP_NAME) ?? null;
-  } catch {
-    return null;
-  }
-}
 function printConnectNotRunningHint() {
   console.log(`[apm] ${PM2_APP_NAME} \u672A\u5728\u8FD0\u884C`);
   console.log("[apm] \u542F\u52A8\u5B88\u62A4: apm connect --daemon");
@@ -4151,6 +4200,12 @@ function writeEcosystemFile(options) {
     formatConnectPm2EcosystemFile(ecosystem),
     "utf8"
   );
+  if (existsSync14(LEGACY_PM2_ECOSYSTEM_PATH)) {
+    try {
+      unlinkSync2(LEGACY_PM2_ECOSYSTEM_PATH);
+    } catch {
+    }
+  }
 }
 async function prepareEcosystem(server) {
   await ensureLoggedConfig();
@@ -4171,7 +4226,14 @@ async function runDaemonStart(options) {
   await runUpdate();
   ensureGlobalPm2();
   const cfg = await prepareEcosystem(options.server);
+  removePm2ConnectProcesses();
   runPm2(["start", PM2_ECOSYSTEM_PATH, "--update-env"], { inherit: true });
+  await delay(1e3);
+  if (!isPm2ConnectOnline()) {
+    console.error(
+      `[apm] ${PM2_APP_NAME} \u542F\u52A8\u540E\u672A\u5904\u4E8E online \u72B6\u6001\uFF0C\u8BF7\u6267\u884C: apm daemon logs -n 200`
+    );
+  }
   console.log(
     `[apm] ${PM2_APP_NAME} \u5DF2\u7531 PM2 \u542F\u52A8\uFF08server=${options.server?.trim() || cfg.baseUrl}\uFF09`
   );
@@ -4194,14 +4256,18 @@ async function runDaemonStop() {
     console.log(`[apm] ${PM2_APP_NAME} \u672A\u5728\u8FD0\u884C`);
     return;
   }
-  runPm2(["stop", PM2_APP_NAME], { inherit: true });
+  runPm2(["stop", resolvePm2ConnectName(findPm2ConnectProcess())], {
+    inherit: true
+  });
   for (let i = 0; i < 10; i += 1) {
     if (!isPm2ConnectOnline()) break;
     await delay(500);
   }
   if (isPm2ConnectOnline()) {
     console.log(`[apm] \u4F18\u96C5\u505C\u6B62\u8D85\u65F6\uFF0C\u5F3A\u5236\u79FB\u9664 ${PM2_APP_NAME}\u2026`);
-    runPm2(["delete", PM2_APP_NAME], { inherit: true });
+    runPm2(["delete", resolvePm2ConnectName(findPm2ConnectProcess())], {
+      inherit: true
+    });
   }
   killConnectLockProcessIfAlive();
   forceReleaseConnectLock();
@@ -4236,36 +4302,38 @@ async function runDaemonRestart(options) {
   }
   await runUpdate();
   await prepareEcosystem(options.server);
-  runPm2(["startOrRestart", PM2_ECOSYSTEM_PATH, "--update-env"], {
-    inherit: true
-  });
+  removePm2ConnectProcesses();
+  runPm2(["start", PM2_ECOSYSTEM_PATH, "--update-env"], { inherit: true });
   console.log(`[apm] ${PM2_APP_NAME} \u5DF2\u91CD\u542F`);
 }
 async function runDaemonDelete() {
   ensureGlobalPm2();
-  if (!findPm2ConnectProcess()) {
+  const app = findPm2ConnectProcess();
+  if (!app?.name) {
     console.log(`[apm] ${PM2_APP_NAME} \u672A\u5728 PM2 \u4E2D\u6CE8\u518C`);
     return;
   }
-  runPm2(["delete", PM2_APP_NAME], { inherit: true });
+  runPm2(["delete", app.name], { inherit: true });
   forceReleaseConnectLock();
-  console.log(`[apm] ${PM2_APP_NAME} \u5DF2\u4ECE PM2 \u79FB\u9664`);
+  console.log(`[apm] ${app.name} \u5DF2\u4ECE PM2 \u79FB\u9664`);
 }
 async function runDaemonStatus() {
   ensureGlobalPm2();
-  if (!findPm2ConnectProcess()) {
+  const app = findPm2ConnectProcess();
+  if (!app?.name) {
     printConnectNotRunningHint();
     return;
   }
-  runPm2(["describe", PM2_APP_NAME], { inherit: true });
+  runPm2(["describe", app.name], { inherit: true });
 }
 async function runDaemonLogs(options) {
   ensureGlobalPm2();
-  if (!findPm2ConnectProcess()) {
+  const app = findPm2ConnectProcess();
+  if (!app?.name) {
     printConnectNotRunningHint();
     return;
   }
-  const args = ["logs", PM2_APP_NAME, "--lines", String(options.lines ?? 100)];
+  const args = ["logs", 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.97",
+  "version": "6.0.98",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,