@underpostnet/underpost 2.99.5 → 2.99.7

package/src/cli/cloud-init.js

@@ -64,7 +64,7 @@ class UnderpostCloudInit {
           fs.writeFileSync(
             `${nfsHostToolsPath}/date.sh`,
             Underpost.baremetal.stepsRender(
-              Underpost.baremetal.systemProvisioningFactory[systemProvisioning].timezone({
+              Underpost.system.factory[systemProvisioning].timezone({
                 timezone,
                 chronyConfPath,
               }),
@@ -78,7 +78,7 @@ class UnderpostCloudInit {
           fs.writeFileSync(
             `${nfsHostToolsPath}/keyboard.sh`,
             Underpost.baremetal.stepsRender(
-              Underpost.baremetal.systemProvisioningFactory[systemProvisioning].keyboard(keyboard.layout),
+              Underpost.system.factory[systemProvisioning].keyboard(keyboard.layout),
               false,
             ),
             'utf8',
@@ -122,8 +122,6 @@ ${Underpost.baremetal.stepsRender(
     `cloud-init modules --mode=config`,
     `sleep 3`,
     `cloud-init modules --mode=final`,
-    `sleep 3`,
-    `/underpost/enlistment.sh`,
   ],
   false,
 )}`,
@@ -190,45 +188,6 @@ cat /etc/default/keyboard`,
           logger.info('Build', `${nfsHostToolsPath}/device_scan.sh`);
           fs.copySync(`${underpostRoot}/scripts/device-scan.sh`, `${nfsHostToolsPath}/device_scan.sh`);
 
-          // Build and write the MAAS enlistment script.
-          logger.info('Build', `${nfsHostToolsPath}/enlistment.sh`);
-          fs.writeFileSync(
-            `${nfsHostToolsPath}/enlistment.sh`,
-            `#!/bin/bash
-set -x
-
-# ------------------------------------------------------------
-# Step: Commission a machine in MAAS using OAuth1 authentication
-# ------------------------------------------------------------
-
-MACHINE_ID=$(cat /underpost/system-id)
-CONSUMER_KEY=$(cat /underpost/consumer-key)
-TOKEN_KEY=$(cat /underpost/token-key)
-TOKEN_SECRET=$(cat /underpost/token-secret)
-
-echo ">>> Starting MAAS machine commissioning for system_id: $MACHINE_ID …"
-
-curl -X POST \\
-  --fail --location --verbose --include --raw --trace-ascii /dev/stdout\\
-  --header "Authorization:\\
-  OAuth oauth_version=1.0,\\
-  oauth_signature_method=PLAINTEXT,\\
-  oauth_consumer_key=$CONSUMER_KEY,\\
-  oauth_token=$TOKEN_KEY,\\
-  oauth_signature=&$TOKEN_SECRET,\\
-  oauth_nonce=$(uuidgen),\\
-  oauth_timestamp=$(date +%s)"\\
-  -F "commissioning_scripts=20-maas-01-install-lldpd"\\
-  -F "enable_ssh=1"\\
-  -F "skip_bmc_config=1"\\
-  -F "skip_networking=1"\\
-  -F "skip_storage=1"\\
-  -F "testing_scripts=none"\\
-  http://${callbackMetaData.runnerHost.ip}:5240/MAAS/api/2.0/machines/$MACHINE_ID/op-commission \\
-  2>&1 | tee /underpost/enlistment.log || echo "ERROR: MAAS commissioning returned code $?"`,
-            'utf8',
-          );
-
           // Import SSH keys for root user.
           logger.info('Import ssh keys');
           shellExec(`sudo rm -rf ${nfsHostPath}/root/.ssh`);
@@ -659,7 +618,30 @@ curl -X POST \\
       }
 
       return yaml.join('\n');
-    } /**
+    },
+
+    /**
+     * @method httpServerStaticFactory
+     * @description Writes cloud-init files (user-data, meta-data, vendor-data) to the bootstrap HTTP server path.
+     * @param {object} params
+     * @param {string} params.bootstrapHttpServerPath
+     * @param {string} params.hostname
+     * @param {string} params.cloudConfigSrc
+     * @param {string} [params.vendorData='']
+     * @memberof UnderpostCloudInit
+     * @returns {void}
+     */
+    httpServerStaticFactory({ bootstrapHttpServerPath, hostname, cloudConfigSrc, vendorData = '' }) {
+      if (!cloudConfigSrc) return;
+      const dir = `${bootstrapHttpServerPath}/${hostname}/cloud-init`;
+      shellExec(`mkdir -p ${dir}`);
+      fs.writeFileSync(`${dir}/user-data`, cloudConfigSrc, 'utf8');
+      fs.writeFileSync(`${dir}/meta-data`, `instance-id: ${hostname}\nlocal-hostname: ${hostname}`, 'utf8');
+      fs.writeFileSync(`${dir}/vendor-data`, vendorData, 'utf8');
+      logger.info(`Cloud-init files written to ${dir}`);
+    },
+
+    /**
      * @method kernelParamsFactory
      * @description Generates the kernel parameters for the target machine's bootloader configuration,
      * including the necessary parameters to enable cloud-init with a specific configuration URL and logging settings.
@@ -670,7 +652,7 @@ curl -X POST \\
      * @param {string} [options.machine.system_id] - The unique identifier of the machine, used to fetch the correct cloud-init preseed configuration from MAAS.
      * @return {array} The modified array of kernel parameters with cloud-init parameters included.
      * @memberof UnderpostCloudInit
-     */,
+     */
     kernelParamsFactory(
       macAddress,
       cmd = [],

package/src/cli/index.js

@@ -76,11 +76,20 @@ program
   .option('--info', 'Displays information about available commit types.')
   .option('--diff', 'Shows the current git diff changes.')
   .option('--edit', 'Edit last commit.')
-  .option('--msg <msg>', 'Sets a custom commit message.')
   .option('--deploy-id <deploy-id>', 'Sets the deployment configuration ID for the commit context.')
   .option('--cached', 'Commit staged changes only or context.')
   .option('--hashes <hashes>', 'Comma-separated list of specific file hashes of commits.')
   .option('--extension <extension>', 'specific file extensions of commits.')
+  .option(
+    '--changelog [latest-n]',
+    'Print plain the changelog of the specified number of latest n commits, if no number is provided it will get the changelog to latest ci integration',
+  )
+  .option('--changelog-build', 'Builds a CHANGELOG.md file based on the commit history')
+  .option('--changelog-min-version <version>', 'Sets the minimum version limit for --changelog-build (default: 2.85.0)')
+  .option(
+    '--changelog-no-hash',
+    'Excludes commit hashes from the generated changelog entries (used with --changelog-build).',
+  )
   .description('Manages commits to a GitHub repository, supporting various commit types and options.')
   .action(Underpost.repo.commit);
 
@@ -150,6 +159,11 @@ program
   .option('--dir <dir>', 'HTML dir attribute (default: ltr).')
   .option('--dev', 'Sets the development cli context')
 
+  .option(
+    '--run-sv [port]',
+    'Start a standalone Express static server to preview the static build (default port: 5000).',
+  )
+
   .description(`Manages static build of page, bundles, and documentation with comprehensive customization options.`)
   .action(Underpost.static.callback);
 
@@ -402,10 +416,27 @@ program
     '[job-list]',
     `A comma-separated list of job IDs. Options: ${Underpost.cron.getJobsIDs()}. Defaults to all available jobs.`,
   )
-  .option('--init-pm2-cronjobs', 'Initializes PM2 cron jobs from configuration for the specified deployment IDs.')
-  .option('--git', 'Uploads cron job configurations to GitHub.')
-  .option('--update-package-scripts', 'Updates package.json start scripts for each deploy-id configuration.')
-  .description('Manages cron jobs, including initialization, execution, and configuration updates.')
+  .option('--generate-k8s-cronjobs', 'Generates Kubernetes CronJob YAML manifests from cron configuration.')
+  .option('--apply', 'Applies generated K8s CronJob manifests to the cluster via kubectl.')
+  .option(
+    '--setup-start [deploy-id]',
+    'Updates deploy-id package.json start script and generates+applies its K8s CronJob manifests.',
+  )
+  .option('--namespace <namespace>', 'Kubernetes namespace for the CronJob resources (default: "default").')
+  .option('--image <image>', 'Custom container image for the CronJob pods.')
+  .option('--git', 'Pass --git flag to cron job execution.')
+  .option('--cmd <cmd>', 'Optional pre-script commands to run before cron execution.')
+  .option('--dev', 'Use local ./ base path instead of global underpost installation.')
+  .option('--k3s', 'Use k3s cluster context (apply directly on host).')
+  .option('--kind', 'Use kind cluster context (apply via kind-worker container).')
+  .option('--kubeadm', 'Use kubeadm cluster context (apply directly on host).')
+  .option('--dry-run', 'Preview cron jobs without executing them.')
+  .option(
+    '--create-job-now',
+    'After applying manifests, immediately create a Job from each CronJob (requires --apply).',
+  )
+  .option('--ssh', 'Execute backup commands via SSH on the remote node instead of locally.')
+  .description('Manages cron jobs: execute jobs directly or generate and apply K8s CronJob manifests.')
   .action(Underpost.cron.callback);
 
 program
@@ -481,6 +512,7 @@ program
   .option('--status', 'Checks the status of the SSH service.')
   .option('--connect-uri', 'Displays the connection URI.')
   .option('--copy', 'Copies the connection URI to clipboard.')
+  .description('Manages SSH credentials and sessions for remote access to cluster nodes or services.')
   .action(Underpost.ssh.callback);
 
 program
@@ -534,7 +566,11 @@ program
   .option('--expose', 'Enables service exposure for the runner execution.')
   .option('--conf-server-path <conf-server-path>', 'Sets a custom configuration server path.')
   .option('--underpost-root <underpost-root>', 'Sets a custom Underpost root path.')
-  .option('--cron-jobs <jobs>', 'Comma-separated list of cron jobs to run before executing the script.')
+  .option('--cmd-cron-jobs <cmd-cron-jobs>', 'Pre-script commands to run before cron job execution.')
+  .option(
+    '--deploy-id-cron-jobs <deploy-id-cron-jobs>',
+    'Specifies deployment IDs to synchronize cron jobs with during execution.',
+  )
   .option('--timezone <timezone>', 'Sets the timezone for the runner execution.')
   .option('--kubeadm', 'Sets the kubeadm cluster context for the runner execution.')
   .option('--k3s', 'Sets the k3s cluster context for the runner execution.')
@@ -567,6 +603,11 @@ program
     '--monitor-status-max-attempts <attempts>',
     'Sets the maximum number of status check attempts (default: 600).',
   )
+  .option('--dry-run', 'Preview operations without executing them.')
+  .option(
+    '--create-job-now',
+    'After applying cron manifests, immediately create a Job from each CronJob (forwarded to cron runner).',
+  )
   .description('Runs specified scripts using various runners.')
   .action(Underpost.run.callback);
 
@@ -650,6 +691,10 @@ program
   .option('--remove-machines <system-ids>', 'Removes baremetal machines by comma-separated system IDs, or use "all"')
   .option('--clear-discovered', 'Clears all discovered baremetal machines from the database.')
   .option('--commission', 'Init workflow for commissioning a physical machine.')
+  .option(
+    '--bootstrap-http-server-run',
+    'Runs a temporary bootstrap HTTP server for generic purposes such as serving iPXE scripts or ISO images during commissioning.',
+  )
   .option(
     '--bootstrap-http-server-path <path>',
     'Sets a custom bootstrap HTTP server path for baremetal commissioning.',
@@ -661,6 +706,7 @@ program
   .option('--iso-url <url>', 'Uses a custom ISO URL for baremetal machine commissioning.')
   .option('--nfs-build', 'Builds an NFS root filesystem for a workflow id config architecture using QEMU emulation.')
   .option('--nfs-mount', 'Mounts the NFS root filesystem for a workflow id config architecture.')
+  .option('--nfs-reset', 'Resets the NFS server completely, closing all connections before reloading exports.')
   .option('--nfs-unmount', 'Unmounts the NFS root filesystem for a workflow id config architecture.')
   .option('--nfs-build-server', 'Builds the NFS server for a workflow id config architecture.')
   .option('--nfs-sh', 'Copies QEMU emulation root entrypoint shell command to the clipboard.')

package/src/cli/kickstart.js

@@ -0,0 +1,149 @@
+/**
+ * Kickstart configuration generator for Underpost Engine
+ * @module src/cli/kickstart.js
+ * @namespace UnderpostKickStart
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { loggerFactory } from '../server/logger.js';
+
+const logger = loggerFactory(import.meta);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+class UnderpostKickStart {
+  static API = {
+    /**
+     * @method kickstartHeader
+     * @description Generates the kickstart header section with template variables.
+     * @param {object} options
+     * @param {string} [options.lang='en_US.UTF-8']
+     * @param {string} [options.keyboard='us']
+     * @param {string} [options.timezone='America/New_York']
+     * @param {string} [options.rootPassword]
+     * @memberof UnderpostKickStart
+     * @returns {string}
+     */
+    kickstartHeader: ({ lang = 'en_US.UTF-8', keyboard = 'us', timezone = 'America/New_York', rootPassword = '' }) => {
+      return [
+        '# Rocky Linux 9 Kickstart - Ephemeral Anaconda Live Environment with SSHD',
+        'cmdline',
+        'eula --agreed',
+        `keyboard --vckeymap=${keyboard} --xlayouts='${keyboard}'`,
+        `lang ${lang}`,
+        'network --bootproto=dhcp --device=link --activate --onboot=yes',
+        `timezone ${timezone} --utc`,
+        rootPassword ? `rootpw --plaintext ${rootPassword}` : 'rootpw --lock',
+        'firstboot --disable',
+        'skipx',
+      ].join('\n');
+    },
+
+    /**
+     * @method kickstartPreVariables
+     * @description Generates the variable assignments block for the %pre script.
+     * @param {object} options
+     * @param {string} [options.rootPassword]
+     * @param {string} [options.authorizedKeys]
+     * @param {string} [options.adminUsername]
+     * @memberof UnderpostKickStart
+     * @returns {string}
+     */
+    kickstartPreVariables: ({ rootPassword = '', authorizedKeys = '', adminUsername = '' }) => {
+      const sanitizedKeys = (authorizedKeys || '').trim();
+      return [
+        `ROOT_PASS='${rootPassword || ''}'`,
+        `AUTHORIZED_KEYS='${sanitizedKeys}'`,
+        `ADMIN_USER='${adminUsername || process.env.MAAS_ADMIN_USERNAME || 'maas'}'`,
+      ].join('\n');
+    },
+
+    /**
+     * @method kickstartFactory
+     * @description Generates a complete kickstart configuration by combining the header,
+     * variable assignments, and the rocky-kickstart.sh script body.
+     * @param {object} options
+     * @param {string} [options.lang='en_US.UTF-8']
+     * @param {string} [options.keyboard='us']
+     * @param {string} [options.timezone='America/New_York']
+     * @param {string} [options.rootPassword]
+     * @param {string} [options.authorizedKeys]
+     * @memberof UnderpostKickStart
+     * @returns {string}
+     */
+    kickstartFactory: ({
+      lang = 'en_US.UTF-8',
+      keyboard = 'us',
+      timezone = 'America/New_York',
+      rootPassword = process.env.MAAS_ADMIN_PASS,
+      authorizedKeys = '',
+    }) => {
+      const adminUsername = process.env.MAAS_ADMIN_USERNAME || 'maas';
+      const header = UnderpostKickStart.API.kickstartHeader({ lang, keyboard, timezone, rootPassword });
+      const variables = UnderpostKickStart.API.kickstartPreVariables({ rootPassword, authorizedKeys, adminUsername });
+
+      const scriptPath = path.resolve(__dirname, '../../scripts/rocky-kickstart.sh');
+      const scriptBody = fs.readFileSync(scriptPath, 'utf8');
+
+      return [
+        header,
+        '',
+        '%pre --interpreter=/bin/bash --log=/tmp/ks-pre.log --erroronfail',
+        '#!/bin/bash',
+        variables,
+        '',
+        scriptBody,
+        '%end',
+      ].join('\n');
+    },
+
+    /**
+     * @method kernelParamsFactory
+     * @description Appends kickstart-specific kernel parameters (inst.ks, inst.repo, inst.text, inst.sshd).
+     * @param {string} macAddress - The MAC address of the target machine.
+     * @param {array} cmd - The existing array of kernel parameters.
+     * @param {object} options - Options for generating kernel parameters.
+     * @param {string} options.ipDhcpServer - The IP address of the DHCP server.
+     * @param {number} [options.bootstrapHttpServerPort=8888] - Port for the bootstrap HTTP server.
+     * @param {string} options.hostname - The hostname of the target machine.
+     * @param {string} [options.architecture='amd64'] - The target architecture.
+     * @memberof UnderpostKickStart
+     * @returns {array}
+     */
+    kernelParamsFactory(
+      macAddress,
+      cmd = [],
+      options = { ipDhcpServer: '', bootstrapHttpServerPort: 8888, hostname: '', architecture: 'amd64' },
+    ) {
+      const { ipDhcpServer, bootstrapHttpServerPort, hostname, architecture } = options;
+      const repoArch = architecture && architecture.match('arm64') ? 'aarch64' : 'x86_64';
+      return cmd.concat([
+        `inst.ks=http://${ipDhcpServer}:${bootstrapHttpServerPort}/${hostname}/ks.cfg`,
+        `inst.repo=http://dl.rockylinux.org/pub/rocky/9/BaseOS/${repoArch}/os/`,
+        `inst.text`,
+        `inst.sshd`,
+      ]);
+    },
+
+    /**
+     * @method httpServerStaticFactory
+     * @description Writes kickstart ks.cfg file to the bootstrap HTTP server path.
+     * @param {object} params
+     * @param {string} params.bootstrapHttpServerPath
+     * @param {string} params.hostname
+     * @param {string} params.kickstartSrc
+     * @memberof UnderpostKickStart
+     * @returns {void}
+     */
+    httpServerStaticFactory({ bootstrapHttpServerPath, hostname, kickstartSrc }) {
+      if (!kickstartSrc) return;
+      const dest = `${bootstrapHttpServerPath}/${hostname}/ks.cfg`;
+      fs.writeFileSync(dest, kickstartSrc, 'utf8');
+      logger.info(`Kickstart file written to ${dest}`);
+    },
+  };
+}
+
+export default UnderpostKickStart;

package/src/cli/repository.js

@@ -88,10 +88,13 @@ class UnderpostRepository {
      * @param {boolean} [options.cached=false] - If true, commits only staged changes.
      * @param {number} [options.log=0] - If greater than 0, shows the last N commits with diffs.
      * @param {boolean} [options.lastMsg=0] - If greater than 0, copies or show the last last single n commit message to clipboard.
-     * @param {string} [options.msg=''] - If provided, outputs this message instead of committing.
      * @param {string} [options.deployId=''] - An optional deploy ID to include in the commit message.
      * @param {string} [options.hashes=''] - If provided with diff option, shows the diff between two hashes.
      * @param {string} [options.extension=''] - If provided with diff option, filters the diff by this file extension.
+     * @param {boolean|string} [options.changelog=undefined] - If true, prints the changelog since the last CI integration commit (starting with 'ci(package-pwa-microservices-'). If a number string, prints the changelog of the last N commits split by version sections. Only considers commits starting with '[<tag>]'.
+     * @param {boolean} [options.changelogBuild=false] - If true, scrapes all git history and builds a full CHANGELOG.md. Commits containing 'New release v:' are used as version section titles. Only commits starting with '[<tag>]' are included as entries.
+     * @param {string} [options.changelogMinVersion=''] - If set, overrides the default minimum version limit (2.85.0) for --changelog-build.
+     * @param {boolean} [options.changelogNoHash=false] - If true, omits commit hashes from the changelog entries.
      * @memberof UnderpostRepository
      */
     commit(
@@ -108,13 +111,169 @@ class UnderpostRepository {
         cached: false,
         lastMsg: 0,
         log: 0,
-        msg: '',
         deployId: '',
         hashes: '',
         extension: '',
+        changelog: undefined,
+        changelogBuild: false,
+        changelogMinVersion: '',
+        changelogNoHash: false,
       },
     ) {
       if (!repoPath) repoPath = '.';
+
+      if (options.changelog !== undefined || options.changelogBuild) {
+        const ciIntegrationPrefix = 'ci(package-pwa-microservices-';
+        const releaseMatch = 'New release v:';
+
+        // Helper: parse [<tag>] commits into grouped sections
+        const buildSectionChangelog = (commits) => {
+          const groups = {};
+          const tagOrder = [];
+          for (const commit of commits) {
+            if (!commit.message.startsWith('[')) continue;
+            const match = commit.message.match(/^\[([^\]]+)\]\s*(.*)/);
+            if (match) {
+              const tag = match[1].trim();
+              const context = match[2].trim().replaceAll('"', '');
+              if (!groups[tag]) {
+                groups[tag] = [];
+                tagOrder.push(tag);
+              }
+              groups[tag].push({ ...commit, context });
+            }
+          }
+          let out = '';
+          for (const tag of tagOrder) {
+            out += `### ${tag}\n\n`;
+            for (const entry of groups[tag]) {
+              out += `- ${entry.context}${options.changelogNoHash ? '' : ` (${commitUrl(entry.hash, entry.fullHash)})`}\n`;
+            }
+            out += '\n';
+          }
+          return out;
+        };
+
+        // Helper: fetch git log as structured array
+        const fetchHistory = (limit) => {
+          const limitArg = limit ? ` -n ${limit}` : '';
+          const rawLog = shellExec(`git log --pretty=format:"%h||%H||%s||%ci"${limitArg}`, {
+            stdout: true,
+            silent: true,
+            disableLog: true,
+          });
+          return rawLog
+            .split('\n')
+            .map((line) => {
+              const parts = line.split('||');
+              return {
+                hash: (parts[0] || '').trim(),
+                fullHash: (parts[1] || '').trim(),
+                message: parts[2] || '',
+                date: parts[3] || '',
+              };
+            })
+            .filter((c) => c.hash);
+        };
+
+        const githubUser = process.env.GITHUB_USERNAME || 'underpostnet';
+        const commitUrl = (shortHash, fullHash) =>
+          `[${shortHash}](https://github.com/${githubUser}/engine/commit/${fullHash})`;
+
+        // Helper: extract version from commit message containing 'New release v:'
+        const extractVersion = (message) => {
+          const idx = message.indexOf(releaseMatch);
+          if (idx === -1) return null;
+          return message.substring(idx + releaseMatch.length).trim();
+        };
+
+        // Helper: split commits array into version sections by 'New release v:' boundary
+        const buildVersionSections = (commits) => {
+          const sections = [];
+          let currentSection = { title: null, date: new Date().toISOString().split('T')[0], commits: [] };
+
+          for (const commit of commits) {
+            const version = extractVersion(commit.message);
+            if (version) {
+              // Push accumulated commits as a section
+              sections.push(currentSection);
+              // Start new version section; commits below this one belong to it
+              const commitDate = commit.date ? commit.date.split(' ')[0] : '';
+              currentSection = { title: `${releaseMatch}${version}`, date: commitDate, hash: commit.hash, commits: [] };
+            } else {
+              currentSection.commits.push(commit);
+            }
+          }
+          // Push the last (oldest) section
+          if (currentSection.commits.length > 0) sections.push(currentSection);
+          return sections;
+        };
+
+        // Helper: render sections array into changelog markdown string
+        const renderSections = (sections) => {
+          let changelog = '';
+          for (const section of sections) {
+            const sectionBody = buildSectionChangelog(section.commits);
+            if (!sectionBody) continue;
+            if (section.title) {
+              changelog += `## ${section.title}${options.changelogNoHash ? '' : ` (${section.date})`}\n\n`;
+            } else {
+              changelog += `## ${section.date}\n\n`;
+            }
+            changelog += sectionBody;
+          }
+          return changelog;
+        };
+
+        const changelogMinVersion = options.changelogMinVersion || '2.97.1';
+
+        if (options.changelogBuild) {
+          // --changelog-build: scrape ALL history, split by 'New release v:' commits as version sections
+          const allCommits = fetchHistory();
+          const sections = buildVersionSections(allCommits);
+
+          // Filter sections: stop at changelogMinVersion boundary
+          const limitedSections = [];
+          for (const section of sections) {
+            limitedSections.push(section);
+            if (section.title) {
+              const versionStr = section.title.replace(releaseMatch, '').trim();
+              if (versionStr === changelogMinVersion) break;
+            }
+          }
+
+          let changelog = renderSections(limitedSections);
+
+          if (!changelog) {
+            changelog = `No changelog entries found.\n`;
+          }
+
+          const changelogPath = `${repoPath === '.' ? '.' : repoPath}/CHANGELOG.md`;
+          fs.writeFileSync(changelogPath, `# Changelog\n\n${changelog}`);
+          logger.info('CHANGELOG.md built at', changelogPath);
+        } else {
+          // --changelog [latest-n]: print changelog of last N commits or since last release
+          const hasExplicitCount =
+            options.changelog !== undefined && options.changelog !== true && !isNaN(parseInt(options.changelog));
+          const scanLimit = hasExplicitCount ? parseInt(options.changelog) : 500;
+          const allCommits = fetchHistory(scanLimit);
+
+          let commits;
+          if (!hasExplicitCount) {
+            // No explicit count: find commits up to the last CI integration boundary
+            const ciIndex = allCommits.findIndex((c) => c.message.startsWith(ciIntegrationPrefix));
+            commits = ciIndex >= 0 ? allCommits.slice(0, ciIndex) : allCommits;
+          } else {
+            commits = allCommits;
+          }
+
+          const sections = buildVersionSections(commits);
+          let changelog = renderSections(sections);
+          console.log(changelog || `No changelog entries found.\n`);
+        }
+
+        return;
+      }
       if (options.diff && options.hashes) {
         const hashes = options.hashes.split(',');
         const cmd = `git --no-pager diff ${hashes[0]} ${hashes[1] ? hashes[1] : 'HEAD'}${options.extension ? ` -- '*.${options.extension}'` : ''}`;
@@ -123,16 +282,6 @@ class UnderpostRepository {
         } else console.log(cmd);
         return;
       }
-      if (options.msg) {
-        options.msg = options.msg.replaceAll('"', '').replaceAll(`'`, '').replaceAll('`', '');
-        let key = Object.keys(commitData).find((k) => k && options.msg.toLocaleLowerCase().slice(0, 16).match(k));
-        if (!key) key = Object.keys(commitData).find((k) => k && options.msg.toLocaleLowerCase().match(k));
-        if (!key || key === undefined) key = 'chore';
-        shellExec(
-          `underpost cmt ${repoPath} ${key} ${options.deployId ? options.deployId : `''`} '${options.msg.replaceAll(`${key}(${key}`, '')}'`,
-        );
-        return;
-      }
       if (options.lastMsg) {
         if (options.copy) {
           pbcopy(Underpost.repo.getLastCommitMsg(options.lastMsg - 1));
@@ -197,7 +346,11 @@ class UnderpostRepository {
      * @memberof UnderpostRepository
      */
     getLastCommitMsg(skip = 0) {
-      return shellExec(`git --no-pager log -1 --skip=${skip} --pretty=%B`, { stdout: true });
+      return shellExec(`git --no-pager log -1 --skip=${skip} --pretty=%B`, {
+        stdout: true,
+        silent: true,
+        disableLog: true,
+      });
     },
 
     /**