From b9ac38356c7b6c548830b7674013b61a9baf9408 Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Wed, 23 Sep 2026 21:54:17 +0300
Subject: [PATCH 1/3] Add Find more experts for existing Expert Finder searches

---
 .../components/FindMoreExpertsModal.tsx       | 129 ++++++++++++++++
 .../components/SearchDetailContent.tsx        | 145 ++++++++++++++----
 .../new/components/ExpertFinderForm.tsx       |  12 +-
 app/expert-finder/library/new/schema.ts       |  15 +-
 hooks/useExpertFinder.ts                      |  54 +++++++
 services/expertFinder.service.ts              |  30 ++++
 types/expertFinder.ts                         |  69 +++++++--
 7 files changed, 397 insertions(+), 57 deletions(-)
 create mode 100644 app/expert-finder/library/[searchId]/components/FindMoreExpertsModal.tsx

diff --git a/app/expert-finder/library/[searchId]/components/FindMoreExpertsModal.tsx b/app/expert-finder/library/[searchId]/components/FindMoreExpertsModal.tsx
new file mode 100644
index 000000000..508271b00
--- /dev/null
+++ b/app/expert-finder/library/[searchId]/components/FindMoreExpertsModal.tsx
@@ -0,0 +1,129 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { ChevronDown } from 'lucide-react';
+import { BaseModal } from '@/components/ui/BaseModal';
+import { Alert } from '@/components/ui/Alert';
+import { Button } from '@/components/ui/Button';
+import { Dropdown, DropdownItem } from '@/components/ui/form/Dropdown';
+import { Textarea } from '@/components/ui/form/Textarea';
+import { LoadingButton } from '@/components/ui/LoadingButton';
+import { cn } from '@/utils/styles';
+import {
+  EXPERT_COUNT_OPTIONS,
+  EXPERT_SEARCH_ADDITIONAL_CONTEXT_MAX_LENGTH,
+  type ExpertCountOption,
+  type FindMoreExpertsPayload,
+} from '@/services/expertFinder.service';
+
+export interface FindMoreExpertsModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  initialAdditionalContext: string;
+  isSubmitting: boolean;
+  error: string | null;
+  onSubmit: (payload: FindMoreExpertsPayload) => Promise<void>;
+}
+
+const INITIAL_EXPERT_COUNT: ExpertCountOption = 10;
+
+export function FindMoreExpertsModal({
+  isOpen,
+  onClose,
+  initialAdditionalContext,
+  isSubmitting,
+  error,
+  onSubmit,
+}: Readonly<FindMoreExpertsModalProps>) {
+  const [expertCount, setExpertCount] = useState<ExpertCountOption>(INITIAL_EXPERT_COUNT);
+  const [additionalContext, setAdditionalContext] = useState(initialAdditionalContext);
+  const [countOpen, setCountOpen] = useState(false);
+
+  useEffect(() => {
+    if (!isOpen) return;
+    setExpertCount(INITIAL_EXPERT_COUNT);
+    setAdditionalContext(initialAdditionalContext);
+    setCountOpen(false);
+  }, [isOpen, initialAdditionalContext]);
+
+  const handleSubmit = async () => {
+    const payload: FindMoreExpertsPayload = { expert_count: expertCount };
+    if (additionalContext !== initialAdditionalContext) {
+      payload.additional_context = additionalContext;
+    }
+    await onSubmit(payload);
+  };
+
+  return (
+    <BaseModal isOpen={isOpen} onClose={onClose} title="Find more experts" size="md">
+      <div className="space-y-4">
+        <p className="text-sm text-gray-600">
+          Request additional experts for this search. New results are appended; existing experts
+          stay.
+        </p>
+
+        <Dropdown
+          label="Number of researchers"
+          helperText={`Up to ${expertCount} more researchers will be found`}
+          trigger={
+            <Button
+              type="button"
+              variant="outlined"
+              size="md"
+              className="w-full justify-between text-left text-gray-900 font-normal"
+              disabled={isSubmitting}
+            >
+              {expertCount}
+              <ChevronDown
+                className={cn(
+                  'ml-2 h-4 w-4 shrink-0 transition-transform',
+                  countOpen && 'rotate-180'
+                )}
+              />
+            </Button>
+          }
+          className="max-h-60 overflow-y-auto py-1"
+          onOpenChange={setCountOpen}
+        >
+          <div className="py-1 max-h-60 overflow-y-auto">
+            {EXPERT_COUNT_OPTIONS.map((option) => (
+              <DropdownItem
+                key={option}
+                onClick={() => setExpertCount(option)}
+                className={expertCount === option ? 'bg-primary-50 text-primary-900' : ''}
+              >
+                {option}
+              </DropdownItem>
+            ))}
+          </div>
+        </Dropdown>
+
+        <Textarea
+          label="Additional guidance (optional)"
+          value={additionalContext}
+          onChange={(e) => setAdditionalContext(e.target.value)}
+          maxLength={EXPERT_SEARCH_ADDITIONAL_CONTEXT_MAX_LENGTH}
+          rows={4}
+          disabled={isSubmitting}
+          helperText="Leave unchanged to keep the current search guidance. Clearing the field replaces it with empty guidance."
+        />
+
+        {error ? <Alert variant="error">{error}</Alert> : null}
+
+        <div className="flex justify-end gap-2 pt-1">
+          <Button type="button" variant="outlined" onClick={onClose} disabled={isSubmitting}>
+            Cancel
+          </Button>
+          <LoadingButton
+            type="button"
+            variant="default"
+            onClick={() => void handleSubmit()}
+            isLoading={isSubmitting}
+          >
+            Find more
+          </LoadingButton>
+        </div>
+      </div>
+    </BaseModal>
+  );
+}
diff --git a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
index 20a131b67..b7a2daed3 100644
--- a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
+++ b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
@@ -4,19 +4,23 @@ import { useState, useCallback } from 'react';
 import Link from 'next/link';
 import { usePathname, useSearchParams } from 'next/navigation';
 import { TAB_EXPERT_RESULTS, TAB_OUTREACH } from '@/app/expert-finder/lib/searchDetailTabs';
