@ranger1/dx 0.1.35 → 0.1.36

package/@opencode/agents/pr_review_aggregate.py

@@ -318,13 +318,66 @@ def _counts(findings):
     return c
 
 
-def _post_pr_comment(pr_number, body_ref):
+def _check_existing_comment(pr_number, run_id, round_num, comment_type):
+    """
+    Check if a comment with same runId/round/type already exists.
+    Returns True if duplicate exists (should skip posting).
+    
+    comment_type: "review-summary" or "fix-report" or "final-report"
+    """
+    try:
+        result = subprocess.run(
+            ["gh", "api", f"repos/:owner/:repo/issues/{pr_number}/comments", "--paginate"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
+            text=True,
+        )
+        if result.returncode != 0:
+            return False
+        
+        comments = json.loads(result.stdout or "[]")
+        
+        if comment_type == "review-summary":
+            type_header = f"## Review Summary (Round {round_num})"
+        elif comment_type == "fix-report":
+            type_header = f"## Fix Report (Round {round_num})"
+        elif comment_type == "final-report":
+            type_header = "## Final Report"
+        else:
+            return False
+        
+        run_id_pattern = f"RunId: {run_id}"
+        
+        for comment in comments:
+            body = comment.get("body", "")
+            if MARKER in body and type_header in body and run_id_pattern in body:
+                return True
+        
+        return False
+    except Exception:
+        return False
+
+
+def _post_pr_comment(pr_number, body_ref, run_id=None, round_num=None, comment_type=None):
+    """
+    Post a PR comment with idempotency check.
+    
+    If run_id, round_num, and comment_type are provided, checks for existing
+    duplicate before posting and skips if already posted.
+    
+    Returns: True if posted successfully or skipped (idempotent), False on error
+    """
     if isinstance(body_ref, Path):
         p = body_ref
     else:
         p = _resolve_ref(REPO_ROOT, CACHE_DIR, body_ref)
     if not p:
         return False
+    
+    if run_id and round_num and comment_type:
+        if _check_existing_comment(pr_number, run_id, round_num, comment_type):
+            return True
+    
     body_path = str(p)
     rc = subprocess.run(
         ["gh", "pr", "comment", str(pr_number), "--body-file", body_path],
@@ -397,6 +450,32 @@ def _render_mode_b_comment(pr_number, round_num, run_id, fix_report_md):
     return "\n".join(body)
 
 
+def _render_final_comment(pr_number, round_num, run_id, status):
+    lines = []
+    lines.append(MARKER)
+    lines.append("")
+    lines.append("## Final Report")
+    lines.append("")
+    lines.append(f"- PR: #{pr_number}")
+    lines.append(f"- Total Rounds: {round_num}")
+    lines.append(f"- RunId: {run_id}")
+    lines.append("")
+    
+    if status == "RESOLVED":
+        lines.append("### Status: ✅ All issues resolved")
+        lines.append("")
+        lines.append("All P0/P1/P2 issues from the automated review have been addressed.")
+        lines.append("The PR is ready for human review and merge.")
+    else:
+        lines.append("### Status: ⚠️ Max rounds reached")
+        lines.append("")
+        lines.append("The automated review loop has completed the maximum number of rounds (3).")
+        lines.append("Some issues may still remain. Please review the PR comments above for details.")
+    
+    lines.append("")
+    return "\n".join(lines)
+
+
 def main(argv):
     class _ArgParser(argparse.ArgumentParser):
         def error(self, message):
@@ -409,6 +488,7 @@ def main(argv):
     parser.add_argument("--context-file")
     parser.add_argument("--review-file", action="append", default=[])
     parser.add_argument("--fix-report-file")
+    parser.add_argument("--final-report")
     parser.add_argument("--duplicate-groups-json")
     parser.add_argument("--duplicate-groups-b64")
 
@@ -422,6 +502,7 @@ def main(argv):
     round_num = args.round
     run_id = str(args.run_id)
 
+    final_report = (args.final_report or "").strip() or None
     fix_report_file = (args.fix_report_file or "").strip() or None
     context_file = (args.context_file or "").strip() or None
     review_files = []
@@ -430,6 +511,17 @@ def main(argv):
         if s:
             review_files.append(s)
 
+    if final_report:
+        body = _render_final_comment(pr_number, round_num, run_id, final_report)
+        body_basename = f"review-aggregate-final-pr{pr_number}-{run_id}.md"
+        body_ref = _repo_relpath(REPO_ROOT, CACHE_DIR / body_basename)
+        _write_cache_text(body_ref, body)
+        if not _post_pr_comment(pr_number, body_ref, run_id=run_id, round_num=round_num, comment_type="final-report"):
+            _json_out({"error": "GH_PR_COMMENT_FAILED"})
+            return 1
+        _json_out({"ok": True, "final": True})
+        return 0
+
     if fix_report_file:
         fix_p = _resolve_ref(REPO_ROOT, CACHE_DIR, fix_report_file)
         if not fix_p or not fix_p.exists():
@@ -440,7 +532,7 @@ def main(argv):
         body_basename = f"review-aggregate-fix-comment-pr{pr_number}-r{round_num}-{run_id}.md"
         body_ref = _repo_relpath(REPO_ROOT, CACHE_DIR / body_basename)
         _write_cache_text(body_ref, body)
-        if not _post_pr_comment(pr_number, body_ref):
+        if not _post_pr_comment(pr_number, body_ref, run_id=run_id, round_num=round_num, comment_type="fix-report"):
             _json_out({"error": "GH_PR_COMMENT_FAILED"})
             return 1
         _json_out({"ok": True})
@@ -488,7 +580,7 @@ def main(argv):
     body_basename = f"review-aggregate-comment-pr{pr_number}-r{round_num}-{run_id}.md"
     body_ref = _repo_relpath(REPO_ROOT, CACHE_DIR / body_basename)
     _write_cache_text(body_ref, body)
-    if not _post_pr_comment(pr_number, body_ref):
+    if not _post_pr_comment(pr_number, body_ref, run_id=run_id, round_num=round_num, comment_type="review-summary"):
         _json_out({"error": "GH_PR_COMMENT_FAILED"})
         return 1
 

package/@opencode/commands/pr-review-loop.md

@@ -41,6 +41,13 @@ agent: sisyphus
 
 ## 循环（最多 3 轮）
 
+**⚠️ 严格串行执行要求（Critical）**:
+
+- 每个 Step 必须完成（收到返回值）后才能开始下一个 Step
+- **禁止任何步骤并行执行**（除了 Step 2 的三个 reviewer 可并行）
+- 如果任何步骤失败或超时，必须立即终止当前轮次，不能跳过或重试
+- 每个步骤的 Task 调用必须 await 返回结果，不能 fire-and-forget
+
 每轮按顺序执行：
 
 1. Task: `pr-context` **（必须先完成，不可与 Step 2 并行）**
@@ -70,6 +77,7 @@ agent: sisyphus
 - prompt 必须包含：`PR #{{PR_NUMBER}}`、`round: <ROUND>`、`runId: <RUN_ID>`、`contextFile: ./.cache/<file>.md`、三条 `reviewFile: ./.cache/<file>.md`
 - 输出：`{"stop":true}` 或 `{"stop":false,"fixFile":"..."}`
 - 若 `stop=true`：本轮结束并退出循环
+- **唯一性约束**: 每轮只能发布一次 Review Summary；脚本内置幂等检查，重复调用不会重复发布
 
 4. Task: `pr-fix`
 
@@ -86,7 +94,49 @@ agent: sisyphus
 
 - prompt 必须包含：`PR #{{PR_NUMBER}}`、`round: <ROUND>`、`runId: <RUN_ID>`、`fixReportFile: ./.cache/<file>.md`
 - 输出：`{"ok":true}`
+- **唯一性约束**: 每轮只能发布一次 Fix Report；脚本内置幂等检查，重复调用不会重复发布
 
 6. 下一轮
 
 - 回到 1（进入下一轮 reviewers）
+
+
+## 终止与收尾（强制）
+
+循环结束时，必须发布一个最终评论到 PR，格式如下：
+
+### 情况 A: 所有问题已解决（stop=true）
+
+当 Step 3 返回 `{"stop":true}` 时，调用 `pr-review-aggregate` 发布收尾评论：
+
+- prompt 必须包含：
+  - `PR #{{PR_NUMBER}}`
+  - `round: <ROUND>`
+  - `runId: <RUN_ID>`
+  - `--final-report "RESOLVED"`（新增参数，表示所有问题已解决）
+
+### 情况 B: 达到最大轮次（3 轮后仍有问题）
+
+当循环完成 3 轮后仍未 stop，调用 `pr-review-aggregate` 发布收尾评论：
+
+- prompt 必须包含：
+  - `PR #{{PR_NUMBER}}`
+  - `round: 3`
+  - `runId: <RUN_ID>`
+  - `--final-report "MAX_ROUNDS_REACHED"`（新增参数，表示达到最大轮次）
+
+### 最终评论格式（由脚本生成）
+
+```markdown
+<!-- pr-review-loop-marker -->
+
+## Final Report
+
+- PR: #<PR_NUMBER>
+- Total Rounds: <N>
+- Status: ✅ All issues resolved / ⚠️ Max rounds reached (some issues may remain)
+
+### Summary
+
+[自动生成的总结]
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ranger1/dx",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "type": "module",
   "license": "MIT",
   "repository": {