fix: use RE2-compatible escaper for repo/file filter queries

escape-string-regexp v5 encodes some characters (e.g. '-') as \xNN hex
escapes, which Go's RE2 engine (used by Zoekt) does not support. This
caused filterByRepos/filterByFilepaths with names containing dots, dashes,
or slashes to return no results. Replace the import with a local escapeRE2
helper that only backslash-escapes characters special in RE2.

Fixes #990

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: brendan-kellam

packages/mcp/src/index.ts

@@ -4,7 +4,9 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import _dedent from "dedent";
-import escapeStringRegexp from 'escape-string-regexp';
+// Escapes special RE2 regex characters using backslash (compatible with Zoekt/Go RE2).
+// escape-string-regexp v5 uses \xNN hex escapes which RE2 does not support.
+const escapeRE2 = (s: string) => s.replace(/[.+*?^${}[\]|(\\]/g, '\\$&');
 import { z } from 'zod';
 import { askCodebase, getFileSource, listCommits, listLanguageModels, listRepos, listTree, search } from './client.js';
 import { env, numberSchema } from './env.js';
@@ -81,15 +83,15 @@ server.tool(
         useRegex = false,
     }) => {
         if (repos.length > 0) {
-            query += ` (repo:${repos.map(id => escapeStringRegexp(id)).join(' or repo:')})`;
+            query += ` (repo:${repos.map(id => escapeRE2(id)).join(' or repo:')})`;
         }
 
         if (languages.length > 0) {
             query += ` (lang:${languages.join(' or lang:')})`;
         }
 
         if (filepaths.length > 0) {
-            query += ` (file:${filepaths.map(filepath => escapeStringRegexp(filepath)).join(' or file:')})`;
+            query += ` (file:${filepaths.map(filepath => escapeRE2(filepath)).join(' or file:')})`;
         }
 
         if (ref) {

packages/web/src/app/[domain]/browse/layoutClient.tsx

@@ -10,7 +10,9 @@ import { useBrowseParams } from "./hooks/useBrowseParams";
 import { FileSearchCommandDialog } from "./components/fileSearchCommandDialog";
 import { useDomain } from "@/hooks/useDomain";
 import { SearchBar } from "../components/searchBar";
-import escapeStringRegexp from "escape-string-regexp";
+// Escapes special RE2 regex characters using backslash (compatible with Zoekt/Go RE2).
+// escape-string-regexp v5 uses \xNN hex escapes which RE2 does not support.
+const escapeRE2 = (s: string) => s.replace(/[.+*?^${}[\]|(\\]/g, '\\$&');
 import { Session } from "next-auth";
 
 interface LayoutProps {
@@ -37,7 +39,7 @@ export function LayoutClient({
                     <SearchBar
                         size="sm"
                         defaults={{
-                            query: `repo:^${escapeStringRegexp(repoName)}$${revisionName ? ` rev:${revisionName}` : ''} `,
+                            query: `repo:^${escapeRE2(repoName)}$${revisionName ? ` rev:${revisionName}` : ''} `,
                         }}
                         className="w-full"
                         isSearchAssistSupported={isSearchAssistSupported}

packages/web/src/features/chat/tools.ts

@@ -9,7 +9,9 @@ import { toolNames } from "./constants";
 import { listReposQueryParamsSchema } from "@/lib/schemas";
 import { ListReposQueryParams } from "@/lib/types";
 import { listRepos } from "@/app/api/(server)/repos/listReposApi";
-import escapeStringRegexp from "escape-string-regexp";
+// Escapes special RE2 regex characters using backslash (compatible with Zoekt/Go RE2).
+// escape-string-regexp v5 uses \xNN hex escapes which RE2 does not support.
+const escapeRE2 = (s: string) => s.replace(/[.+*?^${}[\]|(\\]/g, '\\$&');
 
 // @NOTE: When adding a new tool, follow these steps:
 // 1. Add the tool to the `toolNames` constant in `constants.ts`.
@@ -198,15 +200,15 @@ export const createCodeSearchTool = (selectedRepos: string[]) => tool({
         }
 
         if (repos.length > 0) {
-            query += ` (repo:${repos.map(id => escapeStringRegexp(id)).join(' or repo:')})`;
+            query += ` (repo:${repos.map(id => escapeRE2(id)).join(' or repo:')})`;
         }
 
         if (languages.length > 0) {
             query += ` (lang:${languages.join(' or lang:')})`;
         }
 
         if (filepaths.length > 0) {
-            query += ` (file:${filepaths.map(filepath => escapeStringRegexp(filepath)).join(' or file:')})`;
+            query += ` (file:${filepaths.map(filepath => escapeRE2(filepath)).join(' or file:')})`;
         }
 
         if (ref) {

packages/web/src/features/mcp/server.ts

@@ -11,7 +11,9 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { ChatVisibility } from '@sourcebot/db';
 import { SOURCEBOT_VERSION } from '@sourcebot/shared';
 import _dedent from 'dedent';
-import escapeStringRegexp from 'escape-string-regexp';
+// Escapes special RE2 regex characters using backslash (compatible with Zoekt/Go RE2).
+// escape-string-regexp v5 uses \xNN hex escapes which RE2 does not support.
+const escapeRE2 = (s: string) => s.replace(/[.+*?^${}[\]|(\\]/g, '\\$&');
 import { z } from 'zod';
 import {
     ListTreeEntry,
@@ -141,13 +143,13 @@ export function createMcpServer(): McpServer {
             maxTokens?: number;
         }) => {
             if (repos.length > 0) {
-                query += ` (repo:${repos.map(id => escapeStringRegexp(id)).join(' or repo:')})`;
+                query += ` (repo:${repos.map(id => escapeRE2(id)).join(' or repo:')})`;
             }
             if (languages.length > 0) {
                 query += ` (lang:${languages.join(' or lang:')})`;
             }
             if (filepaths.length > 0) {
-                query += ` (file:${filepaths.map(fp => escapeStringRegexp(fp)).join(' or file:')})`;
+                query += ` (file:${filepaths.map(fp => escapeRE2(fp)).join(' or file:')})`;
             }
             if (ref) {
                 query += ` ( rev:${ref} )`;