fix(cli): make --version and --report take precedence over subcommands

Top-level meta flags like --version and --report now take priority even
when a subcommand is also provided (e.g., cz --version bump shows the
version instead of running bump). The --report flag correctly defers to
the version subcommand when used as cz version --report.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: bearomorphism

commitizen/cli.py

@@ -697,15 +697,19 @@ def main() -> None:
             raise NoCommandFoundError()
         raise e
 
+    if getattr(args, "version", False):
+        out.write(__version__)
+        raise ExpectedExit()
+
+    if getattr(args, "report", False) and (
+        not hasattr(args, "func") or args.func is not commands.Version
+    ):
+        out.write(f"Commitizen Version: {__version__}")
+        out.write(f"Python Version: {sys.version}")
+        out.write(f"Operating System: {platform.system()}")
+        raise ExpectedExit()
+
     if not hasattr(args, "func"):
-        if getattr(args, "version", False):
-            out.write(__version__)
-            raise ExpectedExit()
-        if getattr(args, "report", False):
-            out.write(f"Commitizen Version: {__version__}")
-            out.write(f"Python Version: {sys.version}")
-            out.write(f"Operating System: {platform.system()}")
-            raise ExpectedExit()
         raise NoCommandFoundError()
 
     arguments = vars(args)

tests/test_cli.py

@@ -72,6 +72,14 @@ def test_cz_with_version_short_arg(util: UtilFixture, capsys):
     assert __version__ in out
 
 
+def test_cz_version_flag_takes_precedence_over_subcommand(util: UtilFixture, capsys):
+    """Test that --version takes precedence even when a subcommand is given."""
+    with pytest.raises(ExpectedExit):
+        util.run_cli("--version", "bump")
+    out, _ = capsys.readouterr()
+    assert __version__ in out
+
+
 def test_cz_with_report_arg(util: UtilFixture, capsys):
     """Test that cz shows the report when --report is used."""
     with pytest.raises(ExpectedExit):
@@ -82,6 +90,14 @@ def test_cz_with_report_arg(util: UtilFixture, capsys):
     assert "Operating System:" in out
 
 
+def test_cz_report_flag_takes_precedence_over_subcommand(util: UtilFixture, capsys):
+    """Test that --report takes precedence over non-version subcommands."""
+    with pytest.raises(ExpectedExit):
+        util.run_cli("--report", "bump")
+    out, _ = capsys.readouterr()
+    assert "Commitizen Version:" in out
+
+
 def test_name(util: UtilFixture, capsys):
     util.run_cli("-n", "cz_jira", "example")
     out, _ = capsys.readouterr()