Fix duplicate companies: enforce unique names + searchable company picker

[leerob]

Summary

Companies were being duplicated heavily (e.g. 7 separate "Contentful" rows, ~260 duplicate rows in total) because company creation only de-duped on a freshly-minted client-side id while a BEFORE INSERT trigger silently uniquified slugs (contentful-1, contentful-2, …). This PR fixes the root cause and makes existing companies pickable so users don't need to re-create them.

Prevent duplicate company records

• New migration supabase/migrations/20260526_companies_unique_name.sql: normalizes existing names, adds a generated name_key column, and a case-insensitive unique index so duplicates are rejected at the DB level even under concurrent/double submits.
• upsert-company action: treats a request as an edit only when the row already exists, and reuses the existing company on a name conflict (idempotent) instead of creating a duplicate.
• Company form: generates the id once per mount so it stops changing on every render (which also broke the logo upload path).

Searchable company picker

• Replaces the owner-only company dropdown with a searchable combobox (shadcn Command + Popover, adds cmdk).
• Searches across all companies (RLS allows public read), with the user's own companies listed first and "Add company" kept as the fallback.
• This closes the gap the unique constraint would otherwise create: if a colleague already submitted the company, you can now find and select it instead of being blocked.

Test plan

• Submitting the same company name twice (incl. rapid double-click) resolves to one company instead of duplicates.
• Editing an existing company still works and preserves its slug.
• In the MCP form, searching the company picker surfaces companies created by other users; selecting one attaches it.
• "Add company" for a brand-new name creates it; for an existing name it reuses the existing record.

Notes for reviewers

• The migration and a one-time cleanup of the 260 pre-existing duplicate rows were already applied to the production DB. The cleanup is reversible via the companies_dedup_backup_20260526 table (each row records the canonical id it was merged into).
• OG-image/rate-limit changes that previously shared a branch with this work are not included here — those landed separately in main via Fix OG image 500s and stop install rate limits logging as errors #398. This branch is company-changes only.

Made with Cursor

---

Note

Low Risk
UI-only loading state plus broader read queries on public company data; no auth or write-path changes in this diff.

Overview
Improves the companies directory search UX and removes the implicit 200-result cap on full-table name search.

CompanyList now tracks isSearching during the debounced searchCompanies call, showing a "Searching..." state instead of briefly treating an empty list as no results (and no longer clearing the grid at search start).

searchCompanies takes an optional limit: when provided (e.g. form suggestions still use 5), behavior is unchanged; when omitted, it pages through Supabase in 1000-row chunks until all name matches are returned, so the companies page can show every match—not only the first 200.

^{Reviewed by Cursor Bugbot for commit 75f377a. Bugbot is set up for automated code reviews on this repo. Configure here.}

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
cursor-directory	Ready	Preview, Comment	May 27, 2026 12:01am

[cursor]

Cursor Bugbot has reviewed your changes using default effort and found 2 potential issues.

Autofix Details

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Whitespace-only company names
  • Added Zod .trim().min(2) on the server action name field so whitespace-only input is rejected before insert/update.
• ✅ Fixed: Stale search results shown
  • Clear companies and results immediately when the search term changes so prior matches are not shown during debounce/fetch.

Or push these changes by commenting:

@cursor push 7e660cb4b6

Preview (7e660cb4b6)

