Enable read-only integration lookups for Search Assistant

Author: Sg312

apps/sim/blocks/blocks/github.ts

@@ -2521,7 +2521,10 @@ export const GitHubV2Block: BlockConfig<GitHubResponse> = {
   integrationType: IntegrationType.DevOps,
   tools: {
     ...GitHubBlock.tools,
-    access: (GitHubBlock.tools?.access || []).map((toolId) => `${toolId}_v2`),
+    access: [
+      ...(GitHubBlock.tools?.access || []).map((toolId) => `${toolId}_v2`),
+      'github_list_review_threads',
+    ],
     config: {
       ...GitHubBlock.tools?.config,
       tool: createVersionedToolSelector({

apps/sim/blocks/blocks/gmail.ts

@@ -679,6 +679,7 @@ export const GmailV2Block: BlockConfig<GmailToolResponse> = {
       'gmail_delete_v2',
       'gmail_add_label_v2',
       'gmail_remove_label_v2',
+      'gmail_list_labels_v2',
     ],
     config: {
       ...GmailBlock.tools?.config,

apps/sim/lib/mothership/assistant/tool-policy.test.ts

@@ -6,7 +6,7 @@ import {
 import type { ToolMetadata } from '@/tools/metadata'
 
 const tool: ToolMetadata = {
-  id: 'service_write',
+  id: 'google_drive_get_file',
   oauth: { required: true, provider: 'google-drive', authoritativeParams: ['instanceUrl'] },
   params: {
     credential: { type: 'string', visibility: 'user-only' },
@@ -19,7 +19,7 @@ const tool: ToolMetadata = {
 
 describe('Assistant integration policy', () => {
   const tokenTool: ToolMetadata = {
-    id: 'gitlab_get_project',
+    id: 'gitlab_list_projects',
     personalToken: { provider: 'gitlab', tokenParam: 'accessToken', hostParam: 'host' },
     params: {
       accessToken: { type: 'string', required: true, visibility: 'user-only' },
@@ -41,12 +41,22 @@ describe('Assistant integration policy', () => {
     expect(isAssistantIntegrationTool({ ...tokenTool, params: {} })).toBe(false)
   })
 
-  it('allows writes with one explicit connected account', () => {
+  it('allows selected reads with one explicit connected account', () => {
     expect(() =>
       assertAssistantIntegrationCall(tool, { credential: 'mine', body: 'updated content' })
     ).not.toThrow()
   })
 
+  it.each(['gmail_send', 'google_drive_create_file', 'new_provider_operation'])(
+    'rejects unapproved operation %s even with a personal account',
+    (id) => {
+      expect(isAssistantIntegrationTool({ ...tool, id })).toBe(false)
+      expect(() =>
+        assertAssistantIntegrationCall({ ...tool, id }, { credential: 'mine' })
+      ).toThrow()
+    }
+  )
+
   it.each(['accessToken', 'apiKey', 'headers', '_context', 'impersonateUserEmail', 'instanceUrl'])(
     'rejects model-supplied %s before execution',
     (name) =>

apps/sim/lib/mothership/assistant/tool-policy.ts

@@ -11,9 +11,52 @@ export const ASSISTANT_TOOLS = new Set([
 
 const CREDENTIAL_PARAMS = new Set(['credential', 'credentialId', 'oauthCredential'])
 
-/** Assistant uses the regular integration registry, with authentication supplied by the caller's account. */
+/** Read-only lookups complement search_workspace without exposing provider writes. */
+const ASSISTANT_INTEGRATION_TOOLS = new Set([
+  'slack_list_users',
+  'slack_get_user',
+  'slack_list_channels',
+  'slack_list_user_conversations',
+  'slack_get_channel_info',
+  'slack_list_members',
+  'gmail_list_labels_v2',
+  'google_calendar_list_calendars_v2',
+  'google_calendar_get_v2',
+  'google_calendar_instances_v2',
+  'google_calendar_freebusy_v2',
+  'google_drive_get_file',
+  'google_drive_list_comments',
+  'google_sheets_get_spreadsheet_v2',
+  'google_sheets_read_v2',
+  'jira_search_users',
+  'jira_list_projects',
+  'jira_get_project',
+  'jira_get_fields',
+  'jira_get_comments',
+  'confluence_list_spaces',
+  'confluence_get_user',
+  'confluence_get_page_children',
+  'confluence_get_page_ancestors',
+  'confluence_list_comments',
+  'github_search_users_v2',
+  'github_repo_info_v2',
+  'github_get_tree_v2',
+  'github_list_review_threads',
+  'github_get_pr_files_v2',
+  'gitlab_search_users',
+  'gitlab_list_members',
+  'gitlab_list_projects',
+  'gitlab_get_merge_request_changes',
+  'coda_resolve_browser_link',
+  'coda_list_pages',
+  'coda_list_tables',
+  'coda_list_columns',
+  'coda_list_rows',
+])
+
+/** Discovery and execution share the same operations and personal-account requirements. */
 export function isAssistantIntegrationTool(tool: ToolMetadata | undefined): boolean {
-  if (!tool) return false
+  if (!tool || !ASSISTANT_INTEGRATION_TOOLS.has(tool.id)) return false
   tool = projectAssistantConnectedAccountTool(tool, isLiveEnterpriseSearchEnabled)
   const tokenBinding = tool.personalToken
   const supportsToken =

apps/sim/lib/mothership/chat/payload.test.ts

@@ -2,7 +2,8 @@ import { envFlagsMockFns, resetEnvFlagsMock, setEnvFlags, workflowsUtilsMock } f
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { getExposedIntegrationTools } from '@/lib/integrations/tool-catalog'
 import { ChatPayloadSchema } from '@/lib/mothership/generated/protocol'
-import { searchIssuesV2Tool } from '@/tools/github/search_issues'
+import { searchUsersV2Tool } from '@/tools/github/search_users'
+import { gmailListLabelsV2Tool } from '@/tools/gmail/list_labels'
 
 const {
   mockCreateUserToolSchema,
@@ -153,15 +154,17 @@ vi.mock('@/tools/params', () => ({
 
 vi.mock('@/tools/metadata', () => ({
   getToolMetadata: (id: string) =>
-    id === 'github_search_issues_v2'
-      ? searchIssuesV2Tool
-      : id === 'gmail_send'
-        ? {
-            id,
-            params: { accessToken: { type: 'string', visibility: 'hidden', required: true } },
-            oauth: { required: true, provider: 'google-email' },
-          }
-        : undefined,
+    id === gmailListLabelsV2Tool.id
+      ? gmailListLabelsV2Tool
+      : id === 'github_search_users_v2'
+        ? searchUsersV2Tool
+        : id === 'gmail_send'
+          ? {
+              id,
+              params: { accessToken: { type: 'string', visibility: 'hidden', required: true } },
+              oauth: { required: true, provider: 'google-email' },
+            }
+          : undefined,
 }))
 
 vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => ({
@@ -630,16 +633,16 @@ describe('Assistant payload', () => {
     mockCreateUserToolSchema.mockReturnValue({ type: 'object', properties: {} })
     mockSearchApprovals.mockResolvedValue(new Map())
   })
-  it('discovers the existing GitHub PR-count tool with a personal credential in live Search', async () => {
+  it('discovers the existing GitHub user lookup tool with a personal credential in live Search', async () => {
     clearIntegrationToolSchemaCacheForTests()
     setEnvFlags({ isLiveEnterpriseSearchEnabled: true })
     mockSearchApprovals.mockResolvedValue(new Map([['github', true]]))
     vi.mocked(getExposedIntegrationTools).mockReturnValueOnce([
       {
-        toolId: searchIssuesV2Tool.id,
-        config: searchIssuesV2Tool,
+        toolId: searchUsersV2Tool.id,
+        config: searchUsersV2Tool,
         service: 'github',
-        operation: 'search_issues',
+        operation: 'search_users',
         blockType: 'github_v2',
         owners: [{ service: 'github', blockType: 'github_v2' }],
       },
@@ -653,7 +656,7 @@ describe('Assistant payload', () => {
     })
     expect(tools).toHaveLength(1)
     expect(tools[0]).toMatchObject({
-      name: 'github_search_issues_v2',
+      name: 'github_search_users_v2',
       oauth: { provider: 'github-repositories' },
       input_schema: { required: expect.arrayContaining(['q', 'credentialId']) },
     })
@@ -668,14 +671,25 @@ describe('Assistant payload', () => {
     ).toEqual([])
   })
   it('advertises approved personal organization integrations and rechecks revocation', async () => {
+    clearIntegrationToolSchemaCacheForTests()
+    vi.mocked(getExposedIntegrationTools).mockReturnValueOnce([
+      {
+        toolId: gmailListLabelsV2Tool.id,
+        config: gmailListLabelsV2Tool,
+        service: 'gmail',
+        operation: 'list_labels',
+        blockType: 'gmail',
+        owners: [{ service: 'gmail', blockType: 'gmail' }],
+      },
+    ])
     mockSearchApprovals.mockResolvedValue(new Map([['gmail', true]]))
     const options = {
       schemaSurface: 'copilot' as const,
       personalAccountsOnly: true,
       organizationId: 'org',
     }
     const approved = await buildIntegrationToolSchemas('person', options)
-    expect(approved.map((tool) => tool.name)).toContain('gmail_send')
+    expect(approved.map((tool) => tool.name)).toEqual(['gmail_list_labels_v2'])
     mockSearchApprovals.mockResolvedValue(new Map([['gmail', false]]))
     expect(await buildIntegrationToolSchemas('person', options)).toEqual([])
     mockSearchApprovals.mockResolvedValue(new Map([['gmail', true]]))
@@ -709,7 +723,7 @@ describe('Assistant payload', () => {
     expect(mockTrackChatUpload).not.toHaveBeenCalled()
   })
 
-  it('forwards organization scope without workspace, integration, or desktop authority', async () => {
+  it('forwards organization scope without workspace or desktop authority', async () => {
     const payload = await buildCopilotRequestPayload(
       {
         message: 'Find the policy',
@@ -726,13 +740,13 @@ describe('Assistant payload', () => {
       { selectedModel: '' }
     )
     expect(payload.organizationId).toBe('org-1')
-    expect(payload).not.toHaveProperty('integrationCatalog')
+    expect(payload.integrationCatalog).toEqual({ mcpServerIds: [] })
     expect(payload).not.toHaveProperty('workspaceId')
     expect(payload).not.toHaveProperty('desktopCapabilities')
     expect(payload).not.toHaveProperty('integrationTools')
   })
 
-  it('keeps the shared search scope without an integration gateway catalog', async () => {
+  it('keeps the shared search scope with native discovery and no MCP servers', async () => {
     clearIntegrationToolSchemaCacheForTests()
     const payload = await buildCopilotRequestPayload(
       {
@@ -762,7 +776,7 @@ describe('Assistant payload', () => {
       expect(payload).not.toHaveProperty(field)
     }
     expect(payload).not.toHaveProperty('integrationTools')
-    expect(payload).not.toHaveProperty('integrationCatalog')
+    expect(payload.integrationCatalog).toEqual({ mcpServerIds: [] })
   })
 })
 

apps/sim/lib/mothership/chat/payload.ts

@@ -464,9 +464,9 @@ export async function buildCopilotRequestPayload(
     messageId: userMessageId,
     ...(chatId ? { chatId } : {}),
     ...(allContexts.length > 0 ? { context: allContexts } : {}),
-    ...(!isAssistant && {
-      integrationCatalog: { mcpServerIds: [...new Set(params.mcpServerIds ?? [])] },
-    }),
+    integrationCatalog: {
+      mcpServerIds: isAssistant ? [] : [...new Set(params.mcpServerIds ?? [])],
+    },
     ...(params.userTimezone ? { userTimezone: params.userTimezone } : {}),
     ...(params.effort ? { effort: params.effort } : {}),
     ...(params.modelSelection ? { modelSelection: params.modelSelection } : {}),

apps/sim/lib/mothership/integrations/application/catalog.test.ts

@@ -223,16 +223,14 @@ describe('catalog authorization', () => {
     }
   )
 
-  it('rejects Search Assistant discovery before building native or MCP catalogs', async () => {
+  it('does not discover MCP operations in Search even with selected servers', async () => {
     queueChat()
-    await expect(
-      readIntegrationCatalog.execute({
-        principal: principal(),
-        input: { ...input, mcpServerIds: ['mcp-abc'] },
-      })
-    ).rejects.toThrow('Search Assistant uses scoped search and document reads')
-    expect(mocks.build).not.toHaveBeenCalled()
-    expect(mocks.mcp).not.toHaveBeenCalled()
+    mocks.mcp.mockResolvedValue([{ ...tools[0], name: 'mcp-abc-send', service: 'mcp:mcp-abc' }])
+    const result = await readIntegrationCatalog.execute({
+      principal: principal(),
+      input: { ...input, service: 'mcp:mcp-abc', mcpServerIds: ['mcp-abc'] },
+    })
+    expect(result.operations).toEqual([])
   })
   it.each(['user', 'organization', 'expired', 'audience', 'mode', 'membership'] as const)(
     'rejects invalid %s before catalog building',

apps/sim/lib/mothership/integrations/application/catalog.ts

@@ -166,11 +166,6 @@ const catalogUseCase = defineAuthorizedChatUseCase({
     delegation: { audience: INTEGRATION_CATALOG_AUDIENCE, isWithinScope: () => true },
   },
   async execute({ input, context }) {
-    if (context.mode === 'assistant')
-      throw new OrchestrationError(
-        'forbidden',
-        'Search Assistant uses scoped search and document reads for connected sources.'
-      )
     if (input.mcpExecution && context.organizationId)
       throw new OrchestrationError('forbidden', 'Executor catalogs require workspace agent scope')
     let workspaceId = context.workspaceId
@@ -185,10 +180,12 @@ const catalogUseCase = defineAuthorizedChatUseCase({
           {
             schemaSurface: 'copilot',
             organizationId: context.organizationId,
+            ...(context.mode === 'assistant' ? { personalAccountsOnly: true } : {}),
           },
           workspaceId
         )
     const includeMcp =
+      context.mode !== 'assistant' &&
       (!input.toolId || input.toolId.startsWith('mcp-')) &&
       (!input.service || input.service.startsWith('mcp:'))
     if (includeMcp && (input.mcpServerIds.length || input.mcpToolIds?.length)) {

apps/sim/lib/mothership/tool-executor/executor.test.ts

@@ -112,7 +112,7 @@ describe('copilot tool executor fallback', () => {
     )
     expect(result).toEqual({
       success: false,
-      error: 'Search Assistant uses scoped search and document reads for connected sources.',
+      error: 'This operation is not available in Search Assistant.',
     })
     expect(handler).not.toHaveBeenCalled()
     expect(executeAppTool).not.toHaveBeenCalled()

apps/sim/lib/mothership/tool-executor/executor.ts

@@ -4,11 +4,12 @@ import { toError } from '@sim/utils/errors'
 import { withWorkspaceInvocationScope } from '@/lib/core/application/workspace-invocation-scope'
 import { withResourceOutboundScope } from '@/lib/core/network/resource-scope.server'
 import { resolveInvocationWorkspace } from '@/lib/mothership/application/workspace-target'
-import { ASSISTANT_TOOLS } from '@/lib/mothership/assistant/tool-policy'
+import { ASSISTANT_TOOLS, isAssistantIntegrationTool } from '@/lib/mothership/assistant/tool-policy'
 import { prepareCopilotEnvironmentContext } from '@/lib/mothership/environment-context'
 import { projectToolErrorMessageForCopilot } from '@/lib/mothership/request/tools/resolved-secret-result'
 import { recordSecretUsage } from '@/lib/secrets/usage/record'
 import { executeTool as executeAppTool } from '@/tools'
+import { getToolMetadata } from '@/tools/metadata'
 import { getToolEntry, isClientExecuted, isKnownTool, isSimExecuted } from './router'
 import type { ToolExecutionContext, ToolExecutionResult, ToolHandler } from './types'
 
@@ -56,7 +57,10 @@ export async function executeTool(
             'search_sources',
             ...(params.scope !== 'workspace' ? ['settings'] : []),
           ]
-    if (organizationTools.includes(toolId)) {
+    if (
+      organizationTools.includes(toolId) ||
+      (context.requestMode === 'assistant' && isAssistantIntegrationTool(getToolMetadata(toolId)))
+    ) {
       if (context.targetWorkspaceId)
         return {
           success: false,
@@ -67,7 +71,7 @@ export async function executeTool(
     if (context.requestMode === 'assistant') {
       return {
         success: false,
-        error: 'Search Assistant uses scoped search and document reads for connected sources.',
+        error: 'This operation is not available in Search Assistant.',
       }
     }
     if (toolId === 'sim_cli') return executeBoundTool(toolId, params, context)
@@ -129,10 +133,14 @@ async function executeBoundTool(
   params: Record<string, unknown>,
   context: ToolExecutionContext
 ): Promise<ToolExecutionResult> {
-  if (context.requestMode === 'assistant' && !ASSISTANT_TOOLS.has(toolId)) {
+  if (
+    context.requestMode === 'assistant' &&
+    !ASSISTANT_TOOLS.has(toolId) &&
+    !isAssistantIntegrationTool(getToolMetadata(toolId))
+  ) {
     return {
       success: false,
-      error: 'Search Assistant uses scoped search and document reads for connected sources.',
+      error: 'This operation is not available in Search Assistant.',
     }
   }
   // Client-routed tools (e.g. run_workflow) are normally executed in the browser and never