fix: 统一输出文件目录结构 - Closes #3

- 新增 PROJECT_OUTPUT (项目根/output/)，统一所有输出文件 - IR 中间产物 → output/ir/，最终交付物 → output/final/ - agent_poller.py 新增 pr-status/merge-pr/close-issue/lifecycle 命令 - DEV_AGENT.md 同步更新完整闭环流程 - 更新 conftest/test_sample 中的默认路径 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-31 14:38:37 +08:00
parent 9be264250a
commit 884848f15f
6 changed files with 219 additions and 54 deletions
@@ -1,10 +1,14 @@
-"""Helper for dev agent to interact with Gitea issues.
+"""Helper for dev agent to interact with Gitea issues and PRs.

 Usage:
    python scripts/agent_poller.py --action list
    python scripts/agent_poller.py --action get --issue 1
    python scripts/agent_poller.py --action comment --issue 1 --body "Working on this"
    python scripts/agent_poller.py --action create-pr --issue 1 --branch fix/issue-1
+    python scripts/agent_poller.py --action pr-status --pr 4
+    python scripts/agent_poller.py --action merge-pr --pr 4
+    python scripts/agent_poller.py --action close-issue --issue 2 --body "Done"
+    python scripts/agent_poller.py --action lifecycle --issue 2
 """

 import argparse
@@ -19,7 +23,6 @@ GITEA_REPO = os.environ.get("GITEA_REPO", "pzhang_zywl/document_analyzer")
 GITEA_TOKEN = os.environ.get("GITEA_API_TOKEN", "")

 BASE = f"{GITEA_URL}/api/v1/repos/{GITEA_REPO}"
-TARGET_LABELS = set()  # List all issues, Dev-Agent handles all non-test issues


 def _req(method, path, data=None):
@@ -37,6 +40,8 @@ def _req(method, path, data=None):
        sys.exit(1)


+# ── Issue operations ─────────────────────────────────────────────────────────
+
 def list_issues():
    issues = _req("GET", "/issues?state=open")
    if not issues:
@@ -65,26 +70,127 @@ def comment_issue(num, body):
    return i


-def create_pr(issue_num, branch):
-    # Get issue title for PR description
+def close_issue(num, body=None):
+    """Close an issue, optionally with a final comment."""
+    if body:
+        comment_issue(num, body)
+    i = _req("PATCH", f"/issues/{num}", {"state": "closed"})
+    print(f"Issue #{num} closed")
+    return i
+
+
+# ── PR operations ────────────────────────────────────────────────────────────
+
+def create_pr(issue_num, branch, body=None):
+    """Create a PR for the given issue and branch."""
    issue = _req("GET", f"/issues/{issue_num}")
-    title = f"Fix #{issue_num}: {issue['title'].replace('CI Failure: ', '')}"
-    body = f"Closes #{issue_num}\n\n{issue.get('body', '')}\n\n🤖 Generated by dev agent"
+    title = f"fix: {issue['title']} - Closes #{issue_num}"
+    if body is None:
+        body = f"Closes #{issue_num}\n\n{issue.get('body', '')}\n\n🤖 Generated by dev agent"
    pr = _req("POST", "/pulls", {
        "title": title,
        "head": branch,
        "base": "main",
        "body": body,
    })
-    print(f"PR created: {pr.get('html_url', pr.get('url', ''))}")
+    pr_url = pr.get('html_url', pr.get('url', ''))
+    print(f"PR created: {pr_url}")
    return pr


+def pr_status(pr_num):
+    """Check PR state and CI status."""
+    pr = _req("GET", f"/pulls/{pr_num}")
+    print(f"PR #{pr['number']}: {pr['title']}")
+    print(f"State: {pr['state']}")
+    print(f"Merged: {pr.get('merged', False)}")
+    print(f"Mergeable: {pr.get('mergeable', 'unknown')}")
+    print(f"URL: {pr['html_url']}")
+
+    # CI status
+    sha = pr.get("head", {}).get("sha", "")
+    if sha:
+        try:
+            status = _req("GET", f"/commits/{sha}/status")
+            print(f"CI Status: {status.get('state', 'pending')}")
+            for s in status.get('statuses', []):
+                desc = s.get('description', '')
+                print(f"  - {s.get('context')}: {s.get('state')} ({desc})")
+        except SystemExit:
+            print("CI Status: no statuses found")
+    return pr
+
+
+def merge_pr(pr_num):
+    """Merge a PR. Fails if CI hasn't passed or PR is not mergeable."""
+    pr = _req("GET", f"/pulls/{pr_num}")
+
+    if pr.get("state") == "closed":
+        if pr.get("merged"):
+            print(f"PR #{pr_num} already merged")
+            return pr
+        else:
+            print(f"PR #{pr_num} is closed (not merged)", file=sys.stderr)
+            sys.exit(1)
+
+    # Check CI
+    sha = pr.get("head", {}).get("sha", "")
+    ci_passed = True
+    if sha:
+        try:
+            status = _req("GET", f"/commits/{sha}/status")
+            ci_state = status.get("state", "pending")
+            if ci_state in ("failure", "error"):
+                ci_passed = False
+                print(f"CI status: {ci_state} — cannot merge", file=sys.stderr)
+                for s in status.get('statuses', []):
+                    print(f"  {s.get('context')}: {s.get('state')}", file=sys.stderr)
+        except SystemExit:
+            pass  # No statuses, proceed
+
+    if not ci_passed:
+        print("Merge blocked: CI has not passed", file=sys.stderr)
+        sys.exit(1)
+
+    result = _req("POST", f"/pulls/{pr_num}/merge", {"Do": "merge"})
+    if result.get("merged"):
+        print(f"PR #{pr_num} merged successfully")
+    else:
+        print(f"Merge result: {result.get('message', 'unknown')}")
+    return result
+
+
+# ── Lifecycle management ─────────────────────────────────────────────────────
+
+def lifecycle(issue_num):
+    """Print the full lifecycle status for an issue: branch, PR, CI, merge."""
+    print(f"=== Issue #{issue_num} Lifecycle ===\n")
+
+    issue = _req("GET", f"/issues/{issue_num}")
+    print(f"Issue: {issue['title']}")
+    print(f"State: {issue['state']}\n")
+
+    # Find associated PRs
+    prs = _req("GET", "/pulls?state=all")
+    related = [p for p in prs if f"Closes #{issue_num}" in p.get("body", "")
+               or f"#{issue_num}" in p.get("title", "")]
+    if related:
+        for pr in related:
+            print(f"PR #{pr['number']}: {pr['state']} (merged={pr.get('merged', False)})")
+            pr_status(pr["number"])
+    else:
+        print("No associated PR found.")
+
+
+# ── CLI ──────────────────────────────────────────────────────────────────────
+
 def main():
    parser = argparse.ArgumentParser(description="Dev agent Gitea helper")
    parser.add_argument("--action", required=True,
-                        choices=["list", "get", "comment", "create-pr"])
+                        choices=["list", "get", "comment", "close-issue",
+                                 "create-pr", "pr-status", "merge-pr", "lifecycle"])
    parser.add_argument("--issue", type=int)
