# Task: Integrate macOS popup lag fix on main ## Identity - Task ID: 20260818-macos-popup-main-8f21 - Mode: Integration - Branch: main - Worktree: D:\Datas\OthersProjects\makelore - Base commit: b03ce985787a4f4efa1b2814c2fa9f60592e9663 - Owner: developer - Status: Completed ## Scope - Integrate the reviewed macOS popup compositing implementation from source commit `0f761f3` into the currently clean local `main` at `b03ce985`. - Keep source task records and evidence in their owning feature worktree; write only this integration task's record to the canonical branch. - Run merged-main verification and leave remote `origin/main` and push state unchanged. ## Intent And Constraints - Preserve all existing local `main` commits and unrelated peer work. Do not rebase, reset, stash, force-push, or discard changes. - Integrate only `src/main.tsx`, `src/styles/globals.css`, and `tests/e2e/popup-performance.spec.ts` from the reviewed source. Do not promote the source task's unverified macOS performance claim into canonical memory. - Preserve Main/IPC ownership, hardware-acceleration/native-vibrancy policy, accessibility behavior, and non-Darwin popup visuals. Keep the real signed macOS validation caveat explicit. - If a conflict appears outside this bounded source seam, stop for a semantic decision rather than guessing. ## Outcome - Merged the reviewed macOS popup fix into `main` as commit `fc42c17aabdedba0d99d5a4eccfd406fb243f926` (normal `--no-ff` merge of source commit `0f761f3`; the abbreviated local tip is `fc42c17`). - The canonical merge contains only `src/main.tsx`, `src/styles/globals.css`, and `tests/e2e/popup-performance.spec.ts`. Source feature task records and evidence remain in their owning worktree, as required by the documentation boundary. Existing local `main` history and non-Darwin behavior are intact. ## Verification - `corepack pnpm@10.33.4 run typecheck` — passed. - `corepack pnpm@10.33.4 run build:vite` — passed; existing dynamic-import and chunk-size warnings only. - `corepack pnpm@10.33.4 exec node ./node_modules/@playwright/test/cli.js test tests/e2e/popup-performance.spec.ts --reporter=line` — passed (1 test). - `corepack pnpm@10.33.4 test` — first run had one Vitest worker exit after 175/176 files and 2,114/2,120 tests completed; immediate rerun passed all 176 files and 2,120 tests. - Source/merged-tree scoped ESLint and final Sol reviewer both passed. - Documentation drift and final clean-tree checks are required before releasing this integration task. ## Follow-ups - Remote push was not performed; `origin/main` remains unchanged. - Run signed macOS x64/arm64 package smoke and a short GPU/vibrancy trace before claiming measured frame-time improvement. Sheet/nested-dialog physical coverage remains a release follow-up. ## Promotion Candidates - None. The source task deliberately keeps the platform-scoped rendering rule and performance evidence task-scoped until physical macOS measurements confirm the compositor result.