Skip to main content

Phase 1 Branch Inventory

Purpose: A flat list of every feature branch created during Phase 1 hardening (Workstreams C, D, E, F + docs syncs). This is the single reference for the post-launch merge sequence — whoever merges these to master should follow the order below to minimize conflicts.

Status: All branches committed locally; none pushed.

Workstream C — Critical Code Fixes​

#TaskRepo(s)BranchTip SHA
C1WebSocket gateway JWT auth (HK + Kitchen)hmp-housekeeping-service, hmp-pos-service, hmp-shared-packages, hmp-web-dashboardfeat/ws-jwt-auth(per-repo)
C2Materialized view consumers registeredhmp-analytics-servicefeat/enable-mv-consumers(per-repo)
C3Multi-property isolation E2E testshmp-web-dashboard (Playwright) + receiver-side assertPropertyTenant in hmp-property-service, hmp-reservation-service, hmp-frontdesk-servicefeat/multi-property-isolation-tests(per-repo)
C4xPrisma → ServiceClient (4 sites)hmp-property-service, hmp-reservation-service, hmp-frontdesk-servicefeat/xprisma-to-serviceclient(per-repo)
C4aInternal service-account JWT mechanismhmp-shared-packages (@hmp/auth), hmp-auth-service, hmp-api-gatewayfeat/service-account-jwt(per-repo)
C4bBooking-engine xPrisma migration (19 sites)hmp-booking-engine, hmp-reservation-service, hmp-property-servicefeat/booking-engine-serviceclient(per-repo)
C5Event subscriptions + dispatcherhmp-infrastructure, hmp-analytics-servicefeat/enable-event-flow(per-repo)

Workstream D — UI / UX Polish​

#TaskRepoBranchTip SHA
D1Dashboard UI consistency audit (78/86 fixes)hmp-web-dashboardfeat/dashboard-ui-polish(per-repo)
D2Booking engine mobile responsivehmp-booking-enginefeat/booking-engine-mobile-polish(per-repo)
D3Booking engine empty/loading/error stateshmp-booking-enginefeat/booking-engine-ui-states(per-repo)
D4Dashboard skeleton loadershmp-web-dashboardfeat/dashboard-skeleton-loaders(per-repo)
D5Mobile app KeyNova brandinghmp-mobile-appsfeat/mobile-keynova-branding(per-repo)
D6Branded receipt templateshmp-pos-service, hmp-frontdesk-servicefeat/branded-receipts(per-repo)
D7WCAG 2.1 AA accessibilityhmp-web-dashboard + hmp-booking-enginefeat/dashboard-a11y-fixes + feat/booking-engine-a11y-fixes(per-repo)

Workstream E — Testing (docs only — no code branches)​

All E-stream output is documentation. The actual test fixtures sit on the C/D branches.

#TaskRepoBranch
E1Seed 5 test propertieshmp-infrastructurefeat/seed-5-test-properties
E2Full E2E test pass reporthmp-docsdocs/phase1-e2e-report (commit f64d5ef)
E2 — fix #1Dashboard auth.setup.ts repairhmp-web-dashboardapplied in-place; needs separate fix/dashboard-auth-setup branch
E2 — fix #2Booking engine selector updatehmp-booking-engineapplied in-place; needs separate fix/booking-engine-selectors branch
E3Night audit testinghmp-docsdocs/phase1-night-audit-testing (commit e04e443)
E4Mobile device testing planhmp-docsdocs/phase1-mobile-device-testing (commit ba85516)

Workstream F — Onboarding Playbook (docs only)​

#TaskRepoBranch
F1Property data collection formhmp-docsdocs/phase1-onboarding-playbook (commit 28515c2)
F2Day-by-day onboarding checklisthmp-docs(same branch)
F3Staff training materials reviewhmp-docs(same branch)

Docs Syncs​

#WhatRepoBranchTip SHA
1C + D sync (architecture, registry, test reports)hmp-docsdocs/phase1-c-d-synce9f3973
2E2 test pass reporthmp-docsdocs/phase1-e2e-reportf64d5ef
3E3 night audit testinghmp-docsdocs/phase1-night-audit-testinge04e443
4E4 mobile device testinghmp-docsdocs/phase1-mobile-device-testingba85516
5F1-F3 onboarding playbookhmp-docsdocs/phase1-onboarding-playbook28515c2
6E + F sync (this branch — sidebars, launch readiness, dashboard)hmp-docsdocs/phase1-e-f-sync(current)

For the post-launch (or immediate) merge to master:

