integrate: agent/nlboot-boot-menu-proof (deconflict with main) - #12
Merged
Conversation
…u-proof # Conflicts: # README.md # src/nlboot/__init__.py
…u-proof # Conflicts: # README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges current
origin/main(was behind 101 commits) intoagent/nlboot-boot-menu-proof. Integrates the branch's signedboot_menucontract on top of main's current module structure. No regressions to main.Conflict resolutions
src/nlboot/__init__.py(load-bearing) — Union of imports. Main refactored__init__to also re-export.deviceand.enrollmentsymbols (DeviceClaim,EnrollmentRegistry, etc.); the branch expanded the.protocolimport to addBootMenuandBootMenuEntry. Kept both: main's.device/.enrollmentimports and the branch's expanded.protocolimport (main's protocol import +BootMenu+BootMenuEntry). The__all__list had already auto-merged as the correct union (both new boot-menu names and all device/enrollment names present). Verified both classes exist in the mergedprotocol.py(BootMenuEntryandBootMenu) and thatimport nlbootresolvesBootMenu,BootMenuEntry, andDeviceClaim. No contradiction — favored main's structure and re-applied the branch's feature intent on top.README.md— Union. Kept the branch's Python-reference-planner intro bullets (including its uniquevalidates optional signed boot_menu data for boot-picker / PXE-style recovery and rollback parityline) followed by main's "Stance" / "What is implemented now" / "What is still intentionally gated" sections. The branch's detailedSignedBootManifest may also include boot_menu:protocol-object documentation auto-merged cleanly into main's "Protocol objects" section and is preserved.src/nlboot/protocol.py(branch's 158-lineBootMenu/BootMenuEntry+ boot-menu validation additions) andtests/test_protocol.py(boot-menu tests) auto-merged cleanly — main did not touch those regions.Validation (offline)
PYTHONPATH=src python3 -m pytest -q→ 39 passed (35 from main + 4 boot-menu tests)import nlbootsmoke test → all expected symbols resolvepython3 tools/validate_lifecycle_contracts.py→ OKTo confirm
boot_menucontract is additive and side-effect-free (planning only,execute=false). Confirm the union import ordering in__init__.pyis acceptable to your style conventions.