simstudioai
diff --git a/‎apps/docs/content/docs/introduction/index.mdx‎
Lines changed: 1 addition & 1 deletion b/‎apps/docs/content/docs/introduction/index.mdx‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/docs/package.json‎
Lines changed: 1 addition & 1 deletion b/‎apps/docs/package.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/sim/app/api/auth/oauth/token/route.ts‎
Lines changed: 5 additions & 1 deletion b/‎apps/sim/app/api/auth/oauth/token/route.ts‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎apps/sim/app/api/auth/oauth/utils.ts‎
Lines changed: 7 additions & 2 deletions b/‎apps/sim/app/api/auth/oauth/utils.ts‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎apps/sim/app/api/chat/[subdomain]/route.ts‎
Lines changed: 2 additions & 0 deletions b/‎apps/sim/app/api/chat/[subdomain]/route.ts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎apps/sim/app/api/chat/utils.ts‎
Lines changed: 16 additions & 5 deletions b/‎apps/sim/app/api/chat/utils.ts‎
Lines changed: 16 additions & 5 deletions
diff --git a/‎apps/sim/app/api/memory/[id]/route.ts‎
Lines changed: 7 additions & 19 deletions b/‎apps/sim/app/api/memory/[id]/route.ts‎
Lines changed: 7 additions & 19 deletions
diff --git a/‎apps/sim/app/api/workflows/[id]/execute/route.ts‎
Lines changed: 33 additions & 9 deletions b/‎apps/sim/app/api/workflows/[id]/execute/route.ts‎
Lines changed: 33 additions & 9 deletions
diff --git a/‎apps/sim/app/api/workflows/[id]/revert-to-deployed/route.ts‎
Lines changed: 121 additions & 0 deletions b/‎apps/sim/app/api/workflows/[id]/revert-to-deployed/route.ts‎
Lines changed: 121 additions & 0 deletions
@@ -81,4 +81,4 @@ Sim Studio provides a wide range of features designed to accelerate your develop
 
 ##
 
-Ready to get started? Check out our [Getting Started](/getting-started) guide or explore our [Blocks](/docs/blocks) and [Tools](/docs/tools) in more detail.
+Ready to get started? Check out our [Getting Started](/getting-started) guide or explore our [Blocks](/blocks) and [Tools](/tools) in more detail.
@@ -19,7 +19,7 @@
     "fumadocs-mdx": "^11.5.6",
     "fumadocs-ui": "^15.0.16",
     "lucide-react": "^0.511.0",
-    "next": "^15.2.3",
+    "next": "^15.3.2",
     "next-themes": "^0.4.6",
     "react": "19.1.0",
     "react-dom": "19.1.0",
 
