Skip to content

[Intel Mac P12] Consolidate T1Bridge support and fingerprint UI - #12690

Draft
andrew-boyd wants to merge 2 commits into
omacom:quattrofrom
andrew-boyd:intel-mac/p12-t1bridge
Draft

andrew-boyd wants to merge 2 commits into
omacom:quattrofrom
andrew-boyd:intel-mac/p12-t1bridge

Conversation

@andrew-boyd

@andrew-boyd andrew-boyd commented Sep 20, 2026 •

Copy link
Copy Markdown

[Intel Mac P12] Consolidate T1Bridge support and fingerprint UI

Keep the accepted manual T1Bridge direction for T1 hardware, with existing fingerprint/desktop contributions. Its package companion now fixes the optional brightness controller’s reproducible DPMS-off acceptance bug. This supplies no automatic provider transition or new hardware suspend support.

Draft consolidation for source review and hardware-owner follow-up. Known defects remain; no hardware or merge-readiness certification is claimed. Part of the 14-feature Intel Mac series with three package companions.

Contribute: open follow-up PRs in andrew-boyd/omarchy with base intel-mac/p12-t1bridge. Use [Intel Mac P12] in the title and a contributor branch such as intel-mac/p12/describe-change. Link this feature in the series index. Merging a follow-up into this branch updates its roll-up.

This existing draft: #12690.

Full Intel Mac scope and current revision

The project covers all 64-bit Intel Macs: pre-T1, T1 and T2. MacBookPro13,3 is only the first available physical test machine. Each feature has its own hardware boundary; one model's success does not validate the rest.

Candidate head: 2d674eafb2609035081dfd0686b69f2cc531c6d3; reconciled upstream: 8f324c90b82790d31ab33565441e07cbdb8d2308. Published contribution commits and author/co-author metadata remain in the history.

Ready for attended physical testing; Mac hardware remains untested by this effort. The reconciled combined ISO passed fresh unencrypted/encrypted VM installations, desktop/password-lock checks, strict Neovim startup/theme checks, synthetic Apple EFI preservation through a disk wipe, and affected package/DKMS/migration checks. ISO SHA-256: 9e6288ef5cc1eadce519cdd7384c8030286eb938a6288eb218f025a61b433252.

Exact sources, results, retained failures and reproduction. These results cover the pinned combined image; standalone-versus-combined differences remain explicit. Full inventory and retained work tracks.

Scope and dependencies

T1Bridge remains the accepted T1 provider; setup and hardware handoff remain manual. Its selected 0.1.9 release reports system suspend/resume as not working on its tested machine; that limitation is unresolved here. Shared fingerprint UI is independently useful. EFI-preservation PR omarchy-iso#174 is an integrated-ISO dependency, not code carried by this runtime branch. Preserve an independent firmware backup before a physical disk wipe.

The inventory now records 188 source/context PRs: 101 have dispositions in feature tables and 87 remain only in separate work tracks. This is not 188 implemented PRs or 188-to-14 compression. The 14 feature PRs and three package companions remain the published coordination targets; retained backlog is not claimed complete.

Every affected source PR and recommended action

Current open/closed/merged state is administrative history, not proof that two patches preserve identical behavior. Included/partial identifies selected contributions; alternatives, deferred work and context are not automatically ISO content.

