Merge branch 'worktree-agent-a703bff345dcfce4d' into feat/permission-aware-knowledge

Author: waleedlatif1

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

@@ -1 +1,5 @@
-export { groupResultsByDocument, KnowledgeSearchResults } from './knowledge-search-results'
+export {
+  groupResultsByDocument,
+  indexingSourceNames,
+  KnowledgeSearchResults,
+} from './knowledge-search-results'

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

@@ -0,0 +1,67 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { describe, expect, it, vi } from 'vitest'
+import type { WorkspaceMemberConnector } from '@/hooks/queries/kb/connectors'
+
+vi.mock('@/hooks/queries/kb/connectors', () => ({ useWorkspaceMemberConnectors: vi.fn() }))
+vi.mock('@/hooks/queries/kb/knowledge', () => ({
+  useKnowledgeBasesQuery: vi.fn(),
+  useWorkspaceKnowledgeSearch: vi.fn(),
+}))
+vi.mock('@/app/workspace/[workspaceId]/providers/workspace-host-provider', () => ({
+  useWorkspaceHostContext: vi.fn(),
+}))
+vi.mock(
+  '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card',
+  () => ({ SourceCard: () => null })
+)
+
+import { indexingSourceNames } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results'
+
+function memberConnector(
+  overrides: Partial<WorkspaceMemberConnector> = {}
+): WorkspaceMemberConnector {
+  return {
+    knowledgeBaseId: 'kb-1',
+    knowledgeBaseName: 'Sim Search',
+    connectorId: 'connector-1',
+    connectorType: 'google_drive',
+    memberSyncStatus: 'running',
+    viewerMembership: 'connected',
+    viewerDocumentCount: 0,
+    ...overrides,
+  }
+}
+
+describe('indexingSourceNames', () => {
+  it('names each source still indexing for the viewer once, in the searched bases only', () => {
+    const names = indexingSourceNames(
+      [
+        memberConnector({ connectorId: 'a', connectorType: 'google_drive' }),
+        memberConnector({
+          connectorId: 'b',
+          connectorType: 'google_drive',
+          knowledgeBaseId: 'kb-2',
+        }),
+        memberConnector({ connectorId: 'c', connectorType: 'slack', memberSyncStatus: 'pending' }),
+        memberConnector({ connectorId: 'd', connectorType: 'notion', knowledgeBaseId: 'kb-3' }),
+      ],
+      ['kb-1', 'kb-2']
+    )
+
+    expect(names).toEqual(['Google Drive', 'Slack'])
+  })
+
+  it('ignores sources that are idle or not connected for the viewer', () => {
+    expect(
+      indexingSourceNames(
+        [
+          memberConnector({ connectorId: 'a', memberSyncStatus: 'idle' }),
+          memberConnector({ connectorId: 'b', viewerMembership: 'invited' }),
+        ],
+        ['kb-1']
+      )
+    ).toEqual([])
+  })
+})

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

@@ -7,9 +7,15 @@ import { connectorDisplayName } from '@/lib/sim-search/connectors'
 import { SourceCard } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card'
 import type { SourceTagData } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
 import { isIndexing } from '@/app/workspace/[workspaceId]/home/components/search-sources'
-import { useWorkspaceMemberConnectors } from '@/hooks/queries/kb/connectors'
+import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
+import {
+  useWorkspaceMemberConnectors,
+  type WorkspaceMemberConnector,
+} from '@/hooks/queries/kb/connectors'
 import { useKnowledgeBasesQuery, useWorkspaceKnowledgeSearch } from '@/hooks/queries/kb/knowledge'
 
+const EMPTY_MEMBER_CONNECTORS: WorkspaceMemberConnector[] = []
+
 /** A search spans at most this many knowledge bases. */
 const MAX_SEARCHED_KNOWLEDGE_BASES = 20
 /** Characters of the matching chunk shown under a result. */
@@ -47,6 +53,25 @@ export function groupResultsByDocument(
   return grouped
 }
 
