From 14073c7704031d60d42101df316030476f59ecab Mon Sep 17 00:00:00 2001
From: Taki Koutsomitis <koutst@protonmail.com>
Date: Mon, 18 May 2026 19:14:15 -0400
Subject: [PATCH 1/6] Add manual expert

---
 .../[searchId]/components/AddExpertModal.tsx  | 195 ++++++++++++++++++
 .../components/SearchDetailContent.tsx        |  36 +++-
 hooks/useExpertFinder.ts                      |  40 ++++
 services/expertFinder.service.ts              |  30 +++
 types/expertFinder.ts                         |   2 +-
 5 files changed, 298 insertions(+), 5 deletions(-)
 create mode 100644 app/expert-finder/library/[searchId]/components/AddExpertModal.tsx

diff --git a/app/expert-finder/library/[searchId]/components/AddExpertModal.tsx b/app/expert-finder/library/[searchId]/components/AddExpertModal.tsx
new file mode 100644
index 000000000..301f2592b
--- /dev/null
+++ b/app/expert-finder/library/[searchId]/components/AddExpertModal.tsx
@@ -0,0 +1,195 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { BaseModal } from '@/components/ui/BaseModal';
+import { Button } from '@/components/ui/Button';
+import { Input } from '@/components/ui/form/Input';
+import { Textarea } from '@/components/ui/form/Textarea';
+import { LoadingButton } from '@/components/ui/LoadingButton';
+import type { AddExpertPayload } from '@/services/expertFinder.service';
+import { extractApiErrorMessage } from '@/services/lib/serviceUtils';
+
+export interface AddExpertModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onAdd: (searchId: string, payload: AddExpertPayload) => Promise<unknown>;
+  searchId: string;
+  onSuccess: () => Promise<void>;
+}
+
+function buildPayload(values: {
+  email: string;
+  honorific: string;
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  nameSuffix: string;
+  academicTitle: string;
+  affiliation: string;
+  expertise: string;
+  notes: string;
+}): AddExpertPayload {
+  const t = (s: string) => s.trim();
+  const payload: AddExpertPayload = { email: t(values.email).toLowerCase() };
+
+  if (t(values.honorific)) payload.honorific = t(values.honorific);
+  if (t(values.firstName)) payload.first_name = t(values.firstName);
+  if (t(values.middleName)) payload.middle_name = t(values.middleName);
+  if (t(values.lastName)) payload.last_name = t(values.lastName);
+  if (t(values.nameSuffix)) payload.name_suffix = t(values.nameSuffix);
+  if (t(values.academicTitle)) payload.academic_title = t(values.academicTitle);
+  if (t(values.affiliation)) payload.affiliation = t(values.affiliation);
+  if (t(values.expertise)) payload.expertise = t(values.expertise);
+  if (t(values.notes)) payload.notes = t(values.notes);
+
+  return payload;
+}
+
+export function AddExpertModal({
+  isOpen,
+  onClose,
+  onAdd,
+  searchId,
+  onSuccess,
+}: AddExpertModalProps) {
+  const [email, setEmail] = useState('');
+  const [honorific, setHonorific] = useState('');
+  const [firstName, setFirstName] = useState('');
+  const [middleName, setMiddleName] = useState('');
+  const [lastName, setLastName] = useState('');
+  const [nameSuffix, setNameSuffix] = useState('');
+  const [academicTitle, setAcademicTitle] = useState('');
+  const [affiliation, setAffiliation] = useState('');
+  const [expertise, setExpertise] = useState('');
+  const [notes, setNotes] = useState('');
+  const [submitError, setSubmitError] = useState<string | null>(null);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  useEffect(() => {
+    if (!isOpen) return;
+    setEmail('');
+    setHonorific('');
+    setFirstName('');
+    setMiddleName('');
+    setLastName('');
+    setNameSuffix('');
+    setAcademicTitle('');
+    setAffiliation('');
+    setExpertise('');
+    setNotes('');
+    setSubmitError(null);
+  }, [isOpen]);
+
+  const handleSubmit = async () => {
+    const trimmedEmail = email.trim();
+    if (!trimmedEmail) {
+      setSubmitError('Email is required.');
+      return;
+    }
+
+    setSubmitError(null);
+    setIsSubmitting(true);
+    try {
+      const payload = buildPayload({
+        email,
+        honorific,
+        firstName,
+        middleName,
+        lastName,
+        nameSuffix,
+        academicTitle,
+        affiliation,
+        expertise,
+        notes,
+      });
+      await onAdd(searchId, payload);
+      await onSuccess();
+      onClose();
+    } catch (err) {
+      setSubmitError(extractApiErrorMessage(err, 'Failed to add expert'));
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <BaseModal
+      isOpen={isOpen}
+      onClose={onClose}
+      title="Add expert"
+      size="lg"
+      showCloseButton
+      padding="p-6"
+    >
+      <div className="space-y-4 max-h-[70vh] overflow-y-auto pr-1">
+        <Input
+          label="Email"
+          type="email"
+          required
+          value={email}
+          onChange={(e) => setEmail(e.target.value)}
+          placeholder="jane.doe@university.edu"
+        />
+        <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
+          <Input
+            label="Honorific"
+            value={honorific}
+            onChange={(e) => setHonorific(e.target.value)}
+            placeholder="e.g. Dr, Prof, Mr, Ms"
+          />
+          <Input
+            label="First name"
+            value={firstName}
+            onChange={(e) => setFirstName(e.target.value)}
+          />
+          <Input
+            label="Middle name"
+            value={middleName}
+            onChange={(e) => setMiddleName(e.target.value)}
+          />
+          <Input label="Last name" value={lastName} onChange={(e) => setLastName(e.target.value)} />
+          <Input
+            label="Name suffix"
+            value={nameSuffix}
+            onChange={(e) => setNameSuffix(e.target.value)}
+            placeholder="e.g. Jr., Sr., III, IV"
+          />
+          <Input
+            label="Academic title"
+            value={academicTitle}
+            onChange={(e) => setAcademicTitle(e.target.value)}
+            placeholder="e.g. Associate Professor"
+          />
+        </div>
+        <Input
+          label="Affiliation"
+          value={affiliation}
+          onChange={(e) => setAffiliation(e.target.value)}
+          placeholder="e.g. MIT"
+        />
+        <Input
+          label="Expertise"
+          value={expertise}
+          onChange={(e) => setExpertise(e.target.value)}
+          placeholder="e.g. Quantum computing"
+        />
+        <Textarea label="Notes" value={notes} onChange={(e) => setNotes(e.target.value)} rows={2} />
+        {submitError ? <p className="text-sm text-red-600">{submitError}</p> : null}
+        <div className="flex justify-end gap-2 pt-2">
+          <Button type="button" variant="outlined" onClick={onClose} disabled={isSubmitting}>
+            Cancel
+          </Button>
+          <LoadingButton
+            type="button"
+            variant="default"
+            onClick={() => void handleSubmit()}
+            isLoading={isSubmitting}
+            loadingText="Adding..."
+          >
+            Add expert
+          </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 c226a4fd2..84dbc0132 100644
--- a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
+++ b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
@@ -4,17 +4,18 @@ 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, FileText, Download, Mail } from 'lucide-react';
+import { Loader2, RefreshCw, FileText, Download, Mail, UserPlus } from 'lucide-react';
 import { Alert } from '@/components/ui/Alert';
 import { Breadcrumbs } from '@/components/ui/Breadcrumbs';
 import { Button } from '@/components/ui/Button';
 import { Tabs } from '@/components/ui/Tabs';
-import { useExpertSearchDetail, usePatchExpert } from '@/hooks/useExpertFinder';
+import { useExpertSearchDetail, usePatchExpert, useAddExpert } from '@/hooks/useExpertFinder';
 import type { PatchExpertPayload } from '@/services/expertFinder.service';
 import { SearchDetailHeader } from './SearchDetailHeader';
 import { ExpertResultCard } from './ExpertResultCard';
 import { GenerateEmailModal, type GenerateEmailConfirmPayload } from './GenerateEmailModal';
 import { GenerateEmailProgressModal } from './GenerateEmailProgressModal';
+import { AddExpertModal } from './AddExpertModal';
 import { GeneratedEmailsList } from '@/app/expert-finder/library/[searchId]/outreach/components/GeneratedEmailsList';
 import type { ExpertResult } from '@/types/expertFinder';
 
@@ -29,6 +30,8 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
 
   const [{ searchDetail, isLoading, error }, refetch] = useExpertSearchDetail(searchId);
   const [, patchExpert] = usePatchExpert();
+  const [, addExpert] = useAddExpert();
+  const [showAddExpertModal, setShowAddExpertModal] = useState(false);
 
   const handleSaveExpert = useCallback(
     async (expertId: number, payload: PatchExpertPayload) => {
@@ -272,6 +275,15 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
                     <Mail className="h-4 w-4" aria-hidden />
                     Generate emails
                   </Button>
+                  <Button
+                    variant="outlined"
+                    size="sm"
+                    className="gap-2"
+                    onClick={() => setShowAddExpertModal(true)}
+                  >
+                    <UserPlus className="h-4 w-4" aria-hidden />
+                    Add expert
+                  </Button>
                 </div>
               </div>
               <div className="grid grid-cols-1 gap-4 sm:!grid-cols-2">
@@ -289,13 +301,29 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
               </div>
             </section>
           ) : tab === TAB_EXPERT_RESULTS ? (
-            <div className="rounded-lg border border-gray-200 bg-white p-6 text-center text-gray-600">
-              No experts found for this search.
+            <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>
+              <Button
+                variant="outlined"
+                size="sm"
+                className="gap-2"
+                onClick={() => setShowAddExpertModal(true)}
+              >
+                <UserPlus className="h-4 w-4" aria-hidden />
+                Add expert manually
+              </Button>
             </div>
           ) : null}
         </>
       )}
 