diff --git a/apps/cursor/src/actions/upsert-company.ts b/apps/cursor/src/actions/upsert-company.ts
--- a/apps/cursor/src/actions/upsert-company.ts
+++ b/apps/cursor/src/actions/upsert-company.ts
@@ -16,7 +16,10 @@
   .schema(
     z.object({
       id: z.string().optional(),
-      name: z.string(),
+      name: z
+        .string()
+        .trim()
+        .min(2, { message: "Name must be at least 2 characters." }),
       image: z.string().url().nullable(),
       slug: z.string().optional(),
       location: z.string().nullable(),
@@ -31,7 +34,7 @@
     async ({
       parsedInput: {
         id,
-        name: rawName,
+        name,
         image,
         slug,
         location,
@@ -45,7 +48,6 @@
     }) => {
       const supabase = await createClient();
 
-      const name = rawName.trim();
       const nameKey = name.toLowerCase();
 
       // Only treat the request as an edit when a row with the provided id

diff --git a/apps/cursor/src/components/company/company-list.tsx b/apps/cursor/src/components/company/company-list.tsx
--- a/apps/cursor/src/components/company/company-list.tsx
+++ b/apps/cursor/src/components/company/company-list.tsx
@@ -23,6 +23,7 @@
 
     // With a search term, query the entire companies table rather than
     // filtering only the rows that happen to be loaded on the page.
+    setCompanies([]);
     let active = true;
     const handle = setTimeout(async () => {
       const results = await searchCompanies(term);

diff --git a/apps/cursor/src/components/company/company-select.tsx b/apps/cursor/src/components/company/company-select.tsx
--- a/apps/cursor/src/components/company/company-select.tsx
+++ b/apps/cursor/src/components/company/company-select.tsx
@@ -143,6 +143,7 @@
       return;
     }
 
+    setResults([]);
     let active = true;
     setLoading(true);

_{You can send follow-ups to the cloud agent here.}

[leerob]

@cursor push 7e660cb

[cursor]

Cursor Bugbot has reviewed your changes using default effort and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Search results capped at 200
  • searchCompanies now paginates through all matching rows when no limit is passed, removing the implicit 200-row cap on the companies browse search.
• ✅ Fixed: False empty state while searching
  • CompanyList tracks isSearching, stops clearing results at search start, and shows Searching... instead of the empty state until the debounced query finishes.

Or push these changes by commenting:

@cursor push 43d4502320

Preview (43d4502320)

diff --git a/apps/cursor/src/components/company/company-list.tsx b/apps/cursor/src/components/company/company-list.tsx
--- a/apps/cursor/src/components/company/company-list.tsx
+++ b/apps/cursor/src/components/company/company-list.tsx
@@ -10,6 +10,7 @@
 
 export function CompanyList({ data }: { data?: Company[] | null }) {
   const [companies, setCompanies] = useState<Company[]>(data ?? []);
+  const [isSearching, setIsSearching] = useState(false);
   const [search, setSearch] = useQueryState("q");
 
   useEffect(() => {
@@ -17,18 +18,20 @@
 
     // No search: show the full server-rendered list.
     if (!term) {
+      setIsSearching(false);
       setCompanies(data ?? []);
       return;
     }
 
     // With a search term, query the entire companies table rather than
     // filtering only the rows that happen to be loaded on the page.
-    setCompanies([]);
+    setIsSearching(true);
     let active = true;
     const handle = setTimeout(async () => {
       const results = await searchCompanies(term);
       if (active) {
         setCompanies(results);
+        setIsSearching(false);
       }
     }, 200);
 
@@ -48,6 +51,10 @@
             <CompanyCard key={company.id} company={company} />
           ))}
         </div>
+      ) : isSearching ? (
+        <div className="mt-24 text-center text-sm text-muted-foreground">
+          Searching...
+        </div>
       ) : (
         <div className="mt-24 flex flex-col items-center">
           <div className="text-center text-sm text-muted-foreground">

diff --git a/apps/cursor/src/data/client-queries.ts b/apps/cursor/src/data/client-queries.ts
--- a/apps/cursor/src/data/client-queries.ts
+++ b/apps/cursor/src/data/client-queries.ts
@@ -12,7 +12,7 @@
 // filtering an already-loaded page of results.
 export async function searchCompanies(
   term: string,
-  limit = 200,
+  limit?: number,
 ): Promise<CompanySearchResult[]> {
   const trimmed = term.trim();
 
@@ -21,21 +21,45 @@
   }
 
   const supabase = createClient();
+  const baseQuery = () =>
+    supabase
+      .from("companies")
+      .select("id, name, slug, image, location")
+      .ilike("name", `%${trimmed}%`)
+      .order("name", { ascending: true });
 
-  const { data } = await supabase
-    .from("companies")
-    .select("id, name, slug, image, location")
-    .ilike("name", `%${trimmed}%`)
-    .order("name", { ascending: true })
-    .limit(limit);
+  if (limit !== undefined) {
+    const { data } = await baseQuery().limit(limit);
+    return (data ?? []).map((company) => ({
+      id: company.id,
+      name: company.name,
+      slug: company.slug,
+      image: company.image ?? "",
+      location: company.location ?? "",
+    }));
+  }
 
-  return (data ?? []).map((company) => ({
-    id: company.id,
-    name: company.name,
-    slug: company.slug,
-    image: company.image ?? "",
-    location: company.location ?? "",
-  }));
+  const PAGE_SIZE = 1000;
+  const all: CompanySearchResult[] = [];
+  let from = 0;
+
+  while (true) {
+    const { data } = await baseQuery().range(from, from + PAGE_SIZE - 1);
+    if (!data || data.length === 0) break;
+    all.push(
+      ...data.map((company) => ({
+        id: company.id,
+        name: company.name,
+        slug: company.slug,
+        image: company.image ?? "",
+        location: company.location ?? "",
+      })),
+    );
+    if (data.length < PAGE_SIZE) break;
+    from += PAGE_SIZE;
+  }
+
+  return all;
 }
 
 export async function getMCPsClient({

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit e34ad95. Configure here.}

[leerob]

@cursor push 43d4502