remove regex based checks'

Author: icecrasher321

apps/sim/lib/copilot/tools/server/workflow/edit-workflow/validation.test.ts

@@ -172,15 +172,25 @@ describe('validateInputsForBlock', () => {
     expect(result.validInputs.model).toBe('mistralai/Mistral-7B-Instruct-v0.3')
   })
 
-  it('accepts date-suffixed variants of known Anthropic ids', () => {
+  it('rejects a bare Ollama-style tag without the provider prefix', () => {
+    const result = validateInputsForBlock('agent', { model: 'llama3.1:8b' }, 'agent-1')
+
+    expect(result.validInputs.model).toBeUndefined()
+    expect(result.errors).toHaveLength(1)
+    expect(result.errors[0]?.error).toContain('Unknown model id')
+    expect(result.errors[0]?.error).toContain('ollama/')
+  })
+
+  it('rejects date-pinned ids that are not literally in the catalog', () => {
     const result = validateInputsForBlock(
       'agent',
       { model: 'claude-sonnet-4-5-20250929' },
       'agent-1'
     )
 
-    expect(result.errors).toHaveLength(0)
-    expect(result.validInputs.model).toBe('claude-sonnet-4-5-20250929')
+    expect(result.validInputs.model).toBeUndefined()
+    expect(result.errors).toHaveLength(1)
+    expect(result.errors[0]?.error).toContain('Unknown model id')
   })
 
   it('trims whitespace around catalog model ids and stores the trimmed value', () => {

apps/sim/lib/copilot/tools/server/workflow/edit-workflow/validation.ts

@@ -375,7 +375,7 @@ export function validateValueForSubBlockType(
               blockType,
               field: fieldName,
               value,
-              error: `Unknown model id "${trimmed}" for block "${blockType}". Read components/blocks/${blockType}.json (the model.options array) for valid ids; prefer entries with recommended: true and avoid deprecated: true.${suggestionText}`,
+              error: `Unknown model id "${trimmed}" for block "${blockType}". Read components/blocks/${blockType}.json (the model.options array) for valid ids; prefer entries with recommended: true and avoid deprecated: true. For user-configured models (Ollama, vLLM, OpenRouter, Fireworks), prefix the id with the provider slash, e.g. "ollama/llama3.1:8b".${suggestionText}`,
             },
           }
         }

apps/sim/lib/copilot/vfs/serializers.ts

@@ -2,7 +2,7 @@ import { getCopilotToolDescription } from '@/lib/copilot/tools/descriptions'
 import { isHosted } from '@/lib/core/config/feature-flags'
 import { isSubBlockHidden } from '@/lib/workflows/subblocks/visibility'
 import type { BlockConfig, SubBlockConfig } from '@/blocks/types'
-import { PROVIDER_DEFINITIONS } from '@/providers/models'
+import { DYNAMIC_MODEL_PROVIDERS, PROVIDER_DEFINITIONS } from '@/providers/models'
 import type { ToolConfig } from '@/tools/types'
 
 /**
@@ -342,8 +342,8 @@ const RESELLER_BASE_PREFIX: Record<string, string> = {
 }
 
 const DYNAMIC_PROVIDERS_NOTE = {
-  note: 'The options array above lists Sim\'s static provider catalog. These four providers also accept user-configured models that are NOT enumerated here: the user may have additional ids available at runtime. Any model id prefixed with one of the slashes below is accepted by the server, as is any bare id that does not match a static provider pattern (typically a local Ollama tag like "llama3.1:8b"). The UI dropdown shows the user\'s actual installed models; if the user references one by name, use that id verbatim.',
-  prefixes: ['ollama/', 'vllm/', 'openrouter/', 'fireworks/'],
+  note: 'The options array above lists Sim\'s static provider catalog. These providers also accept user-configured models that are NOT enumerated here: the user may have additional ids available at runtime. Any model id prefixed with one of the slashes below is accepted by the server, as is any bare id that does not match a static provider pattern (typically a local Ollama tag like "llama3.1:8b"). The UI dropdown shows the user\'s actual installed models; if the user references one by name, use that id verbatim.',
+  prefixes: DYNAMIC_MODEL_PROVIDERS.map((p) => `${p}/`),
 } as const
 
 function getStaticModelOptionsForVFS(): StaticModelOption[] {

apps/sim/providers/models.ts

@@ -2711,32 +2711,32 @@ export function getProviderModels(providerId: string): string[] {
   return PROVIDER_DEFINITIONS[providerId]?.models.map((m) => m.id) || []
 }
 
-const DYNAMIC_MODEL_PROVIDERS = ['ollama', 'vllm', 'openrouter', 'fireworks'] as const
+export const DYNAMIC_MODEL_PROVIDERS = ['ollama', 'vllm', 'openrouter', 'fireworks'] as const
+
+export function getAllStaticModelIds(): string[] {
+  const ids: string[] = []
+  for (const [providerId, provider] of Object.entries(PROVIDER_DEFINITIONS)) {
+    if ((DYNAMIC_MODEL_PROVIDERS as readonly string[]).includes(providerId)) continue
+    for (const model of provider.models) ids.push(model.id)
+  }
+  return ids
+}
+
+const STATIC_MODEL_ID_SET = new Set(getAllStaticModelIds().map((id) => id.toLowerCase()))
 
 export function isKnownModelId(modelId: string): boolean {
   if (!modelId || typeof modelId !== 'string') return false
   const trimmed = modelId.trim()
   if (!trimmed) return false
-  const normalized = trimmed.toLowerCase()
-
-  for (const provider of Object.values(PROVIDER_DEFINITIONS)) {
-    for (const model of provider.models) {
-      const base = model.id.toLowerCase()
-      if (normalized === base || normalized.startsWith(`${base}-`)) return true
-    }
-  }
 
-  const dynamicPrefixes = [/^ollama\//i, /^vllm\//i, /^openrouter\//i, /^fireworks\//i]
-  if (dynamicPrefixes.some((re) => re.test(trimmed))) return true
+  if (STATIC_MODEL_ID_SET.has(trimmed.toLowerCase())) return true
 
-  for (const [providerId, provider] of Object.entries(PROVIDER_DEFINITIONS)) {
-    if ((DYNAMIC_MODEL_PROVIDERS as readonly string[]).includes(providerId)) continue
-    if (provider.modelPatterns?.some((re) => re.test(normalized))) {
-      return false
-    }
+  const lowered = trimmed.toLowerCase()
+  for (const provider of DYNAMIC_MODEL_PROVIDERS) {
+    if (lowered.startsWith(`${provider}/`)) return true
   }
 
-  return true
+  return false
 }
 
 export function getRecommendedModels(): string[] {
@@ -2750,25 +2750,7 @@ export function getRecommendedModels(): string[] {
   return models
 }
 
-export function suggestModelIdsForUnknownModel(modelId: string, limit = 5): string[] {
-  if (!modelId || typeof modelId !== 'string') return []
-  const normalized = modelId.trim().toLowerCase()
-  if (!normalized) return []
-
-  for (const [providerId, provider] of Object.entries(PROVIDER_DEFINITIONS)) {
-    if ((DYNAMIC_MODEL_PROVIDERS as readonly string[]).includes(providerId)) continue
-    if (provider.modelPatterns?.some((re) => re.test(normalized))) {
-      const recommendedFirst = [...provider.models].sort((a, b) => {
-        if (a.deprecated && !b.deprecated) return 1
-        if (!a.deprecated && b.deprecated) return -1
-        if (a.recommended && !b.recommended) return -1
-        if (!a.recommended && b.recommended) return 1
-        return 0
-      })
-      return recommendedFirst.map((m) => m.id).slice(0, limit)
-    }
-  }
-
+export function suggestModelIdsForUnknownModel(_modelId: string, limit = 5): string[] {
   const recommended = getRecommendedModels()
   if (recommended.length > 0) return recommended.slice(0, limit)