Repository navigation
test: the numeric-option ratchet is its own pin; a range check refuses an added row (#1608, slice 1) - #1614
test: the numeric-option ratchet is its own pin; a range check refuses an added row (#1608, slice 1)#1614markramm wants to merge 11 commits into
Conversation
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
…atchet-raise trailer (#1608) Reads each registered list at BASE and HEAD with git show + ast (never imports the test module); removals pass, additions need the trailer, an unreadable list fails by name. Registry holds NOT_YET only in slice 1. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
…d so removals merge (#1608) Drops NOT_YET_PINNED_SIZE and its two tests; the range check (scripts/check_ratchets_only_shrink.py) now refuses growth. A comment-only '#' line between module groups keeps adjacent group removals from touching. test_listed_rows_are_not_stale is unchanged and still catches stale rows. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
|
Push refused, and I have stopped as the brief says. The cause is mine: I amended Nothing is force-pushed or rebased. The remote is at Generated by Claude Code |
|
Conductor, answering your 14:51Z stop on PR #1614 (2026-11-17). Stopping was right. No force-push, no rebase, no amend from here on. Do exactly this:
Scope reminder: the one step in .github/workflows/ci.yml is the maintainer's to merge, so say in the report exactly what it runs and what it needs (fetch depth, base ref), and that the range check passes on this PR's own range. Do not touch any other ratchet in this slice. |
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
One conflict, in tests/test_cli_numeric_options_declare_a_range.py: #1595 deleted the eight `pyrite sw` rows and lowered NOT_YET_PINNED_SIZE. Kept this branch's layout (separator lines, no pin, no pin tests) and deleted the software-kb group's comment line and rows, leaving the separators. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
|
Finding, and I have stopped as the brief says. #1599 landed on Two hunks conflict. What I traced, read-only, nothing resolved or pushed:
Both conflicts exist because Waiting for a decision on how to proceed. Resolving it by merging Done and green so far: Generated by Claude Code |
|
Conductor, answering your 15:29Z stop on PR #1614 (2026-11-17). Stopping was right, and your reading is right: it is a one-time transition conflict, because #1599 was written against the old layout and the old pin. Proceed, no decision needed:
|
One conflict, in tests/test_cli_numeric_options_declare_a_range.py: #1599 deleted the `pyrite wiki stubs` group and lowered NOT_YET_PINNED_SIZE to 31, both written against the old layout. Kept this branch's layout, deleted the wiki group's comment line and row, left the separators, no pin line. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
|
Report posted at d8cda52 Generated by Claude Code |
Review at d8cda52 (conductor, 2026-11-17)Automated: read by the conductor from the pushed head, with one single-process run of the new script; no suite run. CI on The theme's property holds on this head: removing rows from Checked by running, against
Checked by reading:
Limits, stated here so the merge is made knowing them:
Both are the design as approved, not defects; none needs a follow-up beyond slice 2, which #1608 already holds. For the maintainer: this changes Recommendation: merge, after the merge of |
|
Conductor, 2026-11-17T18:38Z, for PR #1614 (#1608 slice 1). #1620 has MERGED (dev 5beda72, 18:20Z). Do now, as already instructed:
Then stop. Do not mark the PR ready: it changes |
One conflict, in tests/test_cli_numeric_options_declare_a_range.py: #1620 deleted the two `qa assess` rows and lowered NOT_YET_PINNED_SIZE to 30, both written against the old layout. Kept this branch's layout, deleted the qa group's comment line and rows, left the separators, no pin line. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3
|
Third merge of dev posted at 81ec516
PR left as a draft; not marked ready. Generated by Claude Code |
Part of #1608 (slice 1)
Branch: this session was given
claude/ratchet-not-yet-pin-ae38fa, used instead ofprocess/1608-ratchet-range-check.Acceptance (from #1608)
git merge-treein the PR; no test needs to run git).tests/test_fix_commit_check.pyhas.Report
Branch:
claude/ratchet-not-yet-pin-ae38faPushed SHA:
d8cda527147db1417e1805196e8499ad08470bf4.git ls-remote origin claude/ratchet-not-yet-pin-ae38faprinted that SHA, and localgit rev-parse HEADprinted the same, checked right after the push and before anything else touched a commit.Commits (8 of mine, then 2 merges of
dev):32dac049kb: the claim (backlog item).0b472525test:scripts/check_ratchets_only_shrink.pywithtests/test_check_ratchets_only_shrink.py.a7ea363ftest:NOT_YETis its own pin; the pin and its two tests are deleted; groups separated by a#-only line.f019e05atest: the new tests' subprocess calls get atimeout=(a repo rule,test_no_test_call_can_wait_forever, caught it).d6ac1160ci: one step, "Check ratchet lists only shrink (pull_request only)".3ae3f366docs: CONTRIBUTING, "Running the tests".f0686ad8kb: backlog item moved todone/(this commit alone does not carrystatus: done, see Unsure).71276751kb: backlog itemstatus: done(a new commit; the status line indone/really isdone).c0337ad1,d8cda527: merges oforigin/dev(see (a) below).Footprint:
git diff origin/dev --statatd8cda527: the backlog item,scripts/check_ratchets_only_shrink.py(185),tests/test_check_ratchets_only_shrink.py(322),tests/test_cli_numeric_options_declare_a_range.py,.github/workflows/ci.yml(+9, one step),CONTRIBUTING.md(+8). Six files, nothing else, no changelog fragment (the fragment check is advisory and did not refuse).Done:
tests/test_check_ratchets_only_shrink.pyfailed at collection withModuleNotFoundError: No module named 'check_ratchets_only_shrink', so all of its tests were red at import (1 error, 0 collected).scripts/test-affected --runon the final tree:27470 passed, 258 skipped, 7 xfailed, 0 failed. The pre-push hook did not run a second suite.Acceptance evidence
(c) Merge demonstrations (throwaway local branches off this branch's layout, since deleted; the commands are in the sed scripts below):
Branches were made with
sed -i '/^ ("pyrite sw /d',sed -i '/^ ("pyrite wiki stubs"/d', and a rangedseddeleting each pair of groups' comment line and rows while keeping the#separator lines (6 and 5 deletions). I also ran every adjacent single-group pair (13) and every adjacent pair-of-groups (11) with a script on an in-memory base: all exit 0. Without the separator lines, every adjacent-group pair conflicted (exit 1);ruff formatdeletes a blank line inside the set literal, so the separator is a line holding only#. The list's comment says what it is for.Planted added row, then the trailer:
(throwaway branch, deleted, never pushed.)
Stale row still fails: with a planted
("pyrite social ghost", "limit")row,pytest tests/test_cli_numeric_options_declare_a_range.py::test_listed_rows_are_not_stalegave1 failed:NOT_YET row \pyrite social ghost` `limit`: no such numeric option; delete the row. Plant removed withgit checkout --`, not committed.Range check on this PR's own range:
It also exits 0 against
d4fcea8c.(a) What the merges of dev conflicted on, and how: both merges conflicted only in
tests/test_cli_numeric_options_declare_a_range.py, in the same two places. First merge (#1595,aa7deebc): dev had deleted the eightpyrite swrows and loweredNOT_YET_PINNED_SIZEto 32. Second merge (#1599,814382d3): dev had deleted thepyrite wiki stubscomment line and row and lowered the pin to 31. Resolution each time: keep this branch's layout, delete that group's comment line and rows, leave the separator lines, keep no pin line.Proof of the second resolution (set of rows here equals dev's at
a5f942bd):(b) Live merge-tree check. Right after my first merge, #1599 landed on
dev, and the check was NOT clean:The cause is the transition (see Limits), not a defect of the layout. After the second merge it is clean, including against the latest
dev(d4fcea8c, #1618):CI
.github/workflows/ci.yml, one step, "Check ratchet lists only shrink (pull_request only)", directly after "Check fix: commits have tests (pull_request only)", sameif: github.event_name == 'pull_request' && matrix.shard == 1. It runspython scripts/check_ratchets_only_shrink.py --range HEAD^1 HEAD. It needs the same as the fix-commit step:fetch-depth: 0(already set) sogit showandgit logcan reachHEAD^1and the PR's commits, andHEADbeing the PR merge commit withHEAD^1the base tip. No new dependency (stdlib andgitonly). Maintainer-merged file.3ae3f366): jobtest (3.11, 1), step 11. On that SHAgateandverify-redwere green too.d8cda527: CI was only queued when I posted this, sogateandverify-redford8cda527are not yet read.gateandverify-redwere green on3ae3f366, and the check suite onc0337ad1finished with nothing failing. I did not readd8cda527's results.verify-redon3ae3f366graded the new file's tests as import-only (weak; a new script has nothing for them to fail against, as in the red list above) andtest_listed_rows_are_not_staleas an unexpected pass (only its message text changed). That job is advisory.Limits (the transition)
Every open PR written against the old layout (#1619, #1620, #1622, #1569, and any other #1541 slice) conflicts once with this change, whichever of it and this PR lands second, in the same two places: (1) the removed group's lines sit next to the new
#separator lines, (2) theNOT_YET_PINNED_SIZEline they lower is deleted here. After this is ondev, two removals do not conflict (the merge-tree demonstrations above).The two-line recipe an author follows, after
git merge origin/dev, intests/test_cli_numeric_options_declare_a_range.py:#separator lines and noNOT_YET_PINNED_SIZE), then delete your module's group comment line and its rows, leaving the separator lines.NOT_YET_PINNED_SIZE = <n>line and its comment if the conflict keeps either (nothing lowers a pin any more), then commit the merge.Unsure
read_rowsandcheck_rangeinscripts/check_ratchets_only_shrink.py(it becomes a gate).read_rowstakes the last module-level assignment, as import would.#-only line, so removing one whole group leaves two#lines in a row. Harmless, and the list's comment says so.kb:commit recorded only the rename, I amended it before knowing the first push had gone through, the push was refused, and I stopped (no force-push, no rewrite of the remote). That is why commits 7 and 8 are two. The maintainer instructed the recovery.Left
For slice 2, from a dry read of
git grep -nE '^[A-Z_]*(SIZE|COUNT|PINNED|TOTAL)[A-Z_]* *= *[0-9]+' -- testsplus anastpass over each file:ALLOWLIST(dict, 52) intest_tests_drive_the_surface_not_the_mock.py;PUBLIC_ENTRY_POINTS,PUBLIC_API_OPERATIONS,REST_NOT_YET_MIGRATED,REST_WRITE_TIER_NOT_YET_MIGRATED,REST_READS_OVER_POST(dicts) intest_every_entry_point_passes_the_policy.py;ALLOWED(dict, 2) intest_response_text_is_pyrites.py;ALLOWLIST(dict, 0) intest_storage_never_imports_services.py;ENTRY_FILE_WRITERS_NOT_YET_CONVERTED(dict, 0).MCP_NOT_YET_MIGRATED(built by a call, not a literal), andALLOWLISTandCOMPOSITION_ROOTSintest_layer_boundaries.py(dict displays whose values are not literals, soast.literal_evalof the whole value fails; reading only the keys would need a change to the reader).PINNED_MCP_TOOL_COUNT,PINNED_REST_OPERATION_COUNT,PINNED_MCP_TOTAL_TOOL_COUNT) are plain integers from walks; the issue's option (A) applies.PINNED_MTIMEintest_verify_red_ci.pyis a timestamp, not a ratchet.Learned
ruff formatstrips blank lines inside a set literal, so the group separator has to be a comment line. Captured in: the comment aboveNOT_YETintests/test_cli_numeric_options_declare_a_range.py.timeout=(tests/test_test_rules.py::test_no_test_call_can_wait_forever). Captured in:tests/test_check_ratchets_only_shrink.py(every call hastimeout=60).Tokens: not reported.
🤖 Generated with Claude Code
https://claude.ai/code/session_013BnEiZFj8CP7nEnkefXVU3