fix(mothership): align attachment context with available tools

Author: Sg312

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

@@ -604,6 +604,40 @@ describe('handleUnifiedChatPost', () => {
     expect(processContextsServer).not.toHaveBeenCalled()
   })
 
+  it('passes browser attachment metadata without advertising an unavailable browser agent', async () => {
+    const response = await handleUnifiedChatPost(
+      new NextRequest('http://localhost/api/copilot/chat', {
+        method: 'POST',
+        body: JSON.stringify({
+          message: 'Explain the selected page',
+          workspaceId: 'ws-1',
+          createNewChat: true,
+          resourceAttachments: [
+            {
+              type: 'browser',
+              id: 'browser-session',
+              title: 'Documentation',
+              url: 'https://docs.example.com/guide',
+              active: true,
+            },
+          ],
+        }),
+      })
+    )
+    expect(response.status).toBe(200)
+    const payload = buildCopilotRequestPayload.mock.calls[0]?.[0]
+    expect(payload.contexts).toEqual([
+      expect.objectContaining({
+        type: 'active_resource',
+        tag: '@active_tab',
+        content: expect.stringContaining('cannot read or drive browser tabs'),
+      }),
+    ])
+    expect(payload.contexts[0].content).toContain('https://docs.example.com/guide')
+    expect(payload.contexts[0].content).toContain('Documentation')
+    expect(payload.contexts[0].content).not.toContain('browser subagent')
+  })
+
   it('forwards slash-selected MCP server ids to the request-local tool builder', async () => {
     const response = await handleUnifiedChatPost(
       new NextRequest('http://localhost/api/copilot/chat', {

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

@@ -479,9 +479,9 @@ async function resolveAgentContexts(params: {
             tag: resource.active ? '@active_tab' : '@open_tab',
             content: `The user's ${
               resource.active ? 'currently visible browser tab' : 'other open browser tab'
-            } (driven by the browser subagent) is open on: ${
+            } is open on: ${
               title ? `"${title}" — ` : ''
-            }${resource.url}`,
+            }${resource.url}. You cannot read or drive browser tabs here; this attachment supplies only the title and URL.`,
           }
         }
         const ctx = await resolveActiveResourceContext(

apps/sim/lib/mothership/chat/process-contents.test.ts

@@ -10,6 +10,7 @@ import {
   MAX_TABLE_SELECTION_PREVIEW_LENGTH,
   MAX_TABLE_SELECTION_ROWS,
 } from '@/lib/mothership/chat/selection-context'
+import { buildTaggedMcpToolSchemas } from '@/lib/mothership/mcp-tools'
 import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 import type { ChatContext } from '@/stores/panel'
 
@@ -53,7 +54,10 @@ const {
 
 vi.mock('@/blocks/registry', () => ({ getBlock, getBlockRegistry }))
 vi.mock('@/lib/mothership/block-visibility', () => ({ getBlockVisibilityForCopilot }))
-vi.mock('@/ee/access-control/utils/permission-check', () => ({ getUserPermissionConfig }))
+vi.mock('@/ee/access-control/utils/permission-check', () => ({
+  getUserPermissionConfig,
+  validateMcpToolsAllowed: vi.fn(),
+}))
 vi.mock('@/lib/integrations/availability.server', () => ({
   isIntegrationDeploymentAvailableForVisibility: isIntegrationDeploymentAvailable,
 }))
@@ -505,7 +509,7 @@ describe('processContextsServer - MCP contexts', () => {
     vi.clearAllMocks()
   })
 
-  it('lists only the tools from the slash-selected MCP server', async () => {
+  it('references the selected service while the request catalog owns tool discovery', async () => {
     discoverServerTools.mockResolvedValue([
       {
         serverId: 'mcp-server-1',
@@ -523,14 +527,36 @@ describe('processContextsServer - MCP contexts', () => {
       'ws-1'
     )
 
-    expect(discoverServerTools).toHaveBeenCalledWith('user-1', 'mcp-server-1', 'ws-1')
     expect(result).toEqual([
-      expect.objectContaining({
+      {
         type: 'mcp',
         tag: '/Docs',
-        content: expect.stringContaining('mcp-server-1-search'),
-      }),
+        content: JSON.stringify({ serverId: 'mcp-server-1', service: 'mcp:mcp-server-1' }),
+      },
     ])
+    expect(discoverServerTools).not.toHaveBeenCalled()
+    const catalog = await buildTaggedMcpToolSchemas('user-1', 'ws-1', ['mcp-server-1'])
+    expect(discoverServerTools).toHaveBeenCalledTimes(1)
+    expect(discoverServerTools).toHaveBeenCalledWith('user-1', 'mcp-server-1', 'ws-1')
+    expect(catalog).toMatchObject([
+      { name: 'mcp-server-1-search', service: JSON.parse(result[0].content).service },
+    ])
+  })
+
+  it('keeps the selected service reference when discovery is unavailable', async () => {
+    discoverServerTools.mockRejectedValue(new Error('Server temporarily unavailable'))
+    const result = await processContextsServer(
+      [{ kind: 'mcp', serverId: 'mcp-server-1', label: 'Docs' }],
+      'user-1',
+      '/Docs find auth docs',
+      'ws-1'
+    )
+    expect(result).toHaveLength(1)
+    expect(JSON.parse(result[0].content)).toEqual({
+      serverId: 'mcp-server-1',
+      service: 'mcp:mcp-server-1',
+    })
+    expect(discoverServerTools).not.toHaveBeenCalled()
   })
 })
 
@@ -557,7 +583,8 @@ describe('processContextsServer - browser and terminal selections', () => {
       },
     ])
     expect(result[0].content).toContain('cannot read or drive browser tabs')
-    expect(result[1].content).toContain('terminal list operation')
+    expect(result[1].content).toContain('cannot read or drive terminals')
+    expect(result[1].content).not.toContain('terminal list operation')
   })
 
   it('keeps the live browser pointer and appends quoted untrusted page text', async () => {

apps/sim/lib/mothership/chat/process-contents.ts

@@ -13,8 +13,6 @@ import { isIntegrationDeploymentAvailableForVisibility } from '@/lib/integration
 import { readKnowledgeBase } from '@/lib/knowledge/application/knowledge-bases'
 import { toOverview } from '@/lib/logs/log-views'
 import type { TraceSpan } from '@/lib/logs/types'
-import { mcpService } from '@/lib/mcp/service'
-import { createMcpToolId } from '@/lib/mcp/utils'
 import { createCopilotChatKnowledgePrincipal } from '@/lib/mothership/application/execute-knowledge-use-case'
 import { createCopilotChatTablePrincipal } from '@/lib/mothership/application/execute-table-use-case'
 import { createCopilotChatFilePrincipal } from '@/lib/mothership/auth/file-delegation'
@@ -73,13 +71,7 @@ interface AgentContext {
   type: AgentContextType
   tag: string
   content: string
-  /**
-   * Canonical, URL-encoded VFS path for the tagged resource (e.g.
-   * `agent/skills/My%20Skill.json`). Tagged resources are sent as path
-   * pointers so the model reads them on demand via VFS tools instead of the
-   * full body bloating the request. Skills are the exception: they carry both
-   * `path` and the full `content` so the skill is autoloaded.
-   */
+  /** A CLI-readable file address; other resources carry canonical references in content. */
   path?: string
 }
 
@@ -135,21 +127,11 @@ export async function processContextsServer(
         )
       }
       if (ctx.kind === 'mcp' && ctx.serverId && currentWorkspaceId) {
-        const tools = await mcpService.discoverServerTools(userId, ctx.serverId, currentWorkspaceId)
-        if (tools.length === 0) return null
-        const toolLines = tools.map((tool) => {
-          const name = createMcpToolId(tool.serverId, tool.name)
-          return `- ${name}: ${tool.description || tool.name}`
-        })
+        /** The authorized request catalog owns discovery; context identifies the selected service. */
         return {
           type: 'mcp',
           tag: ctx.label ? `/${ctx.label}` : '/',
-          content: [
-            `The user explicitly enabled the MCP server "${ctx.label || ctx.serverId}". It stays enabled for the rest of this chat, and its tools remain callable on every later turn.`,
-            'Its tools are listed below and are callable directly by the exact name shown — there is no loading step.',
-            'Do not narrate discovery, tool-name selection, or retries. Call the tool first, then respond once with the result. Never claim the server works before a successful tool result. Do not automatically retry a timed-out or abandoned MCP call.',
-            ...toolLines,
-          ].join('\n'),
+          content: JSON.stringify({ serverId: ctx.serverId, service: `mcp:${ctx.serverId}` }),
         }
       }
       if (ctx.kind === 'past_chat' && ctx.chatId) {
@@ -195,9 +177,7 @@ export async function processContextsServer(
           currentWorkspaceId
         )
       }
-      // Every tab context retains its live pointer. An explicit user selection
-      // additionally carries the quoted snapshot they chose, while the pointer
-      // lets the agent inspect or act on the current page/shell when needed.
+      /** Desktop context carries a reference and optional selection; v1 has no desktop control tools. */
       if (ctx.kind === 'browser_tab' && ctx.tabId) {
         if (ctx.tabId === BROWSER_SESSION_RESOURCE_ID) {
           return {
@@ -222,7 +202,7 @@ export async function processContextsServer(
             type: 'terminal_tab',
             tag: ctx.label ? `@${ctx.label}` : '@Terminal',
             content:
-              'The user tagged the Terminal resource as a whole, not a specific shell. Inspect the live terminals with the terminal list operation and choose the relevant one from their request. If no terminal is open yet, create one as needed.',
+              'The user tagged the Terminal resource as a whole, not a specific shell. You cannot read or drive terminals here: work from output the user shares.',
           }
         }
         const pointer = `The user pointed at an open terminal: "${ctx.label}" (terminalId ${ctx.terminalId}). You cannot read or drive terminals here: ask the user to paste the relevant output rather than assuming what is in it.`