ai-project-manage-cli 6.0.98 → 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();
@@ -3855,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) {
@@ -4076,7 +4113,8 @@ function deletePm2AppIfExists(name) {
   spawnSync2(pm2Bin, ["delete", name], {
     encoding: "utf8",
     shell: useNpmShell2,
-    stdio: "ignore"
+    stdio: "ignore",
+    windowsHide: useNpmShell2
   });
 }
 function removePm2ConnectProcesses() {
@@ -4098,7 +4136,8 @@ function runPm2(args, options) {
   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) {
@@ -4122,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() ?? "[]";
@@ -4140,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"
     );
@@ -4177,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);
@@ -4684,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()) {
@@ -4698,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.98",
+  "version": "6.0.99",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,