Files
faceclaw/docs/branches.md
T

49 lines
4.9 KiB
Markdown

# Branches and pull requests
`main` includes `jimrandomh/faceclaw` through `70ec2a0d`, merged as `b4a2b293` in PR #13. Gitea is the remote `origin` and uses `main` as its default branch. The agent publishes proposals from `MasterControl/faceclaw` when it lacks write access to this repository.
Each feature branch starts from the upstream main available when created and groups related changes, without unrelated features or environment setup. Independent feature PRs target `main`.
| Group | Branch | PR | Independent JS tests |
| --- | --- | --- | --- |
| build: reproducible Nix environment for Android and Wear OS | `build/nix-android` | [#1](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/1) | 1061 passed, 2 skipped |
| fix: align the llama native library for Android 16 KiB pages | `fix/android-16k-pages` | [#2](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/2) | 1061 passed, 2 skipped |
| feat: configurable notification defaults and bulk actions | `feat/notifications` | [#3](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/3) | 1067 passed, 2 skipped |
| feat: notification backdrop and selected-label horizontal scrolling | `MasterControl:feat/notification-focus-marquee` | [#14](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/14) | 1228 passed, 3 skipped; same 2 onboarding failures as main baseline |
| feat: share Android calendar selection across calendar readers | `feat/calendar-selection` | [#4](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/4) | 1065 passed, 2 skipped |
| feat: configure head-up wake and wake angle | `feat/head-up-wake` | [#5](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/5) | 1063 passed, 2 skipped |
| feat: system menu controls for app closing, full screen and keep awake | `feat/app-controls` | [#6](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/6) | 1076 passed, 2 skipped |
| feat: language selection for OpenAI and on-device Whisper | `feat/whisper-languages` | [#7](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/7) | 1067 passed, 2 skipped |
| feat: configurable app and system menu hold gestures | `feat/menu-gesture-preference` | [#8](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/8) | 1072 passed, 2 skipped |
| feat: editable launcher folders, icon layout and open-window order | `feat/launcher-layout` | [#9](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/9) | 1080 passed, 2 skipped |
| fix: silent-mode feedback and prompt exit-state refresh | `fix/silent-mode-feedback` | [#10](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/10) | 5 focused tests; combined suite passed |
| feat: optional authenticated export of R1 health history | `feat/health-export` | [#11](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/11) | 6 focused exporter tests; combined suite 1137 passed, 2 skipped |
All independent branches also passed `tsc --noEmit`. The head-up branch received a final import-only cleanup and was typechecked/linted again.
`build/all-features` combines the feature branches and retains the combined validation records. It is the branch for APK builds, not a feature PR. Develop a change on its feature branch, then merge it into the build branch; do not merge the build branch back into a feature branch. The proposed `MasterControl:sync/upstream-main-all-features` branch combines the upstream sync and PR #14 with the existing build history. Its suite passes with 1327 tests and 3 skips; no new APK has been built for this integration.
## Cleanup archive
The tag `archive/before-pr-cleanup-2026-11-06` preserves the complete previous integration history. Replaced branch tips are recorded below; no original feature implementation was discarded.
| Previous branch | Archived commit |
| --- | --- |
| `build/wearos-release` | `2b14ea38b468241ebb5c4d3c0808e6df977ed93a` |
| `chore/nix-build-fixes` | `096510f5adef7c5ed369a89bcca9a1b8144dc51e` |
| `chore/nix-devenv` | `19cf564251507617982cd1ed1da66de317b38ff0` |
| `feat/app-fullscreen` | `49099d5efe6f32f91e0147b81cd613b2043d3378` |
| `feat/app-switcher-close-menu` | `be939f401bdb1372b0f6c9faef754d7a10ff4118` |
| `feat/notification-filter-default` | `5b3a4fa7475664733ca1dbed5d532347bf57c1a6` |
| `integration/device-preferences` | `1d230a401471b99d6136f27916dd90e98033ea26` |
| `fix/android-16k-pages` before squashing/rebase | `68c9dc7ae997c17327433e5b6481e64d6fecca9f` |
| `feat/calendar-selection` before squashing/rebase | `6397928c60fd227fae1d50532933fa390e415ff8` |
| `feat/head-up-wake` before squashing/rebase | `398c62af9adc1401fd3f5d96a5332dab693619bf` |
| `feat/whisper-languages` before squashing/rebase | `c5b57e85b0759bac594a50d9dc870fa1b26d155b` |
The three Nix/build branches were consolidated into `build/nix-android`. The switcher-close and full-screen branches were consolidated into `feat/app-controls`. Notification defaults and dismissal remain together in `feat/notifications`.
Hardware validation remains separate from software checks. No firmware was flashed during this cleanup.