Skip to content

Merge upstream quattro (Hermes desktop agent, OM-SEC-12, leftover Fastfetch/OWE) - #50

Merged
36 commits merged into
quattrofrom
cursor/upstream-changes-pr-8716
Sep 27, 2026
Merged

36 commits merged into
quattrofrom
cursor/upstream-changes-pr-8716

Conversation

@cursor

@cursor cursor Bot commented Sep 25, 2026

Copy link
Copy Markdown

Cherry-picks leftover PR #49 (which already includes leftover #48, #45, and #42) plus the 6 new first-parent / 45 non-merge omacom/omarchy quattro commits since that sync onto this fork’s current quattro (13502987, face holds on swapped frames from #46).

Upstream moved from 93e8cd56 to 7b336b1b. A raw git merge of upstream quattro is still not a fast-forward — earlier cherry-pick syncs already landed those commits — so this is leftover #49 plus the new first-parent commits only. #49, #48, #45, and #42 are still open and are superseded here. Face draft #47 is left alone.

Fork-only Cursor and face/lock work is untouched: official-tarball installer, no mise wrapper, usage collector, Cursor/Grok update steps, the theme-set fix from #22, and face scan #26–#40 / #43 / #46. The OWE lock-feed Loader stays isolated; the face card and presented/swapped-frame holds remain on the lock and polkit surfaces. omarchy-theme-set-vscode still does not theme Cursor.

New since PR #49

