diff --git a/.forgejo/kcl-ci/main.k b/.forgejo/kcl-ci/main.k
index 6817622..3fe892b 100644
--- a/.forgejo/kcl-ci/main.k
+++ b/.forgejo/kcl-ci/main.k
@@ -160,9 +160,9 @@ _test_action_workflow = {
         "test-agent-mode" = {
             name = "Test Agent Mode on Forgejo"
             "runs-on" = "grunt"
-            # Skip when the PR was created by the claude bot (e.g. upstream-sync PRs).
-            # The self-trigger guard in actor.ts blocks actor=claude matching bot_name=claude[bot].
-            "if" = "github.actor != 'claude'"
+            # Skip claude bot on issue_comment/issues events (tag mode loop risk).
+            # Allow on pull_request events (e.g. upstream-sync PRs) — no loop risk there.
+            "if" = "github.actor != 'claude' || github.event_name == 'pull_request'"
             steps = [
                 checkout_mod.checkout()
                 {
diff --git a/.forgejo/workflows/test-action.yml b/.forgejo/workflows/test-action.yml
index 495fccd..513cde6 100644
--- a/.forgejo/workflows/test-action.yml
+++ b/.forgejo/workflows/test-action.yml
@@ -23,7 +23,7 @@ jobs:
   test-agent-mode:
     name: Test Agent Mode on Forgejo
     runs-on: grunt
-    if: github.actor != 'claude'
+    if: github.actor != 'claude' || github.event_name == 'pull_request'
     steps:
     - name: Checkout
       uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2