@@ -14,6 +14,8 @@ const logger = createLogger('OAuthTokenAPI')
 export async function POST(request: NextRequest) {
   const requestId = crypto.randomUUID().slice(0, 8)
 
+  logger.info(`[${requestId}] OAuth token API POST request received`)
+
   try {
     // Parse request body
     const body = await request.json()
@@ -38,14 +40,16 @@ export async function POST(request: NextRequest) {
     const credential = await getCredential(requestId, credentialId, userId)
 
     if (!credential) {
+      logger.error(`[${requestId}] Credential not found: ${credentialId}`)
       return NextResponse.json({ error: 'Credential not found' }, { status: 404 })
     }
 
     try {
       // Refresh the token if needed
       const { accessToken } = await refreshTokenIfNeeded(requestId, credential, credentialId)
       return NextResponse.json({ accessToken }, { status: 200 })
-    } catch (_error) {
+    } catch (error) {
+      logger.error(`[${requestId}] Failed to refresh access token:`, error)
       return NextResponse.json({ error: 'Failed to refresh access token' }, { status: 401 })
     }
   } catch (error) {
 
@@ -89,6 +89,7 @@ export async function getOAuthToken(userId: string, providerId: string): Promise
   // Check if the token is expired and needs refreshing
   const now = new Date()
   const tokenExpiry = credential.accessTokenExpiresAt
+  // Only refresh if we have an expiration time AND it's expired AND we have a refresh token
   const needsRefresh = tokenExpiry && tokenExpiry < now && !!credential.refreshToken
 
   if (needsRefresh) {
@@ -166,7 +167,9 @@ export async function refreshAccessTokenIfNeeded(
   // Check if we need to refresh the token
   const expiresAt = credential.accessTokenExpiresAt
   const now = new Date()
-  const needsRefresh = !expiresAt || expiresAt <= now
+  // Only refresh if we have an expiration time AND it's expired
+  // If no expiration time is set (newly created credentials), assume token is valid
+  const needsRefresh = expiresAt && expiresAt <= now
 
   const accessToken = credential.accessToken
 
@@ -233,7 +236,9 @@ export async function refreshTokenIfNeeded(
   // Check if we need to refresh the token
   const expiresAt = credential.accessTokenExpiresAt
   const now = new Date()
-  const needsRefresh = !expiresAt || expiresAt <= now
+  // Only refresh if we have an expiration time AND it's expired
+  // If no expiration time is set (newly created credentials), assume token is valid
+  const needsRefresh = expiresAt && expiresAt <= now
 
   // If token is still valid, return it directly
   if (!needsRefresh || !credential.refreshToken) {
 
@@ -194,6 +194,7 @@ export async function GET(
           description: deployment.description,
           customizations: deployment.customizations,
           authType: deployment.authType,
+          outputConfigs: deployment.outputConfigs,
         }),
         request
       )
@@ -219,6 +220,7 @@ export async function GET(
         description: deployment.description,
         customizations: deployment.customizations,
         authType: deployment.authType,
+        outputConfigs: deployment.outputConfigs,
       }),
       request
     )
 
@@ -263,17 +263,26 @@ export async function executeWorkflowForChat(
   let outputBlockIds: string[] = []
 
   // Extract output configs from the new schema format
+  let selectedOutputIds: string[] = []
   if (deployment.outputConfigs && Array.isArray(deployment.outputConfigs)) {
-    // Extract block IDs and paths from the new outputConfigs array format
+    // Extract output IDs in the format expected by the streaming processor
     logger.debug(
       `[${requestId}] Found ${deployment.outputConfigs.length} output configs in deployment`
     )
-    deployment.outputConfigs.forEach((config) => {
+
+    selectedOutputIds = deployment.outputConfigs.map((config) => {
+      const outputId = config.path
+        ? `${config.blockId}_${config.path}`
+        : `${config.blockId}.content`
+
       logger.debug(
-        `[${requestId}] Processing output config: blockId=${config.blockId}, path=${config.path || 'none'}`
+        `[${requestId}] Processing output config: blockId=${config.blockId}, path=${config.path || 'content'} -> outputId=${outputId}`
       )
+
+      return outputId
     })
 
+    // Also extract block IDs for legacy compatibility
     outputBlockIds = deployment.outputConfigs.map((config) => config.blockId)
   } else {
     // Use customizations as fallback
@@ -291,7 +300,9 @@ export async function executeWorkflowForChat(
     outputBlockIds = customizations.outputBlockIds
   }
 
-  logger.debug(`[${requestId}] Using ${outputBlockIds.length} output blocks for extraction`)
+  logger.debug(
+    `[${requestId}] Using ${outputBlockIds.length} output blocks and ${selectedOutputIds.length} selected output IDs for extraction`
+  )
 
   // Find the workflow (deployedState is NOT deprecated - needed for chat execution)
   const workflowResult = await db
@@ -457,7 +468,7 @@ export async function executeWorkflowForChat(
         workflowVariables,
         contextExtensions: {
           stream: true,
-          selectedOutputIds: outputBlockIds,
+          selectedOutputIds: selectedOutputIds.length > 0 ? selectedOutputIds : outputBlockIds,
           edges: edges.map((e: any) => ({
             source: e.source,
             target: e.target,
 
@@ -1,4 +1,4 @@
-import { and, eq, isNull } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createLogger } from '@/lib/logs/console-logger'
 import { db } from '@/db'
@@ -40,7 +40,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
     const memories = await db
       .select()
       .from(memory)
-      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId), isNull(memory.deletedAt)))
+      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId)))
       .orderBy(memory.createdAt)
       .limit(1)
 
@@ -112,7 +112,7 @@ export async function DELETE(
     const existingMemory = await db
       .select({ id: memory.id })
       .from(memory)
-      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId), isNull(memory.deletedAt)))
+      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId)))
       .limit(1)
 
     if (existingMemory.length === 0) {
@@ -128,14 +128,8 @@ export async function DELETE(
       )
     }
 
