fix: reconcile staging search and file contracts after rebase

Author: Sg312

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

@@ -3,6 +3,7 @@ import { getErrorMessage } from '@sim/utils/errors'
 import { type NextRequest, NextResponse } from 'next/server'
 import { copilotToolExecuteInternalBodySchema } from '@/lib/api/contracts/copilot'
 import { validationErrorResponse } from '@/lib/api/server'
+import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { toolResultForModel } from '@/lib/mothership/chat/sim-key-redaction'
 import { prepareCopilotEnvironmentContext } from '@/lib/mothership/environment-context'
 import { MothershipStreamV1ToolOutcome } from '@/lib/mothership/generated/mothership-stream-v1'
@@ -20,7 +21,6 @@ import type { ToolCallResult } from '@/lib/mothership/request/types'
 import { ensureHandlersRegistered, toolRequiresApprovalLane } from '@/lib/mothership/tool-executor'
 import { executeTool } from '@/lib/mothership/tool-executor/executor'
 import { TOOL_EFFECT_PHASE } from '@/lib/mothership/tool-executor/types'
-import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 
 const logger = createLogger('CopilotToolExecuteInternalAPI')

apps/sim/app/o/[organizationId]/home/components/composer/composer.tsx

@@ -3,6 +3,7 @@
 import { useEffect, useRef, useState } from 'react'
 import { Chip, ChipDropdown, ComposerActionButton, cn, Tooltip, toast } from '@sim/emcn'
 import { ArrowUp, Paperclip, Plus, Search, Slash, StopFilled } from '@sim/emcn/icons'
