fix(search): preserve ordinary knowledge base classification

Author: Vikhyath Mondreti

apps/sim/lib/knowledge/__integration__/search-source-setup.integration.ts

@@ -236,7 +236,7 @@ describe('Search source identity and concurrent creation', () => {
     ).toHaveLength(0)
   })
 
-  it('adopts a legacy index only during admin setup and persists its canonical identity', async () => {
+  it('preserves ordinary KB name collisions and creates one explicit Search configuration', async () => {
     await db
       .update(knowledgeBase)
       .set({ name: 'Sim Search' })
@@ -258,18 +258,40 @@ describe('Search source identity and concurrent creation', () => {
         principal: { kind: 'session', userId: other.aliceId, sessionId: 'fixture-admin' },
         input,
       })
-    const results = await Promise.all([prepare(), prepare()])
-    expect(results.map((result) => result.knowledgeBaseId)).toEqual([
-      other.knowledgeBaseId,
-      other.knowledgeBaseId,
-    ])
+    await expect(prepare()).rejects.toMatchObject({ code: 'conflict' })
+    expect(
+      await db
+        .select({ name: knowledgeBase.name, isSearchIndex: knowledgeBase.isSearchIndex })
+        .from(knowledgeBase)
+        .where(eq(knowledgeBase.id, other.knowledgeBaseId))
+    ).toEqual([{ name: 'Sim Search', isSearchIndex: false }])
     await db
       .update(knowledgeBase)
-      .set({ name: 'Renamed adopted index' })
+      .set({ name: 'Ordinary knowledge' })
       .where(eq(knowledgeBase.id, other.knowledgeBaseId))
+    const results = await Promise.all([prepare(), prepare()])
+    const searchId = results[0].knowledgeBaseId
+    expect(searchId).not.toBe(other.knowledgeBaseId)
+    expect(results[1].knowledgeBaseId).toBe(searchId)
+    expect(
+      await db
+        .select({ id: knowledgeBase.id })
+        .from(knowledgeBase)
+        .where(
+          and(
+            eq(knowledgeBase.workspaceId, other.workspaceId),
+            eq(knowledgeBase.isSearchIndex, true)
+          )
+        )
+    ).toEqual([{ id: searchId }])
+    await db
+      .update(knowledgeBase)
+      .set({ name: 'Renamed Search configuration' })
+      .where(eq(knowledgeBase.id, searchId))
     await expect(readSearchIndex.execute({ principal: reader, input })).resolves.toMatchObject({
-      knowledgeBaseId: other.knowledgeBaseId,
+      knowledgeBaseId: searchId,
     })
+    await expect(prepare()).resolves.toMatchObject({ knowledgeBaseId: searchId })
   })
 
   it('serializes matching creates across independent database transactions and keeps one grant', async () => {

apps/sim/lib/knowledge/application/sim-search.ts

@@ -1,7 +1,4 @@
 import { type Principal, resolvePrincipalSubjectUserId } from '@sim/auth/principal'
-import { db } from '@sim/db'
-import { knowledgeBase } from '@sim/db/schema'
-import { and, eq, isNull } from 'drizzle-orm'
 import { coalesceLocally } from '@/lib/concurrency/singleflight'
 import { requireOrganizationMembership } from '@/lib/core/application/organization-authorization'
 import {
@@ -84,19 +81,6 @@ async function ensureSearchKnowledgeBase(
         return created.id
       }
       const workspaceId = scope.workspaceId
-      const [legacy] = await db
-        .update(knowledgeBase)
-        .set({ isSearchIndex: true, updatedAt: new Date() })
-        .where(
-          and(
-            eq(knowledgeBase.workspaceId, workspaceId),
-            eq(knowledgeBase.name, SIM_SEARCH_KNOWLEDGE_BASE_NAME),
-            eq(knowledgeBase.isSearchIndex, false),
-            isNull(knowledgeBase.deletedAt)
-          )
-        )
-        .returning({ id: knowledgeBase.id })
-      if (legacy) return legacy.id
       const created = await createKnowledgeBase.execute({
         principal,
         input: {