Hybrid NVIDIA VA-API/GLX (upstream omacom#11690)

  • Forcing NVIDIA’s VA-API and GLX drivers globally on hybrid laptops breaks Chromium-based browsers (black video, audio still plays) because the display is usually wired to the iGPU.
  • New omarchy-hw-nvidia-display reads cached sysfs boot_vga (not lspci, which wakes a runtime-suspended GPU). Hyprland now applies LIBVA_DRIVER_NAME / __GLX_VENDOR_LIBRARY_NAME only when NVIDIA actually drives the display.
  • Migration 1790282866 marks reboot-required on hybrid machines so the old inherited env is cleared.

Hermes Desktop is the default-agent runtime (upstream omacom#12844)

  • Choosing Hermes as the default agent installs Hermes Desktop and the app’s self-updating runtime under ~/.hermes. Nothing is stubbed through mise; provision no longer calls omarchy-install-hermes-cli || true.
  • Removal closes Hermes (including a venv -m hermes_cli process) before dropping the package, and refuses before any user data is touched.
  • Migration 1790017600 retires the old mise wrapper and environment.
  • Fork adaptation: Cursor is still the official tarball path (omarchy-install-cursor-agent), not omarchy-mise-install cursor-agent. manual/17-ai.md names both exceptions.

Omasnap autosaves by default (upstream omacom#13218)

  • Docs only, on top of leftover Omasnap. A capture now saves to disk, copies to the clipboard, and shows the 10-second preview. Set [output] autosave = false in ~/.config/omasnap/omasnap.conf to turn saving off.

Cyclic theme colour references (upstream omacom#13046)

  • shell/Commons/Color.qml now tracks visited roles and returns the supplied fallback instead of recursing forever. color-reference-test.sh covers two-entry cycles, self-references, gradient first-stop cycles, and long acyclic chains.

OM-SEC-12: bind update inhibitor cleanup to process identity (upstream omacom#9467)

  • Large security pass on the update / channel / passwordless-sudo pipeline: privileged Bash startup (#!/bin/bash -p), OMARCHY_PATH must match the running entrypoint, command-scoped --no-update sudo, fail-closed expiry, and inhibitor cleanup bound to owned process identity (PID, start time, owner, token).
  • omarchy update reorders: migrate → orphans / logs / status → service restart → AUR → post-update hook → mise, each user-controlled step behind a cold credential boundary. The reboot prompt is last.
  • Fork adaptation: omarchy-update-grok-bot and omarchy-update-cursor still run after mise, each with their own revoke. Both are stubbed in sudo-boundary-test.sh so the copied updater can finish.

Remote Neovim clipboard yanks (upstream omacom#11486)

  • Migration 1788996284 upgrades known Omarchy remote_clipboard.lua providers atomically (backup + version guard). Custom, symlink-managed, and unrelated files are left alone. Needs omarchy-nvim 2026.9.21-2 or newer before it will mark an unrepaired provider complete.

Leftover from PR #49 (still not on quattro)

Fastfetch swap label spacing (upstream omacom#12774)

  • Hardware-section swap key no longer has a trailing space, so Fastfetch does not render an extra gap before the colon.

Themes remember wallpaper choices (upstream omacom#7718)

  • Switching themes writes the outgoing background under ~/.local/state/omarchy/theme-backgrounds/<theme> and restores it next time. Re-applying the current theme still cycles.

VS Code-family theme reload and contrast (upstream omacom#10134, omacom#10016, omacom#9964)

  • Generated extension copies the palette file, versions as 1.0.<cksum>, and sets _watch: true. Hover/line/badge chrome uses muted mixes so it stays visible. Cursor is still not themed.

Catppuccin Neovim uses mocha (upstream omacom#12864)

  • Stock theme sets colorscheme = "catppuccin-mocha" so old and new plugin checkouts both load.

Elsewhen, literals, clipboard, icons, OCaml, OWE, Omasnap (leftover from #45/#42)

  • Elsewhen rescan is best-effort (omarchy-shell -q). Migration renamed to 1790042972 so the stranded-link repair re-runs.
  • Presence/package/hardware/restart/editor/hook helpers pass operands after --.
  • SUPER+A selects all. In a terminal, SUPER+C / SUPER+V send CTRL+SHIFT+C / CTRL+SHIFT+V.
  • Default-editor menus use the Sublime and Emacs glyphs. omarchy-remove-dev-env ocaml requires sudo --no-update.
  • owe / owe-lockfeed own desktop video and the lock feed. omasnap replaces Satty/Tensaku.

Fork-only adaptations

Tests

Passed locally on this branch:

  • ./test/cli
  • test/shell.d/hw-nvidia-test.sh
  • test/shell.d/hermes-cli-test.sh
  • test/shell.d/hermes-desktop-install-test.sh
  • test/shell.d/hermes-mise-migration-test.sh
  • test/shell.d/hermes-remove-test.sh
  • test/shell.d/preinstalls-test.sh
  • test/shell.d/color-reference-test.sh
  • test/shell.d/neovim-remote-yanks-test.sh
  • test/shell.d/update-sequence-test.sh
  • test/shell.d/update-disk-space-test.sh
  • test/shell.d/update-hook-security-test.sh
  • test/shell.d/update-restart-phases-test.sh
  • test/shell.d/update-user-path-test.sh
  • test/shell.d/security-entrypoint-symlink-test.sh
  • test/shell.d/security-source-root-test.sh
  • test/shell.d/channel-sudo-boundary-test.sh
  • test/shell.d/channel-test.sh
  • test/shell.d/nopasswd-sudo-expiry-test.sh
  • test/shell.d/restart-shell-test.sh
  • leftover coverage from Merge upstream quattro (Fastfetch swap spacing, leftover wallpaper/VS Code/OWE) #49: theme memory / neovim mocha / elsewhen / omasnap / owe / clipboard / lock-face / face overlay+playback / polkit-face / operand boundaries / fingerprint / menu guards

Sandbox limits, not sync regressions:

  • update-lock-test.sh hardcodes /run/user/$UID, which does not exist here.
  • update-stay-awake-security-test.sh needs a private mode-0700 XDG runtime that is not under /tmp (OM-SEC-12 refuses /tmp as an inhibitor path).
  • passwordless-grant-lifecycle-test.sh needs a companion omarchy-pkgs checkout whose omarchy-settings.install defines pre_remove; /home/ubuntu/omarchy-pkgs is older than this PR.
  • remove-dev-env-sudo-security-test.sh still skips the namespace proof when unshare cannot run newuidmap.
  • locate-test.sh still fails on updatedb --debug-pruning against a temp tree; same on current quattro (13502987).

Skipped here (no compositor / no Quickshell): owe-lock-test.sh, screenshot-sanity-test.sh.

Open in Web View Automation 

dhh and others added 30 commits September 23, 2026 23:19
Replace the shell's desktop video path with OWE
…-test

Retire the shipped Copy URL migration test
Point shell documentation to the canonical reference
Remove obsolete repository scan from locate test
…onment

Isolate About tests from inherited NO_COLOR
…ronment

Isolate pacman tests from inherited LC_ALL
…environment

Fall back to connected Wi-Fi when QR route lookup fails
Report skipped checks separately in shell tests
…se-on-retroarch-remove

Drop libretro-database-git when removing RetroArch
Dropbox install not flagged as needing sudo
…ditor-uses-subl

Use subl for the Sublime Text default editor
The lock view now isolates the OWE video feed behind a Loader. Keep the
fork-only assertion that face chrome is not loaded as a plugin Item, and
require that the only Loader is LockFeedSurface.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
…-shell

Let the Elsewhen migration survive a shell it cannot reach
Rename the Elsewhen migration so the link repair reaches machines that already ran it
…teral

Treat command operands as literal values
Add select all and standard terminal clipboard shortcuts
…macs-icons

Add editor icons for Sublime Text and Emacs
…-update

Isolate OCaml cleanup authorization
…sible-hover-states

Fix invisible hover and active states in the generated VS Code theme
…ible-states

Fix invisible VSCode status bar labels and current line
Point catppuccin theme at its flavour colorscheme
Make VS Code-family editors reload the Omarchy theme when it changes
…wallpapers

Remember the selected wallpaper for each theme
Upstream now writes a real theme file and versions the local extension from
palette content so VS Code reloads. The CLI fixture still expected a symlink
to 1.0.0.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Only force NVIDIA VA-API/GLX env when NVIDIA drives the display
spencerbull and others added 6 commits September 25, 2026 23:17
Install Hermes for the default agent as the desktop app's self-updating runtime

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
…ycles-20260923

Guard against cyclic theme colour references
…-inhibitor-identity

[codex] OM-SEC-12: Bind update inhibitor cleanup to process identity

Reported-by: Afonso "AFOliveira" Oliveira

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Migrate remote Neovim providers to reliable clipboard yanks and paste
Official product updates still run after mise, each behind a cold sudo boundary.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Sep 25, 2026

Copy link
Copy Markdown

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 30e139ff-782d-46ab-9783-6efc1ddae0f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@mark-groves mark-groves closed this pull request by merging all changes into quattro in 381d6f9 Sep 27, 2026
@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-8716 branch October 17, 2026 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants