cyberia 3.1.3 → 3.2.9

package/bin/deploy.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 
 import dotenv from 'dotenv';
 
-import { pbcopy, shellCd, shellExec } from '../src/server/process.js';
+import { pbcopy, shellExec } from '../src/server/process.js';
 import { loggerFactory } from '../src/server/logger.js';
 import {
   addApiConf,
@@ -20,7 +20,7 @@ import {
 } from '../src/server/conf.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
-import { timer } from '../src/client/components/core/CommonJs.js';
+import { timer, getCapVariableName } from '../src/client/components/core/CommonJs.js';
 import Underpost from '../src/index.js';
 
 colors.enable();
@@ -218,115 +218,6 @@ try {
       break;
     }
 
-    case 'version-build': {
-      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
-      shellCd(`/home/dd/engine`);
-      Underpost.repo.clean({ paths: ['/home/dd/engine', '/home/dd/engine/engine-private '] });
-      shellExec(`node bin pull . ${process.env.GITHUB_USERNAME}/engine`);
-      shellExec(`node bin run kill 4001`);
-      shellExec(`node bin run kill 4002`);
-      shellExec(`node bin run kill 4003`);
-      shellExec(`npm run update:template`);
-      shellExec(`cd ../pwa-microservices-template && npm install && npm run build`);
-      console.log(fs.existsSync(`../pwa-microservices-template/engine-private/conf/dd-default`));
-      shellExec(`cd ../pwa-microservices-template && ENABLE_FILE_LOGS=true timeout 5s npm run dev`, {
-        async: true,
-      });
-      await timer(5500);
-      const templateRunnerResult = fs.readFileSync(`../pwa-microservices-template/logs/start.js/all.log`, 'utf8');
-      logger.info('Test template runner result');
-      console.log(templateRunnerResult);
-      if (!templateRunnerResult || templateRunnerResult.toLowerCase().match('error')) {
-        logger.error('Test template runner result failed');
-        break;
-      }
-      shellCd(`/home/dd/engine`);
-      Underpost.repo.clean({ paths: ['/home/dd/engine', '/home/dd/engine/engine-private '] });
-      const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
-      const newVersion = process.argv[3] ?? originPackageJson.version;
-      const { version } = originPackageJson;
-      originPackageJson.version = newVersion;
-      fs.writeFileSync(`package.json`, JSON.stringify(originPackageJson, null, 4), 'utf8');
-
-      const originPackageLockJson = JSON.parse(fs.readFileSync(`package-lock.json`, 'utf8'));
-      originPackageLockJson.version = newVersion;
-      originPackageLockJson.packages[''].version = newVersion;
-      fs.writeFileSync(`package-lock.json`, JSON.stringify(originPackageLockJson, null, 4), 'utf8');
-
-      if (fs.existsSync(`./engine-private/conf`)) {
-        const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
-        for (const relativePath of files) {
-          const filePah = `./engine-private/conf/${relativePath.replaceAll(`\\`, '/')}`;
-          if (filePah.split('/').pop() === 'package.json') {
-            const originPackage = JSON.parse(fs.readFileSync(filePah, 'utf8'));
-            originPackage.version = newVersion;
-            fs.writeFileSync(filePah, JSON.stringify(originPackage, null, 4), 'utf8');
-          }
-          if (filePah.split('/').pop() === 'deployment.yaml') {
-            fs.writeFileSync(
-              filePah,
-              fs
-                .readFileSync(filePah, 'utf8')
-                .replaceAll(`v${version}`, `v${newVersion}`)
-                .replaceAll(`engine.version: ${version}`, `engine.version: ${newVersion}`),
-              'utf8',
-            );
-          }
-        }
-      }
-
-      fs.writeFileSync(
-        `./manifests/deployment/dd-default-development/deployment.yaml`,
-        fs
-          .readFileSync(`./manifests/deployment/dd-default-development/deployment.yaml`, 'utf8')
-          .replaceAll(`underpost:v${version}`, `underpost:v${newVersion}`),
-        'utf8',
-      );
-
-      if (fs.existsSync(`./.github/workflows/docker-image.ci.yml`))
-        fs.writeFileSync(
-          `./.github/workflows/docker-image.ci.yml`,
-          fs
-            .readFileSync(`./.github/workflows/docker-image.ci.yml`, 'utf8')
-            .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
-          'utf8',
-        );
-
-      fs.writeFileSync(
-        `./src/index.js`,
-        fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
-        'utf8',
-      );
-      shellExec(`node bin/deploy cli-docs ${version} ${newVersion}`);
-      shellExec(`node bin/deploy update-dependencies`);
-      shellExec(`node bin/build dd`);
-      shellExec(`node bin deploy --build-manifest --sync --info-router --replicas 1 dd production`);
-      shellExec(`node bin deploy --build-manifest --sync --info-router --replicas 1 dd development`);
-      shellExec(`node bin/deploy build-default-confs`);
-      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
-      shellExec(`node bin new --deploy-id dd-default`);
-      console.log(fs.existsSync(`./engine-private/conf/dd-default`));
-      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
-      shellExec(`node bin cron --dev --setup-start`);
-      shellExec(`node bin cmt --changelog-build`);
-      process.exit(0);
-      break;
-    }
-
-    case 'version-deploy': {
-      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
-      shellExec(
-        `underpost secret underpost --create-from-file /home/dd/engine/engine-private/conf/dd-cron/.env.production`,
-      );
-      shellExec(`node bin/build dd conf`);
-      shellExec(`git add . && cd ./engine-private && git add .`);
-      shellExec(`node bin cmt . ci package-pwa-microservices-template 'New release v:${process.argv[3]}'`);
-      shellExec(`node bin cmt ./engine-private ci package-pwa-microservices-template`);
-      shellExec(`node bin push . ${process.env.GITHUB_USERNAME}/engine`);
-      shellExec(`cd ./engine-private && node ../bin push . ${process.env.GITHUB_USERNAME}/engine-private`);
-      break;
-    }
-
     case 'build-default-confs': {
       for (const deployId of fs
         .readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
@@ -475,7 +366,10 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         `${path}/.env`,
         fs
           .readFileSync(`${path}/.env`, 'utf8')
-          .replace(`FIRST_SUPERUSER=admin@example.com`, `FIRST_SUPERUSER=development@underpost.net`)
+          .replace(
+            `FIRST_SUPERUSER=admin@example.com`,
+            `FIRST_SUPERUSER=${process.env.GITHUB_EMAIL || 'development@underpost.net'}`,
+          )
           .replace(`FIRST_SUPERUSER_PASSWORD=changethis`, `FIRST_SUPERUSER_PASSWORD=${password}`)
           .replace(`SECRET_KEY=changethis`, `SECRET_KEY=${password}`)
           .replace(`POSTGRES_DB=app`, `POSTGRES_DB=postgresdb`)
@@ -561,7 +455,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
           shellExec(
             `sudo kubectl create secret generic ${secretSelector}` +
               ` --from-file=SECRET_KEY=/home/dd/engine/engine-private/postgresql-password` +
-              ` --from-literal=FIRST_SUPERUSER=development@underpost.net` +
+              ` --from-literal=FIRST_SUPERUSER=${process.env.GITHUB_EMAIL || 'development@underpost.net'}` +
               ` --from-file=FIRST_SUPERUSER_PASSWORD=/home/dd/engine/engine-private/postgresql-password` +
               ` --dry-run=client -o yaml | kubectl apply -f - -n ${namespace}`,
           );
@@ -798,6 +692,7 @@ nvidia/gpu-operator \
         for (const file of fs.readdirSync(`./engine-private/conf/${deployId}/`)) {
           const deployPackage = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/package.json`, 'utf8'));
           deployPackage.overrides = originPackageJson.overrides;
+          deployPackage.dependencies = originPackageJson.dependencies;
           fs.writeFileSync(
             `./engine-private/conf/${deployId}/package.json`,
             JSON.stringify(deployPackage, null, 4),
@@ -810,7 +705,7 @@ nvidia/gpu-operator \
               for (const path of Object.keys(confObj[host])) {
               }
             }
-            fs.writeFileSync(filePath, JSON.stringify(confObj, null, 4), 'utf8');
+            // fs.writeFileSync(filePath, JSON.stringify(confObj, null, 4), 'utf8');
             logger.info(`sync-conf`, { deployId, file });
           }
         }
@@ -839,7 +734,7 @@ nvidia/gpu-operator \
       if (fs.existsSync(toPath)) fs.removeSync(toPath);
       shellExec(`node bin/deploy pw-conf ${scriptPath}`);
       shellExec(`kubectl delete deployment playwright-server --ignore-not-found`);
-      while (Underpost.deploy.get('playwright-server').length > 0) {
+      while (Underpost.kubectl.get('playwright-server').length > 0) {
         logger.info(`Waiting for playwright-server deployment to be deleted...`);
         await timer(1000);
       }
@@ -847,13 +742,13 @@ nvidia/gpu-operator \
       const id = 'playwright-server';
       await Underpost.test.statusMonitor(id);
       const nameSpace = 'default';
-      const [pod] = Underpost.deploy.get(id);
+      const [pod] = Underpost.kubectl.get(id);
       const podName = pod.NAME;
       shellExec(`kubectl logs -f ${podName} -n ${nameSpace}`, {
         async: true,
       });
       (async () => {
-        while (!Underpost.deploy.existsContainerFile({ podName, path: fromPath })) {
+        while (!Underpost.kubectl.existsFile({ podName, path: fromPath })) {
           await timer(1000);
           logger.info(`Waiting for file ${fromPath} in pod ${podName}...`);
         }
@@ -874,7 +769,8 @@ nvidia/gpu-operator \
     }
 
     case 'dependabot': {
-      shellExec(`git fetch origin`);
+      dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
+      shellExec(`git fetch origin --prune`);
 
       const { stdout: branchOutput } = shellExec(`git branch -r`, { silent: true });
       const dependabotBranches = branchOutput
@@ -890,20 +786,746 @@ nvidia/gpu-operator \
 
       logger.info('Found dependabot branches:', dependabotBranches);
 
-      for (const branch of dependabotBranches) {
-        logger.info(`Checking out branch: ${branch}`);
-        shellExec(`git checkout -B ${branch} origin/${branch}`);
+      // Stash local changes to prevent checkout/merge conflicts
+      const stashResult = shellExec(`git stash --include-untracked`, { silent: true });
+      const hasStash = !stashResult.stdout.includes('No local changes to save');
+
+      // Checkout master
+      const checkoutResult = shellExec(`git checkout master`);
+      if (checkoutResult.code !== 0) {
+        logger.error('Failed to checkout master');
+        if (hasStash) shellExec(`git stash pop`);
+        break;
       }
 
-      logger.info('Checking out master');
-      shellExec(`git checkout master`);
+      // Pull latest master
+      shellExec(`git pull origin master`);
+
+      // Get repo URI from remote
+      const remoteUrl = shellExec(`git config --get remote.origin.url`, { stdout: true, silent: true }).trim();
+      const gitUri = remoteUrl.replace(/.*github\.com[:/]/, '').replace(/\.git$/, '');
+
+      const mergedBranches = [];
+      const failedBranches = [];
 
       for (const branch of dependabotBranches) {
         logger.info(`Merging branch: ${branch}`);
-        shellExec(`git merge ${branch}`);
+        const mergeResult = shellExec(`git merge origin/${branch}`);
+        if (mergeResult.code === 0) {
+          const isAlreadyMerged = mergeResult.stdout && mergeResult.stdout.includes('Already up to date');
+          mergedBranches.push({ branch, isAlreadyMerged });
+        } else {
+          logger.error(`Failed to merge branch: ${branch}`);
+          shellExec(`git merge --abort`, { silent: true });
+          failedBranches.push(branch);
+        }
+      }
+
+      // Delete merged local and remote branches
+      for (const { branch, isAlreadyMerged } of mergedBranches) {
+        shellExec(`git branch -D ${branch}`, { silent: true });
+        // logger.info(`Deleting remote branch: ${branch}${isAlreadyMerged ? ' (already merged)' : ''}`);
+        // shellExec(`git push https://${process.env.GITHUB_TOKEN}@github.com/${gitUri}.git --delete ${branch}`, {
+        //   disableLog: true,
+        // });
+      }
+
+      // Restore stashed changes
+      if (hasStash) shellExec(`git stash pop`);
+
+      logger.info(
+        'Merged branches:',
+        mergedBranches.map((m) => m.branch),
+      );
+      if (failedBranches.length > 0) logger.warn('Failed branches:', failedBranches);
+      logger.info('Dependabot merge completed');
+      break;
+    }
+
+    case 'add-server-client': {
+      // node bin/deploy add-server-client <clientId> <deployId> <host> <path>
+      // Example: node bin/deploy add-server-client cecinasmarcelina dd-core cecinasmarcelina.com /
+      // Example: node bin/deploy add-server-client cecinasmarcelina dd-core www.cecinasmarcelina.com /
+      const clientId = process.argv[3];
+      const deployId = process.argv[4];
+      const rawHost = process.argv[5];
+      const path = process.argv[6];
+
+      // Normalize: strip www. prefix to get the base host
+      const baseHost = rawHost.startsWith('www.') ? rawHost.slice(4) : rawHost;
+      const mainHost = `www.${baseHost}`;
+      const redirectHost = baseHost;
+
+      loadConf('clean');
+      loadConf();
+      shellExec(`node bin/deploy clone-client default ${clientId} dd-default ${deployId}`);
+      // default.net has the main client entry → maps to www.<host> (main)
+      shellExec(`node bin/deploy clone-server default.net / ${mainHost} ${path} dd-default ${deployId} ${clientId}`);
+      // www.default.net has the redirect/empty entry → maps to <host> (redirect)
+      shellExec(`node bin/deploy clone-server www.default.net / ${redirectHost} ${path} dd-default ${deployId}`);
+      fs.removeSync(`./engine-private/conf/dd-default`);
+      break;
+    }
+
+    case 'clone-client': {
+      // node bin/deploy clone-client <fromClientId> <toClientId> <fromDeployId> [toDeployId]
+      // Example: node bin/deploy clone-client dogmadual mynewclient dd-core
+      // Example: node bin/deploy clone-client dogmadual mynewclient dd-core dd-other
+      //
+      // Clones a client configuration and its src/ files with a new name.
+      // If toDeployId is omitted, it defaults to fromDeployId (same deploy).
+      // Steps:
+      // - conf.client.json: clones the fromClientId entry as toClientId (renames identifiers)
+      // - conf.ssr.json: clones the SSR entry under the new PascalCase name
+      // - conf.server.json + dev variants: duplicates paths referencing fromClientId for toClientId
+      // - src/client/components/<fromClientId>/ → src/client/components/<toClientId>/ (renames identifiers)
+      // - src/client/services/<fromClientId>/ → src/client/services/<toClientId>/ (renames identifiers)
+      // - src/client/ssr/head/<From>Scripts.js → <To>Scripts.js
+      // - src/client/ssr/body/<From>*.js → <To>*.js (SplashScreen, etc.)
+      // - src/client/ssr/mailer/<From>*.js → <To>*.js (VerifyEmail, RecoverEmail, etc.)
+      // - src/client/<From>.index.js → <To>.index.js
+      // - src/client/public/<fromClientId>/ → src/client/public/<toClientId>/
+
+      const fromClientId = process.argv[3];
+      const toClientId = process.argv[4];
+      const fromDeployId = process.argv[5];
+      const toDeployId = process.argv[6] || fromDeployId;
+
+      if (!fromClientId || !toClientId || !fromDeployId) {
+        logger.error('Usage: node bin/deploy clone-client <fromClientId> <toClientId> <fromDeployId> [toDeployId]');
+        logger.error('Example: node bin/deploy clone-client dogmadual mynewclient dd-core');
+        process.exit(1);
+      }
+
+      const fromCapName = getCapVariableName(fromClientId);
+      const toCapName = getCapVariableName(toClientId);
+
+      const confFromFolder = `./engine-private/conf/${fromDeployId}`;
+      const confToFolder = `./engine-private/conf/${toDeployId}`;
+
+      if (!fs.existsSync(confFromFolder)) {
+        logger.error(`Source config folder not found: ${confFromFolder}`);
+        process.exit(1);
+      }
+      if (!fs.existsSync(confToFolder)) {
+        logger.error(`Target config folder not found: ${confToFolder}`);
+        process.exit(1);
+      }
+
+      const formattedSrc = (src) => src.replaceAll(fromCapName, toCapName).replaceAll(fromClientId, toClientId);
+
+      // 1. Clone conf.client.json entry
+      {
+        const clientConf = JSON.parse(fs.readFileSync(`${confToFolder}/conf.client.json`, 'utf8'));
+        if (clientConf[toClientId]) {
+          logger.warn(`conf.client.json: "${toClientId}" already exists, skipping`);
+        } else {
+          const fromClientConf = JSON.parse(fs.readFileSync(`${confFromFolder}/conf.client.json`, 'utf8'));
+          if (!fromClientConf[fromClientId]) {
+            logger.error(`conf.client.json: "${fromClientId}" not found in ${confFromFolder}`);
+            process.exit(1);
+          }
+          clientConf[toClientId] = JSON.parse(formattedSrc(JSON.stringify(fromClientConf[fromClientId])));
+          fs.writeFileSync(`${confToFolder}/conf.client.json`, JSON.stringify(clientConf, null, 4), 'utf8');
+          logger.info(`conf.client.json: cloned "${fromClientId}" → "${toClientId}"`);
+        }
+      }
+
+      // 2. Clone conf.ssr.json entry
+      {
+        const ssrConf = JSON.parse(fs.readFileSync(`${confToFolder}/conf.ssr.json`, 'utf8'));
+        if (ssrConf[toCapName]) {
+          logger.warn(`conf.ssr.json: "${toCapName}" already exists, skipping`);
+        } else {
+          const fromSsrConf = JSON.parse(fs.readFileSync(`${confFromFolder}/conf.ssr.json`, 'utf8'));
+          if (fromSsrConf[fromCapName]) {
+            ssrConf[toCapName] = JSON.parse(formattedSrc(JSON.stringify(fromSsrConf[fromCapName])));
+            fs.writeFileSync(`${confToFolder}/conf.ssr.json`, JSON.stringify(ssrConf, null, 4), 'utf8');
+            logger.info(`conf.ssr.json: cloned "${fromCapName}" → "${toCapName}"`);
+          } else {
+            logger.warn(`conf.ssr.json: "${fromCapName}" not found in ${confFromFolder}, skipping`);
+          }
+        }
+      }
+
+      // 3. Clone server conf entries (conf.server.json + dev variants)
+      const cloneServerConfEntries = (filePath, label) => {
+        if (!fs.existsSync(filePath)) return;
+        const serverConf = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        let count = 0;
+        for (const host of Object.keys(serverConf)) {
+          for (const path of Object.keys(serverConf[host])) {
+            const entry = serverConf[host][path];
+            if (entry.client === fromClientId) {
+              const newPath = path === '/' ? `/${toClientId}` : path.replace(fromClientId, toClientId);
+              if (!serverConf[host][newPath]) {
+                serverConf[host][newPath] = JSON.parse(formattedSrc(JSON.stringify(entry)));
+                count++;
+              }
+            }
+          }
+        }
+        if (count > 0) {
+          fs.writeFileSync(filePath, JSON.stringify(serverConf, null, 4), 'utf8');
+        }
+        logger.info(`${label}: cloned ${count} server path(s) for "${toClientId}"`);
+      };
+
+      cloneServerConfEntries(`${confToFolder}/conf.server.json`, 'conf.server.json');
+      const devFiles = fs
+        .readdirSync(confToFolder)
+        .filter((f) => f.startsWith('conf.server.dev.') && f.endsWith('.json'));
+      for (const devFile of devFiles) {
+        cloneServerConfEntries(`${confToFolder}/${devFile}`, devFile);
+      }
+
+      // 4. Clone src/client/components/<fromClientId>/ → <toClientId>/
+      const srcFromFolder = `./src/client/components/${fromClientId}`;
+      const srcToFolder = `./src/client/components/${toClientId}`;
+
+      if (!fs.existsSync(srcFromFolder)) {
+        logger.warn(`Source component folder not found: ${srcFromFolder}, skipping src clone`);
+      } else if (fs.existsSync(srcToFolder)) {
+        logger.warn(`Target component folder already exists: ${srcToFolder}, skipping src clone`);
+      } else {
+        fs.mkdirSync(srcToFolder, { recursive: true });
+        const files = fs.readdirSync(srcFromFolder, { recursive: true });
+        for (const relativePath of files) {
+          const fromFilePath = `${srcFromFolder}/${relativePath}`;
+          if (fs.statSync(fromFilePath).isDirectory()) {
+            fs.mkdirSync(`${srcToFolder}/${formattedSrc(relativePath)}`, { recursive: true });
+            continue;
+          }
+          const toFileName = formattedSrc(relativePath);
+          fs.writeFileSync(`${srcToFolder}/${toFileName}`, formattedSrc(fs.readFileSync(fromFilePath, 'utf8')), 'utf8');
+        }
+        logger.info(`src/client/components: cloned ${srcFromFolder} → ${srcToFolder} (${files.length} files)`);
+      }
+
+      // 5. Clone src/client/services/<fromClientId>/ → <toClientId>/
+      {
+        const svcFromFolder = `./src/client/services/${fromClientId}`;
+        const svcToFolder = `./src/client/services/${toClientId}`;
+        if (!fs.existsSync(svcFromFolder)) {
+          logger.warn(`Source services folder not found: ${svcFromFolder}, skipping`);
+        } else if (fs.existsSync(svcToFolder)) {
+          logger.warn(`Target services folder already exists: ${svcToFolder}, skipping`);
+        } else {
+          fs.mkdirSync(svcToFolder, { recursive: true });
+          const svcFiles = fs.readdirSync(svcFromFolder, { recursive: true });
+          for (const relativePath of svcFiles) {
+            const fromFilePath = `${svcFromFolder}/${relativePath}`;
+            if (fs.statSync(fromFilePath).isDirectory()) {
+              fs.mkdirSync(`${svcToFolder}/${formattedSrc(relativePath)}`, { recursive: true });
+              continue;
+            }
+            const toFileName = formattedSrc(relativePath);
+            fs.writeFileSync(
+              `${svcToFolder}/${toFileName}`,
+              formattedSrc(fs.readFileSync(fromFilePath, 'utf8')),
+              'utf8',
+            );
+          }
+          logger.info(`src/client/services: cloned ${svcFromFolder} → ${svcToFolder} (${svcFiles.length} files)`);
+        }
+      }
+
+      // 6. Clone SSR head scripts
+      const fromScriptsPath = `./src/client/ssr/head/${fromCapName}Scripts.js`;
+      const toScriptsPath = `./src/client/ssr/head/${toCapName}Scripts.js`;
+      if (fs.existsSync(fromScriptsPath) && !fs.existsSync(toScriptsPath)) {
+        fs.writeFileSync(toScriptsPath, formattedSrc(fs.readFileSync(fromScriptsPath, 'utf8')), 'utf8');
+        logger.info(`ssr/head: cloned ${fromCapName}Scripts.js → ${toCapName}Scripts.js`);
+      } else if (fs.existsSync(toScriptsPath)) {
+        logger.warn(`ssr/head: ${toCapName}Scripts.js already exists, skipping`);
+      }
+
+      // 7. Clone SSR body files
+      {
+        const ssrConf = JSON.parse(fs.readFileSync(`${confToFolder}/conf.ssr.json`, 'utf8'));
+        const toSsr = ssrConf[toCapName];
+        if (toSsr && Array.isArray(toSsr.body)) {
+          for (const bodyName of toSsr.body) {
+            if (!bodyName.startsWith(toCapName)) continue;
+            const fromBodyName = bodyName.replace(toCapName, fromCapName);
+            const fromBodyPath = `./src/client/ssr/body/${fromBodyName}.js`;
+            const toBodyPath = `./src/client/ssr/body/${bodyName}.js`;
+            if (fs.existsSync(fromBodyPath) && !fs.existsSync(toBodyPath)) {
+              fs.writeFileSync(toBodyPath, formattedSrc(fs.readFileSync(fromBodyPath, 'utf8')), 'utf8');
+              logger.info(`ssr/body: cloned ${fromBodyName}.js → ${bodyName}.js`);
+            } else if (fs.existsSync(toBodyPath)) {
+              logger.warn(`ssr/body: ${bodyName}.js already exists, skipping`);
+            }
+          }
+        }
+      }
+
+      // 8. Clone SSR mailer files
+      {
+        const ssrConf = JSON.parse(fs.readFileSync(`${confToFolder}/conf.ssr.json`, 'utf8'));
+        const toSsr = ssrConf[toCapName];
+        if (toSsr && toSsr.mailer && typeof toSsr.mailer === 'object') {
+          for (const mailerName of Object.values(toSsr.mailer)) {
+            if (!mailerName.startsWith(toCapName)) continue;
+            const fromMailerName = mailerName.replace(toCapName, fromCapName);
+            const fromMailerPath = `./src/client/ssr/mailer/${fromMailerName}.js`;
+            const toMailerPath = `./src/client/ssr/mailer/${mailerName}.js`;
+            if (fs.existsSync(fromMailerPath) && !fs.existsSync(toMailerPath)) {
+              fs.writeFileSync(toMailerPath, formattedSrc(fs.readFileSync(fromMailerPath, 'utf8')), 'utf8');
+              logger.info(`ssr/mailer: cloned ${fromMailerName}.js → ${mailerName}.js`);
+            } else if (fs.existsSync(toMailerPath)) {
+              logger.warn(`ssr/mailer: ${mailerName}.js already exists, skipping`);
+            }
+          }
+        }
+      }
+
+      // 9. Clone client index
+      const fromIndexPath = `./src/client/${fromCapName}.index.js`;
+      const toIndexPath = `./src/client/${toCapName}.index.js`;
+      if (fs.existsSync(fromIndexPath) && !fs.existsSync(toIndexPath)) {
+        fs.writeFileSync(toIndexPath, formattedSrc(fs.readFileSync(fromIndexPath, 'utf8')), 'utf8');
+        logger.info(`client: cloned ${fromCapName}.index.js → ${toCapName}.index.js`);
+      } else if (fs.existsSync(toIndexPath)) {
+        logger.warn(`client: ${toCapName}.index.js already exists, skipping`);
+      }
+
+      // 10. Clone public assets
+      const fromPublicPath = `./src/client/public/${fromClientId}`;
+      const toPublicPath = `./src/client/public/${toClientId}`;
+      if (fs.existsSync(fromPublicPath) && !fs.existsSync(toPublicPath)) {
+        fs.copySync(fromPublicPath, toPublicPath);
+        logger.info(`public: cloned ${fromPublicPath} → ${toPublicPath}`);
+      } else if (fs.existsSync(toPublicPath)) {
+        logger.warn(`public: ${toPublicPath} already exists, skipping`);
+      }
+
+      // 11. Rebuild default conf
+      shellExec(`node bin new --default-conf --deploy-id ${toDeployId}`);
+      logger.info(`Rebuilt default conf for ${toDeployId}`);
+
+      break;
+    }
+
+    case 'clone-server': {
+      // node bin/deploy clone-server <fromHost> <fromPath> <toHost> <toPath> <fromDeployId> <toDeployId>
+      // Example: node bin/deploy clone-server www.dogmadual.com / www.newsite.com / dd-core dd-other
+      // Example: node bin/deploy clone-server www.nexodev.org / www.newdomain.org /app dd-core dd-core
+      //
+      // Clones a specific server host/path entry from one deploy's conf to another,
+      // optionally renaming the host and path in the target.
+      // - conf.server.json: copies the fromHost/fromPath entry to toHost/toPath
+      // - conf.server.dev.*.json: same treatment for all dev variants
+
+      const fromHost = process.argv[3];
+      const fromPath = process.argv[4];
+      const toHost = process.argv[5];
+      const toPath = process.argv[6];
+      const fromDeployId = process.argv[7];
+      const toDeployId = process.argv[8];
+      const overrideClientId = process.argv[9];
+
+      if (!fromHost || !fromPath || !toHost || !toPath || !fromDeployId || !toDeployId) {
+        logger.error(
+          'Usage: node bin/deploy clone-server <fromHost> <fromPath> <toHost> <toPath> <fromDeployId> <toDeployId> [clientId]',
+        );
+        logger.error(
+          'Example: node bin/deploy clone-server www.dogmadual.com / www.newsite.com / dd-core dd-other newsite',
+        );
+        process.exit(1);
+      }
+
+      const confFromFolder = `./engine-private/conf/${fromDeployId}`;
+      const confToFolder = `./engine-private/conf/${toDeployId}`;
+
+      if (!fs.existsSync(confFromFolder)) {
+        logger.error(`Source config folder not found: ${confFromFolder}`);
+        process.exit(1);
+      }
+      if (!fs.existsSync(confToFolder)) {
+        logger.error(`Target config folder not found: ${confToFolder}`);
+        process.exit(1);
       }
 
-      logger.info('All dependabot branches merged into master');
+      const cloneServerEntry = (fromFilePath, toFilePath, label) => {
+        if (!fs.existsSync(fromFilePath)) {
+          logger.warn(`${label}: source file not found, skipping`);
+          return;
+        }
+        const fromServerConf = JSON.parse(fs.readFileSync(fromFilePath, 'utf8'));
+        if (!fromServerConf[fromHost] || !fromServerConf[fromHost][fromPath]) {
+          logger.warn(`${label}: "${fromHost}" "${fromPath}" not found in source, skipping`);
+          return;
+        }
+
+        const toServerConf = fs.existsSync(toFilePath) ? JSON.parse(fs.readFileSync(toFilePath, 'utf8')) : {};
+
+        if (!toServerConf[toHost]) toServerConf[toHost] = {};
+
+        if (toServerConf[toHost][toPath]) {
+          logger.warn(`${label}: "${toHost}" "${toPath}" already exists in target, skipping`);
+          return;
+        }
+
+        toServerConf[toHost][toPath] = JSON.parse(JSON.stringify(fromServerConf[fromHost][fromPath]));
+        // Override client field if --client= is provided
+        const entry = toServerConf[toHost][toPath];
+        if (overrideClientId && entry.client) {
+          entry.client = overrideClientId;
+        }
+        // Update db.name to use the client-specific env variable
+        if (entry.client && entry.db && entry.db.name) {
+          const upperClientId = entry.client.replaceAll('-', '_').toUpperCase();
+          entry.db.name = `env:DB_NAME_${upperClientId}`;
+        }
+        fs.writeFileSync(toFilePath, JSON.stringify(toServerConf, null, 4), 'utf8');
+        logger.info(
+          `${label}: cloned "${fromHost}" "${fromPath}" → "${toHost}" "${toPath}" (${fromDeployId} → ${toDeployId})`,
+        );
+      };
+
+      // 1. Main conf.server.json
+      cloneServerEntry(`${confFromFolder}/conf.server.json`, `${confToFolder}/conf.server.json`, 'conf.server.json');
+
+      // 2. Dev variants (clone from source dev files)
+      const devFiles = fs
+        .readdirSync(confFromFolder)
+        .filter((f) => f.startsWith('conf.server.dev.') && f.endsWith('.json'));
+      for (const devFile of devFiles) {
+        cloneServerEntry(`${confFromFolder}/${devFile}`, `${confToFolder}/${devFile}`, devFile);
+      }
+
+      // 3. Create individual dev file for the new entry (conf.server.dev.<clientId>.json)
+      {
+        const mainToPath = `${confToFolder}/conf.server.json`;
+        if (fs.existsSync(mainToPath)) {
+          const toServerConf = JSON.parse(fs.readFileSync(mainToPath, 'utf8'));
+          const entry = toServerConf[toHost] && toServerConf[toHost][toPath];
+          if (entry && entry.client) {
+            const devFileName = `conf.server.dev.${entry.client}.json`;
+            const devFilePath = `${confToFolder}/${devFileName}`;
+            if (!fs.existsSync(devFilePath)) {
+              const devConf = { [toHost]: { [toPath]: entry } };
+              fs.writeFileSync(devFilePath, JSON.stringify(devConf, null, 4), 'utf8');
+              logger.info(`${devFileName}: created dev file for "${toHost}" "${toPath}"`);
+            } else {
+              logger.info(`${devFileName}: already exists, skipping creation`);
+            }
+          }
+        }
+      }
+
+      // 4. Add DB_NAME_<UPPER> env variable to target deploy .env.* files
+      {
+        const mainFromPath = `${confFromFolder}/conf.server.json`;
+        if (fs.existsSync(mainFromPath)) {
+          const fromServerConf = JSON.parse(fs.readFileSync(mainFromPath, 'utf8'));
+          const sourceEntry = fromServerConf[fromHost] && fromServerConf[fromHost][fromPath];
+          if (sourceEntry && sourceEntry.client) {
+            const clientId = overrideClientId || sourceEntry.client;
+            const upperClientId = clientId.replaceAll('-', '_').toUpperCase();
+            const envKey = `DB_NAME_${upperClientId}`;
+            const envValue = `${envKey}=${clientId}`;
+            for (const envFile of ['.env.production', '.env.development', '.env.test']) {
+              const envPath = `${confToFolder}/${envFile}`;
+              if (fs.existsSync(envPath)) {
+                const envContent = fs.readFileSync(envPath, 'utf8');
+                if (!envContent.includes(envKey)) {
+                  fs.writeFileSync(envPath, envContent.trimEnd() + '\n' + envValue + '\n', 'utf8');
+                  logger.info(`${envFile}: added ${envValue}`);
+                } else {
+                  logger.info(`${envFile}: ${envKey} already exists, skipping`);
+                }
+              }
+            }
+          }
+        }
+      }
+
+      // 5. Rebuild default conf
+      shellExec(`node bin new --default-conf --deploy-id ${toDeployId}`);
+      logger.info(`Rebuilt default conf for ${toDeployId}`);
+
+      break;
+    }
+
+    case 'add-api': {
+      // node bin/deploy add-api <apiId> <deployId> [clientId] [host]
+      // Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal
+      // Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal underpost.net
+      //
+      // Adds an API to server conf files (main + dev variants) and client conf.
+      // - conf.server.json: adds apiId to every host/path that has an `apis` array
+      //   (or only to the specified host if [host] is provided)
+      // - conf.server.dev.*.json: same treatment for all dev variants
+      // - conf.client.json: adds apiId to the specified clientId's `services` array
+      // Idempotent: skips if the API is already present.
+
+      const apiId = process.argv[3];
+      const deployId = process.argv[4];
+      const clientId = process.argv[5];
+      const targetHost = process.argv[6];
+
+      if (!apiId || !deployId) {
+        logger.error('Usage: node bin/deploy add-api <apiId> <deployId> [clientId] [host]');
+        logger.error('Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal');
+        logger.error('Example: node bin/deploy add-api cyberia-dialogue dd-cyberia cyberia-portal underpost.net');
+        process.exit(1);
+      }
+
+      const confFolder = `./engine-private/conf/${deployId}`;
+      if (!fs.existsSync(confFolder)) {
+        logger.error(`Config folder not found: ${confFolder}`);
+        process.exit(1);
+      }
+
+      // Helper: add apiId to apis[] arrays in a server conf file (idempotent)
+      // When targetHost is set, only entries under that host are modified.
+      const addApiToServerConf = (filePath) => {
+        if (!fs.existsSync(filePath)) return 0;
+        const conf = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        let count = 0;
+        const hosts = targetHost ? (conf[targetHost] ? [targetHost] : []) : Object.keys(conf);
+        for (const host of hosts) {
+          for (const path of Object.keys(conf[host])) {
+            const entry = conf[host][path];
+            if (Array.isArray(entry.apis) && entry.apis.length > 0 && !entry.apis.includes(apiId)) {
+              entry.apis.push(apiId);
+              count++;
+            }
+          }
+        }
+        if (count > 0) {
+          fs.writeFileSync(filePath, JSON.stringify(conf, null, 4), 'utf8');
+        }
+        return count;
+      };
+
+      // 1. Main conf.server.json
+      const mainPath = `${confFolder}/conf.server.json`;
+      const mainCount = addApiToServerConf(mainPath);
+      logger.info(`conf.server.json: added "${apiId}" to ${mainCount} path(s)`);
+
+      // 2. All dev variants: conf.server.dev.*.json
+      const devFiles = fs
+        .readdirSync(confFolder)
+        .filter((f) => f.startsWith('conf.server.dev.') && f.endsWith('.json'));
+      for (const devFile of devFiles) {
+        const devPath = `${confFolder}/${devFile}`;
+        const devCount = addApiToServerConf(devPath);
+        logger.info(`${devFile}: added "${apiId}" to ${devCount} path(s)`);
+      }
+
+      // Helper: add apiId to a client conf file's clientId services (idempotent)
+      const addApiToClientConf = (filePath, label) => {
+        if (!clientId || !fs.existsSync(filePath)) return;
+        const confClient = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        if (confClient[clientId] && Array.isArray(confClient[clientId].services)) {
+          if (!confClient[clientId].services.includes(apiId)) {
+            confClient[clientId].services.push(apiId);
+            fs.writeFileSync(filePath, JSON.stringify(confClient, null, 4), 'utf8');
+            logger.info(`${label}: added "${apiId}" to "${clientId}" services`);
+          } else {
+            logger.info(`${label}: "${apiId}" already in "${clientId}" services`);
+          }
+        } else {
+          logger.warn(`${label}: clientId "${clientId}" not found or has no services array`);
+        }
+      };
+
+      // 3. Client conf.client.json
+      addApiToClientConf(`${confFolder}/conf.client.json`, 'conf.client.json');
+
+      // 4. Replicas: engine-private/replica/<deployId>-*
+      const replicaBase = './engine-private/replica';
+      if (fs.existsSync(replicaBase)) {
+        const replicaDirs = fs
+          .readdirSync(replicaBase)
+          .filter((d) => d.startsWith(`${deployId}-`) && fs.statSync(`${replicaBase}/${d}`).isDirectory());
+        for (const replicaDir of replicaDirs) {
+          const replicaFolder = `${replicaBase}/${replicaDir}`;
+          // Server conf
+          const rMainCount = addApiToServerConf(`${replicaFolder}/conf.server.json`);
+          logger.info(`replica/${replicaDir}/conf.server.json: added "${apiId}" to ${rMainCount} path(s)`);
+          // Dev variants
+          const rDevFiles = fs
+            .readdirSync(replicaFolder)
+            .filter((f) => f.startsWith('conf.server.dev.') && f.endsWith('.json'));
+          for (const rDevFile of rDevFiles) {
+            const rDevCount = addApiToServerConf(`${replicaFolder}/${rDevFile}`);
+            logger.info(`replica/${replicaDir}/${rDevFile}: added "${apiId}" to ${rDevCount} path(s)`);
+          }
+          // Client conf
+          addApiToClientConf(`${replicaFolder}/conf.client.json`, `replica/${replicaDir}/conf.client.json`);
+        }
+      }
+
+      // 5. Rebuild default conf
+      shellExec(`node bin new --default-conf --deploy-id ${deployId}`);
+      logger.info(`Rebuilt default conf for ${deployId}`);
+
+      break;
+    }
+
+    case 'add-component': {
+      // node bin/deploy add-component <componentId> [deployId] [clientId] [submoduleId]
+      // Example: node bin/deploy add-component ColorPaletteElement dd-cyberia cyberia-portal core
+      // Example: node bin/deploy add-component ColorPaletteElement dd-cyberia
+      // Example: node bin/deploy add-component ColorPaletteElement
+      // Adds a component to client conf.main and related replicas.
+      // - if deployId is omitted: iterates deploys in engine-private/deploy/dd.router
+      // - if clientId is omitted: iterates all clients in each conf.client.json
+      // - if submoduleId is omitted: iterates all available components.<submoduleId> arrays per client
+      // - validates src/client/components/<submoduleId>/<componentId>.js exists before adding
+      // Idempotent: skips if the component is already present.
+
+      const componentId = process.argv[3];
+      const deployIdArg = process.argv[4];
+      const clientIdArg = process.argv[5];
+      const submoduleIdArg = process.argv[6];
+
+      if (!componentId) {
+        logger.error('Usage: node bin/deploy add-component <componentId> [deployId] [clientId] [submoduleId]');
+        logger.error('Example: node bin/deploy add-component ColorPaletteElement dd-cyberia cyberia-portal core');
+        logger.error('Example: node bin/deploy add-component ColorPaletteElement');
+        process.exit(1);
+      }
+
+      const deployIds = deployIdArg
+        ? [deployIdArg]
+        : fs
+            .readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
+            .split(',')
+            .map((d) => d.trim())
+            .filter(Boolean);
+
+      const addComponentToClientConf = ({ filePath, label, targetClientId, targetSubmoduleId }) => {
+        if (!fs.existsSync(filePath)) return { added: 0, checked: 0, hasComponentFile: false };
+
+        const confClient = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        const clientIds = targetClientId ? [targetClientId] : Object.keys(confClient);
+        let added = 0;
+        let checked = 0;
+        let hasComponentFile = false;
+        let changed = false;
+
+        for (const currentClientId of clientIds) {
+          const clientConf = confClient[currentClientId];
+          if (!clientConf) {
+            logger.warn(`${label}: clientId "${currentClientId}" not found`);
+            continue;
+          }
+
+          const components = clientConf.components || {};
+          const submoduleIds = targetSubmoduleId
+            ? [targetSubmoduleId]
+            : Object.keys(components).filter((key) => Array.isArray(components[key]));
+
+          for (const currentSubmoduleId of submoduleIds) {
+            checked++;
+
+            if (!Array.isArray(components[currentSubmoduleId])) {
+              logger.warn(`${label}: clientId "${currentClientId}" has no components.${currentSubmoduleId} array`);
+              continue;
+            }
+
+            const componentPath = `./src/client/components/${currentSubmoduleId}/${componentId}.js`;
+            if (!fs.existsSync(componentPath)) {
+              continue;
+            }
+            hasComponentFile = true;
+
+            if (components[currentSubmoduleId].includes(componentId)) {
+              logger.info(
+                `${label}: "${componentId}" already in "${currentClientId}" components.${currentSubmoduleId}`,
+              );
+              continue;
+            }
+
+            components[currentSubmoduleId].push(componentId);
+            changed = true;
+            added++;
+            logger.info(`${label}: added "${componentId}" to "${currentClientId}" components.${currentSubmoduleId}`);
+          }
+        }
+
+        if (changed) {
+          fs.writeFileSync(filePath, JSON.stringify(confClient, null, 4), 'utf8');
+        }
+
+        return { added, checked, hasComponentFile };
+      };
+
+      let totalAdded = 0;
+      let totalChecked = 0;
+      let hasAnyComponentFile = false;
+      const processedDeployIds = [];
+
+      for (const deployId of deployIds) {
+        const confFolder = `./engine-private/conf/${deployId}`;
+        if (!fs.existsSync(confFolder)) {
+          logger.warn(`Config folder not found: ${confFolder}`);
+          continue;
+        }
+
+        processedDeployIds.push(deployId);
+
+        const mainResult = addComponentToClientConf({
+          filePath: `${confFolder}/conf.client.json`,
+          label: `conf/${deployId}/conf.client.json`,
+          targetClientId: clientIdArg,
+          targetSubmoduleId: submoduleIdArg,
+        });
+        totalAdded += mainResult.added;
+        totalChecked += mainResult.checked;
+        hasAnyComponentFile = hasAnyComponentFile || mainResult.hasComponentFile;
+
+        const replicaBase = './engine-private/replica';
+        if (fs.existsSync(replicaBase)) {
+          const replicaDirs = fs
+            .readdirSync(replicaBase)
+            .filter((d) => d.startsWith(`${deployId}-`) && fs.statSync(`${replicaBase}/${d}`).isDirectory());
+
+          for (const replicaDir of replicaDirs) {
+            const replicaResult = addComponentToClientConf({
+              filePath: `${replicaBase}/${replicaDir}/conf.client.json`,
+              label: `replica/${replicaDir}/conf.client.json`,
+              targetClientId: clientIdArg,
+              targetSubmoduleId: submoduleIdArg,
+            });
+            totalAdded += replicaResult.added;
+            totalChecked += replicaResult.checked;
+            hasAnyComponentFile = hasAnyComponentFile || replicaResult.hasComponentFile;
+          }
+        }
+      }
+
+      if (totalChecked === 0) {
+        logger.error('No eligible target entries found to add the component');
+        process.exit(1);
+      }
+
+      if (!hasAnyComponentFile) {
+        if (submoduleIdArg) {
+          logger.error(`Component file not found: ./src/client/components/${submoduleIdArg}/${componentId}.js`);
+        } else {
+          logger.error(`Component file not found in available submodules for "${componentId}"`);
+        }
+        process.exit(1);
+      }
+
+      for (const deployId of processedDeployIds) {
+        shellExec(`node bin new --default-conf --deploy-id ${deployId}`);
+        logger.info(`Rebuilt default conf for ${deployId}`);
+      }
+
+      logger.info(`add-component summary`, {
+        componentId,
+        deployIds: processedDeployIds,
+        added: totalAdded,
+        checked: totalChecked,
+      });
+
       break;
     }
   }