Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

feat(tooling): 集成的合并提交带上 PR 号与 issue 关联行

longmeidaoa14d053129ea
diff --git a/.claude/skills/peach-issue-delivery/SKILL.md b/.claude/skills/peach-issue-delivery/SKILL.md
index 4c7e1f68e..50211f91f 100644
--- a/.claude/skills/peach-issue-delivery/SKILL.md
+++ b/.claude/skills/peach-issue-delivery/SKILL.md
@@ -42,7 +42,7 @@ description: Peach 收集或汇总用户反馈、代码交付、issue 与 PR、
- 分别确认代码合并、CI 结果、修复产物发布和 issue 验收;每项结论只使用对应证据。
- 汇总的发布状态绑定候选提交和实际制品;标签已打或版本段已改不能批量转为「已发布」。发布失败保留已合入状态,成功后只推进候选真正包含的修复。
- 问题依赖特定硬件、部署环境或报告者确认时,通用测试、CI 通过和镜像发布不能代替该验证。必要验证未完成时保持 issue 开放;修复产物可供测试时使用 `status:needs-verification`。
-- 尚需验证的 issue,在 PR 正文中用独立的 `Refs #编号` 行关联,跨仓库使用 `Refs owner/repo#编号`。此格式也供项目看板识别实现关联。
+- 尚需验证的 issue,在 PR 正文中用独立的 `Refs #编号` 行关联,跨仓库使用 `Refs owner/repo#编号`。此格式也供项目看板识别实现关联;`integrate` 把这类独立行连同 PR 号写进合并提交。
- 检查 PR 正文、提交消息以及合并时采用的消息,避免用 `Fixes`、`Closes`、`Resolves` 等关键词触发尚需验证的 issue 自动关闭。
- 关闭前取得覆盖问题验收条件的实际验证证据,或用户明确要求关闭。证据写清测试环境、修复版本、结果与未覆盖范围;不得把未覆盖范围说成已验证。
- 若 issue 被自动关闭且必要验证未完成,重新打开并恢复适用标签;无需为修正状态自动追加评论。
diff --git a/scripts/agent_worktree.py b/scripts/agent_worktree.py
index 08232aa53..366a38474 100644
--- a/scripts/agent_worktree.py
+++ b/scripts/agent_worktree.py
@@ -170,12 +170,21 @@ def require_verified(worker: Path, target_branch: str, paths: Iterable[str]) ->
raise WorkspaceError("验证检查期间工作树改变,请重试")
-def require_pull_request(worker: Path, branch: str, target_branch: str, head: str) -> dict[str, str]:
- """用工作树的 GitHub 仓库上下文取得当前分支 PR,绑定精确提交与目标分支。"""
+ISSUE_LINK = re.compile(
+ r"(?:Refs|Close[sd]?|Fix(?:e[sd])?|Resolve[sd]?)[ \t]+"
+ r"(?:(?:[\w.-]+/[\w.-]+)?#[1-9]\d*|https://github\.com/[\w.-]+/[\w.-]+/issues/[1-9]\d*)",
+ re.IGNORECASE)
+
+
+def require_pull_request(worker: Path, branch: str, target_branch: str, head: str) -> dict[str, object]:
+ """用工作树的 GitHub 仓库上下文取得当前分支 PR,绑定精确提交与目标分支。
+
+ 正文里独占一行的 issue 关联行原样带出,写进合并提交;正文中顺带提到的编号不算。
+ """
fields = ("url", "state", "headRefOid", "baseRefName")
try:
result = subprocess.run(
- ["gh", "pr", "view", branch, "--json", ",".join(fields)], cwd=worker,
+ ["gh", "pr", "view", branch, "--json", ",".join((*fields, "body"))], cwd=worker,
capture_output=True, text=True, encoding="utf-8", errors="replace", timeout=60,
)
except (OSError, subprocess.TimeoutExpired) as error:
@@ -196,7 +205,17 @@ def require_pull_request(worker: Path, branch: str, target_branch: str, head: st
raise WorkspaceError("PR 提交与工作者分支不一致;请先推送当前提交并核对对应 CI")
if pr["baseRefName"] != target_branch:
raise WorkspaceError(f"PR 目标分支不是 {target_branch}")
- return {"url": pr["url"], "head": head, "base": target_branch}
+ body = pr.get("body") if isinstance(pr.get("body"), str) else ""
+ refs = [line.strip() for line in body.splitlines() if ISSUE_LINK.fullmatch(line.strip())]
+ return {"url": pr["url"], "head": head, "base": target_branch, "refs": refs}
+
+
+def merge_message(branch: str, pull_request: dict[str, object]) -> str:
+ """合并提交带 PR 号与 issue 关联行,从 `git log` 就能追到交付与反馈。"""
+ number = str(pull_request["url"]).rsplit("/", 1)[1]
+ subject = f"Merge branch '{branch}' (#{number})"
+ refs = pull_request["refs"]
+ return f"{subject}\n\n" + "\n".join(refs) if refs else subject
def integrate(repo: Path, worker_branch: str, target_branch: str = "master", *,
@@ -266,7 +285,7 @@ def _integrate_locked(repo: Path, worker_branch: str,
raise WorkspaceError("验证检查期间集成工作树改变,请重试")
_install_hooks(main)
_git(main, "-c", f"{MASTER_WRITER}=integrate", "merge", "--no-ff", "--no-edit",
- "-m", f"Merge branch '{worker_branch}'", worker_head)
+ "-m", merge_message(worker_branch, pull_request), worker_head)
_git(main, "worktree", "unlock", str(workers[0]), check=False)
return {
"ok": True,
diff --git a/tests/test_agent_worktree.py b/tests/test_agent_worktree.py
index 22b84bc62..884ab37cc 100644
--- a/tests/test_agent_worktree.py
+++ b/tests/test_agent_worktree.py
@@ -85,7 +85,7 @@ class _WorktreeCase(unittest.TestCase):
if self.mock_pull_request:
pull_request = mock.patch.object(agent_worktree, "require_pull_request", side_effect=
lambda worker, branch, target, head: {"url": "https://github.com/example/peach/pull/1",
- "head": head, "base": target})
+ "head": head, "base": target, "refs": []})
pull_request.start()
self.addCleanup(pull_request.stop)
self.tmp = tempfile.TemporaryDirectory()
@@ -263,11 +263,27 @@ class PullRequestIntegrationTests(_WorktreeCase):
def test_open_matching_pull_request_is_bound_to_the_merge(self):
with self.github() as query:
result = integrate(self.repo, self.branch)
- self.assertEqual(result["pull_request"], {"url": self.pr["url"], "head": self.head, "base": "master"})
+ self.assertEqual(result["pull_request"],
+ {"url": self.pr["url"], "head": self.head, "base": "master", "refs": []})
self.assertEqual((self.repo / "worker.txt").read_text(encoding="utf-8"), "worker\n")
command = query.call_args.args[0]
self.assertEqual(command[:4], ["gh", "pr", "view", self.branch])
self.assertEqual(query.call_args.kwargs["cwd"], self.worker)
+ self.assertEqual(_git(self.repo, "log", "-1", "--format=%B").stdout.strip(),
+ f"Merge branch '{self.branch}' (#12)")
+
+ def test_issue_link_lines_in_the_body_follow_into_the_merge_commit(self):
+ body = ("排查记录里顺带提到 #3,不算关联。\n\nRefs #45\r\n"
+ " Refs peach-mitao/peach-roadmap#7\n"
+ "Fixes https://github.com/example/peach/issues/8\n"
+ "Refs N01(Telegram 反馈)\n")
+ with self.github(json.dumps({**self.pr, "body": body})):
+ result = integrate(self.repo, self.branch)
+ refs = ["Refs #45", "Refs peach-mitao/peach-roadmap#7",
+ "Fixes https://github.com/example/peach/issues/8"]
+ self.assertEqual(result["pull_request"]["refs"], refs)
+ self.assertEqual(_git(self.repo, "log", "-1", "--format=%B").stdout.strip(),
+ f"Merge branch '{self.branch}' (#12)\n\n" + "\n".join(refs))
def test_an_older_remote_head_and_another_base_are_refused(self):
for field, value, message in (("headRefOid", "0" * 40, "提交.*不一致"),
@@ -793,7 +809,7 @@ class IntegrationVersionTests(_WorktreeCase):
self.assertEqual(report["version"], "0.7.14")
self.assertEqual(read_version(self.repo), "0.7.14")
self.assertEqual(_git(self.repo, "log", "-1", "--format=%s").stdout.strip(),
- f"Merge branch '{branch}'")
+ f"Merge branch '{branch}' (#1)")
touched = _lines(_git(self.repo, "show", "--name-only", "--format=", "HEAD"))
self.assertNotIn("src/peach/__init__.py", touched)
diff --git a/tests/test_test_evidence.py b/tests/test_test_evidence.py
index 3d5485b20..9f2656388 100644
--- a/tests/test_test_evidence.py
+++ b/tests/test_test_evidence.py
@@ -954,7 +954,7 @@ class VerificationTests(unittest.TestCase):
self.enterContext(mock.patch.dict(os.environ, {"GITHUB_ACTIONS": "false"}))
self.enterContext(mock.patch.object(coordinator, "require_pull_request", side_effect=
lambda worker, branch, target, head: {"url": "https://github.com/example/peach/pull/1",
- "head": head, "base": target}))
+ "head": head, "base": target, "refs": []}))
temporary = tempfile.TemporaryDirectory()
self.addCleanup(temporary.cleanup)
self.root = Path(temporary.name).resolve()