@ranger1/dx 0.1.36 → 0.1.37

package/@opencode/agents/gh-thread-reviewer.md

@@ -0,0 +1,105 @@
+---
+description: review (GitHub Harvest)
+mode: subagent
+model: openai/gpt-5.2
+temperature: 0.2
+tools:
+  write: true
+  edit: false
+  bash: true
+---
+
+# PR Reviewer (GitHub Harvest)
+
+Harvest all GitHub PR review feedback (humans + bots, including Copilot) and normalize into a standard `reviewFile`.
+
+## 输入（prompt 必须包含）
+
+- `PR #<number>`
+- `round: <number>`
+- `runId: <string>`（必须透传，禁止自行生成）
+- `contextFile: <filename>`
+
+## Cache 约定（强制）
+
+- 缓存目录固定为 `./.cache/`；交接一律传 `./.cache/<file>`（repo 相对路径），禁止 basename-only（如 `foo.md`）。
+
+## 输出（强制）
+
+只输出一行：
+
+`reviewFile: ./.cache/<file>.md`
+
+## reviewFile 格式（强制）
+
+```md
+# Review (GHR)
+
+PR: <PR_NUMBER>
+Round: <ROUND>
+
+## Summary
+
+P0: <n>
+P1: <n>
+P2: <n>
+P3: <n>
+
+## Findings
+
+- id: GHR-RC-2752827557
+  priority: P1
+  category: quality|performance|security|architecture
+  file: <path>
+  line: <number|null>
+  title: <short>
+  description: <single-line text>
+  suggestion: <single-line text>
+```
+
+## ID 规则（强制）
+
+- Inline 评审（discussion_r...）：`GHR-RC-<databaseId>`（databaseId 可映射到 `#discussion_r<databaseId>`）
+- PR Review 总评：`GHR-RV-<reviewId>`
+- PR 普通评论：`GHR-IC-<issueCommentId>`
+
+## 执行步骤（强制）
+
+1) Harvest（确定性）
+
+- 调用脚本生成 raw JSON：
+
+```bash
+python3 ~/.opencode/agents/gh_review_harvest.py \
+  --pr <PR_NUMBER> \
+  --round <ROUND> \
+  --run-id <RUN_ID>
+```
+
+- 脚本 stdout 会输出一行 JSON：`{"rawFile":"./.cache/...json"}`，从中取 `rawFile`。
+
+2) Normalize（LLM 分类）
+
+- 读取 `rawFile`（JSON）后，提取“建议/问题”并生成 findings：
+  - 覆盖 humans + bots（不做作者白名单）。
+  - 去噪：丢弃任何 body 中包含 `<!-- pr-review-loop-marker` 的内容。
+  - 忽略纯审批/无内容：如 `LGTM`、`Looks good`、`Approved` 等。
+  - 默认策略：
+    - `isResolved=true` 或 `isOutdated=true` 的 thread 在 harvest 阶段直接丢弃（不进入 rawFile，不消耗 LLM token）。
+  - 分类规则（大致）：
+    - P0: 明确安全漏洞/数据泄漏/资金损失/远程执行
+    - P1: 逻辑 bug/权限绕过/会导致线上错误
+    - P2: 潜在 bug/鲁棒性/边界条件/可维护性重大问题
+    - P3: 风格/命名/小优化/可选建议
+  - `category` 只能取：quality|performance|security|architecture
+
+3) 写入 reviewFile
+
+- 文件名固定：`./.cache/review-GHR-pr<PR_NUMBER>-r<ROUND>-<RUN_ID>.md`
+- 重要：`title/description/suggestion` 必须是单行；原文有换行时用 `\\n` 转义。
+
+## 禁止事项（强制）
+
+- ⛔ 不发布 GitHub 评论（不调用 `gh pr comment/review`）
+- ⛔ 不修改代码（只输出 reviewFile）
+- ⛔ 不生成/伪造 runId

package/@opencode/agents/gh_review_harvest.py

