Skip to content

update-shape.py: --accept-local re-pins a both row from the merged file, as AGENTS.md promised, and --branch may name the branch you are on (#84) #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettheap merged 2 commits into from
Sep 10, 2026
Merged

update-shape.py: --accept-local re-pins a both row from the merged file, as AGENTS.md promised, and --branch may name the branch you are on (#84) #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f8d573
update-shape.py: --accept-local re-pins a `both` row from the merged …
brettheap Sep 10, 2026
795253f
test_update_shape.py: the adopted-root fixture builds on the existing…
brettheap Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,10 @@ git -C <path> push -u origin shape/update-<sha> # then open a pull request
`validate-pins.py` reports today invisible. Whether the project keeps its
edit is the human's decision; the other two exits are to revert it or to
carry it upstream.
4. **`both` is a merge, and the tool refuses it.** Merge by hand, commit, then
re-run with `--accept-local <path>` on the file you merged.
4. **`both` is a merge, and the tool refuses it unless you say `--accept-local
<path>` too.** Merge by hand, commit, then re-run with `--accept-local
<path>` on the file you merged — that commit goes on the branch `apply` is
then pointed at with `--branch`.
5. **`upstream-added` is a file the STANDARD gained since the pin, and `--add`
is per file.** Report the paths `check` names; pass `--add <path>` only for
a file the human has said to take, and never to quiet the report. Without
Expand Down
15 changes: 13 additions & 2 deletions tests/test_repo_hygiene.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,20 @@ def test_agents_md_is_short_enough_to_be_read():
before anyone is told the estate is parked — a member SKIPPED for want of
a working clone beside the holder was never asked at all, which is the
one outcome an assistant reads as success. The mechanics themselves are
the Speckit git extension's and are deliberately NOT described here."""
the Speckit git extension's and are deliberately NOT described here.

342 -> 344 on 2026-09-10, for point 4's exception (#84). `apply` had
refused every `both` row before it ever consulted `--accept-local`, so
the exit this file already documented — merge by hand, commit, re-run
with `--accept-local <path>` — could never actually be taken; the tool
was fixed to match the file rather than the other way around. The one
sentence added says where that commit goes: on the branch `apply` is
then pointed at with `--branch`, because that is the checkout the
documented exit leaves behind, and an assistant that recreated the
branch instead of committing onto the one already there would be
re-running the tool at the wrong git state."""
lines = (REPO / "AGENTS.md").read_text().splitlines()
assert len(lines) <= 342, f"AGENTS.md is {len(lines)} lines; the cap is 342"
assert len(lines) <= 344, f"AGENTS.md is {len(lines)} lines; the cap is 344"


def test_claude_md_points_at_agents_md():
Expand Down
Loading
Loading