Skip to content

Merge upstream quattro (single sudo auth, leftover Hermes/OM-SEC-12/OWE) - #51

Merged
mark-groves merged 39 commits into
quattrofrom
cursor/upstream-changes-pr-4541
Sep 27, 2026
Merged

mark-groves merged 39 commits into
quattrofrom
cursor/upstream-changes-pr-4541

Conversation

@cursor

@cursor cursor Bot commented Sep 26, 2026

Copy link
Copy Markdown

Cherry-picks leftover PR #50 (which already includes leftover #49, #48, #45, and #42) plus the 3 new first-parent / 3 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 7b336b1b to c5b4db77. 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 #50 plus the new first-parent commits only. #50, #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 #50

One sudo password per omarchy update (upstream omacom#13323)

  • Every sudo call used to prompt because the no-update wrapper covered the whole run, stay-awake revoked on entry/exit, and per-phase revokes stacked. A single update could ask four times before the snapshot finished (omarchy update asks for the sudo password on every privileged command omacom/omarchy#13319).
  • Authorize once, right after confirmation, starting from a revoked timestamp so the prompt belongs to this update. A background keepalive refreshes it until the update is done. Prune, snapshot, stay-awake, keyring, system packages, migrations, orphan removal, service restarts, the post-update hook, and mise all share that authorization.
  • Authorize by running a command, not sudo -v, so passwordless sudo still needs no prompt. Ttyless stay-awake reuses OMARCHY_UPDATE_SUDO_SESSION=1 instead of asking again through polkit.
  • AUR builds run third-party PKGBUILD code, so they move after hook/mise and run cold: the keepalive stops, the timestamp is revoked, and yay plus any bare sudo use the no-update wrapper.
  • Fork adaptation: omarchy-update-grok-bot and omarchy-update-cursor still run after AUR, each with their own revoke and the no-update wrapper. Both are stubbed in sudo-boundary-test.sh so the copied updater can finish.

Stay-awake stop no longer errors on TERM (upstream omacom#13361)

  • Stopping stay-awake sent TERM to an exec'd sleep. systemd-inhibit treated a child killed by a signal as an error, so every update ended with ' /usr/bin/setpriv' terminated by signal TERM.
  • The held process now stays a shell that traps TERM, kills its sleep, and exits cleanly.

AUR menu entry moved down

  • install.aur is no longer the second Install item. It now sits after Windows / before Preinstalls, now that shipped installers no longer need it.

Leftover from PR #50 (still not on quattro)

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.
  • Fork adaptation: Cursor is still the official tarball path (omarchy-install-cursor-agent), not omarchy-mise-install cursor-agent.

OM-SEC-12 (upstream omacom#9467), now reshaped by omacom#13323

  • Privileged Bash startup, OMARCHY_PATH must match the running entrypoint, command-scoped --no-update sudo, fail-closed expiry, and inhibitor cleanup bound to owned process identity.
  • Ask for the sudo password once per omarchy update omacom/omarchy#13323 keeps that hardening and changes who shares the one authorization: hook and mise now share it; AUR (and this fork’s Grok/Cursor tail) stay cold.

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

  • omarchy-hw-nvidia-display reads cached sysfs boot_vga. Hyprland applies NVIDIA VA-API/GLX env only when NVIDIA drives the display.

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.

Cyclic theme colour references (upstream omacom#13046)

  • shell/Commons/Color.qml tracks visited roles and returns the supplied fallback instead of recursing forever.

Remote Neovim clipboard yanks (upstream omacom#11486)

  • Migration 1788996284 upgrades known Omarchy remote_clipboard.lua providers atomically. Needs omarchy-nvim 2026.9.21-2 or newer before it will mark an unrepaired provider complete.

Fastfetch, wallpaper memory, VS Code, Elsewhen, OWE, Omasnap (leftover from #49/#48/#45/#42)

  • Fastfetch swap label spacing; themes remember wallpaper choices; VS Code-family theme reload/contrast and catppuccin mocha; Elsewhen stranded-link repair; literal operands; terminal clipboard shortcuts; Sublime/Emacs icons; OCaml sudo --no-update; owe / owe-lockfeed; omasnap replaces Satty/Tensaku.

Fork-only adaptations

  • lock-face-test.sh still allows the isolated OWE feedLoader while forbidding a plugin Item next to the password field. Face card, Howdy PAM, and lock/polkit chrome — including presented-frame and swapped-frame holds from fix(shell): play face results on presented frames #43/fix(shell): play face holds on swapped frames #46 — are unchanged.
  • test/cli still asserts a copied theme file, _watch: true, and a content-hashed extension version.
  • Cursor stays off mise. Hermes Desktop is taken as upstream wrote it.
  • Official Grok Bot and Cursor product updates remain after AUR, each behind a cold sudo boundary.

Tests

Passed locally on this branch:

  • ./test/cli
  • test/shell.d/update-sequence-test.sh
  • test/shell.d/update-hook-security-test.sh
  • test/shell.d/update-user-path-test.sh
  • test/shell.d/update-disk-space-test.sh
  • test/shell.d/update-restart-phases-test.sh
  • test/shell.d/channel-sudo-boundary-test.sh
  • test/shell.d/channel-test.sh
  • test/shell.d/security-entrypoint-symlink-test.sh
  • test/shell.d/security-source-root-test.sh
  • test/shell.d/nopasswd-sudo-expiry-test.sh
  • test/shell.d/menu-guards-test.sh
  • test/shell.d/update-cursor-test.sh
  • test/shell.d/update-grok-bot-test.sh
  • leftover Hermes / NVIDIA / color-cycle / Neovim / wallpaper / VS Code suites

Known sandbox skips, same as quattro: update-stay-awake-security-test.sh (needs a private XDG runtime dir), update-lock-test.sh (/run/user/$UID), locate-test.sh, passwordless-grant-lifecycle-test.sh (companion omarchy-pkgs checkout older than OM-SEC-12).

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 9 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>
* Ask for the sudo password once per omarchy update

Every sudo call in omarchy update prompted, because the no-update wrapper
covered the whole run on top of per-phase revokes, and stay-awake revoked
the timestamp on its own entry and exit. A single update could ask four
times before the snapshot finished (omacom#13319).

Authorize once, right after confirmation, starting from a revoked
timestamp so the prompt always belongs to this update. A background
keepalive refreshes it until the update is done. Prune, snapshot,
stay-awake, keyring, system packages, migrations, orphan removal, service
restarts, the post-update hook, and mise all share that authorization.

AUR builds run third-party PKGBUILD code, so they move to the end and run
cold: the keepalive stops, the timestamp is revoked, and yay and any bare
sudo use the no-update wrapper. The timestamp is revoked again after AUR
and on every exit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Keep the single authorization for passwordless sudo and ttyless inhibition

Authorize by running a command instead of sudo -v. Under the default
verifypw=all, -v prompts even when passwordless sudo is enabled, which
would have added a prompt those users never had.

Inside an update without a terminal, stay-awake now reuses the update's
authorization with a non-interactive sudo instead of asking again through
polkit. It falls back to polkit only if that authorization is gone.

The test sudo refuses a cold non-interactive call, as the real one does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Stopping stay-awake sends TERM to the held process, which was an exec'd
sleep. systemd-inhibit reports a child killed by a signal as an error, so
every update ended with "'/usr/bin/setpriv' terminated by signal TERM."

The held process now stays a shell that traps TERM, kills its sleep, and
exits cleanly.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Now that every package we offer an installer for no longer needs it
@coderabbitai

coderabbitai Bot commented Sep 26, 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: 7f8bc0fa-019f-4dc0-88fd-bbc792afda0c

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.

@cursor
cursor Bot marked this pull request as ready for review September 26, 2026 23:20
@mark-groves
mark-groves merged commit 381d6f9 into quattro Sep 27, 2026
2 checks passed
@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-4541 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