@@ -0,0 +1,269 @@
+#!/usr/bin/env python3
+
+# Deterministic GitHub PR review harvester.
+#
+# - Fetches inline review threads via GraphQL (reviewThreads) with pagination.
+# - Fetches PR reviews and PR issue comments via REST (gh api) with pagination.
+# - Writes a raw JSON file into project cache: ./.cache/
+# - Prints exactly one JSON object to stdout: {"rawFile":"./.cache/...json"}
+
+import argparse
+import json
+import os
+import subprocess
+import sys
+from datetime import datetime, timezone
+from pathlib import Path
+
+
+def _repo_root():
+    try:
+        p = subprocess.run(
+            ["git", "rev-parse", "--show-toplevel"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
+            text=True,
+        )
+        out = (p.stdout or "").strip()
+        if p.returncode == 0 and out:
+            return Path(out)
+    except Exception:
+        pass
+    return Path.cwd()
+
+
+def _cache_dir(repo_root):
+    return (repo_root / ".cache").resolve()
+
+
+def _repo_relpath(repo_root, p):
+    try:
+        rel = p.resolve().relative_to(repo_root.resolve())
+        return "./" + rel.as_posix()
+    except Exception:
+        return os.path.basename(str(p))
+
+
+REPO_ROOT = _repo_root()
+CACHE_DIR = _cache_dir(REPO_ROOT)
+
+
+def _json_out(obj):
+    sys.stdout.write(json.dumps(obj, ensure_ascii=True))
+    sys.stdout.write("\n")
+
+
+def _run_capture(cmd):
+    try:
+        p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        return p.returncode, p.stdout, p.stderr
+    except FileNotFoundError as e:
+        return 127, "", str(e)
+
+
+def _require_gh_auth():
+    rc, out, err = _run_capture(["gh", "auth", "status"])
+    if rc == 127:
+        return False, "GH_CLI_NOT_FOUND", "gh not found in PATH"
+    if rc != 0:
+        detail = (err or out or "").strip()
+        if len(detail) > 4000:
+            detail = detail[-4000:]
+        return False, "GH_NOT_AUTHENTICATED", detail
+    return True, None, None
+
+
+def _resolve_owner_repo(explicit_repo):
+    if explicit_repo:
+        s = str(explicit_repo).strip()
+        if s and "/" in s:
+            return s
+    rc, out, _ = _run_capture(["gh", "repo", "view", "--json", "nameWithOwner", "--jq", ".nameWithOwner"])
+    owner_repo = out.strip() if rc == 0 else ""
+    return owner_repo or None
+
+
+def _gh_api_json(args):
+    rc, out, err = _run_capture(["gh", "api"] + args)
+    if rc != 0:
+        raise RuntimeError(f"GH_API_FAILED: {(err or out or '').strip()}")
+    try:
+        return json.loads(out or "null")
+    except Exception:
+        raise RuntimeError("GH_API_JSON_PARSE_FAILED")
+
+
+def _gh_api_graphql(query, variables):
+    cmd = ["gh", "api", "graphql", "-f", f"query={query}"]
+    for k, v in (variables or {}).items():
+        if isinstance(v, int):
+            cmd.extend(["-F", f"{k}={v}"])
+        elif v is None:
+            cmd.extend(["-f", f"{k}="])
+        else:
+            cmd.extend(["-f", f"{k}={v}"])
+
+    rc, out, err = _run_capture(cmd)
+    if rc != 0:
+        raise RuntimeError(f"GH_GRAPHQL_FAILED: {(err or out or '').strip()}")
+    try:
+        return json.loads(out or "null")
+    except Exception:
+        raise RuntimeError("GH_GRAPHQL_JSON_PARSE_FAILED")
+
+
+def _flatten_threads(gql_data):
+    threads = []
+    pr = (((gql_data or {}).get("data") or {}).get("repository") or {}).get("pullRequest") or {}
+    conn = pr.get("reviewThreads") or {}
+    nodes = conn.get("nodes") or []
+    for t in nodes:
+        is_resolved = bool((t or {}).get("isResolved"))
+        is_outdated = bool((t or {}).get("isOutdated"))
+        if is_resolved or is_outdated:
+            continue
+        comments_conn = (t or {}).get("comments") or {}
+        comments_nodes = comments_conn.get("nodes") or []
+        comments = []
+        for c in comments_nodes:
+            author = (c or {}).get("author") or {}
+            comments.append(
+                {
+                    "id": (c or {}).get("id"),
+                    "databaseId": (c or {}).get("databaseId"),
+                    "url": (c or {}).get("url"),
+                    "author": {
+                        "login": author.get("login"),
+                        "type": author.get("__typename"),
+                    },
+                    "body": (c or {}).get("body") or "",
+                    "bodyText": (c or {}).get("bodyText") or "",
+                    "createdAt": (c or {}).get("createdAt"),
+                    "updatedAt": (c or {}).get("updatedAt"),
+                }
+            )
+        threads.append(
+            {
+                "id": (t or {}).get("id"),
+                "isResolved": False,
+                "isOutdated": False,
+                "path": (t or {}).get("path"),
+                "line": (t or {}).get("line"),
+                "originalLine": (t or {}).get("originalLine"),
+                "startLine": (t or {}).get("startLine"),
+                "originalStartLine": (t or {}).get("originalStartLine"),
+                "comments": comments,
+            }
+        )
+
+    page_info = conn.get("pageInfo") or {}
+    return threads, {
+        "hasNextPage": bool(page_info.get("hasNextPage")),
+        "endCursor": page_info.get("endCursor"),
+    }
+
+
+def _fetch_all_review_threads(owner, repo, pr_number):
+    query = (
+        "query($owner:String!,$repo:String!,$prNumber:Int!,$after:String){"
+        "repository(owner:$owner,name:$repo){"
+        "pullRequest(number:$prNumber){"
+        "reviewThreads(first:100,after:$after){"
+        "pageInfo{hasNextPage endCursor}"
+        "nodes{"
+        "id isResolved isOutdated path line originalLine startLine originalStartLine "
+        "comments(first:100){nodes{"
+        "id databaseId url body bodyText createdAt updatedAt author{login __typename}"
+        "}}"
+        "}"
+        "}"
+        "}"
+        "}"
+        "}"
+    )
+
+    after = None
+    all_threads = []
+    while True:
+        data = _gh_api_graphql(query, {"owner": owner, "repo": repo, "prNumber": pr_number, "after": after})
+        threads, page = _flatten_threads(data)
+        all_threads.extend(threads)
+        if not page.get("hasNextPage"):
+            break
+        after = page.get("endCursor")
+        if not after:
+            break
+    return all_threads
+
+
+def main(argv):
+    class _ArgParser(argparse.ArgumentParser):
+        def error(self, message):
+            raise ValueError(message)
+
+    parser = _ArgParser(add_help=False)
+    parser.add_argument("--pr", type=int, required=True)
+    parser.add_argument("--round", type=int, default=1)
+    parser.add_argument("--run-id", required=True)
+    parser.add_argument("--repo")
+
+    try:
+        args = parser.parse_args(argv)
+    except ValueError:
+        _json_out({"error": "INVALID_ARGS"})
+        return 2
+
+    ok, code, detail = _require_gh_auth()
+    if not ok:
+        _json_out({"error": code, "detail": detail})
+        return 1
+
+    owner_repo = _resolve_owner_repo(args.repo)
+    if not owner_repo:
+        _json_out({"error": "REPO_NOT_FOUND"})
+        return 1
+    if "/" not in owner_repo:
+        _json_out({"error": "INVALID_REPO"})
+        return 1
+
+    owner, repo = owner_repo.split("/", 1)
+    pr_number = int(args.pr)
+    round_num = int(args.round)
+    run_id = str(args.run_id).strip()
+    if not run_id:
+        _json_out({"error": "MISSING_RUN_ID"})
+        return 1
+
+    CACHE_DIR.mkdir(parents=True, exist_ok=True)
+    raw_basename = f"gh-review-raw-pr{pr_number}-r{round_num}-{run_id}.json"
+    raw_path = CACHE_DIR / raw_basename
+
+    try:
+        threads = _fetch_all_review_threads(owner, repo, pr_number)
+
+        reviews = _gh_api_json([f"repos/{owner_repo}/pulls/{pr_number}/reviews", "--paginate"])
+        issue_comments = _gh_api_json([f"repos/{owner_repo}/issues/{pr_number}/comments", "--paginate"])
+
+        now = datetime.now(timezone.utc).isoformat()
+        payload = {
+            "repo": owner_repo,
+            "pr": pr_number,
+            "round": round_num,
+            "runId": run_id,
+            "generatedAt": now,
+            "reviewThreads": threads,
+            "reviews": reviews if isinstance(reviews, list) else [],
+            "issueComments": issue_comments if isinstance(issue_comments, list) else [],
+        }
+
+        raw_path.write_text(json.dumps(payload, ensure_ascii=True), encoding="utf-8", newline="\n")
+    except Exception as e:
+        _json_out({"error": "HARVEST_FAILED", "detail": str(e)[:800]})
+        return 1
+
+    _json_out({"rawFile": _repo_relpath(REPO_ROOT, raw_path)})
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main(sys.argv[1:]))

