From 1f41bf449869fe553d87e0756f19679ee4f91bcd Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Mon, 10 Aug 2026 06:20:03 +0000 Subject: [PATCH] agents: document dev python version bump and merge queue fields Updating dev tooling Python versions requires updating multiple lock configurations and regenerating lockfiles, but this process was not documented in agent instructions. In addition, the merge-pr skill needed to query additional GitHub PR state fields to reliably inspect merge queue status and mergeability. Add developer guidance for bumping dev tooling Python versions and running lockfile update commands, and expand the gh pr view fields queried during merge queue shepherding. --- .agents/skills/merge-pr/SKILL.md | 8 +++++++- AGENTS.md | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.agents/skills/merge-pr/SKILL.md b/.agents/skills/merge-pr/SKILL.md index 406590e49f..ae3e2e3ad5 100644 --- a/.agents/skills/merge-pr/SKILL.md +++ b/.agents/skills/merge-pr/SKILL.md @@ -23,5 +23,11 @@ When the user asks to merge a pull request (e.g., "merge PR ", "merge th `gh api repos/:owner/:repo/branches --jq '.[].name | select(test("gh-readonly-queue/.*/pr--"))'` and monitor commit statuses/Buildkite builds running on that temporary branch. -4. **Queue Shepherding**: Periodically check `gh pr view --json state,autoMergeRequest`. While `state` is `"OPEN"`, ensure auto-merge is enabled / queued by running `gh pr merge --auto --squash`. If `autoMergeRequest` is null (e.g., ejected from the merge queue due to a CI flake in the temporary queue branch), re-enqueue it for merge by running `gh pr merge --auto --squash` once checks are retried or green. +4. **Queue Shepherding**: Periodically check `gh pr view --json + state,autoMergeRequest,mergeStateStatus,mergeable`. While `state` is + `"OPEN"`, ensure auto-merge is enabled / queued by running `gh pr merge + --auto --squash`. If `autoMergeRequest` is null (e.g., ejected + from the merge queue due to a CI flake in the temporary queue branch), + re-enqueue it for merge by running `gh pr merge --auto --squash` + once checks are retried or green. 5. **Completion Notification**: Once `state` becomes `"MERGED"`, send a high-priority message back to the parent conversation. diff --git a/AGENTS.md b/AGENTS.md index d66e18ca11..07b523e410 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -211,6 +211,14 @@ When modifying locked/resolved requirements files: the requirements.txt file. That will update the locked/resolved requirements.txt file. +When updating the minimum Python version for dev/docs tooling (e.g. following +Dependabot alerts): + * Update `python_version` in both `lock(name = "requirements", ...)` and + `lock(name = "uv_lock", ...)` within `dev/BUILD.bazel`. + * Regenerate lockfiles by running: + `bazel run //dev:requirements.update && bazel run //dev:uv_lock.update` + * Verify docs build via `bazel build //docs:docs`. + ## rules_python idiosyncrasies When building `//docs:docs`, ignore an error about exit code 2; this is a flake,