From 366b559b081b8497d894638758ee0af8b8c025aa Mon Sep 17 00:00:00 2001 From: Kyle Sexton <153232337+kyle-sexton@users.noreply.github.com> Date: Sat, 21 Nov 2026 18:34:39 -0500 Subject: [PATCH 1/3] fix(pr-pipeline): let a standards sync retire a Work status bot setter Standards sync #18060 retires melodic-ci-runner-observer[bot] (302525172) from trusted-actors.json (melodic-software/standards#1088). The live-config test required pr-pipeline.yaml's issue-status bot-setters to equal every listed melodic- App, so the sync failed it, and a sync PR may carry only the sync App's commits: neither side could merge first. The test now requires github-actions[bot] first and every other entry to be a listed melodic- App that is not the lanes App, with the third-party exclusions kept. That holds before and after the sync. The retired App leaves bot-setters and the issue-status test fixture. Every consumer (issue-status.mjs, babysit_merge_policy.py, get-statuses.sh) already ignores a setter trusted-actors.json no longer lists, so no behavior changes. The test's header comment went with the equality rule it described. Deriving the list (removing the copy) touches three plugins and is left out. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01RAoAtUnz4WHB5auUnwQYq7 --- .github/actions/resolve-config/issue-status.test.mjs | 2 +- .github/actions/resolve-config/live-config.test.mjs | 9 +++------ docs/conventions/pr-pipeline.yaml | 2 -- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/actions/resolve-config/issue-status.test.mjs b/.github/actions/resolve-config/issue-status.test.mjs index 14c8d295df4..061b2cddce5 100644 --- a/.github/actions/resolve-config/issue-status.test.mjs +++ b/.github/actions/resolve-config/issue-status.test.mjs @@ -116,7 +116,7 @@ const ACTIONS_BOT = 41898282; const MELODIC_AI = 288071998; const CLAUDE_BOT = 209825114; const LANES_APP = 337595936; -const BOT_SETTERS = [41898282, 300666570, 288071998, 296023097, 300690090, 302525172, 337859524]; +const BOT_SETTERS = [41898282, 300666570, 288071998, 296023097, 300690090, 337859524]; test("read: github-actions[bot] setting needs-human reads needs-human, and melodic-ai[bot] setting confirmed reads confirmed", () => { assert.equal(issueStatus([{ field: FIELD, option: OPTIONS["needs-human"] }], ACTIONS_BOT), "needs-human"); diff --git a/.github/actions/resolve-config/live-config.test.mjs b/.github/actions/resolve-config/live-config.test.mjs index ed1a03c8752..5c001c22fd3 100644 --- a/.github/actions/resolve-config/live-config.test.mjs +++ b/.github/actions/resolve-config/live-config.test.mjs @@ -919,23 +919,20 @@ test("live config: post-merge records the owner login's agent merges on the owne assert.equal(agentIdentity, "melodic-automation-lanes[bot]"); }); -// The owner's rule for Work status bot setters: bot-setters is -// github-actions[bot] and every melodic- App trusted-actors.json lists other -// than the lanes App, with the same id and login, and no third-party bot. -test("live config: models.issue-status bot-setters are github-actions[bot] and the listed melodic- Apps but the lanes App", () => { +test("live config: models.issue-status bot-setters are github-actions[bot] then listed melodic- Apps other than the lanes App", () => { const setters = parse(FILES.config).models["issue-status"]["bot-setters"]; const melodic = FILES.trustedActors.actors .filter((actor) => actor.kind === "bot" && actor.login.startsWith("melodic-") && actor.login !== "melodic-automation-lanes[bot]") .map(({ id, login }) => ({ id, login })); assert.ok(melodic.length > 0); - assert.deepEqual(setters, [{ id: 41898282, login: "github-actions[bot]" }, ...melodic]); + assert.deepEqual(setters[0], { id: 41898282, login: "github-actions[bot]" }); for (const login of ["claude[bot]", "cursor[bot]", "cursoragent", "dependabot[bot]", "melodic-automation-lanes[bot]"]) { assert.equal(setters.some((entry) => entry.login === login), false, login); } // issueStatus ignores an entry the list stops holding; this test is what // flags that drift, so each entry must still be on the list as that bot. for (const entry of setters.slice(1)) { - assert.ok(FILES.trustedActors.actors.some((actor) => actor.id === entry.id && actor.login === entry.login && actor.kind === "bot"), entry.login); + assert.ok(melodic.some((actor) => actor.id === entry.id && actor.login === entry.login), entry.login); } }); diff --git a/docs/conventions/pr-pipeline.yaml b/docs/conventions/pr-pipeline.yaml index 16fb1f0671a..fc0f813ec31 100644 --- a/docs/conventions/pr-pipeline.yaml +++ b/docs/conventions/pr-pipeline.yaml @@ -1115,8 +1115,6 @@ models: login: "melodic-software-github-iac[bot]" - id: 300690090 login: "melodic-ci-runner-host[bot]" - - id: 302525172 - login: "melodic-ci-runner-observer[bot]" - id: 337859524 login: "melodic-release[bot]" # Bot field events before this time are label mirrors and never count as history. From bfe7d6c347305dd6c6264111e34168d3052b4498 Mon Sep 17 00:00:00 2001 From: Kyle Sexton <153232337+kyle-sexton@users.noreply.github.com> Date: Sat, 21 Nov 2026 19:12:30 -0500 Subject: [PATCH 2/3] test(source-control): count the live bot-setters block instead of a literal test_babysit_issue_status.py's TheConfigBlock asserted the live issue-status block parses to 7 setters, so dropping the retired runner-observer App failed it (6 != 7) in run 44962506127, also through engine-d.test.sh, which runs that suite. The expected count now comes from the yaml block's `- id:` rows read as text, so the parser is still checked against an independent count, and a sync that adds or retires an App needs no test edit. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01RAoAtUnz4WHB5auUnwQYq7 --- .../babysit-prs/scripts/tests/test_babysit_issue_status.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py b/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py index 78dcaaf7de1..7f18d326739 100644 --- a/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py +++ b/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py @@ -22,6 +22,7 @@ import json import os import pathlib +import re import shutil import subprocess import sys @@ -415,7 +416,9 @@ def test_the_live_block_style_setters_parse(self) -> None: self.assertEqual(status.field_id, FIELD) self.assertIn((41898282, "github-actions[bot]"), status.bot_setters) self.assertIn((337859524, "melodic-release[bot]"), status.bot_setters) - self.assertEqual(len(status.bot_setters), 7) + block = re.search(r"\n bot-setters:\n((?: - id: \d+\n login: .+\n)+)", LIVE) + assert block is not None + self.assertEqual(len(status.bot_setters), block.group(1).count("- id:")) self.assertIn(("86380005", "needs-human"), status.options) self.assertEqual( dict(status.labels)["needs-owner-decision"], From 64a284658ed921e4a8e1092e04e3aca1cfc6d640 Mon Sep 17 00:00:00 2001 From: Kyle Sexton <153232337+kyle-sexton@users.noreply.github.com> Date: Sat, 21 Nov 2026 19:42:54 -0500 Subject: [PATCH 3/3] test(source-control): declare the issue-status suites' reads and add the fragment Test Selection traced the three changed suites and found reads no test-scope line declared: the issue-status Python suite reads sibling babysit suites, repo_config_fake.py and babysit_merge_prefilter.py, and both resolve-config suites read package.json. Check Plugins wanted a source-control fragment; the change is test-only, so it is bump: none. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01RAoAtUnz4WHB5auUnwQYq7 --- .../fix-derive-issue-status-bot-setters-d0232667.md | 5 +++++ .github/actions/resolve-config/issue-status.test.mjs | 1 + .github/actions/resolve-config/live-config.test.mjs | 1 + .../babysit-prs/scripts/tests/test_babysit_issue_status.py | 1 + 4 files changed, 8 insertions(+) create mode 100644 .changes/source-control/fix-derive-issue-status-bot-setters-d0232667.md diff --git a/.changes/source-control/fix-derive-issue-status-bot-setters-d0232667.md b/.changes/source-control/fix-derive-issue-status-bot-setters-d0232667.md new file mode 100644 index 00000000000..3b7e8427510 --- /dev/null +++ b/.changes/source-control/fix-derive-issue-status-bot-setters-d0232667.md @@ -0,0 +1,5 @@ +--- +bump: none +--- + +Test-only change: the issue-status suite counts the live bot-setters block instead of a fixed number, and declares the files it reads. No shipped behavior changes. diff --git a/.github/actions/resolve-config/issue-status.test.mjs b/.github/actions/resolve-config/issue-status.test.mjs index 061b2cddce5..62c27d28ae8 100644 --- a/.github/actions/resolve-config/issue-status.test.mjs +++ b/.github/actions/resolve-config/issue-status.test.mjs @@ -1,3 +1,4 @@ +// test-scope: .github/actions/resolve-config/package.json // models.issue-status: the label collapse and the Work status field reader, // over the live config. Expected values are written by hand: the option ids // from the org field as read on 2026-11-01, and the label table and collapse diff --git a/.github/actions/resolve-config/live-config.test.mjs b/.github/actions/resolve-config/live-config.test.mjs index 5c001c22fd3..fd718af4d7a 100644 --- a/.github/actions/resolve-config/live-config.test.mjs +++ b/.github/actions/resolve-config/live-config.test.mjs @@ -1,3 +1,4 @@ +// test-scope: .github/actions/resolve-config/package.json // The repository's own pipeline config, resolved with the real schema, // vocabulary and trust files. Expected values come from the pr-unblock // contract (applies-when of resolve-conflicts, the report-escalation leaf) and diff --git a/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py b/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py index 7f18d326739..bbb181a3de9 100644 --- a/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py +++ b/plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_issue_status.py @@ -1,5 +1,6 @@ # test-scope: .github/actions/resolve-config/issue-status.mjs .github/actions/resolve-config/dimensions.mjs docs/conventions/pr-pipeline.yaml plugins/source-control/lib/yaml-subset.awk .github/actions/resolve-config/package.json # test-scope: plugins/source-control/skills/babysit-prs/scripts/tests/fixtures/postmerge/merged-pr.json plugins/source-control/skills/babysit-prs/scripts/tests/fixtures/postmerge/workflow-run.json plugins/source-control/skills/babysit-prs/scripts/tests/fixtures/review_evidence/probe_rerun_after_success.json +# test-scope: plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_review_evidence.py plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_merge_async.py plugins/source-control/skills/babysit-prs/scripts/tests/test_babysit_merge.py plugins/source-control/skills/babysit-prs/scripts/tests/repo_config_fake.py plugins/source-control/skills/babysit-prs/scripts/babysit_merge_prefilter.py """The Work status field (`models.issue-status`) as a hold source for the pr-merge lane, the capped-close park and the post-merge demotion record.