-import { Loader2, RefreshCw, Download, Mail, UserPlus, MoreVertical } from 'lucide-react';
+import { Loader2, RefreshCw, Download, Mail, UserPlus, MoreVertical, Search } from 'lucide-react';
+import toast from 'react-hot-toast';
 import { Alert } from '@/components/ui/Alert';
 import { Breadcrumbs } from '@/components/ui/Breadcrumbs';
 import { Button } from '@/components/ui/Button';
 import { BaseMenu, BaseMenuItem } from '@/components/ui/form/BaseMenu';
 import { Tabs } from '@/components/ui/Tabs';
 import { cn } from '@/utils/styles';
-import { useExpertSearchDetail } from '@/hooks/useExpertFinder';
+import { useExpertSearchDetail, useFindMoreExperts } from '@/hooks/useExpertFinder';
+import { ApiError } from '@/services/types/api';
+import { type FindMoreExpertsPayload } from '@/services/expertFinder.service';
 import { SearchDetailHeader } from './SearchDetailHeader';
 import { ExpertResultCard } from './ExpertResultCard';
 import { GenerateEmailModal, type GenerateEmailConfirmPayload } from './GenerateEmailModal';
 import { GenerateEmailProgressModal } from './GenerateEmailProgressModal';
 import { ExpertFormModal } from './ExpertFormModal';
+import { FindMoreExpertsModal } from './FindMoreExpertsModal';
 import { GeneratedEmailsList } from '@/app/expert-finder/library/[searchId]/outreach/components/GeneratedEmailsList';
 import { SearchDetailSkeleton } from '@/components/ExpertFinder/SearchDetailSkeleton';
 import type { ExpertResult } from '@/types/expertFinder';
