… writes its pin file as the scaffold does, so an adopted root passes `validate-pins.py` (#273); a `--pin-source` that cannot answer is `pin-source-unreadable` (#339) (#508)
**Brought up to date after #409 squash-landed** by merging origin/main (9736424, #409's squash) as f9ed46f. Its `scaffold-project.py` conflict was resolved to this branch's side once `git diff b70a07d 9736424 -- scaffold-project.py` (#409's final head against its squash) came out empty. So the file is the one tested on this branch plus main's own later changes to it, and holds nothing of #409's; details below.
This branch carries #275's adopt half. It was built on `fix/pin-source-env-collisions`, PR #409 (#275's scaffold half and its fix round), merged at 6494714 as 583f647, over the earlier 5690235 (34dbd86). After 6494714, #409 only merged main, five times, up to its final head b70a07d, and none of those merges has a hand edit (`git show --remerge-diff` is empty for each). Adopt's refusal of two products that share a source variable goes through #409's function, so this branch lands after #409. It was never rebased.
`git diff b70a07d 9736424` is empty for each file #409 touched: `scaffold-project.py`, `scripts/repo_shape.py`, `templates/assembly-root/scripts/validate-pins.py` and `tests/test_pin_source_env_collisions.py`. What f9ed46f resolves, four files with one hunk each:
- **`scaffold-project.py`.**
- The conflict hunk is main's block from `PIN_COLLISION_REMEDIATION` through `_pin_collision_remediation`, which #409's squash edits: it adds `PIN_VARIABLE_REMEDIATION`, `_colliding_pin_variables` and `_pin_collision_remediation` and changes `_refuse_colliding_pins`. This branch moved all of that to `scripts/shape_materialize.py`. The hunk takes this branch's side. (The merge commit's message says "re-adds"; this is the exact account.)
- #409's auto-merged import of `PIN_SOURCE_ENV_PREFIX, pin_source_env_collisions` is dropped, because nothing in the file uses either name any more.
- It is not `git checkout --ours` of the whole file. Main changed the file beyond #409 since this branch last merged it: #355's `--tracking-branch` check (6c2a371) and a73b4e9's `RULESET_HINT`. Those lines stay.
- The result is the file `git merge-tree` gives for this branch with main before the squash (518010b). Its diff from the file tested here has the same patch-id as main's own 3ef059c..518010b change to it.
- **`templates/assembly-root/scripts/validate-pins.py`.** Main's side, which is #409's final blob, with main's #359 workflow reader in it. This branch had no change of its own to the file beyond #409.
- **`adopt-project.py`, `_commit_the_split`.**
- Main: #445 wraps the function in its late-failure `try`, and #394 builds an `append` with the plan's submodule record.
- This branch: its only edits there were a comment and `neutral_pins=_recorded_pins(plan)` on the materializer call.
- Both now sit on main's call inside the `try`: `append=append, neutral_pins=_recorded_pins(plan)`.
- **`docs/cli.md`.** It is regenerated with `scripts/render-cli-reference.py`, and `--check` is ok. It differs from main's only in the `--pin`, `--pin-owner` and `--pin-source` help of `adopt-project.py plan`.
`scripts/repo_shape.py`, `templates/assembly-root/scripts/validate-pins.py` and `tests/test_pin_source_env_collisions.py` are main's blobs, which are #409's: this branch adds nothing to them. Nothing of #409 is lost. Its scaffold behaviour is `shape_materialize.refuse_colliding_pins` and `pin_variable_collisions`, keyed by #409's `pin_product_key`.
**73d65c6, after the merge.**
- **The change.** `_read_pins` reads `plan.get("pins")` where it read `plan.data.get("pins")`.
- **Why.** #445's `tests/test_adopt_late_failure.py` hands `_commit_the_split` a `SplitPlan` as its plan, a `dict` that adds `entries`. On f9ed46f, three of its tests stopped at "committing the split" with `AttributeError: 'SplitPlan' object has no attribute 'data'` (3 failed, 83 passed in that file).
- **Nothing else changes.** `Plan.get` with no default returns `plan.data.get(key)` exactly, so a loaded plan reads as before.
`adopt-project.py plan --pin` took a NAME only (`--pin openGlass`) and refused a trailing `@<commit>`. `plan`, `check` and `execute` each exited 0, and `execute` printed `adoption verified`. The manifest then listed the name in `neutral_product_pins:` with no `contracts/<product>-pin.yaml` beside it, and on its first run the adopted root's own `validate-pins.py` refused it as `neutral-pin-missing`.
#273's table, reproduced on c7c02fa with the issue's own commands (local bare remotes, and a stub `gh` that exits 97):
| `--pin` | c7c02fa | this branch |
|---|---|---|
| `openGlass` | `execute` exit 0, `- openGlass`; clone's `validate-pins.py` exit 2 `neutral-pin-missing` | `plan` exit 2 `pin-malformed`, with the scaffold's remediation (`--pin openGlass@<40 hex>`); no plan is written |
| `opensoft/openGlass` | exit 0, `- opensoft/openGlass`; exit 2 `neutral-pin-missing` for `contracts/opensoft/openglass-pin.yaml` | `plan` exit 2 `pin-malformed` |
| `spec` | exit 0; `validate-pins.py` exit 0, reading the leg's `contracts/spec-pin.yaml` as the neutral pin | `spec@<sha>` is `adopt-pin-collides` at `plan` |
| `shape` | exit 0; `contracts/shape-pin.yaml` read as the neutral pin | `shape@<sha>` is `adopt-pin-collides` at `plan` |
| `openGlass@<sha>`, `opensoft/openGlass@<sha>` | `plan` exit 2 `adopt-pin-malformed` | `plan`, `check` and `execute` exit 0, and `gh` is called 0 times. `contracts/openglass-pin.yaml` is written and the manifest lists `- openGlass`. In the clone, `validate-manifest.py` exits 0, and `validate-pins.py` exits 0 with `openGlass: pin commit … digest recomputes` |
Brett ruled for decision 1's first option ("go with your recommendation on #273"): adopt takes the scaffold's pin and writes the scaffold's pin file. That reverses the NAME-only `--pin` from #6, and the comment that described it is replaced with the new contract.
- **One implementation.** The scaffold's pin code moved into `scripts/shape_materialize.py`, next to `neutral_pin_path` and the materializer that writes the file. What moved:
- `PIN_ARG_RE`, `parse_pin`, `pin_digest_from_source` and `pin_digest_from_gh`;
- `declared_pin_values`, `declared_pin_products` and `PIN_COLLISION_REMEDIATION` (in #309's wording);
- from #275's branch, `PIN_VARIABLE_REMEDIATION` and the variable check;
- `_refuse_colliding_pins`, split into the pure `pin_collisions` and `pin_variable_collisions`, and `refuse_colliding_pins(refusal=...)`, which raises one refusal for both.
The code did not move verbatim. `_refuse_colliding_pins` became the three functions above; `pin_digest_from_source` was rewritten for #339 (below); and fix round 1 changed three of them (below): `pin_variable_collisions` keys each pin by #275's `pin_product_key`, `pin_digest_from_source` spells a path that is not printable, and `pin_digest_from_gh` refuses a missing `gh`. The scaffold's behaviour is otherwise unchanged. `scaffold-project.py` imports what it calls under its old names. Lane 5's review ran 34 scaffold cases (every pin refusal, the `gh` stub's four modes, dry and real successes) on 34dbd86 and on this branch at 7a94b6b. rc, stdout, stderr, the `gh` log and the files made were identical, apart from the shape's own commit and digest and #339's row. Its pin tests and #275's pass as they are. `tests/test_git_output_decoding.py`'s exemption for `pin_digest_from_gh` follows the function to its new file.
- **`plan`.** `--pin`, `--pin-owner` and `--pin-source` mean what they mean for the scaffold. `plan` reads the digest from `--pin-source` or `gh api`, and records product, repository, commit, digest and `digest_source` in the plan, so `check` and `execute` read no network for a pin. `plan` refuses:
- a name with no `@<commit>`, as `pin-malformed`. That includes an empty `--pin ''`, which adopt used to drop and now refuses, as the scaffold always has;
- `spec`, `code` and `shape`, in any case, as `adopt-pin-collides` (#273 decision 4), in the scaffold's sentence and remediation (#241, #309);
- one product given twice, the same way, whether it is a repeat or two names that share one file (decision 5);
- two products that one `SHAPE_PIN_SOURCE_<PRODUCT>` names, such as `open-glass` and `open_glass`, the same way, through #275's check;
- a leg path over a pin's file, as `adopt-leg-path-collides`;
- a `--pin-source` path that `check` would refuse in `digest_source:` (fix round 1), as `adopt-unwritable-value`. It is asked only when a `--pin` records the path;
- with no `gh` on PATH and no `--pin-source`, `gh-not-found` (fix round 1).
- **`check` and `execute`.** These are new `check` findings, and `execute` refuses each one before any leg exists. They come from `_leg_findings`, the list `check` and `_refuse_what_check_finds` share:
- `plan-pin-unrecorded`: a name alone (an old plan's `pins: [openGlass]`, or a hand edit), or an entry missing its commit or digest;
- `plan-pin-malformed`;
- `plan-pin-collides`, which covers two pins at one file, a pin at a file the shape writes, and two products that share one source variable;
- `plan-root-holds-pin`: a source path kept in the root at the pin's file. The materializer would write the shape's pin beside it under `shape/`, and `validate-pins.py` would read the source's file instead.
How each finding ends:
- `plan-pin-unrecorded` and `plan-pin-malformed` end with the `plan --pin <product>@<40 hex commit>` that records the pin whole.
- `plan-pin-collides` ends with re-running `plan` with each product once, or, for two products that share a source variable, with one product of each such group.
- `plan-root-holds-pin` ends with the kept path's own remedy: send that entry to a leg, `drop` it, or rename it in the source and re-run `plan`.
A leg moved over a pin's file in the plan is `plan-leg-path-collides`.
- **Also part of #386: its `pins:` row.** A hand-edited `pins:` that is not a list (a name such as `pins: openGlass`, a number, a mapping, a quoted string) is now `plan-pin-malformed` in `check` (`` `pins:` is 'openGlass', not a list of pins ``), and `execute` refuses it before any leg exists.
- Where: `_read_pins` in `adopt-project.py`; the test row is `plan-pin-malformed-not-a-list` in `tests/test_adopt_pins.py`.
- Before: on main, `check` said `plan ok` for the name, the mapping and the string, and gave a traceback for the number (reproduced by lane 5's review on cb7063f). #386 records that `execute` then wrote the name as eight one-letter pins.
- Not fixed here: #386's other keys, `allow_empty_legs:`, `paths:`, `legs:` and `source:`, so #386 stays open. Lane 2's #435 takes all of #386, `pins:` included, and its `pins:` rule keeps only text items where this branch writes mappings; whichever lands second reconciles them (#435 (comment), and "Where the meaning meets" below).
- **`execute`.** It writes each pin through `materialize_assembly_root(neutral_pins=...)`. The manifest lists the product with the owner stripped (decision 3), so the entry and the file agree.
- **Docs.** `--help` is updated and `docs/cli.md` regenerated (`render-cli-reference.py --check` ok).
`pin_digest_from_source` caught only `Refusal`. A directory that is no clone is git's own failure, so it was always `pin-source-unreadable`, exit 2. A path `subprocess.run` cannot enter never reaches git: it is a `FileNotFoundError`, `NotADirectoryError` or `PermissionError` out of `cwd=`, and nothing caught it. `scaffold-project.py --pin ... --pin-source <that>` ended `--dry-run` and the real run alike in a traceback, exit 1. Since the move above, `adopt-project.py plan --pin` reads its digest through the same function and ended the same way. Both reach it through `declared_pin_values`, and `check` and `execute` read no source, so that call is the only reader.
The issue's table, run on ab623dd for the scaffold and on d806e8f for `adopt-project.py plan` (adopt has no `--pin-source` on ab623dd), then on this head. `gh` is a stub that logs and exits 97, with `GH_TOKEN` bogus and an empty `GH_CONFIG_DIR`; it was called 0 times in every run:
| `--pin-source` | before | this branch |
|---|---|---|
| a directory that is not a clone | `pin-source-unreadable`, exit 2 | unchanged |
| a path that does not exist | `FileNotFoundError` traceback, exit 1 | `pin-source-unreadable`, exit 2: `<path> could not answer for opensoft/openGlass @ <40 hex>: no such directory` |
| a file | `NotADirectoryError`, exit 1 | exit 2, `... it is a file, not a directory` |
| under a parent this user cannot enter | `PermissionError`, exit 1 | exit 2, `... Permission denied` |
| a symlink loop (not in the issue) | `RuntimeError` out of `Path.resolve()` on 3.12, exit 1 | exit 2, `... Too many levels of symbolic links` |
The real run and `--dry-run` give the same stdout and stderr, and nothing exists afterwards (no remote directory, no work directory; for adopt, no plan file).
What changed, in `scripts/shape_materialize.py` only:
- `pin_digest_from_source` catches `OSError` as well as `Refusal` and raises the existing `pin-source-unreadable` with its remediation unchanged. The message names the path and the reason.
- `stat()` judges the source inside the guard, as #312 does in `validate-pins.py`, and the sentences are that file's: a missing path, or one beneath a file, is "no such directory"; a file is "it is a file, not a directory"; any other `OSError`, from `stat()` or from git's `cwd=`, is the system's own reason (`strerror`). It is not `exists()`/`is_dir()`, which before 3.14 swallow only a missing path. A source `stat()` can read but `cwd=` cannot enter, a directory with no search bit, fails in `tree_digest` and the same guard answers it.
- `declared_pin_values` resolves the path through a guarded `_resolved_pin_source`. `Path.resolve()` raises a `RuntimeError` on a symlink loop before 3.13 (an `OSError` since), before the digest was asked for. As typed, `stat()` meets the loop and says so.
- A source that answers is read exactly as before: a relative path resolves against the working directory, a symlink to a clone is followed, `digest_source` reads `local-clone (<path as typed>)`, and the digest is `tree_digest`'s.
`tests/test_pin_source_unreadable.py` (46 tests in the #339 commit; fix round 1 adds 17 for S1 and moves one, below) runs each case through `scaffold-project.py --dry-run`, its real run and `adopt-project.py plan`: missing, a file, beneath a file, relative and missing, a parent and a source with no search bit (skipped on Windows and as root, by a mark, so before any fixture builds a directory), a 300-character name, a symlink loop (skipped on Windows) and a directory that is no clone. Each asserts exit 2, the refusal naming the path and the reason, its remediation, no traceback and nothing created. It also holds `--dry-run` and the real run to the same stdout and stderr, checks the path is printed escaped under an ASCII stderr and as a surrogate when it is not UTF-8, and checks that a relative source and a symlink to a clone read as before. The session `gh` guard fails any test whose run called `gh`.
origin/main ab623dd reached this branch through implQ's branch: 34dbd86 is a30091f merged with ab623dd. One file conflicted there, `templates/assembly-root/scripts/validate-pins.py`, in seven hunks, because #312 (8cdca5e) replaced `keyed_sources` and `default_source` with `PinSources` and #275 added `env_shared` and `shared`. #312's blob is the same at its PR head, at the squash and at ab623dd, so it landed the file implQ resolved against. The resolution keeps #312's side in all seven and adds #275's on top:
| # | hunk | resolution |
|---|---|---|
| 1 | `resolve_neutral_pin_source` signature | #312's `sources: PinSources` and 3-tuple return, plus #275's `env_shared: bool = False` |
| 2 | its docstring tail | #312's `Returns (path, how, typed)` text, plus #275's "Rule 2 is skipped when `env_shared`" paragraph |
| 3 | `_recompute_neutral_pin_digest` signature | #312's `sources`, plus #275's `shared: frozenset[str]` after `report` |
| 4 | the `resolve_neutral_pin_source(...)` call inside it | #312's 3-tuple unpack, plus `env_shared = product.casefold() in shared` and the extra argument |
| 5 | `_check_one_neutral_product_pin` signature | #312's `sources`, plus #275's `shared` |
| 6 | its call of `_recompute_neutral_pin_digest` | `sources, report, shared` |
| 7 | `_check_neutral_product_pins` docstring and body | #312's `PinSources(...)` and `_note_unused_pin_sources`, plus #275's paragraph, `_report_pin_source_collisions(products, report)` and `shared = frozenset(pin_source_env_shared(products))` |
This branch's own merge of 34dbd86 (5690235) had no conflict, and neither had its merge of #409's fix round, 6494714 (583f647). That fix round made `neutral-pin-source-collides` a note and keyed "one product" by `repo_shape.pin_product_key`. At 421e4e5, `templates/assembly-root/scripts/validate-pins.py`, `scripts/repo_shape.py` and `tests/test_pin_source_env_collisions.py` were byte-identical to the tree `git merge-tree` gives for 6494714 with origin/main 3ef059c (blobs 5604007, 091966b, 5220787), so this branch added nothing to those three files beyond #409. The 34dbd86 merge brought in #335, #312, #317, #270 (f795cf7), #344 and #349 with no conflict. Earlier merges of origin/main (87373a6, for #309's reworded constant, and e43fa95) are unchanged.
Fix round 1 merged origin/main three more times:
- **cd1fc79 (2bcfa69).** It brought #245, #351, #350, #345, #372, #371, #354, #380, #377 and the rest since ab623dd, with no conflict.
- **45e01f4 (4098b61).** It brought #396's `tests/test_agents_md_codes.py`. That test finds `scaffold-pin-collides` as a string constant of `scripts/shape_materialize.py`, which `SHIPPED` lists.
- **3ef059c (421e4e5), #314.** One conflict, one hunk in `adopt-project.py`. This branch's `_refuse_an_unrecordable_pin_source` and #314's section "The project must be able to hold what `execute` writes into it (#261)" were added at the same place; both are kept. Where the two meet, lane 5's earlier recipe applies:
- `_flag_plan` builds each pin as the `PIN_FIELDS` mapping `plan` writes, not `list(pins)` of products. So the plan `plan` asks the validator about is the plan it writes.
- #314's `test_plan_asks_what_check_asks_of_the_same_keys` plans `--pin openGlass@<commit> --pin-source <stand-in>` where it planned the name alone, which `plan` now refuses.
Then f9ed46f, after #409 squash-landed, and 73d65c6 after it (top of this description).
On the merged tree exactly one test failed: `tests/test_adopt_template_values.py::test_check_finds_and_execute_refuses_a_hand_edited_value[pins-surrogate]`. It plans, then hand-edits the plan to `pins: ["openX\ud800"]`, a name-only pin with a lone surrogate. Before this branch the refusal's headline was `REFUSED plan-unwritable-value`. A name-only pin in a plan is now `plan-pin-unrecorded` (#273), so `check` has a second, independent finding for that very plan, and the headline is the first finding's:
```
REFUSED plan-pin-unrecorded: 2 finding(s) ...
FINDING plan-pin-unrecorded: `pins:` entry 1, 'openX\ud800', is a name with no commit and no digest ...
FINDING plan-unwritable-value: a `pins:` item is 'openX\ud800', which `execute` writes into the assembly root's `project.yaml`, and it holds a lone surrogate ...
```
Nothing about #270's contract changed. The lone surrogate is still found as `plan-unwritable-value`, listed under the refusal, and `execute` still refuses before any leg exists. `check` builds `_leg_findings`, where `_pin_findings` sits, before it calls `_value_findings`, so the pin finding comes first. d806e8f changes one assertion for that row, `pins` only: the headline is `REFUSED plan-pin-unrecorded: ` where it was `PLAN_REFUSED`. The other 15 rows and the finding assertions, including the `plan-unwritable-value` line, are untouched.
Lane 5's review of 7a94b6b found 3 should-fix and 5 nits. Each is answered here:
- **#409's `pin_product_key` (review N1).** The merge of #409's fix round could not carry it, because this branch had moved the function that used it out of `scaffold-project.py`. `pin_variable_collisions` now keys each pin by that function, where it casefolded. `openß` and `openss` are two pin files and one `SHAPE_PIN_SOURCE_OPENSS`, and a casefold named each of the two pins twice. No `--pin` or recorded `pins:` entry `PIN_ARG_RE` admits can spell either, so the test asks the function directly. `refuse_colliding_pins`' docstring now says, in #409's words, that the root's `validate-pins.py` only notes such a pair.
- **S1, a `--pin-source` path that is not printable.** `pin_digest_from_source` names the path as typed unless it is not printable (`str.isprintable`), and then as Python's `repr` spells it (`shown_source`). That covers the refusal's head and git's own reason, which names the directory it ran in. Printed raw, an ESC reached the terminal, and a line break or a carriage return began a line of the path's choosing, a forged `REFUSED` line among them, from the scaffold and from adopt. The traceback #339 replaced had shown a `repr`. A printable path is named byte for byte as before.
- **S2, no `gh` on PATH.** `pin_digest_from_gh` refuses as `gh-not-found`, exit 2, as `repo_shape.tree_digest_from_gh` names it, and offers `--pin-source`. It was a `FileNotFoundError` traceback, exit 1, from the scaffold and, new with this branch, from `adopt-project.py plan --pin`.
- **S3, a hand-edited `commit:` or `tree_sha256:`.** The lane's decision is to accept it and document it (option (c)); no behaviour changed. A pair that disagrees passes `check` and `execute` (`adoption verified`), because neither reads a network for a pin, by design. The adopted root's own `validate-pins.py` then exits 1 with `neutral-pin-digest-mismatch` wherever it can read the product. `check` now says so once, after the pins it will write: "each pin as `plan` read it, not read again here: the root's own `validate-pins.py` recomputes its digest wherever it can read the product". Options (a), `execute` recomputes before it creates the legs, and (b), `check` recomputes from a clone still on the machine, are filed as #449.
- **N2, a `--pin-source` that `plan` cannot record.** `plan` asks `check`'s question (`one_printable_line`) of the path it records in each pin's `digest_source:`, before any digest is read. It refuses one that fails as `adopt-unwritable-value`, in #270's words (`unwritable_reason`), or as "an invisible formatting character" where those name nothing. Before, it was planned, exit 0, and printed raw in the report. `check` then refused it as `plan-pin-malformed` and said to re-run the same `plan`. The report's `pin` line and `check`'s `write` line now spell the digest's source with `_shown`. The scaffold half is pre-existing (a line break in the path is written into the pin file; a byte that is not UTF-8 dies after all three repositories exist) and is filed as #450.
- **N3, six hunks no test guarded.** Each now has a test that fails when it alone is reverted:
- the two name guards (a `pins:` name holding an ESC and a forged line);
- the lower-casing of the commit and the digest (an upper-cased hand edit);
- the `digest_source` printability check;
- the not-text check (`commit: 1234567` unquoted);
- the gitlink filter (a submodule kept where the pin is written is `plan-submodule-root` alone).
- **N4.** This body.
- **N5, #339's third decision.** A `--pin-source` that nothing reads is still silent, now in adopt too. This PR does not decide it. #451, filed, lays out refuse, note and leave, so closing #339 loses nothing.
Lane 5's second review, of 421e4e5, found no blocking item, 2 should-fix items and 3 nits. The two should-fix items are this body: the landing after #409 (above) and #386 (above). The code needed no change for them. f63d1ed adds two tests and no code:
- **n1. `plan` asks nothing of a `--pin-source` no `--pin` records.** With the `args.pin and` guard dropped, such a path holding an ESC or a zero-width joiner was refused in a sentence naming no file ("`execute` writes into , and ..."), and every test still passed. `test_a_pin_source_no_pin_records_is_not_asked_about` holds the plan to exit 0 and `pins: []`, with the path named nowhere in the plan or the report. The ESC row is POSIX-only by the file's `POSIX_NAMES` mark; the zero-width joiner row runs everywhere. It holds #451's answer today, silence, so a decision there changes this test on purpose.
- **n2. A printable `--pin-source` is printed as it is.** With `_spelled` in place of `_shown` in `plan`'s `pin` line, every test still passed. `test_a_printable_pin_source_is_printed_as_it_is` holds `plan`'s `pin` line, and `check`'s `write` line for the plan `plan` wrote, to their exact text, ending `(local-clone (<path>))` with no backtick.
- **n3** needs a code change and is left out (below).
**Fix round 2, on f63d1ed.** Each run had a `gh` stub first on PATH (it logs and exits 97), `GH_TOKEN` bogus, an empty `GH_CONFIG_DIR`, `git-filter-repo` 2.47.0 next on PATH, and the identity blanked with `GIT_CONFIG_COUNT`; the session `gh` guard came first inside each run.
- **The pin set: 812 passed, 2 skipped.** It covers adopt pins, adopt plan, #339's file, #275's tests, the pin and neutral-pin validators, git output decoding, adopt template values, CLI reference, scaffold pin and reuse, scaffold pin collisions, #314's two files and #396's file. The skips are `test_adopt_plan.py:403` (no MedxEHR clone) and `test_adopt_template_values.py:223` (this host reads `git config user.name` from the repository, not from `GIT_CONFIG_GLOBAL`). That is fix round 1's 809 passed, plus the three new rows.
- **Shape doctor and scaffold leg-path collisions: 369 passed, 3 skipped** (the PowerShell line exists only on a Windows host).
- **Mutation probes**, each one line changed in a throwaway worktree, over `tests/test_adopt_pins.py` and `tests/test_pin_source_unreadable.py` less the five end-to-end adoptions:
- the `args.pin and` guard dropped: 2 failed, both n1 rows;
- `plan`'s `pin` line `_spelled`: 1 failed, the n2 test;
- `check`'s `write` line `_spelled`: 2 failed, the n2 test and `test_an_upper_cased_hand_edit_is_written_lower_cased`;
- `plan`'s `pin` line raw: 1 failed, the no-break-space test that already guarded that hunk.
**On the merged tree, 73d65c6** (the merge f9ed46f and the `_read_pins` commit), with the same harness:
- **The pin set** above, with #445's `test_adopt_late_failure.py`, `test_adopt_git_reads.py` and `test_adopt_filter_repo_failure.py` and #387's `test_adopt_empty_symlinks.py` and `test_adopt_root_manifest.py`: **988 passed, 2 skipped**. The skips are the two above.
- **Shape doctor, scaffold leg-path collisions and the adopt suites:** **967 passed, 3 skipped** (the PowerShell line). The adopt suites are e2e, execute refusals, verify, root shape paths (#387's too), leg-path collisions, clone template, ignored shape files and submodules.
- **On the merge alone, f9ed46f** (the same tree as before the `_read_pins` commit): `tests/test_adopt_late_failure.py` gave 3 failed, 83 passed, the three `AttributeError` rows above.
- `render-cli-reference.py --check` is ok on the merged tree. pyflakes reports the same four warnings on `adopt-project.py`, `scaffold-project.py` and `scripts/shape_materialize.py` as before the merge.
**Fix round 1, on 421e4e5.** Each run had `git-filter-repo` 2.47.0 on PATH and the identity blanked with `GIT_CONFIG_COUNT`. A `gh` stub that logs and exits 97 was first on PATH, with `GH_TOKEN` bogus and an empty `GH_CONFIG_DIR`, and the session `gh` guard came first inside each run.
- **The pin set:** 809 passed, 2 skipped (the same files and skips as above).
- **Doctor and scaffold:** 782 passed, 3 skipped (the PowerShell line exists only on a Windows host). It covers shape doctor, scaffold leg-path collisions, scaffold e2e, referent chain links, naming policy, repo hygiene and #351's free-text values.
- **The adopt suites:** 882 passed. It covers e2e, execute refusals, verify, spec-only, leg paths, root shape paths, plan escapes, leg-path collisions, clone template and submodules.
- **Before the #314 merge,** on 74ce4d9's tree: the first two sets gave 577 passed, 2 skipped and 782 passed, 3 skipped. On 2bcfa69's tree (the merges alone, before the fix) they gave 542 passed, 2 skipped and 782 passed, 3 skipped. After the 45e01f4 merge, `tests/test_agents_md_codes.py`, repo hygiene and CLI reference: 110 passed.
- **Lane 5's second review** also ran 421e4e5 merged with main cb7063f and with 53bee5b: the pin set, the manifest-value set, and the doctor set with #357's `tests/test_doctor_validator_rows.py`. All passed, with only the skips above.
Proof that fix round 1's tests test something:
- **On 2bcfa69's tree,** with this head's two test files laid over it, 31 of the new rows fail:
- S1: 17;
- N2 and its report spelling: 7;
- S2: 3;
- the `pin_product_key` port: 2;
- `check`'s S3 line: 1;
- the not-UTF-8 `adopt plan` row: 1.
The N3 rows pass there, as they must: they guard hunks this branch already had.
- **Mutation probes.** Each hunk was reverted alone, in a throwaway worktree, and both test files were run: 18 of 18 were caught.
- **The port:** the casefold keying (2 fail); the casefold lookup alone (2).
- **S1:** the path named raw (13); git's reason named raw (2); every path `repr`'d, printable or not (27).
- **S2:** no `except` (3).
- **N2:** no `plan` check (11); only #270's question asked (1); the formatting-character reason said otherwise (1); the report's `pin` line raw (1); `check`'s `write` line raw (1).
- **S3:** the line dropped (1).
- **N3:** the `_pin_fix` name guard (1); the `_read_pins` path guard (1); the lower-casing (1); the `digest_source` check (1); the not-text check (1); the gitlink filter (1).
- **The issue rows reproduced.** S1, S2 and N2 were reproduced on 2bcfa69's tree and shown gone on the fix (a probe driving both tools; `gh` was called 0 times).
**Before fix round 1.** Runs were on 7a94b6b, with `git-filter-repo` 2.47.0 first on PATH and the repository-local `user.name` blanked with `GIT_CONFIG_COUNT` (a workstation whose standard checkout sets one fails `test_the_scaffold_refuses_with_no_elector` on main itself; CI sets none). 7a94b6b differs from ffd1297 in `tests/test_pin_source_unreadable.py` only, so the three suites that do not read that file ran on ffd1297:
- the new file: 46 passed;
- adopt pins, adopt plan, git output decoding: 172 passed, 1 skipped (the MedxEHR clone is absent);
- scaffold pin and reuse, pin collisions, e2e, referent chain links, neutral pin and pin validators, #275's tests, naming policy, repo hygiene, CLI reference, scaffold leg-path collisions: 571 passed;
- shape doctor: 254 passed, 3 skipped (the PowerShell line exists only on a Windows host);
- the new file with repo hygiene, git output decoding and CLI reference, once more after the last edit: 176 passed.
Earlier on 5690235 and d806e8f, before the #339 commit: the adopt suites (e2e, execute refusals, verify, spec-only, leg paths, root shape paths, plan escapes, leg-path collisions, clone template) 740 passed, and `tests/test_adopt_template_values.py` with #273's other adopt tests 489 passed, 2 skipped. They were not re-run on 7a94b6b: the #339 diff touches `pin_digest_from_source` and the call in `declared_pin_values`, which those suites reach through `test_adopt_pins.py` only. Nothing was run on macOS or Windows.
Proof the new tests test something:
- **On d806e8f.** 38 of the 46 fail, each on the traceback and its exit 1. The 8 that pass are the unchanged behaviour: the not-a-clone refusal (4 rows) and the valid-source rows (4).
- **Mutation probes.** Ten hunks reverted one at a time, each failing at least one new test: the `OSError` catch (16 fail), the catch narrowed to `OSError` only (21), the missing-path clause (9), the clause narrowed to `FileNotFoundError` (3), the `S_ISDIR` judgement (3), the loop guard (4), no resolve at all (3), the old `.resolve()` call (4), the reason as `str(exc)` (12), and the file sentence as the OS's (3).
- #273's own 52 tests still fail on c7c02fa (51 fail or error; the one that passes checks the test's own table), and its 18 mutation probes were each caught.
**Re-verified after the merge.** An independent re-verification of f9ed46f and 73d65c6 found the code correct:
- #409 is carried whole. A 30,000-case fuzz of `--pin` lists through #409's final refusal and this branch's port differed in 0 cases.
- `scaffold-project.py` equals the tested file plus main's own changes that are not #409's (same patch-id).
- `_commit_the_split` keeps #445's `try` and #394's `append`.
- `_read_pins` reads a loaded plan as before.
Its findings were all in this description (the #506 bullet and three stale facts), now fixed. Runs on the head and on its merge with main 48585e6: 988 passed, 2 skipped; and 967 passed, 3 skipped.
`git merge-tree --write-tree` was run at 01:48Z on 2026-10-13, comparing hunks per file. Each PR head, fetched from `refs/pull/<n>/head` with no `gh`, was merged with 73d65c6 and with origin/main 9736424 alone. Two sets were asked about:
- every PR this description listed before that main does not now contain;
- every PR numbered above #468 whose head main does not contain: #473, #474, #490, #491, #493, #494, #495, #496, #497, #503, #504 and #505.
**Open state, read with `gh` by the coordinator at 02:00Z and refreshed at 02:25Z after a re-verification on main 48585e6.** Every pull request named below is open. #184, #94, #96, #98, #100 and #161 are closed, and #465 landed as 48585e6. `fix/adopt-plan-quote-yaml-keywords` has no pull request. #506 (`fix/scaffold-reuse-seeded-legs`) opened after this list was made, and the re-verification reads it.
- **Landed since the last draft of this list:** #343, #346, #355, #358, #373, #378, #382, #387, #394, #397, #401, #404, #409, #419, #452, #456, #465, #466 and #484. #394's `_commit_the_split` conflict and #401's `docs/cli.md` conflict are both resolved in f9ed46f, above.
- **Clean, 20:** #266, #347, #356, #374, #376, #384, #395, #453, #467, #468, #473, #474, #490, #491, #493, #494, #495, #497, #503 and #505. #453, #468 and #491 were updated onto main since the first read and now merge clean. #507 (lane 5's #486-#488) shares only the generated `docs/cli.md` with this branch and merges clean with it.
- **Conflicting with main alone, and this branch adds no hunk:**
- #402: `shape-doctor.py` 5;
- #496: `shape-doctor.py` 10 and `tests/test_shape_doctor.py` 1.
**Conflicts this branch adds:**
- **#435** (3efcc7a, lane 2's `fix/adopt-plan-field-types`, for #386).
- It adds 2 hunks in `adopt-project.py`: 5 here, against 3 with main alone. They are `render_plan`'s `pins:` line and `Plan.pins`.
- Keep this branch's `_pin_lines` and `_pin_products`. The rest is under "Where the meaning meets".
- **#504** (37ef29a, `fix/adopt-root-kept-symlinks`).
- It adds 1 hunk in `adopt-project.py`: 2 here, against 1 with main alone. It is the materializer call in `_commit_the_split`.
- Keep both arguments and both comments: `append=append, neutral_pins=_recorded_pins(plan), spell=_spelled`.
- **#506** (119d8c4, `fix/scaffold-reuse-seeded-legs`).
- It adds 1 hunk in `scaffold-project.py`. With main alone, #506 conflicts only in `docs/handbook.html`.
- #506 inserts `LEG_TEMPLATES` right after `declared_pin_products`, which this branch moved out, and rewrites `_reusable_remotes` further down. Keeping both sides breaks the file with an unterminated string literal.
- Keep only #506's `LEG_TEMPLATES` block. Drop #506's `declared_pin_values`/`declared_pin_products`, which moved here, and this branch's three-line `_reusable_remotes` opener, which #506 rewrites below. Resolved that way, pyflakes is clean and #506's scaffold tests pass (88).
- **`fix/adopt-plan-quote-yaml-keywords`** (ed9968f; a branch with no pull request).
- It adds 2 hunks in `adopt-project.py`: 3 here, against 1 with main alone.
- One is `render_plan`'s `pins:` line. Keep `_pin_lines`, which already sends product, repository and `digest_source` through `y`.
- The other is `_refuse_unholdable_values`' signature. Keep `pins: dict`, with that branch's `_validator_judged` and `_named_as_read` above it.
- `fix/adopt-late-failure-notice` is no longer on origin. #445, the late-failure notice, is on main and merged here.
**Where the meaning meets:**
- **#435 and #386.** The coordinator has said this on #435: #435 (comment)
- #435's `_plan_key_findings` (`plan-bad-pins`) keeps only text items in `pins:`, and its `PINS_REMEDIATION` tells a person to write `pins: [openGlass]`.
- This branch writes each pin as a mapping, and it makes a name alone `plan-pin-unrecorded`.
- Read from #435's code, not run: on a tree with both, the plan `plan --pin` writes is `plan-bad-pins` in `check`.
- Whichever lands second reconciles them, with three changes:
- `_plan_key_findings` takes this branch's mappings, or leaves `pins:` items to `_read_pins`;
- a `pins:` that is not a list gives one finding, not both `plan-bad-pins` and `plan-pin-malformed`;
- `PINS_REMEDIATION` says the mapping `plan` writes.
- Until that is done, `tests/test_adopt_pins.py::test_a_plan_with_a_whole_pin_checks_ok` fails.
- **#314.** It landed, and it is merged here (above).
- **`fix/adopt-plan-quote-yaml-keywords`.** Its pin tests are written against the name-only `--pin`. They need the `name@commit` form, and their expected `pins: [...]` line becomes `_pin_lines`'s mapping.
- **Two unwritable values are refused in two runs (lane 5's second review, n3).** `plan --elected-by 'A<LF>B' --pin openGlass@<sha> --pin-source <a path holding an ESC>` refuses the elector alone, exit 2. Re-run with the elector retyped, it refuses the source; #270's refusal names every unwritable value at once. Reproduced on 421e4e5, with `gh` called 0 times. One refusal would need a code change, not made here:
- `_refuse_an_unrecordable_pin_source` would split into a function that returns the sentence;
- `_checked_plan_inputs` would ask it before #270's `unwritable_values` raise, and raise one `adopt-unwritable-value` that names both, with both remediations;
- a test would add the two-value row.
N2's question is `one_printable_line`, not `unwritable_reason`, so it cannot simply join #270's list.
- **Docs.** The README, AGENTS.md and `docs/handbook.html` are unchanged, because none of them calls adopt's `--pin` a name. A sentence saying adopt now takes the scaffold's `--pin` is a follow-up. It costs an AGENTS.md line-cap raise, and a README edit forces the handbook's README blob to change.
- **A product spelled `null`, `true` or `false`.** The scaffold already accepts `--pin null@<sha>`: it exits 0 and builds a root whose `validate-pins.py` exits 1 `neutral-pin-entry-malformed`. Adopt's `plan` writes `product: null` through `y`, and `check` then finds `plan-pin-malformed` and refuses it before any leg exists. The one fix for both tools is in `parse_pin`, and it would change the scaffold's behaviour.
- **Wording shared with the scaffold.** `digest_source` is written bare into the pin file, so a `--pin-source` path holding ` #` is cut short there. `templates/assembly-root/contracts/neutral-product-pin.yaml` and `validate-pins.py`'s `neutral-pin-missing` remediation name only the scaffold as the writer. Two comments in `scripts/repo_shape.py` still name the scaffold's `pin_digest_from_gh`, in a digest-pinned shipped copy.
- **Filed as follow-ups:**
- #449: S3, a hand-edited `commit:` or `tree_sha256:` that disagrees, with options (a) and (b);
- #450: the scaffold half of N2, a `--pin-source` path no file can hold;
- #451: #339's third decision (N5), a `--pin-source` that nothing reads.
- **`validate-pins.py` prints a `--pin-source` path raw** in `neutral-pin-source-unreadable`, the twin of S1. It is a shipped template that #409 and other open PRs edit, so it is left for its own change. No issue is filed for it yet.
- **Windows and macOS** were not run here; CI ran both (below). Two assertions that depend on what Windows answers for a path (a name past the filesystem's limit, a path beneath a file) check only the refusal and its remediation there. Fix round 1's rows that need a control character or a byte that is not UTF-8 in a path, or a symlink to `git`, are skipped on Windows by a mark, and so is fix round 2's ESC row. The rows for a no-break space and a zero-width joiner run everywhere, and so does the in-process `gh-not-found` test.
Reviewed independently by lane 5 at 7a94b6b (3 should-fix, 5 nits: fix round 1) and at 421e4e5 (0 blockers, 2 should-fix, 3 nits: fix round 2). After #409's squash, the re-verification of f9ed46f and 73d65c6 found the code correct; its 1 should-fix and 3 nits were in this description and are fixed. GitHub's update-branch then merged main twice (33bae3f, 2170526), with no hand edit. CI's tests, tests-macos and tests-windows and SonarCloud all passed at 2170526 (main cac6bb2 merged in). On that head merged with main 57c85e9 (#490, #474 and #468, none of which touches this branch's files), the pin and adopt set with `tests/test_update_shape_landing.py` gave 1112 passed, 2 skipped, and the doctor, adopt end-to-end, unfinished-merge and bootstrap set gave 1056 passed, 3 skipped (the doctor's PowerShell line, which exists only on a Windows host).
Closes #273
Closes #339
Lane: openreposhape-5 (openRepoShape-5)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Lane: openreposhape-5 (openRepoShape-5)
Claim: #338 (comment)
What was wrong
Two faults, one in the parser and one in the lookup.
_link_sources_from_argssplit every--link-sourcevalue at its first=. A link tree under a directory nameda=b, passed bare, became a source keyed to a linkathat no chain names. Nothing asked for it, so the link stayeddeclared-unverified, exit 0. The WARNING then offered--link-source openXdox=<path>to the person who had passed exactly that. A mistyped key failed the same silent way.repo_shape.link_manifest_pathaskedPath.is_dir()and thenis_file(). Before Python 3.14 those swallow only ENOENT, ENOTDIR, EBADF and ELOOP. So each of these ended the naming gate in a traceback, exit 1:SHAPE_PIN_SOURCE_<LINK>pointing there;../openXdoxat mode 000, which every--projectrun asks for;What changed
How a value is read (
LinkSourcesinscripts/validate-repository-naming.py). This mirrors #312'sPinSources, with a chain link where that file has a declared pin:=is a LINK only when it casefolds to a link of a chain this run reads. Those are the entries of--referent-chain, and of each leg'snaming.referent_chain:under--project. Both are read before any leg is classified../reads that directory.What a lookup says (
scripts/repo_shape.py):link_manifest_lookupasksstat()inside a guard, as_digest_from_sourcedoes in validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312. It returns the system's reason when a source cannot answer, or says which of four plain cases it is (no such file or directory,it holds no project.yaml,its project.yaml is not a file,it is neither a directory nor a file), and it never raises. It replaceslink_manifest_path, which is gone: nothing calls it.link_declarationsgives the reason a manifest could not be read, anddeclared_neutral_pins, which it left with no caller, is removed (fix round 1).resolve_link_sourceandlink_pins_from_treestake a keyword-onlytried. It records each source asked, in order, with its reason. Nothing inrepo_shapeprints.link_pins_from_treesalso takes a keyword-onlywith_reasons(fix round 2). Asked, it returns aLinkPins, a dict equal to the plain mapping that also remembers why a tree it reached could not be read. Only the scaffold asks.What the validator prints (stderr, after each name's WARNINGs):
WARNING link-source-unreadable: <path> (<how>) could not answer for <link>: <reason>. This covers a--link-sourceasked for a link that holds a pin, aSHAPE_PIN_SOURCE_<LINK>likewise, and a checkout beside the project that exists and still cannot answer. A keyed value that also names a directory gets a second line saying how to ask for that directory with./. A bare value holding=says it was read as a PATH.NOTE --link-source <typed>: not used — <why>.for a value no such link asked for. The why is one of five: a later value replaced it; no name reads that link's own declaration (a keyed value); no name records a chain at all; no name reads any chain link's own declaration (a bare value, where chains exist and none is read); or every link that is read had a more specific source.--link-sourcevalue for such a chain is the NOTE); and a checkout that is absent or holds no manifest.--quietdrops both, with the WARNINGs. Somake bootstrapand the doctor'snamingrow print nothing new.--help, the module docstring anddocs/cli.md(regenerated) say all of this.Fix round 1 (lane 5's review of 40762ca: 0 blockers, 2 should, 4 nits)
Second commit, 4b21263. Each review finding, in order:
neutral_product_pins:is not a list of names is a tree that cannot answer (SHOULD-1).link_declarationsiterateddata.get(key) or []as it stood, against thelink_pins_from_treesdocstring this change wrote ("nothing a source does raises out of here").5ended the naming gate, the scaffold and the project'svalidate-manifest.pyinTypeError: 'int' object is not iterable. A scalaropenDoxwas read as the charactersD,e,n,o,p,x, so the chain broke, and under--projectthat is a FINDING. A mapping was read as its keys, soopenDox: yesDECLAREDopenDox. Each is now(None, why), asnot a mappingis: declared-unverified, with the reason named ("neutral_product_pinsis not a list", "holds an entry that is not text"). An absent or null value, an empty list, and a blank entry (null,'') in a list, declare nothing, as ever. The fix is in the shared function, so the scaffold andvalidate-manifest.pyare reached too.Three behaviours change on purpose here, and the tests of fix round 2 pin each:
neutral_product_pins: 0,falseor''was read as no pin at all (or []), so a chain through the tree was BROKEN, and under--projectthat is a FINDING. It is now a tree that cannot answer: the link is declared-unverified, a WARNING, exit 0.[openInk, 0]and[openInk, false]dropped the entry as a blank, and[openInk, true]read it as the textTrue, so a chain through the list VERIFIED. Each is now declared-unverified, with a WARNING saying the list "holds an entry that is not text". That is stricter than the link tree's ownvalidate-manifest.py, which takesstr(pin)of an entry (_declared_pins,templates/assembly-root/scripts/validate-manifest.py:85): a chain is better left unverified than verified through a name nobody wrote.chain-not-declaredover a pins value that is a scalar. With--pin-sourcea tree whoseneutral_product_pins:is the scalaropenInk, the scaffold used to refuse (REFUSED chain-not-declared: ... openXdox declares I, e, k, n, o, p, not openInk, exit 2, from the characters). It is now the declared-unverified WARNING and the scaffold goes on, exit 0, which is its documented rule for a tree that cannot answer: "a warning, never a refusal, because the check is offline". The warning says the tree was reached and could not be read (fix round 2, below).make validate,validate.ymlandmake bootstrapstill end in a traceback on the sibling row before Python 3.14, at a file this change does not touch (below). On 3.14 the sibling is passed over without a word there instead, which is EveryPath.is_file()/is_dir()/exists()guard in the shipped tools answers False to any OSError on Python 3.14 (3.12 and 3.13 raise PermissionError), so a directory this user cannot search reads as ABSENT: validate-pins.py skips its workflow@<sha>check, update-shape.py sayscopy-missingandupdate-pin-missing("adopt the project") for files that are there, the doctor says DRIFTED (5 copy-missing), and bump-leg.py's remaining guards, and every other tool's, skip or misreport instead of refusing by name #430.project.yamlthat is a directory; a device or a FIFO as the source; the order A, B, A; a value holding=with no chain at all; and every failure ofSHAPE_PIN_SOURCE_<LINK>for a link that holds a pin (a path that is not there, a directory with no manifest, a file that is no manifest), not only a permission. The sixth, thetyped in self.usedtest inunread_lines, could not be killed because it was dead: a value is read as one link's keyed source or is the one bare PATH, so every lookup asks it of the same path and it is used or unread, never both. That was asserted over 293 tests and the test is removed.classifyconsults a link's own declaration only for a name that claims a referent, with a recorded chain whose shape holds. For any other chain (one recorded on a spec leg; one on a name with noopen<Product>to reach; one that does not begin at a held pin or does not end at a referent of the name) a source was still asked, so a path that was not there was reported aslink-source-unreadableand a good tree was counted used, each for a question nobody put.NamingPolicy.reads_link_declarationsnow says whenresolve_referentreads a chain, andLinkSources.link_pinsasks it first: such a chain asks nothing, and a value for it is the NOTE that no name reads that link's declaration. A test runsresolve_referentwith a mapping that records whether it was read, over every way a chain is and is not, and holds the new method to it.declared_neutral_pinsis removed:git grepover the tree, every pushed branch and every sibling worktree finds no caller.link_manifest_lookup's docstring no longer says "replaces" over a name that is gone. This body no longer saystests/test_naming_policy.pytakesSEARCH_DENIEDfrom validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312: it defines a mark of its own, with the same condition and its own reason text.Fix round 2 (lane 5's re-review of 4b21263: 0 blockers, 0 should, 3 nits)
Third commit, 2ac911c. Each finding, in order:
if declared is Noneread asif not declared, which makes0,falseand''declare nothing again) and R2 (if pin is None or pin == ""read asif not pin, which drops a0orfalseentry as a blank) both passed all 210 cases oftests/test_naming_policy.pyat 4b21263. Six rows joinNOT_A_LIST_OF_NAMES, which runs at the CLI and in process:0,falseand''as the value, and0,falseandtrueamong the names. R1 now fails 9 cases and R2 fails 6.--pin-sourcewhoseneutral_product_pins:is not a list, round 1 turned thechain-not-declaredrefusal into a declared-unverified WARNING that says the tree "is not reachable here (a sibling checkout, SHAPE_PIN_SOURCE_, or --link-source = would let it be read)".--pin-sourcedid reach the tree, and only its declaration could not be read, so that blamed a path that was right. Nowlink_pins_from_treestakes a keyword-onlywith_reasons; asked, it returns aLinkPins, a dict equal to the plain mapping that also keepsunreadable,{link: why}for each link whose source answered and whose manifest could not be read._chain_link_findingswords such a link "which was reached but could not be read as a declaration ()", in a branch of its own, and only the scaffold asks. The new text is asserted for each of the eleven not-a-list rows, withscaffold-project.py --dry-runrun as a subprocess.LinkPinsand for an absent tree; the scaffold's own old warning for a clone that holds noproject.yaml; the naming validator's two lines (its warning, and thelink-source-unreadableline that names the reason); andvalidate-manifest.py's. The naming validator andvalidate-manifest.pydo not ask for reasons, so they print what they printed._declarationstill returns its four values, so nothing else inscaffold-project.pymoved._chain_read_caseshad no case whose chain link is qualified, soreads_link_declarationscould take the chain as typed and not through_chain_links(R3) and pass every test. With--referent-chain testorg/openXdox,openDoxthat turns a verified chain into a declared-unverified one.("codexDox", {"openXdox"}, ("testorg/openXdox", "openDox"), True)is a case now, and R3 fails it.validate-pins.pybullet, the 3.14.7 rows, the merge-tree section, the filed numbers, and the project's ownvalidate-manifest.py).The mutation proofs: all three survivors were reproduced first at 4b21263 (210 passed each) and each dies at 2ac911c. Six mutations of the new code each die too: the warning ignoring the reasons (12 cases fail), the lookup recording none (12), the scaffold not asking (11),
with_reasonson by default (3), an absent tree called reached (3), and the reached sentence used for a tree nothing reached (17).Where it departs from #312, and why
--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312 made an unreadable--pin-sourcea finding. Three reasons for the difference:SHAPE_PIN_SOURCE_<PRODUCT>also answersvalidate-pins.py's digest question, from a checkout that need not hold a manifest.--pin-source, a keyed value is final.WARNING/NOTEas this file spells them. validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312's notes arenotelines on stdout, where that file's report lives.Who else this reaches
The guard is in
repo_shape.py, so the samelink_pins_from_treeslookup stops crashing for these callers too:validate-manifest.py. It reaches the lookup throughSHAPE_PIN_SOURCE_<LINK>or a sibling checkout, and now gives its usual declared-unverified WARNING instead of the traceback.scaffold-project.py --referent-chain. ASHAPE_PIN_SOURCE_<LINK>under a locked parent no longer kills the plan, and--pin-sourceverifies the link.Neither of these prints the reason a source could not be entered; the scaffold says it only for a tree it reached and could not read (fix round 2, above). A
--pin-sourcethe scaffold cannot enter is still a traceback: that is #339 (pin_digest_from_source), and this PR does not touch it.What this does not reach, and what the doctor says.
make validate,validate.ymlandmake bootstrapstop crashing for a checkout../openXdoxat mode 000. Those targets also runvalidate-pins.py, whoseresolve_neutral_pin_sourceasks(sibling / ".git").exists()with no guard (templates/assembly-root/scripts/validate-pins.py:463on main), so before 3.14 a sibling at mode 000 still ends them in aPermissionError. That file is validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312's, andfix/pin-source-env-collisions(PR scaffold-project.py, validate-pins.py, repo_shape.py:open-glassandopen_glassshare oneSHAPE_PIN_SOURCE_<PRODUCT>, so--pinrefuses the pair andvalidate-pins.pynotes a declared one and reads the variable for neither (#275) #409),fix/adopt-pin-writes-pin-fileand open PRs update-shape.pyread_pinrefusesupdate-pin-row, and the pinned validate-pins.py and validate-family.py reportshape-pin-row, when a shape pin'sfiles:is not a list, sofiles: 5,trueor1.5no longer endscheck,apply, shape-doctor.py and the project's own validator inTypeError: ... is not iterable(#290) #343 and validate-pins.py (assembly-root template): a workflow file under.github/workflows/that is not UTF-8, or that this user cannot open, is ONEworkflow-unreadablerefusal naming every such file, exit 2, so the project's pins gate no longer ends in a UnicodeDecodeError traceback, exit 1, with no line naming the file (#359) #419 touch it, so this PR does not edit it. The same line is listed for Python 3.14 by EveryPath.is_file()/is_dir()/exists()guard in the shipped tools answers False to any OSError on Python 3.14 (3.12 and 3.13 raise PermissionError), so a directory this user cannot search reads as ABSENT: validate-pins.py skips its workflow@<sha>check, update-shape.py sayscopy-missingandupdate-pin-missing("adopt the project") for files that are there, the doctor says DRIFTED (5 copy-missing), and bump-leg.py's remaining guards, and every other tool's, skip or misreport instead of refusing by name #430 (lane 2), where the helper that would cure both halves is asked for; the pre-3.14 traceback reproduction is added there as a comment, not filed apart. ASHAPE_PIN_SOURCE_<LINK>under a locked parent is different:validate-pins.pymakes that aneutral-pin-source-unreadableFINDING (validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312), and that stays.namingrow runs the STANDARD's copy of the validator, so it stops crashing at once. Itsmanifestrow runs the project's OWNvalidate-manifest.pyon the project's ownrepo_shape.py, so it changes only once the project has applied this change. Over an existing project the doctor saysINVALID (manifest, pins)untilupdate-shape.py applylands the twoupstream-changedrows below.SHAPE_PIN_SOURCE_<LINK>under a locked parent, on a project that carries these copies,INVALID (naming, manifest, pins)becomesINVALID (pins), andpinsis validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312's finding for that locked variable, which is right. For a sibling at mode 000 thepinsthat remains is the traceback above, not a finding.The two copied scripts this change edits (
scripts/repo_shape.pyandscripts/validate-repository-naming.py) are copied into every project and pinned there. A project takes the change throughupdate-shape.py(twoupstream-changedrows), and a family holder takes therepo_shape.pyrow. Neither file has a second copy in this repository.Evidence
repro338.sh, aghstub first on PATH). Under 3.10.21 and 3.12.3, rows 4-7 (keyed under a mode-000 parent,SHAPE_PIN_SOURCE_OPENXDOXthere, a sibling at mode 000, a 300-character name) are a traceback, exit 1. Rows 2-3 (a=b, the typo) are a silent declared-unverified, exit 0. Under 3.14.7 row 1 verifies, and rows 2-7 are the silent declared-unverified WARNING, exit 0.a=bverifies. The other five rows each name their source with its reason. Re-run on the fix-round head, 4b21263, under 3.10.21, 3.12.3 and 3.14.7: byte-identical to the first commit's run. Re-run on the fix-round-2 head, 2ac911c, under the same three: all 7 rows exit 0 with no traceback, the output is byte-identical across the three versions, and it is identical to the re-review's runs of the previous head over main.PermissionErrortraceback, exit 1, forscaffold --dry-run, the project'svalidate-manifest.py,validate-repository-naming.py --projectand its--quietform, each withSHAPE_PIN_SOURCE_OPENXDOXunder a locked parent. This PR gives exit 0 for all four.validate-pins.pyon the sibling row is the exception said above.tests/test_naming_policy.py, and 17 of them fail on 40762ca: the five shapes of pins that are not a list (each at the CLI, in-process and, for the scalar, under--project), and the chains nobody reads. The other 14 guard what a mutation could break (below) or the side the fix must not move (an absent, null or blank pin list still answers).test_naming_policy,test_manifest_validator,test_scaffold_referent_chain_links,test_cli_reference,test_repo_hygiene,test_neutral_pin_validator,test_scaffold_e2e,test_shape_doctor,test_git_output_decodingandtest_pin_validator: 765 passed, 3 skipped. The 3 skips are the PowerShell-only rows. (40762ca: 734 passed, 3 skipped.)render-cli-reference.py --checkis ok.--quietdrop, the "read as a PATH" sentence, the./line, the project-chain read, the WARNING lines or the env reporting each fails at least one new test.test_naming_policy(238 cases: 210 and 28 new),test_cli_reference,test_manifest_validator,test_scaffold_referent_chain_links,test_repo_hygieneandtest_setup_project_py: 468 passed; andtest_scaffold_e2e,test_scaffold_pin_and_reuse,test_scaffold_leg_path_collisions,test_scaffold_pin_collisions,test_neutral_pin_validator,test_git_output_decodingandtest_pin_validator: 312 passed. Under 3.10.21 and under 3.14.7,test_naming_policy,test_manifest_validatorandtest_scaffold_referent_chain_links: 321 passed each.render-cli-reference.py --checkis ok, andast.parse(feature_version=(3, 9))passes on the three changed files.reads_link_declarationsalways true, without the shape check, without the held pins, and the validator ignoring it): eight die. The ninth,reads_link_declarationsignoring whether the name has a referent, survives as an equivalent mutant: with no referent_chain_shape_problem's last question always reports a problem, so the explicit early return is redundant, and is kept becauseresolve_referenthas the same first line. The spy test holds the two together.SEARCH_DENIEDmark this file defines, with the same condition as validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312's. The new FIFO and/dev/nullrows skip where those do not exist.a=band the 300-character name run everywhere. On Windows the long-name row asserts the line, not POSIX's reason. None of it was run on Windows or macOS.Merge-tree
Recomputed at 19:04Z with
git merge-tree --write-treeof 2ac911c against currentorigin/main53bee5b and against every one of the other 37 pushed branches that touches a file this PR changes (a scan of each head against its merge-base with main):Clean: origin/main 53bee5b (it carries scaffold-project.py and adopt-project.py ask the project's YAML reader and validate-manifest.py about the manifest's values before anything exists, so
--id null,--tracking-branch trueand a blank--elected-byare refused (#258, #261) #314 and repo_shape.py, validate-manifest.py: a bracket in a plain flow scalar is refused and a name holding a lone surrogate is a finding, sopins: [a, b]]is not the pinb]andname: "a\ud83db"no longer killsmake validate(#301, #280) #390); adopt-project.py:executerecords inproject.yamlwhich leg the plan gave each submodule a leg keeps, and shape-doctor.py holds the submodule to that row, so one in the other leg is MISPLACED and a real adoption's placement readsok(#189) #394fix/adopt-record-submodule-placement563ea16 (scripts/repo_shape.pyandvalidate-manifest.py) and validate-family.py: a gitlink inmembers/or a.gitmodulessection whose path no row names is a finding in every mode, a hand-editedpath:ismember-pathwith nothing read through it andrecorded_gitlinkreads its path literally, and no git to run refusesgit-not-runnableinstead of a traceback that exits 1 (#361, #367, #368) #406fix/validate-family-unnamed-mounts369af2e (scripts/repo_shape.py); family.py:initasks the holder's reader and validate-family.py about family.yaml before creating anything,--dry-runtoo, so--id null,--tracking-branch true, a blank--created-byand--created-on 20261011are refused (#307) #397 abb27e6, family.py:add --dry-runmakes every refusaladdmakes before it mounts, reads the member from throwaway clones outside the holder for the row's id and digest, and prints the row, gitlink,.gitmodulessection and trailers without mounting, writing or committing anything, andaddtakes--trailerasbumpdoes, so every subcommand has the dry run the module'sEXIT CODESline promises (#326) #400 7062a47, adopt-project.py:plan --helpsays what--spec-pathand--code-pathare, the default and key each records, and the two refusalsplanmakes on them, sodocs/cli.mdno longer lists the two flags that choose where a leg is mounted as bare lines (#340) #401 409f10b, family.py:bumpandremoveput the holder back when a hook, a lock or git refuses them after they write, and say what they put back or what is left with the commands that put it back; they ask first what their dry runs ask first; andremoverefuses a heldindex.lockbefore it unmounts and a.gitmodulesthat gives the member's path to two submodules, of whichgit rmtook out one (#365, #360) #416 7cca975, setup.sh:--helpfrom anywhere but a checkout is the shim's own few lines and clones nothing, and render-cli-reference.py refuses a tree that is not a checkout, so asking a download for help is no longer a clone of GitHub (#341) #452 e2df9a8 and templates:project.yaml, the leg pins andfamily.yamlquote their text placeholders, so--id 007,--tracking-branch 2026,--spec-path trueor--org nullread back as typed, andfamily.py addquotes a member id alike (#259) #395 1ef3310 (docs/cli.md); scaffold-project.py and family.py:--tracking-branchis asked ofgit check-ref-format --branchbefore anything exists, so~,a..b,x.lockanda/are refused under--dry-runand no longer die at the firstgit init -baftergh repo createhas made the repositories (#283) #355 6fdbe3d, shape_materialize.py:RULESET_HINTnames the run's tracking branch where it namedmain, as the pull request's base and the ref the scaffold and the family holder pushed (#324) #373 741cbf2 and templates:project.yaml, the leg pins andfamily.yamlquote their text placeholders, so--id 007,--tracking-branch 2026,--spec-path trueor--org nullread back as typed, andfamily.py addquotes a member id alike (#259) #395 (scaffold-project.py).Conflict, four hunks each, all in
scripts/repo_shape.py: Q,fix/pin-source-env-collisions(PR scaffold-project.py, validate-pins.py, repo_shape.py:open-glassandopen_glassshare oneSHAPE_PIN_SOURCE_<PRODUCT>, so--pinrefuses the pair andvalidate-pins.pynotes a declared one and reads the variable for neither (#275) #409) 6494714, andfix/adopt-pin-writes-pin-file421e4e5 (no PR). Both also touchscaffold-project.py, and that merges clean with this PR's one edit there. Fix round 2's new hunks merge with neither: Q's change to the "not reachable here" sentence (theofferedtext, when a variable is shared) and the reached branch sit in different lines of_chain_link_findings. The four hunks, each taking both sides:resolve_link_sourcesignature:default_source=None, env_shared: bool = False, *, tried: list | None = None;link_pins_from_treesdocstring and the lines after it: both paragraphs, thenfound, this PR'sunreadableand Q'slinksandshared;resolve_link_source(name, root, keyed_sources, default_source, pin_product_key(name) in shared, tried=asked)(the same spelling on both branches), followed byif tried is not None: tried[name] = asked.Resolved that way in a throwaway and committed there, the merge with 6494714 passed 496 tests (
test_naming_policy,test_pin_source_env_collisions,test_neutral_pin_validator,test_scaffold_referent_chain_links,test_manifest_validator,test_cli_reference), and the merge with 421e4e5 passed 559 tests (the same files andtest_pin_source_unreadable).render-cli-reference.py --checkis ok on both, pyflakes is clean, and the grammar parses as 3.9's. Neither branch carries the resolution. The earlier counts (468 and 434 from the first fix round, 430 from the re-review) are those runs' own, at their heads.Left out
Each of these was found by lane 5's reviews of this change, and is filed or folded:
--link-sourceanswers for every link with no more specific source (scripts/repo_shape.pyresolve_link_source(:2401-2402) and scripts/validate-repository-naming.py_link_sources_from_args(:408): a bare--link-source <path>answers for EVERY chain link that has no more specific source, so in a chain of three or more links one tree is read as two links' declarations and a correct chain is reported broken, a FINDING (exit 1) for a name that holds no direct pin on its referent #441). In a chain of three or more links, one bare tree is read as two links' declarations, and a chain that holds is reported broken, a FINDING for a name with no direct pin on its referent. Pre-existing, the same on main;validate-pins.py's--pin-sourcehas the same documented rule and was not examined.--link-source openXdox=) isPath(""), the current directory (scripts/validate-repository-naming.py_link_sources_from_args(:406) and templates/assembly-root/scripts/validate-pins.pyPinSources(:409): a key with an empty path (--link-source openXdox=,--pin-source openXdox=) isPath(""), which is the current directory, so run from a project root the naming gate reads the project's OWNproject.yamlas the link's declaration and reports a chain that holds as broken, a FINDING (exit 1) for a name with no direct pin #442). Run from a project root, the project's ownproject.yamlis read as the link's declaration. Pre-existing;validate-pins.py's--pin-source openXdox=has the same shape (there a finding naming.).validate-pins.py's(sibling / ".git").exists()is unguarded (the sibling row above), folded into lane 2's EveryPath.is_file()/is_dir()/exists()guard in the shipped tools answers False to any OSError on Python 3.14 (3.12 and 3.13 raise PermissionError), so a directory this user cannot search reads as ABSENT: validate-pins.py skips its workflow@<sha>check, update-shape.py sayscopy-missingandupdate-pin-missing("adopt the project") for files that are there, the doctor says DRIFTED (5 copy-missing), and bump-leg.py's remaining guards, and every other tool's, skip or misreport instead of refusing by name #430, which already covers the Python 3.14 half: the pre-3.14 traceback and its reproduction are added there as a comment. validate-pins.py: a--pin-sourcevalue isPRODUCT=PATHonly when the text before its first=names a declared neutral-product pin, so a bare stand-in undera=b/recomputes the digest instead of falling togh apiand askip, an explicit source that does not exist or is not a directory is theneutral-pin-source-unreadablefinding instead of aFileNotFoundErrortraceback, and a value no pin used is noted (#295) #312's file.neutral_product_pins: 5ends in aTypeErrorin two gates before either can say anything about it (validate-repository-naming.py (_pins_from_project:302,_chain_from_leg:318), validate-manifest.py (_declared_pins:85) and validate-pins.py (PinSources:390, called at:698) iterate the project's ownneutral_product_pins:and a leg'snaming.referent_chain:without asking they are lists, so5(ortrue,1.5) in either field ends the naming gate inTypeError: 'int' object is not iterable, exit 1,neutral_product_pins: 5ends the other two validators the same way before validate-manifest.py reaches themanifest-neutral-product-pinsfinding it has for it, andmake validatestops in a traceback at its first command; a scalaropenXdoxinneutral_product_pins:is read as the charactersX,d,e,n,o,p,xby the naming gate, which classifies and exits 0 #443):_pins_from_projectin the naming gate (scripts/validate-repository-naming.py:302on main), and_declared_pinsin the project's ownvalidate-manifest.py(templates/assembly-root/scripts/validate-manifest.py:85), which ends it before its ownmanifest-neutral-product-pinsfinding (_neutral_product_pins_type_finding,:524on main) can print. Reproduced on 3ef059c. That is the project's own declaration, read by the project's own gates, and not a link source, so it is outside this change; "read by the project's own gates" covers two crashing gates.Also not done here:
ast.parse(feature_version=(3, 9)). Windows and macOS were not run.Closes #338
🤖 Generated with Claude Code
Summary by Sourcery
Make link-source handling unambiguous and ensure inaccessible or invalid link trees produce actionable warnings instead of tracebacks.
New Features:
--link-sourcevalues as keyed sources only when their key names a chain link, while preserving paths containing=and reporting unused values.Bug Fixes:
neutral_product_pinsdeclarations as unverifiable rather than crashing or inferring pins from invalid data.Enhancements:
Documentation:
Tests:
Chores: