fix(search): no cached member rows with access off, no double enrollment, code-point-safe matching

Surfaces consume member-connector rows only while the feature is on;
the Search page treats an awaited enrollment, including a first
connect, as non-actionable; a refused members-mode sync rolls back only
the member lists; result actions show on pointers without hover; route
error causes go through the redacting describer; the citation template
is valid JSON; term edges and snippet windows respect code points.

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx

@@ -199,10 +199,13 @@ export function KnowledgeSearchResults({
    * the viewer will see, and the list is not worth asking for.
    */
   const memberAccessAvailable = features?.knowledgeMemberAccess === true
-  const { data: memberConnectors = EMPTY_MEMBER_CONNECTORS } = useWorkspaceMemberConnectors(
-    workspaceId,
-    { enabled: memberAccessAvailable }
-  )
+  const { data: memberConnectorRows } = useWorkspaceMemberConnectors(workspaceId, {
+    enabled: memberAccessAvailable,
+  })
+  /** Rows cached before the feature went off are not this surface's to show. */
+  const memberConnectors = memberAccessAvailable
+    ? (memberConnectorRows ?? EMPTY_MEMBER_CONNECTORS)
+    : EMPTY_MEMBER_CONNECTORS
   const indexing = indexingSourceNames(memberConnectors, knowledgeBaseIds)
   const documents = useMemo(() => groupResultsByDocument(results ?? []), [results])
   const sourceTypes = useMemo(

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx

@@ -168,7 +168,7 @@ export function SourceCard({ source, query, onSummarize }: SourceCardProps) {
           </p>
         )}
       </div>
-      <div className='flex flex-shrink-0 items-center gap-1 self-start opacity-0 transition-opacity group-focus-within/source:opacity-100 group-hover/source:opacity-100'>
+      <div className='flex flex-shrink-0 items-center gap-1 self-start opacity-0 transition-opacity group-focus-within/source:opacity-100 group-hover/source:opacity-100 [@media(hover:none)]:opacity-100'>
         <CopyLinkAction url={source.url} />
         {onSummarize && (
           <Button variant='ghost' size='sm' onClick={() => onSummarize(source)}>

apps/sim/app/workspace/[workspaceId]/home/components/search-sources/search-sources.tsx

@@ -145,10 +145,13 @@ export function SearchSources({ workspaceId }: SearchSourcesProps) {
    * off, a connect is refused, so the chips say so instead of offering one.
    */
   const memberAccessAvailable = features?.knowledgeMemberAccess === true
-  const { data: memberConnectors = EMPTY_MEMBER_CONNECTORS } = useWorkspaceMemberConnectors(
-    workspaceId,
-    { enabled: memberAccessAvailable }
-  )
+  const { data: memberConnectorRows } = useWorkspaceMemberConnectors(workspaceId, {
+    enabled: memberAccessAvailable,
+  })
+  /** Rows cached before the feature went off are not this surface's to show. */
+  const memberConnectors = memberAccessAvailable
+    ? (memberConnectorRows ?? EMPTY_MEMBER_CONNECTORS)
+    : EMPTY_MEMBER_CONNECTORS
   const connectionByType = useMemo(
     () => simSearchConnectionsByType(memberConnectors),
     [memberConnectors]

apps/sim/app/workspace/[workspaceId]/search/search.test.tsx

@@ -140,6 +140,7 @@ vi.mock('@/hooks/use-member-enrollment', async () => {
       setupConnector: null,
       closeSetup: () => {},
       isAwaiting: () => false,
+      isAwaitingSource: () => false,
       isPending: false,
       error: null,
     }),

apps/sim/app/workspace/[workspaceId]/search/search.tsx

@@ -90,7 +90,7 @@ function SourceRow({
       : connector.meta.description
   const description = unavailableReason ?? (personal ? state : NEEDS_KNOWLEDGE_BASE_SETUP)
   const connectable =
-    !unavailable && personal && (!membership || CONNECTABLE_MEMBERSHIPS.has(membership))
+    !unavailable && !waiting && personal && (!membership || CONNECTABLE_MEMBERSHIPS.has(membership))
   return (
     <SettingsResourceRow
       iconVariant='custom'
@@ -141,8 +141,14 @@ export function Search() {
    */
   const setSearchTerm = useDebouncedSearchSetter(setSearchTermParam)
 
-  const { data: memberConnectors = EMPTY_MEMBER_CONNECTORS, isPending: connectionsPending } =
-    useWorkspaceMemberConnectors(workspaceId, { enabled: memberAccessAvailable })
+  const { data: memberConnectorRows, isPending: connectionsPending } = useWorkspaceMemberConnectors(
+    workspaceId,
+    { enabled: memberAccessAvailable }
+  )
+  /** Rows cached before the feature went off are not this surface's to show. */
+  const memberConnectors = memberAccessAvailable
+    ? (memberConnectorRows ?? EMPTY_MEMBER_CONNECTORS)
+    : EMPTY_MEMBER_CONNECTORS
   useScrollRestoration(scrollContainerRef, {
     ready: !memberAccessAvailable || !connectionsPending,
   })
@@ -179,6 +185,7 @@ export function Search() {
     setupConnector,
     closeSetup,
     isAwaiting,
+    isAwaitingSource,
     isPending,
     error,
   } = useMemberEnrollment({
@@ -237,7 +244,11 @@ export function Search() {
                         integrationAvailability,
                         memberAccessAvailable
                       )}
-                      waiting={connection ? isAwaiting(connection.connectorId) : false}
+                      waiting={
+                        connection
+                          ? isAwaiting(connection.connectorId)
+                          : isAwaitingSource(connector.type)
+                      }
                       isPending={isPending}
                       onConnect={() => connectSearchSource(workspaceId, connector, connection)}
                     />

apps/sim/hooks/queries/kb/connectors.ts

@@ -524,10 +524,15 @@ export function useTriggerSync() {
       if (previous) {
         setCachedConnectorStatus(queryClient, knowledgeBaseId, connectorId, previous)
       }
-      queryClient.invalidateQueries({ queryKey: connectorKeys.all(knowledgeBaseId) })
-      /** The member-connector list took the same optimistic `pending`; a refetch is its rollback. */
+      /**
+       * The member-connector list took the same optimistic `pending`; a refetch
+       * is its rollback, and the connector list's own status was restored above,
+       * so it is not refetched over concurrent optimistic patches.
+       */
       if (previous && 'memberSyncStatus' in previous) {
         queryClient.invalidateQueries({ queryKey: memberConnectorKeys.lists() })
+      } else {
+        queryClient.invalidateQueries({ queryKey: connectorKeys.all(knowledgeBaseId) })
       }
     },
     /**

apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts

@@ -66,7 +66,7 @@ const DEFAULT_QUERY_TOP_K = 5
  * a source URL is quoted by name instead.
  */
 const KNOWLEDGE_CITATION_INSTRUCTION =
-  'Cite each result you use inline, right after the sentence it supports, as <source>{"url":<sourceUrl>,"title":<documentName>,"siteName":<knowledgeBaseName>,"connectorType":<connectorType>,"snippet":<the sentence or two of content you relied on>,"updatedAt":<sourceModifiedAt>,"author":<author>}</source>; leave out any optional field whose value is null or unknown, and omit the tag for a result whose sourceUrl is null and name the document instead.'
+  'Cite each result you use inline, right after the sentence it supports, as <source>{"url":"<sourceUrl>","title":"<documentName>","siteName":"<knowledgeBaseName>","connectorType":"<connectorType>","snippet":"<the sentence or two of content you relied on>","updatedAt":"<sourceModifiedAt>","author":"<author>"}</source> with every value JSON-escaped; leave out any optional field whose value is null or unknown, and omit the tag for a result whose sourceUrl is null and name the document instead.'
 
 /**
  * Resolves an environment-variable reference passed as a connector API key.

apps/sim/lib/core/utils/with-route-handler.ts

@@ -1,5 +1,5 @@
 import { createLogger, runWithRequestContext } from '@sim/logger'
-import { getErrorMessage, getPostgresErrorCode } from '@sim/utils/errors'
+import { describeError, getErrorMessage } from '@sim/utils/errors'
 import type { NextRequest } from 'next/server'
 import { NextResponse } from 'next/server'
 import { getRateLimitHeaders } from '@/lib/api/server/rate-limit-context'
@@ -90,14 +90,15 @@ function traceIdFromTraceparent(header: string | null | undefined): string | und
 /**
  * What a wrapped error hides: a query failure from the database client carries
  * the driver's reason and the Postgres code on its cause, and only the outer
- * message names the query.
+ * message names the query. The shared describer reads the deepest cause and
+ * strips bound parameter values, so user data never reaches the log.
  */
 function errorDetail(error: unknown): { cause?: string; code?: string } {
-  const cause = error instanceof Error && error.cause !== undefined ? error.cause : undefined
-  const code = getPostgresErrorCode(error)
+  if (!(error instanceof Error) || error.cause === undefined) return {}
+  const described = describeError(error)
   return {
-    ...(cause !== undefined ? { cause: getErrorMessage(cause) } : {}),
-    ...(code ? { code } : {}),
+    cause: `${described.name}: ${described.message}`,
+    ...(described.code ? { code: described.code } : {}),
   }
 }
 

apps/sim/lib/knowledge/search/snippet.test.ts

@@ -60,6 +60,10 @@ describe('findTermMatches', () => {
     expect(findTermMatches('東京の天気', ['天気'])).toEqual([{ index: 3, length: 2 }])
   })
 
+  it('reads whole characters beside a hit, not code units', () => {
+    expect(findTermMatches('𝔘nicode volvo𝔘 volvo', ['volvo'])).toEqual([{ index: 17, length: 5 }])
+  })
+
   it('skips a hit glued to another word character', () => {
     expect(findTermMatches('subvolvo volvo_x volvo', ['volvo'])).toEqual([{ index: 17, length: 5 }])
   })
@@ -85,6 +89,14 @@ describe('matchSnippet', () => {
     expect(matchSnippet(german, 'Zürich')).toContain('nach Zürich')
   })
 
+  it('never splits a surrogate pair at a window edge', () => {
+    const emoji = `${'🙂'.repeat(200)} volvo ${'🙂'.repeat(200)}`
+    const loneSurrogate = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/
+    for (const snippet of [matchSnippet(emoji, 'volvo'), matchSnippet(emoji, 'none')]) {
+      expect(loneSurrogate.test(snippet)).toBe(false)
+    }
+  })
+
   it('falls back to the opening when no term appears in the chunk', () => {
     const snippet = matchSnippet(EMAIL, 'unrelated')
     expect(snippet.startsWith('Thanks for your patience.')).toBe(true)

apps/sim/lib/knowledge/search/snippet.ts

@@ -68,15 +68,35 @@ export function findTermMatches(text: string, terms: readonly string[]): TermMat
   const pattern = new RegExp(terms.map(escapeRegExp).join('|'), 'giu')
   const matches: TermMatch[] = []
   for (const match of text.matchAll(pattern)) {
-    const before = text[match.index - 1]
-    const after = text[match.index + match[0].length]
+    const before = codePointBefore(text, match.index)
+    const after = codePointAt(text, match.index + match[0].length)
     if (before !== undefined && WORD_CHARACTER.test(before)) continue
     if (after !== undefined && WORD_CHARACTER.test(after)) continue
     matches.push({ index: match.index, length: match[0].length })
   }
   return matches
 }
 
+/** The whole character starting at a code-unit index, or undefined past the end. */
+function codePointAt(text: string, index: number): string | undefined {
+  const code = text.codePointAt(index)
+  return code === undefined ? undefined : String.fromCodePoint(code)
+}
+
+/** The whole character ending just before a code-unit index, or undefined at the start. */
+function codePointBefore(text: string, index: number): string | undefined {
+  if (index <= 0) return undefined
+  const unit = text.charCodeAt(index - 1)
+  const start = unit >= 0xdc00 && unit <= 0xdfff && index >= 2 ? index - 2 : index - 1
+  return codePointAt(text, start)
+}
+
+/** An index moved off the middle of a surrogate pair, so a slice never splits a character. */
+function alignToCodePoint(text: string, index: number): number {
+  const unit = text.charCodeAt(index)
+  return unit >= 0xdc00 && unit <= 0xdfff ? index - 1 : index
+}
+
 /**
  * The passage of a document a search result shows: a window around the first
  * query term found, the way a search page shows why a document matched, and
@@ -94,11 +114,13 @@ export function matchSnippet(content: string, query?: string): string {
     const boundary = flat.indexOf(' ', start)
     if (boundary !== -1 && boundary - start < LEAD_LENGTH) start = boundary + 1
   }
+  start = alignToCodePoint(flat, start)
   if (flat.length - start <= SNIPPET_LENGTH) {
     return `${start > 0 ? '…' : ''}${flat.slice(start)}`
   }
   let end = start + SNIPPET_LENGTH
   const lastSpace = flat.lastIndexOf(' ', end)
   if (lastSpace > start + SNIPPET_LENGTH / 2) end = lastSpace
+  end = alignToCodePoint(flat, end)
   return `${start > 0 ? '…' : ''}${flat.slice(start, end).trimEnd()}…`
 }