@@ -76,7 +80,11 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
   const tab = searchParams?.get('tab') === TAB_OUTREACH ? TAB_OUTREACH : TAB_EXPERT_RESULTS;
 
   const [{ searchDetail, isLoading, error }, refetch] = useExpertSearchDetail(searchId);
+  const [{ isLoading: isFindMoreSubmitting, error: findMoreError }, findMore] =
+    useFindMoreExperts();
+
   const [showAddExpertModal, setShowAddExpertModal] = useState(false);
+  const [showFindMoreModal, setShowFindMoreModal] = useState(false);
 
   const [selectedIndices, setSelectedIndices] = useState<Set<number>>(new Set());
   const [showGenerateModal, setShowGenerateModal] = useState(false);
@@ -84,6 +92,10 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
   const [generateExperts, setGenerateExperts] = useState<ExpertResult[]>([]);
   const [generatePayload, setGeneratePayload] = useState<GenerateEmailConfirmPayload | null>(null);
 
+  const isInProgress =
+    searchDetail != null &&
+    (searchDetail.status === 'pending' || searchDetail.status === 'processing');
+
   const toggleSelection = useCallback((index: number) => {
     setSelectedIndices((prev) => {
       const next = new Set(prev);
@@ -113,13 +125,28 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
     setSelectedIndices(new Set());
   }, []);
 
+  const handleFindMoreSubmit = useCallback(
+    async (payload: FindMoreExpertsPayload) => {
+      try {
+        await findMore(searchId, payload);
+        setShowFindMoreModal(false);
+        await refetch();
+      } catch (err: unknown) {
+        if (err instanceof ApiError && err.status === 409) {
+          toast.error('Search is already running');
+          setShowFindMoreModal(false);
+          await refetch();
+          return;
+        }
+        // Modal surfaces findMoreError from the hook
+      }
+    },
+    [findMore, searchId, refetch]
+  );
+
   const expertResultsTabHref = pathname ? `${pathname}?tab=${TAB_EXPERT_RESULTS}` : undefined;
   const outreachTabHref = pathname ? `${pathname}?tab=${TAB_OUTREACH}` : undefined;
 
-  const isInProgress =
-    searchDetail != null &&
-    (searchDetail.status === 'pending' || searchDetail.status === 'processing');
-
   if (isLoading && !searchDetail) {
     return <SearchDetailSkeleton activeTab={tab} />;
   }
@@ -144,15 +171,36 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
     return null;
   }
 
-  const displayedExpertTotal =
-    searchDetail.status === 'completed'
-      ? Math.max(searchDetail.expertCount, searchDetail.expertResults.length)
-      : searchDetail.expertResults.length;
+  const displayedExpertTotal = Math.max(
+    searchDetail.expertCount,
+    searchDetail.expertResults.length
+  );
+
+  const statusAllowsFindMore =
+    searchDetail.status === 'completed' || searchDetail.status === 'failed';
+  const canFindMore = statusAllowsFindMore && !isInProgress;
+
+  const showCompletedResults =
+    searchDetail.status === 'completed' ||
+    (searchDetail.status === 'failed' && searchDetail.expertResults.length > 0) ||
+    (isInProgress && searchDetail.expertResults.length > 0);
 
   // Proposal drafts / proposal invitations only apply to searches linked to a
   // grant (funding round) document.
   const isGrantLinked = searchDetail.work?.contentType === 'funding_request';
 
+  const findMoreButton = canFindMore ? (
+    <Button
+      variant="outlined"
+      size="sm"
+      className="gap-2"
+      onClick={() => setShowFindMoreModal(true)}
+    >
+      <Search className="h-4 w-4" aria-hidden />
+      Find more experts
+    </Button>
+  ) : null;
+
   return (
     <div className="w-full max-w-5xl mx-auto px-4 py-8 space-y-6">
       <Breadcrumbs
@@ -188,10 +236,51 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
               </p>
             </div>
           </Alert>
+          {canFindMore && searchDetail.expertResults.length === 0 ? (
+            <div className="flex flex-wrap items-center gap-2">{findMoreButton}</div>
+          ) : null}
         </div>
       )}
 