Source and author State Treatment and rationale Recommended action
omacom/omarchy-iso#174 — @niconistal open partial: Both existing EFI-preservation commits are incorporated unchanged into the local integrated ISO source with original authorship. The new ISO passed a fresh VM disk-wipe/restore check for all three synthetic file hashes; historical B7 lacks this contribution. The proposal remains best-effort and verifies counts/sizes rather than hashes, so the physical-install guide also requires an independent external firmware backup. Keep uncovered work open; this feature alone does not fully supersede it.
omacom/omarchy-pkgs#152 — @shawnyeager open alternative: Heratiki legacy driver and ACPI power behavior conflict with selected T1Bridge ownership; full source preserved. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy-pkgs#298 — @monomyth open alternative: AJ/freeze-safe legacy provider with different reports and no legacy ALS module; not evidence for T1Bridge behavior. Refreshed head b6495c4 adds only local-package planner metadata; runtime stack and version remain unchanged. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy-pkgs#315 — @shawnyeager open alternative: Legacy ALS service packaging retained; selected T1Bridge optional package installs its own original service. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy#10141 — @monomyth open context: Existing MacBookPro13,3 bundle combines separate calibration, legacy T1/SPI, NVMe and experimental Radeon work. Retain relevant device reports and model boundaries; this roll-up does not cover or endorse the full bundle. Keep the original as its review/test target; no closure recommendation here.
omacom/omarchy#10331 — @shawnyeager open context: Legacy panel and automatic keyboard lighting retained separately. Selected T1Bridge consumer is optional, panel-only; scope is not equivalent. Keep the original as its review/test target; no closure recommendation here.
omacom/omarchy#10582 — @fresh3nough open context: First-run user-unit fix remains independent; accepted manual T1Bridge setup enables named units directly. Keep the original as its review/test target; no closure recommendation here.
omacom/omarchy#11273 — @niconistal open included: Existing shared lock blank/wake fingerprint lifecycle and retry behavior. Consider closure only after maintainers accept preserved behavior and hardware coverage.
omacom/omarchy#11952 — @tonibergholm open included: Existing status/enrollment UI combined with #11273 through their shared lock service. Consider closure only after maintainers accept preserved behavior and hardware coverage.
omacom/omarchy#12201 — @slr01 closed context: Closed shared-reader predecessor superseded by #12426. Already closed; retain evidence and credit. No action requested.
omacom/omarchy#12420 — @slr01 open alternative: Shared-reader blanking alternative avoids aborting the active scan; differs from selected #11273 lifecycle. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy#12426 — @slr01 open alternative: Fresh PAM-context ownership alternative supersedes #12201; differing hardware reports do not validate selected code. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy#12435 — @jonathan-downs open alternative: Overlapping shared lock/resume lifecycle reviewed with P04. Keep separate from the selected #11273/#11952 service until the differing triggers and reader behavior are reconciled. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy#12502 — @mohan314e open context: Overlapping shared lock/resume lifecycle reviewed with P04. Keep separate from the selected #11273/#11952 service until the differing triggers and reader behavior are reconciled. Keep the original as its review/test target; no closure recommendation here.
omacom/omarchy#12614 — @dexteresc closed superseded: Closed in favor of #12652 to correct commit attribution; preserve the original source and exact production comparison. Already closed; retain evidence and credit. No action requested.
omacom/omarchy#12652 — @dexteresc closed alternative: Window-event focus recovery for an already active lock surface; separate from #12435's logind monitor and #9181's resume/PAM retry ownership. Preserve as a follow-up; not stacked into accepted fingerprint work. Already closed; retain evidence and credit. No action requested.
omacom/omarchy#12667 — @prabhchintan open context: Shared lock numeric-keypad handling with an attributed Apple Magic Keyboard report. Separate from T1 provider and fingerprint lifecycle; retained as follow-up context, not a new prerequisite. Keep the original as its review/test target; no closure recommendation here.
omacom/omarchy#7064 — @shawnyeager open alternative: Complete legacy EFI/Touch Bar handoff retained; competing HID-module provider not layered onto T1Bridge. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy#7950 — @csk-grit42 open alternative: Virtual-HID rebinding depends on legacy provider; differs from T1Bridge DRM/configuration ownership. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy#8560 — @robouk open alternative: Upstream-selected successor when #9181 was closed. Its active-focus callback is a smaller implementation than explicit resume signaling, output recreation and bounded retries. Keep the difference visible; closure does not establish complete behavioral equivalence. Retain for comparison; do not stack competing implementations automatically.
omacom/omarchy#9181 — @ClGratton closed alternative: Broader FocusScope/focus-generation recovery changes the sleep monitor, explicit resume IPC and post-PAM retry policy. Preserve separately from #12652 and #12435; no mixed focus ownership is invented. Already closed; retain evidence and credit. No action requested.
omacom/omarchy#9211 — @phedoreanu open alternative: Shared lock wake and wake-key consumption proposal, reported on MacBookPro16,1. It uses wall-clock polling and changes password-key handling; retain alongside the explicit resume/focus alternatives instead of stacking competing wake owners into the accepted lid-lock/fingerprint components. Retain for comparison; do not stack competing implementations automatically.

Validation and attribution

Required fresh-image checks are satisfied, with qualified reruns. The full source suite passed 273 files with two disclosed skips, but repeated NetworkManager Polkit failures during that suite temporarily locked its test account. The following password/desktop/recovery checks failed there and passed separately in a clean overlay of the same ISO; the original aggregate remains failed. The first build attempt also failed one libfprint USB-emulation test; unchanged-source isolated repeats, two complete suites and normal package checks passed afterward. That intermittent build-test failure remains documented, and its cause is not established. VM fixtures and DKMS builds do not establish physical device behavior. Physical Wi-Fi, audio, camera, Touch Bar, fingerprint, graphics and suspend behavior remain unverified by this effort.

Original source histories remain linked above. Source-authored commits already included in the roll-ups remain ancestors of this revision; additional copied contributions receive native attribution. Original attribution mapping. No original PR is edited or closed by this effort.

Consolidate existing source contributions for draft review.
Original implementation authors are retained as author/co-authors; the committer assembled and reconciled the candidate. No contributor approval or sign-off is implied.
Known defects and excluded alternatives remain documented in the PR body.

Source-PR: omacom#11273
Source-PR: omacom#11952
Source-Commit: omacom#11273277ea6f
Source-Commit: omacom#119526d88ae4

Co-authored-by: Toni Bergholm <toni.bergholm@iki.fi>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@omarchybot

Copy link
Copy Markdown
Collaborator

Merged #7158 incorporates strict enrollment detection, transient probe recovery and device-error backoff. The T1Bridge setup, hardware support and shared fingerprint status UI in this roll-up remain outside that merge. Keeping this open; the shared lock code needs to retain the landed retry and probe behavior.

GPT-6 in Codex and Claude Opus 5.5 Medium checked the coverage against the landed source; Claude's agreement does not guarantee independence. This closure review was read-only and did not rerun runtime tests.

@jandrusk

jandrusk commented Oct 8, 2026

Copy link
Copy Markdown

Heads-up for the next rebase: since #14553 (Qt 6.12) merged to quattro, QML has to reference the theme singleton as Commons.Color, because a bare Color now resolves to Qt's own type. The new fingerprint message in shell/plugins/lock/LockView.qml uses the bare form:

-      color: Color.lock.text
+      color: Commons.Color.lock.text

(LockView.qml already imports qs.Commons as Commons.) The branch also conflicts with quattro after #7158 merged into the same lock service, so it needs a rebase that keeps #7158's retry and probe behavior, as noted above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants