Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(tooling): 前置交付预检并绑定合入 PR

longmeidao446743abc15f
diff --git a/.claude/skills/peach-worktree/SKILL.md b/.claude/skills/peach-worktree/SKILL.md
index 31b750510..abc855a5f 100644
--- a/.claude/skills/peach-worktree/SKILL.md
+++ b/.claude/skills/peach-worktree/SKILL.md
@@ -6,7 +6,7 @@ description: Peach 代码任务开工,以及创建、提交、集成或回收
# 工作树与集成交付
最后复核:2026-10-29
-证据来源:工作树入口、交付门槛、集成事故、用户确认的存量生效判据及 0.51.0 发版复盘。
+证据来源:工作树入口、交付预检与 PR 绑定回归、集成事故、用户确认的存量生效判据及 0.51.0 发版复盘。
## 开工与职责
@@ -20,9 +20,9 @@ description: Peach 代码任务开工,以及创建、提交、集成或回收
1. 在当前工作树准备独立 venv,按 `docs/TESTING.md` 安装锁定依赖,不复制 venv 或修改正在服务的环境。
2. 行为修改先列失败路径与影响域,通过正式入口定向验证;新增或改名测试核对域登记,不能以文件存在代替覆盖。
-3. 冻结改动后运行一次 `auto`;未知影响、实际依赖和共享设施用 `full`。环境、编码、源码定位、记录复用和补测契约统一见 `docs/TESTING.md`,不逐域循环重复公共用例。
+3. 最后交付提交完成后先运行 `agent_worktree.py preflight`,再运行一次 `auto`;未知影响、实际依赖和共享设施用 `full`。预检不签发测试记录。环境、编码、源码定位、记录复用和补测契约统一见 `docs/TESTING.md`,不逐域循环重复公共用例。
4. `ready` 前纳入当前 `master` 并验证最终内容;主线前移后交 `auto` 复用有效记录,不默认重跑全量。提交、声明与记录齐全后取得 `ready` 的实际结果。
-5. 协调者执行 `integrate --branch <分支>`,等成功退出并核对主线提交,再做适用重启和运行核验。锁忙交入口等待,不手工 merge 绕过,不把分支交接当成验收完成。
+5. 协调者执行 `integrate --branch <分支>`;入口核对开放 PR 的提交与工作者 HEAD、目标分支一致。等成功退出并核对主线提交,再做适用重启和运行核验。锁忙交入口等待,不手工 merge 绕过,不把分支交接当成验收完成。
主检出 master 的直接提交与手工 merge 由 hook 拒收。发布先完成 `docs/TESTING.md`「每次发版检查」的依赖升级批次,再通过 `scripts/release_tag.py` 定版、打标签与发布;更新清单不代表升级完成。发布时机采用 `release_due.py` 及集成入口的同一判据,不额外重复检查。
diff --git a/docs/README_MAINTENANCE.md b/docs/README_MAINTENANCE.md
index ad0135a26..4b9ec3b6a 100644
--- a/docs/README_MAINTENANCE.md
+++ b/docs/README_MAINTENANCE.md
@@ -43,7 +43,7 @@ README 改动必须核对两种语言;`updated` 至少对应一份实际差异
仅一份需要调整时,用唯一 `README-Reviewed` 写明未改文件及原因,不能为了满足检查改动正确的译文。
提交后的暂存内容不能满足要求。原因的真实性仍由代码审阅负责,脚本不代替语义判断。
-`agent_worktree.py ready/integrate` 在接受测试记录前执行这一门槛。检查覆盖本次分支交付,
+`agent_worktree.py preflight` 在耗时验证前核对这一门槛;`ready/integrate` 在接受测试记录前复用同一检查。检查覆盖本次分支交付,
允许在最后交付提交统一核对整批差异。仓库 `scripts/githooks/commit-msg` 在 `agent/*`
分支提交时检查署名,以及消息中已有 README 声明的格式与分段;中间提交可以不写 README 声明。
合并消息免除署名检查,amend 使用同一套字段判据;钩子只读消息。README 声明与整个分支差异
diff --git a/docs/REUSE.md b/docs/REUSE.md
index e05e60e6b..64dcb127a 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -104,6 +104,8 @@ React 与应用层的 GET 入口共用 `frontend/src/core/library-scope.ts`:
## 正式测试记录与中断恢复
+交付预检复用已有的提交主题、共同署名与 README 影响检查,不新增规则解释器。合入前的 PR 身份复用 [GitHub CLI 的 `gh pr view`](https://cli.github.com/manual/gh_pr_view),使用工作树仓库上下文和原生 JSON 字段;Peach 只校验开放状态、精确提交及目标分支,不引入 GitHub SDK 或另一套凭据存储。临时 Git 工作树回归覆盖未取得 PR、旧提交、其他目标、远端查询期间内容变化及成功合并回执。
+
测试结果继续复用 Python ≥3.14 标准库 `unittest`、`hashlib`、`json` 和项目的内容快照、影响域映射与外部测试结果。互斥复用既有 `filelock 4.2.0`,分片退出后回收其进程树复用开发依赖 `psutil 7.2.2`;版本与许可沿用锁定依赖及第三方许可清单,不新增运行时依赖。Peach 保留输入身份、逐文件覆盖、完成报告、批次来源和 `ready`/`integrate` 验收规则;串行、并行、浏览器与 Vitest 使用同一个恢复模型。
CI 跨作业恢复使用 GitLab Runner 19.5 的原生 [缓存](https://docs.gitlab.com/ci/caching/) 与 [`cache:when`](https://docs.gitlab.com/ci/yaml/#cachewhen),保存正式证明 JSON,按作业、分支及保护状态隔离。缓存可缺失,Peach 仍负责内容、环境、时效与全量批次校验;不引入缓存 SDK 或独立证明存储。GitLab 克隆地址使用标准库 `urllib.parse` 保留仓库身份并规范化认证值,作业令牌及其密码别名按存在性参与环境身份。
diff --git a/docs/TESTING.md b/docs/TESTING.md
index 6b89e20f6..f8704bcc1 100644
--- a/docs/TESTING.md
+++ b/docs/TESTING.md
@@ -203,6 +203,26 @@ macOS 按影响域验证:
ffmpeg 起不来是事实,但它不该挡住一次只改文档的 `checks`。域由选中的测试源码推出来。
确认本次无关时用 `PEACH_SKIP_PREFLIGHT=1` 整体跳过预检;分片子进程不重复预检。
+### 交付预检与 PR 绑定
+
+最后交付提交完成后,先在当前隔离工作树根目录运行元数据预检,再开始耗时验证或推送。预检核对工作树干净、目标分支已纳入,以及提交主题、署名和 README 声明。
+
+Windows(PowerShell 7)运行预检:
+
+```powershell
+& .\.venv\Scripts\python.exe -X utf8 .\scripts\agent_worktree.py preflight
+```
+
+macOS/Linux(zsh)运行同一预检:
+
+```zsh
+./.venv/bin/python -X utf8 scripts/agent_worktree.py preflight
+```
+
+`preflight` 不安装依赖、不计算测试环境身份、不读取或签发测试证明,也不访问远端 PR。退出码为 `0` 只表示元数据通过;`tests` 与 `pull_request` 仍是 `not_checked`。`ready` 和 `integrate` 继续使用相同元数据判据,并核对当前内容对应的正式测试记录。
+
+`integrate` 在合并前通过工作树的 GitHub CLI 仓库上下文取得 PR。PR 必须开放,`headRefOid` 等于工作者当前提交,`baseRefName` 等于集成目标分支;成功回执保留 PR 链接及这两个身份。未取得 PR、字段无效或身份不匹配时停止,不改变主线内容。此核对不替代 PR 审阅、对应提交的 CI 与既有预览确认。
+
## 定向调试与局部记录
Windows 的 `-Focus` 接受 Python 模块、类、方法或仓库相对路径,可传数组;通过 `pwsh -File` 调用时也接受一个逗号分隔参数。macOS/Linux 对每个选择器重复传 `--focus`。入口统一去重,拒绝空项并核对源码及隔离依赖。选择器不存在、浏览器路径超出 `frontend/e2e` 或与分片混用时拒绝执行。浏览器用例只收单个 `frontend/e2e/*.test.ts` 文件,不收目录;要跑全部 e2e 时把文件逐个列进数组。
diff --git a/scripts/adopt_dependency_bump.py b/scripts/adopt_dependency_bump.py
index e3fac9999..ac9e60f22 100644
--- a/scripts/adopt_dependency_bump.py
+++ b/scripts/adopt_dependency_bump.py
@@ -42,6 +42,12 @@ if not __package__:
from . import co_author
ROOT = Path(__file__).resolve().parents[1]
+DELIVERY_STEPS = [
+ "提交后预检(工作树根目录,PowerShell 7):"
+ "& .\\.venv\\Scripts\\python.exe -X utf8 .\\scripts\\agent_worktree.py preflight",
+ "测试:& .\\scripts\\test.ps1 full",
+ "交付:推送工作者分支并创建交付 PR,核对当前提交的 CI;ready 后由协调者 integrate",
+]
#: 每份清单的接管方式。`manifests` 是从 Dependabot 分支套过来的文件,`derived` 是重算后
#: 可能变的路径,`commands` 是重算命令,`checks` 只核对不产出文件。以 `/` 结尾的条目按
@@ -352,8 +358,7 @@ def adopt_all(prs: list[dict], *, signature: str, root: Path = ROOT) -> dict:
"再跑一次 --all-open --apply,已接管的会跳过"]}
except RuntimeError as exc:
return {"ok": False, "error": str(exc), "stopped_at": pr["number"], "done": done}
- next_steps = ["测试:& .\\scripts\\test.ps1 full",
- "交付:scripts/agent_worktree.py ready,再由协调者 integrate",
+ next_steps = [*DELIVERY_STEPS,
"推送 master 之后逐个收尾:",
*(close_command(item["pr"], item["recipe"]) for item in done)]
return {"ok": True, "done": done, "next": next_steps if done else []}
@@ -401,8 +406,7 @@ def main(argv: list[str] | None = None) -> int:
pr = pull_request(args.pr) if args.pr else {"headRefName": args.branch}
item = adopt(pr, apply=args.apply, signature=args.co_author)
plan = {"ok": True, **item,
- "next": ["测试:& .\\scripts\\test.ps1 full",
- "交付:scripts/agent_worktree.py ready,再由协调者 integrate"]}
+ "next": list(DELIVERY_STEPS)}
if item.get("already"):
plan["next"] = []
elif not args.apply:
diff --git a/scripts/agent_worktree.py b/scripts/agent_worktree.py
index 69b0e56cb..08232aa53 100644
--- a/scripts/agent_worktree.py
+++ b/scripts/agent_worktree.py
@@ -101,10 +101,10 @@ def create(repo: Path, agent: str, task: str, root: Path | None = None) -> dict[
}
-def ready(repo: Path, target_branch: str = "master") -> dict[str, object]:
+def _worker_delivery(repo: Path, target_branch: str) -> dict[str, object]:
branch = _git(repo, "branch", "--show-current").stdout.strip()
if not branch.startswith("agent/"):
- raise WorkspaceError("ready must run from an agent/* branch")
+ raise WorkspaceError("preflight/ready must run from an agent/* branch")
dirty = _lines(_git(repo, "status", "--porcelain"))
if dirty:
raise WorkspaceError("worktree is dirty; commit only owned paths first")
@@ -114,10 +114,7 @@ def ready(repo: Path, target_branch: str = "master") -> dict[str, object]:
raise WorkspaceError("branch has no commits")
worker_files = set(_lines(_git(repo, "diff", "--name-only", f"{base}..HEAD")))
target_files = set(_lines(_git(repo, "diff", "--name-only", f"{base}..{target_branch}")))
- require_verified(repo, target_branch, worker_files)
return {
- "ok": True,
- "action": "ready",
"branch": branch,
"base": base,
"head": _git(repo, "rev-parse", "HEAD").stdout.strip(),
@@ -127,7 +124,25 @@ def ready(repo: Path, target_branch: str = "master") -> dict[str, object]:
}
-def require_verified(worker: Path, target_branch: str, paths: Iterable[str]) -> None:
+def preflight(repo: Path, target_branch: str = "master") -> dict[str, object]:
+ """快速核对当前交付提交;不读取或签发测试证明,也不查询 PR。"""
+ report = _worker_delivery(repo, target_branch)
+ if require_metadata(repo, target_branch) != report["head"]:
+ raise WorkspaceError("预检期间工作者分支改变,请重试")
+ return {"ok": True, "action": "preflight", **report,
+ "metadata": "passed", "tests": "not_checked", "pull_request": "not_checked"}
+
+
+def ready(repo: Path, target_branch: str = "master") -> dict[str, object]:
+ report = _worker_delivery(repo, target_branch)
+ require_verified(repo, target_branch, set(report["files"]))
+ if _git(repo, "rev-parse", "HEAD").stdout.strip() != report["head"]:
+ raise WorkspaceError("验证检查期间工作者分支改变,请重试")
+ return {"ok": True, "action": "ready", **report}
+
+
+def require_metadata(worker: Path, target_branch: str) -> str:
+ """干净交付内容、目标祖先与提交声明的共用判据。"""
head = _git(worker, "rev-parse", "HEAD").stdout.strip()
if _git(worker, "status", "--porcelain").stdout.strip():
raise WorkspaceError("验证工作树必须干净")
@@ -138,6 +153,14 @@ def require_verified(worker: Path, target_branch: str, paths: Iterable[str]) ->
+ commit_subject.check(worker, target_branch))
if problems:
raise WorkspaceError("; ".join(problems))
+ if _git(worker, "rev-parse", "HEAD").stdout.strip() != head or \
+ _git(worker, "status", "--porcelain").stdout.strip():
+ raise WorkspaceError("元数据检查期间工作树改变,请重试")
+ return head
+
+
+def require_verified(worker: Path, target_branch: str, paths: Iterable[str]) -> None:
+ head = require_metadata(worker, target_branch)
scopes, _ = test_runner.scopes_for_changes(paths, contents=test_runner.changed_contents(worker, target_branch, paths))
state = test_evidence.key(worker)
if not test_evidence.covers(test_evidence.read(worker, state), scopes):
@@ -147,6 +170,35 @@ 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,绑定精确提交与目标分支。"""
+ fields = ("url", "state", "headRefOid", "baseRefName")
+ try:
+ result = subprocess.run(
+ ["gh", "pr", "view", branch, "--json", ",".join(fields)], cwd=worker,
+ capture_output=True, text=True, encoding="utf-8", errors="replace", timeout=60,
+ )
+ except (OSError, subprocess.TimeoutExpired) as error:
+ raise WorkspaceError(f"未取得 PR:{error}") from error
+ if result.returncode:
+ raise WorkspaceError("未取得 PR:" + (result.stderr or result.stdout).strip())
+ try:
+ pr = json.loads(result.stdout)
+ except json.JSONDecodeError as error:
+ raise WorkspaceError("PR 回执不是有效 JSON") from error
+ if not isinstance(pr, dict) or any(not isinstance(pr.get(key), str) or not pr[key] for key in fields):
+ raise WorkspaceError("PR 回执字段无效")
+ if not re.fullmatch(r"https://[^/\s]+/[^/\s]+/[^/\s]+/pull/[1-9]\d*", pr["url"]):
+ raise WorkspaceError("PR 回执链接无效")
+ if pr["state"] != "OPEN":
+ raise WorkspaceError(f"PR 状态为 {pr['state']};交付 PR 必须开放待合入")
+ if pr["headRefOid"] != head:
+ raise WorkspaceError("PR 提交与工作者分支不一致;请先推送当前提交并核对对应 CI")
+ if pr["baseRefName"] != target_branch:
+ raise WorkspaceError(f"PR 目标分支不是 {target_branch}")
+ return {"url": pr["url"], "head": head, "base": target_branch}
+
+
def integrate(repo: Path, worker_branch: str, target_branch: str = "master", *,
lock_timeout: float = 1800) -> dict[str, object]:
folder = test_evidence.evidence_dir(repo)
@@ -205,6 +257,7 @@ def _integrate_locked(repo: Path, worker_branch: str,
raise WorkspaceError("工作者必须有唯一、干净且已注册的工作树")
worker_head = _git(main, "rev-parse", worker_branch).stdout.strip()
require_verified(workers[0], target_branch, worker_files)
+ pull_request = require_pull_request(workers[0], worker_branch, target_branch, worker_head)
if _git(main, "rev-parse", worker_branch).stdout.strip() != worker_head or \
_git(workers[0], "rev-parse", "HEAD").stdout.strip() != worker_head:
raise WorkspaceError("验证检查期间工作者分支改变,请重试")
@@ -222,6 +275,7 @@ def _integrate_locked(repo: Path, worker_branch: str,
"before": before,
"after": _git(main, "rev-parse", "HEAD").stdout.strip(),
"files": sorted(worker_files),
+ "pull_request": pull_request,
"version": version_bump.read_version(main),
"release_tag_entry": RELEASE_TAG_ENTRY,
# 发布提示挂在这里,是因为集成的输出是人和智能体每次都会读的那一份。挂在别处
@@ -532,8 +586,9 @@ def main() -> int:
start.add_argument("--agent", required=True)
start.add_argument("--task", required=True)
start.add_argument("--root", type=Path)
- inspect = sub.add_parser("ready")
- inspect.add_argument("--target", default="master")
+ for name in ("preflight", "ready"):
+ inspect = sub.add_parser(name)
+ inspect.add_argument("--target", default="master")
merge = sub.add_parser("integrate")
merge.add_argument("--branch", required=True)
merge.add_argument("--target", default="master")
@@ -546,6 +601,8 @@ def main() -> int:
try:
if args.command == "create":
result = create(args.repo, args.agent, args.task, args.root)
+ elif args.command == "preflight":
+ result = preflight(args.repo, args.target)
elif args.command == "ready":
result = ready(args.repo, args.target)
elif args.command == "prune":
diff --git a/tests/test_agent_worktree.py b/tests/test_agent_worktree.py
index 6bddb6230..22b84bc62 100644
--- a/tests/test_agent_worktree.py
+++ b/tests/test_agent_worktree.py
@@ -1,3 +1,5 @@
+import io
+import json
import os
import shutil
import subprocess
@@ -6,7 +8,7 @@ import tempfile
import time
import unittest
from concurrent.futures import ThreadPoolExecutor
-from contextlib import contextmanager
+from contextlib import contextmanager, redirect_stdout
from pathlib import Path
from threading import Event
from unittest import mock
@@ -74,10 +76,18 @@ def commit(repo: Path, message: str) -> None:
class _WorktreeCase(unittest.TestCase):
+ mock_pull_request = True
+
def setUp(self):
self.verification = mock.patch.object(agent_worktree, "require_verified")
self.verification.start()
self.addCleanup(self.verification.stop)
+ 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})
+ pull_request.start()
+ self.addCleanup(pull_request.stop)
self.tmp = tempfile.TemporaryDirectory()
# 先 resolve:prune 报告的是 git worktree list 给出的真实路径,而 CI runner 的
# 临时目录是别名(macOS /var 软链到 /private/var,Windows 的 RUNNER~1 短名展开
@@ -211,6 +221,145 @@ class AgentWorktreeTests(_WorktreeCase):
integrate(self.repo, str(result["branch"]))
+class PullRequestIntegrationTests(_WorktreeCase):
+ mock_pull_request = False
+
+ def setUp(self):
+ super().setUp()
+ result = create(self.repo, "Codex", "pr-boundary", self.root / "worktrees")
+ self.worker = Path(result["path"])
+ self.branch = result["branch"]
+ (self.worker / "worker.txt").write_text("worker\n", encoding="utf-8")
+ commit(self.worker, "fix(tooling): 示例变更")
+ self.head = _git(self.worker, "rev-parse", "HEAD").stdout.strip()
+ self.pr = {"url": "https://github.com/example/peach/pull/12", "state": "OPEN",
+ "headRefOid": self.head, "baseRefName": "master"}
+
+ @contextmanager
+ def github(self, stdout=None, returncode=0, stderr=""):
+ run = subprocess.run
+ query = mock.Mock(return_value=subprocess.CompletedProcess(
+ ["gh"], returncode, json.dumps(self.pr) if stdout is None else stdout, stderr))
+
+ def call(command, *args, **kwargs):
+ return query(command, *args, **kwargs) if command[0] == "gh" else run(command, *args, **kwargs)
+
+ with mock.patch.object(agent_worktree.subprocess, "run", side_effect=call):
+ yield query
+
+ def assert_refused(self, message):
+ before = _git(self.repo, "rev-parse", "HEAD").stdout.strip()
+ with self.assertRaisesRegex(WorkspaceError, message):
+ integrate(self.repo, self.branch)
+ self.assertEqual(_git(self.repo, "rev-parse", "HEAD").stdout.strip(), before)
+ self.assertEqual((self.repo / "worker.txt").read_text(encoding="utf-8"), "base\n")
+ entry = next(row for row in agent_worktree._worktree_entries(self.repo) if row.get("branch") == self.branch)
+ self.assertIn("locked", entry)
+
+ def test_missing_pull_request_preserves_master(self):
+ with self.github(returncode=1, stderr="no pull requests found for branch"):
+ self.assert_refused("未取得 PR")
+
+ 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((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)
+
+ def test_an_older_remote_head_and_another_base_are_refused(self):
+ for field, value, message in (("headRefOid", "0" * 40, "提交.*不一致"),
+ ("baseRefName", "other", "目标分支"),
+ ("state", "CLOSED", "必须开放"),
+ ("state", "MERGED", "必须开放")):
+ with self.subTest(field=field, value=value), self.github(json.dumps({**self.pr, field: value})):
+ self.assert_refused(message)
+
+ def test_unreadable_or_invalid_receipts_never_count_as_a_pull_request(self):
+ cases = (("", "有效 JSON"), ("{", "有效 JSON"), ("[]", "字段无效"),
+ (json.dumps({**self.pr, "headRefOid": None}), "字段无效"),
+ (json.dumps({**self.pr, "url": "file:///private"}), "链接无效"))
+ for stdout, message in cases:
+ with self.subTest(stdout=stdout), self.github(stdout):
+ self.assert_refused(message)
+
+ def test_an_unavailable_client_and_a_timeout_preserve_master(self):
+ for error in (FileNotFoundError("gh"), subprocess.TimeoutExpired(["gh"], 60)):
+ with self.subTest(error=type(error).__name__), self.github() as query:
+ query.side_effect = error
+ self.assert_refused("未取得 PR")
+
+ def test_a_worker_change_during_the_remote_read_prevents_merge(self):
+ before = _git(self.repo, "rev-parse", "HEAD").stdout.strip()
+ with self.github() as query:
+ reply = query.return_value
+
+ def advance(*_args, **_kwargs):
+ (self.worker / "worker.txt").write_text("parallel\n", encoding="utf-8")
+ commit(self.worker, "fix(tooling): 并行变更")
+ return reply
+
+ query.side_effect = advance
+ with self.assertRaisesRegex(WorkspaceError, "工作者分支改变"):
+ integrate(self.repo, self.branch)
+ self.assertEqual(_git(self.repo, "rev-parse", "HEAD").stdout.strip(), before)
+ self.assertNotEqual(_git(self.worker, "rev-parse", "HEAD").stdout.strip(), self.head)
+
+ def test_the_requested_target_branch_is_preserved(self):
+ _git(self.repo, "branch", "-m", "master", "develop")
+ with self.github(json.dumps({**self.pr, "baseRefName": "develop"})):
+ result = integrate(self.repo, self.branch, "develop")
+ self.assertEqual(result["pull_request"]["base"], "develop")
+
+
+class PreflightTests(_WorktreeCase):
+ def worker(self, *, declaration=True):
+ item = create(self.repo, "Codex", "preflight", self.root / "worktrees")
+ worker = Path(item["path"])
+ path = worker / "src/peach/module.py"
+ path.write_text("VALUE = 1\n", encoding="utf-8")
+ _git(worker, "add", "src/peach/module.py")
+ trailers = ("README-Impact: none; 内部规则,使用方式不变\n" if declaration else "") + AUTHOR
+ _git(worker, "commit", "-m", "fix(tooling): 示例规则", "-m", trailers)
+ return worker
+
+ def test_the_cli_checks_metadata_without_reading_or_signing_test_proof(self):
+ worker = self.worker()
+ output = io.StringIO()
+ with mock.patch.object(sys, "argv", ["agent_worktree.py", "--repo", str(worker), "preflight"]), \
+ mock.patch.object(agent_worktree.test_evidence, "key") as key, redirect_stdout(output):
+ self.assertEqual(agent_worktree.main(), 0)
+ result = json.loads(output.getvalue())
+ self.assertEqual((result["action"], result["metadata"], result["tests"]),
+ ("preflight", "passed", "not_checked"))
+ self.assertEqual(result["head"], _git(worker, "rev-parse", "HEAD").stdout.strip())
+ key.assert_not_called()
+ agent_worktree.require_verified.assert_not_called()
+ agent_worktree.require_pull_request.assert_not_called()
+ self.assertFalse((self.repo / "build/agent-verification").exists())
+
+ def test_a_missing_final_declaration_is_rejected_before_test_proof(self):
+ worker = self.worker(declaration=False)
+ with mock.patch.object(agent_worktree.test_evidence, "key") as key:
+ with self.assertRaisesRegex(WorkspaceError, "README"):
+ agent_worktree.preflight(worker)
+ key.assert_not_called()
+
+ def test_dirty_content_and_a_newer_target_require_preparation(self):
+ worker = self.worker()
+ path = worker / "src/peach/module.py"
+ path.write_text("VALUE = 2\n", encoding="utf-8")
+ with self.assertRaisesRegex(WorkspaceError, "dirty"):
+ agent_worktree.preflight(worker)
+ path.write_text("VALUE = 1\n", encoding="utf-8")
+ (self.repo / "tracked.txt").write_text("parallel\n", encoding="utf-8")
+ commit(self.repo, "docs(tooling): 并行变更")
+ with self.assertRaisesRegex(WorkspaceError, "已前进"):
+ agent_worktree.preflight(worker)
+
+
class MasterCommitGuardTests(_WorktreeCase):
"""主检出的 master 只收 `integrate` 与 `release_tag.py` 的提交。
diff --git a/tests/test_test_evidence.py b/tests/test_test_evidence.py
index a97dc8b5a..3d5485b20 100644
--- a/tests/test_test_evidence.py
+++ b/tests/test_test_evidence.py
@@ -952,6 +952,9 @@ class VerificationTests(unittest.TestCase):
def setUp(self):
# 这组用例模拟本机验收,运行它的 CI job 身份不属于临时仓库。
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}))
temporary = tempfile.TemporaryDirectory()
self.addCleanup(temporary.cleanup)
self.root = Path(temporary.name).resolve()
@@ -1003,6 +1006,7 @@ class VerificationTests(unittest.TestCase):
coordinator.ready(worker)
self.certify(worker, success=False)
self.assertEqual(self.git("rev-parse", "HEAD"), before)
+ coordinator.require_pull_request.assert_not_called()
self.certify(worker)
coordinator.ready(worker)
result = coordinator.integrate(self.repo, branch)