Merge pull request #688 from simstudioai/staging

v0.2.14: fix + improvement

Author: icecrasher321

apps/docs/app/global.css

@@ -1,7 +1,8 @@
 @import "tailwindcss";
 @import "fumadocs-ui/css/neutral.css";
 @import "fumadocs-ui/css/preset.css";
-:root {
+
+@theme {
   --color-fd-primary: #802fff; /* Purple from control-bar component */
 }
 
@@ -15,4 +16,9 @@
   color: var(--color-fd-primary);
 }
 
+/* Tailwind v4 content sources */
+@source '../app/**/*.{js,ts,jsx,tsx,mdx}';
+@source '../components/**/*.{js,ts,jsx,tsx,mdx}';
+@source '../content/**/*.{js,ts,jsx,tsx,mdx}';
+@source '../mdx-components.tsx';
 @source '../node_modules/fumadocs-ui/dist/**/*.js';

apps/sim/app/api/knowledge/[id]/documents/route.ts

@@ -4,6 +4,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console-logger'
+import { getUserId } from '@/app/api/auth/oauth/utils'
 import { db } from '@/db'
 import { document } from '@/db/schema'
 import { checkKnowledgeBaseAccess, processDocumentAsync } from '../../utils'
@@ -269,27 +270,41 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
   const { id: knowledgeBaseId } = await params
 
   try {
-    const session = await getSession()
-    if (!session?.user?.id) {
-      logger.warn(`[${requestId}] Unauthorized document creation attempt`)
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    const body = await req.json()
+    const { workflowId } = body
+
+    logger.info(`[${requestId}] Knowledge base document creation request`, {
+      knowledgeBaseId,
+      workflowId,
+      hasWorkflowId: !!workflowId,
+      bodyKeys: Object.keys(body),
+    })
+
+    const userId = await getUserId(requestId, workflowId)
+
+    if (!userId) {
+      const errorMessage = workflowId ? 'Workflow not found' : 'Unauthorized'
+      const statusCode = workflowId ? 404 : 401
+      logger.warn(`[${requestId}] Authentication failed: ${errorMessage}`, {
+        workflowId,
+        hasWorkflowId: !!workflowId,
+      })
+      return NextResponse.json({ error: errorMessage }, { status: statusCode })
     }
 
-    const accessCheck = await checkKnowledgeBaseAccess(knowledgeBaseId, session.user.id)
+    const accessCheck = await checkKnowledgeBaseAccess(knowledgeBaseId, userId)
 
     if (!accessCheck.hasAccess) {
       if ('notFound' in accessCheck && accessCheck.notFound) {
         logger.warn(`[${requestId}] Knowledge base not found: ${knowledgeBaseId}`)
         return NextResponse.json({ error: 'Knowledge base not found' }, { status: 404 })
       }
       logger.warn(
-        `[${requestId}] User ${session.user.id} attempted to create document in unauthorized knowledge base ${knowledgeBaseId}`
+        `[${requestId}] User ${userId} attempted to create document in unauthorized knowledge base ${knowledgeBaseId}`
       )
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
-    const body = await req.json()
-
     // Check if this is a bulk operation
     if (body.bulk === true) {
       // Handle bulk processing (replaces process-documents endpoint)

apps/sim/app/unsubscribe/page.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState } from 'react'
+import { Suspense, useEffect, useState } from 'react'
 import { CheckCircle, Heart, Info, Loader2, XCircle } from 'lucide-react'
 import { useSearchParams } from 'next/navigation'
 import { Button } from '@/components/ui/button'
@@ -20,7 +20,7 @@ interface UnsubscribeData {
   }
 }
 
-export default function UnsubscribePage() {
+function UnsubscribeContent() {
   const searchParams = useSearchParams()
   const [loading, setLoading] = useState(true)
   const [data, setData] = useState<UnsubscribeData | null>(null)
@@ -380,3 +380,21 @@ export default function UnsubscribePage() {
     </div>
   )
 }
+
+export default function UnsubscribePage() {
+  return (
+    <Suspense
+      fallback={
+        <div className='flex min-h-screen items-center justify-center bg-background'>
+          <Card className='w-full max-w-md border shadow-sm'>
+            <CardContent className='flex items-center justify-center p-8'>
+              <Loader2 className='h-8 w-8 animate-spin text-muted-foreground' />
+            </CardContent>
+          </Card>
+        </div>
+      }
+    >
+      <UnsubscribeContent />
+    </Suspense>
+  )
+}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value.ts

@@ -181,7 +181,7 @@ export function useSubBlockValue<T = any>(
   triggerWorkflowUpdate = false,
   options?: UseSubBlockValueOptions
 ): readonly [T | null, (value: T) => void] {
-  const { debounceMs = 150, isStreaming = false, onStreamingEnd } = options || {}
+  const { isStreaming = false, onStreamingEnd } = options || {}
 
   const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
 
@@ -202,8 +202,7 @@ export function useSubBlockValue<T = any>(
   // Previous model reference for detecting model changes
   const prevModelRef = useRef<string | null>(null)
 
-  // Debouncing refs
-  const debounceTimerRef = useRef<NodeJS.Timeout | null>(null)
+  // Streaming refs
   const lastEmittedValueRef = useRef<T | null>(null)
   const streamingValueRef = useRef<T | null>(null)
   const wasStreamingRef = useRef<boolean>(false)
@@ -232,15 +231,6 @@ export function useSubBlockValue<T = any>(
   // Compute the modelValue based on block type
   const modelValue = isProviderBasedBlock ? (modelSubBlockValue as string) : null
 
-  // Cleanup timer on unmount
-  useEffect(() => {
-    return () => {
-      if (debounceTimerRef.current) {
-        clearTimeout(debounceTimerRef.current)
-      }
-    }
-  }, [])
-
   // Emit the value to socket/DB
   const emitValue = useCallback(
     (value: T) => {
@@ -299,26 +289,12 @@ export function useSubBlockValue<T = any>(
           storeApiKeyValue(blockId, blockType, modelValue, newValue, storeValue)
         }
 
-        // Clear any existing debounce timer
-        if (debounceTimerRef.current) {
-          clearTimeout(debounceTimerRef.current)
-          debounceTimerRef.current = null
-        }
-
         // If streaming, just store the value without emitting
         if (isStreaming) {
           streamingValueRef.current = valueCopy
         } else {
-          // Detect large changes for extended debounce
-          const isLargeChange = detectLargeChange(lastEmittedValueRef.current, valueCopy)
-          const effectiveDebounceMs = isLargeChange ? debounceMs * 2 : debounceMs
-
-          // Debounce the socket emission
-          debounceTimerRef.current = setTimeout(() => {
-            if (valueRef.current !== null && valueRef.current !== lastEmittedValueRef.current) {
-              emitValue(valueCopy)
-            }
-          }, effectiveDebounceMs)
+          // Emit immediately - let the operation queue handle debouncing and deduplication
+          emitValue(valueCopy)
         }
 
         if (triggerWorkflowUpdate) {
@@ -335,7 +311,6 @@ export function useSubBlockValue<T = any>(
       triggerWorkflowUpdate,
       modelValue,
       isStreaming,
-      debounceMs,
       emitValue,
     ]
   )
@@ -412,26 +387,3 @@ export function useSubBlockValue<T = any>(
   // Return appropriate tuple based on whether options were provided
   return [storeValue !== undefined ? storeValue : initialValue, setValue] as const
 }
-
-// Helper function to detect large changes
-function detectLargeChange(oldValue: any, newValue: any): boolean {
-  // Handle null/undefined
-  if (oldValue == null && newValue == null) return false
-  if (oldValue == null || newValue == null) return true
-
-  // For strings, check if it's a large paste or deletion
-  if (typeof oldValue === 'string' && typeof newValue === 'string') {
-    const sizeDiff = Math.abs(newValue.length - oldValue.length)
-    // Consider it a large change if more than 50 characters changed at once
-    return sizeDiff > 50
-  }
-
-  // For arrays, check length difference
-  if (Array.isArray(oldValue) && Array.isArray(newValue)) {
-    const sizeDiff = Math.abs(newValue.length - oldValue.length)
-    return sizeDiff > 5
-  }
-
-  // For other types, always treat as small change
-  return false
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx

@@ -500,7 +500,7 @@ const WorkflowContent = React.memo(() => {
       let autoConnectEdge
       if (isAutoConnectEnabled && type !== 'starter') {
         const closestBlock = findClosestOutput(centerPosition)
-        console.log('🎯 Closest block found:', closestBlock)
+        logger.info('🎯 Closest block found:', closestBlock)
         if (closestBlock) {
           // Get appropriate source handle
           const sourceHandle = determineSourceHandle(closestBlock)
@@ -513,7 +513,7 @@ const WorkflowContent = React.memo(() => {
             targetHandle: 'target',
             type: 'workflowEdge',
           }
-          console.log('✅ Auto-connect edge created:', autoConnectEdge)
+          logger.info('✅ Auto-connect edge created:', autoConnectEdge)
         }
       }
 

apps/sim/lib/auth-client.ts

@@ -1,8 +1,8 @@
 import { stripeClient } from '@better-auth/stripe/client'
 import { emailOTPClient, genericOAuthClient, organizationClient } from 'better-auth/client/plugins'
 import { createAuthClient } from 'better-auth/react'
-import { env } from './env'
-import { isDev, isProd } from './environment'
+import { env } from '@/lib/env'
+import { isDev, isProd } from '@/lib/environment'
 
 export function getBaseURL() {
   let baseURL

apps/sim/lib/auth.ts

@@ -19,13 +19,13 @@ import {
   renderOTPEmail,
   renderPasswordResetEmail,
 } from '@/components/emails/render-email'
+import { getBaseURL } from '@/lib/auth-client'
 import { env, isTruthy } from '@/lib/env'
 import { isProd } from '@/lib/environment'
 import { createLogger } from '@/lib/logs/console-logger'
 import { getEmailDomain } from '@/lib/urls/utils'
 import { db } from '@/db'
 import * as schema from '@/db/schema'
-import { getBaseURL } from './auth-client'
 
 const logger = createLogger('Auth')
 

apps/sim/lib/billing/calculations/usage-monitor.ts

@@ -1,9 +1,9 @@
 import { eq } from 'drizzle-orm'
+import { getUserUsageLimit } from '@/lib/billing/core/usage'
 import { isProd } from '@/lib/environment'
 import { createLogger } from '@/lib/logs/console-logger'
 import { db } from '@/db'
 import { userStats } from '@/db/schema'
-import { getUserUsageLimit } from '../core/usage'
 
 const logger = createLogger('UsageMonitor')
 

apps/sim/lib/billing/core/billing.ts

@@ -1,11 +1,14 @@
 import { and, eq } from 'drizzle-orm'
+import {
+  resetOrganizationBillingPeriod,
+  resetUserBillingPeriod,
+} from '@/lib/billing/core/billing-periods'
+import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
+import { getUserUsageData } from '@/lib/billing/core/usage'
+import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { createLogger } from '@/lib/logs/console-logger'
 import { db } from '@/db'
 import { member, organization, subscription, user, userStats } from '@/db/schema'
-import { requireStripeClient } from '../stripe-client'
-import { resetOrganizationBillingPeriod, resetUserBillingPeriod } from './billing-periods'
-import { getHighestPrioritySubscription } from './subscription'
-import { getUserUsageData } from './usage'
 
 const logger = createLogger('Billing')
 

apps/sim/lib/billing/core/organization-billing.ts

@@ -1,9 +1,9 @@
 import { and, eq } from 'drizzle-orm'
+import { getPlanPricing } from '@/lib/billing/core/billing'
+import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { createLogger } from '@/lib/logs/console-logger'
 import { db } from '@/db'
 import { member, organization, user, userStats } from '@/db/schema'
-import { getPlanPricing } from './billing'
-import { getHighestPrioritySubscription } from './subscription'
 
 const logger = createLogger('OrganizationBilling')