package/@opencode/agents/pr-review-aggregate.md

@@ -21,7 +21,7 @@ tools:
 - `round: <number>`
 - `runId: <string>`
 - `contextFile: <path>`（例如：`./.cache/pr-context-...md`）
-- `reviewFile: <path>`（三行，分别对应 CDX/CLD/GMN，例如：`./.cache/review-...md`）
+- `reviewFile: <path>`（多行，1+ 条；例如：`./.cache/review-...md`）
 
 ### 模式 B：发布修复评论（基于 fixReportFile）
 
@@ -53,7 +53,7 @@ runId: abcdef123456
 
 ## 重复分组（仅作为脚本入参）
 
-你需要基于 3 份 `reviewFile` 内容判断重复 finding 分组，生成**一行 JSON**（不要代码块、不要解释文字、不要换行）。
+你需要基于所有 `reviewFile` 内容判断重复 finding 分组，生成**一行 JSON**（不要代码块、不要解释文字、不要换行）。
 
 注意：这行 JSON **不是你的最终输出**，它只用于生成 `--duplicate-groups-b64` 传给脚本。
 

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

@@ -22,6 +22,7 @@ agent: sisyphus
 - `codex-reviewer`
 - `claude-reviewer`
 - `gemini-reviewer`
+- `gh-thread-reviewer`
 - `pr-review-aggregate`
 - `pr-fix`
 
