You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The native search index (fff-node 0.11.0, the latest stable) applies .gitignore files only: it does not read .git/info/exclude, core.excludesFile or the default global ignore file, and it reports those files with gitStatus 'clean', so its results carry no signal to filter on. WorkspaceSearchIndex.make now captures VcsProcess and loads Git's untracked ignored paths with git -c core.fsmonitor=false ls-files --others --ignored --exclude-standard --directory -z when the index is built and again on each refresh (refresh already runs after every agent run and file write). list, search (file, directory and mixed) and searchContents drop any entry whose path or a parent folder is in that set. A new searchVisible helper fetches a bigger page (x4 each time, up to the existing WORKSPACE_INDEX_PAGE_SIZE cap) when ignored entries fill the first page, so they cannot crowd out real matches; it is still one call when nothing is hidden. The result mappers now take a narrow {items,totalMatched} type. If git fails, times out or its output is cut off, the set is empty and behaviour matches main. No regex or parser was added; the ignored-path check walks a path's parent folders once each, so its cost grows with folder depth. Known gap: a file created between refreshes that a non-.gitignore rule would hide can show up until the next refresh.
Commit da345d2 (origin/main). 1) Ran the reporter's repro.sh unchanged against a fresh worktree after vp i: it exits 0, meaning the defect is present. In the 'configured' fixture git check-ignore reports gitignore-target.txt, info-exclude-target.txt and global-exclude-target.txt as ignored. WorkspaceEntries.search, flat list and searchContents all still return info-exclude-target.txt and global-exclude-target.txt; only gitignore-target.txt is excluded. The 'default' fixture (~/.config/git/ignore) shows the same for default-exclude-target.txt and info-exclude-target.txt. Directory-scoped list marks them all ignored:true, which is correct. Adding the same patterns to .gitignore (the 'workaround' fixture) excludes them. 2) Extended two existing tests in apps/server/src/workspace/WorkspaceEntries.test.ts. 'excludes gitignored paths for git repositories' gains files listed in .git/info/exclude and in a repository-local core.excludesFile. 'honors case sensitivity and gitignore rules' gains a file listed in .git/info/exclude. Both fail on main with expected [...] to not include 'info-excluded.txt' and an extra content match. Both runs called the production WorkspaceEntries service layer, not a dev server driven through the UI.
Evidence
Being captured: before and after in the real app. This section is filled in before the pull request can merge.
Tests
vp test run src/workspace/WorkspaceEntries.test.ts src/workspace/WorkspaceSearchIndex.test.ts: 31 passed (with WorkspaceSearchIndex.ts reverted to the repro base: 3 failed, the two repro cases plus the new page-growth case). vp run typecheck in apps/server: pass. vp run check:changed: pass (format, lint, knip, graphql, typecheck of 3 packages, tests of 3 files). Manual check: git ls-files --exclude-standard on a fixture lists the info/exclude, core.excludesFile and .gitignore entries.
Not in this change
Moving to an fff-node build that applies .git/info/exclude and global excludes natively would make this post-filter unnecessary; only 0.11.1 nightlies exist today.
Ignored files created between index refreshes can still show up until the next refresh; per-query git check-ignore would close that gap at the cost of one subprocess per keystroke.
Content search still scans ignored files inside fff and drops their hits afterwards, which uses part of its 250 ms time budget.
AI-assisted; verified with the tests and tools listed above.
…e.excludesFile
Failing tests for #35587: path search and content search return files Git
ignores through .git/info/exclude or core.excludesFile.
AI-assisted; verified with the tests and tools listed above.
…itignore
The native search index applies .gitignore files only, so files ignored
through .git/info/exclude, core.excludesFile or the default global ignore
file showed up in path search, the flat listing and content search.
The index now lists Git's ignored paths with
`git ls-files --others --ignored --exclude-standard --directory` when it
is built and on each refresh, and drops matching entries and grep hits.
Path searches widen their first page when hidden entries fill it.
AI-assisted; verified with the tests and tools listed above.
Macroscope's review found this PR approvable — Workspace search now honors Git's global and repository-local exclusions as well as .gitignore. The change filters search results using bounded, read-only Git inspection without modifying files or persistent data.
You can add or adjust custom eligibility rules. Learn more.
No actionable comments were generated in the recent review.
Walkthrough
The workspace search index now loads Git-ignored paths and filters them from listing, name-search, and content-search results. Name searches fetch additional results when ignored paths leave fewer visible results than requested.
Changes: Workspace search
Layer / File(s)
Summary
Ignored-path discovery and refresh apps/server/src/workspace/WorkspaceSearchIndex.ts
The index runs git ls-files to load ignored paths, normalizes paths for descendant checks, and reloads the set during refresh.
Search filtering and validation apps/server/src/workspace/WorkspaceSearchIndex.ts, apps/server/src/workspace/WorkspaceEntries.test.ts, apps/server/src/workspace/WorkspaceSearchIndex.test.ts
Listing, name-search, and content-search results skip ignored paths. Name searches fetch more results when needed and adjust totalMatched. Tests cover Git ignore sources and a limited search result page.
pingdotgg/t3code#1000: Applies Git-derived exclusions to workspace path and content search through a different mechanism.
pingdotgg/t3code#34831: Adds gitignored nested worktree files to exact-path search results, which overlaps with this PR’s ignored-path filtering.
Suggested labels:bugfix
Suggested reviewers:t3dotgg, macroscopeapp
Merge Risk: Minimal · up to da391
Workspace search now filters files ignored through Git's exclude sources. If Git cannot supply the ignored paths, search behaves as it did before. No merge-blocking risk was identified.
Pre-merge checks: 4
Check name
Status
Explanation
Title check
The title describes the main change: workspace search omitted files that Git ignores through sources other than .gitignore. The changeset adds ignored-path loading from .git/info/exclude, core.exclude…
Description check
The description follows the repository template closely. It covers the problem (fff-node applies only .gitignore), the change (ignored-path loading via VcsProcess, filtering in list/search/searchConte…
Linked Issues check
[#35587] Requirements covered by the diff at head: 1. Path search, flat listing, and content search exclude untracked paths ignored through .git/info/exclude, core.excludesFile, and the default global…
Out of Scope Changes check
All changed hunks connect to the objectives of #35587. The import of VcsProcess, the ignored-path loader, isIgnoredPath, mixedItemPath, and searchVisible implement the ignore filtering. The narrowed S…
Full details: Title check
Explanation
The title describes the main change: workspace search omitted files that Git ignores through sources other than .gitignore. The changeset adds ignored-path loading from .git/info/exclude, core.excludesFile, and the global ignore file, then filters those paths from search results. The title uses the conventional commit format and is specific enough for a teammate to understand the primary change.
Full details: Description check
Explanation
The description follows the repository template closely. It covers the problem (fff-node applies only .gitignore), the change (ignored-path loading via VcsProcess, filtering in list/search/searchContents, page growth via searchVisible, and fallback to empty set on git failure), and a linked issue (#35587). It gives concrete verification steps with observed results on main and after the change. The Scope section does not explicitly state why the change is a bug fix rather than a feature, though the linked issue documents the defect. The Evidence section is explicitly marked as pending, and the template asks for before/after evidence only for UI changes, which this PR does not contain. The description also includes a Not in this change section, which is extra but not disallowed.
Full details: Linked Issues check
Explanation
[#35587] Requirements covered by the diff at head:
Path search, flat listing, and content search exclude untracked paths ignored through .git/info/exclude, core.excludesFile, and the default global ignore file. WorkspaceSearchIndex.make runs git ls-files --others --ignored --exclude-standard --directory -z at build and on refresh. list, fileSearch, directorySearch, mixedSearch (via searchVisible) and searchContents drop matching paths and their descendants (isIgnoredPath walks parent folders).
Preserve existing behavior: --others limits the set to untracked paths, so staged and tracked files are not hidden. .gitignore-matched files are already excluded by fff and stay excluded. The directory-scoped listing path is not changed by this diff, so it keeps ignored entries marked ignored: true.
Page growth: searchVisible refetches with a larger page, capped at WORKSPACE_INDEX_PAGE_SIZE, when hidden entries fill the first page.
Tests: WorkspaceEntries.test.ts adds .git/info/exclude and core.excludesFile cases for path search and a .git/info/exclude case for content search. WorkspaceSearchIndex.test.ts adds a page-growth case. The PR reports these tests fail on main. Limits: the known gap (files created between refreshes) is a documented limitation, not a stated requirement of the issue.
Full details: Out of Scope Changes check
Explanation
All changed hunks connect to the objectives of #35587. The import of VcsProcess, the ignored-path loader, isIgnoredPath, mixedItemPath, and searchVisible implement the ignore filtering. The narrowed SearchPage<I> type replaces fff result types so the mappers accept filtered results. That change supports the implementation and does not change behavior. The test changes cover the new ignore sources and page growth. No unrelated behavior change appears in the diff. The PR description's notes about performance cost and content-search scanning are disclosed trade-offs, not unrelated changes.
Finishing Touches
Generate unit tests (beta)
Commit to this branch
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 2 remain after this review.
This branch has not been deployed
No deployments
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
size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.
1 participant
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.
github-actions
Bot
added
vouch:trusted
![macroscopeapp[bot]](https://avatars.githubusercontent.com/in/900172?s=60&v=4){kind=small}
The native search index (fff-node 0.11.0, the latest stable) applies .gitignore files only: it does not read .git/info/exclude, core.excludesFile or the default global ignore file, and it reports those files with gitStatus 'clean', so its results carry no signal to filter on. WorkspaceSearchIndex.make now captures VcsProcess and loads Git's untracked ignored paths with
git -c core.fsmonitor=false ls-files --others --ignored --exclude-standard --directory -zwhen the index is built and again on each refresh (refresh already runs after every agent run and file write). list, search (file, directory and mixed) and searchContents drop any entry whose path or a parent folder is in that set. A new searchVisible helper fetches a bigger page (x4 each time, up to the existing WORKSPACE_INDEX_PAGE_SIZE cap) when ignored entries fill the first page, so they cannot crowd out real matches; it is still one call when nothing is hidden. The result mappers now take a narrow {items,totalMatched} type. If git fails, times out or its output is cut off, the set is empty and behaviour matches main. No regex or parser was added; the ignored-path check walks a path's parent folders once each, so its cost grows with folder depth. Known gap: a file created between refreshes that a non-.gitignore rule would hide can show up until the next refresh.Fixes #35587
Reproduction on main
Commit da345d2 (origin/main). 1) Ran the reporter's repro.sh unchanged against a fresh worktree after
vp i: it exits 0, meaning the defect is present. In the 'configured' fixturegit check-ignorereports gitignore-target.txt, info-exclude-target.txt and global-exclude-target.txt as ignored. WorkspaceEntries.search, flat list and searchContents all still return info-exclude-target.txt and global-exclude-target.txt; only gitignore-target.txt is excluded. The 'default' fixture (~/.config/git/ignore) shows the same for default-exclude-target.txt and info-exclude-target.txt. Directory-scoped list marks them all ignored:true, which is correct. Adding the same patterns to .gitignore (the 'workaround' fixture) excludes them. 2) Extended two existing tests in apps/server/src/workspace/WorkspaceEntries.test.ts. 'excludes gitignored paths for git repositories' gains files listed in .git/info/exclude and in a repository-local core.excludesFile. 'honors case sensitivity and gitignore rules' gains a file listed in .git/info/exclude. Both fail on main withexpected [...] to not include 'info-excluded.txt'and an extra content match. Both runs called the production WorkspaceEntries service layer, not a dev server driven through the UI.Evidence
Being captured: before and after in the real app. This section is filled in before the pull request can merge.
Tests
vp test run src/workspace/WorkspaceEntries.test.ts src/workspace/WorkspaceSearchIndex.test.ts: 31 passed (with WorkspaceSearchIndex.ts reverted to the repro base: 3 failed, the two repro cases plus the new page-growth case). vp run typecheck in apps/server: pass. vp run check:changed: pass (format, lint, knip, graphql, typecheck of 3 packages, tests of 3 files). Manual check: git ls-files --exclude-standard on a fixture lists the info/exclude, core.excludesFile and .gitignore entries.
Not in this change
AI-assisted; verified with the tests and tools listed above.