fix(custom-model): enforce super-user boundary

Author: Sg312

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

@@ -16,7 +16,7 @@ import type { SubBlockConfig } from '@/blocks/types'
 import { getDependsOnFields } from '@/blocks/utils'
 import { useGeneralSettings } from '@/hooks/queries/general-settings'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
-import { isCustomModel } from '@/providers/custom-model'
+import { getCustomModelDisplayValue, isCustomModel } from '@/providers/custom-model'
 import { getProviderFromModel } from '@/providers/utils'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
@@ -314,14 +314,18 @@ export const ComboBox = memo(function ComboBox({
   const displayValue = useMemo(() => {
     const raw = value?.toString() ?? ''
     if (!raw) return ''
+    if (subBlockId === 'model') {
+      const visibleModel = getCustomModelDisplayValue(raw, effectiveSuperUser)
+      if (visibleModel !== raw) return visibleModel
+    }
 
     const match = evaluatedOptions.find((option) =>
       typeof option === 'string' ? option === raw : option.id === raw
     )
 
     if (!match) return raw
     return typeof match === 'string' ? match : match.label
-  }, [value, evaluatedOptions])
+  }, [value, evaluatedOptions, subBlockId, effectiveSuperUser])
 
   const [inputValue, setInputValue] = useState(displayValue)
   const [prevDisplayValue, setPrevDisplayValue] = useState(displayValue)

apps/sim/executor/handlers/agent/agent-handler.test.ts

@@ -397,15 +397,15 @@ describe('AgentBlockHandler', () => {
         superUserModeEnabled: false,
       })
 
-      await expect(
-        handler.execute(mockContext, mockBlock, {
-          model: CUSTOM_MODEL_ID,
-          customModelConfig: {
-            provider: 'openai',
-            model: 'gpt-future',
-          },
-        })
-      ).rejects.toThrow('only while Super User mode is enabled')
+      const execution = handler.execute(mockContext, mockBlock, {
+        model: CUSTOM_MODEL_ID,
+        customModelConfig: {
+          provider: 'openai',
+          model: 'gpt-future',
+        },
+      })
+      await expect(execution).rejects.toThrow('The selected model is unavailable')
+      await expect(execution).rejects.not.toThrow(/Custom|Super User/)
       expect(mockExecuteProviderRequest).not.toHaveBeenCalled()
     })
 

apps/sim/executor/handlers/agent/agent-handler.ts

