improvement(code-quality): centralize regex checks, normalization (#2554)

* improvement(code-quality): centralize regex checks, normalization

* simplify resolution

* fix(copilot): don't allow duplicate name blocks

* centralize uuid check

apps/sim/app/api/copilot/checkpoints/revert/route.ts

@@ -10,9 +10,9 @@ import {
   createRequestTracker,
   createUnauthorizedResponse,
 } from '@/lib/copilot/request-helpers'
-import { validateUUID } from '@/lib/core/security/input-validation'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
+import { isUuidV4 } from '@/executor/constants'
 
 const logger = createLogger('CheckpointRevertAPI')
 
@@ -87,9 +87,8 @@ export async function POST(request: NextRequest) {
       isDeployed: cleanedState.isDeployed,
     })
 
-    const workflowIdValidation = validateUUID(checkpoint.workflowId, 'workflowId')
-    if (!workflowIdValidation.isValid) {
-      logger.error(`[${tracker.requestId}] Invalid workflow ID: ${workflowIdValidation.error}`)
+    if (!isUuidV4(checkpoint.workflowId)) {
+      logger.error(`[${tracker.requestId}] Invalid workflow ID format`)
       return NextResponse.json({ error: 'Invalid workflow ID format' }, { status: 400 })
     }
 

apps/sim/app/api/copilot/execute-tool/route.ts

@@ -14,6 +14,8 @@ import { generateRequestId } from '@/lib/core/utils/request'
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
 import { createLogger } from '@/lib/logs/console/logger'
 import { refreshTokenIfNeeded } from '@/app/api/auth/oauth/utils'
+import { REFERENCE } from '@/executor/constants'
+import { createEnvVarPattern } from '@/executor/utils/reference-validation'
 import { executeTool } from '@/tools'
 import { getTool } from '@/tools/utils'
 
@@ -33,14 +35,18 @@ const ExecuteToolSchema = z.object({
 function resolveEnvVarReferences(value: any, envVars: Record<string, string>): any {
   if (typeof value === 'string') {
     // Check for exact match: entire string is "{{VAR_NAME}}"
-    const exactMatch = /^\{\{([^}]+)\}\}$/.exec(value)
+    const exactMatchPattern = new RegExp(
+      `^\\${REFERENCE.ENV_VAR_START}([^}]+)\\${REFERENCE.ENV_VAR_END}$`
+    )
+    const exactMatch = exactMatchPattern.exec(value)
     if (exactMatch) {
       const envVarName = exactMatch[1].trim()
       return envVars[envVarName] ?? value
     }
 
     // Check for embedded references: "prefix {{VAR}} suffix"
-    return value.replace(/\{\{([^}]+)\}\}/g, (match, varName) => {
+    const envVarPattern = createEnvVarPattern()
+    return value.replace(envVarPattern, (match, varName) => {
       const trimmedName = varName.trim()
       return envVars[trimmedName] ?? match
     })