Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 27 additions & 34 deletions apps/sim/app/api/mothership/execute/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import { isE2BDocEnabled } from '@/lib/core/config/env-flags'
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
import {
assertActiveWorkspaceAccess,
getUserEntityPermissions,
isWorkspaceAccessDeniedError,
} from '@/lib/workspaces/permissions/utils'
import type { ChatContext } from '@/stores/panel'
Expand Down Expand Up @@ -130,7 +129,7 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
}
const userId = auth.userId ?? bodyUserId

await assertActiveWorkspaceAccess(workspaceId, userId)
const workspaceAccess = await assertActiveWorkspaceAccess(workspaceId, userId)
const billingAttribution = requireBillingAttributionHeader(req.headers, {
actorUserId: userId,
workspaceId,
Expand All @@ -152,38 +151,32 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
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 userPermission = workspaceAccess.permission
const [workspaceContext, integrationTools, mothershipTools, entitlements, agentContexts] =
await Promise.all([
generateWorkspaceContext(workspaceId, userId, { workspaceAccess }),
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()]
}),
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,
Expand Down
Loading
Loading