Update request tracing and skills and handlers

Author: Sg312

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

@@ -1,3 +1,6 @@
+import { db } from '@sim/db'
+import { user } from '@sim/db/schema'
+import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { env } from '@/lib/core/config/env'
@@ -12,6 +15,19 @@ function getMothershipUrl(environment: string): string | null {
   return ENV_URLS[environment] ?? null
 }
 
+async function isAdminRequestAuthorized() {
+  const session = await getSession()
+  if (!session?.user?.id) return false
+
+  const [currentUser] = await db
+    .select({ role: user.role })
+    .from(user)
+    .where(eq(user.id, session.user.id))
+    .limit(1)
+
+  return currentUser?.role === 'admin'
+}
+
 /**
  * Proxy to the mothership admin API.
  *
@@ -23,8 +39,7 @@ function getMothershipUrl(environment: string): string | null {
  * (e.g. requestId for GET /traces) are forwarded.
  */
 export async function POST(req: NextRequest) {
-  const session = await getSession()
-  if (!session?.user || session.user.role !== 'admin') {
+  if (!(await isAdminRequestAuthorized())) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
 
@@ -75,8 +90,7 @@ export async function POST(req: NextRequest) {
 }
 
 export async function GET(req: NextRequest) {
-  const session = await getSession()
-  if (!session?.user || session.user.role !== 'admin') {
+  if (!(await isAdminRequestAuthorized())) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
 

apps/sim/app/api/mcp/copilot/route.ts

@@ -143,8 +143,8 @@ When the user refers to a workflow by name or description ("the email one", "my
 ### Key Rules
 
 - You can test workflows immediately after building — deployment is only needed for external access (API, chat, MCP).
-- All copilot tools (build, plan, edit, deploy, test, debug) require workflowId.
-- If the user reports errors → use \`sim_debug\` first, don't guess.
+- All workflow-scoped copilot tools require \`workflowId\`.
+- If the user reports errors, route through \`sim_workflow\` and ask it to reproduce, inspect logs, and fix the issue end to end.
 - Variable syntax: \`<blockname.field>\` for block outputs, \`{{ENV_VAR}}\` for env vars.
 `
 

apps/sim/app/workspace/[workspaceId]/home/components/message-content/utils.ts

@@ -2,7 +2,6 @@ import type { ComponentType, SVGProps } from 'react'
 import {
   Asterisk,
   Blimp,
-  Bug,
   Calendar,
   Database,
   Eye,
@@ -55,7 +54,6 @@ const TOOL_ICONS: Record<string, IconComponent> = {
   agent: AgentIcon,
   custom_tool: Wrench,
   research: Search,
-  debug: Bug,
   context_compaction: Asterisk,
   open_resource: Eye,
   file: File,

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -62,6 +62,7 @@ import {
   isResourceToolName,
 } from '@/lib/copilot/resources/extraction'
 import { VFS_DIR_TO_RESOURCE } from '@/lib/copilot/resources/types'
+import { isToolHiddenInUi } from '@/lib/copilot/tools/client/hidden-tools'
 import {
   cancelRunToolExecution,
   executeRunToolOnClient,
@@ -1575,7 +1576,7 @@ export function useChat(
                     ? payload.name
                     : 'unknown'
               const isPartial = payload.partial === true
-              if (name === ToolSearchToolRegex.id) {
+              if (name === ToolSearchToolRegex.id || isToolHiddenInUi(name)) {
                 break
               }
               const ui = getToolUI(payload)

apps/sim/app/workspace/[workspaceId]/home/types.ts

@@ -2,7 +2,6 @@ import {
   Agent,
   Auth,
   CreateWorkflow,
-  Debug,
   Deploy,
   EditContent,
   EditWorkflow,
@@ -188,7 +187,6 @@ export const SUBAGENT_LABELS: Record<string, string> = {
   table: 'Table Agent',
   custom_tool: 'Custom Tool Agent',
   superagent: 'Superagent',
-  debug: 'Debug Agent',
   run: 'Run Agent',
   agent: 'Tools Agent',
   job: 'Job Agent',
@@ -315,7 +313,6 @@ export const TOOL_UI_METADATA: Record<string, ToolUIMetadata> = {
     phase: 'subagent',
   },
   [Research.id]: { title: 'Research Agent', phaseLabel: 'Research', phase: 'subagent' },
-  [Debug.id]: { title: 'Debug Agent', phaseLabel: 'Debug', phase: 'subagent' },
   [OpenResource.id]: {
     title: 'Opening resource',
     phaseLabel: 'Resource',

apps/sim/app/workspace/[workspaceId]/settings/components/mothership/mothership.tsx

@@ -315,7 +315,7 @@ function OverviewTab({
                       {r.error ? (
                         <Badge variant='red'>Error</Badge>
                       ) : r.aborted ? (
-                        <Badge variant='yellow'>Abort</Badge>
+                        <Badge variant='amber'>Abort</Badge>
                       ) : (
                         <Badge variant='green'>OK</Badge>
                       )}
@@ -694,7 +694,7 @@ function TraceDetail({ trace }: { trace: TraceData }) {
               trace.outcome === 'success'
                 ? 'green'
                 : trace.outcome === 'cancelled'
-                  ? 'yellow'
+                  ? 'amber'
                   : 'red'
             }
           >

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx

@@ -14,12 +14,11 @@ import {
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import {
-  getEffectiveBlockOutputPaths,
   getEffectiveBlockOutputType,
   getOutputPathsFromSchema,
 } from '@/lib/workflows/blocks/block-outputs'
+import { getBlockReferenceTags } from '@/lib/workflows/blocks/block-reference-tags'
 import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils'
-import { TRIGGER_TYPES } from '@/lib/workflows/triggers/triggers'
 import { KeyboardNavigationHandler } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler'
 import type {
   BlockTagGroup,
@@ -177,17 +176,6 @@ const ensureRootTag = (tags: string[], rootTag: string): string[] => {
   return [rootTag, ...tags]
 }
 
-/**
- * Gets a subblock value from the store.
- *
- * @param blockId - The block identifier
- * @param property - The property name to retrieve
- * @returns The value from the subblock store
- */
-const getSubBlockValue = (blockId: string, property: string): any => {
-  return useSubBlockStore.getState().getValue(blockId, property)
-}
-
 /**
  * Gets the output type for a specific path in a block's outputs.
  *
@@ -1055,53 +1043,19 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
         return { tags: [], variableInfoMap: emptyVariableInfoMap, blockTagGroups: [] }
       }
 
-      const blockName = sourceBlock.name || sourceBlock.type
-      const normalizedBlockName = normalizeName(blockName)
-
       const mergedSubBlocks = getMergedSubBlocks(activeSourceBlockId)
-      let blockTags: string[]
-
-      if (sourceBlock.type === 'variables') {
-        const variablesValue = getSubBlockValue(activeSourceBlockId, 'variables')
-
-        if (variablesValue && Array.isArray(variablesValue) && variablesValue.length > 0) {
-          const validAssignments = variablesValue.filter((assignment: { variableName?: string }) =>
-            assignment?.variableName?.trim()
-          )
-          blockTags = validAssignments.map(
-            (assignment: { variableName: string }) =>
-              `${normalizedBlockName}.${assignment.variableName.trim()}`
-          )
-        } else {
-          blockTags = [normalizedBlockName]
-        }
-      } else {
-        const sourceBlockConfig = getBlock(sourceBlock.type)
-        const isTriggerCapable = sourceBlockConfig ? hasTriggerCapability(sourceBlockConfig) : false
-        const effectiveTriggerMode = Boolean(sourceBlock.triggerMode && isTriggerCapable)
-        const outputPaths = getEffectiveBlockOutputPaths(sourceBlock.type, mergedSubBlocks, {
-          triggerMode: effectiveTriggerMode,
-          preferToolOutputs: !effectiveTriggerMode,
-        })
-        const allTags = outputPaths.map((path) => `${normalizedBlockName}.${path}`)
-
-        if (sourceBlock.type === 'human_in_the_loop' && activeSourceBlockId === blockId) {
-          blockTags = allTags.filter(
-            (tag) => tag.endsWith('.url') || tag.endsWith('.resumeEndpoint')
-          )
-        } else if (allTags.length === 0) {
-          blockTags = [normalizedBlockName]
-        } else {
-          blockTags = allTags
-        }
-      }
-
-      blockTags = ensureRootTag(blockTags, normalizedBlockName)
-      const shouldShowRootTag =
-        sourceBlock.type === TRIGGER_TYPES.GENERIC_WEBHOOK || sourceBlock.type === 'start_trigger'
-      if (!shouldShowRootTag) {
-        blockTags = blockTags.filter((tag) => tag !== normalizedBlockName)
-      }
+      const blockName = sourceBlock.name || sourceBlock.type
+      const blockTags = getBlockReferenceTags({
+        block: {
+          id: activeSourceBlockId,
+          type: sourceBlock.type,
+          name: sourceBlock.name,
+          triggerMode: sourceBlock.triggerMode,
+          subBlocks: mergedSubBlocks,
+        },
+        currentBlockId: blockId,
+        subBlocks: mergedSubBlocks,
+      })
 
       const blockTagGroups: BlockTagGroup[] = [
         {
@@ -1331,57 +1285,19 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
         continue
       }
 
-      const blockName = accessibleBlock.name || accessibleBlock.type
-      const normalizedBlockName = normalizeName(blockName)
-
       const mergedSubBlocks = getMergedSubBlocks(accessibleBlockId)
-
-      let blockTags: string[]
-
-      if (accessibleBlock.type === 'variables') {
-        const variablesValue = getSubBlockValue(accessibleBlockId, 'variables')
-
-        if (variablesValue && Array.isArray(variablesValue) && variablesValue.length > 0) {
-          const validAssignments = variablesValue.filter((assignment: { variableName?: string }) =>
-            assignment?.variableName?.trim()
-          )
-          blockTags = validAssignments.map(
-            (assignment: { variableName: string }) =>
-              `${normalizedBlockName}.${assignment.variableName.trim()}`
-          )
-        } else {
-          blockTags = [normalizedBlockName]
-        }
-      } else {
-        const accessibleBlockConfig = getBlock(accessibleBlock.type)
-        const isTriggerCapable = accessibleBlockConfig
-          ? hasTriggerCapability(accessibleBlockConfig)
-          : false
-        const effectiveTriggerMode = Boolean(accessibleBlock.triggerMode && isTriggerCapable)
-        const outputPaths = getEffectiveBlockOutputPaths(accessibleBlock.type, mergedSubBlocks, {
-          triggerMode: effectiveTriggerMode,
-          preferToolOutputs: !effectiveTriggerMode,
-        })
-        const allTags = outputPaths.map((path) => `${normalizedBlockName}.${path}`)
-
-        if (accessibleBlock.type === 'human_in_the_loop' && accessibleBlockId === blockId) {
-          blockTags = allTags.filter(
-            (tag) => tag.endsWith('.url') || tag.endsWith('.resumeEndpoint')
-          )
-        } else if (allTags.length === 0) {
-          blockTags = [normalizedBlockName]
-        } else {
-          blockTags = allTags
-        }
-      }
-
-      blockTags = ensureRootTag(blockTags, normalizedBlockName)
-      const shouldShowRootTag =
-        accessibleBlock.type === TRIGGER_TYPES.GENERIC_WEBHOOK ||
-        accessibleBlock.type === 'start_trigger'
-      if (!shouldShowRootTag) {
-        blockTags = blockTags.filter((tag) => tag !== normalizedBlockName)
-      }
+      const blockName = accessibleBlock.name || accessibleBlock.type
+      const blockTags = getBlockReferenceTags({
+        block: {
+          id: accessibleBlockId,
+          type: accessibleBlock.type,
+          name: accessibleBlock.name,
+          triggerMode: accessibleBlock.triggerMode,
+          subBlocks: mergedSubBlocks,
+        },
+        currentBlockId: blockId,
+        subBlocks: mergedSubBlocks,
+      })
 
       blockTagGroups.push({
         blockName,

apps/sim/executor/types.ts

@@ -177,6 +177,7 @@ export interface ExecutionContext {
   userId?: string
   isDeployedContext?: boolean
   enforceCredentialAccess?: boolean
+  copilotToolExecution?: boolean
 
   permissionConfig?: PermissionGroupConfig | null
   permissionConfigLoaded?: boolean

apps/sim/lib/copilot/chat/display-message.test.ts

@@ -60,4 +60,32 @@ describe('display-message', () => {
       },
     ])
   })
+
+  it('hides load_agent_skill blocks from display output', () => {
+    const display = toDisplayMessage({
+      id: 'msg-2',
+      role: 'assistant',
+      content: '',
+      timestamp: '2024-01-01T00:00:00.000Z',
+      contentBlocks: [
+        {
+          type: 'tool',
+          phase: 'call',
+          toolCall: {
+            id: 'tool-hidden',
+            name: 'load_agent_skill',
+            state: 'success',
+            display: { title: 'Loading skill' },
+          },
+        },
+        {
+          type: 'text',
+          channel: 'assistant',
+          content: 'visible text',
+        },
+      ],
+    })
+
+    expect(display.contentBlocks).toEqual([{ type: 'text', content: 'visible text' }])
+  })
 })

apps/sim/lib/copilot/chat/display-message.ts

@@ -4,6 +4,7 @@ import {
   MothershipStreamV1SpanLifecycleEvent,
   MothershipStreamV1ToolOutcome,
 } from '@/lib/copilot/generated/mothership-stream-v1'
+import { isToolHiddenInUi } from '@/lib/copilot/tools/client/hidden-tools'
 import {
   type ChatContextKind,
   type ChatMessage,
@@ -29,6 +30,7 @@ const STATE_TO_STATUS: Record<string, ToolCallStatus> = {
 function toToolCallInfo(block: PersistedContentBlock): ToolCallInfo | undefined {
   const tc = block.toolCall
   if (!tc) return undefined
+  if (isToolHiddenInUi(tc.name)) return undefined
   const status: ToolCallStatus = STATE_TO_STATUS[tc.state] ?? ToolCallStatus.error
   return {
     id: tc.id,
@@ -42,7 +44,7 @@ function toToolCallInfo(block: PersistedContentBlock): ToolCallInfo | undefined
   }
 }
 
-function toDisplayBlock(block: PersistedContentBlock): ContentBlock {
+function toDisplayBlock(block: PersistedContentBlock): ContentBlock | undefined {
   switch (block.type) {
     case MothershipStreamV1EventType.text:
       if (block.lane === 'subagent') {
@@ -53,6 +55,7 @@ function toDisplayBlock(block: PersistedContentBlock): ContentBlock {
       }
       return { type: ContentBlockType.text, content: block.content }
     case MothershipStreamV1EventType.tool:
+      if (!toToolCallInfo(block)) return undefined
       return { type: ContentBlockType.tool_call, toolCall: toToolCallInfo(block) }
     case MothershipStreamV1EventType.span:
       if (block.lifecycle === MothershipStreamV1SpanLifecycleEvent.end) {
@@ -110,7 +113,9 @@ export function toDisplayMessage(msg: PersistedMessage): ChatMessage {
   }
 
   if (msg.contentBlocks && msg.contentBlocks.length > 0) {
-    display.contentBlocks = msg.contentBlocks.map(toDisplayBlock)
+    display.contentBlocks = msg.contentBlocks
+      .map(toDisplayBlock)
+      .filter((block): block is ContentBlock => !!block)
   }
 
   const attachments = toDisplayAttachment(msg.fileAttachments)