more subblock cases

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx

@@ -46,6 +46,8 @@ interface ShortInputProps {
   wandControlRef?: React.MutableRefObject<WandControlHandlers | null>
   /** Whether to hide the internal wand button (controlled by parent) */
   hideInternalWand?: boolean
+  /** Whether workflow search is actively highlighting this input */
+  isSearchHighlighted?: boolean
 }
 
 /**
@@ -74,6 +76,7 @@ export const ShortInput = memo(function ShortInput({
   useWebhookUrl = false,
   wandControlRef,
   hideInternalWand = false,
+  isSearchHighlighted = false,
 }: ShortInputProps) {
   const [localContent, setLocalContent] = useState<string>('')
   const [isFocused, setIsFocused] = useState(false)
@@ -332,16 +335,15 @@ export const ShortInput = memo(function ShortInput({
                 ? webhookManagement.webhookUrl
                 : ctrlValue
 
-            const displayValue =
-              password && !isFocused ? '•'.repeat(actualValue?.length ?? 0) : actualValue
+            const shouldMask = password && !isFocused && !isSearchHighlighted
+            const displayValue = shouldMask ? '•'.repeat(actualValue?.length ?? 0) : actualValue
 
-            const formattedText =
-              password && !isFocused
-                ? '•'.repeat(actualValue?.length ?? 0)
-                : formatDisplayText(actualValue, {
-                    accessiblePrefixes,
-                    highlightAll: !accessiblePrefixes,
-                  })
+            const formattedText = shouldMask
+              ? '•'.repeat(actualValue?.length ?? 0)
+              : formatDisplayText(actualValue, {
+                  accessiblePrefixes,
+                  highlightAll: !accessiblePrefixes,
+                })
 
             return (
               <>

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx

@@ -671,6 +671,7 @@ function SubBlockComponent({
             disabled={isDisabled}
             wandControlRef={wandControlRef}
             hideInternalWand={true}
+            isSearchHighlighted={isSearchHighlighted}
           />
         )
 

apps/sim/hooks/queries/workflow-search-replace.test.ts

@@ -2,11 +2,83 @@
  * @vitest-environment node
  */
 import { describe, expect, it } from 'vitest'
+import type { WorkflowSearchMatch } from '@/lib/workflows/search-replace/types'
 import {
+  buildWorkflowSearchMcpToolReplacementOptions,
   flattenWorkflowSearchReplacementOptions,
   workflowSearchReplaceKeys,
 } from '@/hooks/queries/workflow-search-replace'
 
+function createMcpToolMatch(serverId?: string): WorkflowSearchMatch {
+  return {
+    id: serverId ? `match-${serverId}` : 'match-all',
+    blockId: 'mcp-1',
+    blockName: 'MCP',
+    blockType: 'mcp',
+    subBlockId: 'tool',
+    canonicalSubBlockId: 'tool',
+    subBlockType: 'mcp-tool-selector',
+    valuePath: [],
+    target: { kind: 'subblock' },
+    kind: 'mcp-tool',
+    rawValue: serverId ? `${serverId}-search` : 'search',
+    searchText: 'Search',
+    editable: true,
+    navigable: true,
+    protected: false,
+    resource: {
+      kind: 'mcp-tool',
+      key: serverId ? `${serverId}-search` : 'search',
+      selectorContext: serverId ? { mcpServerId: serverId } : undefined,
+      resourceGroupKey: serverId ? `mcp-tool:${serverId}` : 'mcp-tool:any',
+    },
+  }
+}
+
+describe('buildWorkflowSearchMcpToolReplacementOptions', () => {
+  const tools = [
+    {
+      id: 'a-search',
+      name: 'search',
+      serverId: 'server-a',
+      serverName: 'Server A',
+      inputSchema: {},
+    },
+    {
+      id: 'b-search',
+      name: 'search',
+      serverId: 'server-b',
+      serverName: 'Server B',
+      inputSchema: {},
+    },
+  ]
+
+  it('filters MCP tool replacement options to the matched server context', () => {
+    const options = buildWorkflowSearchMcpToolReplacementOptions(
+      [createMcpToolMatch('server-a')],
+      tools
+    )
+
+    expect(options).toEqual([
+      {
+        kind: 'mcp-tool',
+        value: 'mcp-server-a-search',
+        label: 'Server A: search',
+        resourceGroupKey: 'mcp-tool:server-a',
+      },
+    ])
+  })
+
+  it('keeps all MCP tool replacement options when no server context exists', () => {
+    const options = buildWorkflowSearchMcpToolReplacementOptions([createMcpToolMatch()], tools)
+
+    expect(options.map((option) => option.value)).toEqual([
+      'mcp-server-a-search',
+      'mcp-server-b-search',
+    ])
+  })
+})
+
 describe('workflowSearchReplaceKeys', () => {
   it('builds stable hierarchical keys for credential candidates', () => {
     expect(

apps/sim/hooks/queries/workflow-search-replace.ts

@@ -568,6 +568,23 @@ export function useWorkflowSearchMcpServerReplacementOptions(
   })
 }
 
+export function buildWorkflowSearchMcpToolReplacementOptions(
+  toolGroups: WorkflowSearchMatch[],
+  tools: DiscoverMcpToolsResponse['data']['tools']
+): WorkflowSearchReplacementOption[] {
+  return toolGroups.flatMap((match) => {
+    const serverId = match.resource?.selectorContext?.mcpServerId
+    return tools
+      .filter((tool) => !serverId || tool.serverId === serverId)
+      .map((tool) => ({
+        kind: 'mcp-tool',
+        value: createMcpToolId(tool.serverId, tool.name),
+        label: `${tool.serverName}: ${tool.name}`,
+        resourceGroupKey: match.resource?.resourceGroupKey,
+      }))
+  })
+}
+
 export function useWorkflowSearchMcpToolReplacementOptions(
   matches: WorkflowSearchMatch[],
   workspaceId?: string
@@ -586,14 +603,7 @@ export function useWorkflowSearchMcpToolReplacementOptions(
         enabled: Boolean(workspaceId && toolGroups.length > 0),
         staleTime: 60 * 1000,
         select: (response: DiscoverMcpToolsResponse): WorkflowSearchReplacementOption[] =>
-          toolGroups.flatMap((match) =>
-            response.data.tools.map((tool) => ({
-              kind: 'mcp-tool',
-              value: createMcpToolId(tool.serverId, tool.name),
-              label: `${tool.serverName}: ${tool.name}`,
-              resourceGroupKey: match.resource?.resourceGroupKey,
-            }))
-          ),
+          buildWorkflowSearchMcpToolReplacementOptions(toolGroups, response.data.tools),
       },
     ],
   })

apps/sim/hooks/selectors/types.ts

@@ -90,6 +90,7 @@ export interface SelectorContext {
   awsSecretAccessKey?: string
   awsRegion?: string
   logGroupName?: string
+  mcpServerId?: string
 }
 
 export interface SelectorQueryArgs {