Update filesystem watch filters#11464

MaggieShan · 2026-05-21T03:44:10Z

Description

Based on change to the notify crate Update WatchFilter API notify#3 (will update cargo.toml once it's merged)
- Which introduces 2 filter fns within the watch filter - should_emit_event and should_register_directory
- Updates all callers of WatchFilter::with_filter to include the right predicates
  - Where should_emit_event filters out specific files while should_register_directory includes ancestors to allowlisted paths such that the directories are correctly registered
Today we use a filesystem watcher to detect git changes (branch checkouts, commits, etc.) using an allowlist - this includes paths like HEAD, refs/heads/*, index.lock, and ignores paths like .git/logs/ to reduce noice
- The issue is that on linux, the notify crate uses inotify which uses the filter to decide which directories to register/watch
- This meant that with out filter should_ignore_git_path, directories like ./git and ./git/refs were not getting registered
Better fix to Allow ancestor directories of allowlisted git files #11321

Linked Issue

APP-4528
I believe this also fixes the flaky test mentioned in for the same reasons CODE-1492

Testing

Tested various git commands and repo updates in a linux devbox

Tested original repro steps where diffs weren't getting the events for checkout:

git checkout HEAD~1
update base branch to master in code review view
git checkout master
Bug: code review renders old/inaccurate diffs
Fix: code review refresh is triggered and shows clean state
https://www.loom.com/share/ea1a81e5c0654fc9a6d0f20b68f7d63e

Also verified that we're not properly watching changes to remote refs - so pushing commits to a remote branch is tracked:

git commit and git push changes to a branch
Bug: code review git button shows "push" as the primary action
Fix: code review git button shows "create pr" as the primary action

I have manually tested my changes locally with ./script/run

Agent Mode

Warp Agent Mode - This PR was created via Warp's AI Agent Mode

Oz plan: https://staging.warp.dev/drive/notebook/Linux-inotify-dual-predicate-watch-filter-Warp-caller-updates-5HQUBSdF5ZqO5e8GxJmuAe

Changelog Entries for Stable

CHANGELOG-BUG-FIX: Fixes linux file watcher bug where certain git events were not getting sent

oz-for-oss · 2026-05-21T03:44:24Z

@MaggieShan

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR updates filesystem watch filters to separate directory-registration predicates from event-emission predicates for repository and managed-path watchers. No approved spec context was available, so the review is based on the PR description and annotated diff.

Concerns

The committed Cargo [patch] override points notify dependencies at a developer-local /Users/... checkout, and the lockfile has been rewritten as if those packages are path dependencies. This will make builds fail or become non-reproducible outside that machine.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

MaggieShan · 2026-05-21T05:08:43Z

/oz-review

oz-for-oss · 2026-05-21T05:08:56Z

@MaggieShan

I'm re-reviewing this pull request in response to a review request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR updates filesystem watcher filters for the notify dual-predicate API and adjusts repository/git watch tests. The watcher logic generally follows the intended separation between directory registration and event emission, and I did not find security-specific findings.

Concerns

The new repo_watch_filter surface pulls notify-debouncer-full into repo_metadata/src/entry.rs unconditionally, but that dependency is not available for wasm builds.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

kevinyang372 · 2026-05-21T15:16:40Z

+        // and `.git/` allowlist rules.
+        let emit_gitignores = gitignores.clone();
+        let should_emit_event =
+            Arc::new(move |path: &Path| path_passes_filters(path, emit_gitignores.as_slice()));


I think this should just be if path matches gitignore for both emit event and should register directory

For codebase index, for both emit event and register folder:

Path does not match gitignore

Path is not under .git/

kevinyang372 · 2026-05-21T15:19:25Z

+        Some("worktrees") => true,
+        // Other top-level entries are only descendable when they are allowlisted files.
+        // Non-allowlisted directories such as `.git/objects`, `.git/hooks`, and `.git/logs` must be pruned.
+        Some("HEAD" | "index.lock" | "config" | "config.worktree") if suffix.len() == 1 => true,


Aren't these files? What does it mean for files to be descendable?

Updated to be more clear + removed the file check

* Based on change to the `notify` crate warpdotdev/notify#3 (will update cargo.toml once it's merged) * Which introduces 2 filter fns within the watch filter - `should_emit_event` and `should_register_directory` * Updates all callers of `WatchFilter::with_filter` to include the right predicates * Where `should_emit_event` filters out specific files while `should_register_directory` includes ancestors to allowlisted paths such that the directories are correctly registered * Today we use a filesystem watcher to detect git changes (branch checkouts, commits, etc.) using an allowlist - this includes paths like `HEAD`, `refs/heads/*`, `index.lock`, and ignores paths like `.git/logs/` to reduce noice * The issue is that on linux, the notify crate uses `inotify` which uses the filter to decide which directories to register/watch * This meant that with out filter `should_ignore_git_path`, directories like `./git` and `./git/refs` were not getting registered * Better fix to warpdotdev#11321 * [APP-4528](https://linear.app/warpdotdev/issue/APP-4528/bug-code-review-shows-inaccurate-diffs-when-switching-commits) * I believe this also fixes the flaky test mentioned in for the same reasons [CODE-1492](https://linear.app/warpdotdev/issue/CODE-1492/fix-flaky-test-commit-related-files-excluded-from-update-lists) Tested various git commands and repo updates in a linux devbox Tested original repro steps where diffs weren't getting the events for checkout: 1. git checkout HEAD~1 2. update base branch to master in code review view 3. git checkout master 4. Bug: code review renders old/inaccurate diffs 5. Fix: code review refresh is triggered and shows clean state https://www.loom.com/share/ea1a81e5c0654fc9a6d0f20b68f7d63e Also verified that we're not properly watching changes to remote refs - so pushing commits to a remote branch is tracked: 1. git commit and git push changes to a branch 2. Bug: code review git button shows "push" as the primary action 3. Fix: code review git button shows "create pr" as the primary action - [x] I have manually tested my changes locally with `./script/run` - [x] Warp Agent Mode - This PR was created via Warp's AI Agent Mode Oz plan: https://staging.warp.dev/drive/notebook/Linux-inotify-dual-predicate-watch-filter-Warp-caller-updates-5HQUBSdF5ZqO5e8GxJmuAe CHANGELOG-BUG-FIX: Fixes linux file watcher bug where certain git events were not getting sent (cherry picked from commit cb4fe42)

cla-bot Bot added the cla-signed label May 21, 2026

MaggieShan mentioned this pull request May 21, 2026

Update WatchFilter API warpdotdev/notify#3

Merged

oz-for-oss Bot reviewed May 21, 2026

View reviewed changes

Comment thread Cargo.toml Outdated

MaggieShan requested a review from kevinyang372 May 21, 2026 04:28

oz-for-oss Bot reviewed May 21, 2026

View reviewed changes

Comment thread crates/repo_metadata/src/entry.rs

MaggieShan added 5 commits May 21, 2026 10:39

testing

03c671e

update watch filters

4acb101

update and unignore test

d6d1670

update cargo.toml

74973cf

clippy

721aa20

MaggieShan force-pushed the maggs/fix-linux-inotify-bug branch from 20fc479 to 721aa20 Compare May 21, 2026 14:39

kevinyang372 approved these changes May 21, 2026

View reviewed changes

pr review

420e05c

MaggieShan enabled auto-merge (squash) May 21, 2026 16:08

MaggieShan mentioned this pull request May 21, 2026

Allow ancestor directories of allowlisted git files #11321

Closed

2 tasks

clippy

1abd552

MaggieShan merged commit cb4fe42 into master May 21, 2026
25 checks passed

MaggieShan deleted the maggs/fix-linux-inotify-bug branch May 21, 2026 16:41

Conversation

MaggieShan commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Linked Issue

Testing

Agent Mode

Changelog Entries for Stable

Uh oh!

oz-for-oss Bot commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

MaggieShan commented May 21, 2026

Uh oh!

oz-for-oss Bot commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

kevinyang372 May 21, 2026

Choose a reason for hiding this comment

Uh oh!

kevinyang372 May 21, 2026

Choose a reason for hiding this comment

Uh oh!

MaggieShan May 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kevinyang372 May 21, 2026

Choose a reason for hiding this comment

Uh oh!

MaggieShan May 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MaggieShan commented May 21, 2026 •

edited

Loading

oz-for-oss Bot commented May 21, 2026 •

edited

Loading

oz-for-oss Bot commented May 21, 2026 •

edited

Loading