Skip to content

Merge upstream quattro (Elsewhen repair, literal operands, leftover OWE/Omasnap) - #45

Closed
cursor[bot] wants to merge 22 commits into
quattrofrom
cursor/upstream-changes-pr-2298
Closed

cursor[bot] wants to merge 22 commits into
quattrofrom
cursor/upstream-changes-pr-2298

Conversation

@cursor

@cursor cursor Bot commented Sep 22, 2026

Copy link
Copy Markdown

Cherry-picks leftover PR #42 plus the 6 new first-parent omacom/omarchy quattro commits since that sync onto this fork’s current quattro (4a167a6e, pstack Grok 4.7 / Opus 5.5 from #44).

Upstream moved from b8c382da to d3cfd53b. A raw git merge of upstream quattro is still not a fast-forward — earlier cherry-pick syncs already landed those commits — so this is a clean cherry-pick of leftover #42 and the new first-parent commits only. #42 is still open and is superseded here.

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 / #44. The OWE lock-feed Loader was merged into the fork lock view without dropping the face card.

New since PR #42

Elsewhen migration survives an absent shell (upstream omacom#12853)

  • omarchy-shell shell rescanPlugins exits 1 when no shell answers, and omarchy-migrate runs under set -e, so a TTY/ssh update (or one whose shell went down while QML was replaced) died at "omarchy-shell is not running" and re-failed every retry.
  • The rescan is now best-effort (omarchy-shell -q), matching omarchy-bar put. The update still restarts the shell after migrations. An unknown widget on a live shell still leaves the migration pending.

Elsewhen stranded-link repair actually re-runs (upstream omacom#12861)

  • The package move from plugins/ to shell/plugins/ left ~/.config/omarchy/plugins/omacom.elsewhen pointing at the old path. Machines that already applied 1789581661 never ran the repair, because omarchy-migrate keys completion on the filename.
  • The migration is renamed to 1790042972 so it runs again everywhere. Each step is idempotent: package add is a no-op once installed, both link branches are guarded, rescan is best-effort, and the bar put keeps an existing placement.
  • A dangling link into /usr/share/omarchy is re-pointed; a user-made link is left alone. Dev checkouts still get the user symlink when $OMARCHY_PATH is not /usr/share/omarchy.

Command operands are literals (upstream omacom#11495)

  • omarchy-cmd-present / omarchy-cmd-missing, omarchy-pkg-*, omarchy-hw-match, omarchy-restart-app, omarchy-launch-editor, omarchy-hook-install, and fingerprint setup now pass operands after -- so an option-shaped name is not parsed as a flag.
  • New command-operand-boundaries-test.sh covers the helpers. Fingerprint and menu-guard tests follow the same delimiter.

Terminal clipboard shortcuts (upstream omacom#12915)

  • SUPER+A selects all (CTRL+A).
  • SUPER+C / SUPER+V still copy/paste, but in a terminal they send CTRL+SHIFT+C / CTRL+SHIFT+V so they do not interrupt the shell. Cut stays SUPER+X → CTRL+X. Clipboard manager is still SUPER+CTRL+V.

Sublime Text and Emacs icons (upstream omacom#10033)

  • Default-editor and Setup → Default editor use the Sublime () and Emacs () glyphs. Cursor stays on the editor menu.

OCaml removal keeps a cold sudo (upstream omacom#10217)

  • omarchy-remove-dev-env ocaml now requires sudo --no-update, invalidates cached credentials around the privileged step, and refuses to run if that sudo cannot do it. New remove-dev-env-sudo-security-test.sh proves the boundary when user namespaces are available.

Leftover from PR #42 (still not on quattro)

OWE owns desktop video backgrounds and the lock feed (upstream omacom#12429)

  • New base packages: owe and owe-lockfeed. qt6-multimedia / qt6-multimedia-ffmpeg leave the default set; the workshop no longer ships its own video player (shell/Ui/BackgroundVideo.qml is gone).
  • Desktop backgrounds are stills in BackgroundMedia; while OWE is running it owns the video path. Migration 1789764927 installs the packages, hooks theme-set to /usr/share/owe/10-owe-sync, and enables owed.service (starts it only when a graphical session is already up).
  • Lock keeps a cached poster (shell/plugins/lock/poster.sh via ffmpegthumbnailer) and loads LockFeedSurface.qml through an isolated Loader, so a missing OWE module costs only the video, not the lock screen. Playback stops when displays blank or power-saver is on.

Screenshots move to Omasnap (upstream omacom#9446)

  • omasnap replaces Satty and Tensaku. omarchy-capture-screenshot is a thin compatibility wrapper.
  • Migration 1788129995 installs Omasnap, drops satty/tensaku, removes a leftover NoDisplay desktop override, and rewrites only the stock imv Ctrl+e binding.

Elsewhen on dev checkouts (upstream 0d5232ed, now inside 1790042972)

  • Packaged installs still rely on /usr/share/omarchy/shell/plugins/omacom.elsewhen.
  • Git checkouts still get a user symlink so the running shell can discover the packaged plugin.

Test and docs cleanup, small command fixes

Fork-only adaptation

  • 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 are unchanged.

Tests

Passed locally on this branch:

  • ./test/cli
  • test/shell.d/elsewhen-default-migration-test.sh
  • test/shell.d/omasnap-test.sh
  • test/shell.d/owe-integration-test.sh
  • test/shell.d/video-background-test.sh
  • test/shell.d/clipboard-test.sh
  • test/shell.d/network-qr-test.sh
  • test/shell.d/launch-about-test.sh
  • test/shell.d/update-pacman-test.sh
  • test/shell.d/test-runner-test.sh
  • test/shell.d/default-apps-test.sh
  • test/shell.d/menu-test.sh
  • test/shell.d/config-test.sh
  • test/shell.d/lock-face-test.sh
  • test/shell.d/apply-lock-test.sh
  • test/shell.d/face-overlay-test.sh
  • test/shell.d/polkit-face-test.sh
  • test/shell.d/command-operand-boundaries-test.sh
  • test/shell.d/fingerprint-driver-migration-test.sh
  • test/shell.d/fingerprint-package-test.sh
  • test/shell.d/menu-guards-test.sh

remove-dev-env-sudo-security-test.sh skipped the namespace proof here (unshare could not run newuidmap); that is an environment limit, not a sync regression.

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

locate-test.sh still fails in this sandbox on updatedb --debug-pruning against a temp tree; the same command fails on current quattro (4a167a6e) so it is not a regression from this sync.

Open in Web View Automation 

dhh and others added 22 commits September 22, 2026 23:13
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
@coderabbitai

coderabbitai Bot commented Sep 22, 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: 925f681d-05bc-48c8-8a29-5f6c720eb50b

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.

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.

7 participants