feat(mship): add external mcps to mship

Author: Sg312

apps/sim/app/api/mothership/execute/route.ts

@@ -14,6 +14,7 @@ import {
   MothershipStreamV1EventType,
   MothershipStreamV1TextChannel,
 } from '@/lib/copilot/generated/mothership-stream-v1'
+import { buildSelectedMcpToolSchemas, buildTaggedMcpToolSchemas } from '@/lib/copilot/mcp-tools'
 import { runHeadlessCopilotLifecycle } from '@/lib/copilot/request/lifecycle/headless'
 import { requestExplicitStreamAbort } from '@/lib/copilot/request/session/explicit-abort'
 import type { StreamEvent } from '@/lib/copilot/request/types'
@@ -106,6 +107,7 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
       requestId: providedRequestId,
       fileAttachments,
       contexts,
+      mcpTools,
       workflowId,
       executionId,
       userMetadata,
@@ -146,25 +148,42 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
     const lastUserMessage = messages.filter((m) => m.role === 'user').at(-1)?.content
     // double-cast-allowed: the contract validates contexts as open kind/label objects; processContextsServer narrows on `kind` at runtime
     const agentMentions = contexts as unknown as ChatContext[] | undefined
-    const [workspaceContext, integrationTools, userPermission, entitlements, agentContexts] =
-      await Promise.all([
-        generateWorkspaceContext(workspaceId, userId),
-        buildIntegrationToolSchemas(userId, messageId, undefined, workspaceId),
-        getUserEntityPermissions(userId, 'workspace', workspaceId).catch(() => null),
-        computeWorkspaceEntitlements(workspaceId, userId),
-        processContextsServer(
-          agentMentions,
-          userId,
-          lastUserMessage,
-          workspaceId,
-          effectiveChatId
-        ).catch((error) => {
-          reqLogger.warn('Failed to resolve agent contexts for execution', {
-            error: toError(error).message,
-          })
-          return []
-        }),
-      ])
+    const taggedMcpServerIds = (agentMentions ?? []).flatMap((context) =>
+      context.kind === 'mcp' && context.serverId ? [context.serverId] : []
+    )
+    const nonMcpAgentMentions = agentMentions?.filter((context) => context.kind !== 'mcp')
+    const [
+      workspaceContext,
+      integrationTools,
+      mothershipTools,
+      userPermission,
+      entitlements,
+      agentContexts,
+    ] = await Promise.all([
+      generateWorkspaceContext(workspaceId, userId),
+      buildIntegrationToolSchemas(userId, messageId, undefined, workspaceId),
+      Promise.all([
+        buildSelectedMcpToolSchemas(userId, workspaceId, mcpTools ?? []),
+        buildTaggedMcpToolSchemas(userId, workspaceId, taggedMcpServerIds),
+      ]).then((groups) => {
+        const byName = new Map(groups.flat().map((tool) => [tool.name, tool]))
+        return [...byName.values()]
+      }),
+      getUserEntityPermissions(userId, 'workspace', workspaceId).catch(() => null),
+      computeWorkspaceEntitlements(workspaceId, userId),
+      processContextsServer(
+        nonMcpAgentMentions,
+        userId,
+        lastUserMessage,
+        workspaceId,
+        effectiveChatId
+      ).catch((error) => {
+        reqLogger.warn('Failed to resolve agent contexts for execution', {
+          error: toError(error).message,
+        })
+        return []
+      }),
+    ])
     const requestPayload: Record<string, unknown> = {
       messages,
       responseFormat,
@@ -183,8 +202,30 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
       ...(isE2BDocEnabled ? { docCompiler: 'python' } : {}),
       ...(userMetadata ? { userMetadata } : {}),
       ...(fileAttachments && fileAttachments.length > 0 ? { fileAttachments } : {}),
-      ...(agentContexts.length > 0 ? { contexts: agentContexts } : {}),
+      ...(agentContexts.length > 0 || mothershipTools.length > 0
+        ? {
+            contexts: [
+              ...agentContexts,
+              ...(mothershipTools.length > 0
+                ? [
+                    {
+                      type: 'mcp',
+                      content: [
+                        'The following MCP tools are explicitly enabled for this request.',
+                        'Load one with load_custom_tool({ type: "mcp", name: "<exact name>" }) before calling it.',
+                        'Do not narrate discovery, loading, 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.',
+                        ...mothershipTools.map(
+                          (tool) => `- ${tool.name}: ${tool.description || tool.name}`
+                        ),
+                      ].join('\n'),
+                    },
+                  ]
+                : []),
+            ],
+          }
+        : {}),
       ...(integrationTools.length > 0 ? { integrationTools } : {}),
+      ...(mothershipTools.length > 0 ? { mothershipTools } : {}),
       ...(userPermission ? { userPermission } : {}),
       ...(entitlements.length > 0 ? { entitlements } : {}),
     }

apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx

@@ -8,7 +8,7 @@ import {
   Task,
   Workflow,
 } from '@sim/emcn/icons'
-import { AgentSkillsIcon } from '@/components/icons'
+import { AgentSkillsIcon, McpIcon } from '@/components/icons'
 import { getDocumentIcon } from '@/components/icons/document-icons'
 import type { ChatContextKind, ChatMessageContext } from '@/app/workspace/[workspaceId]/home/types'
 import { getBareIconStyle } from '@/blocks/icon-color'
@@ -99,4 +99,8 @@ export const CHAT_CONTEXT_KIND_REGISTRY: Record<ChatContextKind, ChatContextKind
     label: 'Skill',
     renderIcon: ({ className }) => <AgentSkillsIcon className={className} />,
   },
