From 6606d4f735d3d62d5fb8971430f6d9b3395ab45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pasik?= <pawel.pasik@speednet.pl>
Date: Thu, 23 Apr 2026 14:57:28 +0200
Subject: [PATCH] Add support for --commit-message option in push:artifact

---
 src/Command/Push/PushArtifactCommand.php | 42 +++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/Command/Push/PushArtifactCommand.php b/src/Command/Push/PushArtifactCommand.php
index 858240fae..0bb52a113 100644
--- a/src/Command/Push/PushArtifactCommand.php
+++ b/src/Command/Push/PushArtifactCommand.php
@@ -49,6 +49,12 @@ protected function configure(): void
             ->addOption('dry-run', null, InputOption::VALUE_NONE, 'Deprecated: Use no-push instead')
             ->addOption('no-push', null, InputOption::VALUE_NONE, 'Do not push changes to Acquia Cloud')
             ->addOption('no-commit', null, InputOption::VALUE_NONE, 'Do not commit changes. Implies no-push')
+            ->addOption(
+                'commit-message',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Custom commit message for artifact commit'
+            )
             ->addOption('no-clone', null, InputOption::VALUE_NONE, 'Do not clone repository. Implies no-commit and no-push')
             ->addOption('destination-git-urls', 'u', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'The URL of your git repository to which the artifact branch will be pushed. Use multiple times for multiple URLs.')
             ->addOption('destination-git-branch', 'b', InputOption::VALUE_REQUIRED, 'The destination branch to push the artifact to')
@@ -385,13 +391,47 @@ private function commit(Closure $outputCallback, string $artifactDir, string $co
 
     private function generateCommitMessage(string $commitHash): array|string
     {
+        // CLI option.
+        if ($option = $this->input->getOption('commit-message')) {
+            $this->logger->debug('Using custom commit message from --commit-message option.');
+            return $this->sanitizeCommitMessage($option, $commitHash);
+        }
+
+        // ENV fallback.
         if ($envVar = getenv('ACLI_PUSH_ARTIFACT_COMMIT_MSG')) {
-            return $envVar;
+            $this->logger->debug('Using commit message from ACLI_PUSH_ARTIFACT_COMMIT_MSG env var.');
+            return $this->sanitizeCommitMessage($envVar, $commitHash);
         }
 
+        // Default behavior.
         return "Automated commit by Acquia CLI (source commit: $commitHash)";
     }
 
+    /**
+     * Sanitize commit message.
+     */
+    private function sanitizeCommitMessage(string $message, string $commitHash): string
+    {
+        // Remove control characters (security / log safety).
+        $message = preg_replace('/[\x00-\x1F\x7F]/u', '', $message);
+
+        // Keep only first line (git subject best practice).
+        $message = strtok($message, "\n");
+
+        // Trim whitespace.
+        $message = trim($message);
+
+        // Limit length (avoid abuse / log issues).
+        $message = mb_substr($message, 0, 255);
+
+        // Fallback if empty after sanitization.
+        if ($message === '') {
+            return "Automated commit by Acquia CLI (source commit: $commitHash)";
+        }
+
+        return $message;
+    }
+
     /**
      * Push the artifact.
      */