byop

Author: Sg312

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

@@ -2,6 +2,7 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Combobox, type ComboboxOption, cn } from '@sim/emcn'
 import { Plus } from '@sim/emcn/icons'
 import { useReactFlow } from 'reactflow'
+import { useSession } from '@/lib/auth/auth-client'
 import { SandboxCreateModal } from '@/app/workspace/[workspaceId]/settings/components/sandboxes/components/sandbox-create-modal'
 import type { SandboxLanguage } from '@/app/workspace/[workspaceId]/settings/components/sandboxes/utils'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
@@ -13,7 +14,9 @@ import { useActiveSearchTarget } from '@/app/workspace/[workspaceId]/w/[workflow
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 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 { getProviderFromModel } from '@/providers/utils'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
@@ -42,7 +45,12 @@ const CREATE_ACTION_VALUE = '__sub-block-create-action__'
  */
 type ComboBoxOption =
   | string
-  | { label: string; id: string; icon?: React.ComponentType<{ className?: string }> }
+  | {
+      label: string
+      id: string
+      icon?: React.ComponentType<{ className?: string }>
+      requiresSuperUser?: boolean
+    }
 
 /**
  * Props for the ComboBox component
@@ -96,6 +104,8 @@ export const ComboBox = memo(function ComboBox({
 }: ComboBoxProps) {
   const activeSearchTarget = useActiveSearchTarget()
   // Hooks and context
+  const { data: session } = useSession()
+  const { data: generalSettings } = useGeneralSettings()
   const [storeValue, setStoreValue] = useSubBlockValue<string>(blockId, subBlockId)
   const accessiblePrefixes = useAccessibleReferencePrefixes(blockId)
   const reactFlowInstance = useReactFlow()
@@ -112,14 +122,20 @@ export const ComboBox = memo(function ComboBox({
     isModelAllowed,
     isLoading: isPermissionLoading,
   } = usePermissionConfig()
+  const effectiveSuperUser =
+    session?.user?.role === 'admin' && (generalSettings?.superUserModeEnabled ?? false)
 
   // Evaluate static options if provided as a function
   const staticOptions = useMemo(() => {
     const opts = typeof options === 'function' ? options() : options
+    const visibleOptions = opts.filter(
+      (option) => typeof option === 'string' || !option.requiresSuperUser || effectiveSuperUser
+    )
 
     if (subBlockId === 'model') {
-      return opts.filter((opt) => {
+      return visibleOptions.filter((opt) => {
         const modelId = typeof opt === 'string' ? opt : opt.id
+        if (isCustomModel(modelId)) return effectiveSuperUser
         if (!isModelAllowed(modelId)) return false
         try {
           return isProviderAllowed(getProviderFromModel(modelId))
@@ -129,8 +145,8 @@ export const ComboBox = memo(function ComboBox({
       })
     }
 
-    return opts
-  }, [options, subBlockId, isProviderAllowed, isModelAllowed])
+    return visibleOptions
+  }, [options, subBlockId, isProviderAllowed, isModelAllowed, effectiveSuperUser])
 
   const {
     fetchedOptions,
@@ -186,6 +202,7 @@ export const ComboBox = memo(function ComboBox({
     if (subBlockId === 'model' && fetchOptions && normalizedFetchedOptions.length > 0) {
       opts = opts.filter((opt) => {
         const modelId = typeof opt === 'string' ? opt : opt.id
+        if (isCustomModel(modelId)) return effectiveSuperUser
         if (!isModelAllowed(modelId)) return false
         try {
           return isProviderAllowed(getProviderFromModel(modelId))
@@ -196,7 +213,7 @@ export const ComboBox = memo(function ComboBox({
     }
 
     // Merge hydrated option if not already present
-    if (hydratedOption) {
+    if (hydratedOption && (!isCustomModel(hydratedOption.id) || effectiveSuperUser)) {
       const alreadyPresent = opts.some((o) =>
         typeof o === 'string' ? o === hydratedOption.id : o.id === hydratedOption.id
       )
@@ -227,6 +244,7 @@ export const ComboBox = memo(function ComboBox({
     subBlockId,
     isProviderAllowed,
     isModelAllowed,
+    effectiveSuperUser,
   ])
 
   // Convert options to Combobox format

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

@@ -18,6 +18,7 @@ import { createLogger } from '@sim/logger'
 import { ArrowLeft, ChevronRight, ServerIcon, WrenchIcon, XIcon } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import { McpIcon, WorkflowIcon } from '@/components/icons'
+import { useSession } from '@/lib/auth/auth-client'
 import {
   getIssueBadgeLabel,
   getIssueBadgeVariant,
@@ -74,6 +75,7 @@ import {
   useCustomTools,
 } from '@/hooks/queries/custom-tools'
 import { useDeploymentInfo, useDeployWorkflow } from '@/hooks/queries/deployments'
+import { useGeneralSettings } from '@/hooks/queries/general-settings'
 import {
   useAllowedMcpDomains,
   useCreateMcpServer,
@@ -472,6 +474,10 @@ export const ToolInput = memo(function ToolInput({
   const workspaceId = params.workspaceId as string
   const workflowId = params.workflowId as string
   const activeSearchTarget = useActiveSearchTarget()
+  const { data: session } = useSession()
+  const { data: generalSettings } = useGeneralSettings()
+  const effectiveSuperUser =
+    session?.user?.role === 'admin' && (generalSettings?.superUserModeEnabled ?? false)
   const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlockId)
   const [open, setOpen] = useState(false)
   const [customToolModalOpen, setCustomToolModalOpen] = useState(false)
@@ -1807,8 +1813,9 @@ export const ToolInput = memo(function ToolInput({
           const displaySubBlocks: BlockSubBlockConfig[] = useSubBlocks
             ? subBlocksResult!.subBlocks.filter(
                 (sb) =>
-                  !sb.reactiveCondition ||
-                  toolCredential?.type === sb.reactiveCondition.requiredType
+                  (!sb.superUserOnly || effectiveSuperUser) &&
+                  (!sb.reactiveCondition ||
+                    toolCredential?.type === sb.reactiveCondition.requiredType)
               )
             : []
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts

@@ -1,4 +1,5 @@
 import { useCallback, useMemo } from 'react'
+import { useSession } from '@/lib/auth/auth-client'
 import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
@@ -10,6 +11,7 @@ import {
   shouldUseSubBlockForTriggerModeCanonicalIndex,
 } from '@/lib/workflows/subblocks/visibility'
 import type { BlockConfig, SubBlockConfig } from '@/blocks/types'
+import { useGeneralSettings } from '@/hooks/queries/general-settings'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { useReactiveConditions } from '@/hooks/use-reactive-conditions'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
@@ -38,10 +40,14 @@ export function useEditorSubblockLayout(
   blockSubBlockValues: Record<string, any>,
   isSnapshotView: boolean
 ) {
+  const { data: session } = useSession()
+  const { data: generalSettings } = useGeneralSettings()
   const blockDataFromStore = useWorkflowStore(
     useCallback((state) => state.blocks?.[blockId]?.data, [blockId])
   )
   const { config: permissionConfig } = usePermissionConfig()
+  const effectiveSuperUser =
+    session?.user?.role === 'admin' && (generalSettings?.superUserModeEnabled ?? false)
 
   // Evaluate reactive conditions (hooks-based, must be called before useMemo)
   const hiddenByReactiveCondition = useReactiveConditions(
@@ -117,6 +123,7 @@ export function useEditorSubblockLayout(
 
     const visibleSubBlocks = (config.subBlocks || []).filter((block) => {
       if (block.hidden) return false
+      if (block.superUserOnly && !effectiveSuperUser) return false
 
       // Configures the block as an agent tool; it has no meaning on the canvas.
       if (isToolInputOnlySubBlock(block)) return false
@@ -169,5 +176,6 @@ export function useEditorSubblockLayout(
     blockDataFromStore,
     hiddenByReactiveCondition,
     permissionConfig.disableSkills,
+    effectiveSuperUser,
   ])
 }

apps/sim/blocks/blocks/agent.test.ts

@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { AgentBlock } from '@/blocks/blocks/agent'
+import { CUSTOM_MODEL_ID } from '@/providers/custom-model'
 
 vi.mock('@/blocks', () => ({
   getAllBlocks: vi.fn(() => [
@@ -29,6 +30,55 @@ describe('AgentBlock', () => {
     throw new Error('AgentBlock.tools.config.params function is missing')
   }
 
+  it('declares the custom JSON control directly after the model and keeps other controls separate', () => {
+    const modelIndex = AgentBlock.subBlocks.findIndex((subBlock) => subBlock.id === 'model')
+    const customConfig = AgentBlock.subBlocks[modelIndex + 1]
+    const modelOptions = AgentBlock.subBlocks[modelIndex].options
+    const evaluatedModelOptions = typeof modelOptions === 'function' ? modelOptions() : modelOptions
+
+    expect(customConfig).toEqual(
+      expect.objectContaining({
+        id: 'customModelConfig',
+        type: 'code',
+        language: 'json',
+        superUserOnly: true,
+        condition: { field: 'model', value: CUSTOM_MODEL_ID },
+        required: { field: 'model', value: CUSTOM_MODEL_ID },
+      })
+    )
+    expect(evaluatedModelOptions).toContainEqual(
+      expect.objectContaining({
+        id: CUSTOM_MODEL_ID,
+        requiresSuperUser: true,
+      })
+    )
+    expect(AgentBlock.inputs.customModelConfig?.schema).toBeDefined()
+
+    const tools = AgentBlock.subBlocks.find((subBlock) => subBlock.id === 'tools')
+    const responseFormat = AgentBlock.subBlocks.find((subBlock) => subBlock.id === 'responseFormat')
+    expect(tools?.condition).toEqual(
+      expect.objectContaining({ value: expect.not.arrayContaining([CUSTOM_MODEL_ID]) })
+    )
+    expect(responseFormat?.condition).toEqual(
+      expect.objectContaining({ value: expect.not.arrayContaining([CUSTOM_MODEL_ID]) })
+    )
+  })
+
+  it('selects the explicit provider from a custom model configuration', () => {
+    const toolFunction = AgentBlock.tools.config?.tool
+    expect(toolFunction).toBeDefined()
+
+    expect(
+      toolFunction?.({
+        model: CUSTOM_MODEL_ID,
+        customModelConfig: {
+          provider: 'fireworks',
+          model: 'accounts/fireworks/models/kimi-k3',
+        },
+      } as never)
+    ).toBe('fireworks')
+  })
+
   describe('tools.config.params function', () => {
     it('should pass through params when no tools array is provided', () => {
       const params = {

apps/sim/blocks/blocks/agent.ts

@@ -3,11 +3,18 @@ import { AgentIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import {
-  getModelOptions,
+  getAgentModelOptions,
   getProviderCredentialSubBlocks,
   normalizeFileInput,
   RESPONSE_FORMAT_WAND_CONFIG,
 } from '@/blocks/utils'
+import {
+  CUSTOM_MODEL_CONFIG_DEFAULT,
+  CUSTOM_MODEL_CONFIG_JSON_SCHEMA,
+  CUSTOM_MODEL_ID,
+  isCustomModel,
+  parseCustomModelConfig,
+} from '@/providers/custom-model'
 import {
   getBaseModelProviders,
   getMaxTemperature,
@@ -134,9 +141,28 @@ Return ONLY the JSON array.`,
       placeholder: 'Type or select a model...',
       required: true,
       defaultValue: 'claude-sonnet-5',
-      options: getModelOptions,
+      options: getAgentModelOptions,
       commandSearchable: true,
     },
+    {
+      id: 'customModelConfig',
+      title: 'Custom Model Configuration',
+      type: 'code',
+      language: 'json',
+      placeholder: 'Enter custom provider and model configuration...',
+      description:
+        'Provider, model, credentials, and provider-specific generation settings. Tools, response format, skills, files, prompts, and memory remain configured separately.',
+      defaultValue: CUSTOM_MODEL_CONFIG_DEFAULT,
+      superUserOnly: true,
+      required: {
+        field: 'model',
+        value: CUSTOM_MODEL_ID,
+      },
+      condition: {
+        field: 'model',
+        value: CUSTOM_MODEL_ID,
+      },
+    },
     {
       id: 'attachmentFiles',
       title: 'Files',
@@ -480,7 +506,7 @@ Return ONLY the JSON array.`,
       mode: 'advanced',
       condition: {
         field: 'model',
-        value: MODELS_WITH_DEEP_RESEARCH,
+        value: [...MODELS_WITH_DEEP_RESEARCH, CUSTOM_MODEL_ID],
         not: true,
       },
     },
@@ -523,6 +549,9 @@ Return ONLY the JSON array.`,
         if (!model) {
           throw new Error('No model selected')
         }
+        if (isCustomModel(model)) {
+          return parseCustomModelConfig(params.customModelConfig).provider
+        }
         // sim-auto resolves to a concrete pool model at execution time, where
         // the agent handler derives the provider from the resolved model and
         // never reads this serialized value. Serialization still needs the
@@ -607,6 +636,12 @@ Return ONLY the JSON array.`,
         'Maximum number of tokens for token-based sliding window memory (when memoryType is sliding_window_tokens, e.g., "4000")',
     },
     model: { type: 'string', description: 'AI model to use' },
+    customModelConfig: {
+      type: 'json',
+      description:
+        'Custom provider/model execution configuration. Tools, response format, skills, files, prompts, and memory are separate Agent inputs.',
+      schema: CUSTOM_MODEL_CONFIG_JSON_SCHEMA,
+    },
     apiKey: { type: 'string', description: 'Provider API key' },
     azureEndpoint: { type: 'string', description: 'Azure endpoint URL' },
     azureApiVersion: { type: 'string', description: 'Azure API version' },

apps/sim/blocks/types.ts

@@ -258,6 +258,8 @@ export interface SubBlockConfig {
   id: string
   title?: string
   type: SubBlockType
+  /** Shows this authoring control only while effective super-user mode is enabled. */
+  superUserOnly?: boolean
   mode?: 'basic' | 'advanced' | 'both' | 'trigger' | 'trigger-advanced' // Default is 'both' if not specified. 'trigger' means only shown in trigger mode. 'trigger-advanced' is the advanced side of a trigger field — either a canonical pair member or a standalone field shown under the block-level advanced toggle
   canonicalParamId?: string
   /** Controls parameter visibility in agent/tool-input context */
@@ -317,6 +319,8 @@ export interface SubBlockConfig {
         hidden?: boolean
         defaultChecked?: boolean
         description?: string
+        /** Omits this option unless effective super-user mode is enabled. */
+        requiresSuperUser?: boolean
       }[]
     | (() => {
         label: string
@@ -326,6 +330,8 @@ export interface SubBlockConfig {
         hidden?: boolean
         defaultChecked?: boolean
         description?: string
+        /** Omits this option unless effective super-user mode is enabled. */
+        requiresSuperUser?: boolean
       }[])
   min?: number
   max?: number