fix: dedupe mention footer and reduce duplicate dispatch triggers

Author: gqy20

.github/workflows/dispatch_agents.yml

@@ -16,13 +16,15 @@ jobs:
     if: |
       (github.event_name == 'issue_comment' &&
        github.event.issue.state == 'open' &&
+       github.event.comment.user.type != 'Bot' &&
+       !contains(fromJson('["moderator","reviewer_a","reviewer_b","summarizer","observer","pubmed_observer","arxiv_observer","video_manim"]'), github.event.comment.user.login) &&
        !contains(github.event.comment.body, '[Agent:') &&
        (contains(github.event.comment.body, '相关人员:') || contains(github.event.comment.body, '协作请求:'))) ||
       (github.event_name == 'issues' &&
        github.event.issue.state == 'open' &&
        (contains(github.event.issue.body, '相关人员:') || contains(github.event.issue.body, '协作请求:')))
     runs-on: ubuntu-latest
-    # 允许 Agent 回复中的 @mention 触发分发
+    # 仅处理用户触发的受控 @mention；系统 agent 由 orchestrator 处理
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/orchestrator.yml

@@ -83,6 +83,8 @@ jobs:
     if: |
       github.event_name == 'issue_comment' &&
       github.event.issue.state == 'open' &&
+      github.event.comment.user.type != 'Bot' &&
+      !contains(fromJson('["moderator","reviewer_a","reviewer_b","summarizer","observer","pubmed_observer","arxiv_observer","video_manim"]'), github.event.comment.user.login) &&
       !contains(github.event.comment.body, '[Agent:') &&
       (contains(github.event.comment.body, '相关人员:') || contains(github.event.comment.body, '协作请求:'))
     runs-on: ubuntu-latest

src/issuelab/cli/dispatch.py

