DEVX-127: fix: fall back to CI token when reviewer self-approval is rejected

src/devx/ci/pr_review.py

@@ -22,6 +22,7 @@ Usage:
 
 from __future__ import annotations
 
+import os
 import re
 from dataclasses import dataclass, field
 from typing import Any
@@ -548,8 +549,14 @@ def _post_manual_review(
     checklist_confirmed: bool,
     checklist_categories: str | None,
     dry_run: bool,
+    owner: str | None = None,
+    repo_name: str | None = None,
 ) -> None:
-    """Post a manual review with validation for APPROVE events."""
+    """Post a manual review with validation for APPROVE events.
+
+    When self-approval is rejected (reviewer token belongs to PR author),
+    falls back to the CI token (different user) if available.
+    """
     if not body or len(body) < 50:
         raise click.ClickException(_("Review body must be at least 50 characters."))
 
@@ -585,8 +592,20 @@ def _post_manual_review(
         review = client.create_review(pr_number, event=event, body=body)
     except APIError as e:
         if "approve" in e.message.lower() or "422" in str(e.status):
-            click.echo(_("Note: Self-approval not allowed. Posting COMMENT instead."))
-            review = client.create_review(pr_number, event="COMMENT", body=body)
+            # Self-approval not allowed (reviewer token belongs to PR author).
+            # Fall back to CI token (different user) if available.
+            ci_token = os.environ.get("CI_GITEA_API_TOKEN", "").strip()
+            if ci_token and owner and repo_name:
+                click.echo(_("Note: Self-approval not allowed with reviewer token. Retrying with CI token."))
+                ci_client = GiteaClient(GITEA_API_URL, ci_token, owner, repo_name)
+                try:
+                    review = ci_client.create_review(pr_number, event=event, body=body)
+                except APIError:
+                    click.echo(_("Note: CI token also cannot approve. Posting COMMENT instead."))
+                    review = client.create_review(pr_number, event="COMMENT", body=body)
+            else:
+                click.echo(_("Note: Self-approval not allowed. Posting COMMENT instead."))
+                review = client.create_review(pr_number, event="COMMENT", body=body)
         else:
             raise
     review_id = review.get("id", "?")
@@ -645,7 +664,17 @@ def main(
     client = GiteaClient(GITEA_API_URL, token, owner, repo_name)
 
     if event is not None:
-        _post_manual_review(client, pr_number, event.upper(), body, checklist_confirmed, checklist_categories, dry_run)
+        _post_manual_review(
+            client,
+            pr_number,
+            event.upper(),
+            body,
+            checklist_confirmed,
+            checklist_categories,
+            dry_run,
+            owner=owner,
+            repo_name=repo_name,
+        )
         return
 
     result = run_review(client, pr_number)

src/devx/translations.json

@@ -2104,12 +2104,28 @@
     "zh": "No workflow runs found for SHA {sha}."
   },
   "Note: Self-approval not allowed. Posting COMMENT instead.": {
-    "bg": "Note: Self-approval not allowed. Posting COMMENT instead.",
-    "de": "Note: Self-approval not allowed. Posting COMMENT instead.",
+    "bg": "Забележка: Само-одобрението не е разрешено. Публикуване на COMMENT вместо това.",
+    "de": "Hinweis: Selbstgenehmigung nicht erlaubt. COMMENT wird stattdessen gesendet.",
     "en": "Note: Self-approval not allowed. Posting COMMENT instead.",
     "pl": "Uwaga: Samo-zatwierdzenie niedozwolone. Publikowanie COMMENT zamiast tego.",
-    "ru": "Note: Self-approval not allowed. Posting COMMENT instead.",
-    "zh": "Note: Self-approval not allowed. Posting COMMENT instead."
+    "ru": "Примечание: Самоодобрение не разрешено. Публикация COMMENT вместо этого.",
+    "zh": "注意：不允许自我批准。改为发布 COMMENT。"
+  },
+  "Note: Self-approval not allowed with reviewer token. Retrying with CI token.": {
+    "bg": "Забележка: Само-одобрението не е разрешено с тоукън на рецензента. Повторен опит с CI тоукън.",
+    "de": "Hinweis: Selbstgenehmigung mit Reviewer-Token nicht erlaubt. Wiederholung mit CI-Token.",
+    "en": "Note: Self-approval not allowed with reviewer token. Retrying with CI token.",
+    "pl": "Uwaga: Samo-zatwierdzenie niedozwolone tokenem recenzenta. Ponawianie tokenem CI.",
+    "ru": "Примечание: Самоодобрение токеном ревьюера не разрешено. Повторная попытка с CI токеном.",
+    "zh": "注意：不允许使用审阅者令牌进行自我批准。正在使用 CI 令牌重试。"
+  },
+  "Note: CI token also cannot approve. Posting COMMENT instead.": {
+    "bg": "Забележка: CI тоукънът също не може да одобри. Публикуване на COMMENT вместо това.",
+    "de": "Hinweis: CI-Token kann ebenfalls nicht genehmigen. COMMENT wird stattdessen gesendet.",
+    "en": "Note: CI token also cannot approve. Posting COMMENT instead.",
+    "pl": "Uwaga: Token CI również nie może zatwierdzić. Publikowanie COMMENT zamiast tego.",
+    "ru": "Примечание: CI токен также не может одобрить. Публикация COMMENT вместо этого.",
+    "zh": "注意：CI 令牌也无法批准。改为发布 COMMENT。"
   },
   "Nothing to push.": {
     "bg": "Nothing to push.",