@nmakarov/cli-toolkit 0.46.0 → 0.49.0

package/dist/index.js

@@ -1388,36 +1388,29 @@ var Args = class _Args {
       }
       return;
     }
-    let dotEnvPathFile = null;
-    const envSpecificFile = `.env.${this.env}`;
-    const envSpecificPath = resolve(dotEnvPath, envSpecificFile);
-    if (existsSync(envSpecificPath)) {
-      dotEnvPathFile = envSpecificPath;
-    }
-    if (!dotEnvPathFile && !this.get("dotEnvPath")) {
+    let dotEnvPathFile = resolve(dotEnvPath, dotEnvFile);
+    if (!existsSync(dotEnvPathFile) && !this.get("dotEnvPath")) {
       const examplesPath = resolve(dotEnvPath, "examples");
-      const examplesEnvSpecificPath = resolve(examplesPath, envSpecificFile);
-      if (existsSync(examplesEnvSpecificPath)) {
-        dotEnvPathFile = examplesEnvSpecificPath;
-      }
-    }
-    if (!dotEnvPathFile) {
-      dotEnvPathFile = resolve(dotEnvPath, dotEnvFile);
-      if (!existsSync(dotEnvPathFile)) {
-        if (!this.get("dotEnvPath")) {
-          const examplesPath = resolve(dotEnvPath, "examples");
-          const examplesEnvFile = resolve(examplesPath, dotEnvFile);
-          if (existsSync(examplesEnvFile)) {
-            dotEnvPathFile = examplesEnvFile;
-          } else {
-            dotEnvPathFile = resolve(dotEnvPath, "..", dotEnvFile);
-          }
-        }
+      const examplesEnvFile = resolve(examplesPath, dotEnvFile);
+      if (existsSync(examplesEnvFile)) {
+        dotEnvPathFile = examplesEnvFile;
+      } else {
+        dotEnvPathFile = resolve(dotEnvPath, "..", dotEnvFile);
       }
     }
     if (dotEnvPathFile && existsSync(dotEnvPathFile)) {
       config({ path: dotEnvPathFile, quiet: true });
     }
+    const envSpecificFile = `.env.${this.env}`;
+    const envSpecificPath = resolve(dotEnvPath, envSpecificFile);
+    if (existsSync(envSpecificPath) && envSpecificPath !== dotEnvPathFile) {
+      config({ path: envSpecificPath, quiet: true });
+    } else if (!this.get("dotEnvPath")) {
+      const examplesOverlay = resolve(dotEnvPath, "examples", envSpecificFile);
+      if (existsSync(examplesOverlay)) {
+        config({ path: examplesOverlay, quiet: true });
+      }
+    }
   }
   /**
    * Load configuration files
@@ -5800,10 +5793,9 @@ function buildEcosystemConfig(service, paths) {
   const outLog = join9(paths.logs, `${pm2.appName}.out.log`);
   const errLog = join9(paths.logs, `${pm2.appName}.err.log`);
   return `/**
- * pm2 ecosystem for ${service.name} \u2014 seeded by cli-toolkit deploy (init).
- *
- * cwd points at the \`current\` symlink (created on first deploy).
- * Tweak \`args\` here, then: pm2 reload ${paths.ecosystem} --update-env
+ * 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
+ * manifest and redeploy. cwd \u2192 \`current\` symlink.
  */
 module.exports = {
     apps: [
@@ -5811,7 +5803,7 @@ module.exports = {
             name: "${pm2.appName}",
             script: "${pm2.script}",
             cwd: "${paths.current}",
-            args: "${pm2.args}",
+            args: "${pm2.args ?? ""}",
             instances: 1,
             exec_mode: "fork",
             autorestart: true,
@@ -5824,6 +5816,8 @@ module.exports = {
             merge_logs: true,
             time: true,
             env: {
+                // cli-toolkit Args: ENV selects env-suffixed defaults (DB_NAME_PRODUCTION, BUCKET_PRODUCTION, \u2026)
+                ENV: "production",
                 NODE_ENV: "production",
             },
         },
@@ -5848,17 +5842,17 @@ async function initServiceStructure(service, options = {}) {
     if (!dryRun) await mkdir6(dir, { recursive: true });
     created.push(dir);
   }
-  let ecosystemCreated = false;
-  if (await pathExists4(paths.ecosystem)) {
-    skipped.push(paths.ecosystem);
+  const ecosystemExisted = await pathExists4(paths.ecosystem);
+  if (!dryRun) {
+    await writeFile5(paths.ecosystem, buildEcosystemConfig(service, paths), { mode: 420 });
+  }
+  if (ecosystemExisted) {
+    logger.info(`synced ${paths.ecosystem} from manifest`);
   } else {
-    if (!dryRun) {
-      await writeFile5(paths.ecosystem, buildEcosystemConfig(service, paths), { mode: 420 });
-    }
-    ecosystemCreated = true;
     created.push(paths.ecosystem);
+    logger.info(`seeded ${paths.ecosystem}`);
   }
-  const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] init-structure service=${service.name} dryRun=${dryRun} created=${created.length} skipped=${skipped.length}
+  const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] init-structure service=${service.name} dryRun=${dryRun} created=${created.length} skipped=${skipped.length} ecosystem=synced
 `;
   if (!dryRun) {
     await mkdir6(paths.logs, { recursive: true });
@@ -5867,8 +5861,7 @@ async function initServiceStructure(service, options = {}) {
   logger.info(`service=${service.name} appsRoot=${paths.root}`);
   logger.info(`created: ${created.length ? created.join(", ") : "(none)"}`);
   logger.info(`already present: ${skipped.length ? skipped.join(", ") : "(none)"}`);
-  if (ecosystemCreated) logger.info(`seeded ${paths.ecosystem}`);
-  return { paths, created, skipped, ecosystemCreated };
+  return { paths, created, skipped, ecosystemCreated: !ecosystemExisted, ecosystemSynced: true };
 }
 
 // src/deploy/bootstrap-host.js
@@ -5965,11 +5958,55 @@ async function installLogrotate(service, options = {}) {
   await runShell(`sudo cp '${tmp}' '${conf}'`, { logger });
   logger.info(`logrotate config written: ${conf}`);
 }
+var OPERATOR_SHELL_BEGIN = "# >>> mlsfarm-operator >>>";
+var OPERATOR_SHELL_END = "# <<< mlsfarm-operator <<<";
+async function installOperatorShell(service, options = {}) {
+  const { user = "ubuntu", dryRun = false, logger = console } = options;
+  const appsRoot = service.appsRoot;
+  if (!appsRoot) {
+    logger.warn("installOperatorShell: service.appsRoot missing \u2014 skipped");
+    return;
+  }
+  const home = user === "ubuntu" || user === process.env.USER ? join10(homedir(), ".bashrc") : `/home/${user}/.bashrc`;
+  const currentDir = join10(appsRoot, "current");
+  const block = [
+    OPERATOR_SHELL_BEGIN,
+    "# Managed by cli-toolkit deploy bootstrap \u2014 do not edit by hand.",
+    "export ENV=production",
+    `if [ -d "${currentDir}" ]; then`,
+    `  cd "${currentDir}" || true`,
+    "fi",
+    OPERATOR_SHELL_END,
+    ""
+  ].join("\n");
+  if (dryRun) {
+    logger.info(`[dryRun] would update ${home} (ENV=production, cd ${currentDir})`);
+    return;
+  }
+  let existing = "";
+  if (await pathExists5(home)) {
+    existing = await readFile4(home, "utf8");
+  }
+  const begin = existing.indexOf(OPERATOR_SHELL_BEGIN);
+  const end = existing.indexOf(OPERATOR_SHELL_END);
+  let next;
+  if (begin !== -1 && end !== -1 && end > begin) {
+    const afterEnd = end + OPERATOR_SHELL_END.length;
+    const rest = existing.slice(afterEnd).replace(/^\n/, "");
+    next = `${existing.slice(0, begin).replace(/\s*$/, "\n")}${block}${rest}`;
+  } else {
+    next = `${existing.replace(/\s*$/, "\n")}
+${block}`;
+  }
+  await writeFile6(home, next, { mode: 420 });
+  logger.info(`operator shell: ${home} \u2192 ENV=production, cd ${currentDir}`);
+}
 async function bootstrapHost(service, options = {}) {
   const { deployKey = service.deployKey, user = "ubuntu", dryRun = false, logger = console } = options;
   await ensurePm2Startup({ user, dryRun, logger });
   if (deployKey) await installDeployKey(deployKey, { dryRun, logger });
   await installLogrotate(service, { dryRun, logger });
+  await installOperatorShell(service, { user, dryRun, logger });
   logger.info("bootstrap-host complete");
 }
 
@@ -8707,6 +8744,7 @@ export {
   createElement2 as h,
   initServiceStructure,
   installDeps,
+  installOperatorShell,
   ipcFileLogsTableNameForSourceResource,
   joiEdateType,
   joiStringArrayType,