fix(workflow): thread custom-tool and MCP data into the search indexer; fix blockConfigs type

The search index now resolves tool names with the same data as the chip
renderers: the single caller passes customTools and a live MCP name map
into indexWorkflowSearchMatches, so indexed names match the panel for
custom-tool references and MCP entries, not just registry-backed types.
Also declare the optional name on WorkflowSearchIndexerOptions
blockConfigs entries, fixing the next build type error.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: j15z

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/workflow-search-replace.tsx

@@ -35,7 +35,9 @@ import {
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/float'
 import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-current-workflow'
 import { getBlock } from '@/blocks'
+import { useMcpTools } from '@/hooks/mcp/use-mcp-tools'
 import { useWorkspaceCredentials } from '@/hooks/queries/credentials'
+import { useCustomTools } from '@/hooks/queries/custom-tools'
 import { useFolderMap } from '@/hooks/queries/folders'
 import { isWorkflowEffectivelyLocked } from '@/hooks/queries/utils/folder-tree'
 import { useWorkflowMap } from '@/hooks/queries/workflows'
@@ -170,6 +172,15 @@ export function WorkflowSearchReplace() {
   const prevIsOpenRef = useRef(false)
   const afterReplaceIndexRef = useRef<number | null>(null)
   const { data: workspaceCredentials } = useWorkspaceCredentials({ workspaceId, enabled: isOpen })
+  const { data: customTools = [] } = useCustomTools(isOpen && workspaceId ? workspaceId : '')
+  const { mcpTools } = useMcpTools(isOpen && workspaceId ? workspaceId : '')
+  const mcpToolNamesById = useMemo(() => {
+    const names = new Map<string, string>()
+    for (const t of mcpTools) {
+      if (!names.has(t.id)) names.set(t.id, t.name)
+    }
+    return names
+  }, [mcpTools])
 
   useRegisterGlobalCommands([
     createCommand({
@@ -215,10 +226,14 @@ export function WorkflowSearchReplace() {
         workspaceId,
         workflowId,
         credentialTypeById,
+        customTools,
+        mcpToolNamesById,
       }),
     [
       currentWorkflow.isSnapshotView,
       credentialTypeById,
+      customTools,
+      mcpToolNamesById,
       query,
       readonlyReason,
       searchBlocks,

apps/sim/lib/workflows/search-replace/indexer.test.ts

@@ -1423,6 +1423,50 @@ describe('indexWorkflowSearchMatches', () => {
     expect(matches.some((match) => match.valuePath.includes('schema'))).toBe(false)
   })
 
+  it('indexes canonical MCP and custom-tool names over mutated stored titles', () => {
+    const workflow = createSearchReplaceWorkflowFixture()
+    workflow.blocks['tool-input-1'] = {
+      id: 'tool-input-1',
+      type: 'custom',
+      name: 'Tool Input Block',
+      position: { x: 0, y: 0 },
+      enabled: true,
+      outputs: {},
+      subBlocks: {
+        tools: {
+          id: 'tools',
+          type: 'tool-input',
+          value: [
+            { type: 'mcp', toolId: 'mcp-tool-1', title: 'Mutated Title', params: {} },
+            { type: 'custom-tool', customToolId: 'ct-1', title: 'Mutated Title', params: {} },
+          ],
+        },
+      },
+    }
+
+    const matches = indexWorkflowSearchMatches({
+      workflow,
+      query: 'customer',
+      mode: 'text',
+      blockConfigs: {
+        ...SEARCH_REPLACE_BLOCK_CONFIGS,
+        custom: {
+          subBlocks: [{ id: 'tools', title: 'Tools', type: 'tool-input' }],
+        },
+      },
+      customTools: [{ id: 'ct-1', title: 'Customer Records' }],
+      mcpToolNamesById: new Map([['mcp-tool-1', 'customer_lookup']]),
+    }).filter((match) => match.blockId === 'tool-input-1')
+
+    expect(matches).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ valuePath: [0, 'title'], searchText: 'customer_lookup' }),
+        expect.objectContaining({ valuePath: [1, 'title'], searchText: 'Customer Records' }),
+      ])
+    )
+    expect(matches.some((match) => match.searchText === 'Mutated Title')).toBe(false)
+  })
+
   it('indexes explicit secret tool params for intentional replacement', () => {
     const workflow = createSearchReplaceWorkflowFixture()
     workflow.blocks['tool-input-1'] = {

apps/sim/lib/workflows/search-replace/indexer.ts

@@ -932,6 +932,8 @@ function addToolInputMatches({
   workflowId,
   credentialTypeById,
   blockConfigs,
+  customTools,
+  mcpToolNamesById,
 }: {
   matches: WorkflowSearchMatch[]
   block: WorkflowSearchBlockState
@@ -951,13 +953,17 @@ function addToolInputMatches({
   workflowId?: string
   credentialTypeById?: Record<string, string | undefined>
   blockConfigs?: WorkflowSearchIndexerOptions['blockConfigs']
+  customTools?: WorkflowSearchIndexerOptions['customTools']
+  mcpToolNamesById?: WorkflowSearchIndexerOptions['mcpToolNamesById']
 }) {
   const parentCanonicalModes = getSearchCanonicalModes(block)
 
   parseStoredToolInputValue(value).forEach((tool, toolIndex) => {
     // Index the resolved display name (not the stored mutable title) so
     // search text and highlights match what the tool chip actually renders.
     const toolDisplayName = resolveStoredToolName(tool, {
+      customTools,
+      mcpToolNamesById,
       getBlockConfig: (type) => blockConfigs?.[type] ?? getBlock(type),
     })
     if (mode !== 'resource' && toolDisplayName) {
@@ -1234,6 +1240,8 @@ export function indexWorkflowSearchMatches(
     workflowId,
     blockConfigs = {},
     credentialTypeById,
+    customTools,
+    mcpToolNamesById,
   } = options
 
   const matches: WorkflowSearchMatch[] = []
@@ -1369,6 +1377,8 @@ export function indexWorkflowSearchMatches(
           workflowId,
           credentialTypeById,
           blockConfigs,
+          customTools,
+          mcpToolNamesById,
         })
         continue
       }

apps/sim/lib/workflows/search-replace/types.ts

@@ -3,6 +3,7 @@ import type {
   WorkflowSearchSubflowEditableValue,
   WorkflowSearchSubflowFieldId,
 } from '@/lib/workflows/search-replace/subflow-fields'
+import type { StoredCustomToolRecord } from '@/lib/workflows/subblocks/display'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { SelectorContext } from '@/hooks/selectors/types'
 import type { BlockState, SubBlockState } from '@/stores/workflows/workflow/types'
@@ -96,10 +97,19 @@ export interface WorkflowSearchIndexerOptions {
   workflowId?: string
   blockConfigs?: Record<
     string,
-    | { subBlocks?: SubBlockConfig[]; triggers?: { enabled?: boolean }; category?: string }
+    | {
+        name?: string
+        subBlocks?: SubBlockConfig[]
+        triggers?: { enabled?: boolean }
+        category?: string
+      }
     | undefined
   >
   credentialTypeById?: Record<string, string | undefined>
+  /** Custom-tool records so indexed tool names match the rendered chips. */
+  customTools?: StoredCustomToolRecord[]
+  /** Live MCP tool names keyed by composite tool id, same as the chip renderers. */
+  mcpToolNamesById?: ReadonlyMap<string, string>
 }
 
 export interface WorkflowSearchReplacementOption {