@@ -57,9 +58,9 @@ agent: sisyphus
 - 取出：`contextFile`、`runId`、`headOid`（如有）
 - **CRITICAL**: 必须等待此 Task 成功完成并获取到 `contextFile` 后，才能进入 Step 2
 
-2. Task（并行）: `codex-reviewer` + `claude-reviewer` + `gemini-reviewer` **（依赖 Step 1 的 contextFile）**
+2. Task（并行）: `codex-reviewer` + `claude-reviewer` + `gemini-reviewer` + `gh-thread-reviewer` **（依赖 Step 1 的 contextFile）**
 
-- **DEPENDENCY**: 这三个 reviewers 依赖 Step 1 返回的 `contextFile`，因此**必须等 Step 1 完成后才能并行启动**
+- **DEPENDENCY**: 这些 reviewers 依赖 Step 1 返回的 `contextFile`，因此**必须等 Step 1 完成后才能并行启动**
 - 每个 reviewer prompt 必须包含：
   - `PR #{{PR_NUMBER}}`
   - `round: <ROUND>`
@@ -74,7 +75,7 @@ agent: sisyphus
 
 3. Task: `pr-review-aggregate`
 
-- prompt 必须包含：`PR #{{PR_NUMBER}}`、`round: <ROUND>`、`runId: <RUN_ID>`、`contextFile: ./.cache/<file>.md`、三条 `reviewFile: ./.cache/<file>.md`
+- prompt 必须包含：`PR #{{PR_NUMBER}}`、`round: <ROUND>`、`runId: <RUN_ID>`、`contextFile: ./.cache/<file>.md`、以及 1+ 条 `reviewFile: ./.cache/<file>.md`
 - 输出：`{"stop":true}` 或 `{"stop":false,"fixFile":"..."}`
 - 若 `stop=true`：本轮结束并退出循环
 - **唯一性约束**: 每轮只能发布一次 Review Summary；脚本内置幂等检查，重复调用不会重复发布

package/package.json

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