add isSearchExausted flag for flagging when a search captured all results

Author: brendan-kellam

packages/web/src/app/[domain]/search/components/searchResultsPage.tsx

@@ -62,6 +62,8 @@ export const SearchResultsPage = ({
         durationMs,
         isStreaming,
         numMatches,
+        isExhaustive,
+        stats,
     } = useStreamedSearch({
         query: searchQuery,
         matches: maxMatchCount,
@@ -170,10 +172,8 @@ export const SearchResultsPage = ({
                     repoInfo={repoInfo}
                     searchDurationMs={durationMs}
                     isStreaming={isStreaming}
-                    // @todo: handle search stats
-                    searchStats={undefined}
-                    // @todo: detect when more results are available
-                    isMoreResultsButtonVisible={false}
+                    searchStats={stats}
+                    isMoreResultsButtonVisible={!isExhaustive}
                     // @todo: handle branch filtering
                     isBranchFilteringEnabled={false}
                 />

packages/web/src/app/[domain]/search/useStreamedSearch.ts

@@ -1,6 +1,6 @@
 'use client';
 
-import { RepositoryInfo, SearchRequest, SearchResponse, SearchResultFile } from '@/features/search/types';
+import { RepositoryInfo, SearchRequest, SearchResultFile, SearchStats, StreamedSearchResponse } from '@/features/search/types';
 import { useState, useCallback, useRef, useEffect } from 'react';
 import * as Sentry from '@sentry/nextjs';
 
@@ -10,6 +10,7 @@ interface CacheEntry {
     numMatches: number;
     durationMs: number;
     timestamp: number;
+    isExhaustive: boolean;
 }
 
 const searchCache = new Map<string, CacheEntry>();
@@ -34,18 +35,22 @@ export const useStreamedSearch = ({ query, matches, contextLines, whole, isRegex
 
     const [state, setState] = useState<{
         isStreaming: boolean,
+        isExhaustive: boolean,
         error: Error | null,
         files: SearchResultFile[],
         repoInfo: Record<number, RepositoryInfo>,
         durationMs: number,
         numMatches: number,
+        stats?: SearchStats,
     }>({
         isStreaming: false,
+        isExhaustive: false,
         error: null,
         files: [],
         repoInfo: {},
         durationMs: 0,
         numMatches: 0,
+        stats: undefined,
     });
 
     const abortControllerRef = useRef<AbortController | null>(null);
@@ -85,6 +90,7 @@ export const useStreamedSearch = ({ query, matches, contextLines, whole, isRegex
                 console.debug('Using cached search results');
                 setState({
                     isStreaming: false,
+                    isExhaustive: cachedEntry.isExhaustive,
                     error: null,
                     files: cachedEntry.files,
                     repoInfo: cachedEntry.repoInfo,
@@ -96,6 +102,7 @@ export const useStreamedSearch = ({ query, matches, contextLines, whole, isRegex
 
             setState({
                 isStreaming: true,
+                isExhaustive: false,
                 error: null,
                 files: [],
                 repoInfo: {},
@@ -167,22 +174,33 @@ export const useStreamedSearch = ({ query, matches, contextLines, whole, isRegex
                             break;
                         }
 
-                        const chunk: SearchResponse = JSON.parse(data);
-                        setState(prev => ({
-                            ...prev,
-                            files: [
-                                ...prev.files,
-                                ...chunk.files
-                            ],
-                            repoInfo: {
-                                ...prev.repoInfo,
-                                ...chunk.repositoryInfo.reduce((acc, repo) => {
-                                    acc[repo.id] = repo;
-                                    return acc;
-                                }, {} as Record<number, RepositoryInfo>),
-                            },
-                            numMatches: prev.numMatches + chunk.stats.actualMatchCount,
-                        }));
+                        const response: StreamedSearchResponse = JSON.parse(data);
+                        switch (response.type) {
+                            case 'chunk':
+                                setState(prev => ({
+                                    ...prev,
+                                    files: [
+                                        ...prev.files,
+                                        ...response.files
+                                    ],
+                                    repoInfo: {
+                                        ...prev.repoInfo,
+                                        ...response.repositoryInfo.reduce((acc, repo) => {
+                                            acc[repo.id] = repo;
+                                            return acc;
+                                        }, {} as Record<number, RepositoryInfo>),
+                                    },
+                                    numMatches: prev.numMatches + response.stats.actualMatchCount,
+                                }));
+                                break;
+                            case 'final':
+                                setState(prev => ({
+                                    ...prev,
+                                    isExhaustive: response.isSearchExhaustive,
+                                    stats: response.accumulatedStats,
+                                }));
+                                break;
+                        }
                     }
                 }
 
@@ -192,6 +210,7 @@ export const useStreamedSearch = ({ query, matches, contextLines, whole, isRegex
                     searchCache.set(cacheKey, {
                         files: prev.files,
                         repoInfo: prev.repoInfo,
+                        isExhaustive: prev.isExhaustive,
                         numMatches: prev.numMatches,
                         durationMs,
                         timestamp: Date.now(),

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

@@ -4,7 +4,7 @@ import { search } from "@/features/search/searchApi";
 import { isServiceError } from "@/lib/utils";
 import { NextRequest } from "next/server";
 import { schemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
-import { searchRequestSchema } from "@/features/search/schemas";
+import { searchRequestSchema } from "@/features/search/types";
 
 export const POST = async (request: NextRequest) => {
     const body = await request.json();

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

@@ -4,7 +4,7 @@ import { getFileSource } from "@/features/search/fileSourceApi";
 import { schemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
 import { NextRequest } from "next/server";
-import { fileSourceRequestSchema } from "@/features/search/schemas";
+import { fileSourceRequestSchema } from "@/features/search/types";
 
 export const POST = async (request: NextRequest) => {
     const body = await request.json();