@nmakarov/cli-toolkit 0.55.0 → 0.57.0

package/dist/index.js

@@ -1081,6 +1081,10 @@ var Args = class _Args {
     this.parseArgs(args);
     this.env = this.get("env")?.toLowerCase() || "local";
     this.loadDotEnv();
+    const envAfterDotEnv = this.get("env")?.toLowerCase();
+    if (envAfterDotEnv) {
+      this.env = envAfterDotEnv;
+    }
     this.loadConfigFiles();
     this.checkConflicts();
     if (context && typeof context.registerCleanup === "function") {
@@ -5269,6 +5273,8 @@ function servicePaths(service) {
     current: join2(root, "current"),
     sharedEnv: join2(root, "shared", ".env"),
     ecosystem: join2(root, "shared", "ecosystem.config.cjs"),
+    /** Preloaded by pm2 `node_args --require` so ENV survives flaky restarts. */
+    ensureEnv: join2(root, "shared", "ensure-env.cjs"),
     deployLog: join2(root, "logs", "deploy.log"),
     lockHashFile: join2(root, "shared", ".package-lock.sha256")
   };
@@ -5959,12 +5965,23 @@ function resolvePm2Args(pm2) {
   if (/(?:^|\s)--stopAllowance=/.test(base)) return base;
   return `${base}${base ? " " : ""}--stopAllowance=${Math.floor(stopSec)}`.trim();
 }
+function buildEnsureEnvScript() {
+  return `/**
+ * Written by cli-toolkit deploy (init-structure). Do not hand-edit.
+ * Preloaded via pm2 node_args --require so Args sees ENV=production even when
+ * a post-SIGKILL restart briefly omits ecosystem env (otherwise Db \u2192 local:6032).
+ */
+if (!process.env.ENV) process.env.ENV = "production";
+if (!process.env.NODE_ENV) process.env.NODE_ENV = "production";
+`;
+}
 function buildEcosystemConfig(service, paths) {
   const { pm2 } = service;
   const outLog = join9(paths.logs, `${pm2.appName}.out.log`);
   const errLog = join9(paths.logs, `${pm2.appName}.err.log`);
   const killTimeoutMs = resolveKillTimeoutMs(pm2);
   const args = resolvePm2Args(pm2);
+  const ensureEnv = paths.ensureEnv;
   return `/**
  * pm2 ecosystem for ${service.name} \u2014 written by cli-toolkit deploy from the
  * service manifest (init/deploy). Do not hand-edit; change pm2.* in the
@@ -5977,6 +5994,8 @@ module.exports = {
             script: "${pm2.script}",
             cwd: "${paths.current}",
             args: ${JSON.stringify(args)},
+            // Absolute --require so ENV is set before Args constructs (see shared/ensure-env.cjs).
+            node_args: ${JSON.stringify(`--require ${ensureEnv}`)},
             instances: 1,
             exec_mode: "fork",
             autorestart: true,
@@ -6018,9 +6037,17 @@ async function initServiceStructure(service, options = {}) {
     created.push(dir);
   }
   const ecosystemExisted = await pathExists4(paths.ecosystem);
+  const ensureEnvExisted = await pathExists4(paths.ensureEnv);
   if (!dryRun) {
+    await writeFile5(paths.ensureEnv, buildEnsureEnvScript(), { mode: 420 });
     await writeFile5(paths.ecosystem, buildEcosystemConfig(service, paths), { mode: 420 });
   }
+  if (ensureEnvExisted) {
+    logger.info(`synced ${paths.ensureEnv}`);
+  } else {
+    created.push(paths.ensureEnv);
+    logger.info(`seeded ${paths.ensureEnv}`);
+  }
   if (ecosystemExisted) {
     logger.info(`synced ${paths.ecosystem} from manifest`);
   } else {