ai-project-manage-cli 6.0.97 → 6.0.99

package/dist/index.js

@@ -3758,7 +3758,13 @@ function createRunSlotPool(maxConcurrent = DEFAULT_MAX_CONCURRENT) {
 }
 
 // src/commands/connect-lock.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync6, readFileSync as readFileSync12, unlinkSync, writeFileSync as writeFileSync12 } from "fs";
+import {
+  existsSync as existsSync13,
+  mkdirSync as mkdirSync6,
+  readFileSync as readFileSync12,
+  unlinkSync,
+  writeFileSync as writeFileSync12
+} from "fs";
 import { join as join14 } from "path";
 var CONNECT_LOCK_PATH = join14(APM_CONFIG_DIR, "connect.lock");
 function isProcessAlive(pid) {
@@ -3770,6 +3776,22 @@ function isProcessAlive(pid) {
     return false;
   }
 }
+function sleepSync(ms) {
+  const deadline = Date.now() + ms;
+  while (Date.now() < deadline) {
+  }
+}
+function waitForPm2LockHandoff(timeoutMs = 5e3) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    pruneStaleConnectLock();
+    const lock = readConnectLock();
+    if (!lock || lock.mode !== "pm2" || lock.pid === process.pid || !isProcessAlive(lock.pid)) {
+      return;
+    }
+    sleepSync(100);
+  }
+}
 function readConnectLock() {
   if (!existsSync13(CONNECT_LOCK_PATH)) return null;
   try {
@@ -3796,10 +3818,17 @@ function acquireConnectLock(mode) {
   pruneStaleConnectLock();
   const existing = readConnectLock();
   if (existing && isProcessAlive(existing.pid)) {
-    console.error(
-      `[apm] \u5DF2\u6709 apm connect \u5728\u8FD0\u884C (pid=${existing.pid}, mode=${existing.mode})`
-    );
-    process.exit(1);
+    if (existing.pid === process.pid) {
+      return;
+    }
+    if (mode === "pm2" && existing.mode === "pm2") {
+      forceReleaseConnectLock();
+    } else {
+      console.error(
+        `[apm] \u5DF2\u6709 apm connect \u5728\u8FD0\u884C (pid=${existing.pid}, mode=${existing.mode})`
+      );
+      process.exit(1);
+    }
   }
   mkdirSync6(APM_CONFIG_DIR, { recursive: true });
   const lock = {
@@ -3807,7 +3836,11 @@ function acquireConnectLock(mode) {
     mode,
     startedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  writeFileSync12(CONNECT_LOCK_PATH, JSON.stringify(lock, null, 2) + "\n", "utf8");
+  writeFileSync12(
+    CONNECT_LOCK_PATH,
+    JSON.stringify(lock, null, 2) + "\n",
+    "utf8"
+  );
 }
 function releaseConnectLock() {
   const lock = readConnectLock();
@@ -3829,10 +3862,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();
@@ -3847,24 +3888,28 @@ function buildConnectPm2Ecosystem(options) {
   if (baseUrl) {
     env.AI_PM_SERVER = baseUrl;
   }
+  const app = {
+    name: PM2_APP_NAME,
+    script: options.apmScript,
+    interpreter: options.nodePath,
+    args: options.connectArgs,
+    autorestart: true,
+    min_uptime: "10s",
+    max_restarts: 10,
+    restart_delay: 3e3,
+    exp_backoff_restart_delay: 1e3,
+    max_memory_restart: "1G",
+    kill_timeout: 5e3,
+    shutdown_with_message: true,
+    instances: 1,
+    exec_mode: "fork",
+    env
+  };
+  if (process.platform === "win32") {
+    app.windowsHide = true;
+  }
   return {
-    apps: [
-      {
-        name: PM2_APP_NAME,
-        script: options.apmScript,
-        interpreter: options.nodePath,
-        args: options.connectArgs,
-        autorestart: true,
-        min_uptime: "10s",
-        max_restarts: 0,
-        restart_delay: 3e3,
-        exp_backoff_restart_delay: 1e3,
-        max_memory_restart: "1G",
-        kill_timeout: 5e3,
-        shutdown_with_message: true,
-        env
-      }
-    ]
+    apps: [app]
   };
 }
 function formatConnectPm2EcosystemFile(ecosystem) {
@@ -4033,14 +4078,66 @@ 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",
+    windowsHide: useNpmShell2
+  });
+}
+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 });
   const spawnOptions = {
     encoding: "utf8",
     stdio: options?.inherit ? "inherit" : ["ignore", "pipe", "pipe"],
-    shell: useNpmShell2
+    shell: useNpmShell2,
+    windowsHide: useNpmShell2
   };
   const result = spawnSync2(pm2Bin, args, spawnOptions);
   if (result.error) {
@@ -4064,7 +4161,8 @@ function runPm2Json(args) {
   const result = spawnSync2(pm2Bin, args, {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"],
-    shell: useNpmShell2
+    shell: useNpmShell2,
+    windowsHide: useNpmShell2
   });
   if (result.status !== 0) return "[]";
   return result.stdout?.toString() ?? "[]";
@@ -4075,15 +4173,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");
@@ -4091,13 +4180,13 @@ function printConnectNotRunningHint() {
 function assertConnectNotRunning() {
   pruneStaleConnectLock();
   const lock = readConnectLock();
-  if (lock && isProcessAlive(lock.pid)) {
+  if (lock && isProcessAlive(lock.pid) && lock.pid !== process.pid) {
     console.error(
       `[apm] \u5DF2\u6709 apm connect \u5728\u8FD0\u884C (pid=${lock.pid}, mode=${lock.mode})\uFF0C\u8BF7\u5148\u505C\u6B62\u540E\u518D\u542F\u52A8`
     );
     process.exit(1);
   }
-  if (isPm2ConnectOnline()) {
+  if (!isRunningUnderPm2() && isPm2ConnectOnline()) {
     console.error(
       "[apm] \u5DF2\u6709 apm connect \u5B88\u62A4\u8FDB\u7A0B\u5728\u8FD0\u884C\uFF0C\u8BF7\u5148\u6267\u884C apm daemon stop"
     );
@@ -4128,10 +4217,8 @@ async function handleConnectAfterUpdate(options) {
   console.log("[apm] \u66F4\u65B0\u5B8C\u6210\uFF0C\u6B63\u5728\u4EE5\u65B0\u7248\u672C\u91CD\u65B0\u8FDE\u63A5\u2026");
   await prepareEcosystem(options.server);
   if (isRunningUnderPm2()) {
-    runPm2(["startOrRestart", PM2_ECOSYSTEM_PATH, "--update-env"], {
-      inherit: true
-    });
-    console.log("[apm] \u5DF2\u901A\u77E5 PM2 \u4F7F\u7528\u65B0\u7248\u672C\u91CD\u542F connect");
+    runPm2(["reload", PM2_ECOSYSTEM_PATH, "--update-env"], { inherit: true });
+    console.log("[apm] \u5DF2\u901A\u77E5 PM2 \u4F7F\u7528\u65B0\u7248\u672C\u91CD\u65B0\u52A0\u8F7D connect");
     process.exit(0);
   }
   reexecConnectWithResolvedPath(options);
@@ -4151,6 +4238,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 +4264,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 +4294,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 +4340,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");
   }
@@ -4616,9 +4722,12 @@ function connectOnce(url, ctx, connectionAbort, onConnected) {
   });
 }
 async function runConnect(options) {
-  const { didUpdate } = await runUpdate();
-  if (didUpdate) {
-    await handleConnectAfterUpdate(options);
+  const underPm2 = isRunningUnderPm2();
+  if (!underPm2) {
+    const { didUpdate } = await runUpdate();
+    if (didUpdate) {
+      await handleConnectAfterUpdate(options);
+    }
   }
   const cfg = await ensureLoggedConfig();
   if (options.server?.trim()) {
@@ -4630,7 +4739,10 @@ async function runConnect(options) {
     process.exit(1);
   }
   assertConnectNotRunning();
-  const lockMode = isRunningUnderPm2() ? "pm2" : "foreground";
+  if (underPm2) {
+    waitForPm2LockHandoff();
+  }
+  const lockMode = underPm2 ? "pm2" : "foreground";
   acquireConnectLock(lockMode);
   process.on("exit", releaseConnectLock);
   let shuttingDown = false;

package/package.json

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