Skip to content

Merge upstream quattro (drop notification snooze and panel) - #92

Merged
mark-groves merged 2 commits into
quattrofrom
cursor/upstream-changes-pr-636a
Oct 24, 2026
Merged

mark-groves merged 2 commits into
quattrofrom
cursor/upstream-changes-pr-636a

Conversation

@cursor

@cursor cursor Bot commented Oct 23, 2026

Copy link
Copy Markdown

Upstream quattro moved from 967bbdd7 (already on the fork via #91) to cbd44ba1 (2026-10-23 19:04 UTC). 2 first-parent commits, both non-merges, cherry-picked onto fork quattro. Cursor stays on the official tarball. Face, Grok Bot, and Cursor menu entries stay. The power-profile menu provider stays out. The kernels provider stays. Fingerprint setup still goes through omarchy-pam-pair-add and omarchy-apply-polkit-pam. Factory reset still scrubs inherited USBGuard and Thunderbolt trust. The icon font charset stays e900-e90f; Tailscale stays at U+E90F and Cursor at U+E90D. The fork overlay is still 231 paths, the same set as against 967bbdd7. The only file both sides touch is default/i18n/en/shell.json; the fork hunks there (face strings, no power-profile menu strings, no agents.helpStartToSeeLimits) are unchanged. Every other overlay hunk matches.

Snooze and the screen-sharing offer are gone (omacom#16429)

Per-source snooze and snooze-everything are gone, along with the PipeWire screen-share detection that offered a timed snooze. Right-click on a card dismisses it (the zzz control is gone). The bell no longer has snoozed or sharing states. Held-back cards follow Do Not Disturb only. quiet.json is { dnd }.

The notification panel and its preferences are gone (omacom#16430)

Right-clicking the bell no longer opens a panel. The preferences page is gone, and so are NotificationPanel.qml, Picker.qml, and Settings.js. There is no notifications object in shell.json anymore: no display picker, no history-length setting, no fullscreen-overlay switch, no "let codes through" switch.

What remains is fixed:

  • A new deck lands on the focused display and stays there until it empties.
  • A fullscreen window unmaps the notification surface when nothing is showing, so the window can scan out directly. A new card still appears over it, then steps aside again.
  • History is a day, capped at 100 rows. Super + Shift + Alt + , puts the last few back on screen, held back or not.
  • The bell is a plain Do Not Disturb toggle (Super + Ctrl + , still flips the same switch).
  • Verification codes always get through Do Not Disturb, along with Omarchy's own confirmation toasts and critical alerts sent as notify-send. Silenced rows are still recorded in history; ephemeral ones are dropped.

English shell strings for snooze, the panel, and those preferences are removed. Other languages may still carry the old keys; the structural i18n check allows that.

test/shell.d/notifications-test.sh and test/shell.d/i18n-test.sh passed.

Open in Web View Automation 

dhh and others added 2 commits October 23, 2026 23:04
Drop per-source and global snooze, the PipeWire screen-share detection
that offered one, and the bell's snoozed and sharing states. The bell is
a plain Do Not Disturb toggle again (right-click still opens the panel),
the panel's held-back list follows Do Not Disturb only, and
right-clicking a card dismisses it.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Drop the panel behind a right-click on the bell, its preferences page,
and the `notifications` settings in shell.json. Notifications follow the
focused display, step aside for fullscreen windows, keep a day of
history, and always let verification codes through Do Not Disturb. The
bell is a plain Do Not Disturb toggle, and Super+Shift+Alt+, still puts
the last few back on screen, held back or not.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 23, 2026 •

Copy link
Copy Markdown

Important

Review skipped

Bot user detected.

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

⚙️ Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 9cd2e111-b5a9-4298-aa43-65aa1a71c0d4

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
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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 October 23, 2026 23:06
@mark-groves
mark-groves merged commit e4bcdc1 into quattro Oct 24, 2026
4 checks passed
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.

2 participants