@@ -102,11 +102,11 @@ export class AgentBlockHandler implements BlockHandler {
     let autoRouting: AutoRoutingResult | null = null
     if (isCustomModel(configuredModel)) {
       if (!ctx.userId) {
-        throw new Error('Custom models require an authenticated Super User')
+        throw new Error('The selected model is unavailable for this execution')
       }
       const { effectiveSuperUser } = await verifyEffectiveSuperUser(ctx.userId)
       if (!effectiveSuperUser) {
-        throw new Error('Custom models are available only while Super User mode is enabled')
+        throw new Error('The selected model is unavailable for this execution')
       }
 
       customModelConfig = parseCustomModelConfig(filteredInputs.customModelConfig)

apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.test.ts

@@ -15,7 +15,7 @@ describe('get blocks metadata', () => {
     expect(definitions).not.toHaveProperty('mountedSecrets')
   })
 
-  it('omits Super User-only definitions unless the caller is effective', () => {
+  it('always omits Super User-only definitions from Copilot metadata', () => {
     const block = {
       type: 'agent',
       subBlocks: [
@@ -29,9 +29,5 @@ describe('get blocks metadata', () => {
     } as unknown as BlockConfig
 
     expect(computeBlockLevelInputs(block)).toEqual({ model: { type: 'string' } })
-    expect(computeBlockLevelInputs(block, true)).toEqual({
-      model: { type: 'string' },
-      customModelConfig: { type: 'json' },
-    })
   })
 })

apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts

@@ -7,7 +7,6 @@ import { getCopilotToolDescription } from '@/lib/copilot/tools/descriptions'
 import type { BaseServerTool } from '@/lib/copilot/tools/server/base-tool'
 import { getAllowedIntegrationsFromEnv, isHosted } from '@/lib/core/config/env-flags'
 import { getServiceAccountProviderForProviderId } from '@/lib/oauth/utils'
-import { verifyEffectiveSuperUser } from '@/lib/permissions/super-user'
 import { isCustomBlockType } from '@/blocks/custom/build-config'
 import { getBlock } from '@/blocks/registry'
 import { AuthMode, type BlockConfig, isHiddenFromDisplay } from '@/blocks/types'
@@ -127,18 +126,6 @@ export const getBlocksMetadataServerTool: BaseServerTool<
         : null
     const allowedIntegrations =
       permissionConfig?.allowedIntegrations ?? getAllowedIntegrationsFromEnv()
-    let effectiveSuperUser = false
-    if (context?.userId) {
-      try {
-        effectiveSuperUser = (await verifyEffectiveSuperUser(context.userId)).effectiveSuperUser
-      } catch (error) {
-        // Metadata remains available, but privileged fields fail closed.
-        logger.warn('Failed to verify effective Super User for block metadata', {
-          userId: context.userId,
-          error: toError(error).message,
-        })
-      }
-    }
 
     const result: Record<string, CopilotBlockMetadata> = {}
     for (const blockId of blockIds || []) {
@@ -153,8 +140,7 @@ export const getBlocksMetadataServerTool: BaseServerTool<
         const specialBlock = SPECIAL_BLOCKS_METADATA[blockId]
         const { commonParameters, operationParameters } = splitParametersByOperation(
           specialBlock.subBlocks || [],
-          specialBlock.inputs || {},
-          effectiveSuperUser
+          specialBlock.inputs || {}
         )
         metadata = {
           id: specialBlock.id,
@@ -195,7 +181,7 @@ export const getBlocksMetadataServerTool: BaseServerTool<
           // Present it as self-contained: its visible input fields + curated outputs,
           // no tools/operations.
           const visibleSubBlocks = (blockConfig.subBlocks || []).filter(
-            (sb) => !sb.hidden && !sb.hideFromCopilot && (!sb.superUserOnly || effectiveSuperUser)
+            (sb) => !sb.hidden && !sb.hideFromCopilot && !sb.superUserOnly
           )
           const outputs = blockConfig.outputs
             ? Object.fromEntries(
@@ -207,9 +193,7 @@ export const getBlocksMetadataServerTool: BaseServerTool<
             name: blockConfig.name || blockId,
             description: blockConfig.longDescription || blockConfig.description || '',
             bestPractices: blockConfig.bestPractices,
-            inputSchema: visibleSubBlocks.map((subBlock) =>
-              processSubBlock(subBlock, effectiveSuperUser)
-            ),
+            inputSchema: visibleSubBlocks.map(processSubBlock),
             inputDefinitions: {},
             tools: [],
             triggers: [],
@@ -252,7 +236,7 @@ export const getBlocksMetadataServerTool: BaseServerTool<
             if (
               (subBlock.mode === 'trigger' || subBlock.mode === 'trigger-advanced') &&
               !SYSTEM_SUBBLOCK_IDS.includes(subBlock.id) &&
-              (!subBlock.superUserOnly || effectiveSuperUser)
+              !subBlock.superUserOnly
             ) {
               const fieldDef: any = {
                 type: subBlock.type,
@@ -292,27 +276,22 @@ export const getBlocksMetadataServerTool: BaseServerTool<
           })
         }
 
-        const hiddenParamKeys = getCopilotHiddenParamKeys(blockConfig, effectiveSuperUser)
-        const blockInputs = computeBlockLevelInputs(
-          blockConfig,
-          effectiveSuperUser,
-          hiddenParamKeys
-        )
+        const hiddenParamKeys = getCopilotHiddenParamKeys(blockConfig)
+        const blockInputs = computeBlockLevelInputs(blockConfig, hiddenParamKeys)
         const { commonParameters, operationParameters } = splitParametersByOperation(
           Array.isArray(blockConfig.subBlocks)
             ? blockConfig.subBlocks.filter(
                 (sb) =>
                   !sb.hideFromCopilot &&
-                  (!sb.superUserOnly || effectiveSuperUser) &&
+                  !sb.superUserOnly &&
                   sb.mode !== 'trigger' &&
                   sb.mode !== 'trigger-advanced'
               )
             : [],
-          blockInputs,
-          effectiveSuperUser
+          blockInputs
         )
 
-        const operationInputs = computeOperationLevelInputs(blockConfig, effectiveSuperUser)
+        const operationInputs = computeOperationLevelInputs(blockConfig)
         const operationIds = resolveOperationIds(blockConfig, operationParameters)
         const operations: Record<string, any> = {}
         for (const opId of operationIds) {
@@ -700,7 +679,7 @@ function generateInputExample(schema: CopilotSubblockMetadata, inputDef?: any):
   }
 }
 
-function processSubBlock(sb: any, effectiveSuperUser = false): CopilotSubblockMetadata {
+function processSubBlock(sb: any): CopilotSubblockMetadata {
   const processed: CopilotSubblockMetadata = {
     id: sb.id,
     type: sb.type,
@@ -770,7 +749,7 @@ function processSubBlock(sb: any, effectiveSuperUser = false): CopilotSubblockMe
   }
 
   // Process options with icon detection
-  const options = resolveSubblockOptions(sb, effectiveSuperUser)
+  const options = resolveSubblockOptions(sb)
   if (options) {
     processed.options = options
   }
@@ -880,8 +859,7 @@ function callOptionsWithFallback(
 }
 
 function resolveSubblockOptions(
-  sb: any,
-  effectiveSuperUser = false
+  sb: any
 ): { id: string; label?: string; hasIcon?: boolean }[] | undefined {
   // Skip if subblock uses fetchOptions (async network calls)
   if (sb.fetchOptions) {
@@ -907,7 +885,7 @@ function resolveSubblockOptions(
   }
 
   const normalized = rawOptions
-    .filter((opt: any) => effectiveSuperUser || !opt?.requiresSuperUser)
+    .filter((opt: any) => !opt?.requiresSuperUser)
     .map((opt: any) => {
       if (!opt) return undefined
 
@@ -961,8 +939,7 @@ function normalizeCondition(condition: any): any | undefined {
 
 function splitParametersByOperation(
   subBlocks: any[],
-  blockInputsForDescriptions?: Record<string, any>,
-  effectiveSuperUser = false
+  blockInputsForDescriptions?: Record<string, any>
 ): {
   commonParameters: CopilotSubblockMetadata[]
   operationParameters: Record<string, CopilotSubblockMetadata[]>
@@ -972,7 +949,7 @@ function splitParametersByOperation(
 
   for (const sb of subBlocks || []) {
     const cond = normalizeCondition(sb.condition)
-    const processed = processSubBlock(sb, effectiveSuperUser)
+    const processed = processSubBlock(sb)
 
     if (cond && cond.field === 'operation' && !cond.not && cond.value !== undefined) {
       const values: any[] = Array.isArray(cond.value) ? cond.value : [cond.value]
@@ -1000,13 +977,10 @@ function splitParametersByOperation(
   return { commonParameters, operationParameters }
 }
 
-function getCopilotHiddenParamKeys(
-  blockConfig: BlockConfig,
-  effectiveSuperUser = false
-): Set<string> {
+function getCopilotHiddenParamKeys(blockConfig: BlockConfig): Set<string> {
   const hiddenParamKeys = new Set<string>()
   for (const subBlock of blockConfig.subBlocks ?? []) {
-    if (!subBlock.hideFromCopilot && (!subBlock.superUserOnly || effectiveSuperUser)) continue
+    if (!subBlock.hideFromCopilot && !subBlock.superUserOnly) continue
     if (subBlock.id) hiddenParamKeys.add(subBlock.id)
     if (subBlock.canonicalParamId) hiddenParamKeys.add(subBlock.canonicalParamId)
   }
@@ -1015,15 +989,14 @@ function getCopilotHiddenParamKeys(
 
 export function computeBlockLevelInputs(
   blockConfig: BlockConfig,
-  effectiveSuperUser = false,
-  hiddenParamKeys = getCopilotHiddenParamKeys(blockConfig, effectiveSuperUser)
+  hiddenParamKeys = getCopilotHiddenParamKeys(blockConfig)
 ): Record<string, any> {
   const inputs = blockConfig.inputs || {}
   const subBlocks: any[] = Array.isArray(blockConfig.subBlocks)
     ? blockConfig.subBlocks.filter(
         (sb) =>
           !sb.hideFromCopilot &&
-          (!sb.superUserOnly || effectiveSuperUser) &&
+          !sb.superUserOnly &&
           sb.mode !== 'trigger' &&
           sb.mode !== 'trigger-advanced'
       )
@@ -1058,15 +1031,14 @@ export function computeBlockLevelInputs(
 }
 
 function computeOperationLevelInputs(
-  blockConfig: BlockConfig,
-  effectiveSuperUser = false
+  blockConfig: BlockConfig
 ): Record<string, Record<string, any>> {
   const inputs = blockConfig.inputs || {}
   const subBlocks = Array.isArray(blockConfig.subBlocks)
     ? blockConfig.subBlocks.filter(
         (sb) =>
           !sb.hideFromCopilot &&
-          (!sb.superUserOnly || effectiveSuperUser) &&
+          !sb.superUserOnly &&
           sb.mode !== 'trigger' &&
           sb.mode !== 'trigger-advanced'
       )