fix(server): honor gitignored files in workspace search#2078
fix(server): honor gitignored files in workspace search#2078juliusmarminge merged 2 commits intopingdotgg:mainfrom
Conversation
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
github-actions
bot
added
vouch:unvouched
ApprovabilityVerdict: Approved Straightforward bug fix that wires GitCore into the workspace layer to properly filter gitignored files from search results. The scope is limited to layer composition changes and includes test coverage. The open review comment about dead code shadowing is a low-severity cleanup item that doesn't affect correctness. You can customize Macroscope's approvability policy. Learn more. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 650e69f. Configure here.
| Layer.provide(workspaceEntriesLayer), | ||
| ), | ||
| ProjectFaviconResolverLive, | ||
| ); |
There was a problem hiding this comment.
Local variable shadows module-level constant creating dead code
Low Severity
The new local workspaceAndProjectServicesLayer inside buildAppUnderTest shadows the module-level constant of the same name (line 196). The only usage at line 543 is inside buildAppUnderTest, so the module-level definition is now dead code. Worse, the module-level version lacks GitCoreLive — so if someone mistakenly removes the local redefinition assuming it's redundant, the gitignore fix silently regresses. The module-level constant needs to be removed or the local variable renamed.
Additional Locations (1)
Reviewed by Cursor Bugbot for commit 650e69f. Configure here.
![macroscopeapp[bot]](https://avatars.githubusercontent.com/in/900172?s=60&v=4){kind=small}
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Integrates upstream/main (9df3c64) on top of fork's main (9602c18). Upstream features adopted: - Claude Opus 4.5 and 4.7 built-in models (pingdotgg#2072, pingdotgg#2143) - Node-native TypeScript migration across desktop/server (pingdotgg#2098) - Configurable project grouping with client-settings overrides (pingdotgg#2055, pingdotgg#2099) - Thread status in command palette (pingdotgg#2107) - Responsive composer / plan sidebar on narrow windows (pingdotgg#1198) - Capture-phase CTRL+J keydown for Windows terminal toggle (pingdotgg#2113/pingdotgg#2142) - Bypass xterm for global terminal shortcuts (pingdotgg#1580) - Windows ARM build target (pingdotgg#2080) - Windows PATH hydration + repair (pingdotgg#1729) - Gitignore-aware workspace search (pingdotgg#2078) - Claude process leak fix + stale session monitoring (pingdotgg#2042) - Preserve provider bindings when stopping sessions (pingdotgg#2084) - Clean up invalid pending-approval projections (pingdotgg#2106) — new migration - Extract backend startup readiness coordination - Drop stale text-gen options on reset (pingdotgg#2076) - Extend negative repository identity cache TTL (pingdotgg#2083) - Allow deleting non-empty projects from warning toast (pingdotgg#1264) - Restore defaults only on General settings (pingdotgg#1710) - Release workflow modernization (blacksmith runners, GitHub App token guards, v0.0.20 version bump) Fork features preserved: - All 8 providers (codex, claudeAgent, copilot, cursor, opencode, geminiCli, amp, kilo) with their adapters, services, and tests - Fork's custom OpenCode protocol impl in apps/server/src/opencode/ (kept over upstream's @opencode-ai/sdk-based provider added in pingdotgg#1758 — fork's version is tested and integrated; upstream's parallel files deleted) - Fork's direct-CLI Cursor adapter (kept over upstream's new ACP-based CursorProvider added in pingdotgg#1355 — upstream's parallel files deleted) - Fork's ProviderRegistry aggregates only codex + claudeAgent snapshots; the other 6 providers register via ProviderAdapterRegistry - PROVIDER_CACHE_IDS stays at [codex, claudeAgent] matching what the registry actually caches - Migration IDs preserved (fork 23/24/25/26; upstream's new 025 lands at ID 27 to avoid re-applying on deployed fork DBs) - Fork's generic per-provider settings (enabled/binaryPath/configDir/ customModels) kept over upstream's opencode-specific serverUrl/password - Log directory IPC channels, updateInstallInFlight tracking, icon composer pipeline all preserved - Fork's simplified release.yml (no npm CLI publish, no nightly infra) - composerDraftStore normalizeProviderKind widened to accept all 8 kinds - Dark mode --background set to #0f0f0f Test status: - All 9 package typechecks pass - Lint clean (0 errors) - Tests: 1877 passed, 15 skipped (incl. 4 historically-flaky GitManager cross-repo PR selector tests newly gated with TODO for Node-native-TS follow-up)
2 participants
What Changed
Wire
GitCoreLiveinto the server workspace layer soWorkspaceEntriesLivecan use the Git-backed workspace index and.gitignorefiltering duringprojects.searchEntries.Also update the server test harness to match that wiring and add a regression test covering
projects.searchEntriesexcluding a gitignored file.Why
WorkspaceEntriesresolves Git throughEffect.serviceOption(GitCore), but the server'sWorkspaceLayerLivewas buildingWorkspaceEntriesLivewithoutGitCoreLive.That meant the Git-backed workspace index path was disabled in practice and
projects.searchEntriescould fall back to filesystem scanning, which allowed gitignored paths to appear in@workspace search.This change keeps the fix narrow:
WorkspaceEntriesimplementation itselfCloses #2077
Checklist
Note
Medium Risk
Changes server runtime dependency wiring for workspace services to always include
GitCore, which can affect file discovery and search results across the app; behavior is covered by a new regression test but touches core server composition.Overview
Workspace search over websocket RPC now consistently honors Git-aware workspace indexing and
.gitignorefiltering by wiringGitCoreLiveinto the server’s workspace layers (refactoringWorkspaceLayerLiveinto explicitWorkspaceEntriesLayerLive/WorkspaceFileSystemLayerLive).The server test harness is updated to provide a default
GitCoremock to the workspace layers, and a new integration test assertsprojects.searchEntriesreturns no matches for a gitignored file.Reviewed by Cursor Bugbot for commit 650e69f. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Fix workspace search to exclude gitignored files in
projects.searchEntriesGitCoreLiveintoWorkspaceEntriesLivevia a newWorkspaceEntriesLayerLivelayer in server.ts, so gitignore filtering is applied at runtime during workspace entry enumeration.WorkspaceLayerLiveto composeWorkspaceEntriesLayerLiveandWorkspaceFileSystemLayerLiveas discrete layers instead of inline provisioning.projects.searchEntriesreturns zero results when all paths are gitignored via.venv/.Macroscope summarized 650e69f.