fix(custom-blocks): move executor tool id out of the custom-tool namespace

Author: TheodoreSpeaks

apps/sim/providers/custom-block-tool.test.ts

@@ -3,6 +3,7 @@
  */
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { transformBlockTool } from '@/providers/utils'
+import { normalizeToolId } from '@/tools/normalize'
 
 const mockResolve = vi.fn()
 
@@ -17,8 +18,8 @@ const options = {
     },
   ],
   getTool: (id: string) =>
-    id === 'custom_block_executor'
-      ? { id: 'custom_block_executor', description: 'exec' }
+    id === 'deployed_block_executor'
+      ? { id: 'deployed_block_executor', description: 'exec' }
       : undefined,
   resolveCustomBlockBinding: mockResolve,
 }
@@ -28,7 +29,7 @@ describe('transformBlockTool — custom blocks', () => {
     vi.clearAllMocks()
   })
 
-  it('builds an id-keyed custom_block_executor tool and omits file[] fields', async () => {
+  it('builds an id-keyed deployed_block_executor tool and omits file[] fields', async () => {
     mockResolve.mockResolvedValue({
       workflowId: 'wf-src',
       inputFields: [
@@ -45,7 +46,7 @@ describe('transformBlockTool — custom blocks', () => {
 
     expect(tool).not.toBeNull()
     // Unique per block, name/description from the block (never the source workflow).
-    expect(tool!.id).toBe('custom_block_executor_custom_block_test')
+    expect(tool!.id).toBe('deployed_block_executor_custom_block_test')
     expect(tool!.name).toBe('The Elder')
     // Baked params: block type + assembled (id-keyed) input mapping.
     expect(tool!.params.blockType).toBe('custom_block_test')
@@ -59,6 +60,22 @@ describe('transformBlockTool — custom blocks', () => {
     expect(mockResolve).toHaveBeenCalledWith('custom_block_test')
   })
 
+  it('keeps the tool id out of the user-defined custom-tool namespace', async () => {
+    mockResolve.mockResolvedValue({
+      workflowId: 'wf-src',
+      inputFields: [{ id: 'q', name: 'Question', type: 'string' }],
+      requiredInputIds: [],
+    })
+
+    const tool = await transformBlockTool({ type: 'custom_block_test', params: {} }, options)
+
+    // `custom_` is the custom-tool prefix (`isCustomTool`). Colliding with it makes
+    // executeTool resolve via the DB custom-tool lookup, skip internal-field
+    // stripping, and let `disableCustomTools` block deploy-as-block tools.
+    expect(tool!.id.startsWith('custom_')).toBe(false)
+    expect(normalizeToolId(tool!.id)).toBe('deployed_block_executor')
+  })
+
   it('does not offer the tool when a required file input has no preset value', async () => {
     mockResolve.mockResolvedValue({
       workflowId: 'wf-src',

apps/sim/providers/utils.ts

@@ -620,7 +620,7 @@ export async function transformBlockTool(
   // Custom (deploy-as-block) blocks resolve to the generic `workflow_executor`, but
   // as an agent tool they must run through the authority boundary (owner identity,
   // latest deployment, curated outputs) — not the plain workflow executor. Route
-  // them to the dedicated in-process `custom_block_executor` tool, carrying the
+  // them to the dedicated in-process `deployed_block_executor` tool, carrying the
   // block TYPE (never a source workflow id) so authority is re-resolved server-side.
   // Dynamic imports keep the DB/executor dependency graph out of client bundles.
   if (isCustomBlockType(block.type)) {
@@ -629,9 +629,9 @@ export async function transformBlockTool(
       logger.warn(`Custom block tool binding not resolved for type: ${block.type}`)
       return null
     }
-    const customToolConfig = getTool('custom_block_executor')
+    const customToolConfig = getTool('deployed_block_executor')
     if (!customToolConfig) {
-      logger.warn('custom_block_executor tool not registered')
+      logger.warn('deployed_block_executor tool not registered')
       return null
     }
     const inputMapping = assembleCustomBlockInputMapping(block.params || {})
@@ -653,7 +653,7 @@ export async function transformBlockTool(
     }
     return {
       // Unique per block so two custom-block tools never collide on the wire.
-      id: `custom_block_executor_${block.type}`,
+      id: `deployed_block_executor_${block.type}`,
       // Name/description come from the block itself — never the source workflow's
       // metadata, which the consumer has no access to.
       name: blockDef.name,

apps/sim/tools/index.ts

@@ -1242,7 +1242,7 @@ export async function executeTool(
     // tool registry never pulls in the executor/db dependency graph (a static or
     // dynamic executor import in the tool descriptor itself would break the client
     // build — and with it `getTool('workflow_executor')`).
-    if (normalizedToolId === 'custom_block_executor') {
+    if (normalizedToolId === 'deployed_block_executor') {
       logger.info(`[${requestId}] Running custom block tool ${toolId}`)
       const { runCustomBlockTool } = await import(
         '@/executor/handlers/workflow/custom-block-tool-runner'

apps/sim/tools/normalize.ts

@@ -7,14 +7,15 @@
  * Pure string utility — no server dependencies, safe to import in client components.
  */
 export function normalizeToolId(toolId: string): string {
-  // Check the longer prefix first — `custom_block_executor_` also starts with
-  // neither `workflow_executor_` nor a knowledge/table op, so ordering is safe,
-  // but keep it explicit since its suffix (`custom_block_<id>`) is itself prefixed.
+  // Custom (deploy-as-block) tools: 'deployed_block_executor_custom_block_<id>' ->
+  // 'deployed_block_executor'. Note the id deliberately does NOT start with
+  // `custom_` — that prefix is the user-defined custom-tool namespace
+  // (`isCustomTool`), and colliding with it misroutes resolution and permissions.
   if (
-    toolId.startsWith('custom_block_executor_') &&
-    toolId.length > 'custom_block_executor_'.length
+    toolId.startsWith('deployed_block_executor_') &&
+    toolId.length > 'deployed_block_executor_'.length
   ) {
-    return 'custom_block_executor'
+    return 'deployed_block_executor'
   }
 
   if (toolId.startsWith('workflow_executor_') && toolId.length > 'workflow_executor_'.length) {

apps/sim/tools/registry.minimal.ts

@@ -91,7 +91,7 @@ export const tools: Record<string, ToolConfig> = {
   // Needed so workflow-as-tool and custom (deploy-as-block) tools resolve their
   // config in minimal-registry dev mode (both route through `workflow_executor`).
   workflow_executor: workflowExecutorTool,
-  custom_block_executor: customBlockExecutorTool,
+  deployed_block_executor: customBlockExecutorTool,
   gmail_send_v2: gmailSendV2Tool,
   gmail_read_v2: gmailReadV2Tool,
   gmail_search_v2: gmailSearchV2Tool,

apps/sim/tools/registry.ts

@@ -8185,7 +8185,7 @@ export const tools: Record<string, ToolConfig> = {
   google_forms_delete_watch: googleFormsDeleteWatchTool,
   google_forms_renew_watch: googleFormsRenewWatchTool,
   workflow_executor: workflowExecutorTool,
-  custom_block_executor: customBlockExecutorTool,
+  deployed_block_executor: customBlockExecutorTool,
   wealthbox_read_contact: wealthboxReadContactTool,
   wealthbox_write_contact: wealthboxWriteContactTool,
   wealthbox_read_task: wealthboxReadTaskTool,

apps/sim/tools/workflow/custom-block-executor.ts

@@ -16,7 +16,11 @@ interface CustomBlockExecutorParams {
  * custom-block branch returns first).
  */
 export const customBlockExecutorTool: ToolConfig<CustomBlockExecutorParams> = {
-  id: 'custom_block_executor',
+  // NOT `custom_block_executor`: `custom_` is the user-defined custom-tool namespace
+  // (`isCustomTool`), so that id would make `executeTool` resolve this through the
+  // DB custom-tool lookup, skip `postProcessToolOutput`'s internal-field stripping,
+  // and let `disableCustomTools` workspaces block deploy-as-block tools.
+  id: 'deployed_block_executor',
   name: 'Custom Block Executor',
   description: 'Execute a published custom block (a workflow packaged as a reusable block).',
   version: '1.0.0',