-    // Soft delete by setting deletedAt timestamp
-    await db
-      .update(memory)
-      .set({
-        deletedAt: new Date(),
-        updatedAt: new Date(),
-      })
-      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId)))
+    // Hard delete the memory
+    await db.delete(memory).where(and(eq(memory.key, id), eq(memory.workflowId, workflowId)))
 
     logger.info(`[${requestId}] Memory deleted successfully: ${id} for workflow: ${workflowId}`)
     return NextResponse.json(
@@ -202,7 +196,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
     const existingMemories = await db
       .select()
       .from(memory)
-      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId), isNull(memory.deletedAt)))
+      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId)))
       .limit(1)
 
     if (existingMemories.length === 0) {
@@ -250,13 +244,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
     }
 
     // Update the memory with new data
-    await db
-      .update(memory)
-      .set({
-        data,
-        updatedAt: new Date(),
-      })
-      .where(and(eq(memory.key, id), eq(memory.workflowId, workflowId)))
+    await db.delete(memory).where(and(eq(memory.key, id), eq(memory.workflowId, workflowId)))
 
     // Fetch the updated memory
     const updatedMemories = await db
 
@@ -197,18 +197,42 @@ async function executeWorkflow(workflow: any, requestId: string, input?: any) {
       (acc, [blockId, blockState]) => {
         // Check if this block has a responseFormat that needs to be parsed
         if (blockState.responseFormat && typeof blockState.responseFormat === 'string') {
-          try {
-            logger.debug(`[${requestId}] Parsing responseFormat for block ${blockId}`)
-            // Attempt to parse the responseFormat if it's a string
-            const parsedResponseFormat = JSON.parse(blockState.responseFormat)
-
+          const responseFormatValue = blockState.responseFormat.trim()
+
+          // Check for variable references like <start.input>
+          if (responseFormatValue.startsWith('<') && responseFormatValue.includes('>')) {
+            logger.debug(
+              `[${requestId}] Response format contains variable reference for block ${blockId}`
+            )
+            // Keep variable references as-is - they will be resolved during execution
+            acc[blockId] = blockState
+          } else if (responseFormatValue === '') {
+            // Empty string - remove response format
             acc[blockId] = {
               ...blockState,
-              responseFormat: parsedResponseFormat,
+              responseFormat: undefined,
+            }
+          } else {
+            try {
+              logger.debug(`[${requestId}] Parsing responseFormat for block ${blockId}`)
+              // Attempt to parse the responseFormat if it's a string
+              const parsedResponseFormat = JSON.parse(responseFormatValue)
+
+              acc[blockId] = {
+                ...blockState,
+                responseFormat: parsedResponseFormat,
+              }
+            } catch (error) {
+              logger.warn(
+                `[${requestId}] Failed to parse responseFormat for block ${blockId}, using undefined`,
+                error
+              )
+              // Set to undefined instead of keeping malformed JSON - this allows execution to continue
+              acc[blockId] = {
+                ...blockState,
+                responseFormat: undefined,
+              }
             }
-          } catch (error) {
-            logger.warn(`[${requestId}] Failed to parse responseFormat for block ${blockId}`, error)
-            acc[blockId] = blockState
           }
         } else {
           acc[blockId] = blockState
 
@@ -0,0 +1,121 @@
+import crypto from 'crypto'
+import { eq } from 'drizzle-orm'
+import type { NextRequest } from 'next/server'
+import { createLogger } from '@/lib/logs/console-logger'
+import { saveWorkflowToNormalizedTables } from '@/lib/workflows/db-helpers'
+import { db } from '@/db'
+import { workflow } from '@/db/schema'
+import type { WorkflowState } from '@/stores/workflows/workflow/types'
+import { validateWorkflowAccess } from '../../middleware'
+import { createErrorResponse, createSuccessResponse } from '../../utils'
+
+const logger = createLogger('RevertToDeployedAPI')
+
+export const dynamic = 'force-dynamic'
+export const runtime = 'nodejs'
+
+/**
+ * POST /api/workflows/[id]/revert-to-deployed
+ * Revert workflow to its deployed state by saving deployed state to normalized tables
+ */
+export async function POST(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+  const requestId = crypto.randomUUID().slice(0, 8)
+  const { id } = await params
+
+  try {
+    logger.debug(`[${requestId}] Reverting workflow to deployed state: ${id}`)
+    const validation = await validateWorkflowAccess(request, id, false)
+
+    if (validation.error) {
+      logger.warn(`[${requestId}] Workflow revert failed: ${validation.error.message}`)
+      return createErrorResponse(validation.error.message, validation.error.status)
+    }
+
+    const workflowData = validation.workflow
+
+    // Check if workflow is deployed and has deployed state
+    if (!workflowData.isDeployed || !workflowData.deployedState) {
+      logger.warn(`[${requestId}] Cannot revert: workflow is not deployed or has no deployed state`)
+      return createErrorResponse('Workflow is not deployed or has no deployed state', 400)
+    }
+
+    // Validate deployed state structure
+    const deployedState = workflowData.deployedState as WorkflowState
+    if (!deployedState.blocks || !deployedState.edges) {
+      logger.error(`[${requestId}] Invalid deployed state structure`, { deployedState })
+      return createErrorResponse('Invalid deployed state structure', 500)
+    }
+
+    logger.debug(`[${requestId}] Saving deployed state to normalized tables`, {
+      blocksCount: Object.keys(deployedState.blocks).length,
+      edgesCount: deployedState.edges.length,
+      loopsCount: Object.keys(deployedState.loops || {}).length,
+      parallelsCount: Object.keys(deployedState.parallels || {}).length,
+    })
+
+    // Save deployed state to normalized tables
+    const saveResult = await saveWorkflowToNormalizedTables(id, {
+      blocks: deployedState.blocks,
+      edges: deployedState.edges,
+      loops: deployedState.loops || {},
+      parallels: deployedState.parallels || {},
+      lastSaved: Date.now(),
+      isDeployed: workflowData.isDeployed,
+      deployedAt: workflowData.deployedAt,
+      deploymentStatuses: deployedState.deploymentStatuses || {},
+      hasActiveSchedule: deployedState.hasActiveSchedule || false,
+      hasActiveWebhook: deployedState.hasActiveWebhook || false,
+    })
+
+    if (!saveResult.success) {
+      logger.error(`[${requestId}] Failed to save deployed state to normalized tables`, {
+        error: saveResult.error,
+      })
+      return createErrorResponse(
+        saveResult.error || 'Failed to save deployed state to normalized tables',
+        500
+      )
+    }
+
+    // Update workflow's last_synced timestamp to indicate changes
+    await db
+      .update(workflow)
+      .set({
+        lastSynced: new Date(),
+        updatedAt: new Date(),
+      })
+      .where(eq(workflow.id, id))
+
+    // Notify socket server about the revert operation for real-time sync
+    try {
+      const socketServerUrl = process.env.SOCKET_SERVER_URL || 'http://localhost:3002'
+      await fetch(`${socketServerUrl}/api/workflow-reverted`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          workflowId: id,
+          timestamp: Date.now(),
+        }),
+      })
+      logger.debug(`[${requestId}] Notified socket server about workflow revert: ${id}`)
+    } catch (socketError) {
+      // Don't fail the request if socket notification fails
+      logger.warn(`[${requestId}] Failed to notify socket server about revert:`, socketError)
+    }
+
+    logger.info(`[${requestId}] Successfully reverted workflow to deployed state: ${id}`)
+
+    return createSuccessResponse({
+      message: 'Workflow successfully reverted to deployed state',
+      lastSaved: Date.now(),
+    })
+  } catch (error: any) {
+    logger.error(`[${requestId}] Error reverting workflow to deployed state: ${id}`, {
+      error: error.message,
+      stack: error.stack,
+    })
+    return createErrorResponse(error.message || 'Failed to revert workflow to deployed state', 500)
+  }
+}
Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,4 @@ Sim Studio provides a wide range of features designed to accelerate your develop`
`81`	`81`
`82`	`82`	`##`
`83`	`83`
`84`		`-Ready to get started? Check out our [Getting Started](/getting-started) guide or explore our [Blocks](/docs/blocks) and [Tools](/docs/tools) in more detail.`
	`84`	`+Ready to get started? Check out our [Getting Started](/getting-started) guide or explore our [Blocks](/blocks) and [Tools](/tools) in more detail.`