[cursor]

What changes

Upstream quattro moved past omacom#18831 (6baca275b), which is what #132 merged. Sixteen commits replayed onto current quattro, through 6f646bc9d (ASUS Vivobook S 16 unlock prompt, omacom#18951). No merge commits. Nothing skipped. One conflict, in the agents panel. Fork delta vs 6f646bc9d is 253 paths, the same set as quattro vs 6baca275b. On the 195 paths upstream did not touch, the added and removed lines are unchanged. A three-way merge of the 58 paths both sides changed matches this branch, except the agents panel, resolved below. Face, Grok Bot, Cursor, linux / linux-headers, and the dropped translation-sync workflow stay.

• First boot can carry an OEM's name and agreement (Show an OEM's branding and agreement in first-boot setup omacom/omarchy#18841). An OEM that prepares machines with the Omarchy ISO can leave a bundle in /etc/omarchy/oem. install/provisioning/oem.sh reads it for owner setup: the OEM's logo, tagline, and colour stand in for Omarchy's on the greeter, and again above the agreement, which is the last question, after the review and before anything is created. Declining leaves the machine as it left the factory and offers to shut down, with going back in focus. Accepting records the OEM, the text's hash, the account, and the time in /var/lib/omarchy/oem/eula-accepted.json. The agreement is one screen: the text in a frame that scrolls, with the question and buttons under it. console-font.py draws the logo's braille patterns into glyphs the screen does not otherwise use, and setup sets that font only while a branded screen is up. A console that cannot be given the dots shows Omarchy's logo. The logo's colour goes in the palette's bright red slot, so the buttons and marks keep their own colours. A colour that is not #RRGGBB is ignored. The re-key journal test stubs the new agreement step so it does not loop.
• A fresh link no longer flashes "limited" (Wait out NetworkManager's passing Limited state on connect omacom/omarchy#18869). NetworkManager reports every new link as Limited until its first connectivity probe answers. The panel and bar were painting the red warning for that moment. Limited counts as an outage only once it has held; until then the state stays unknown. The wait starts over after a warning has already shown.
• Slack theme sync is gone (Remove Slack theme sync omacom/omarchy#18788). Slack 4.53 refuses the debugging pipe the themed launcher started it with, so themed Slack no longer opened. This returns existing installs to Slack's own launcher. Migration 1794642577 drops the themed launcher, the theme template, and the sync scripts. Install > Service > Slack, the package, stays.
• The Yoga Slim 7x stays asleep in deep suspend with the lid open (Keep the Yoga Slim 7x asleep in deep suspend with the lid open omacom/omarchy#18835). On a Qualcomm Yoga Slim 7x (83ED), a system-sleep hook keeps that suspend from waking itself. Setup installs it, and migration 1794609353 installs it on an existing machine that does not have it yet. Other machines are untouched.
• The Surface Laptop 8's second USB-C port gets its USB4 firmware (Copy the Surface Laptop 8's second USB4 router image on existing installs omacom/omarchy#18782). linux-omarchy now runs USB4 on that port, and the port's router takes an image of its own. Migration 1794594909 copies it on a Surface Laptop 8 (microsoft,surface-laptop-8-13p8 or microsoft,surface-laptop-8-15) whose support package is 1-7 or newer, then rebuilds the boot image and asks for a reboot. An older package leaves the migration pending. A machine whose Windows USB4 driver cannot be read is told how to copy the image later, and the other migrations continue.
• Activity Monitor opens btop from the launcher (Add Activity Monitor to the app launcher for btop omacom/omarchy#18764). New installs get a launcher that opens btop the same way Super+Shift+T does, with a themed icon drawn like btop's own panels.
• A first local model is set up in the agents panel (Set up a first local model entirely in the agents panel omacom/omarchy#18907). Download and Add another › Local AI no longer open a terminal. A detached setup that is missing Podman installs it through pkexec, and the panel runs the setup itself: an Installing line until the download takes over, the reason if it fails, and the offer again if the password dialog is dismissed. A second model chosen while the first is still installing Podman waits on a line of its own and starts once the first hands off. Delete on a setup the panel still owns forgets a failure, drops one waiting, and leaves the one installing packages alone. Podman and crun join the base install, about 26 MiB on the ISO. The NVIDIA container toolkit is installed with the NVIDIA driver, including the N1x package set, so a local model can reach the GPU. linux and linux-headers stay in the other-packages list beside it. The panel conflict kept shownProviders, so paused collectors and a duplicate unified pool stay hidden, and the new delete path uses that index.
• Herdr, Agent, and ChatGPT join the launcher, and a dock click can be told how to answer (Add Herdr, Agent and ChatGPT to the launcher, and let apps pick how a dock click answers omacom/omarchy#18909). Herdr opens under org.omarchy.herdr, so the dock matches its window, and the launcher and Super+Ctrl+Return focus the open window instead of attaching another terminal. Agent runs omarchy-agent --pick, like Super+Shift+Ctrl+A, and claims org.omarchy.agent. ChatGPT opens chatgpt.com, like Super+Shift+A, with OpenAI's knot on its own. X-Omarchy-Dock-Click=new opens a new window on every click, which Terminal and Agent ask for, and =workspace brings back a window only from the workspace in front. A minimized window of those apps comes back before a new one opens. The scan that read hidden entries now also reads this key, and is desktop-entries.sh. Terminal, Herdr, and Agent share cliamp's terminal window; ChatGPT's knot stands alone.
• Closing the update's terminal ends it at the prompt (End omarchy update when its terminal closes at a prompt omacom/omarchy#16045). omarchy update keeps an untrapped shell as the PTY session leader, so a hangup reaches the foreground prompt instead of waiting on the update's signal traps. The logger restores the caller's SHELL inside that command, so hooks and package builds keep their environment, and the update's exit status is preserved. The update lock records the acquiring PID for the message a second update prints. The flock still decides the hold; a rejected contender leaves that PID in place, and a stale PID does not block the next acquisition. Grok Bot and Cursor still follow AUR and share the update's authorization, and the boot check stays the last sudo-capable step.
• Snapdragon X2 Plus machines use Kalambo's device trees (Pick the Kalambo device trees on Snapdragon X2 Plus laptops omacom/omarchy#18944). Kalambo (X2P-42-100) trees are named kalambo-* and their root names only qcom,kalambo. The UKI's tree list and the Glymur display setup for disk unlock now include them.
• The disk unlock prompt shows on the Acer Aspire 16 AI A16-11M (Show the disk unlock prompt on the Acer Aspire 16 AI A16-11M omacom/omarchy#18743). The display driver binds only once every output's chain has loaded, which was happening from the real root, so the screen stayed black at the prompt. Setup loads the panel, USB-C DisplayPort, retimer, HDMI bridge, IPC router, and PD mapper in the initramfs, plus the Adreno X1-45 microcode. The Aspire 14 AI shares the tree's outputs and is left out until it has been tried. Migration 1794526429 applies it on an existing Aspire 16 AI.
• The disk unlock prompt shows on the ASUS Vivobook S 16 S3607QA (Show the disk unlock prompt on the ASUS Vivobook S 16 S3607QA omacom/omarchy#18951). Same black screen: the display chain loads from the real root. Setup loads the panel, USB-C DisplayPort, retimer, and HDMI bridge with the IPC router and PD mapper in the initramfs. Migration 1794695964 applies it on an existing Vivobook S 16.
• Translations through Update translations omacom/omarchy#18919 (Update translations omacom/omarchy#18860, Update translations omacom/omarchy#18910, Update translations omacom/omarchy#18914, Update translations omacom/omarchy#18919), including the new first-boot, local-model, and launcher strings. The English catalog still has the fork's face strings, Grok Bot strings, and AUR-held strings. agents.helpStartToSeeLimits and the power-profile menu strings stay out of the catalogs.

Verification

• Cherry-pick of the sixteen commits from 2c8d93be0 through 6f646bc9d applied onto quattro 1141aef53. shell/plugins/agents/Panel.qml conflicted and was resolved as above. git diff --name-only of HEAD vs upstream 6f646bc9d is 253 paths, the same set as quattro vs 6baca275b. On the paths upstream did not touch, the added and removed line counts match. The 58 paths both sides changed three-way merge to this branch, apart from the agents panel index. linux and linux-headers are still in the other-packages list. Face, Grok Bot, and Cursor are still in the menu. The translation-sync workflow is still absent. cursor-agent is still out of the mise tool list. Power profiles still write through busctl.
• ./test/cli passed (133).
• ./test/shell was not run as a whole. The files this sync covers passed: agents-panel-test.sh (113, including the in-panel setup, the queue, and a dismissed password), dock-test.sh (48, including new, workspace, and minimized dock clicks), desktop-entries-test.sh (2), i18n-test.sh (401, one structural skip), nvidia-install-packages-test.sh (4), network-captive-portal-test.sh (74), theme-staging-test.sh (8), launcher-remove-test.sh (5), yoga-slim7x-hardware-test.sh (2), hardware-quirks-test.sh (6), snapdragon-hardware-test.sh (3), luks-rekey-journal-test.sh (27). provision-owner-keyboard-test.sh passed (33, one skip) once this machine's kbd-model-map had a ge row bound over it. The host map is 72 lines and has no ge row, so the first run stopped on "the Georgian layout (ge) gets an XKB layout" before the OEM cases. The skip is no readable VT, so the console-font size choice was not built.
• network-panel-runtime-test.sh skipped: no Wayland compositor, so the Limited wait was not drawn.
• update-hangup-test.sh stopped on "close-terminal: gum survived terminal loss". Closing a PTY master in this sandbox leaves both a bare gum confirm and script running sleep alive, so the hangup the test is watching for is not delivered here.
• update-lock-test.sh stopped on "first omarchy-update reached snapshot under lock". /run/user/1000 does not exist here, which is where that test puts the lock. The new PID checks sit after that and did not run.
• This checkout has no Omarchy session, so the OEM screens, the Wi-Fi warning, the agents panel, the dock, and the unlock prompt were not checked on a machine. No other sync was open.

Screenshots

No visible change: this checkout has no Omarchy session, so nothing was drawn here. The OEM greeter and agreement, the Wi-Fi warning, the agents panel's Installing line, and the new launcher icons are visible on a machine; the tests above cover the behavior that can run here.