switch to using pagination api for listing repos. Remove search repos tool since it is redudant with lsit repos

Author: brendan-kellam

packages/web/src/app/api/(client)/client.ts

@@ -37,7 +37,7 @@ export const search = async (body: SearchRequest): Promise<SearchResponse | Serv
 }
 
 export const getFileSource = async (queryParams: FileSourceRequest): Promise<FileSourceResponse | ServiceError> => {
-    const url = new URL("/api/source", window.location.origin);
+    const url = new URL("/api/source");
     for (const [key, value] of Object.entries(queryParams)) {
         url.searchParams.set(key, value.toString());
     }
@@ -50,7 +50,7 @@ export const getFileSource = async (queryParams: FileSourceRequest): Promise<Fil
 }
 
 export const listRepos = async (queryParams: ListReposQueryParams): Promise<ListReposResponse | ServiceError> => {
-    const url = new URL("/api/repos", window.location.origin);
+    const url = new URL("/api/repos");
     for (const [key, value] of Object.entries(queryParams)) {
         url.searchParams.set(key, value.toString());
     }

packages/web/src/app/api/(server)/repos/listReposApi.ts

@@ -0,0 +1,54 @@
+import { sew } from "@/actions";
+import { repositoryQuerySchema } from "@/lib/schemas";
+import { ListReposQueryParams } from "@/lib/types";
+import { withOptionalAuthV2 } from "@/withAuthV2";
+import { headers } from "next/headers";
+import { getBaseUrl } from "@/lib/utils.server";
+import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
+
+export const listRepos = async ({ query, page, perPage, sort, direction }: ListReposQueryParams) => sew(() =>
+    withOptionalAuthV2(async ({ org, prisma }) => {
+        const skip = (page - 1) * perPage;
+        const orderByField = sort === 'pushed' ? 'pushedAt' : 'name';
+
+        const headersList = await headers();
+        const baseUrl = getBaseUrl(headersList);
+
+        const [repos, totalCount] = await Promise.all([
+            prisma.repo.findMany({
+                where: {
+                    orgId: org.id,
+                    ...(query ? {
+                        name: { contains: query, mode: 'insensitive' },
+                    } : {}),
+                },
+                skip,
+                take: perPage,
+                orderBy: { [orderByField]: direction },
+            }),
+            prisma.repo.count({
+                where: { orgId: org.id },
+            }),
+        ]);
+
+        return {
+            data: repos.map((repo) => repositoryQuerySchema.parse({
+                codeHostType: repo.external_codeHostType,
+                repoId: repo.id,
+                repoName: repo.name,
+                webUrl: `${baseUrl}${getBrowsePath({
+                    repoName: repo.name,
+                    path: '',
+                    pathType: 'tree',
+                    domain: org.domain,
+                })}`,
+                repoDisplayName: repo.displayName ?? undefined,
+                externalWebUrl: repo.webUrl ?? undefined,
+                imageUrl: repo.imageUrl ?? undefined,
+                indexedAt: repo.indexedAt ?? undefined,
+                pushedAt: repo.pushedAt ?? undefined,
+            })),
+            totalCount,
+        };
+    })
+)

packages/web/src/app/api/(server)/repos/route.ts

@@ -1,11 +1,9 @@
-import { NextRequest } from "next/server";
-import { sew } from "@/actions";
-import { withOptionalAuthV2 } from "@/withAuthV2";
+import { buildLinkHeader } from "@/lib/pagination";
+import { listReposQueryParamsSchema } from "@/lib/schemas";
 import { queryParamsSchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
-import { listReposQueryParamsSchema, repositoryQuerySchema } from "@/lib/schemas";
-import { buildLinkHeader } from "@/lib/pagination";
-import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
+import { NextRequest } from "next/server";
+import { listRepos } from "./listReposApi";
 
 export const GET = async (request: NextRequest) => {
     const rawParams = Object.fromEntries(
@@ -21,49 +19,14 @@ export const GET = async (request: NextRequest) => {
     }
 
     const { page, perPage, sort, direction, query } = parseResult.data;
-    const skip = (page - 1) * perPage;
-    const orderByField = sort === 'pushed' ? 'pushedAt' : 'name';
 
-    const response = await sew(() =>
-        withOptionalAuthV2(async ({ org, prisma }) => {
-            const [repos, totalCount] = await Promise.all([
-                prisma.repo.findMany({
-                    where: {
-                        orgId: org.id,
-                        ...(query ? {
-                            name: { contains: query, mode: 'insensitive' },
-                        } : {}),
-                    },
-                    skip,
-                    take: perPage,
-                    orderBy: { [orderByField]: direction },
-                }),
-                prisma.repo.count({
-                    where: { orgId: org.id },
-                }),
-            ]);
-
-            return {
-                data: repos.map((repo) => repositoryQuerySchema.parse({
-                    codeHostType: repo.external_codeHostType,
-                    repoId: repo.id,
-                    repoName: repo.name,
-                    webUrl: `${request.nextUrl.origin}${getBrowsePath({
-                        repoName: repo.name,
-                        path: '',
-                        pathType: 'tree',
-                        domain: org.domain,
-                    })}`,
-                    repoDisplayName: repo.displayName ?? undefined,
-                    externalWebUrl: repo.webUrl ?? undefined,
-                    imageUrl: repo.imageUrl ?? undefined,
-                    indexedAt: repo.indexedAt ?? undefined,
-                    pushedAt: repo.pushedAt ?? undefined,
-                })),
-                totalCount,
-            };
-        })
-    );
+    const response = await listRepos({
+        page,
+        perPage,
+        sort,
+        direction,
+        query,
+    })
 
     if (isServiceError(response)) {
         return serviceErrorResponse(response);

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

@@ -5,7 +5,7 @@ import { createLogger, env } from "@sourcebot/shared";
 import { env as clientEnv } from "@sourcebot/shared/client";
 import { LanguageModel, ModelMessage, StopCondition, streamText } from "ai";
 import { ANSWER_TAG, FILE_REFERENCE_PREFIX, toolNames } from "./constants";
-import { createCodeSearchTool, findSymbolDefinitionsTool, findSymbolReferencesTool, listAllReposTool, readFilesTool, searchReposTool } from "./tools";
+import { createCodeSearchTool, findSymbolDefinitionsTool, findSymbolReferencesTool, listReposTool, readFilesTool } from "./tools";
 import { Source } from "./types";
 import { addLineNumbers, fileReferenceToString } from "./utils";
 import _dedent from "dedent";
@@ -73,8 +73,7 @@ export const createAgentStream = async ({
             [toolNames.readFiles]: readFilesTool,
             [toolNames.findSymbolReferences]: findSymbolReferencesTool,
             [toolNames.findSymbolDefinitions]: findSymbolDefinitionsTool,
-            [toolNames.searchRepos]: searchReposTool,
-            [toolNames.listAllRepos]: listAllReposTool,
+            [toolNames.listRepos]: listReposTool,
         },
         temperature: env.SOURCEBOT_CHAT_MODEL_TEMPERATURE,
         stopWhen: [

packages/web/src/features/chat/components/chatThread/detailsCard.tsx

@@ -13,8 +13,7 @@ import { FindSymbolDefinitionsToolComponent } from './tools/findSymbolDefinition
 import { FindSymbolReferencesToolComponent } from './tools/findSymbolReferencesToolComponent';
 import { ReadFilesToolComponent } from './tools/readFilesToolComponent';
 import { SearchCodeToolComponent } from './tools/searchCodeToolComponent';
-import { SearchReposToolComponent } from './tools/searchReposToolComponent';
-import { ListAllReposToolComponent } from './tools/listAllReposToolComponent';
+import { ListReposToolComponent } from './tools/listReposToolComponent';
 import { SBChatMessageMetadata, SBChatMessagePart } from '../../types';
 import { SearchScopeIcon } from '../searchScopeIcon';
 import isEqual from "fast-deep-equal/react";
@@ -184,16 +183,9 @@ const DetailsCardComponent = ({
                                                         part={part}
                                                     />
                                                 )
-                                            case 'tool-searchRepos':
+                                            case 'tool-listRepos':
                                                 return (
-                                                    <SearchReposToolComponent
-                                                        key={index}
-                                                        part={part}
-                                                    />
-                                                )
-                                            case 'tool-listAllRepos':
-                                                return (
-                                                    <ListAllReposToolComponent
+                                                    <ListReposToolComponent
                                                         key={index}
                                                         part={part}
                                                     />

…read/tools/listAllReposToolComponent.tsx …tThread/tools/listReposToolComponent.tsxpackages/web/src/features/chat/components/chatThread/tools/listAllReposToolComponent.tsx renamed to packages/web/src/features/chat/components/chatThread/tools/listReposToolComponent.tsx packages/web/src/features/chat/components/chatThread/tools/listAllReposToolComponent.tsx renamed to packages/web/src/features/chat/components/chatThread/tools/listReposToolComponent.tsx

@@ -1,25 +1,25 @@
 'use client';
 
-import { ListAllReposToolUIPart } from "@/features/chat/tools";
+import { ListReposToolUIPart } from "@/features/chat/tools";
 import { isServiceError } from "@/lib/utils";
 import { useMemo, useState } from "react";
 import { ToolHeader, TreeList } from "./shared";
 import { CodeSnippet } from "@/app/components/codeSnippet";
 import { Separator } from "@/components/ui/separator";
 import { FolderOpenIcon } from "lucide-react";
 
-export const ListAllReposToolComponent = ({ part }: { part: ListAllReposToolUIPart }) => {
+export const ListReposToolComponent = ({ part }: { part: ListReposToolUIPart }) => {
     const [isExpanded, setIsExpanded] = useState(false);
 
     const label = useMemo(() => {
         switch (part.state) {
             case 'input-streaming':
-                return 'Loading all repositories...';
+                return 'Listing repositories...';
             case 'output-error':
-                return '"List all repositories" tool call failed';
+                return '"List repositories" tool call failed';
             case 'input-available':
             case 'output-available':
-                return 'Listed all repositories';
+                return 'Listed repositories';
         }
     }, [part]);
 

packages/web/src/features/chat/components/chatThread/tools/searchReposToolComponent.tsx

@@ -14,8 +14,7 @@ export const toolNames = {
     readFiles: 'readFiles',
     findSymbolReferences: 'findSymbolReferences',
     findSymbolDefinitions: 'findSymbolDefinitions',
-    searchRepos: 'searchRepos',
-    listAllRepos: 'listAllRepos',
+    listRepos: 'listRepos',
 } as const;
 
 // These part types are visible in the UI.
@@ -26,6 +25,5 @@ export const uiVisiblePartTypes: SBChatMessagePart['type'][] = [
     'tool-readFiles',
     'tool-findSymbolDefinitions',
     'tool-findSymbolReferences',
-    'tool-searchRepos',
-    'tool-listAllRepos',
+    'tool-listRepos',
 ] as const;

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

@@ -6,8 +6,9 @@ import { FileSourceResponse, getFileSource } from '@/features/git';
 import { findSearchBasedSymbolDefinitions, findSearchBasedSymbolReferences } from "../codeNav/api";
 import { addLineNumbers, buildSearchQuery } from "./utils";
 import { toolNames } from "./constants";
-import { getRepos } from "@/actions";
-import Fuse from "fuse.js";
+import { listReposQueryParamsSchema } from "@/lib/schemas";
+import { ListReposQueryParams } from "@/lib/types";
+import { listRepos } from "@/app/api/(server)/repos/listReposApi";
 
 // @NOTE: When adding a new tool, follow these steps:
 // 1. Add the tool to the `toolNames` constant in `constants.ts`.
@@ -217,58 +218,21 @@ export type SearchCodeToolInput = InferToolInput<ReturnType<typeof createCodeSea
 export type SearchCodeToolOutput = InferToolOutput<ReturnType<typeof createCodeSearchTool>>;
 export type SearchCodeToolUIPart = ToolUIPart<{ [toolNames.searchCode]: SearchCodeTool }>;
 
-export const searchReposTool = tool({
-    description: `Search for repositories by name using fuzzy search. This helps find repositories in the codebase when you know part of their name.`,
-    inputSchema: z.object({
-        query: z.string().describe("The search query to find repositories by name (supports fuzzy matching)"),
-        limit: z.number().default(10).describe("Maximum number of repositories to return (default: 10)")
-    }),
-    execute: async ({ query, limit }) => {
-        const reposResponse = await getRepos();
-
-        if (isServiceError(reposResponse)) {
-            return reposResponse;
-        }
-
-        // Configure Fuse.js for fuzzy searching
-        const fuse = new Fuse(reposResponse, {
-            keys: [
-                { name: 'repoName', weight: 0.7 },
-                { name: 'repoDisplayName', weight: 0.3 }
-            ],
-            threshold: 0.4, // Lower threshold = more strict matching
-            includeScore: true,
-            minMatchCharLength: 1,
-        });
-
-        const searchResults = fuse.search(query, { limit: limit ?? 10 });
-
-        searchResults.sort((a, b) => (a.score ?? 0) - (b.score ?? 0));
-
-        return searchResults.map(({ item }) => item.repoName);
-    }
-});
-
-export type SearchReposTool = InferUITool<typeof searchReposTool>;
-export type SearchReposToolInput = InferToolInput<typeof searchReposTool>;
-export type SearchReposToolOutput = InferToolOutput<typeof searchReposTool>;
-export type SearchReposToolUIPart = ToolUIPart<{ [toolNames.searchRepos]: SearchReposTool }>;
-
-export const listAllReposTool = tool({
-    description: `Lists all repositories in the codebase. This provides a complete overview of all available repositories.`,
-    inputSchema: z.object({}),
-    execute: async () => {
-        const reposResponse = await getRepos();
+export const listReposTool = tool({
+    description: 'Lists repositories in the organization with optional filtering and pagination.',
+    inputSchema: listReposQueryParamsSchema,
+    execute: async (request: ListReposQueryParams) => {
+        const reposResponse = await listRepos(request);
 
         if (isServiceError(reposResponse)) {
             return reposResponse;
         }
 
-        return reposResponse.map((repo) => repo.repoName);
+        return reposResponse.data.map((repo) => repo.repoName);
     }
 });
 
-export type ListAllReposTool = InferUITool<typeof listAllReposTool>;
-export type ListAllReposToolInput = InferToolInput<typeof listAllReposTool>;
-export type ListAllReposToolOutput = InferToolOutput<typeof listAllReposTool>;
-export type ListAllReposToolUIPart = ToolUIPart<{ [toolNames.listAllRepos]: ListAllReposTool }>;
+export type ListReposTool = InferUITool<typeof listReposTool>;
+export type ListReposToolInput = InferToolInput<typeof listReposTool>;
+export type ListReposToolOutput = InferToolOutput<typeof listReposTool>;
+export type ListReposToolUIPart = ToolUIPart<{ [toolNames.listRepos]: ListReposTool }>;