more cases

Author: icecrasher321

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

@@ -5,6 +5,7 @@ import { Button, Input, Textarea, Tooltip } from '@/components/emcn'
 import { Trash } from '@/components/emcn/icons/trash'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/core/utils/cn'
+import { WORKFLOW_SEARCH_HIGHLIGHT_CLASS } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/constants'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
@@ -31,9 +32,6 @@ interface EvalInputProps {
   activeSearchTarget?: ActiveSearchTarget | null
 }
 
-const WORKFLOW_SEARCH_HIGHLIGHT_CLASS =
-  'rounded-sm bg-orange-400 shadow-[3px_0_0_#fb923c,-3px_0_0_#fb923c]'
-
 // Default values
 const createDefaultMetric = (): EvalMetric => ({
   id: generateId(),

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

@@ -20,6 +20,7 @@ import {
 } from '@/components/emcn'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/core/utils/cn'
+import { WORKFLOW_SEARCH_HIGHLIGHT_CLASS } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/constants'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
@@ -53,9 +54,6 @@ interface FieldFormatProps {
   activeSearchTarget?: ActiveSearchTarget | null
 }
 
-const WORKFLOW_SEARCH_HIGHLIGHT_CLASS =
-  'rounded-sm bg-orange-400 shadow-[3px_0_0_#fb923c,-3px_0_0_#fb923c]'
-
 /**
  * Type options for field type selection
  */

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

@@ -77,6 +77,7 @@ import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import {
   formatParameterLabel,
   getSubBlocksForToolInput,
+  getToolIdForOperation,
   getToolParametersConfig,
   isPasswordParameter,
   type SubBlocksForToolInput,
@@ -383,36 +384,6 @@ function getOperationOptions(blockType: string): { label: string; id: string }[]
   })
 }
 
-/**
- * Gets the correct tool ID for a given operation.
- *
- * @param blockType - The block type
- * @param operation - The selected operation (for multi-operation tools)
- * @returns The tool ID to use for execution, or `undefined` if not found
- */
-function getToolIdForOperation(blockType: string, operation?: string): string | undefined {
-  const block = getAllBlocks().find((b) => b.type === blockType)
-  if (!block || !block.tools?.access) return undefined
-
-  if (block.tools.access.length === 1) {
-    return block.tools.access[0]
-  }
-
-  if (operation && block.tools?.config?.tool) {
-    try {
-      return block.tools.config.tool({ operation })
-    } catch (error) {
-      logger.error('Error selecting tool for operation:', error)
-    }
-  }
-
-  if (operation && block.tools.access.includes(operation)) {
-    return operation
-  }
-
-  return block.tools.access[0]
-}
-
 /**
  * Creates a styled icon element for tool items in the selection dropdown.
  *

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/types.ts

@@ -1,36 +1 @@
-/**
- * Represents a tool selected and configured in the workflow
- *
- * @remarks
- * Valid types include:
- * - Standard block types (e.g., 'api', 'search', 'function')
- * - 'custom-tool': User-defined tools with custom code
- * - 'mcp': Individual MCP tool from a connected server
- *
- * For custom tools (new format), we only store: type, customToolId, usageControl, isExpanded.
- * Everything else (title, schema, code) is loaded dynamically from the database.
- * Legacy custom tools with inline schema/code are still supported for backwards compatibility.
- */
-export interface StoredTool {
-  /** Block type identifier */
-  type: string
-  /** Display title for the tool (optional for new custom tool format) */
-  title?: string
-  /** Direct tool ID for execution (optional for new custom tool format) */
-  toolId?: string
-  /** Parameter values configured by the user */
-  params?: Record<string, string>
-  /** Whether the tool details are expanded in UI */
-  isExpanded?: boolean
-  /** Database ID for custom tools (new format - reference only) */
-  customToolId?: string
-  /** Tool schema for custom tools (legacy format - inline JSON schema) */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  schema?: Record<string, any>
-  /** Implementation code for custom tools (legacy format - inline) */
-  code?: string
-  /** Selected operation for multi-operation tools */
-  operation?: string
-  /** Tool usage control mode for LLM */
-  usageControl?: 'auto' | 'force' | 'none'
-}
+export type { StoredTool } from '@/lib/workflows/tool-input/types'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/hooks/use-workflow-resource-replacement-options.ts

@@ -27,7 +27,7 @@ export function useWorkflowResourceReplacementOptions({
   workflowId,
 }: UseWorkflowResourceReplacementOptionsParams): WorkflowSearchReplacementOption[] {
   const oauthOptions = useWorkflowSearchOAuthReplacementOptions(matches, workspaceId, workflowId)
-  const knowledgeOptions = useWorkflowSearchKnowledgeReplacementOptions(workspaceId)
+  const knowledgeOptions = useWorkflowSearchKnowledgeReplacementOptions(matches, workspaceId)
   const selectorOptions = useWorkflowSearchSelectorReplacementOptions(matches)
   const tableOptions = useWorkflowSearchTableReplacementOptions(matches, workspaceId)
   const fileOptions = useWorkflowSearchFileReplacementOptions(matches, workspaceId)

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

@@ -73,22 +73,16 @@ export const workflowSearchReplaceKeys = {
   tableReplacementOptions: (workspaceId?: string) =>
     [...workflowSearchReplaceKeys.replacementOptions(), 'table', workspaceId ?? ''] as const,
   fileDetails: () => [...workflowSearchReplaceKeys.resourceDetails(), 'file'] as const,
-  fileDetail: (workspaceId?: string, fileKey?: string) =>
-    [...workflowSearchReplaceKeys.fileDetails(), workspaceId ?? '', fileKey ?? ''] as const,
   fileListDetails: (workspaceId?: string) =>
     [...workflowSearchReplaceKeys.fileDetails(), 'list', workspaceId ?? ''] as const,
   fileReplacementOptions: (workspaceId?: string) =>
     [...workflowSearchReplaceKeys.replacementOptions(), 'file', workspaceId ?? ''] as const,
   mcpServerDetails: () => [...workflowSearchReplaceKeys.resourceDetails(), 'mcp-server'] as const,
-  mcpServerDetail: (workspaceId?: string, serverId?: string) =>
-    [...workflowSearchReplaceKeys.mcpServerDetails(), workspaceId ?? '', serverId ?? ''] as const,
   mcpServerListDetails: (workspaceId?: string) =>
     [...workflowSearchReplaceKeys.mcpServerDetails(), 'list', workspaceId ?? ''] as const,
   mcpServerReplacementOptions: (workspaceId?: string) =>
     [...workflowSearchReplaceKeys.replacementOptions(), 'mcp-server', workspaceId ?? ''] as const,
   mcpToolDetails: () => [...workflowSearchReplaceKeys.resourceDetails(), 'mcp-tool'] as const,
-  mcpToolDetail: (workspaceId?: string, toolId?: string) =>
-    [...workflowSearchReplaceKeys.mcpToolDetails(), workspaceId ?? '', toolId ?? ''] as const,
   mcpToolListDetails: (workspaceId?: string) =>
     [...workflowSearchReplaceKeys.mcpToolDetails(), 'list', workspaceId ?? ''] as const,
   mcpToolReplacementOptions: (workspaceId?: string) =>
@@ -439,22 +433,33 @@ export function useWorkflowSearchOAuthReplacementOptions(
   })
 }
 
-export function useWorkflowSearchKnowledgeReplacementOptions(workspaceId?: string) {
+export function useWorkflowSearchKnowledgeReplacementOptions(
+  matches: WorkflowSearchMatch[],
+  workspaceId?: string
+) {
+  const knowledgeGroups = useMemo(
+    () => uniqueResourceOptionGroups(matches, 'knowledge-base'),
+    [matches]
+  )
+
   return useQueries({
     queries: [
       {
         queryKey: workflowSearchReplaceKeys.knowledgeReplacementOptions(workspaceId),
         queryFn: ({ signal }: { signal: AbortSignal }) =>
           fetchKnowledgeBases(workspaceId, 'active', signal),
-        enabled: Boolean(workspaceId),
+        enabled: Boolean(workspaceId && knowledgeGroups.length > 0),
         staleTime: 60 * 1000,
         placeholderData: (previous: KnowledgeBaseData[] | undefined) => previous,
         select: (knowledgeBases: KnowledgeBaseData[]): WorkflowSearchReplacementOption[] =>
-          knowledgeBases.map((knowledgeBase) => ({
-            kind: 'knowledge-base',
-            value: knowledgeBase.id,
-            label: knowledgeBase.name,
-          })),
+          knowledgeGroups.flatMap((match) =>
+            knowledgeBases.map((knowledgeBase) => ({
+              kind: 'knowledge-base',
+              value: knowledgeBase.id,
+              label: knowledgeBase.name,
+              resourceGroupKey: match.resource?.resourceGroupKey,
+            }))
+          ),
       },
     ],
   })

apps/sim/hooks/use-collaborative-workflow.ts

@@ -18,6 +18,10 @@ import { useShallow } from 'zustand/react/shallow'
 import { requestJson } from '@/lib/api/client/request'
 import { getWorkflowStateContract } from '@/lib/api/contracts'
 import { useSession } from '@/lib/auth/auth-client'
+import {
+  type WorkflowSearchSubflowFieldId,
+  workflowSearchSubflowFieldMatchesExpected,
+} from '@/lib/workflows/search-replace/subflow-fields'
 import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
 import { getSubBlocksDependingOnChange } from '@/blocks/utils'
@@ -1543,7 +1547,7 @@ export function useCollaborativeWorkflow() {
         subflowUpdates?: Array<{
           blockId: string
           blockType: 'loop' | 'parallel'
-          fieldId: string
+          fieldId: WorkflowSearchSubflowFieldId
           before: unknown
           after: unknown
         }>
@@ -1580,6 +1584,23 @@ export function useCollaborativeWorkflow() {
         return false
       }
 
+      const staleSubflowUpdate = undoSubflowUpdates.find((update) => {
+        const currentBlock = useWorkflowStore.getState().blocks[update.blockId]
+        if (!currentBlock || currentBlock.type !== update.blockType) return true
+        return !workflowSearchSubflowFieldMatchesExpected(
+          currentBlock,
+          update.fieldId,
+          update.before
+        )
+      })
+      if (staleSubflowUpdate) {
+        logger.warn('Skipping batch subflow update because expected value changed', {
+          blockId: staleSubflowUpdate.blockId,
+          fieldId: staleSubflowUpdate.fieldId,
+        })
+        return false
+      }
+
       if (updates.length > 0) {
         updates.forEach((update) => {
           useSubBlockStore.getState().setValue(update.blockId, update.subblockId, update.value)