merge: preserve latest assistant and personal account changes

Author: waleedlatif1

apps/sim/app/api/copilot/tools/execute/route.ts

@@ -41,16 +41,19 @@ const turnRegistryCache = new Map<
 async function getTurnEgressRegistry(
   userId: string,
   workspaceId: string | undefined,
-  messageId: string | undefined
+  messageId: string | undefined,
+  requestMode?: string
 ): Promise<ResolvedSecretTraceRegistry> {
-  const key = `${userId}\u0000${workspaceId ?? ''}\u0000${messageId ?? ''}`
+  const key = `${userId}\u0000${workspaceId ?? ''}\u0000${messageId ?? ''}\u0000${requestMode ?? ''}`
   const now = Date.now()
   const hit = turnRegistryCache.get(key)
   if (hit && hit.expiresAt > now) {
     hit.expiresAt = now + TURN_REGISTRY_TTL_MS
     return hit.registry
   }
-  const environmentContext = await prepareCopilotEnvironmentContext(userId, workspaceId)
+  const environmentContext = await prepareCopilotEnvironmentContext(userId, workspaceId, {
+    includeSecrets: requestMode !== 'assistant',
+  })
   for (const [cachedKey, cached] of turnRegistryCache) {
     if (cached.expiresAt <= now) turnRegistryCache.delete(cachedKey)
   }
@@ -111,6 +114,8 @@ export const POST = withRouteHandler((request: NextRequest) =>
         messageId,
         parentToolCallId,
         userPermission,
+        requestMode,
+        assistantSearch,
       } = validation.data
       rootSpan.setAttributes({
         [TraceAttr.ToolName]: toolName,
@@ -121,7 +126,7 @@ export const POST = withRouteHandler((request: NextRequest) =>
       let toolRegistry: ResolvedSecretTraceRegistry
       let turnRegistry: ResolvedSecretTraceRegistry
       try {
-        turnRegistry = await getTurnEgressRegistry(userId, workspaceId, messageId)
+        turnRegistry = await getTurnEgressRegistry(userId, workspaceId, messageId, requestMode)
         toolRegistry = turnRegistry.forkForInputPaths([])
       } catch (err) {
         /**
@@ -173,6 +178,9 @@ export const POST = withRouteHandler((request: NextRequest) =>
           parentToolCallId,
           userPermission,
           copilotToolExecution: true,
+          copilotInteractionMode: 'interactive',
+          requestMode,
+          assistantSearch,
           resolvedSecretTraceRegistry: toolRegistry,
         })
         const projection = inspectToolResultForCopilot(result, toolRegistry, toolName)

apps/sim/app/api/knowledge/search/route.test.ts

@@ -6,8 +6,8 @@ import { NextRequest } from 'next/server'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({ search: vi.fn() }))
-vi.mock('@/lib/knowledge/application/search', () => ({
-  searchKnowledge: { operation: { id: 'knowledge.search' }, execute: mocks.search },
+vi.mock('@/lib/knowledge/application/workspace-search', () => ({
+  searchWorkspaceKnowledge: { operation: { id: 'knowledge.search' }, execute: mocks.search },
 }))
 
 import { POST } from '@/app/api/knowledge/search/route'
@@ -29,7 +29,7 @@ describe('workspace search route', () => {
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify({
         workspaceId: 'workspace-1',
-        knowledgeBaseIds: ['kb-1'],
+        filters: { source: 'slack', documentIds: ['doc-1'] },
         query: 'Orion',
       }),
       signal: controller.signal,
@@ -38,6 +38,8 @@ describe('workspace search route', () => {
     expect(response.status).toBe(200)
     const call = mocks.search.mock.calls[0][0]
     expect(call.principal).toEqual({ kind: 'session', userId: 'user-1', sessionId: 'session-1' })
+    expect(call.input).not.toHaveProperty('knowledgeBaseIds')
+    expect(call.input.filters).toEqual({ source: 'slack', documentIds: ['doc-1'] })
     expect(call.input.signal).toBe(request.signal)
     controller.abort()
     expect(call.input.signal.aborted).toBe(true)

apps/sim/app/api/knowledge/search/route.ts

@@ -6,7 +6,7 @@ import {
 } from '@/lib/api/server/routes'
 import { internalKnowledgeErrorPolicies } from '@/lib/knowledge/api/route-policies'
 import { knowledgeOperations } from '@/lib/knowledge/application/operations'
-import { searchKnowledge } from '@/lib/knowledge/application/search'
+import { searchWorkspaceKnowledge } from '@/lib/knowledge/application/workspace-search'
 import { sourceAuthor } from '@/lib/knowledge/search/author'
 
 export const POST = defineInternalJsonRoute({
@@ -19,13 +19,13 @@ export const POST = defineInternalJsonRoute({
   errorPolicy: internalKnowledgeErrorPolicies.search,
   mapInput: ({ body }, { request }) => ({
     workspaceId: body.workspaceId,
-    knowledgeBaseIds: body.knowledgeBaseIds,
+    filters: body.filters,
     query: body.query,
     topK: body.topK,
     surface: 'dashboard' as const,
     signal: request.signal,
   }),
-  useCase: searchKnowledge,
+  useCase: searchWorkspaceKnowledge,
   present: ({ results, knowledgeBases }, { input }) => {
     const knowledgeBaseNames = new Map(knowledgeBases.map((kb) => [kb.id, kb.name]))
     return {

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

@@ -1,20 +1,16 @@
 'use client'
 
 import { useMemo } from 'react'
-import { Chip, OverflowText } from '@sim/emcn'
-import { FileText } from '@sim/emcn/icons'
-import { formatDate } from '@sim/utils/formatting'
+import { Chip } from '@sim/emcn'
 import { useQueryStates } from 'nuqs'
-import type { WorkspaceKnowledgeSearchResult } from '@/lib/api/contracts/knowledge'
+import type {
+  WorkspaceKnowledgeSearchResult,
+  WorkspaceSearchFilters,
+} from '@/lib/api/contracts/knowledge'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { matchSnippet } from '@/lib/knowledge/search/snippet'
 import { connectorDisplayName } from '@/lib/sim-search/connectors'
-import { searchedKnowledgeBases } from '@/lib/sim-search/knowledge-bases'
-import {
-  highlightTerms,
-  SOURCE_ROW_CLASSES,
-  SOURCE_ROW_MARK_CLASSES,
-  SourceCard,
-} from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card'
+import { SourceCard } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card'
 import {
   isHttpUrl,
   type SourceTagData,
@@ -78,14 +74,18 @@ export function indexingSourceNames(
 
 /**
  * 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 an
- * http(s) source URL cannot be opened, and a connector-supplied value of any
- * other scheme is never handed to the browser as a link.
+ * source app, or the knowledge base for an upload. Without an HTTP(S) source
+ * URL, the link opens the canonical document in Sim.
  */
-function toSource(result: WorkspaceKnowledgeSearchResult, query: string): SourceTagData | null {
-  if (!isHttpUrl(result.sourceUrl)) return null
+function toSource(
+  result: WorkspaceKnowledgeSearchResult,
+  query: string,
+  workspaceId: string
+): SourceTagData {
   return {
-    url: result.sourceUrl,
+    url: isHttpUrl(result.sourceUrl)
+      ? result.sourceUrl
+      : `${getBaseUrl()}/workspace/${encodeURIComponent(workspaceId)}/knowledge/${encodeURIComponent(result.knowledgeBaseId)}/${encodeURIComponent(result.documentId)}`,
     title: result.documentName ?? undefined,
     siteName: result.connectorType
       ? connectorDisplayName(result.connectorType)
@@ -113,51 +113,16 @@ function handleResultsKeyDown(event: React.KeyboardEvent<HTMLDivElement>) {
   links[next].focus()
 }
 
-interface UnlinkedResultRowProps {
-  result: WorkspaceKnowledgeSearchResult
-  query: string
-}
-
-/**
- * A document with nowhere to open, such as an upload: the same row as a
- * linked result, with the file mark in place of a brand mark, so the list's
- * columns and the matched passage stay aligned whatever the document is.
- */
-function UnlinkedResultRow({ result, query }: UnlinkedResultRowProps) {
-  const meta = [
-    result.knowledgeBaseName,
-    result.author,
-    result.sourceModifiedAt ? formatDate(new Date(result.sourceModifiedAt)) : null,
-  ].filter((part): part is string => Boolean(part))
-  return (
-    <div className={SOURCE_ROW_CLASSES}>
-      <span className={SOURCE_ROW_MARK_CLASSES}>
-        <FileText className='size-[16px] text-[var(--text-icon)]' />
-      </span>
-      <div className='flex min-w-0 flex-1 flex-col gap-0.5'>
-        <OverflowText
-          label={result.documentName ?? 'Untitled document'}
-          className='text-[var(--text-primary)] text-sm'
-        />
-        <OverflowText label={meta.join(' · ')} className='text-[var(--text-muted)] text-caption' />
-        <p className='line-clamp-2 text-[var(--text-body)] text-small leading-snug'>
-          {highlightTerms(matchSnippet(result.content, query), query)}
-        </p>
-      </div>
-    </div>
-  )
-}
-
 interface KnowledgeSearchResultsProps {
   workspaceId: string
   query: string
-  /** Asks the agent about one document; the prompt names it and links to it. */
-  onSummarize: (prompt: string) => void
+  /** Binds the Assistant turn to the selected canonical document. */
+  onSummarize: (prompt: string, filters: WorkspaceSearchFilters) => void
 }
 
 /**
  * The composer's Search mode: the documents the signed-in person may read that
- * match their query, across every knowledge base in the workspace, as rows
+ * match their query in the canonical Enterprise Search index, as rows
  * that open the source. A header says how many and that the search ran as
  * them; while a connected source is still indexing it says so, and the list
  * grows as documents land. Filters by source and recency appear only once the
@@ -174,14 +139,26 @@ export function KnowledgeSearchResults({
     isPending: basesPending,
     error: basesError,
   } = useKnowledgeBasesQuery(workspaceId)
-  const knowledgeBaseIds = searchedKnowledgeBases(knowledgeBases, workspaceId).map((kb) => kb.id)
+  const index = knowledgeBases.find(
+    (base) => base.workspaceId === workspaceId && base.isSearchIndex
+  )
+  const knowledgeBaseIds = index ? [index.id] : []
+  const [filters, setFilters] = useQueryStates(searchFilterParsers, resourceUrlKeys)
+  const searchFilters = useMemo<WorkspaceSearchFilters>(() => {
+    const window = UPDATED_WINDOWS.find((entry) => entry.id === filters.updated)
+    return {
+      ...(filters.source ? { source: filters.source } : {}),
+      ...(window?.days
+        ? { modifiedAfter: new Date(Date.now() - window.days * DAY_MS).toISOString() }
+        : {}),
+    }
+  }, [filters.source, filters.updated])
   const {
     data: results,
     isPending,
     isFetching,
-    isPlaceholderData,
     error,
-  } = useWorkspaceKnowledgeSearch(workspaceId, knowledgeBaseIds, query)
+  } = useWorkspaceKnowledgeSearch(workspaceId, query, searchFilters)
   /**
    * With per-member access off, member-scoped documents are hidden, so the
    * indexing list is not worth asking for.
@@ -196,28 +173,16 @@ export function KnowledgeSearchResults({
     : EMPTY_MEMBER_CONNECTORS
   const indexing = indexingSourceNames(memberConnectors, knowledgeBaseIds)
   const documents = useMemo(() => groupResultsByDocument(results ?? []), [results])
-  const sourceTypes = useMemo(
-    () => [...new Set(documents.map((result) => result.connectorType ?? UPLOAD_SOURCE))],
-    [documents]
-  )
-  const [filters, setFilters] = useQueryStates(searchFilterParsers, resourceUrlKeys)
+  const sourceTypes = [
+    ...new Set([
+      ...(filters.source ? [filters.source] : []),
+      ...documents.map((result) => result.connectorType ?? UPLOAD_SOURCE),
+    ]),
+  ]
   const filtersActive = filters.source !== null || filters.updated !== 'any'
   /** The controls appear once the list is long and mixed, and stay while a filter from the link is active. */
   const showFilters =
     filtersActive || (documents.length >= FILTERS_MIN_RESULTS && sourceTypes.length > 1)
-  const visible = useMemo(() => {
-    if (!filtersActive) return documents
-    const window = UPDATED_WINDOWS.find((entry) => entry.id === filters.updated)
-    const cutoff = window?.days ? Date.now() - window.days * DAY_MS : null
-    return documents.filter((result) => {
-      if (filters.source && (result.connectorType ?? UPLOAD_SOURCE) !== filters.source) return false
-      if (cutoff !== null) {
-        const modified = result.sourceModifiedAt ? Date.parse(result.sourceModifiedAt) : Number.NaN
-        if (Number.isNaN(modified) || modified < cutoff) return false
-      }
-      return true
-    })
-  }, [documents, filtersActive, filters.source, filters.updated])
 
   const failure = basesError ?? error
   if (failure) {
@@ -230,8 +195,7 @@ export function KnowledgeSearchResults({
       </p>
     )
   }
-  /** Kept results belong to the previous query; a new query shows its own state. */
-  if (isPending || isPlaceholderData || (isFetching && !results)) {
+  if (isPending || (isFetching && !results)) {
     return <p className='px-2 py-2 text-[var(--text-muted)] text-caption'>Searching…</p>
   }
 
@@ -283,27 +247,28 @@ export function KnowledgeSearchResults({
           ))}
         </div>
       )}
-      {visible.length === 0 ? (
+      {documents.length === 0 ? (
         <p className='px-2 py-2 text-[var(--text-muted)] text-caption'>
-          {documents.length === 0
-            ? `No documents you can read match “${query}”.`
-            : 'No documents match these filters.'}
+          {filtersActive
+            ? 'No documents match these filters.'
+            : `No documents you can read match “${query}”.`}
         </p>
       ) : (
         <div className='flex flex-col' onKeyDown={handleResultsKeyDown}>
-          {visible.map((result) => {
-            const source = toSource(result, query)
-            return source ? (
+          {documents.map((result) => {
+            const source = toSource(result, query, workspaceId)
+            return (
               <SourceCard
                 key={result.documentId}
                 source={source}
                 query={query}
                 onSummarize={(cited) =>
-                  onSummarize(`Summarize "${cited.title ?? cited.url}" (${cited.url})`)
+                  onSummarize(`Summarize "${cited.title ?? cited.url}"`, {
+                    ...searchFilters,
+                    documentIds: [result.documentId],
+                  })
                 }
               />
-            ) : (
-              <UnlinkedResultRow key={result.documentId} result={result} query={query} />
             )
           })}
         </div>

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

@@ -22,6 +22,7 @@ import {
 } from '@/lib/copilot/tools/tool-display'
 import { useChatSurface } from '@/app/workspace/[workspaceId]/home/components/chat-surface-context'
 import type { CredentialSubmissionPayload } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
+import { resolveMessageCitations } from '@/app/workspace/[workspaceId]/home/components/message-content/resolve-citations'
 import { useCustomBlockOverlayVersion } from '@/blocks/custom/client-overlay'
 import type { ContentBlock, OptionItem, ToolCallData } from '../../types'
 import { SUBAGENT_LABELS } from '../../types'
@@ -818,6 +819,7 @@ interface MessageContentProps {
   blocks: ContentBlock[]
   fallbackContent: string
   messageId?: string
+  requestMode?: 'agent' | 'assistant'
   isStreaming: boolean
   /**
    * True for the last message in the transcript. The last turn keeps a
@@ -848,6 +850,7 @@ function MessageContentInner({
   blocks,
   fallbackContent,
   messageId,
+  requestMode,
   isStreaming = false,
   isLast = false,
   questionAnswers,
@@ -860,9 +863,13 @@ function MessageContentInner({
 }: MessageContentProps) {
   const { onWorkspaceResourceSelect } = useChatSurface()
   const blockOverlayVersion = useCustomBlockOverlayVersion()
+  const cited = useMemo(
+    () => resolveMessageCitations(blocks, fallbackContent, requestMode === 'assistant'),
+    [blocks, fallbackContent, requestMode]
+  )
   const parsed = useMemo(
-    () => (blocks.length > 0 ? parseBlocks(blocks) : []),
-    [blocks, blockOverlayVersion]
+    () => (cited.blocks.length > 0 ? parseBlocks(cited.blocks) : []),
+    [cited.blocks, blockOverlayVersion]
   )
 
   const [trailingRevealing, setTrailingRevealing] = useState(false)
@@ -883,10 +890,10 @@ function MessageContentInner({
     () =>
       parsed.length > 0
         ? parsed
-        : fallbackContent?.trim()
-          ? [{ type: 'text', id: 'text-fallback', content: fallbackContent }]
+        : cited.fallbackContent?.trim()
+          ? [{ type: 'text', id: 'text-fallback', content: cited.fallbackContent }]
           : [],
-    [parsed, fallbackContent]
+    [parsed, cited.fallbackContent]
   )
   /**
    * Collected from the segments that render, not the raw blocks: that is the