+    parser.add_argument("--pr", type=int)
    parser.add_argument("--branch")
    parser.add_argument("--body")
    args = parser.parse_args()
@@ -106,11 +212,31 @@ def main():
            print("--issue and --body are required for 'comment' action", file=sys.stderr)
            sys.exit(1)
        comment_issue(args.issue, args.body)
+    elif args.action == "close-issue":
+        if not args.issue:
+            print("--issue is required for 'close-issue' action", file=sys.stderr)
+            sys.exit(1)
+        close_issue(args.issue, args.body)
    elif args.action == "create-pr":
        if not args.issue or not args.branch:
            print("--issue and --branch are required for 'create-pr' action", file=sys.stderr)
            sys.exit(1)
-        create_pr(args.issue, args.branch)
+        create_pr(args.issue, args.branch, args.body)
+    elif args.action == "pr-status":
+        if not args.pr:
+            print("--pr is required for 'pr-status' action", file=sys.stderr)
+            sys.exit(1)
+        pr_status(args.pr)
+    elif args.action == "merge-pr":
+        if not args.pr:
+            print("--pr is required for 'merge-pr' action", file=sys.stderr)
+            sys.exit(1)
+        merge_pr(args.pr)
+    elif args.action == "lifecycle":
+        if not args.issue:
+            print("--issue is required for 'lifecycle' action", file=sys.stderr)
+            sys.exit(1)
+        lifecycle(args.issue)


 if __name__ == "__main__":