Notify on detected config drift#216
Merged
cooper (czxtm) merged 11 commits intoJun 4, 2026
Merged
Conversation
Contributor
📋 PR Overview
🔬 Coverage
|
Contributor
There was a problem hiding this comment.
Pull request overview
Adds native-side drift notifications in the Tauri (Rust) app so that watcher-detected config drift can surface as a macOS notification while keeping the existing git:status-changed frontend event flow intact (ENG-514).
Changes:
- Emit a native drift notification when uncommitted config drift is detected (deduped).
- Emit a native drift notification when an external nix build changes the live store path.
- Introduce
state::drift_notificationsand hook it into the watcher loop.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| apps/native/src-tauri/src/state/watcher.rs | Constructs a WatcherEvent, emits git:status-changed, and triggers native drift notifications. |
| apps/native/src-tauri/src/state/mod.rs | Exposes the new drift_notifications module. |
| apps/native/src-tauri/src/state/drift_notifications.rs | Implements deduping + macOS notification delivery and unit tests for notification selection. |
Comment on lines
+119
to
+128
| let event = WatcherEvent { | ||
| git_status: Some(status.clone()), | ||
| change_map: Some(change_map), | ||
| evolve_state: evolve_state_updated, | ||
| error: None, | ||
| external_build_detected, | ||
| }; | ||
| // fire-and-forget: frontend event delivery; window may not be connected. | ||
| let _ = app_handle.emit( | ||
| "git:status-changed", | ||
| WatcherEvent { | ||
| git_status: Some(status.clone()), | ||
| change_map: Some(change_map), | ||
| evolve_state: evolve_state_updated, | ||
| error: None, | ||
| external_build_detected, | ||
| }, | ||
| ); | ||
| let _ = app_handle.emit("git:status-changed", event.clone()); | ||
| drift_notifications::maybe_notify(&event); |
Comment on lines
+69
to
+88
| #[cfg(target_os = "macos")] | ||
| fn send_native_notification(title: &str, body: &str) -> Result<(), String> { | ||
| use cocoa::base::{id, nil}; | ||
| use cocoa::foundation::{NSAutoreleasePool, NSString}; | ||
| use objc::{class, msg_send, sel, sel_impl}; | ||
|
|
||
| unsafe { | ||
| let pool = NSAutoreleasePool::new(nil); | ||
| let notification: id = msg_send![class!(NSUserNotification), new]; | ||
| let title = NSString::alloc(nil).init_str(title); | ||
| let body = NSString::alloc(nil).init_str(body); | ||
|
|
||
| let _: () = msg_send![notification, setTitle: title]; | ||
| let _: () = msg_send![notification, setInformativeText: body]; | ||
|
|
||
| let center: id = msg_send![ | ||
| class!(NSUserNotificationCenter), | ||
| defaultUserNotificationCenter | ||
| ]; | ||
| let _: () = msg_send![center, deliverNotification: notification]; |
Member
|
Copilot resolve the merge conflicts in this pull request |
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
Contributor
Resolved and pushed. The PR now includes the conflict resolution merge from |
cooper (czxtm)
approved these changes
Jun 3, 2026
auto-merge was automatically disabled
June 3, 2026 05:45
Head branch was pushed to by a user without write access
Member
|
Copilot resolve the merge conflicts in this pull request |
Contributor
Merge activity
|
cooper (czxtm)
force-pushed
the
cursor/ENG-514-linear-issue-triage-automation-51b4
branch
2 times, most recently
from
dd48979 to
b0e662c
Compare
auto-merge was automatically disabled
June 4, 2026 11:32
Head branch was pushed to by a user without write access
Contributor
Resolved and pushed in merge commit |
Co-authored-by: cooper <czxtm@users.noreply.github.com>
Co-authored-by: cooper <czxtm@users.noreply.github.com>
Co-authored-by: cooper <czxtm@users.noreply.github.com>
Co-authored-by: cooper <czxtm@users.noreply.github.com>
Co-authored-by: cooper <czxtm@users.noreply.github.com>
Co-authored-by: cooper <czxtm@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
cooper (czxtm)
force-pushed
the
cursor/ENG-514-linear-issue-triage-automation-51b4
branch
from
fea928a to
14a909e
Compare
…ypes The --theirs rebase onto develop left mixed architectures. Restore develop's queue_summarizer (SummarizerState/mpsc worker), watcher (per-slice GitState events), api.ts (drop duplicate devConfigs), and regenerated ipc/types.ts (GitState/ExportResult/ImportResult; drop removed WatcherEvent/SummarizerUpdateEvent). Re-add GitState specta registration. Adapt drift_notifications to take GitStatus directly instead of the removed WatcherEvent.
cooper (czxtm)
deleted the
cursor/ENG-514-linear-issue-triage-automation-51b4
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds a native macOS notification path for watcher-detected drift:
git_state_changedandchange_map_changedTest Plan
rustfmt --edition 2021 --check apps/native/src-tauri/src/state/watcher.rs apps/native/src-tauri/src/state/drift_notifications.rs apps/native/src-tauri/src/storage/credential_store.rs apps/native/src-tauri/src/summarize/queue_summarizer.rsbun -F native buildcargo test --manifest-path apps/native/src-tauri/Cargo.toml drift_notifications, but this runner is missing the systemglib-2.0.pcdependency required byglib-sys.Docs
No docs update needed.