fix(chat): keep the longest overlapping mention chip and centralize the integration matcher mock

Author: waleedlatif1

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

@@ -5,6 +5,7 @@ import {
   deploymentShapeMock,
   deploymentShapeMockFns,
 } from '@sim/testing/mocks/deployment-shape.mock'
+import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
 import {
   organizationProviderMock,
   organizationProviderMockFns,
@@ -57,9 +58,7 @@ vi.mock('@/hooks/queries/skills', () => ({
   }),
 }))
 vi.mock('@/hooks/queries/mcp', () => ({ useMcpToolServers: () => ({ data: [] }) }))
-vi.mock('@/blocks/integration-matcher', () => ({
-  getIntegrationMatcher: () => ({ regex: null, byName: new Map() }),
-}))
+vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
 vi.mock(
   '@/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown',
   async () => {

apps/sim/app/o/[organizationId]/home/organization-home.test.tsx

@@ -7,6 +7,7 @@ import {
   deploymentShapeMock,
   deploymentShapeMockFns,
 } from '@sim/testing/mocks/deployment-shape.mock'
+import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
 import {
   kbConnectorsQueriesMock,
   kbConnectorsQueriesMockFns,
@@ -46,7 +47,7 @@ vi.mock('@/app/workspace/[workspaceId]/providers/feature-flags-provider', () =>
   useFeatureFlag: (name: string) => (name === 'mothership-plan-mode' ? mocks.plan : false),
 }))
 vi.mock('@/lib/core/config/deployment-shape', () => deploymentShapeMock)
-vi.mock('@/blocks/integration-matcher', () => ({ mentionifyIntegrations: (text: string) => text }))
+vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
 vi.mock('next/navigation', () => nextNavigationMock)
 vi.mock('@tanstack/react-query', () => reactQueryMock)
 vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-resource-panel', () => ({

apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/use-chat-find.ts

@@ -127,6 +127,7 @@ export function useChatFind({
   const [index, setIndex] = useState(0)
   if (scope !== chatId) {
     setScope(chatId)
+    // A pending chat adopting its id (undefined → id) is the same conversation.
     if (scope !== undefined) {
       setIsOpen(false)
       setQuery('')

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.test.tsx

@@ -2,14 +2,13 @@
  * @vitest-environment jsdom
  */
 import { act, type ReactNode } from 'react'
+import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
 import { createRoot, type Root } from 'react-dom/client'
 import { describe, expect, it, vi } from 'vitest'
 
 vi.mock('@/hooks/queries/skills', () => ({ useSkills: () => ({ data: [] }) }))
 vi.mock('@/hooks/queries/mcp', () => ({ useMcpToolServers: () => ({ data: [] }) }))
-vi.mock('@/blocks/integration-matcher', () => ({
-  getIntegrationMatcher: () => ({ regex: null, byName: new Map() }),
-}))
+vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
 
 import { SIM_SELECTION_MIME } from '@/lib/mothership/chat/selection-clipboard'
 import {

apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/utils.test.ts

@@ -1,10 +1,9 @@
+import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
 import { describe, expect, it, vi } from 'vitest'
 import { computeMentionRanges } from '@/app/workspace/[workspaceId]/home/components/user-message-content/utils'
 import type { ChatMessageContext } from '@/app/workspace/[workspaceId]/home/types'
 
-vi.mock('@/blocks/integration-matcher', () => ({
-  getIntegrationMatcher: () => ({ regex: null, byName: new Map() }),
-}))
+vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
 
 function spans(text: string, contexts: ChatMessageContext[]): string[] {
   return computeMentionRanges(text, contexts).map((range) => text.slice(range.start, range.end))
@@ -26,6 +25,18 @@ describe('computeMentionRanges', () => {
     expect(spans('@Workflow-2', [workflow])).toEqual([])
   })
 
+  it('keeps only the longest of overlapping mentions', () => {
+    const report: ChatMessageContext = { kind: 'file', label: 'report' }
+    const reportPdf: ChatMessageContext = { kind: 'file', label: 'report.pdf' }
+    expect(spans('compare @report.pdf with @report', [report, reportPdf])).toEqual([
+      '@report.pdf',
+      '@report',
+    ])
+    expect(
+      spans('@Workflow 2 and @Workflow', [workflow, { kind: 'workflow', label: 'Workflow 2' }])
+    ).toEqual(['@Workflow 2', '@Workflow'])
+  })
+
   it('matches slash commands by their slash prefix', () => {
     expect(spans('/research the topic', [{ kind: 'slash_command', label: 'research' }])).toEqual([
       '/research',

apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/utils.ts

@@ -45,8 +45,12 @@ export function computeMentionRanges(text: string, contexts: ChatMessageContext[
     ranges.push(range)
   }
 
-  ranges.sort((a, b) => a.start - b.start)
-  return ranges
+  ranges.sort((a, b) => a.start - b.start || b.end - a.end)
+  const merged: MentionRange[] = []
+  for (const range of ranges) {
+    if (range.start >= (merged.at(-1)?.end ?? 0)) merged.push(range)
+  }
+  return merged
 }
 
 /**

packages/testing/src/mocks/index.ts

@@ -383,6 +383,7 @@ export {
   inputValidationMock,
   inputValidationMockFns,
 } from './input-validation.mock'
+export { integrationMatcherMock } from './integration-matcher.mock'
 export {
   integrationsAvailabilityMock,
   integrationsAvailabilityMockFns,

packages/testing/src/mocks/integration-matcher.mock.ts

@@ -0,0 +1,17 @@
+import { vi } from 'vitest'
+
+/**
+ * Static mock module for `@/blocks/integration-matcher` that knows no integrations, so tests never
+ * load the block registry: the matcher has no regex and `mentionifyIntegrations` returns its input.
+ *
+ * @example
+ * ```ts
+ * import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
+ *
+ * vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
+ * ```
+ */
+export const integrationMatcherMock = {
+  getIntegrationMatcher: vi.fn(() => ({ regex: null, byName: new Map() })),
+  mentionifyIntegrations: vi.fn((text: string) => text),
+}