fix(server): decouple tree visibility from gitignore

Author: pallyoung

packages/server/src/__tests__/file-commands.test.ts

@@ -119,6 +119,28 @@ describe("File Commands", () => {
     expect(files).toHaveLength(0);
   });
 
+  it("keeps .gitignore filtering for search results", async () => {
+    await writeFile(join(testDir, ".gitignore"), "ignored-note.md\n");
+    await writeFile(join(testDir, "ignored-note.md"), "hidden from search\n");
+
+    const result = await dispatch(
+      {
+        kind: "command",
+        id: "file-search-3",
+        op: "file.search",
+        args: {
+          workspaceId,
+          query: "ignored",
+        },
+      },
+      ctx
+    );
+
+    expect(result.ok).toBe(true);
+    const files = (result.data as { files: Array<{ path: string }> }).files;
+    expect(files).toHaveLength(0);
+  });
+
   it("emits fs.dirty after file writes", async () => {
     const result = await dispatch(
       {

packages/server/src/__tests__/fs/gitignore.test.ts

@@ -6,7 +6,11 @@ import { mkdir, rm, writeFile } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { createGitignoreFilter, createWatcherIgnoreFilter } from "../../fs/gitignore.js";
+import {
+  createGitignoreFilter,
+  createTreeVisibilityFilter,
+  createWatcherIgnoreFilter,
+} from "../../fs/gitignore.js";
 
 describe("createGitignoreFilter", () => {
   let testDir: string;
@@ -86,6 +90,18 @@ describe("createGitignoreFilter", () => {
   });
 });
 
+describe("createTreeVisibilityFilter", () => {
+  it("hides only .git entries from the directory tree", () => {
+    const filter = createTreeVisibilityFilter();
+
+    expect(filter(".git")).toBe(false);
+    expect(filter(".gitignore")).toBe(true);
+    expect(filter(".env")).toBe(true);
+    expect(filter("node_modules")).toBe(true);
+    expect(filter("src")).toBe(true);
+  });
+});
+
 describe("createWatcherIgnoreFilter", () => {
   let testDir: string;
 

packages/server/src/__tests__/fs/tree.test.ts

@@ -91,25 +91,30 @@ describe("readTree", () => {
     expect(result.children[3].name).toBe("b-file.txt");
   });
 
-  it("should skip hidden files", async () => {
+  it("should show hidden files except .git", async () => {
     await writeFile(join(testDir, ".hidden"), "hidden");
+    await writeFile(join(testDir, ".gitignore"), "*.log\n");
+    await mkdirAsync(join(testDir, ".git"));
     await writeFile(join(testDir, "visible.txt"), "visible");
 
     const result = await readTree(testDir);
 
-    expect(result.children).toHaveLength(1);
-    expect(result.children[0].name).toBe("visible.txt");
+    expect(result.children.some((n) => n.name === ".hidden")).toBe(true);
+    expect(result.children.some((n) => n.name === ".gitignore")).toBe(true);
+    expect(result.children.some((n) => n.name === ".git")).toBe(false);
+    expect(result.children.some((n) => n.name === "visible.txt")).toBe(true);
   });
 
-  it("should skip node_modules and .git", async () => {
+  it("should show node_modules but skip .git", async () => {
     await mkdirAsync(join(testDir, "node_modules"));
     await mkdirAsync(join(testDir, ".git"));
     await writeFile(join(testDir, "file.txt"), "content");
 
     const result = await readTree(testDir);
 
-    expect(result.children).toHaveLength(1);
-    expect(result.children[0].name).toBe("file.txt");
+    expect(result.children.some((n) => n.name === "node_modules")).toBe(true);
+    expect(result.children.some((n) => n.name === ".git")).toBe(false);
+    expect(result.children.some((n) => n.name === "file.txt")).toBe(true);
   });
 
   it("should use relative paths", async () => {
@@ -122,7 +127,7 @@ describe("readTree", () => {
     // Subdir children are undefined (lazy loading)
   });
 
-  it("should respect .gitignore rules", async () => {
+  it("should not hide .gitignore-matched files from the tree", async () => {
     await writeFile(join(testDir, ".gitignore"), "*.log\ndist/");
     await writeFile(join(testDir, "app.log"), "log content");
     await writeFile(join(testDir, "app.txt"), "text content");
@@ -131,23 +136,9 @@ describe("readTree", () => {
 
     const result = await readTree(testDir);
 
-    expect(result.children.some((n) => n.name === "app.log")).toBe(false);
-    expect(result.children.some((n) => n.name === "dist")).toBe(false);
+    expect(result.children.some((n) => n.name === "app.log")).toBe(true);
+    expect(result.children.some((n) => n.name === "dist")).toBe(true);
     expect(result.children.some((n) => n.name === "app.txt")).toBe(true);
     expect(result.children.some((n) => n.name === "src")).toBe(true);
   });
-
-  it("should show dotfiles when .gitignore does not ignore them", async () => {
-    await writeFile(join(testDir, ".gitignore"), "*.log");
-    await writeFile(join(testDir, ".env"), "secret");
-    await writeFile(join(testDir, ".hidden-config"), "hidden");
-    await writeFile(join(testDir, "visible.txt"), "visible");
-
-    const result = await readTree(testDir);
-
-    expect(result.children.some((n) => n.name === ".env")).toBe(true);
-    expect(result.children.some((n) => n.name === ".gitignore")).toBe(true);
-    expect(result.children.some((n) => n.name === ".hidden-config")).toBe(true);
-    expect(result.children.some((n) => n.name === "visible.txt")).toBe(true);
-  });
 });

packages/server/src/fs/gitignore.ts

@@ -25,6 +25,10 @@ function isDefaultTreeIgnored(name: string): boolean {
   return name.startsWith(".") || name === "node_modules" || name === ".git";
 }
 
+function isTreeHidden(name: string): boolean {
+  return name === ".git";
+}
+
 function isAlwaysTreeIgnored(name: string): boolean {
   return name === "node_modules" || name === ".git";
 }
@@ -68,6 +72,14 @@ export function createGitignoreFilter(
   };
 }
 
+/**
+ * Creates a filter for directory tree visibility.
+ * Returns false if the entry should be hidden from the tree, true otherwise.
+ */
+export function createTreeVisibilityFilter(): (name: string) => boolean {
+  return (name: string) => !isTreeHidden(name);
+}
+
 /**
  * Creates a filter for the file watcher (chokidar).
  * Returns a function suitable for chokidar's `ignored` option.

packages/server/src/fs/tree.ts

@@ -6,7 +6,7 @@
 import type { FileNode } from "@coder-studio/core";
 import { readdir, stat } from "fs/promises";
 import { join, relative } from "path";
-import { createGitignoreFilter } from "./gitignore.js";
+import { createGitignoreFilter, createTreeVisibilityFilter } from "./gitignore.js";
 
 export interface ReadTreeResult {
   path: string;
@@ -24,7 +24,7 @@ export interface ReadTreeResult {
  */
 export async function readTree(rootPath: string, subdir?: string): Promise<ReadTreeResult> {
   const targetPath = subdir ? join(rootPath, subdir) : rootPath;
-  const filter = createGitignoreFilter(rootPath, targetPath);
+  const filter = createTreeVisibilityFilter();
 
   const entries = await readdir(targetPath, { withFileTypes: true });
   const nodes: FileNode[] = [];