Skip to content

Unbreak regen after #6242: registry partition + .dag comment parse wall - #6260

Closed
gunbai-bot[bot] wants to merge 3 commits into
mainfrom
fix/dag-collect-registry-partition
Closed

gunbai-bot[bot] wants to merge 3 commits into
mainfrom
fix/dag-collect-registry-partition

Conversation

@gunbai-bot

@gunbai-bot gunbai-bot Bot commented Jul 5, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Two #6242 fallouts that re-blocked regen_stage0 repo-wide one merge after #6255 unblocked it — both mechanical, both enacting #6242's own documented intent:

  1. Registry partition: P1 emit fix: dag_collect O(n^2) fingerprint memo #6242 parked v1_compiler_dag_collect{,_support}.rs in HAND_MAINTAINED_STAGE0_FILES (its comment: the P1 slot-map/fp memo lives only in the hand-edited seed until regen unblocks) but left both in GENERATED_STAGE0_FILES; assert_registry_is_partitioned fails on any tree. Fix: delete the two GENERATED rows (regen then stops overwriting the hand-edited memo — the guard the comment asks for).
  2. .dag comment parse wall: P1 emit fix: dag_collect O(n^2) fingerprint memo #6242 added six // lines to dag_collect.dag / dag_collect_support.dag. .dag deliberately has no comment syntax, so both modules fail to parse and never register — regen dies with 65 cascade diagnostics (unresolved import: v1.compiler.dag_collect_support + every json_quote/dag_node_key/collect_dag_nodes use in compile.dag). Fix: strip the lines; their rationale already lives in P1 emit fix: dag_collect O(n^2) fingerprint memo #6242's commit message, the repo's convention for it.

Test plan

  • Discriminating: regen_stage0 fails at the partition assert on origin/main, then (with only fix 1) at the 65 parse-cascade diagnostics, and proceeds past both with this PR (--emit-fresh receipt in session snappy-newt-504).
  • CI dark by design (10-min cap); review-bar merge.

🤖 Generated with Claude Code

Brian Searls and others added 2 commits July 5, 2026 03:14
… parked them hand-maintained)

#6242 moved v1_compiler_dag_collect.rs and v1_compiler_dag_collect_support.rs
to HAND_MAINTAINED_STAGE0_FILES (its in-line comment: the slot-map + fp/key
memo lives only in the hand-edited seed until regen is unblocked) but left
them in GENERATED_STAGO_FILES, so assert_registry_is_partitioned refuses:
regen_stage0 fails on any tree — regen blocked repo-wide again, one merge
after #6255 unblocked it. Deleting the two GENERATED rows enacts the author's
documented intent; the partition assert itself is the witness (fails on
origin/main, passes here).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
… modules failed to load)

.dag deliberately has no comment syntax; the six // lines #6242 added to
dag_collect.dag / dag_collect_support.dag make both modules unparseable, so
'v1.compiler.dag_collect{,_support}' never register and regen fails with 65
cascade diagnostics (unresolved import + every json_quote / dag_node_key /
collect_dag_nodes use across compile.dag). The rationale those comments held
is already in #6242's commit message, which is where the repo keeps it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@gunbai-bot gunbai-bot Bot changed the title regen_stage0: drop dag_collect rows from GENERATED (fix #6242 registry-partition break) Unbreak regen after #6242: registry partition + .dag comment parse wall Jul 5, 2026
@gunbai-bot

gunbai-bot Bot commented Jul 5, 2026

Copy link
Copy Markdown
Contributor Author

Known follow-up (out of scope here, kept minimal per manager): the dag_collect fingerprint memo that makes #6242 fast lives only in the hand-edited seed, not in the .dag model — dag_collect_insert in the model still recomputes dag_node_surface_fingerprint_rec per node and re-derives the anchor 3x, so a clean regen from .dag reverts the O(M²) until the memo is modeled in dag_collect.dag (a §7 model↔seed fork). The hand-maintained parking this PR completes is the interim guard; modeling the memo is the dissolution. — sent from snappy-newt-504

Review note on this PR: the six removed // lines included two on-carrier
dissolution markers (std.content_hash grounding for the fp memo;
collision_errors threading drop condition). .dag cannot carry comments, so
their nearest legal carrier is the HAND_MAINTAINED registry entry that
already owns the #6242 parking rationale and dissolves at the same trigger.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@gunbai-bot

gunbai-bot Bot commented Jul 5, 2026

Copy link
Copy Markdown
Contributor Author

Superseded by #6262 (sharp-deer's canonical #6242 regen hotfix — same registry-partition + comment-parse fixes, plus structured-mark hoisting of the comments, a witness, and --verify restoration). Closing to avoid duplicate review. — sent from snappy-newt-504

@gunbai-bot gunbai-bot Bot closed this Jul 5, 2026
@gunbai-bot
gunbai-bot Bot deleted the fix/dag-collect-registry-partition branch July 5, 2026 03:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants