address comments

Author: icecrasher321

apps/sim/lib/workflows/search-replace/resources/resolvers.test.ts

@@ -69,6 +69,32 @@ describe('dedupeOverlappingWorkflowSearchMatches', () => {
     ])
   })
 
+  it('uses kind priority rather than iteration order for equal-span non-text matches', () => {
+    const workflowReferenceMatch = createMatch({
+      id: 'workflow-reference',
+      kind: 'workflow-reference',
+      rawValue: '{{API_KEY}}',
+      searchText: 'API_KEY',
+      range: { start: 0, end: 11 },
+      resource: { kind: 'workflow-reference', token: '{{API_KEY}}', key: 'API_KEY' },
+    })
+    const environmentMatch = createMatch({
+      id: 'environment',
+      kind: 'environment',
+      rawValue: '{{API_KEY}}',
+      searchText: 'API_KEY',
+      range: { start: 0, end: 11 },
+      resource: { kind: 'environment', token: '{{API_KEY}}', key: 'API_KEY' },
+    })
+
+    expect(
+      dedupeOverlappingWorkflowSearchMatches([workflowReferenceMatch, environmentMatch])
+    ).toEqual([workflowReferenceMatch])
+    expect(
+      dedupeOverlappingWorkflowSearchMatches([environmentMatch, workflowReferenceMatch])
+    ).toEqual([workflowReferenceMatch])
+  })
+
   it('does not collapse matches from different fields', () => {
     const firstMatch = createMatch({
       id: 'first',

apps/sim/lib/workflows/search-replace/resources/resolvers.ts

@@ -1,11 +1,27 @@
 import type {
   WorkflowSearchMatch,
+  WorkflowSearchMatchKind,
   WorkflowSearchReplacementOption,
   WorkflowSearchResourceMeta,
   WorkflowSearchValuePath,
 } from '@/lib/workflows/search-replace/types'
 import type { SelectorContext } from '@/hooks/selectors/types'
 
+const OVERLAPPING_MATCH_KIND_PRIORITY: Record<WorkflowSearchMatchKind, number> = {
+  text: 0,
+  environment: 1,
+  'workflow-reference': 2,
+  'oauth-credential': 3,
+  'knowledge-base': 3,
+  'knowledge-document': 3,
+  workflow: 3,
+  'mcp-server': 3,
+  'mcp-tool': 3,
+  table: 3,
+  file: 3,
+  'selector-resource': 3,
+}
+
 export function stableStringifyWorkflowSearchValue(value: unknown): string {
   if (!value || typeof value !== 'object') return JSON.stringify(value)
   if (Array.isArray(value)) {
@@ -118,10 +134,9 @@ function shouldPreferOverlappingMatch(
   const currentLength = getRangeLength(current)
   if (candidateLength !== currentLength) return candidateLength < currentLength
 
-  if (candidate.kind !== current.kind) {
-    if (candidate.kind !== 'text') return true
-    if (current.kind !== 'text') return false
-  }
+  const candidatePriority = OVERLAPPING_MATCH_KIND_PRIORITY[candidate.kind]
+  const currentPriority = OVERLAPPING_MATCH_KIND_PRIORITY[current.kind]
+  if (candidatePriority !== currentPriority) return candidatePriority > currentPriority
 
   return false
 }