Load skill tool

Author: Sg312

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

@@ -16,7 +16,7 @@ import { requestExplicitStreamAbort } from '@/lib/copilot/request/session/explic
 import type { StreamEvent } from '@/lib/copilot/request/types'
 import { isE2BDocEnabled } from '@/lib/core/config/feature-flags'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { buildMothershipToolsForRequest } from '@/lib/mothership/settings/runtime'
+import { buildUserSkillTool } from '@/lib/mothership/skills'
 import {
   assertActiveWorkspaceAccess,
   getUserEntityPermissions,
@@ -118,13 +118,12 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
       workflowId,
       executionId,
     })
-    const [workspaceContext, integrationTools, mothershipToolRuntime, userPermission] =
-      await Promise.all([
-        generateWorkspaceContext(workspaceId, userId),
-        buildIntegrationToolSchemas(userId, messageId, undefined, workspaceId),
-        buildMothershipToolsForRequest({ workspaceId, userId }),
-        getUserEntityPermissions(userId, 'workspace', workspaceId).catch(() => null),
-      ])
+    const [workspaceContext, integrationTools, userSkillTool, userPermission] = await Promise.all([
+      generateWorkspaceContext(workspaceId, userId),
+      buildIntegrationToolSchemas(userId, messageId, undefined, workspaceId),
+      buildUserSkillTool(workspaceId),
+      getUserEntityPermissions(userId, 'workspace', workspaceId).catch(() => null),
+    ])
     const requestPayload: Record<string, unknown> = {
       messages,
       responseFormat,
@@ -138,9 +137,7 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
       ...(userMetadata ? { userMetadata } : {}),
       ...(fileAttachments && fileAttachments.length > 0 ? { fileAttachments } : {}),
       ...(integrationTools.length > 0 ? { integrationTools } : {}),
-      ...(mothershipToolRuntime.tools.length > 0
-        ? { mothershipTools: mothershipToolRuntime.tools }
-        : {}),
+      ...(userSkillTool ? { mothershipTools: [userSkillTool] } : {}),
       ...(userPermission ? { userPermission } : {}),
     }
 

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

@@ -60,7 +60,8 @@ export function getBlockIconAndColor(
       if (mcpBlock) return { icon: mcpBlock.icon, bgColor: mcpBlock.bgColor }
     }
     const normalized = normalizeToolId(toolName)
-    if (normalized === 'load_skill') return { icon: AgentSkillsIcon, bgColor: '#8B5CF6' }
+    if (normalized === 'load_skill' || normalized === 'load_user_skill')
+      return { icon: AgentSkillsIcon, bgColor: '#8B5CF6' }
     const toolBlock = getBlockByToolName(normalized)
     if (toolBlock) return { icon: toolBlock.icon, bgColor: toolBlock.bgColor }
   }