Round 1 — hmp-docs first (no code dependencies)​

  1. docs/phase1-c-d-sync → master
  2. docs/phase1-e2e-report → master
  3. docs/phase1-night-audit-testing → master
  4. docs/phase1-mobile-device-testing → master
  5. docs/phase1-onboarding-playbook → master
  6. docs/phase1-e-f-sync → master (this branch — sidebars + launch readiness + dashboard)

Note: Each docs branch was created independently from master, so a fast-forward merge is not possible after the first one. Use a no-ff merge or rebase each subsequent branch onto the new tip. This branch (docs/phase1-e-f-sync) already has the C+D, E2, E3, E4, F1-F3 commits cherry-picked into it, so merging just this single branch will land all six docs changes in one shot.

Round 2 — Backend services in dependency order​

  1. hmp-shared-packages → feat/service-account-jwt (C4a base)
  2. hmp-shared-packages → feat/ws-jwt-auth (C1 base)
  3. hmp-auth-service → feat/service-account-jwt (C4a)
  4. hmp-api-gateway → feat/service-account-jwt (C4a)
  5. hmp-property-service → feat/xprisma-to-serviceclient (C4)
  6. hmp-property-service → feat/multi-property-isolation-tests (C3, receiver-side)
  7. hmp-reservation-service → feat/xprisma-to-serviceclient (C4)
  8. hmp-reservation-service → feat/multi-property-isolation-tests (C3, receiver-side)
  9. hmp-reservation-service → feat/booking-engine-serviceclient (C4b)
  10. hmp-frontdesk-service → feat/xprisma-to-serviceclient (C4)
  11. hmp-frontdesk-service → feat/multi-property-isolation-tests (C3, receiver-side)
  12. hmp-frontdesk-service → feat/branded-receipts (D6)
  13. hmp-housekeeping-service → feat/ws-jwt-auth (C1)
  14. hmp-pos-service → feat/ws-jwt-auth (C1)
  15. hmp-pos-service → feat/branded-receipts (D6)
  16. hmp-analytics-service → feat/enable-mv-consumers (C2)
  17. hmp-analytics-service → feat/enable-event-flow (C5)

Round 3 — Frontend (depends on Round 2)​

  1. hmp-web-dashboard → feat/ws-jwt-auth (C1 client side)
  2. hmp-web-dashboard → feat/dashboard-ui-polish (D1)
  3. hmp-web-dashboard → feat/dashboard-skeleton-loaders (D4)
  4. hmp-web-dashboard → feat/dashboard-a11y-fixes (D7)
  5. hmp-web-dashboard → feat/multi-property-isolation-tests (C3, Playwright)
  6. hmp-booking-engine → feat/booking-engine-serviceclient (C4b)
  7. hmp-booking-engine → feat/booking-engine-mobile-polish (D2)
  8. hmp-booking-engine → feat/booking-engine-ui-states (D3)
  9. hmp-booking-engine → feat/booking-engine-a11y-fixes (D7)

Round 4 — Mobile + infra​

  1. hmp-mobile-apps → feat/mobile-keynova-branding (D5)
  2. hmp-infrastructure → feat/seed-5-test-properties (E1)
  3. hmp-infrastructure → feat/enable-event-flow (C5)

Round 5 — Pending fixes (not on a branch yet)​

  1. (P0 #1) hmp-frontdesk-service → new fix/night-audit-pos-order-drift branch
  2. (P0 #2) hmp-frontdesk-service → new fix/night-audit-settings-overwrite branch
  3. (P0 #3+#4) hmp-frontdesk-service → new fix/night-audit-property-id-filter branch
  4. (P1) hmp-web-dashboard → new fix/dashboard-auth-setup branch
  5. (P1) hmp-booking-engine → new fix/booking-engine-selectors branch
  6. (P1) hmp-frontdesk-service → new fix/night-audit-running-stuck branch
  7. (P1) hmp-frontdesk-service → new fix/rollback-folio-decrement branch
  8. (P1) hmp-web-dashboard → new fix/d7-opacity-contrast branch (or formal scope-out)

Total Phase 1 Branches​

  • Workstream C: 7 task branches × ~3 repos avg = ~14 distinct branches
  • Workstream D: 7 task branches × ~1 repo avg = ~8 distinct branches
  • Workstream E: 5 doc branches in hmp-docs (E2 + E3 + E4) + 1 infra branch (E1)
  • Workstream F: 1 doc branch in hmp-docs (covers F1, F2, F3)
  • Docs syncs: 6 doc branches in hmp-docs (1 = C+D, 2 = E2, 3 = E3, 4 = E4, 5 = F1-3, 6 = E+F sync — this one)
  • Pending fixes (Round 5): 8 branches not yet created

Approximate total: ~40 branches across 12+ repos.

See Also​