-      {searchDetail.status === 'completed' && (
+      {searchDetail.status === 'completed' && searchDetail.errorMessage.trim() !== '' && (
+        <Alert variant="warning">
+          <div>
+            <p className="font-semibold mb-1">Find more did not finish cleanly</p>
+            <p className="font-normal text-sm whitespace-pre-wrap">{searchDetail.errorMessage}</p>
+            <p className="font-normal text-sm mt-2 text-amber-900/80">
+              Existing experts from this search are still available below.
+            </p>
+          </div>
+        </Alert>
+      )}
+
+      {isInProgress && (
+        <div className="flex flex-wrap items-center gap-3" aria-live="polite">
+          <Loader2 className="h-5 w-5 animate-spin text-primary-600 shrink-0" aria-hidden />
+          <p className="text-sm text-gray-600 min-w-0 flex-1">
+            Finding experts…
+            {searchDetail.expertResults.length > 0
+              ? ' Existing experts stay visible while new ones are found.'
+              : ' This can take a bit of time.'}
+          </p>
+          <Button
+            variant="secondary"
+            size="sm"
+            className="gap-2"
+            onClick={() => void refetch()}
+            disabled={isLoading}
+          >
+            {isLoading ? (
+              <Loader2 className="h-4 w-4 animate-spin shrink-0" aria-hidden />
+            ) : (
+              <RefreshCw className="h-4 w-4 shrink-0" aria-hidden />
+            )}
+            <span>{isLoading ? 'Refreshing…' : 'Refresh'}</span>
+          </Button>
+        </div>
+      )}
+
+      {showCompletedResults && (
         <>
           <Tabs
             tabs={[
@@ -257,6 +346,7 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
                     <span className="text-sm text-gray-600">{selectedIndices.size} selected</span>
                   </div>
                   <div className="flex flex-wrap items-center gap-2">
+                    {findMoreButton}
                     <Button
                       variant="default"
                       size="sm"
@@ -299,7 +389,8 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
           ) : tab === TAB_EXPERT_RESULTS ? (
             <div className="rounded-lg border border-gray-200 bg-white p-6 text-center text-gray-600 space-y-3">
               <p>No experts found for this search.</p>
-              <div className="flex justify-center">
+              <div className="flex flex-wrap justify-center gap-2">
+                {findMoreButton}
                 <SearchActionsMenu
                   reportPdfUrl={searchDetail.reportPdfUrl}
                   reportCsvUrl={searchDetail.reportCsvUrl}
@@ -317,6 +408,14 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
         searchId={searchId}
         onSuccess={refetch}
       />
+      <FindMoreExpertsModal
+        isOpen={showFindMoreModal}
+        onClose={() => setShowFindMoreModal(false)}
+        initialAdditionalContext={searchDetail.additionalContext}
+        isSubmitting={isFindMoreSubmitting}
+        error={findMoreError}
+        onSubmit={handleFindMoreSubmit}
+      />
       <GenerateEmailModal
         isOpen={showGenerateModal}
         onClose={() => setShowGenerateModal(false)}
@@ -332,28 +431,6 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
         generation={generatePayload}
         onDone={handleProgressDone}
       />
-
-      {isInProgress && (
-        <div className="flex flex-wrap items-center gap-3">
-          <p className="text-sm text-gray-500">
-            Re-check status when the search has had time to complete.
-          </p>
-          <Button
-            variant="secondary"
-            size="sm"
-            className="gap-2"
-            onClick={refetch}
-            disabled={isLoading}
-          >
-            {isLoading ? (
-              <Loader2 className="h-4 w-4 animate-spin shrink-0" aria-hidden />
-            ) : (
-              <RefreshCw className="h-4 w-4 shrink-0" aria-hidden />
-            )}
-            <span>{isLoading ? 'Refreshing…' : 'Refresh'}</span>
-          </Button>
-        </div>
-      )}
     </div>
   );
 }
diff --git a/app/expert-finder/library/new/components/ExpertFinderForm.tsx b/app/expert-finder/library/new/components/ExpertFinderForm.tsx
index 62cd327ce..a3ae89d4e 100644
--- a/app/expert-finder/library/new/components/ExpertFinderForm.tsx
+++ b/app/expert-finder/library/new/components/ExpertFinderForm.tsx
@@ -22,7 +22,12 @@ import {
   ExpertFinderService,
   EXPERTISE_LEVEL_ALL,
 } from '@/services/expertFinder.service';
-import { expertFinderFormSchema, type ExpertFinderFormValues, DEFAULT_STATE } from '../schema';
+import {
+  expertFinderFormSchema,
+  type ExpertFinderFormValues,
+  type ExpertCountOption,
+  DEFAULT_STATE,
+} from '../schema';
 import { AdvancedConfig } from './AdvancedConfig';
 import { SearchSubmissionProgress } from './SearchSubmissionProgress';
 import { WorkPreviewCard } from './WorkPreviewCard';
@@ -30,6 +35,7 @@ import type { Work } from '@/types/work';
 import { ExpertSearchResult } from '@/types/expertFinder';
 
 const DEFAULT_URL_PLACEHOLDER = 'e.g., https://researchhub.com/paper/123/...';
+const INITIAL_EXPERT_COUNT: ExpertCountOption = 10;
 
 function getAvailableInputTypes(work: Work | null): InputType[] {
   if (work?.contentType === 'paper') {
@@ -45,7 +51,7 @@ const defaultValues: ExpertFinderFormValues = {
   url: '',
   additionalContext: '',
   advanced: {
-    expertCount: 25,
+    expertCount: INITIAL_EXPERT_COUNT,
     expertiseLevel: [],
     region: DEFAULT_REGION,
     state: DEFAULT_STATE,
@@ -151,7 +157,7 @@ export function ExpertFinderForm() {
       setSelectedSearchId(search?.searchId ?? null);
       if (!search) return;
       const config = search.config as Record<string, unknown>;
-      const expertCount = (config.expert_count as number) ?? 25;
+      const expertCount = (config.expert_count as number) ?? INITIAL_EXPERT_COUNT;
       const rawLevel = config.expertise_level;
       let expertiseLevel: ExpertiseLevel[];
       if (Array.isArray(rawLevel)) {
diff --git a/app/expert-finder/library/new/schema.ts b/app/expert-finder/library/new/schema.ts
index 921bb4f52..fc6e01ed4 100644
--- a/app/expert-finder/library/new/schema.ts
+++ b/app/expert-finder/library/new/schema.ts
@@ -1,15 +1,17 @@
 import { z } from 'zod';
 import {
   ExpertiseLevel,
+  EXPERT_COUNT_OPTIONS,
   EXPERT_SEARCH_ADDITIONAL_CONTEXT_MAX_LENGTH,
   InputType,
   Region,
+  type ExpertCountOption,
 } from '@/services/expertFinder.service';
 
 const INPUT_TYPES: InputType[] = ['abstract', 'pdf', 'full_content'];
 
-export const EXPERT_COUNT_OPTIONS = [5, 10, 25, 50, 100] as const;
-export type ExpertCountOption = (typeof EXPERT_COUNT_OPTIONS)[number];
+export { EXPERT_COUNT_OPTIONS };
+export type { ExpertCountOption };
 
 export const DEFAULT_STATE = 'All States';
 
@@ -31,7 +33,14 @@ export const REGION_VALUES: [Region, ...Region[]] = [
 ];
 
 export const advancedConfigSchema = z.object({
-  expertCount: z.number().default(25),
+  expertCount: z
+    .number()
+    .refine(
+      (n): n is ExpertCountOption => (EXPERT_COUNT_OPTIONS as readonly number[]).includes(n),
+      {
+        message: `Must be ${EXPERT_COUNT_OPTIONS.join(', ')}`,
+      }
+    ),
   expertiseLevel: z.array(z.enum(EXPERTISE_LEVELS_SPECIFIC)).default([]),
   region: z.enum(REGION_VALUES),
   state: z.string(),
diff --git a/hooks/useExpertFinder.ts b/hooks/useExpertFinder.ts
index c97201168..6f5dd0260 100644
--- a/hooks/useExpertFinder.ts
+++ b/hooks/useExpertFinder.ts
@@ -7,11 +7,13 @@ import {
   type AddExpertPayload,
   type CreateSavedTemplatePayload,
   type ExpertSearchCreatePayload,
+  type FindMoreExpertsPayload,
   type PatchExpertPayload,
   type UpdateGeneratedEmailPayload,
   type UpdateSavedTemplatePayload,
 } from '@/services/expertFinder.service';
 import { extractApiErrorMessage } from '@/services/lib/serviceUtils';
+import { ApiError } from '@/services/types/api';
 import type {
   ExpertResult,
   ExpertSearchCreated,
@@ -273,6 +275,58 @@ export function useCreateExpertSearch(): UseCreateExpertSearchReturn {
   return [{ created, isLoading, error }, createSearch];
 }
 
+// ── useFindMoreExperts ───────────────────────────────────────────────────────
+
+interface UseFindMoreExpertsState {
+  isLoading: boolean;
+  error: string | null;
+  alreadyRunning: boolean;
+}
+
+type FindMoreExpertsFn = (
+  searchId: number | string,
+  payload?: FindMoreExpertsPayload
+) => Promise<ExpertSearchCreated>;
+type UseFindMoreExpertsReturn = [UseFindMoreExpertsState, FindMoreExpertsFn];
+
+/**
+ * Request additional experts for an existing search.
+ * Callers should treat alreadyRunning (409) by refreshing search status.
+ */
+export function useFindMoreExperts(): UseFindMoreExpertsReturn {
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [alreadyRunning, setAlreadyRunning] = useState(false);
+
+  const findMore = useCallback(
+    async (
+      searchId: number | string,
+      payload?: FindMoreExpertsPayload
+    ): Promise<ExpertSearchCreated> => {
+      setIsLoading(true);
+      setError(null);
+      setAlreadyRunning(false);
+      try {
+        return await ExpertFinderService.findMoreExperts(searchId, payload);
+      } catch (err: unknown) {
+        if (err instanceof ApiError && err.status === 409) {
+          setAlreadyRunning(true);
+          setError(extractApiErrorMessage(err, 'Search is already running'));
+          throw err;
+        }
+        const message = extractApiErrorMessage(err, 'Failed to find more experts');
+        setError(message);
+        throw err;
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    []
+  );
+
+  return [{ isLoading, error, alreadyRunning }, findMore];
+}
+
 // ── usePatchExpert ────────────────────────────────────────────────────────────
 
 interface UsePatchExpertState {
diff --git a/services/expertFinder.service.ts b/services/expertFinder.service.ts
index 10167d2d0..605cee086 100644
--- a/services/expertFinder.service.ts
+++ b/services/expertFinder.service.ts
@@ -95,6 +95,16 @@ export interface ExpertSearchCreatePayload {
   additional_context?: string;
 }
 
+/** POST body for find-more on an existing search (all fields optional). */
+export interface FindMoreExpertsPayload {
+  expert_count?: number;
+  additional_context?: string;
+}
+
+/** Allowed `expert_count` values for create and find-more (API: 5–25). */
+export const EXPERT_COUNT_OPTIONS = [5, 10, 25] as const;
+export type ExpertCountOption = (typeof EXPERT_COUNT_OPTIONS)[number];
+
 /** PATCH body for canonical expert (wire format, snake_case). */
 export type PatchExpertPayload = Partial<{
   honorific: string;
@@ -217,6 +227,26 @@ export class ExpertFinderService {
     return transformExpertSearchCreateResponse(raw);
   }
 
+  /**
+   * Request additional experts for an existing search (appended when done).
+   * POST /api/research_ai/expert-finder/searches/:searchId/find-more/
+   */
+  static async findMoreExperts(
+    searchId: number | string,
+    payload?: FindMoreExpertsPayload
+  ): Promise<ExpertSearchCreated> {
+    const body: Record<string, unknown> = {};
+    if (payload?.expert_count != null) body.expert_count = payload.expert_count;
+    if (payload && 'additional_context' in payload) {
+      body.additional_context = payload.additional_context ?? '';
+    }
+    const raw = await ApiClient.post<Record<string, unknown>>(
+      `${this.BASE_PATH}/searches/${searchId}/find-more/`,
+      body
+    );
+    return transformExpertSearchCreateResponse(raw);
+  }
+
   /**
    * Fetch full detail for a single expert search.
    * GET /api/research_ai/expert-finder/searches/:searchId/
diff --git a/types/expertFinder.ts b/types/expertFinder.ts
index 7754fd50e..d0835a4c8 100644
--- a/types/expertFinder.ts
+++ b/types/expertFinder.ts
@@ -183,12 +183,29 @@ export interface ExpertSearchListResponse {
   offset: number;
 }
 
-/** Result of creating an expert search. */
+/** Result of creating an expert search (or find-more). */
 export interface ExpertSearchCreated {
   searchId: number;
   status: SearchStatus;
   message: string;
   sseUrl: string | null;
+  expertCount?: number;
+  append?: boolean;
+}
+
+const SEARCH_STATUSES: readonly SearchStatus[] = ['pending', 'processing', 'completed', 'failed'];
+
+/** Normalize API status (often uppercase) to client SearchStatus. */
+export function normalizeSearchStatus(
+  raw: unknown,
+  fallback: SearchStatus = 'pending'
+): SearchStatus {
+  const value = String(raw ?? '')
+    .trim()
+    .toLowerCase();
+  return (SEARCH_STATUSES as readonly string[]).includes(value)
+    ? (value as SearchStatus)
+    : fallback;
 }
 
 /** SSE progress event. */
@@ -377,7 +394,7 @@ export const transformExpertSearch = createTransformer<any, ExpertSearchResult>(
     inputType: raw.input_type ?? 'abstract',
     config: raw.config ?? {},
     llmModel: raw.llm_model ?? '',
-    status: raw.status ?? 'pending',
+    status: normalizeSearchStatus(raw.status),
     progress: raw.progress ?? 0,
     currentStep: raw.current_step ?? '',
     expertResults,
@@ -401,7 +418,7 @@ export const transformExpertSearchListItem = createTransformer<any, ExpertSearch
     searchId: raw.search_id ?? 0,
     name: raw.name ?? '',
     query: raw.query ?? '',
-    status: raw.status ?? 'pending',
+    status: normalizeSearchStatus(raw.status),
     expertCount: raw.expert_count ?? 0,
     createdAt: raw.created_at ?? '',
     completedAt: raw.completed_at ?? null,
@@ -410,23 +427,41 @@ export const transformExpertSearchListItem = createTransformer<any, ExpertSearch
 );
 
 export const transformExpertSearchCreateResponse = createTransformer<any, ExpertSearchCreated>(
-  (raw) => ({
-    searchId: raw.search_id ?? 0,
-    status: raw.status ?? 'pending',
-    message: raw.message ?? '',
-    sseUrl: raw.sse_url ?? null,
-  })
+  (raw) => {
+    const expertCountRaw = raw.expert_count;
+    const expertCount =
+      expertCountRaw != null && Number.isFinite(Number(expertCountRaw))
+        ? Number(expertCountRaw)
+        : undefined;
+    return {
+      searchId: raw.search_id ?? 0,
+      status: normalizeSearchStatus(raw.status),
+      message: raw.message ?? '',
+      sseUrl: raw.sse_url ?? null,
+      ...(expertCount !== undefined ? { expertCount } : {}),
+      ...(typeof raw.append === 'boolean' ? { append: raw.append } : {}),
+    };
+  }
 );
 
 export const transformExpertSearchProgressEvent = createTransformer<any, ExpertSearchProgress>(
-  (raw) => ({
-    status: raw.status ?? 'pending',
-    progress: raw.progress,
-    currentStep: raw.current_step,
-    taskType: raw.task_type,
-    taskId: raw.task_id,
-    error: raw.error,
-  })
+  (raw) => {
+    const rawStatus = raw.status;
+    const status =
+      rawStatus == null || rawStatus === ''
+        ? 'pending'
+        : String(rawStatus).trim().toLowerCase() === 'connected'
+          ? 'connected'
+          : normalizeSearchStatus(rawStatus);
+    return {
+      status,
+      progress: raw.progress,
+      currentStep: raw.current_step,
+      taskType: raw.task_type,
+      taskId: raw.task_id,
+      error: raw.error,
+    };
+  }
 );
 
 // ── Generated emails ─────────────────────────────────

From c5d0e2b90e1600063c03094f90598e7e2014c9e3 Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Wed, 23 Sep 2026 22:00:38 +0300
Subject: [PATCH 2/3] Add expert count option handling in ExpertFinderForm

---
 .../library/new/components/ExpertFinderForm.tsx        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/expert-finder/library/new/components/ExpertFinderForm.tsx b/app/expert-finder/library/new/components/ExpertFinderForm.tsx
index a3ae89d4e..1e805acab 100644
--- a/app/expert-finder/library/new/components/ExpertFinderForm.tsx
+++ b/app/expert-finder/library/new/components/ExpertFinderForm.tsx
@@ -23,6 +23,7 @@ import {
   EXPERTISE_LEVEL_ALL,
 } from '@/services/expertFinder.service';
 import {
+  EXPERT_COUNT_OPTIONS,
   expertFinderFormSchema,
   type ExpertFinderFormValues,
   type ExpertCountOption,
@@ -37,6 +38,13 @@ import { ExpertSearchResult } from '@/types/expertFinder';
 const DEFAULT_URL_PLACEHOLDER = 'e.g., https://researchhub.com/paper/123/...';
 const INITIAL_EXPERT_COUNT: ExpertCountOption = 10;
 
+function toExpertCountOption(value: unknown): ExpertCountOption {
+  const n = Number(value);
+  return (EXPERT_COUNT_OPTIONS as readonly number[]).includes(n)
+    ? (n as ExpertCountOption)
+    : INITIAL_EXPERT_COUNT;
+}
+
 function getAvailableInputTypes(work: Work | null): InputType[] {
   if (work?.contentType === 'paper') {
     const hasPdf = (work.formats ?? []).some((f) => f.type === 'PDF');
@@ -157,7 +165,7 @@ export function ExpertFinderForm() {
       setSelectedSearchId(search?.searchId ?? null);
       if (!search) return;
       const config = search.config as Record<string, unknown>;
-      const expertCount = (config.expert_count as number) ?? INITIAL_EXPERT_COUNT;
+      const expertCount = toExpertCountOption(config.expert_count);
       const rawLevel = config.expertise_level;
       let expertiseLevel: ExpertiseLevel[];
       if (Array.isArray(rawLevel)) {

From d0b67de310e5b563fcbea7b4841e9eaee6c28554 Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Fri, 25 Sep 2026 20:03:04 +0300
Subject: [PATCH 3/3] nibor

---
 .../library/[searchId]/components/SearchDetailContent.tsx     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
index b7a2daed3..e4cb7cc22 100644
--- a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
+++ b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
@@ -259,9 +259,7 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
           <Loader2 className="h-5 w-5 animate-spin text-primary-600 shrink-0" aria-hidden />
           <p className="text-sm text-gray-600 min-w-0 flex-1">
             Finding experts…
-            {searchDetail.expertResults.length > 0
-              ? ' Existing experts stay visible while new ones are found.'
-              : ' This can take a bit of time.'}
+            {' This can take a bit of time.'}
           </p>
           <Button
             variant="secondary"