fix: update commit message formatting to improve output clarity and consistency

Author: shenxianpeng

main.py

@@ -10,7 +10,7 @@
 SUCCESS_TITLE = "# Commit-Check ✔️"
 FAILURE_TITLE = "# Commit-Check ❌"
 COMMIT_MESSAGE_DELIMITER = "\x00"
-COMMIT_SECTION_SEPARATOR = "\n" + ("-" * 72) + "\n"
+COMMIT_SECTION_SEPARATOR = "\n---\n"
 
 # Environment variables
 MESSAGE = os.getenv("MESSAGE", "false")
@@ -144,7 +144,8 @@ def run_check_command(
     if result.stdout:
         if output_prefix:
             result_file.write(output_prefix)
-        result_file.write(result.stdout)
+        result_file.write(result.stdout.rstrip("\n"))
+        result_file.write("\n")
     return result.returncode
 
 
@@ -154,30 +155,30 @@ def run_pr_message_checks(pr_messages: list[str], result_file: TextIO) -> int:
     Returns 1 if any message fails, 0 if all pass.
     """
     has_failure = False
+    emitted_failure_output = False
     total_messages = len(pr_messages)
     for index, msg in enumerate(pr_messages, start=1):
         subject = msg.splitlines()[0] if msg else "<empty commit message>"
         command_args = ["--message"]
-        if index > 1:
+        if emitted_failure_output:
             command_args.append("--no-banner")
 
-        output_prefix = f"\n--- Commit {index}/{total_messages}: {subject}\n"
-        if index > 1:
+        output_prefix = f"--- Commit {index}/{total_messages}: {subject}\n"
+        if emitted_failure_output:
             output_prefix = (
                 f"{COMMIT_SECTION_SEPARATOR}"
                 f"--- Commit {index}/{total_messages}: {subject}\n"
             )
 
-        has_failure = (
-            run_check_command(
-                command_args,
-                result_file,
-                input_text=msg,
-                output_prefix=output_prefix,
-            )
-            != 0
-            or has_failure
+        return_code = run_check_command(
+            command_args,
+            result_file,
+            input_text=msg,
+            output_prefix=output_prefix,
         )
+        if return_code != 0:
+            has_failure = True
+            emitted_failure_output = True
     return 1 if has_failure else 0
 
 

main_test.py

@@ -126,38 +126,52 @@ def test_empty_list(self):
         self.assertEqual(rc, 0)
         mock_run.assert_not_called()
 
-    def test_second_and_later_messages_use_no_banner(self):
+    def test_first_failure_keeps_banner_and_later_failures_use_no_banner(self):
         results = [
+            MagicMock(returncode=0, stdout=""),
             MagicMock(returncode=1, stdout="Commit rejected.\n"),
             MagicMock(returncode=1, stdout="Type subject_imperative check failed\n"),
         ]
         with patch("main.subprocess.run", side_effect=results) as mock_run:
-            main.run_pr_message_checks(["bad first", "bad second"], io.StringIO())
+            main.run_pr_message_checks(["ok first", "bad second", "bad third"], io.StringIO())
 
         self.assertEqual(
             mock_run.call_args_list[0][0][0], ["commit-check", "--message"]
         )
         self.assertEqual(
             mock_run.call_args_list[1][0][0],
+            ["commit-check", "--message"],
+        )
+        self.assertEqual(
+            mock_run.call_args_list[2][0][0],
             ["commit-check", "--message", "--no-banner"],
         )
 
-    def test_second_message_prefix_uses_separator(self):
+    def test_later_failure_prefix_uses_short_separator_without_extra_blank_lines(self):
         results = [
+            MagicMock(returncode=0, stdout=""),
             MagicMock(returncode=1, stdout="Commit rejected.\n"),
-            MagicMock(returncode=1, stdout="Type subject_imperative check failed\n"),
+            MagicMock(
+                returncode=1,
+                stdout=(
+                    "Type subject_imperative check failed ==> bad third\n"
+                    "Commit message should use imperative mood\n"
+                    "Suggest: Use imperative mood\n\n"
+                ),
+            ),
         ]
         result_file = io.StringIO()
         with patch("main.subprocess.run", side_effect=results):
-            main.run_pr_message_checks(["bad first", "bad second"], result_file)
+            main.run_pr_message_checks(["ok first", "bad second", "bad third"], result_file)
 
         output = result_file.getvalue()
-        self.assertIn("\n--- Commit 1/2: bad first\nCommit rejected.\n", output)
+        self.assertIn("--- Commit 2/3: bad second\nCommit rejected.\n", output)
         self.assertIn(
-            f"{main.COMMIT_SECTION_SEPARATOR}--- Commit 2/2: bad second\n",
+            f"{main.COMMIT_SECTION_SEPARATOR}--- Commit 3/3: bad third\n",
             output,
         )
-        self.assertIn("Type subject_imperative check failed\n", output)
+        self.assertNotIn("------------------------------------------------------------------------", output)
+        self.assertNotIn("\n\n\n", output)
 
 
 class TestRunOtherChecks(unittest.TestCase):