+/**
+ * The names of the sources still indexing for the viewer among the bases the
+ * search spans, each once. A base outside the search cannot grow its results,
+ * so its indexing is not the reader's concern here.
+ */
+export function indexingSourceNames(
+  memberConnectors: readonly WorkspaceMemberConnector[],
+  knowledgeBaseIds: readonly string[]
+): string[] {
+  const searched = new Set(knowledgeBaseIds)
+  return [
+    ...new Set(
+      memberConnectors
+        .filter((connection) => searched.has(connection.knowledgeBaseId) && isIndexing(connection))
+        .map((connection) => connectorDisplayName(connection.connectorType))
+    ),
+  ]
+}
+
 /**
  * A result as the source card renders it: the row's second line names the
  * source app, or the knowledge base for an upload. A document without a
@@ -124,15 +149,17 @@ export function KnowledgeSearchResults({
     isFetching,
     error,
   } = useWorkspaceKnowledgeSearch(workspaceId, knowledgeBaseIds, query)
-  const { data: memberConnectors = [] } = useWorkspaceMemberConnectors(workspaceId)
-  /** Every per-member connector still indexing for the viewer, in any base the search spans. */
-  const indexing = [
-    ...new Set(
-      memberConnectors
-        .filter(isIndexing)
-        .map((connection) => connectorDisplayName(connection.connectorType))
-    ),
-  ]
+  const { features } = useWorkspaceHostContext()
+  /**
+   * Judged by the workspace, as the server judges it: with per-member access
+   * off, member-scoped documents are hidden, so no source is indexing anything
+   * the viewer will see, and the list is not worth asking for.
+   */
+  const memberAccessAvailable = features?.knowledgeMemberAccess === true
+  const { data: memberConnectors = EMPTY_MEMBER_CONNECTORS } = useWorkspaceMemberConnectors(
+    memberAccessAvailable ? workspaceId : undefined
+  )
+  const indexing = indexingSourceNames(memberConnectors, knowledgeBaseIds)
   const documents = useMemo(() => groupResultsByDocument(results ?? []), [results])
   const sourceTypes = useMemo(
     () => [...new Set(documents.map((result) => result.connectorType ?? 'upload'))],

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

@@ -3,6 +3,8 @@
 import { type ReactNode, useState } from 'react'
 import { Button, cn, Tooltip } from '@sim/emcn'
 import { Check, Link as LinkIcon } from '@sim/emcn/icons'
+import { createLogger } from '@sim/logger'
+import { getErrorMessage } from '@sim/utils/errors'
 import { formatDate } from '@sim/utils/formatting'
 import { faviconUrl } from '@/lib/core/utils/favicon'
 import {
@@ -17,6 +19,8 @@ import {
 import type { SourceTagData } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
 import { BrandIcon } from '@/blocks/brand-icon'
 
+const logger = createLogger('SourceCard')
+
 /** Query terms shorter than this are too common to bold. */
 const MIN_HIGHLIGHT_TERM_LENGTH = 3
 /** How long the copied state shows on the copy-link action. */
@@ -63,7 +67,11 @@ interface CopyLinkActionProps {
   url: string
 }
 
-/** Copies the document's link; confirms with a check for a moment. */
+/**
+ * Copies the document's link; confirms with a check for a moment. The check
+ * only shows once the clipboard accepted the write: a page denied clipboard
+ * access is left at "Copy link" rather than claiming a copy that never landed.
+ */
 function CopyLinkAction({ url }: CopyLinkActionProps) {
   const [copied, setCopied] = useState(false)
   return (
@@ -74,10 +82,17 @@ function CopyLinkAction({ url }: CopyLinkActionProps) {
           size='sm'
           aria-label='Copy link'
           onClick={() => {
-            void navigator.clipboard.writeText(url).then(() => {
-              setCopied(true)
-              window.setTimeout(() => setCopied(false), COPIED_FEEDBACK_MS)
-            })
+            navigator.clipboard.writeText(url).then(
+              () => {
+                setCopied(true)
+                window.setTimeout(() => setCopied(false), COPIED_FEEDBACK_MS)
+              },
+              (error: unknown) => {
+                logger.warn('Copying the document link failed', {
+                  error: getErrorMessage(error),
+                })
+              }
+            )
           }}
         >
           {copied ? (

apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx

@@ -70,6 +70,8 @@ interface MothershipChatProps {
     fileAttachments?: FileAttachmentForApi[],
     contexts?: ChatContext[]
   ) => void
+  /** Whether the composer offers Search mode; only the Home composer answers a search. */
+  canSearch?: boolean
   /** Off in Search mode, where the query stays put so the person can refine it. */
   clearOnSubmit?: boolean
   /** Fires when the composer's text goes from something to nothing. */
@@ -324,6 +326,7 @@ export function MothershipChat({
   isReconnecting = false,
   isLoading = false,
   onSubmit,
+  canSearch = false,
   clearOnSubmit,
   onCleared,
   onStopGeneration,
@@ -844,6 +847,7 @@ export function MothershipChat({
               key={draftScopeKey}
               ref={userInputRef}
               onSubmit={onSubmit}
+              canSearch={canSearch}
               clearOnSubmit={clearOnSubmit}
               onCleared={onCleared}
               isSending={isStreamActive}

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

@@ -166,6 +166,7 @@ export function SearchSources({ workspaceId }: SearchSourcesProps) {
     setupConnector,
     closeSetup,
     isAwaiting,
+    isAwaitingSource,
     isPending,
     error,
   } = useMemberEnrollment({ membershipQueryKeys, connectedConnectorIds })
@@ -193,7 +194,9 @@ export function SearchSources({ workspaceId }: SearchSourcesProps) {
                 integrationAvailability,
                 memberAccessAvailable
               )}
-              waiting={connection ? isAwaiting(connection.connectorId) : false}
+              waiting={
+                connection ? isAwaiting(connection.connectorId) : isAwaitingSource(connector.type)
+              }
               disabled={isPending}
               onConnect={() => connectSearchSource(workspaceId, connector, connection)}
             />

apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx

@@ -70,6 +70,12 @@ interface UserInputProps {
   onStopGeneration: () => void
   isInitialView?: boolean
   onSendQueuedHead?: () => void
+  /**
+   * Whether the composer offers Search mode. Only the Home composer answers a
+   * search with documents; the workflow copilot always talks to the agent, so
+   * it must not show a mode it cannot honour.
+   */
+  canSearch?: boolean
   /**
    * Whether the text is cleared once submitted. A search keeps its query in
    * the box, the way a search bar does, so it can be read and refined against
@@ -107,6 +113,7 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
     isInitialView = true,
     onSendQueuedHead,
     onEditQueuedTail,
+    canSearch = false,
     clearOnSubmit = true,
     onCleared,
   },
@@ -712,7 +719,7 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
           </Tooltip.Root>
         </div>
         <div className='flex items-center gap-1.5'>
-          <ModeSwitcher />
+          {canSearch && <ModeSwitcher />}
           {isSttSupported && (
             <MicButton
               audioLevelsRef={audioLevelsRef}

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

@@ -462,9 +462,12 @@ export function Home({ chatId, userName, userId }: HomeProps) {
         is_new_task: !chatId,
       })
 
-      /** Search mode answers with documents, not a turn of the agent. */
-      if (useMothershipModeStore.getState().mode === 'search' && trimmed) {
-        setSearchQuery(trimmed)
+      /**
+       * Search mode answers with documents, not a turn of the agent, and only
+       * a query can be answered: attachments alone have nothing to search for.
+       */
+      if (useMothershipModeStore.getState().mode === 'search') {
+        if (trimmed) setSearchQuery(trimmed)
         return
       }
 
@@ -726,6 +729,7 @@ export function Home({ chatId, userName, userId }: HomeProps) {
                     defaultValue={initialPrompt || initialSearchQuery}
                     draftScopeKey={draftScopeKey}
                     onSubmit={handleSubmit}
+                    canSearch
                     clearOnSubmit={composerMode !== 'search'}
                     onCleared={clearSearch}
                     isSending={isSending}
@@ -754,6 +758,7 @@ export function Home({ chatId, userName, userId }: HomeProps) {
             isReconnecting={isReconnecting}
             isLoading={showChatSkeleton}
             onSubmit={handleSubmit}
+            canSearch
             clearOnSubmit={composerMode !== 'search'}
             onCleared={clearSearch}
             onStopGeneration={handleStopGeneration}