+import { escapeRegExp } from '@sim/utils/string'
 import { useQueries } from '@tanstack/react-query'
 import {
   ASSISTANT_IMAGE_ACCEPT_ATTRIBUTE,
@@ -25,10 +26,7 @@ import {
 import { organizationSkillOptions } from '@/app/workspace/[workspaceId]/home/components/user-input/components/skills-menu-dropdown/organization-skill-options'
 import type { ChatRequestMode } from '@/app/workspace/[workspaceId]/home/types'
 import type { useFileAttachments } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
-import {
-  escapeRegex,
-  SKILL_CHIP_TRIGGER,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
+import { SKILL_CHIP_TRIGGER } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
 import { getSkillsQueryOptions } from '@/hooks/queries/skills'
 import { useWorkspacesQuery } from '@/hooks/queries/workspace'
 import { useAnimatedPlaceholder } from '@/hooks/use-animated-placeholder'
@@ -131,7 +129,7 @@ export function Composer({
     for (const context of restoredContexts) {
       if (context.kind !== 'skill') continue
       restoredText = restoredText.replace(
-        new RegExp(`(^|\\s)/${escapeRegex(context.label)}(?=\\s|$)`, 'g'),
+        new RegExp(`(^|\\s)/${escapeRegExp(context.label)}(?=\\s|$)`, 'g'),
         `$1${SKILL_CHIP_TRIGGER}${context.label}`
       )
     }

apps/sim/app/o/[organizationId]/search/search-results-view.test.tsx

@@ -145,7 +145,7 @@ describe('results-only search layout', () => {
     const filters = mocks.search.mock.calls.at(-1)![2]
     expect(filters.source).toBe('slack')
     expect(mocks.searchChange).toHaveBeenLastCalledWith({ scope, query: 'Orion', filters })
-    expect(mocks.search).toHaveBeenLastCalledWith(scope, 'Orion', filters, undefined)
+    expect(mocks.search).toHaveBeenLastCalledWith(scope, 'Orion', filters, 20)
   })
   it('summarizes the selected document through Home without duplicating search state', async () => {
     await render('?q=Orion')

apps/sim/app/o/[organizationId]/search/search.test.tsx

@@ -163,7 +163,7 @@ async function editDraft(value: string) {
 function expectVisibleQuery(query: string) {
   expect(searchInput().value).toBe(query)
   expect(container.querySelector('a[data-source-link]')?.textContent).toBe(`${query} launch plan`)
-  expect(mocks.search).toHaveBeenLastCalledWith(scope, query, {}, undefined)
+  expect(mocks.search).toHaveBeenLastCalledWith(scope, query, {}, 20)
   expect(document.activeElement).toBe(searchInput())
 }
 

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

@@ -187,13 +187,16 @@ function SearchResults({
     scope,
     awaitingRange ? '' : query,
     searchFilters,
-    topK ?? (expanded
-      ? WORKSPACE_KNOWLEDGE_SEARCH_LIMITS.expanded
-      : WORKSPACE_KNOWLEDGE_SEARCH_LIMITS.initial)
+    topK ??
+      (expanded
+        ? WORKSPACE_KNOWLEDGE_SEARCH_LIMITS.expanded
+        : WORKSPACE_KNOWLEDGE_SEARCH_LIMITS.initial)
   )
   /** A full first page may collapse to few cards, yet more documents may still match. */
   const mayHaveMore =
-    topK === undefined && !expanded && (search?.results.length ?? 0) >= WORKSPACE_KNOWLEDGE_SEARCH_LIMITS.initial
+    topK === undefined &&
+    !expanded &&
+    (search?.results.length ?? 0) >= WORKSPACE_KNOWLEDGE_SEARCH_LIMITS.initial
   const { data: overview } = useSearchSourceOverview(scope)
   const indexing = (overview?.providers ?? [])
     .filter((provider) => provider.isSyncing)

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx

@@ -1,7 +1,15 @@
 'use client'
 
 import { lazy, memo, Suspense, useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { OverflowText, PlayOutline, Skeleton, TabStripAction, Tooltip, toast } from '@sim/emcn'
+import {
+  Button,
+  OverflowText,
+  PlayOutline,
+  Skeleton,
+  TabStripAction,
+  Tooltip,
+  toast,
+} from '@sim/emcn'
 import {
   Download,
   FileX,
@@ -640,16 +648,16 @@ function EmbeddedFileActions({
   return (
     <>
       {file && !isUpload && (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          <TabStripAction variant='subtle' onClick={handleOpenInFiles} aria-label='Open in files'>
-            <SquareArrowUpRight className={RESOURCE_TAB_ICON_CLASS} />
-          </TabStripAction>
-        </Tooltip.Trigger>
-        <Tooltip.Content side='bottom'>
-          <p>Open in files</p>
-        </Tooltip.Content>
-      </Tooltip.Root>
+        <Tooltip.Root>
+          <Tooltip.Trigger asChild>
+            <TabStripAction variant='subtle' onClick={handleOpenInFiles} aria-label='Open in files'>
+              <SquareArrowUpRight className={RESOURCE_TAB_ICON_CLASS} />
+            </TabStripAction>
+          </Tooltip.Trigger>
+          <Tooltip.Content side='bottom'>
+            <p>Open in files</p>
+          </Tooltip.Content>
+        </Tooltip.Root>
       )}
       <Tooltip.Root>
         <Tooltip.Trigger asChild>

apps/sim/app/workspace/[workspaceId]/home/components/user-input/hooks/use-skill-auto-mention.ts

@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useRef } from 'react'
 import { escapeRegExp } from '@sim/utils/string'
-import { SKILL_CHIP_TRIGGER } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
 import { isBuiltinSkillId } from '@/lib/workflows/skills/builtin-skills'
+import { SKILL_CHIP_TRIGGER } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
 import type { McpServer } from '@/hooks/queries/mcp'
 import type { SkillDefinition } from '@/hooks/queries/skills'
 import type { ChatContext } from '@/stores/panel'

apps/sim/app/workspace/[workspaceId]/home/search-params.ts

@@ -61,13 +61,21 @@ function endOfLocalDay(day: Date): Date {
 
 /** Resolve the shared source/recency controls once for a particular search. */
 export function searchFiltersFromParams(
-  params: { source: string | null; updated: (typeof UPDATED_WINDOWS)[number]['id']; from?: Date | null; to?: Date | null },
+  params: {
+    source: string | null
+    updated: (typeof UPDATED_WINDOWS)[number]['id']
+    from?: Date | null
+    to?: Date | null
+  },
   searchedAt: number
 ): WorkspaceSearchFilters {
   const days = UPDATED_WINDOWS.find((entry) => entry.id === params.updated)?.days
   return {
     ...(params.updated === 'custom' && params.from && params.to
-      ? { modifiedAfter: startOfLocalDay(params.from).toISOString(), modifiedBefore: endOfLocalDay(params.to).toISOString() }
+      ? {
+          modifiedAfter: startOfLocalDay(params.from).toISOString(),
+          modifiedBefore: endOfLocalDay(params.to).toISOString(),
+        }
       : {}),
     ...(params.source ? { source: params.source } : {}),
     ...(days ? { modifiedAfter: new Date(searchedAt - days * 86_400_000).toISOString() } : {}),

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

@@ -886,11 +886,8 @@ describe('knowledge search application use case', () => {
       expect(result.results[1]).toMatchObject({ similarity: 0.95, rankScore: 1 / 62 })
     })
 
-    it('assigns contiguous ranks after unreadable documents are removed', async () => {
-      mocks.executeSearch.mockResolvedValue([
-        row({ id: 'hidden', documentId: 'unreadable', rankScore: 0.9, rank: 1 }),
-        row({ id: 'visible', rankScore: 0.8, rank: 2 }),
-      ])
+    it('assigns contiguous ranks to the authorized retrieval rows', async () => {
+      mocks.executeSearch.mockResolvedValue([row({ id: 'visible', rankScore: 0.8, rank: 2 })])
 
       const result = await search()
 

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

@@ -53,8 +53,8 @@ import {
   vectorCandidatePoolLimit,
   visibleDocumentsQuery,
 } from '@/lib/knowledge/search/queries'
-import { forgetIndexedVectorSources } from '@/lib/knowledge/search/source-vector-indexes'
 import { RRF_K } from '@/lib/knowledge/search/recency'
+import { forgetIndexedVectorSources } from '@/lib/knowledge/search/source-vector-indexes'
 import type { StructuredFilter } from '@/lib/knowledge/types'
 
 /**