Fixes

Author: Sg312

apps/sim/app/api/chat/route.test.ts

@@ -274,6 +274,50 @@ describe('Chat API Route', () => {
       )
     })
 
+    it('passes chat customizations and outputConfigs through in the API request shape', async () => {
+      mockGetSession.mockResolvedValue({
+        user: { id: 'user-id', email: 'user@example.com' },
+      })
+
+      const validData = {
+        workflowId: 'workflow-123',
+        identifier: 'test-chat',
+        title: 'Test Chat',
+        customizations: {
+          primaryColor: '#000000',
+          welcomeMessage: 'Hello',
+          imageUrl: 'https://example.com/icon.png',
+        },
+        outputConfigs: [{ blockId: 'agent-1', path: 'content' }],
+      }
+
+      mockLimit.mockResolvedValueOnce([])
+      mockCheckWorkflowAccessForChatCreation.mockResolvedValue({
+        hasAccess: true,
+        workflow: { userId: 'user-id', workspaceId: null, isDeployed: true },
+      })
+
+      const req = new NextRequest('http://localhost:3000/api/chat', {
+        method: 'POST',
+        body: JSON.stringify(validData),
+      })
+      const response = await POST(req)
+
+      expect(response.status).toBe(200)
+      expect(mockPerformChatDeploy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          workflowId: 'workflow-123',
+          identifier: 'test-chat',
+          customizations: {
+            primaryColor: '#000000',
+            welcomeMessage: 'Hello',
+            imageUrl: 'https://example.com/icon.png',
+          },
+          outputConfigs: [{ blockId: 'agent-1', path: 'content' }],
+        })
+      )
+    })
+
     it('should allow chat deployment when user has workspace admin permission', async () => {
       mockGetSession.mockResolvedValue({
         user: { id: 'user-id', email: 'user@example.com' },

apps/sim/app/api/copilot/chat/abort/route.ts

@@ -3,11 +3,12 @@ import { NextResponse } from 'next/server'
 import { getLatestRunForStream } from '@/lib/copilot/async-runs/repository'
 import { SIM_AGENT_API_URL } from '@/lib/copilot/constants'
 import { authenticateCopilotRequestSessionOnly } from '@/lib/copilot/request/http'
-import { abortActiveStream } from '@/lib/copilot/request/session/abort'
+import { abortActiveStream, waitForPendingChatStream } from '@/lib/copilot/request/session'
 import { env } from '@/lib/core/config/env'
 
 const logger = createLogger('CopilotChatAbortAPI')
 const GO_EXPLICIT_ABORT_TIMEOUT_MS = 3000
+const STREAM_ABORT_SETTLE_TIMEOUT_MS = 8000
 
 export async function POST(request: Request) {
   const { userId: authenticatedUserId, isAuthenticated } =
@@ -74,5 +75,16 @@ export async function POST(request: Request) {
   }
 
   const aborted = await abortActiveStream(streamId)
+  if (chatId) {
+    const settled = await waitForPendingChatStream(chatId, STREAM_ABORT_SETTLE_TIMEOUT_MS, streamId)
+    if (!settled) {
+      return NextResponse.json(
+        { error: 'Previous response is still shutting down', aborted, settled: false },
+        { status: 409 }
+      )
+    }
+    return NextResponse.json({ aborted, settled: true })
+  }
+
   return NextResponse.json({ aborted })
 }

apps/sim/app/api/mothership/chat/stop/route.ts

@@ -6,7 +6,6 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { normalizeMessage, type PersistedMessage } from '@/lib/copilot/chat/persisted-message'
-import { releasePendingChatStream } from '@/lib/copilot/request/session'
 import { taskPubSub } from '@/lib/copilot/tasks'
 
 const logger = createLogger('MothershipChatStopAPI')
@@ -60,6 +59,8 @@ const StopSchema = z.object({
  * POST /api/mothership/chat/stop
  * Persists partial assistant content when the user stops a stream mid-response.
  * Clears conversationId so the server-side onComplete won't duplicate the message.
+ * The chat stream lock is intentionally left alone here; it is released only once
+ * the aborted server stream actually unwinds.
  */
 export async function POST(req: NextRequest) {
   try {
@@ -80,7 +81,6 @@ export async function POST(req: NextRequest) {
       .limit(1)
 
     if (!row) {
-      await releasePendingChatStream(chatId, streamId)
       return NextResponse.json({ success: true })
     }
 
@@ -119,8 +119,6 @@ export async function POST(req: NextRequest) {
       .where(and(eq(copilotChats.id, chatId), eq(copilotChats.userId, session.user.id)))
       .returning({ workspaceId: copilotChats.workspaceId })
 
-    await releasePendingChatStream(chatId, streamId)
-
     if (updated?.workspaceId) {
       taskPubSub?.publishStatusChanged({
         workspaceId: updated.workspaceId,

apps/sim/app/api/workflows/[id]/chat/status/route.test.ts

@@ -122,7 +122,7 @@ describe('Workflow Chat Status Route', () => {
         customizations: { theme: 'dark' },
         authType: 'public',
         allowedEmails: [],
-        outputConfigs: {},
+        outputConfigs: [{ blockId: 'agent-1', path: 'content' }],
         password: 'secret',
         isActive: true,
       },
@@ -136,5 +136,6 @@ describe('Workflow Chat Status Route', () => {
     expect(data.isDeployed).toBe(true)
     expect(data.deployment.id).toBe('chat-1')
     expect(data.deployment.hasPassword).toBe(true)
+    expect(data.deployment.outputConfigs).toEqual([{ blockId: 'agent-1', path: 'content' }])
   })
 })

apps/sim/app/api/workflows/[id]/execute/route.ts

@@ -78,6 +78,7 @@ const ExecuteWorkflowSchema = z.object({
       parallels: z.record(z.any()).optional(),
     })
     .optional(),
+  triggerBlockId: z.string().optional(),
   stopAfterBlockId: z.string().optional(),
   runFromBlock: z
     .object({
@@ -381,6 +382,7 @@ async function handleExecutePost(
       includeFileBase64,
       base64MaxBytes,
       workflowStateOverride,
+      triggerBlockId,
       stopAfterBlockId,
       runFromBlock: rawRunFromBlock,
     } = validation.data
@@ -484,6 +486,7 @@ async function handleExecutePost(
               includeFileBase64,
               base64MaxBytes,
               workflowStateOverride,
+              triggerBlockId: _triggerBlockId,
               stopAfterBlockId: _stopAfterBlockId,
               runFromBlock: _runFromBlock,
               workflowId: _workflowId, // Also exclude workflowId used for internal JWT auth
@@ -514,6 +517,7 @@ async function handleExecutePost(
       (body.useDraftState !== undefined ||
         body.workflowStateOverride !== undefined ||
         body.runFromBlock !== undefined ||
+        body.triggerBlockId !== undefined ||
         body.stopAfterBlockId !== undefined ||
         body.selectedOutputs?.length ||
         body.includeFileBase64 !== undefined ||
@@ -714,6 +718,7 @@ async function handleExecutePost(
         sessionUserId: isClientSession ? userId : undefined,
         workflowUserId: workflow.userId,
         triggerType,
+        triggerBlockId,
         useDraftState: shouldUseDraftState,
         startTime: new Date().toISOString(),
         isClientSession,
@@ -1122,6 +1127,7 @@ async function handleExecutePost(
             sessionUserId: isClientSession ? userId : undefined,
             workflowUserId: workflow.userId,
             triggerType,
+            triggerBlockId,
             useDraftState: shouldUseDraftState,
             startTime: new Date().toISOString(),
             isClientSession,

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx

@@ -268,7 +268,7 @@ export function FileViewer({
   }
 
   if (category === 'image-previewable') {
-    return <ImagePreview file={file} />
+    return <ImagePreview file={file} workspaceId={workspaceId} />
   }
 
   if (category === 'docx-previewable') {
@@ -997,8 +997,20 @@ const ZOOM_BUTTON_FACTOR = 1.2
 
 const clampZoom = (z: number) => Math.min(Math.max(z, ZOOM_MIN), ZOOM_MAX)
 
-const ImagePreview = memo(function ImagePreview({ file }: { file: WorkspaceFileRecord }) {
-  const serveUrl = `/api/files/serve/${encodeURIComponent(file.key)}?context=workspace&t=${file.size}`
+const ImagePreview = memo(function ImagePreview({
+  file,
+  workspaceId,
+}: {
+  file: WorkspaceFileRecord
+  workspaceId: string
+}) {
+  const {
+    data: fileData,
+    isLoading,
+    error: fetchError,
+  } = useWorkspaceFileBinary(workspaceId, file.id, file.key)
+  const [blobUrl, setBlobUrl] = useState<string | null>(null)
+  const blobUrlRef = useRef<string | null>(null)
   const [zoom, setZoom] = useState(1)
   const [offset, setOffset] = useState({ x: 0, y: 0 })
   const isDragging = useRef(false)
@@ -1009,6 +1021,15 @@ const ImagePreview = memo(function ImagePreview({ file }: { file: WorkspaceFileR
 
   const containerRef = useRef<HTMLDivElement>(null)
 
+  const replaceBlobUrl = useCallback((nextUrl: string | null) => {
+    const previousUrl = blobUrlRef.current
+    blobUrlRef.current = nextUrl
+    setBlobUrl(nextUrl)
+    if (previousUrl && previousUrl !== nextUrl) {
+      URL.revokeObjectURL(previousUrl)
+    }
+  }, [])
+
   const zoomIn = useCallback(() => setZoom((z) => clampZoom(z * ZOOM_BUTTON_FACTOR)), [])
   const zoomOut = useCallback(() => setZoom((z) => clampZoom(z / ZOOM_BUTTON_FACTOR)), [])
 
@@ -1027,6 +1048,24 @@ const ImagePreview = memo(function ImagePreview({ file }: { file: WorkspaceFileR
     return () => el.removeEventListener('wheel', onWheel)
   }, [])
 
+  useEffect(() => {
+    replaceBlobUrl(null)
+  }, [file.id, file.key, replaceBlobUrl])
+
+  useEffect(() => {
+    return () => {
+      if (blobUrlRef.current) {
+        URL.revokeObjectURL(blobUrlRef.current)
+        blobUrlRef.current = null
+      }
+    }
+  }, [])
+
+  useEffect(() => {
+    if (!fileData) return
+    replaceBlobUrl(URL.createObjectURL(new Blob([fileData], { type: file.type || 'image/png' })))
+  }, [file.type, fileData, replaceBlobUrl])
+
   const handleMouseDown = useCallback((e: React.MouseEvent) => {
     if (e.button !== 0) return
     isDragging.current = true
@@ -1052,7 +1091,21 @@ const ImagePreview = memo(function ImagePreview({ file }: { file: WorkspaceFileR
   useEffect(() => {
     setZoom(1)
     setOffset({ x: 0, y: 0 })
-  }, [file.key])
+  }, [blobUrl])
+
+  const error = blobUrl !== null ? null : resolvePreviewError(fetchError, null)
+
+  if (error) {
+    return <PreviewError label='Image' error={error} />
+  }
+
+  if (isLoading && !blobUrl) {
+    return (
+      <div className='flex h-full items-center justify-center'>
+        <Skeleton className='h-[200px] w-[80%]' />
+      </div>
+    )
+  }
 
   return (
     <div
@@ -1071,7 +1124,7 @@ const ImagePreview = memo(function ImagePreview({ file }: { file: WorkspaceFileR
         }}
       >
         <img
-          src={serveUrl}
+          src={blobUrl ?? undefined}
           alt={file.name}
           className='max-h-full max-w-full select-none rounded-md object-contain'
           draggable={false}

apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx

@@ -1,7 +1,6 @@
 'use client'
 
 import {
-  File as FileTool,
   Read as ReadTool,
   ToolSearchToolRegex,
   WorkspaceFile,
@@ -13,6 +12,8 @@ import { SUBAGENT_LABELS, TOOL_UI_METADATA } from '../../types'
 import type { AgentGroupItem } from './components'
 import { AgentGroup, ChatContent, CircleStop, Options, PendingTagIndicator } from './components'
 
+const FILE_SUBAGENT_ID = 'file'
+
 interface TextSegment {
   type: 'text'
   content: string
@@ -48,7 +49,7 @@ const SUBAGENT_KEYS = new Set(Object.keys(SUBAGENT_LABELS))
  * group is absorbed so it doesn't render as a separate Mothership entry.
  */
 const SUBAGENT_DISPATCH_TOOLS: Record<string, string> = {
-  [FileTool.id]: WorkspaceFile.id,
+  [FILE_SUBAGENT_ID]: WorkspaceFile.id,
 }
 
 function isToolResultRead(params?: Record<string, unknown>): boolean {

apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx

@@ -177,7 +177,7 @@ export function MothershipChat({
                   blocks={msg.contentBlocks || []}
                   fallbackContent={msg.content}
                   isStreaming={isThisStreaming}
-                  onOptionSelect={isLastMessage ? onSubmit : undefined}
+                  onOptionSelect={isLastMessage && !isStreamActive ? onSubmit : undefined}
                   onWorkspaceResourceSelect={onWorkspaceResourceSelect}
                 />
                 {!isThisStreaming && (msg.content || msg.contentBlocks?.length) && (

apps/sim/app/workspace/[workspaceId]/home/home.tsx

@@ -228,7 +228,7 @@ export function Home({ chatId }: HomeProps = {}) {
       workspace_id: workspaceId,
       view: 'mothership',
     })
-    stopGeneration()
+    void stopGeneration().catch(() => {})
   }, [stopGeneration, workspaceId])
 
   const handleSubmit = useCallback(