+  mcp: {
+    label: 'MCP server',
+    renderIcon: ({ className }) => <McpIcon className={className} />,
+  },
 }

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts

@@ -33,6 +33,7 @@ const PORTABLE_KIND_TO_ID_FIELD = {
   workflow: 'workflowId',
   logs: 'executionId',
   skill: 'skillId',
+  mcp: 'serverId',
   integration: 'blockType',
   slash_command: 'command',
 } as const satisfies Partial<Record<ChatContext['kind'], string>>
@@ -220,6 +221,8 @@ export function chipLinkToContext(link: ParsedChipLink): ChatContext {
       return { kind: 'logs', executionId: link.id, label: link.label }
     case 'skill':
       return { kind: 'skill', skillId: link.id, label: link.label }
+    case 'mcp':
+      return { kind: 'mcp', serverId: link.id, label: link.label }
     case 'integration':
       return { kind: 'integration', blockType: link.id, label: link.label }
     case 'slash_command':

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

@@ -214,7 +214,9 @@ export function PromptEditor({
           <SkillsMenuDropdown
             ref={editor.skillsMenuRef}
             skills={editor.skills}
+            mcpServers={editor.mcpServers}
             onSkillSelect={editor.handleSkillSelect}
+            onMcpSelect={editor.handleMcpSelect}
             onClose={editor.handleSkillsMenuClose}
             textareaRef={editor.textareaRef}
             pendingCursorRef={editor.pendingCursorRef}

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

@@ -6,6 +6,7 @@ import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 vi.mock('@/hooks/queries/skills', () => ({ useSkills: () => ({ data: [] }) }))
+vi.mock('@/hooks/queries/mcp', () => ({ useMcpServers: () => ({ data: [] }) }))
 vi.mock('@/hooks/queries/workflows', () => ({ useWorkflows: () => ({ data: [] }) }))
 vi.mock('@/hooks/queries/tables', () => ({ useTablesList: () => ({ data: [] }) }))
 vi.mock('@/hooks/queries/workspace-files', () => ({ useWorkspaceFiles: () => ({ data: [] }) }))

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

@@ -24,6 +24,7 @@ import {
   restoreSkillTriggerText,
   SKILL_CHIP_TRIGGER,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
+import { type McpServer, useMcpServers } from '@/hooks/queries/mcp'
 import { type SkillDefinition, useSkills } from '@/hooks/queries/skills'
 import type { ChatContext } from '@/stores/panel'
 
@@ -155,6 +156,11 @@ export function usePromptEditor({
   onPasteFiles,
 }: UsePromptEditorProps) {
   const { data: skills = [] } = useSkills(workspaceId)
+  const { data: allMcpServers = [] } = useMcpServers(workspaceId)
+  const mcpServers = useMemo(
+    () => allMcpServers.filter((server) => server.enabled && server.workspaceId === workspaceId),
+    [allMcpServers, workspaceId]
+  )
 
   const [value, setValueState] = useState(initialValue)
   const valueRef = useRef(value)
@@ -224,6 +230,7 @@ export function usePromptEditor({
 
   const skillAutoMention = useSkillAutoMention({
     skills,
+    mcpServers,
     setSelectedContexts: contextManagement.setSelectedContexts,
   })
 
@@ -272,8 +279,8 @@ export function usePromptEditor({
       valueRef.current = converted
       setValueState(converted)
     }
-    seedRef.current = skills.length > 0 ? null : converted
-  }, [skills.length, applyAutoMentions])
+    seedRef.current = skills.length > 0 || mcpServers.length > 0 ? null : converted
+  }, [skills.length, mcpServers.length, applyAutoMentions])
 
   const existingResourceKeys = useMemo(() => {
     const keys = new Set<string>()
@@ -444,6 +451,32 @@ export function usePromptEditor({
     [textareaRef, addContextNotified]
   )
 
+  const handleMcpSelect = useCallback(
+    (server: McpServer) => {
+      const textarea = textareaRef.current
+      if (textarea) {
+        const currentValue = valueRef.current
+        const range = slashRangeRef.current
+        const insertAt = range?.start ?? textarea.selectionStart ?? currentValue.length
+        const end = range?.end ?? insertAt
+        const needsSpaceBefore = insertAt > 0 && !/\s/.test(currentValue.charAt(insertAt - 1))
+        const insertText = `${needsSpaceBefore ? ' ' : ''}${SKILL_CHIP_TRIGGER}${server.name} `
+        const newValue = `${currentValue.slice(0, insertAt)}${insertText}${currentValue.slice(end)}`
+        const newPos = insertAt + insertText.length
+
+        pendingCursorRef.current = newPos
+        valueRef.current = newValue
+        slashRangeRef.current = null
+        setSlashQuery(null)
+        dismissedSlashStartRef.current = null
+        setValueState(newValue)
+      }
+
+      addContextNotified({ kind: 'mcp', serverId: server.id, label: server.name })
+    },
+    [textareaRef, addContextNotified]
+  )
+
   /**
    * Only reachable via Radix's own dismiss detection (outside click /
    * Escape) — programmatic closes (`skillsMenuRef.current?.close()`) bypass
@@ -1010,6 +1043,8 @@ export function usePromptEditor({
     /** @internal Wiring consumed by the {@link PromptEditor} view. */
     skills,
     /** @internal */
+    mcpServers,
+    /** @internal */
     availableResources,
     /** @internal */
     mentionQuery,
@@ -1026,6 +1061,8 @@ export function usePromptEditor({
     /** @internal */
     handleSkillSelect,
     /** @internal */
+    handleMcpSelect,
+    /** @internal */
     handlePlusMenuClose,
     /** @internal */
     handleSkillsMenuClose,