- {groups.map((group, i) => {
- if (group.kind === 'inline') {
- return (
-
+
)
}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-sanitize.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-sanitize.ts
index 4e0792df0ab..1d210bd1b92 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-sanitize.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-sanitize.ts
@@ -2,7 +2,9 @@ const HIDDEN_INLINE_REFERENCE_PATTERN =
/`[^`\n]*(?:internal\/tool-results\/|internal\/blocktips\/|components\/integrations\/[^`\n]*README)[^`\n]*`/g
/**
- * A complete workspace-resource tag: opener, payload, closer.
+ * A complete inline-chip tag — `:first-child]:mt-0 [&>:last-child]:mb-0')}
- >
-
+
+ })}
+
+ {groups.map((group, i) => {
+ if (group.kind === 'inline') {
+ return (
+
+ {group.markdown}
+
+
+ )
+ }
+ return (
+ :first-child]:mt-0 [&>:last-child]:mb-0')}
>
- {group.markdown}
-
-
+
+ {sources.map((source) => (
+
+ )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/index.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/index.ts
new file mode 100644
index 00000000000..4168fe2a584
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/index.ts
@@ -0,0 +1 @@
+export { SourceChip, sourceLabel } from './source-chip'
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/source-chip.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/source-chip.tsx
new file mode 100644
index 00000000000..4101ddffb17
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/source-chip.tsx
@@ -0,0 +1,89 @@
+'use client'
+
+import { chipFilledFillTokens, chipHoverSurfaceClass, cn, OverflowText, Tooltip } from '@sim/emcn'
+import { stripVersionSuffix } from '@sim/utils/string'
+import { faviconUrl } from '@/lib/core/utils/favicon'
+import { blockTypeToIconMap } from '@/lib/integrations'
+import {
+ externalLinkHostname,
+ handleExternalLinkClick,
+ hideBrokenFavicon,
+} from '@/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/external-link'
+import type { SourceTagData } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
+import { BrandIcon, type StyleableIcon } from '@/blocks/brand-icon'
+
+/**
+ * Brand marks by base block type. A connector id names the same product as its
+ * integration block (`confluence`, `google_drive`), so the block's mark serves
+ * the chip — through the catalog icon map rather than the connector registry,
+ * which would drag seventy connector modules into every surface that renders
+ * chat. Versioned catalog types (`gmail_v2`) collapse onto their base name.
+ */
+const BRAND_ICON_BY_BASE_TYPE: ReadonlyMap
+
+ )}
{thinkingExpanded && isLast ? (
// Fixed-height placeholder for the NEXT piece of output: the shimmer
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/utils.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/utils.test.ts
index f0a74e539a7..de5bd6402fe 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/utils.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/utils.test.ts
@@ -2,7 +2,7 @@
* @vitest-environment node
*/
import { describe, expect, it } from 'vitest'
-import { deriveMessagePhase, resolveToolDisplayState } from './utils'
+import { collectMessageSources, deriveMessagePhase, resolveToolDisplayState } from './utils'
describe('deriveMessagePhase', () => {
it('is streaming whenever the transport is live', () => {
@@ -36,3 +36,25 @@ describe('resolveToolDisplayState', () => {
expect(resolveToolDisplayState('rejected')).toBe('icon')
})
})
+
+describe('collectMessageSources', () => {
+ const source = (url: string, extra = '') => `{providerId}
: null,
+}))
+
+import { SuggestedActions } from '@/app/workspace/[workspaceId]/home/components/suggested-actions/suggested-actions'
+import { useMothershipModeStore } from '@/stores/mothership-mode/store'
+
+let root: Root | null = null
+let container: HTMLDivElement | null = null
+const onSelectPrompt = vi.fn()
+
+function mount() {
+ ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+ container = document.createElement('div')
+ document.body.appendChild(container)
+ root = createRoot(container)
+ act(() => root?.render(
+
+}) {
+ const { workspaceId, credentialId } = await params
+ return
+ Search
+
+ )
+
+ const actions =
+ credential && isAdmin ? (
+ <>
+
+ Reconnect
+
+ setShowDeleteConfirmDialog(true)}
+ disabled={deleteCredential.isPending}
+ >
+ Disconnect
+
+
+ Loading…
+
+ )
+ }
+
+ if (!credential) {
+ return (
+
+ Credential not found.
+
+ )
+ }
+
+ return (
+ <>
+
+
+
+
+
+ form.setDisplayNameDraft(event.target.value)}
+ autoComplete='off'
+ data-lpignore='true'
+ disabled={!isAdmin}
+ />
+
+
+
+ form.setDescriptionDraft(event.target.value)}
+ placeholder='Add a description...'
+ maxLength={500}
+ autoComplete='off'
+ data-lpignore='true'
+ disabled={!isAdmin}
+ />
+
+
+
+
+
+ }
+ >
+
+
+ {credential.displayName.slice(0, 1) || '?'}
+
+
+ )
+ }
+ title={display?.detailTitle ?? credential.displayName}
+ subtitle={display?.detailSubtitle ?? 'Connected service'}
+ />
+
+ {providerId}
: null,
+}))
+vi.mock('@/blocks', () => ({ getBlock: () => undefined }))
+vi.mock('@/lib/integrations', () => ({
+ resolveCredentialDisplay: () => ({ icon: () => null, blockType: 'confluence', subtitle: 'Sub' }),
+}))
+
+vi.mock('@/lib/sim-search/connectors', () => {
+ const icon = () => null
+ const connector = (type: string, name: string, description: string) => ({
+ type,
+ meta: { id: type, name, description, icon },
+ providerId: type,
+ providerIds: [type],
+ requiredScopes: [],
+ serviceName: name,
+ serviceIcon: icon,
+ blockType: type,
+ })
+ const providers = new Set(['confluence', 'jira', 'slack'])
+ return {
+ isSearchConnectorAvailable: (
+ candidate: { blockType: string },
+ availability: ReadonlyMap
+ {
+ if (!open) setConnectTarget(null)
+ }}
+ workspaceId={workspaceId}
+ providerId={connectTarget.providerId}
+ requiredScopes={connectTarget.requiredScopes}
+ serviceName={connectTarget.serviceName}
+ serviceIcon={connectTarget.serviceIcon}
+ />
+ )}
+
+ )
+}
diff --git a/apps/sim/components/emails/_styles/base.tokens.test.ts b/apps/sim/components/emails/_styles/base.tokens.test.ts
index 0baac25f776..9d4b794a32b 100644
--- a/apps/sim/components/emails/_styles/base.tokens.test.ts
+++ b/apps/sim/components/emails/_styles/base.tokens.test.ts
@@ -91,8 +91,16 @@ describe('email geometry mirrors the platform', () => {
})
it('the CTA transcribes chipGeometryClass', () => {
- const geometry = chipChrome.match(/chipGeometryClass = `([^`]+)`/)?.[1]
- expect(geometry).toBeDefined()
+ // chipGeometryClass composes the unrounded geometry with the default radius,
+ // so the transcription reads both halves rather than one literal.
+ expect(chipChrome).toMatch(
+ /chipGeometryClass = `\$\{chipGeometryUnroundedClass\} \$\{chipRadiusClass\}`/
+ )
+ const unrounded = chipChrome.match(/chipGeometryUnroundedClass = `([^`]+)`/)?.[1]
+ const radius = chipChrome.match(/chipRadiusClass = '([^']+)'/)?.[1]
+ expect(unrounded).toBeDefined()
+ expect(radius).toBeDefined()
+ const geometry = `${unrounded} ${radius}`
for (const token of ['h-[30px]', 'rounded-lg', 'px-2', 'text-sm']) {
expect(geometry).toContain(token)
}
diff --git a/apps/sim/lib/posthog/events.ts b/apps/sim/lib/posthog/events.ts
index 85da54723a7..71c9643839a 100644
--- a/apps/sim/lib/posthog/events.ts
+++ b/apps/sim/lib/posthog/events.ts
@@ -614,10 +614,19 @@ export interface PostHogEventMap {
action_id?: string
}
- /** A home-page suggested action was clicked. `action_id` is the candidate id (e.g. `gmail-0`). */
+ /** The chat composer's mode switcher picked a different mode. */
+ chat_mode_changed: {
+ workspace_id: string
+ mode: 'build' | 'search'
+ }
+
+ /**
+ * A home-page suggested action was clicked. `action_id` is the candidate id
+ * (e.g. `gmail-0`); `connector` rows are the Search-mode "Connect X" rows.
+ */
suggested_action_clicked: {
workspace_id: string
- kind: 'prompt' | 'integration'
+ kind: 'prompt' | 'integration' | 'connector'
action_id: string
label: string
position: number
diff --git a/apps/sim/lib/sim-search/connectors.test.ts b/apps/sim/lib/sim-search/connectors.test.ts
new file mode 100644
index 00000000000..df5ffbd7ef1
--- /dev/null
+++ b/apps/sim/lib/sim-search/connectors.test.ts
@@ -0,0 +1,135 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('@/connectors/registry', () => {
+ const icon = () => null
+ return {
+ CONNECTOR_META_REGISTRY: {
+ mintlify: { id: 'mintlify', name: 'Mintlify', auth: { mode: 'apiKey' }, icon },
+ jsm: {
+ id: 'jsm',
+ name: 'Jira Service Management',
+ auth: { mode: 'oauth', provider: 'jira' },
+ icon,
+ },
+ jira: { id: 'jira', name: 'Jira', auth: { mode: 'oauth', provider: 'jira' }, icon },
+ google_drive: {
+ id: 'google_drive',
+ name: 'Google Drive',
+ auth: { mode: 'oauth', provider: 'google-drive' },
+ icon,
+ },
+ gmail: {
+ id: 'gmail',
+ name: 'Gmail',
+ auth: { mode: 'oauth', provider: 'google-email' },
+ icon,
+ },
+ unknown: {
+ id: 'unknown',
+ name: 'Unknown',
+ auth: { mode: 'oauth', provider: 'not-a-service' },
+ icon,
+ },
+ salesforce: {
+ id: 'salesforce',
+ name: 'Salesforce',
+ auth: { mode: 'oauth', provider: 'salesforce' },
+ icon,
+ },
+ },
+ }
+})
+
+vi.mock('@/lib/oauth', () => {
+ const services = {
+ jira: { providerId: 'jira', name: 'Jira', icon: () => null },
+ 'google-drive': { providerId: 'google-drive', name: 'Google Drive', icon: () => null },
+ gmail: { providerId: 'google-email', name: 'Gmail', icon: () => null },
+ salesforce: {
+ providerId: 'salesforce',
+ name: 'Salesforce',
+ icon: () => null,
+ additionalProviderIds: ['salesforce-sandbox'],
+ },
+ }
+ return {
+ getServiceConfigByServiceId: (serviceId: string) =>
+ services[serviceId as keyof typeof services] ?? null,
+ getServiceConfigByProviderId: (providerId: string) =>
+ Object.values(services).find((service) => service.providerId === providerId) ?? null,
+ getCanonicalScopesForProvider: (providerId: string) => [`${providerId}:read`],
+ }
+})
+
+vi.mock('@/lib/integrations/credential-display', () => ({
+ getIntegrationsForCredentialProvider: (providerId: string) =>
+ providerId === 'jira' ? [{ type: 'jira' }] : [],
+}))
+
+import {
+ isSearchConnectorAvailable,
+ isSearchConnectorConnected,
+ isSearchConnectorProvider,
+ SEARCH_CONNECTORS,
+} from '@/lib/sim-search/connectors'
+
+describe('SEARCH_CONNECTORS', () => {
+ it('lists OAuth connectors with a registered service, alphabetically', () => {
+ expect(SEARCH_CONNECTORS.map((connector) => connector.type)).toEqual([
+ 'gmail',
+ 'google_drive',
+ 'jira',
+ 'jsm',
+ 'salesforce',
+ ])
+ })
+
+ it('resolves the provider, scopes, and brand block type per connector', () => {
+ const jsm = SEARCH_CONNECTORS.find((connector) => connector.type === 'jsm')
+ expect(jsm).toMatchObject({
+ providerId: 'jira',
+ providerIds: ['jira'],
+ requiredScopes: ['jira:read'],
+ serviceName: 'Jira',
+ blockType: 'jira',
+ })
+ const drive = SEARCH_CONNECTORS.find((connector) => connector.type === 'google_drive')
+ expect(drive).toMatchObject({ blockType: 'google_drive' })
+ const gmail = SEARCH_CONNECTORS.find((connector) => connector.type === 'gmail')
+ expect(gmail).toMatchObject({ providerId: 'google-email', serviceName: 'Gmail' })
+ })
+})
+
+describe('isSearchConnectorProvider', () => {
+ it('matches credentials by provider, including shared and additional providers', () => {
+ expect(isSearchConnectorProvider('jira')).toBe(true)
+ expect(isSearchConnectorProvider('google-drive')).toBe(true)
+ expect(isSearchConnectorProvider('salesforce-sandbox')).toBe(true)
+ expect(isSearchConnectorProvider('slack')).toBe(false)
+ expect(isSearchConnectorProvider(null)).toBe(false)
+ })
+})
+
+describe('isSearchConnectorConnected', () => {
+ it('counts a credential under any of the service’s provider ids', () => {
+ const salesforce = SEARCH_CONNECTORS.find((connector) => connector.type === 'salesforce')!
+ expect(isSearchConnectorConnected(salesforce, new Set(['salesforce-sandbox']))).toBe(true)
+ expect(isSearchConnectorConnected(salesforce, new Set(['jira']))).toBe(false)
+ })
+})
+
+describe('isSearchConnectorAvailable', () => {
+ it('reads the OAuth path of the connector’s block, defaulting to available', () => {
+ const jira = SEARCH_CONNECTORS.find((connector) => connector.type === 'jira')!
+ expect(isSearchConnectorAvailable(jira, new Map([['jira', { oauthAvailable: false }]]))).toBe(
+ false
+ )
+ expect(isSearchConnectorAvailable(jira, new Map([['jira', { oauthAvailable: true }]]))).toBe(
+ true
+ )
+ expect(isSearchConnectorAvailable(jira, new Map())).toBe(true)
+ })
+})
diff --git a/apps/sim/lib/sim-search/connectors.ts b/apps/sim/lib/sim-search/connectors.ts
new file mode 100644
index 00000000000..fda056d4d27
--- /dev/null
+++ b/apps/sim/lib/sim-search/connectors.ts
@@ -0,0 +1,108 @@
+import type { ComponentType } from 'react'
+import { getIntegrationsForCredentialProvider } from '@/lib/integrations/credential-display'
+import {
+ getCanonicalScopesForProvider,
+ getServiceConfigByProviderId,
+ getServiceConfigByServiceId,
+} from '@/lib/oauth'
+import { CONNECTOR_META_REGISTRY } from '@/connectors/registry'
+import type { ConnectorMeta } from '@/connectors/types'
+
+/**
+ * A knowledge-base connector offered on the Sim Search surface: the connector's
+ * client-safe meta paired with the OAuth service a user connects it through.
+ * Only OAuth connectors qualify — an API-key connector has nowhere to keep a
+ * personal key outside a knowledge base, so it stays a knowledge-base flow.
+ */
+export interface SearchConnector {
+ /** `CONNECTOR_META_REGISTRY` key — the id a knowledge base reports in `connectorTypes`. */
+ type: string
+ meta: ConnectorMeta
+ /** Canonical OAuth provider id the connection is stored under. */
+ providerId: string
+ /**
+ * Every provider id a credential for this service may carry: the canonical
+ * id plus any additional authorization server (Salesforce sandbox). A
+ * credential under any of them counts as connected.
+ */
+ providerIds: readonly string[]
+ /**
+ * Scopes listed in the connect modal — the provider's canonical set, which is
+ * what the knowledge-base connector flow requests for the same provider.
+ */
+ requiredScopes: readonly string[]
+ /** The OAuth service's own name and mark, for the connect modal. */
+ serviceName: string
+ serviceIcon: ComponentType<{ className?: string }>
+ /**
+ * Block type lending the brand tile and the deployment-availability lookup:
+ * the first catalog integration on the provider, else the connector type.
+ */
+ blockType: string
+}
+
+/**
+ * Every Sim Search connector, alphabetical by name. Built once at module load.
+ *
+ * A connector names its service by service id (`confluence`) or, for Gmail, by
+ * the provider id (`google-email`); the knowledge-base connector flow accepts
+ * both through `getProviderIdFromServiceId`'s raw fallback, so the lookup here
+ * tries the service id first and the provider id second.
+ */
+export const SEARCH_CONNECTORS: readonly SearchConnector[] = Object.entries(CONNECTOR_META_REGISTRY)
+ .flatMap(([type, meta]): SearchConnector[] => {
+ if (meta.auth.mode !== 'oauth') return []
+ const service =
+ getServiceConfigByServiceId(meta.auth.provider) ??
+ getServiceConfigByProviderId(meta.auth.provider)
+ if (!service) return []
+ return [
+ {
+ type,
+ meta,
+ providerId: service.providerId,
+ providerIds: [service.providerId, ...(service.additionalProviderIds ?? [])],
+ requiredScopes: getCanonicalScopesForProvider(service.providerId),
+ serviceName: service.name,
+ serviceIcon: service.icon as ComponentType<{ className?: string }>,
+ blockType: getIntegrationsForCredentialProvider(service.providerId)[0]?.type ?? type,
+ },
+ ]
+ })
+ .sort((a, b) => a.meta.name.localeCompare(b.meta.name))
+
+/**
+ * Provider ids some Sim Search connector connects through. Several connectors
+ * share one (Jira and Jira Service Management both use `jira`), so a credential
+ * is matched to the surface by provider rather than to a single connector.
+ */
+const SEARCH_PROVIDER_IDS: ReadonlySet
+
+ {connectTarget && workspaceId && (
+
+ setSearchTerm(e.target.value)}
+ disabled={credentialsLoading}
+ />
+
+
+
+ {visibleCredentials.length > 0 && (
+
+ {visibleCredentials.map((credential) => (
+
+ )}
+
+ {visibleConnectors.length > 0 && (
+
+ {visibleConnectors.map((connector) => (
+
+ )}
+
+ {showNoResults && (
+
+ No connectors found matching “{searchTerm}”
+
+ )}
+
+