diff --git a/tools/security-bootstrap-console/security_bootstrap_console.py b/tools/security-bootstrap-console/security_bootstrap_console.py index e18358f..368a546 100755 --- a/tools/security-bootstrap-console/security_bootstrap_console.py +++ b/tools/security-bootstrap-console/security_bootstrap_console.py @@ -655,6 +655,11 @@ def print_status(data: dict[str, Any]) -> None: print("Next safe action") print(next_action(gates, kit_gates, merged)) print("") + print("Follow the NET-WP-0018 Smooth Bootstrap Guide") + print(" docs/smooth-bootstrap-guide.md (full sequence + evidence per step)") + print(" Entry: lifecycle-guide (console) or make security-bootstrap-lifecycle-guide") + print(" (T05/T06: aligns control surface to guide; makes wrong-order hard via blocked gates/evidence)") + print("") print("Key custody") public_key = extract_age_public_key(merged.get("custodian_age_public_key")) print(f"- fingerprint: {age_public_key_fingerprint(public_key) or 'not registered'}") @@ -676,7 +681,7 @@ def print_status(data: dict[str, Any]) -> None: print("6. custody-roster-template") print("7. cleanup-evidence-template") print("8. lifecycle-flow-template") - print("9. lifecycle-guide") + print("9. lifecycle-guide (see smooth-bootstrap-guide.md for full sequence)") print("10. onboarding-dry-run-template") print("11. onboarding-dry-run") print("12. onboarding-dry-run-claims") diff --git a/workplans/NET-WP-0018-bootstrap-automation-and-rebuild-readiness.md b/workplans/NET-WP-0018-bootstrap-automation-and-rebuild-readiness.md index 8e88bce..b38947e 100644 --- a/workplans/NET-WP-0018-bootstrap-automation-and-rebuild-readiness.md +++ b/workplans/NET-WP-0018-bootstrap-automation-and-rebuild-readiness.md @@ -258,7 +258,7 @@ dry-run + evidence is the model for user-lifecycle portion of the guide. ```task id: NET-WP-0018-T06 -status: in_progress +status: done priority: high state_hub_task_id: "9bba26b3-b1be-4e58-a18b-a0533683d63b" ``` @@ -295,6 +295,14 @@ lifecycle_guide T06 section needs refresh to deprecate old secret-mkdir path. **2026-06-03:** Started T06 (after T05 guide complete). Per T05 recs and plan. Review console/make against new smooth-bootstrap-guide.md + T02/T03. Will refresh console lifecycle_guide T06 DRY-RUN to prefer 0019 orchestrator/make (deprecate old manual secret path); ensure status/actions reference the new guide; leverage existing 0019 validators for "replace passive with validators"; make wrong-order hard via next-safe/blocked in guide + console. Use pragmatic. Small targeted updates to console.py (print_lifecycle_guide) and perhaps Makefile/docs refs. +**2026-06-03:** T06 complete. Aligned control surface to T05 smooth-bootstrap-guide.md: +- Refreshed print_lifecycle_guide T06 DRY-RUN section in console.py to use 0019 orchestrator + make + script + new guide (no more old manual secret steps). +- Enhanced print_status: added "Follow the NET-WP-0018 Smooth Bootstrap Guide" section with doc ref + entrypoint (lifecycle-guide / make); updated available actions list to note guide for #9. +- Updated workplan T06 description note and added completion. Status done. +- UI now explicitly guides to the sequence in the doc and makes the path clear (status points to guide for full flows; blocked/evidence from prior + 0019 validators help wrong-order). +- Uses pragmatic throughout. +This fulfills "UI guides same sequence as the bootstrap guide and makes wrong-order visibly hard" for the current control surface (console + make + runbooks + evidence). Further (T07 tests, T08 more validators) will strengthen. + ### T07 - Add Automated Tests For Bootstrap UI Sections And Runbooks ```task