# Upstream integration into build/all-features ## Scope - Upstream: `https://github.com/jimrandomh/faceclaw`, `main` at `70ec2a0d`. - Integration branch: `build/all-features`, previously `16fe517b`. - Merge all 38 commits missing from the fork's original main, preserving the custom feature history. No rebasing or force push. - Independent feature branches and the remote main branch remain unchanged. ## Merge resolutions - Notifications keep the new upstream Settings entry and its popup-duration preferences, plus the custom dismiss-all action, default authorization and bulk controls. Source filtering still applies to glasses lists and tray icons. - Android/iOS controllers retain custom transcription language and OpenAI model selection while adopting upstream multi-model glasses behavior. - Both reconnect head-up synchronization and upstream voice-wake setup remain. - Password setting editors retain masked values alongside the new short-window layout and error positioning. - The shared sender preserves explicit head-up preferences and upstream G2-only framebuffer leasing. - Layout tests retain both custom fullscreen/keep-awake behavior and upstream glasses-specific defaults. - Notification and EvenHub test fixtures account for the new Settings and device compatibility dependencies. Onboarding assertions match upstream's intentional hiding of unreleased RayNeo iO from the device picker. ## Additional compatibility fixes - Keep head-up controls and native commands G2-only, preserving stored choices when another model is selected. Add controller/UI and Kotlin enqueue tests. - Align notification-filter wording with custom list/tray filtering. - Keep the iOS ring connection row model-aware. ## Automated validation - `npm test`: 1,315 tests, 1,312 passed, 3 skipped, 0 failed. - `npm exec -- tsc --noEmit`: passed. - Lint: passed with existing warnings. ## Validation limitations This integration does not build or install APKs, flash firmware, or exercise a physical phone, glasses or ring. Kotlin host-test execution requires a Java and Android SDK toolchain; this environment has neither. The attempted `npm run test:kotlin` stops because `JAVA_HOME` is unset and `java` is absent. Existing release artifact checksums in other validation documents describe older builds and do not validate this merge.