+      <AddExpertModal
+        isOpen={showAddExpertModal}
+        onClose={() => setShowAddExpertModal(false)}
+        onAdd={addExpert}
+        searchId={searchId}
+        onSuccess={refetch}
+      />
       <GenerateEmailModal
         isOpen={showGenerateModal}
         onClose={() => setShowGenerateModal(false)}
diff --git a/hooks/useExpertFinder.ts b/hooks/useExpertFinder.ts
index 3c2c0ad63..acd203b27 100644
--- a/hooks/useExpertFinder.ts
+++ b/hooks/useExpertFinder.ts
@@ -4,6 +4,7 @@ import { useState, useEffect, useCallback } from 'react';
 import { EXPERT_FINDER_LIST_PAGE_SIZE } from '@/app/expert-finder/lib/paginationParams';
 import {
   ExpertFinderService,
+  type AddExpertPayload,
   type CreateSavedTemplatePayload,
   type ExpertSearchCreatePayload,
   type PatchExpertPayload,
@@ -12,6 +13,7 @@ import {
 } from '@/services/expertFinder.service';
 import { extractApiErrorMessage } from '@/services/lib/serviceUtils';
 import type {
+  ExpertResult,
   ExpertSearchCreated,
   InvitedExperts,
   ExpertSearchResult,
@@ -215,6 +217,44 @@ export function usePatchExpert(): UsePatchExpertReturn {
   return [{ isLoading, error }, patchExpert];
 }
 
+// ── useAddExpert ──────────────────────────────────────────────────────────────
+
+interface UseAddExpertState {
+  isLoading: boolean;
+  error: string | null;
+}
+
+type AddExpertFn = (searchId: number | string, payload: AddExpertPayload) => Promise<ExpertResult>;
+type UseAddExpertReturn = [UseAddExpertState, AddExpertFn];
+
+/**
+ * Manually add an expert to an existing search.
+ */
+export function useAddExpert(): UseAddExpertReturn {
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const addExpert = useCallback(
+    async (searchId: number | string, payload: AddExpertPayload): Promise<ExpertResult> => {
+      setIsLoading(true);
+      setError(null);
+      try {
+        const result = await ExpertFinderService.addExpert(searchId, payload);
+        return result;
+      } catch (err: unknown) {
+        const message = extractApiErrorMessage(err, 'Failed to add expert');
+        setError(message);
+        throw err;
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    []
+  );
+
+  return [{ isLoading, error }, addExpert];
+}
+
 // ── useWorkByUnifiedDocumentId ───────────────────────────────────────────────
 
 interface UseWorkByUnifiedDocumentIdState {
diff --git a/services/expertFinder.service.ts b/services/expertFinder.service.ts
index e2ab96e72..7946ecf5e 100644
--- a/services/expertFinder.service.ts
+++ b/services/expertFinder.service.ts
@@ -3,6 +3,7 @@ import { ApiClient } from './client';
 import { PaperService } from './paper.service';
 import { PostService } from './post.service';
 import {
+  transformExpertResult,
   transformExpertSearch,
   transformExpertSearchCreateResponse,
   transformExpertSearchListItem,
@@ -10,6 +11,7 @@ import {
   transformSavedTemplate,
   transformInvitedExperts,
   type InvitedExperts,
+  type ExpertResult,
   type ExpertSearchCreated,
   type ExpertSearchResult,
   type ExpertSearchListItem,
@@ -142,6 +144,19 @@ export interface CreateDraftEmailPayload {
 
 export type UpdateGeneratedEmailPayload = Partial<CreateDraftEmailPayload>;
 
+export interface AddExpertPayload {
+  email: string;
+  honorific?: string;
+  first_name?: string;
+  middle_name?: string;
+  last_name?: string;
+  name_suffix?: string;
+  academic_title?: string;
+  affiliation?: string;
+  expertise?: string;
+  notes?: string;
+}
+
 export interface CreateSavedTemplatePayload {
   name: string;
   email_subject?: string;
@@ -186,6 +201,21 @@ export class ExpertFinderService {
     await ApiClient.patch<void>(`${this.BASE_PATH}/experts/${expertId}/`, payload);
   }
 
+  /**
+   * Manually add an expert to an existing search.
+   * POST /api/research_ai/expert-finder/searches/:searchId/experts/
+   */
+  static async addExpert(
+    searchId: number | string,
+    payload: AddExpertPayload
+  ): Promise<ExpertResult> {
+    const raw = await ApiClient.post<Record<string, unknown>>(
+      `${this.BASE_PATH}/searches/${searchId}/experts/`,
+      payload
+    );
+    return transformExpertResult(raw);
+  }
+
   /**
    * List the current user's expert searches with pagination.
    * GET /api/research_ai/expert-finder/searches/?limit=&offset=
diff --git a/types/expertFinder.ts b/types/expertFinder.ts
index 273cc528f..0aaa6b13c 100644
--- a/types/expertFinder.ts
+++ b/types/expertFinder.ts
@@ -137,7 +137,7 @@ function parseExpertId(raw: any): number | null {
   return Number.isInteger(n) && n >= 1 ? n : null;
 }
 
-function transformExpertResult(raw: any): ExpertResult {
+export function transformExpertResult(raw: any): ExpertResult {
   const sourcesRaw = Array.isArray(raw.sources) ? raw.sources : null;
   const sources = sourcesRaw
     ? sourcesRaw

From c7d8fe2f11f2d3063faa503b434c9c0dda9a22f0 Mon Sep 17 00:00:00 2001
From: Taki Koutsomitis <koutst@protonmail.com>
Date: Wed, 20 May 2026 12:25:19 -0400
Subject: [PATCH 2/6] Reuse edit modal

---
 .../[searchId]/components/AddExpertModal.tsx  | 195 -----------------
 .../[searchId]/components/ExpertEditModal.tsx | 196 ++++++++++++++----
 .../components/ExpertResultCard.tsx           |   1 +
 .../components/SearchDetailContent.tsx        |   5 +-
 4 files changed, 165 insertions(+), 232 deletions(-)
 delete mode 100644 app/expert-finder/library/[searchId]/components/AddExpertModal.tsx

diff --git a/app/expert-finder/library/[searchId]/components/AddExpertModal.tsx b/app/expert-finder/library/[searchId]/components/AddExpertModal.tsx
deleted file mode 100644
index 301f2592b..000000000
--- a/app/expert-finder/library/[searchId]/components/AddExpertModal.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-'use client';
-
-import { useState, useEffect } from 'react';
-import { BaseModal } from '@/components/ui/BaseModal';
-import { Button } from '@/components/ui/Button';
-import { Input } from '@/components/ui/form/Input';
-import { Textarea } from '@/components/ui/form/Textarea';
-import { LoadingButton } from '@/components/ui/LoadingButton';
-import type { AddExpertPayload } from '@/services/expertFinder.service';
-import { extractApiErrorMessage } from '@/services/lib/serviceUtils';
-
-export interface AddExpertModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onAdd: (searchId: string, payload: AddExpertPayload) => Promise<unknown>;
-  searchId: string;
-  onSuccess: () => Promise<void>;
-}
-
-function buildPayload(values: {
-  email: string;
-  honorific: string;
-  firstName: string;
-  middleName: string;
-  lastName: string;
-  nameSuffix: string;
-  academicTitle: string;
-  affiliation: string;
-  expertise: string;
-  notes: string;
-}): AddExpertPayload {
-  const t = (s: string) => s.trim();
-  const payload: AddExpertPayload = { email: t(values.email).toLowerCase() };
-
-  if (t(values.honorific)) payload.honorific = t(values.honorific);
-  if (t(values.firstName)) payload.first_name = t(values.firstName);
-  if (t(values.middleName)) payload.middle_name = t(values.middleName);
-  if (t(values.lastName)) payload.last_name = t(values.lastName);
-  if (t(values.nameSuffix)) payload.name_suffix = t(values.nameSuffix);
-  if (t(values.academicTitle)) payload.academic_title = t(values.academicTitle);
-  if (t(values.affiliation)) payload.affiliation = t(values.affiliation);
-  if (t(values.expertise)) payload.expertise = t(values.expertise);
-  if (t(values.notes)) payload.notes = t(values.notes);
-
-  return payload;
-}
-
-export function AddExpertModal({
-  isOpen,
-  onClose,
-  onAdd,
-  searchId,
-  onSuccess,
-}: AddExpertModalProps) {
-  const [email, setEmail] = useState('');
-  const [honorific, setHonorific] = useState('');
-  const [firstName, setFirstName] = useState('');
-  const [middleName, setMiddleName] = useState('');
-  const [lastName, setLastName] = useState('');
-  const [nameSuffix, setNameSuffix] = useState('');
-  const [academicTitle, setAcademicTitle] = useState('');
-  const [affiliation, setAffiliation] = useState('');
-  const [expertise, setExpertise] = useState('');
-  const [notes, setNotes] = useState('');
-  const [submitError, setSubmitError] = useState<string | null>(null);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  useEffect(() => {
-    if (!isOpen) return;
-    setEmail('');
-    setHonorific('');
-    setFirstName('');
-    setMiddleName('');
-    setLastName('');
-    setNameSuffix('');
-    setAcademicTitle('');
-    setAffiliation('');
-    setExpertise('');
-    setNotes('');
-    setSubmitError(null);
-  }, [isOpen]);
-
-  const handleSubmit = async () => {
-    const trimmedEmail = email.trim();
-    if (!trimmedEmail) {
-      setSubmitError('Email is required.');
-      return;
-    }
-
-    setSubmitError(null);
-    setIsSubmitting(true);
-    try {
-      const payload = buildPayload({
-        email,
-        honorific,
-        firstName,
-        middleName,
-        lastName,
-        nameSuffix,
-        academicTitle,
-        affiliation,
-        expertise,
-        notes,
-      });
-      await onAdd(searchId, payload);
-      await onSuccess();
-      onClose();
-    } catch (err) {
-      setSubmitError(extractApiErrorMessage(err, 'Failed to add expert'));
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  return (
-    <BaseModal
-      isOpen={isOpen}
-      onClose={onClose}
-      title="Add expert"
-      size="lg"
-      showCloseButton
-      padding="p-6"
-    >
-      <div className="space-y-4 max-h-[70vh] overflow-y-auto pr-1">
-        <Input
-          label="Email"
-          type="email"
-          required
-          value={email}
-          onChange={(e) => setEmail(e.target.value)}
-          placeholder="jane.doe@university.edu"
-        />
-        <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-          <Input
-            label="Honorific"
-            value={honorific}
-            onChange={(e) => setHonorific(e.target.value)}
-            placeholder="e.g. Dr, Prof, Mr, Ms"
-          />
-          <Input
-            label="First name"
-            value={firstName}
-            onChange={(e) => setFirstName(e.target.value)}
-          />
-          <Input
-            label="Middle name"
-            value={middleName}
-            onChange={(e) => setMiddleName(e.target.value)}
-          />
-          <Input label="Last name" value={lastName} onChange={(e) => setLastName(e.target.value)} />
-          <Input
-            label="Name suffix"
-            value={nameSuffix}
-            onChange={(e) => setNameSuffix(e.target.value)}
-            placeholder="e.g. Jr., Sr., III, IV"
-          />
-          <Input
-            label="Academic title"
-            value={academicTitle}
-            onChange={(e) => setAcademicTitle(e.target.value)}
-            placeholder="e.g. Associate Professor"
-          />
-        </div>
-        <Input
-          label="Affiliation"
-          value={affiliation}
-          onChange={(e) => setAffiliation(e.target.value)}
-          placeholder="e.g. MIT"
-        />
-        <Input
-          label="Expertise"
-          value={expertise}
-          onChange={(e) => setExpertise(e.target.value)}
-          placeholder="e.g. Quantum computing"
-        />
-        <Textarea label="Notes" value={notes} onChange={(e) => setNotes(e.target.value)} rows={2} />
-        {submitError ? <p className="text-sm text-red-600">{submitError}</p> : null}
-        <div className="flex justify-end gap-2 pt-2">
-          <Button type="button" variant="outlined" onClick={onClose} disabled={isSubmitting}>
-            Cancel
-          </Button>
-          <LoadingButton
-            type="button"
-            variant="default"
-            onClick={() => void handleSubmit()}
-            isLoading={isSubmitting}
-            loadingText="Adding..."
-          >
-            Add expert
-          </LoadingButton>
-        </div>
-      </div>
-    </BaseModal>
-  );
-}
diff --git a/app/expert-finder/library/[searchId]/components/ExpertEditModal.tsx b/app/expert-finder/library/[searchId]/components/ExpertEditModal.tsx
index e9d4a38fb..af0437047 100644
--- a/app/expert-finder/library/[searchId]/components/ExpertEditModal.tsx
+++ b/app/expert-finder/library/[searchId]/components/ExpertEditModal.tsx
@@ -4,20 +4,32 @@ import { useState, useEffect } from 'react';
 import { BaseModal } from '@/components/ui/BaseModal';
 import { Button } from '@/components/ui/Button';
 import { Input } from '@/components/ui/form/Input';
+import { Textarea } from '@/components/ui/form/Textarea';
 import { LoadingButton } from '@/components/ui/LoadingButton';
 import type { ExpertResult } from '@/types/expertFinder';
-import type { PatchExpertPayload } from '@/services/expertFinder.service';
+import type { AddExpertPayload, PatchExpertPayload } from '@/services/expertFinder.service';
 import { extractApiErrorMessage } from '@/services/lib/serviceUtils';
 
-export interface ExpertEditModalProps {
-  isOpen: boolean;
-  onClose: () => void;
+interface EditModeProps {
+  mode: 'edit';
   expert: ExpertResult;
   expertId: number;
   onSave: (expertId: number, payload: PatchExpertPayload) => Promise<void>;
 }
 
-function buildPayload(values: {
+interface AddModeProps {
+  mode: 'add';
+  searchId: string;
+  onAdd: (searchId: string, payload: AddExpertPayload) => Promise<unknown>;
+  onSuccess: () => Promise<void>;
+}
+
+export type ExpertEditModalProps = {
+  isOpen: boolean;
+  onClose: () => void;
+} & (EditModeProps | AddModeProps);
+
+function buildEditPayload(values: {
   honorific: string;
   firstName: string;
   middleName: string;
@@ -36,66 +48,150 @@ function buildPayload(values: {
   return payload;
 }
 
-export function ExpertEditModal({
-  isOpen,
-  onClose,
-  expert,
-  expertId,
-  onSave,
-}: ExpertEditModalProps) {
+function buildAddPayload(values: {
+  email: string;
+  honorific: string;
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  nameSuffix: string;
+  academicTitle: string;
+  affiliation: string;
+  expertise: string;
+  notes: string;
+}): AddExpertPayload {
+  const t = (s: string) => s.trim();
+  const payload: AddExpertPayload = { email: t(values.email).toLowerCase() };
+
+  if (t(values.honorific)) payload.honorific = t(values.honorific);
+  if (t(values.firstName)) payload.first_name = t(values.firstName);
+  if (t(values.middleName)) payload.middle_name = t(values.middleName);
+  if (t(values.lastName)) payload.last_name = t(values.lastName);
+  if (t(values.nameSuffix)) payload.name_suffix = t(values.nameSuffix);
+  if (t(values.academicTitle)) payload.academic_title = t(values.academicTitle);
+  if (t(values.affiliation)) payload.affiliation = t(values.affiliation);
+  if (t(values.expertise)) payload.expertise = t(values.expertise);
+  if (t(values.notes)) payload.notes = t(values.notes);
+
+  return payload;
+}
+
+export function ExpertEditModal(props: ExpertEditModalProps) {
+  const { isOpen, onClose } = props;
+
+  const [email, setEmail] = useState('');
   const [honorific, setHonorific] = useState('');
   const [firstName, setFirstName] = useState('');
   const [middleName, setMiddleName] = useState('');
   const [lastName, setLastName] = useState('');
   const [nameSuffix, setNameSuffix] = useState('');
+  const [academicTitle, setAcademicTitle] = useState('');
+  const [affiliation, setAffiliation] = useState('');
+  const [expertise, setExpertise] = useState('');
+  const [notes, setNotes] = useState('');
   const [submitError, setSubmitError] = useState<string | null>(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   useEffect(() => {
     if (!isOpen) return;
-    setHonorific(expert.honorific);
-    setFirstName(expert.firstName);
-    setMiddleName(expert.middleName);
-    setLastName(expert.lastName);
-    setNameSuffix(expert.nameSuffix);
     setSubmitError(null);
-  }, [isOpen, expert]);
+    if (props.mode === 'edit') {
+      setHonorific(props.expert.honorific);
+      setFirstName(props.expert.firstName);
+      setMiddleName(props.expert.middleName);
+      setLastName(props.expert.lastName);
+      setNameSuffix(props.expert.nameSuffix);
+    } else {
+      setEmail('');
+      setHonorific('');
+      setFirstName('');
+      setMiddleName('');
+      setLastName('');
+      setNameSuffix('');
+      setAcademicTitle('');
+      setAffiliation('');
+      setExpertise('');
+      setNotes('');
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isOpen, props.mode]);
 
   const handleSubmit = async () => {
     setSubmitError(null);
     setIsSubmitting(true);
     try {
-      const payload = buildPayload({
-        honorific,
-        firstName,
-        middleName,
-        lastName,
-        nameSuffix,
-      });
-      if (Object.keys(payload).length === 0) {
-        setSubmitError('Change at least one field to save.');
-        setIsSubmitting(false);
-        return;
+      if (props.mode === 'edit') {
+        const payload = buildEditPayload({
+          honorific,
+          firstName,
+          middleName,
+          lastName,
+          nameSuffix,
+        });
+        if (Object.keys(payload).length === 0) {
+          setSubmitError('Change at least one field to save.');
+          setIsSubmitting(false);
+          return;
+        }
+        await props.onSave(props.expertId, payload);
+        onClose();
+      } else {
+        const trimmedEmail = email.trim();
+        if (!trimmedEmail) {
+          setSubmitError('Email is required.');
+          setIsSubmitting(false);
+          return;
+        }
+        const payload = buildAddPayload({
+          email,
+          honorific,
+          firstName,
+          middleName,
+          lastName,
+          nameSuffix,
+          academicTitle,
+          affiliation,
+          expertise,
+          notes,
+        });
+        await props.onAdd(props.searchId, payload);
+        await props.onSuccess();
+        onClose();
       }
-      await onSave(expertId, payload);
-      onClose();
     } catch (err) {
-      setSubmitError(extractApiErrorMessage(err, 'Failed to update expert'));
+      setSubmitError(
+        extractApiErrorMessage(
+          err,
+          props.mode === 'edit' ? 'Failed to update expert' : 'Failed to add expert'
+        )
+      );
     } finally {
       setIsSubmitting(false);
     }
   };
 
+  const isAdd = props.mode === 'add';
+
   return (
     <BaseModal
       isOpen={isOpen}
       onClose={onClose}
-      title="Edit expert name"
+      title={isAdd ? 'Add expert' : 'Edit expert name'}
       size="lg"
       showCloseButton
       padding="p-6"
     >
       <div className="space-y-4 max-h-[70vh] overflow-y-auto pr-1">
+        {isAdd && (
+          <Input
+            label="Email"
+            type="email"
+            required
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+            placeholder="jane.doe@university.edu"
+          />
+        )}
         <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
           <Input
             label="Honorific"
@@ -120,7 +216,37 @@ export function ExpertEditModal({
             onChange={(e) => setNameSuffix(e.target.value)}
             placeholder="e.g. Jr., Sr., III, IV"
           />
+          {isAdd && (
+            <Input
+              label="Academic title"
+              value={academicTitle}
+              onChange={(e) => setAcademicTitle(e.target.value)}
+              placeholder="e.g. Associate Professor"
+            />
+          )}
         </div>
+        {isAdd && (
+          <>
+            <Input
+              label="Affiliation"
+              value={affiliation}
+              onChange={(e) => setAffiliation(e.target.value)}
+              placeholder="e.g. MIT"
+            />
+            <Input
+              label="Expertise"
+              value={expertise}
+              onChange={(e) => setExpertise(e.target.value)}
+              placeholder="e.g. Quantum computing"
+            />
+            <Textarea
+              label="Notes"
+              value={notes}
+              onChange={(e) => setNotes(e.target.value)}
+              rows={2}
+            />
+          </>
+        )}
         {submitError ? <p className="text-sm text-red-600">{submitError}</p> : null}
         <div className="flex justify-end gap-2 pt-2">
           <Button type="button" variant="outlined" onClick={onClose} disabled={isSubmitting}>
@@ -131,9 +257,9 @@ export function ExpertEditModal({
             variant="default"
             onClick={() => void handleSubmit()}
             isLoading={isSubmitting}
-            loadingText="Saving…"
+            loadingText={isAdd ? 'Adding…' : 'Saving…'}
           >
-            Save
+            {isAdd ? 'Add expert' : 'Save'}
           </LoadingButton>
         </div>
       </div>
diff --git a/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx b/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
index 933af26d5..01cd9a7af 100644
--- a/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
+++ b/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
@@ -246,6 +246,7 @@ export function ExpertResultCard({
 
       {canEditContact && expert.expertId != null && onSaveExpert ? (
         <ExpertEditModal
+          mode="edit"
           isOpen={editOpen}
           onClose={() => setEditOpen(false)}
           expert={expert}
diff --git a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
index 84dbc0132..178640cca 100644
--- a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
+++ b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
@@ -15,7 +15,7 @@ import { SearchDetailHeader } from './SearchDetailHeader';
 import { ExpertResultCard } from './ExpertResultCard';
 import { GenerateEmailModal, type GenerateEmailConfirmPayload } from './GenerateEmailModal';
 import { GenerateEmailProgressModal } from './GenerateEmailProgressModal';
-import { AddExpertModal } from './AddExpertModal';
+import { ExpertEditModal } from './ExpertEditModal';
 import { GeneratedEmailsList } from '@/app/expert-finder/library/[searchId]/outreach/components/GeneratedEmailsList';
 import type { ExpertResult } from '@/types/expertFinder';
 
@@ -317,7 +317,8 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
         </>
       )}
 
-      <AddExpertModal
+      <ExpertEditModal
+        mode="add"
         isOpen={showAddExpertModal}
         onClose={() => setShowAddExpertModal(false)}
         onAdd={addExpert}

From ca5c9e7ca4c0b4af9a70237fa9d15bbc4bee55f3 Mon Sep 17 00:00:00 2001
From: Taki Koutsomitis <koutst@protonmail.com>
Date: Tue, 26 May 2026 11:28:01 -0400
Subject: [PATCH 3/6] Rename modal

---
 .../components/{ExpertEditModal.tsx => ExpertFormModal.tsx}   | 4 ++--
 .../library/[searchId]/components/ExpertResultCard.tsx        | 4 ++--
 .../library/[searchId]/components/SearchDetailContent.tsx     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename app/expert-finder/library/[searchId]/components/{ExpertEditModal.tsx => ExpertFormModal.tsx} (98%)

diff --git a/app/expert-finder/library/[searchId]/components/ExpertEditModal.tsx b/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
similarity index 98%
rename from app/expert-finder/library/[searchId]/components/ExpertEditModal.tsx
rename to app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
index af0437047..4c2d5589f 100644
--- a/app/expert-finder/library/[searchId]/components/ExpertEditModal.tsx
+++ b/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
@@ -24,7 +24,7 @@ interface AddModeProps {
   onSuccess: () => Promise<void>;
 }
 
-export type ExpertEditModalProps = {
+export type ExpertFormModalProps = {
   isOpen: boolean;
   onClose: () => void;
 } & (EditModeProps | AddModeProps);
@@ -76,7 +76,7 @@ function buildAddPayload(values: {
   return payload;
 }
 
-export function ExpertEditModal(props: ExpertEditModalProps) {
+export function ExpertFormModal(props: ExpertFormModalProps) {
   const { isOpen, onClose } = props;
 
   const [email, setEmail] = useState('');
diff --git a/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx b/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
index 01cd9a7af..f0b83c08c 100644
--- a/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
+++ b/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
@@ -10,7 +10,7 @@ import { cn } from '@/utils/styles';
 import { formatTimestamp } from '@/utils/date';
 import type { ExpertResult } from '@/types/expertFinder';
 import type { PatchExpertPayload } from '@/services/expertFinder.service';
-import { ExpertEditModal } from './ExpertEditModal';
+import { ExpertFormModal } from './ExpertFormModal';
 
 interface ExpertResultCardProps {
   expert: ExpertResult;
@@ -245,7 +245,7 @@ export function ExpertResultCard({
       </div>
 
       {canEditContact && expert.expertId != null && onSaveExpert ? (
-        <ExpertEditModal
+        <ExpertFormModal
           mode="edit"
           isOpen={editOpen}
           onClose={() => setEditOpen(false)}
diff --git a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
index 178640cca..f0e7d9254 100644
--- a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
+++ b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
@@ -15,7 +15,7 @@ import { SearchDetailHeader } from './SearchDetailHeader';
 import { ExpertResultCard } from './ExpertResultCard';
 import { GenerateEmailModal, type GenerateEmailConfirmPayload } from './GenerateEmailModal';
 import { GenerateEmailProgressModal } from './GenerateEmailProgressModal';
-import { ExpertEditModal } from './ExpertEditModal';
+import { ExpertFormModal } from './ExpertFormModal';
 import { GeneratedEmailsList } from '@/app/expert-finder/library/[searchId]/outreach/components/GeneratedEmailsList';
 import type { ExpertResult } from '@/types/expertFinder';
 
@@ -317,7 +317,7 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
         </>
       )}
 
-      <ExpertEditModal
+      <ExpertFormModal
         mode="add"
         isOpen={showAddExpertModal}
         onClose={() => setShowAddExpertModal(false)}

From bf84d785b4fbaaee06a9b27760878156a0e5dbbc Mon Sep 17 00:00:00 2001
From: Taki Koutsomitis <koutst@protonmail.com>
Date: Tue, 26 May 2026 11:33:11 -0400
Subject: [PATCH 4/6] Same input props across modes

---
 .../[searchId]/components/ExpertFormModal.tsx | 90 +++++++++----------
 .../components/ExpertResultCard.tsx           | 16 ++--
 .../components/SearchDetailContent.tsx        | 18 +---
 3 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx b/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
index 4c2d5589f..dc589fa17 100644
--- a/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
+++ b/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
@@ -9,26 +9,16 @@ import { LoadingButton } from '@/components/ui/LoadingButton';
 import type { ExpertResult } from '@/types/expertFinder';
 import type { AddExpertPayload, PatchExpertPayload } from '@/services/expertFinder.service';
 import { extractApiErrorMessage } from '@/services/lib/serviceUtils';
+import { usePatchExpert, useAddExpert } from '@/hooks/useExpertFinder';
 
-interface EditModeProps {
-  mode: 'edit';
-  expert: ExpertResult;
-  expertId: number;
-  onSave: (expertId: number, payload: PatchExpertPayload) => Promise<void>;
-}
-
-interface AddModeProps {
-  mode: 'add';
+export interface ExpertFormModalProps {
+  isOpen: boolean;
+  onClose: () => void;
   searchId: string;
-  onAdd: (searchId: string, payload: AddExpertPayload) => Promise<unknown>;
+  expert?: ExpertResult;
   onSuccess: () => Promise<void>;
 }
 
-export type ExpertFormModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
-} & (EditModeProps | AddModeProps);
-
 function buildEditPayload(values: {
   honorific: string;
   firstName: string;
@@ -76,8 +66,16 @@ function buildAddPayload(values: {
   return payload;
 }
 
-export function ExpertFormModal(props: ExpertFormModalProps) {
-  const { isOpen, onClose } = props;
+export function ExpertFormModal({
+  isOpen,
+  onClose,
+  searchId,
+  expert,
+  onSuccess,
+}: ExpertFormModalProps) {
+  const [, patchExpert] = usePatchExpert();
+  const [, addExpert] = useAddExpert();
+  const isAdd = expert == null;
 
   const [email, setEmail] = useState('');
   const [honorific, setHonorific] = useState('');
@@ -95,12 +93,12 @@ export function ExpertFormModal(props: ExpertFormModalProps) {
   useEffect(() => {
     if (!isOpen) return;
     setSubmitError(null);
-    if (props.mode === 'edit') {
-      setHonorific(props.expert.honorific);
-      setFirstName(props.expert.firstName);
-      setMiddleName(props.expert.middleName);
-      setLastName(props.expert.lastName);
-      setNameSuffix(props.expert.nameSuffix);
+    if (expert != null) {
+      setHonorific(expert.honorific);
+      setFirstName(expert.firstName);
+      setMiddleName(expert.middleName);
+      setLastName(expert.lastName);
+      setNameSuffix(expert.nameSuffix);
     } else {
       setEmail('');
       setHonorific('');
@@ -114,13 +112,13 @@ export function ExpertFormModal(props: ExpertFormModalProps) {
       setNotes('');
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isOpen, props.mode]);
+  }, [isOpen, isAdd]);
 
   const handleSubmit = async () => {
     setSubmitError(null);
     setIsSubmitting(true);
     try {
-      if (props.mode === 'edit') {
+      if (expert != null) {
         const payload = buildEditPayload({
           honorific,
           firstName,
@@ -133,8 +131,7 @@ export function ExpertFormModal(props: ExpertFormModalProps) {
           setIsSubmitting(false);
           return;
         }
-        await props.onSave(props.expertId, payload);
-        onClose();
+        await patchExpert(expert.expertId!, payload);
       } else {
         const trimmedEmail = email.trim();
         if (!trimmedEmail) {
@@ -142,36 +139,33 @@ export function ExpertFormModal(props: ExpertFormModalProps) {
           setIsSubmitting(false);
           return;
         }
-        const payload = buildAddPayload({
-          email,
-          honorific,
-          firstName,
-          middleName,
-          lastName,
-          nameSuffix,
-          academicTitle,
-          affiliation,
-          expertise,
-          notes,
-        });
-        await props.onAdd(props.searchId, payload);
-        await props.onSuccess();
-        onClose();
+        await addExpert(
+          searchId,
+          buildAddPayload({
+            email,
+            honorific,
+            firstName,
+            middleName,
+            lastName,
+            nameSuffix,
+            academicTitle,
+            affiliation,
+            expertise,
+            notes,
+          })
+        );
       }
+      await onSuccess();
+      onClose();
     } catch (err) {
       setSubmitError(
-        extractApiErrorMessage(
-          err,
-          props.mode === 'edit' ? 'Failed to update expert' : 'Failed to add expert'
-        )
+        extractApiErrorMessage(err, isAdd ? 'Failed to add expert' : 'Failed to update expert')
       );
     } finally {
       setIsSubmitting(false);
     }
   };
 
-  const isAdd = props.mode === 'add';
-
   return (
     <BaseModal
       isOpen={isOpen}
diff --git a/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx b/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
index f0b83c08c..7067b9329 100644
--- a/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
+++ b/app/expert-finder/library/[searchId]/components/ExpertResultCard.tsx
@@ -9,16 +9,16 @@ import { Tooltip } from '@/components/ui/Tooltip';
 import { cn } from '@/utils/styles';
 import { formatTimestamp } from '@/utils/date';
 import type { ExpertResult } from '@/types/expertFinder';
-import type { PatchExpertPayload } from '@/services/expertFinder.service';
 import { ExpertFormModal } from './ExpertFormModal';
 
 interface ExpertResultCardProps {
   expert: ExpertResult;
   index: number;
+  searchId: string;
   selected?: boolean;
   onToggleSelect?: (index: number) => void;
   onGenerateEmail?: (expert: ExpertResult) => void;
-  onSaveExpert?: (expertId: number, payload: PatchExpertPayload) => Promise<void>;
+  onSuccess?: () => Promise<void>;
 }
 
 function empty(value: string | undefined): string {
@@ -31,14 +31,15 @@ const NOTES_READ_MORE_MIN_LENGTH = 25;
 export function ExpertResultCard({
   expert,
   index,
+  searchId,
   selected,
   onToggleSelect,
   onGenerateEmail,
-  onSaveExpert,
+  onSuccess,
 }: ExpertResultCardProps) {
   const [editOpen, setEditOpen] = useState(false);
   const name = empty(expert.name);
-  const canEditContact = expert.expertId != null && Boolean(onSaveExpert);
+  const canEditContact = expert.expertId != null && Boolean(onSuccess);
   const title = empty(expert.title);
   const affiliation = empty(expert.affiliation);
   const expertiseStr = empty(expert.expertise);
@@ -244,14 +245,13 @@ export function ExpertResultCard({
         )}
       </div>
 
-      {canEditContact && expert.expertId != null && onSaveExpert ? (
+      {canEditContact && onSuccess ? (
         <ExpertFormModal
-          mode="edit"
           isOpen={editOpen}
           onClose={() => setEditOpen(false)}
+          searchId={searchId}
           expert={expert}
-          expertId={expert.expertId}
-          onSave={onSaveExpert}
+          onSuccess={onSuccess}
         />
       ) : null}
     </article>
diff --git a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
index f0e7d9254..90d81a9ed 100644
--- a/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
+++ b/app/expert-finder/library/[searchId]/components/SearchDetailContent.tsx
@@ -9,8 +9,7 @@ import { Alert } from '@/components/ui/Alert';
 import { Breadcrumbs } from '@/components/ui/Breadcrumbs';
 import { Button } from '@/components/ui/Button';
 import { Tabs } from '@/components/ui/Tabs';
-import { useExpertSearchDetail, usePatchExpert, useAddExpert } from '@/hooks/useExpertFinder';
-import type { PatchExpertPayload } from '@/services/expertFinder.service';
+import { useExpertSearchDetail } from '@/hooks/useExpertFinder';
 import { SearchDetailHeader } from './SearchDetailHeader';
 import { ExpertResultCard } from './ExpertResultCard';
 import { GenerateEmailModal, type GenerateEmailConfirmPayload } from './GenerateEmailModal';
@@ -29,18 +28,8 @@ 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 [, patchExpert] = usePatchExpert();
-  const [, addExpert] = useAddExpert();
   const [showAddExpertModal, setShowAddExpertModal] = useState(false);
 
-  const handleSaveExpert = useCallback(
-    async (expertId: number, payload: PatchExpertPayload) => {
-      await patchExpert(expertId, payload);
-      await refetch();
-    },
-    [patchExpert, refetch]
-  );
-
   const [selectedIndices, setSelectedIndices] = useState<Set<number>>(new Set());
   const [showGenerateModal, setShowGenerateModal] = useState(false);
   const [showProgressModal, setShowProgressModal] = useState(false);
@@ -295,7 +284,8 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
                     selected={selectedIndices.has(index)}
                     onToggleSelect={toggleSelection}
                     onGenerateEmail={(expert) => openGenerateForExperts([expert])}
-                    onSaveExpert={handleSaveExpert}
+                    searchId={searchId}
+                    onSuccess={refetch}
                   />
                 ))}
               </div>
@@ -318,10 +308,8 @@ export function SearchDetailContent({ searchId }: SearchDetailContentProps) {
       )}
 
       <ExpertFormModal
-        mode="add"
         isOpen={showAddExpertModal}
         onClose={() => setShowAddExpertModal(false)}
-        onAdd={addExpert}
         searchId={searchId}
         onSuccess={refetch}
       />

From a035d40211e159c82821395f20089ff0f6961353 Mon Sep 17 00:00:00 2001
From: Taki Koutsomitis <koutst@protonmail.com>
Date: Tue, 26 May 2026 11:39:29 -0400
Subject: [PATCH 5/6] Put submit flow inside modal

---
 .../[searchId]/components/ExpertFormModal.tsx       | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx b/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
index dc589fa17..67fb21342 100644
--- a/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
+++ b/app/expert-finder/library/[searchId]/components/ExpertFormModal.tsx
@@ -74,7 +74,7 @@ export function ExpertFormModal({
   onSuccess,
 }: ExpertFormModalProps) {
   const [, patchExpert] = usePatchExpert();
-  const [, addExpert] = useAddExpert();
+  const [, createExpert] = useAddExpert();
   const isAdd = expert == null;
 
   const [email, setEmail] = useState('');
@@ -128,18 +128,15 @@ export function ExpertFormModal({
         });
         if (Object.keys(payload).length === 0) {
           setSubmitError('Change at least one field to save.');
-          setIsSubmitting(false);
           return;
         }
         await patchExpert(expert.expertId!, payload);
       } else {
-        const trimmedEmail = email.trim();
-        if (!trimmedEmail) {
+        if (!email.trim()) {
           setSubmitError('Email is required.');
-          setIsSubmitting(false);
           return;
         }
-        await addExpert(
+        await createExpert(
           searchId,
           buildAddPayload({
             email,
@@ -158,9 +155,7 @@ export function ExpertFormModal({
       await onSuccess();
       onClose();
     } catch (err) {
-      setSubmitError(
-        extractApiErrorMessage(err, isAdd ? 'Failed to add expert' : 'Failed to update expert')
-      );
+      setSubmitError(extractApiErrorMessage(err, 'Failed to save expert'));
     } finally {
       setIsSubmitting(false);
     }

From 0cecb4ca1beacafa42aa298a98ebf29ca1ab58ae Mon Sep 17 00:00:00 2001
From: Taki Koutsomitis <koutst@protonmail.com>
Date: Tue, 26 May 2026 12:26:47 -0400
Subject: [PATCH 6/6] Add visibility controls to grant and preregistration
 publishing forms

---
 .../GrantApplicationVisibilitySection.tsx     | 41 +++++++++++++++++++
 .../PreregistrationPrivacySection.tsx         | 37 +++++++++++++++++
 components/Notebook/PublishingForm/index.tsx  | 17 ++++++++
 components/Notebook/PublishingForm/schema.ts  |  2 +
 hooks/useDocument.ts                          | 10 +++++
 types/grant.ts                                |  4 ++
 6 files changed, 111 insertions(+)
 create mode 100644 components/Notebook/PublishingForm/components/GrantApplicationVisibilitySection.tsx
 create mode 100644 components/Notebook/PublishingForm/components/PreregistrationPrivacySection.tsx

diff --git a/components/Notebook/PublishingForm/components/GrantApplicationVisibilitySection.tsx b/components/Notebook/PublishingForm/components/GrantApplicationVisibilitySection.tsx
new file mode 100644
index 000000000..3cdd2515e
--- /dev/null
+++ b/components/Notebook/PublishingForm/components/GrantApplicationVisibilitySection.tsx
@@ -0,0 +1,41 @@
+import { useFormContext } from 'react-hook-form';
+import { Eye } from 'lucide-react';
+import { RadioGroup } from '@/components/ui/form/RadioGroup';
+import { SectionHeader } from './SectionHeader';
+
+const OPTIONS = [
+  {
+    value: 'OPTIONAL',
+    label: 'Applicant chooses',
+    description: 'Applicants can submit either a public or a private preregistration.',
+  },
+  {
+    value: 'PUBLIC',
+    label: 'Public only',
+    description: 'Applications must be public preregistrations visible to everyone.',
+  },
+  {
+    value: 'PRIVATE',
+    label: 'Private only',
+    description: 'Applications must be private preregistrations shared only with reviewers.',
+  },
+];
+
+export function GrantApplicationVisibilitySection() {
+  const { watch, setValue } = useFormContext();
+  const value = watch('applicationVisibility') ?? 'OPTIONAL';
+
+  return (
+    <div className="py-3 px-6">
+      <SectionHeader icon={Eye}>Application Visibility</SectionHeader>
+      <div className="mt-2">
+        <RadioGroup
+          options={OPTIONS}
+          value={value}
+          onChange={(next) => setValue('applicationVisibility', next, { shouldValidate: true })}
+          helperText="Controls whether applicants must submit public or private preregistrations."
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/components/Notebook/PublishingForm/components/PreregistrationPrivacySection.tsx b/components/Notebook/PublishingForm/components/PreregistrationPrivacySection.tsx
new file mode 100644
index 000000000..8ed09186f
--- /dev/null
+++ b/components/Notebook/PublishingForm/components/PreregistrationPrivacySection.tsx
@@ -0,0 +1,37 @@
+import { useFormContext } from 'react-hook-form';
+import { Lock } from 'lucide-react';
+import { RadioGroup } from '@/components/ui/form/RadioGroup';
+import { SectionHeader } from './SectionHeader';
+
+const OPTIONS = [
+  {
+    value: 'public',
+    label: 'Public',
+    description: 'Anyone on ResearchHub can view this preregistration.',
+  },
+  {
+    value: 'private',
+    label: 'Private',
+    description: 'Only you and reviewers you grant access to can view it.',
+  },
+];
+
+export function PreregistrationPrivacySection() {
+  const { watch, setValue } = useFormContext();
+  const isPublic = watch('isPublic');
+  const value = isPublic === false ? 'private' : 'public';
+
+  return (
+    <div className="py-3 px-6">
+      <SectionHeader icon={Lock}>Visibility</SectionHeader>
+      <div className="mt-2">
+        <RadioGroup
+          options={OPTIONS}
+          value={value}
+          onChange={(next) => setValue('isPublic', next === 'public', { shouldValidate: true })}
+          helperText="Visibility can only be set when the preregistration is created."
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/components/Notebook/PublishingForm/index.tsx b/components/Notebook/PublishingForm/index.tsx
index e6d4ad2a9..81033da60 100644
--- a/components/Notebook/PublishingForm/index.tsx
+++ b/components/Notebook/PublishingForm/index.tsx
@@ -12,6 +12,8 @@ import { JournalSection } from './components/JournalSection';
 import { GrantDescriptionSection } from './components/GrantDescriptionSection';
 import { GrantOrganizationSection } from './components/GrantOrganizationSection';
 import { GrantFundingAmountSection } from './components/GrantFundingAmountSection';
+import { GrantApplicationVisibilitySection } from './components/GrantApplicationVisibilitySection';
+import { PreregistrationPrivacySection } from './components/PreregistrationPrivacySection';
 import { Button } from '@/components/ui/Button';
 import { cn } from '@/utils/styles';
 import { buildWorkUrl } from '@/utils/url';
@@ -105,6 +107,8 @@ const FORM_DEFAULTS = {
   shortDescription: '',
   organization: '',
   applicationDeadline: null,
+  applicationVisibility: 'OPTIONAL' as const,
+  isPublic: true,
 };
 
 const mapContentTypeToArticleType = (contentType: string): PublishingFormData['articleType'] => {
@@ -139,6 +143,9 @@ const populateGrantFields = (grant: any, setValue: (name: any, value: any) => vo
       }))
     );
   }
+  if (grant.applicationVisibility) {
+    setValue('applicationVisibility', grant.applicationVisibility);
+  }
 };
 
 const populateFromPost = (post: any, setValue: (name: any, value: any) => void) => {
@@ -470,6 +477,12 @@ export function PublishingForm({
               ? new Date('2029-12-31')
               : formData.applicationDeadline,
           grantId,
+          applicationVisibility:
+            formData.articleType === 'grant' ? formData.applicationVisibility : undefined,
+          isPublic:
+            formData.articleType === 'preregistration' && !formData.workId
+              ? formData.isPublic
+              : undefined,
         },
         formData.workId
       );
@@ -548,7 +561,11 @@ export function PublishingForm({
               </div>
             )}
             {articleType === 'grant' && <GrantFundingAmountSection />}
+            {articleType === 'grant' && <GrantApplicationVisibilitySection />}
             {articleType === 'preregistration' && <FundingSection note={note} />}
+            {articleType === 'preregistration' && !methods.watch('workId') && (
+              <PreregistrationPrivacySection />
+            )}
             {FEATURE_FLAG_RESEARCH_COIN &&
               articleType !== 'preregistration' &&
               articleType !== 'grant' && (
diff --git a/components/Notebook/PublishingForm/schema.ts b/components/Notebook/PublishingForm/schema.ts
index eed4abe18..51a70bd06 100644
--- a/components/Notebook/PublishingForm/schema.ts
+++ b/components/Notebook/PublishingForm/schema.ts
@@ -65,6 +65,8 @@ export const publishingFormSchema = z
     shortDescription: z.string().optional(),
     organization: z.string().optional(),
     applicationDeadline: z.date().nullable().optional(),
+    applicationVisibility: z.enum(['OPTIONAL', 'PRIVATE', 'PUBLIC'] as const).optional(),
+    isPublic: z.boolean().optional(),
   })
   .superRefine((data, ctx) => {
     if (data.topics.length === 0) {
diff --git a/hooks/useDocument.ts b/hooks/useDocument.ts
index d94e2b12f..0cac26a65 100644
--- a/hooks/useDocument.ts
+++ b/hooks/useDocument.ts
@@ -34,6 +34,10 @@ export interface PreregistrationPostParams {
   organization?: string | null;
   description?: string | null;
   contacts?: number[];
+  applicationVisibility?: 'OPTIONAL' | 'PRIVATE' | 'PUBLIC';
+
+  // Preregistration specific (create-only — server marks it read-only on update)
+  isPublic?: boolean;
 
   // RFP attachment
   grantId?: string | null;
@@ -98,6 +102,9 @@ export const useUpsertPost = (): UseUpsertPostReturn => {
         if (postParams.grantId) {
           payload.grant_id = postParams.grantId;
         }
+        if (typeof postParams.isPublic === 'boolean') {
+          payload.is_public = postParams.isPublic;
+        }
       }
 
       if (postParams.articleType === 'GRANT') {
@@ -107,6 +114,9 @@ export const useUpsertPost = (): UseUpsertPostReturn => {
         payload.grant_description = postParams.description;
         payload.grant_end_date = postParams.applicationDeadline?.toISOString() || null;
         payload.grant_contacts = postParams.contacts;
+        if (postParams.applicationVisibility) {
+          payload.grant_application_visibility = postParams.applicationVisibility;
+        }
       }
 
       const response = (await PostService.upsert(payload)) as TransformedWork;
diff --git a/types/grant.ts b/types/grant.ts
index ce569e760..8840d1ad0 100644
--- a/types/grant.ts
+++ b/types/grant.ts
@@ -5,6 +5,8 @@ import { Contact, transformContact } from './note';
 
 export type GrantStatus = 'OPEN' | 'CLOSED' | 'PENDING' | 'DECLINED' | 'COMPLETED';
 
+export type GrantApplicationVisibility = 'OPTIONAL' | 'PRIVATE' | 'PUBLIC';
+
 export const GRANT_IMAGE_FALLBACK_GRADIENT =
   'radial-gradient(ellipse at 25% 35%, rgba(251,146,60,0.55) 0%, transparent 50%), ' +
   'linear-gradient(135deg, #1a1a2e 0%, #0f3460 100%)';
@@ -55,6 +57,7 @@ export interface Grant {
   startDate: string;
   endDate: string;
   contacts: Contact[];
+  applicationVisibility: GrantApplicationVisibility;
   applicants?: AuthorProfile[];
   reviewedBy?: {
     id: ID;
@@ -89,6 +92,7 @@ export const transformGrant = createTransformer<any, Grant>((raw) => ({
   contacts: Array.isArray(raw.contacts)
     ? raw.contacts.map((contact: any) => transformContact(contact))
     : undefined,
+  applicationVisibility: (raw.application_visibility as GrantApplicationVisibility) ?? 'OPTIONAL',
   applicants: Array.isArray(raw.applications)
     ? raw.applications.map((application: any) => transformAuthorProfile(application.applicant))
     : undefined,