feat(copilot): gate user skills to explicit slash-attach

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

@@ -17,7 +17,6 @@ import { requestExplicitStreamAbort } from '@/lib/copilot/request/session/explic
 import type { StreamEvent } from '@/lib/copilot/request/types'
 import { isE2BDocEnabled } from '@/lib/core/config/env-flags'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { buildUserSkillTool } from '@/lib/mothership/skills'
 import {
   assertActiveWorkspaceAccess,
   getUserEntityPermissions,
@@ -141,25 +140,23 @@ 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, userSkillTool, userPermission, agentContexts] =
-      await Promise.all([
-        generateWorkspaceContext(workspaceId, userId),
-        buildIntegrationToolSchemas(userId, messageId, undefined, workspaceId),
-        buildUserSkillTool(workspaceId),
-        getUserEntityPermissions(userId, 'workspace', workspaceId).catch(() => null),
-        processContextsServer(
-          agentMentions,
-          userId,
-          lastUserMessage,
-          workspaceId,
-          effectiveChatId
-        ).catch((error) => {
-          reqLogger.warn('Failed to resolve agent contexts for execution', {
-            error: toError(error).message,
-          })
-          return []
-        }),
-      ])
+    const [workspaceContext, integrationTools, userPermission, agentContexts] = await Promise.all([
+      generateWorkspaceContext(workspaceId, userId),
+      buildIntegrationToolSchemas(userId, messageId, undefined, workspaceId),
+      getUserEntityPermissions(userId, 'workspace', workspaceId).catch(() => null),
+      processContextsServer(
+        agentMentions,
+        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,
@@ -180,7 +177,6 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
       ...(fileAttachments && fileAttachments.length > 0 ? { fileAttachments } : {}),
       ...(agentContexts.length > 0 ? { contexts: agentContexts } : {}),
       ...(integrationTools.length > 0 ? { integrationTools } : {}),
-      ...(userSkillTool ? { mothershipTools: [userSkillTool] } : {}),
       ...(userPermission ? { userPermission } : {}),
     }
 

apps/sim/app/workspace/[workspaceId]/logs/components/log-details/utils.ts

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

apps/sim/executor/handlers/agent/skills-resolver.test.ts

@@ -20,8 +20,8 @@ vi.mock('drizzle-orm', () => ({
 
 import { resolveSkillContent } from './skills-resolver'
 
-// resolveSkillContent is the shared resolver invoked when the mothership calls
-// load_user_skill (and when a workflow agent block calls load_skill).
+// resolveSkillContent is the shared resolver invoked when a workflow agent block
+// calls load_skill.
 describe('resolveSkillContent', () => {
   beforeEach(() => {
     vi.clearAllMocks()

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

@@ -9,7 +9,6 @@ import { getToolEntry } from '@/lib/copilot/tool-executor/router'
 import { getCopilotToolDescription } from '@/lib/copilot/tools/descriptions'
 import { encodeVfsSegment } from '@/lib/copilot/vfs/path-utils'
 import { isE2BDocEnabled, isHosted } from '@/lib/core/config/env-flags'
-import { buildUserSkillTool } from '@/lib/mothership/skills'
 import { trackChatUpload } from '@/lib/uploads/contexts/workspace/workspace-file-manager'
 import { stripVersionSuffix } from '@/tools/utils'
 
@@ -42,7 +41,6 @@ interface BuildPayloadParams {
     email?: string
     timezone?: string
   }
-  includeMothershipTools?: boolean
 }
 
 export interface ToolSchema {
@@ -325,7 +323,6 @@ export async function buildCopilotRequestPayload(
   const allContexts = [...(contexts ?? []), ...uploadContexts]
 
   let integrationTools: ToolSchema[] = []
-  const mothershipTools: ToolSchema[] = []
   const payloadLogger = logger.withMetadata({ messageId: userMessageId })
 
   if (effectiveMode === 'build') {
@@ -335,20 +332,6 @@ export async function buildCopilotRequestPayload(
       { schemaSurface: 'copilot' },
       params.workspaceId
     )
-
-    if (params.includeMothershipTools && params.workspaceId) {
-      // Expose all workspace user-created skills via the single load_user_skill
-      // tool. Available to every user; content is fetched sim-side when the
-      // model calls it.
-      try {
-        const userSkillTool = await buildUserSkillTool(params.workspaceId)
-        if (userSkillTool) mothershipTools.push(userSkillTool)
-      } catch (error) {
-        logger.warn('Failed to build load_user_skill tool', {
-          error: toError(error).message,
-        })
-      }
-    }
   }
 
   return {
@@ -366,7 +349,6 @@ export async function buildCopilotRequestPayload(
     ...(typeof prefetch === 'boolean' ? { prefetch } : {}),
     ...(implicitFeedback ? { implicitFeedback } : {}),
     ...(integrationTools.length > 0 ? { integrationTools } : {}),
-    ...(mothershipTools.length > 0 ? { mothershipTools } : {}),
     ...(commands && commands.length > 0 ? { commands } : {}),
     ...(params.workspaceContext ? { workspaceContext: params.workspaceContext } : {}),
     ...(params.vfs ? { vfs: params.vfs } : {}),

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

@@ -680,7 +680,6 @@ async function resolveBranch(params: {
           userPermission: payloadParams.userPermission,
           userTimezone: payloadParams.userTimezone,
           userMetadata: payloadParams.userMetadata,
-          includeMothershipTools: true,
         },
         { selectedModel: '' }
       ),

apps/sim/lib/copilot/chat/workspace-context.ts

@@ -291,8 +291,8 @@ export function buildWorkspaceMd(data: WorkspaceMdData): string {
       .sort(byNameThenId)
       .map((s) => `- **${s.name}** (${s.id}) — ${s.description}`)
     sections.push(
-      `## Skills (${data.skills.length})\n` +
-        'To use a skill, call the load_user_skill tool with its name to load the full instructions, then follow them. The descriptions below only say when each skill applies — they are not the instructions.\n' +
+      `## Agent Block Skills — NOT FOR YOU (${data.skills.length})\n` +
+        'These are user-created skills used by agent blocks in the workspace and are NOT instructions for you\n' +
         lines.join('\n')
     )
   }

apps/sim/lib/copilot/tools/client/hidden-tools.test.ts

@@ -12,9 +12,7 @@ describe('isToolHiddenInUi', () => {
     expect(isToolHiddenInUi('load_agent_skill')).toBe(true)
   })
 
-  it('does not hide user skill loads, ordinary tools, or undefined', () => {
-    // load_user_skill renders like the old per-skill loaders so the load is visible.
-    expect(isToolHiddenInUi('load_user_skill')).toBe(false)
+  it('does not hide ordinary tools or undefined', () => {
     expect(isToolHiddenInUi('read')).toBe(false)
     expect(isToolHiddenInUi(undefined)).toBe(false)
   })

apps/sim/lib/copilot/tools/client/hidden-tools.ts

@@ -1,6 +1,5 @@
 // load_agent_skill is retained for historical persisted messages; it is no
-// longer emitted now that internal skills autoload. load_user_skill is NOT
-// hidden — it renders like the old per-skill loaders so users see the skill load.
+// longer emitted now that internal skills autoload.
 const HIDDEN_TOOL_NAMES = new Set(['load_agent_skill', 'load_custom_tool', 'load_integration_tool'])
 
 export function isToolHiddenInUi(toolName: string | undefined): boolean {

apps/sim/lib/mothership/inbox/executor.ts

@@ -21,7 +21,6 @@ import * as agentmail from '@/lib/mothership/inbox/agentmail-client'
 import { formatEmailAsMessage } from '@/lib/mothership/inbox/format'
 import { sendInboxResponse } from '@/lib/mothership/inbox/response'
 import type { AgentMailAttachment } from '@/lib/mothership/inbox/types'
-import { buildUserSkillTool } from '@/lib/mothership/skills'
 import { uploadFile } from '@/lib/uploads/core/storage-service'
 import { createFileContent, type MessageContent } from '@/lib/uploads/utils/file-utils'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
@@ -208,12 +207,11 @@ export async function executeInboxTask(taskId: string): Promise<void> {
       return { attachments, ...downloaded }
     }
 
-    const [attachmentResult, workspaceContext, integrationTools, userSkillTool, userPermission] =
+    const [attachmentResult, workspaceContext, integrationTools, userPermission] =
       await Promise.all([
         fetchAttachments(),
         generateWorkspaceContext(ws.id, userId),
         buildIntegrationToolSchemas(userId, undefined, undefined, ws.id),
-        buildUserSkillTool(ws.id),
         getUserEntityPermissions(userId, 'workspace', ws.id).catch(() => null),
       ])
     const { attachments, fileAttachments, storedAttachments } = attachmentResult
@@ -235,7 +233,6 @@ export async function executeInboxTask(taskId: string): Promise<void> {
       workspaceContext,
       ...(isE2BDocEnabled ? { docCompiler: 'python' } : {}),
       ...(integrationTools.length > 0 ? { integrationTools } : {}),
-      ...(userSkillTool ? { mothershipTools: [userSkillTool] } : {}),
       ...(userPermission ? { userPermission } : {}),
       ...(fileAttachments.length > 0 ? { fileAttachments } : {}),
     }

apps/sim/lib/workflows/skills/operations.test.ts

@@ -37,8 +37,8 @@ describe('listSkills includeBuiltins', () => {
     expect(result.every((s) => s.id.startsWith('builtin-'))).toBe(true)
   })
 
-  // The mothership skill registry passes includeBuiltins: false so it never sees
-  // the code-only template skills (it loads workspace skills via load_user_skill).
+  // The mothership skill inventory passes includeBuiltins: false so it never sees
+  // the code-only template skills.
   it('excludes builtin template skills when includeBuiltins is false', async () => {
     orderByMock.mockResolvedValue([
       { id: 'sk-1', name: 'mine', description: 'd', content: 'c', workspaceId: 'ws-1' },

apps/sim/lib/workflows/skills/operations.ts

@@ -36,8 +36,8 @@ function builtinSkillRow(workspaceId: string, builtin: BuiltinSkill): typeof ski
  * real skills do. A workspace skill that shares a built-in's name overrides it.
  *
  * Pass `includeBuiltins: false` to return only user-created skills. The
- * mothership uses this for the skill registry it sees, since it loads workspace
- * skills via load_user_skill and never the code-only templates.
+ * mothership uses this for the workspace skill inventory it sees, which lists
+ * only user-created skills and never the code-only templates.
  */
 export async function listSkills(params: { workspaceId: string; includeBuiltins?: boolean }) {
   const dbRows = await db

apps/sim/tools/index.ts

@@ -928,7 +928,7 @@ export async function executeTool(
     const scope = resolveToolScope(params, executionContext)
 
     const toolKind: 'skill' | 'custom' | 'mcp' | undefined =
-      normalizedToolId === 'load_skill' || normalizedToolId === 'load_user_skill'
+      normalizedToolId === 'load_skill'
         ? 'skill'
         : isCustomTool(normalizedToolId)
           ? 'custom'
@@ -948,7 +948,7 @@ export async function executeTool(
       })
     }
 
-    if (normalizedToolId === 'load_skill' || normalizedToolId === 'load_user_skill') {
+    if (normalizedToolId === 'load_skill') {
       const skillName = params.skill_name
       if (!skillName || !scope.workspaceId) {
         return {