@@ -366,7 +366,15 @@ def dispatch_mentions(
         print("Info: No matching agents found")
         return {"success_count": 0, "total_count": 0, "local_agents": [], "failed_agents": []}
 
-    print(f"Matched {len(matched_configs)} agents")
+    matched_all_count = len(matched_configs)
+    matched_configs = [cfg for cfg in matched_configs if str(cfg.get("agent_type", "")).lower() != "system"]
+    skipped_system_count = matched_all_count - len(matched_configs)
+    if skipped_system_count > 0:
+        print(f"Info: Skipped {skipped_system_count} system agent(s); handled by orchestrator workflow")
+    if not matched_configs:
+        return {"success_count": 0, "total_count": 0, "local_agents": [], "failed_agents": []}
+
+    print(f"Matched {len(matched_configs)} user agents")
 
     client_payload: dict[str, Any] = {
         "source_repo": source_repo,

src/issuelab/tools/github.py

@@ -2,6 +2,7 @@
 
 import json
 import os
+import re
 import subprocess
 import tempfile
 from typing import Literal
@@ -14,6 +15,11 @@
 
 # GitHub 评论最大长度
 MAX_COMMENT_LENGTH = 10000
+_CONTROLLED_FOOTER_RE = re.compile(
+    r"(?:\n{1,3}(?:---\s*\n)?(?:\s*相关人员:\s*(?:@[a-zA-Z0-9_](?:[a-zA-Z0-9_-]*[a-zA-Z0-9_])?\s*)+"
+    r"|\s*协作请求:\s*(?:\n\s*-\s*@.*)+)\s*)\Z",
+    re.MULTILINE,
+)
 
 
 def _load_mentions_max_count() -> int:
@@ -188,8 +194,10 @@ def post_comment(
     if mentions:
         from issuelab.mention_policy import build_mention_section
 
+        # 避免重复追加：如果正文尾部已有受控区，先移除再注入过滤后的单一受控区。
+        body_no_footer = _CONTROLLED_FOOTER_RE.sub("", body.rstrip())
         mention_section = build_mention_section(mentions, format_type="labeled")
-        final_body = f"{body}\n\n{mention_section}"
+        final_body = f"{body_no_footer}\n\n{mention_section}"
     else:
         final_body = body
 

src/issuelab/utils/mentions.py

@@ -23,43 +23,44 @@ def extract_github_mentions(text: str | None) -> list[str]:
 
 
 def extract_controlled_mentions(text: str | None) -> list[str]:
-    """Extract mentions only from controlled collaboration sections.
-
-    Supported formats:
-    - `相关人员: @alice @bob`
-    - `协作请求:` followed by bullet lines like `- @alice`
-    """
+    """Extract mentions only from the trailing controlled collaboration section."""
     if not text:
         return []
 
+    lines = text.splitlines()
+    if not lines:
+        return []
+
+    end = len(lines) - 1
+    while end >= 0 and not lines[end].strip():
+        end -= 1
+    if end < 0:
+        return []
+
     result: list[str] = []
     seen: set[str] = set()
-    in_list_section = False
 
-    for raw_line in text.splitlines():
-        line = raw_line.strip()
+    # Case 1: 文末为单行 "相关人员: @a @b"
+    tail = lines[end].strip()
+    if "相关人员:" in tail:
+        suffix = tail.split("相关人员:", 1)[1]
+        for username in extract_github_mentions(suffix):
+            if username not in seen:
+                seen.add(username)
+                result.append(username)
+        return result
 
-        if "相关人员:" in line:
-            suffix = line.split("相关人员:", 1)[1]
-            for username in extract_github_mentions(suffix):
+    # Case 2: 文末为列表形式
+    list_lines: list[str] = []
+    idx = end
+    while idx >= 0 and re.match(r"^\s*-\s+@", lines[idx]):
+        list_lines.append(lines[idx])
+        idx -= 1
+
+    if list_lines and idx >= 0 and lines[idx].strip().startswith("协作请求:"):
+        for line in reversed(list_lines):
+            for username in extract_github_mentions(line):
                 if username not in seen:
                     seen.add(username)
                     result.append(username)
-            in_list_section = False
-            continue
-
-        if line.startswith("协作请求:"):
-            in_list_section = True
-            continue
-
-        if in_list_section:
-            if re.match(r"^\s*-\s+@", raw_line):
-                for username in extract_github_mentions(raw_line):
-                    if username not in seen:
-                        seen.add(username)
-                        result.append(username)
-                continue
-            if line and not line.startswith("-"):
-                in_list_section = False
-
     return result

tests/test_cli.py

@@ -92,6 +92,20 @@ def test_controlled_section_list_format(self):
         mentions = parse_github_mentions(text, controlled_section_only=True)
         assert mentions == ["alice", "bob"]
 
+    def test_controlled_section_only_reads_trailing_block(self):
+        """Ignore historical mentions in body, read only trailing controlled block."""
+        text = """
+        历史记录：
+        相关人员: @old_agent
+
+        正文继续...
+
+        ---
+        相关人员: @alice @bob
+        """
+        mentions = parse_github_mentions(text, controlled_section_only=True)
+        assert mentions == ["alice", "bob"]
+
 
 class TestMentionsCLI:
     """Tests for mentions CLI."""
@@ -276,6 +290,40 @@ def test_match_triggers(self):
         assert len(matched) == 1
         assert matched[0]["owner"] == "carol"
 
+    def test_dispatch_mentions_skips_system_agents(self, monkeypatch):
+        """System agents should be ignored by dispatch workflow."""
+        from issuelab.cli.dispatch import dispatch_mentions
+
+        monkeypatch.setattr(
+            "issuelab.cli.dispatch.load_registry",
+            lambda _agents_dir: {
+                "moderator": {
+                    "owner": "moderator",
+                    "repository": "gqy20/IssueLab",
+                    "agent_type": "system",
+                },
+                "alice": {
+                    "owner": "alice",
+                    "repository": "gqy20/IssueLab",
+                    "agent_type": "user",
+                },
+            },
+        )
+
+        summary = dispatch_mentions(
+            mentions=["moderator", "alice"],
+            agents_dir="agents",
+            source_repo="gqy20/IssueLab",
+            issue_number=1,
+            dry_run=True,
+            app_id="fake_app_id",
+            app_private_key="fake_private_key",
+        )
+
+        assert summary["total_count"] == 1
+        assert summary["success_count"] == 1
+        assert summary["local_agents"] == ["alice"]
+
 
 class TestDispatchCLI:
     """Tests for dispatch CLI mention parsing."""

tests/test_github.py

@@ -87,6 +87,30 @@ def fake_run(cmd, capture_output, text, env):
     assert content.strip().splitlines()[-1] == "相关人员: @a1 @a2 @a3"
 
 
+def test_post_comment_replaces_existing_controlled_footer(monkeypatch):
+    body = "分析正文\n\n---\n相关人员: @legacy1 @legacy2"
+    captured = {}
+
+    def fake_run(cmd, capture_output, text, env):
+        captured["cmd"] = cmd
+        return MagicMock(returncode=0)
+
+    monkeypatch.setattr("issuelab.tools.github.subprocess.run", fake_run)
+    monkeypatch.setattr("issuelab.tools.github.os.unlink", lambda _path: None)
+    monkeypatch.setattr(
+        "issuelab.mention_policy.filter_mentions", lambda mentions, policy=None, issue_number=None: (mentions, [])
+    )
+
+    result = post_comment(1, body, mentions=["alice"])
+    assert result is True
+
+    cmd = captured.get("cmd", [])
+    body_path = cmd[cmd.index("--body-file") + 1]
+    content = Path(body_path).read_text(encoding="utf-8")
+    assert content.count("相关人员:") == 1
+    assert content.strip().splitlines()[-1] == "相关人员: @alice"
+
+
 def test_post_comment_keeps_original_body_without_normalize(monkeypatch):
     body = """[Agent: reviewer_a]