diff --git a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.test.ts b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.test.ts
index e3f373675a0..73b16fdea1c 100644
--- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.test.ts
+++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.test.ts
@@ -5,13 +5,24 @@
import { NextRequest } from 'next/server'
import { beforeEach, describe, expect, it, vi } from 'vitest'
-const mockCheckHybridAuth = vi.fn()
-const mockAuthorizeWorkflowByWorkspacePermission = vi.fn()
-const mockMarkExecutionCancelled = vi.fn()
-const mockAbortManualExecution = vi.fn()
-
-vi.mock('@sim/logger', () => ({
- createLogger: () => ({ info: vi.fn(), warn: vi.fn(), error: vi.fn() }),
+const {
+ mockCheckHybridAuth,
+ mockAuthorizeWorkflowByWorkspacePermission,
+ mockMarkExecutionCancelled,
+ mockAbortManualExecution,
+ mockCancelPausedExecution,
+ mockSetExecutionMeta,
+ mockWriteEvent,
+ mockCloseWriter,
+} = vi.hoisted(() => ({
+ mockCheckHybridAuth: vi.fn(),
+ mockAuthorizeWorkflowByWorkspacePermission: vi.fn(),
+ mockMarkExecutionCancelled: vi.fn(),
+ mockAbortManualExecution: vi.fn(),
+ mockCancelPausedExecution: vi.fn(),
+ mockSetExecutionMeta: vi.fn(),
+ mockWriteEvent: vi.fn(),
+ mockCloseWriter: vi.fn(),
}))
vi.mock('@/lib/auth/hybrid', () => ({
@@ -26,19 +37,48 @@ vi.mock('@/lib/execution/manual-cancellation', () => ({
abortManualExecution: (...args: unknown[]) => mockAbortManualExecution(...args),
}))
+vi.mock('@/lib/workflows/executor/human-in-the-loop-manager', () => ({
+ PauseResumeManager: {
+ cancelPausedExecution: (...args: unknown[]) => mockCancelPausedExecution(...args),
+ },
+}))
+
vi.mock('@/lib/workflows/utils', () => ({
authorizeWorkflowByWorkspacePermission: (params: unknown) =>
mockAuthorizeWorkflowByWorkspacePermission(params),
}))
+vi.mock('@/lib/posthog/server', () => ({
+ captureServerEvent: vi.fn(),
+}))
+
+vi.mock('@/lib/execution/event-buffer', () => ({
+ setExecutionMeta: (...args: unknown[]) => mockSetExecutionMeta(...args),
+ createExecutionEventWriter: () => ({
+ write: (...args: unknown[]) => mockWriteEvent(...args),
+ close: () => mockCloseWriter(),
+ }),
+}))
+
import { POST } from './route'
+const makeRequest = () =>
+ new NextRequest('http://localhost/api/workflows/wf-1/executions/ex-1/cancel', {
+ method: 'POST',
+ })
+
+const makeParams = () => ({ params: Promise.resolve({ id: 'wf-1', executionId: 'ex-1' }) })
+
describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
beforeEach(() => {
vi.clearAllMocks()
mockCheckHybridAuth.mockResolvedValue({ success: true, userId: 'user-1' })
mockAuthorizeWorkflowByWorkspacePermission.mockResolvedValue({ allowed: true })
mockAbortManualExecution.mockReturnValue(false)
+ mockCancelPausedExecution.mockResolvedValue(false)
+ mockSetExecutionMeta.mockResolvedValue(undefined)
+ mockWriteEvent.mockResolvedValue({ eventId: 1 })
+ mockCloseWriter.mockResolvedValue(undefined)
})
it('returns success when cancellation was durably recorded', async () => {
@@ -47,14 +87,7 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
reason: 'recorded',
})
- const response = await POST(
- new NextRequest('http://localhost/api/workflows/wf-1/executions/ex-1/cancel', {
- method: 'POST',
- }),
- {
- params: Promise.resolve({ id: 'wf-1', executionId: 'ex-1' }),
- }
- )
+ const response = await POST(makeRequest(), makeParams())
expect(response.status).toBe(200)
await expect(response.json()).resolves.toEqual({
@@ -63,6 +96,7 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
redisAvailable: true,
durablyRecorded: true,
locallyAborted: false,
+ pausedCancelled: false,
reason: 'recorded',
})
})
@@ -73,14 +107,7 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
reason: 'redis_unavailable',
})
- const response = await POST(
- new NextRequest('http://localhost/api/workflows/wf-1/executions/ex-1/cancel', {
- method: 'POST',
- }),
- {
- params: Promise.resolve({ id: 'wf-1', executionId: 'ex-1' }),
- }
- )
+ const response = await POST(makeRequest(), makeParams())
expect(response.status).toBe(200)
await expect(response.json()).resolves.toEqual({
@@ -89,6 +116,7 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
redisAvailable: false,
durablyRecorded: false,
locallyAborted: false,
+ pausedCancelled: false,
reason: 'redis_unavailable',
})
})
@@ -99,14 +127,7 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
reason: 'redis_write_failed',
})
- const response = await POST(
- new NextRequest('http://localhost/api/workflows/wf-1/executions/ex-1/cancel', {
- method: 'POST',
- }),
- {
- params: Promise.resolve({ id: 'wf-1', executionId: 'ex-1' }),
- }
- )
+ const response = await POST(makeRequest(), makeParams())
expect(response.status).toBe(200)
await expect(response.json()).resolves.toEqual({
@@ -115,6 +136,7 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
redisAvailable: true,
durablyRecorded: false,
locallyAborted: false,
+ pausedCancelled: false,
reason: 'redis_write_failed',
})
})
@@ -126,14 +148,7 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
})
mockAbortManualExecution.mockReturnValue(true)
- const response = await POST(
- new NextRequest('http://localhost/api/workflows/wf-1/executions/ex-1/cancel', {
- method: 'POST',
- }),
- {
- params: Promise.resolve({ id: 'wf-1', executionId: 'ex-1' }),
- }
- )
+ const response = await POST(makeRequest(), makeParams())
expect(response.status).toBe(200)
await expect(response.json()).resolves.toEqual({
@@ -142,7 +157,50 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
redisAvailable: false,
durablyRecorded: false,
locallyAborted: true,
+ pausedCancelled: false,
+ reason: 'redis_unavailable',
+ })
+ })
+
+ it('returns success when a paused HITL execution is cancelled directly in the database', async () => {
+ mockMarkExecutionCancelled.mockResolvedValue({
+ durablyRecorded: false,
+ reason: 'redis_unavailable',
+ })
+ mockCancelPausedExecution.mockResolvedValue(true)
+
+ const response = await POST(makeRequest(), makeParams())
+
+ expect(response.status).toBe(200)
+ await expect(response.json()).resolves.toEqual({
+ success: true,
+ executionId: 'ex-1',
+ redisAvailable: false,
+ durablyRecorded: false,
+ locallyAborted: false,
+ pausedCancelled: true,
reason: 'redis_unavailable',
})
})
+
+ it('returns 401 when auth fails', async () => {
+ mockCheckHybridAuth.mockResolvedValue({ success: false, error: 'Unauthorized' })
+
+ const response = await POST(makeRequest(), makeParams())
+
+ expect(response.status).toBe(401)
+ })
+
+ it('returns 403 when workflow access is denied', async () => {
+ mockMarkExecutionCancelled.mockResolvedValue({ durablyRecorded: true, reason: 'recorded' })
+ mockAuthorizeWorkflowByWorkspacePermission.mockResolvedValue({
+ allowed: false,
+ message: 'Access denied',
+ status: 403,
+ })
+
+ const response = await POST(makeRequest(), makeParams())
+
+ expect(response.status).toBe(403)
+ })
})
diff --git a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
index 4fb045c5816..ec65f693501 100644
--- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
+++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
@@ -2,8 +2,10 @@ import { createLogger } from '@sim/logger'
import { type NextRequest, NextResponse } from 'next/server'
import { checkHybridAuth } from '@/lib/auth/hybrid'
import { markExecutionCancelled } from '@/lib/execution/cancellation'
+import { createExecutionEventWriter, setExecutionMeta } from '@/lib/execution/event-buffer'
import { abortManualExecution } from '@/lib/execution/manual-cancellation'
import { captureServerEvent } from '@/lib/posthog/server'
+import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
const logger = createLogger('CancelExecutionAPI')
@@ -49,11 +51,31 @@ export async function POST(
const cancellation = await markExecutionCancelled(executionId)
const locallyAborted = abortManualExecution(executionId)
+ let pausedCancelled = false
+ try {
+ pausedCancelled = await PauseResumeManager.cancelPausedExecution(executionId)
+ } catch (error) {
+ logger.warn('Failed to cancel paused execution in database', { executionId, error })
+ }
if (cancellation.durablyRecorded) {
logger.info('Execution marked as cancelled in Redis', { executionId })
} else if (locallyAborted) {
logger.info('Execution cancelled via local in-process fallback', { executionId })
+ } else if (pausedCancelled) {
+ logger.info('Paused execution cancelled directly in database', { executionId })
+ void setExecutionMeta(executionId, { status: 'cancelled', workflowId }).catch(() => {})
+ const writer = createExecutionEventWriter(executionId)
+ void writer
+ .write({
+ type: 'execution:cancelled',
+ timestamp: new Date().toISOString(),
+ executionId,
+ workflowId,
+ data: { duration: 0 },
+ })
+ .then(() => writer.close())
+ .catch(() => {})
} else {
logger.warn('Execution cancellation was not durably recorded', {
executionId,
@@ -61,7 +83,9 @@ export async function POST(
})
}
- if (cancellation.durablyRecorded || locallyAborted) {
+ const success = cancellation.durablyRecorded || locallyAborted || pausedCancelled
+
+ if (success) {
const workspaceId = workflowAuthorization.workflow?.workspaceId
captureServerEvent(
auth.userId,
@@ -72,11 +96,12 @@ export async function POST(
}
return NextResponse.json({
- success: cancellation.durablyRecorded || locallyAborted,
+ success,
executionId,
redisAvailable: cancellation.reason !== 'redis_unavailable',
durablyRecorded: cancellation.durablyRecorded,
locallyAborted,
+ pausedCancelled,
reason: cancellation.reason,
})
} catch (error: any) {
diff --git a/apps/sim/app/chat/components/message/components/markdown-renderer.tsx b/apps/sim/app/chat/components/message/components/markdown-renderer.tsx
index 48d4a144bdb..12254f18dd5 100644
--- a/apps/sim/app/chat/components/message/components/markdown-renderer.tsx
+++ b/apps/sim/app/chat/components/message/components/markdown-renderer.tsx
@@ -1,8 +1,7 @@
import React, { type HTMLAttributes, memo, type ReactNode, useMemo } from 'react'
import { Streamdown } from 'streamdown'
import 'streamdown/styles.css'
-import { Tooltip } from '@/components/emcn'
-import { CopyCodeButton } from '@/components/ui/copy-code-button'
+import { CopyCodeButton, Tooltip } from '@/components/emcn'
import { extractTextContent } from '@/lib/core/utils/react-node-text'
export function LinkWithPreview({ href, children }: { href: string; children: React.ReactNode }) {
@@ -100,7 +99,7 @@ function createCustomComponents(LinkComponent: typeof LinkWithPreview) {
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx
index 72e94545d52..46091cd9ce3 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx
@@ -8,8 +8,7 @@ import 'prismjs/components/prism-bash'
import 'prismjs/components/prism-css'
import 'prismjs/components/prism-markup'
import '@/components/emcn/components/code/code.css'
-import { Checkbox, highlight, languages } from '@/components/emcn'
-import { CopyCodeButton } from '@/components/ui/copy-code-button'
+import { Checkbox, CopyCodeButton, highlight, languages } from '@/components/emcn'
import { cn } from '@/lib/core/utils/cn'
import { extractTextContent } from '@/lib/core/utils/react-node-text'
import {
@@ -148,7 +147,7 @@ const MARKDOWN_COMPONENTS = {
{language || 'code'}
@@ -265,12 +264,7 @@ export function ChatContent({
useEffect(() => {
const handler = (e: Event) => {
const { type, id, title } = (e as CustomEvent).detail
- const RESOURCE_TYPE_MAP: Record
= {}
- onWorkspaceResourceSelectRef.current?.({
- type: RESOURCE_TYPE_MAP[type] || type,
- id,
- title: title || id,
- })
+ onWorkspaceResourceSelectRef.current?.({ type, id, title: title || id })
}
window.addEventListener('wsres-click', handler)
return () => window.removeEventListener('wsres-click', handler)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
index 1030d3951ad..fb94ac5a759 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
@@ -176,7 +176,7 @@ export function MothershipChat({
blocks={msg.contentBlocks || []}
fallbackContent={msg.content}
isStreaming={isThisStreaming}
- onOptionSelect={isLastMessage && !isStreamActive ? onSubmit : undefined}
+ onOptionSelect={isLastMessage ? onSubmit : undefined}
onWorkspaceResourceSelect={onWorkspaceResourceSelect}
/>
{!isThisStreaming && (msg.content || msg.contentBlocks?.length) && (
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
index 9c54cb87f0c..bae0f084183 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
@@ -232,6 +232,7 @@ export function UserInput({
const canSubmit = (value.trim().length > 0 || hasFiles) && !isSending
const valueRef = useRef(value)
+ valueRef.current = value
const sttPrefixRef = useRef('')
const handleTranscript = useCallback((text: string) => {
@@ -271,10 +272,6 @@ export function UserInput({
const isSendingRef = useRef(isSending)
isSendingRef.current = isSending
- useEffect(() => {
- valueRef.current = value
- }, [value])
-
const textareaRef = mentionMenu.textareaRef
const wasSendingRef = useRef(false)
const atInsertPosRef = useRef(null)
@@ -358,9 +355,7 @@ export function UserInput({
}
// Reset after batch so the next non-drop insert uses the cursor position
atInsertPosRef.current = null
- } catch {
- // Invalid JSON — ignore
- }
+ } catch {}
textareaRef.current?.focus()
return
}
@@ -372,9 +367,7 @@ export function UserInput({
const resource = JSON.parse(resourceJson) as MothershipResource
handleResourceSelect(resource)
atInsertPosRef.current = null
- } catch {
- // Invalid JSON — ignore
- }
+ } catch {}
textareaRef.current?.focus()
return
}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index 229b161f727..1687a1973d1 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -4,6 +4,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
import { createLogger } from '@sim/logger'
import { useParams, useRouter, useSearchParams } from 'next/navigation'
import { usePostHog } from 'posthog-js/react'
+import { Button } from '@/components/emcn'
import { PanelLeft } from '@/components/emcn/icons'
import { useSession } from '@/lib/auth/auth-client'
import {
@@ -33,6 +34,7 @@ export function Home({ chatId }: HomeProps = {}) {
const { data: session } = useSession()
const posthog = usePostHog()
const posthogRef = useRef(posthog)
+ posthogRef.current = posthog
const [initialPrompt, setInitialPrompt] = useState('')
const hasCheckedLandingStorageRef = useRef(false)
const initialViewInputRef = useRef(null)
@@ -99,19 +101,12 @@ export function Home({ chatId }: HomeProps = {}) {
return
}
- // const templateId = LandingTemplateStorage.consume()
- // if (templateId) {
- // logger.info('Retrieved landing page template, redirecting to template detail')
- // router.replace(`/workspace/${workspaceId}/templates/${templateId}?use=true`)
- // return
- // }
-
const prompt = LandingPromptStorage.consume()
if (prompt) {
logger.info('Retrieved landing page prompt, populating home input')
setInitialPrompt(prompt)
}
- }, [createWorkflowFromLandingSeed, workspaceId, router])
+ }, [createWorkflowFromLandingSeed])
const wasSendingRef = useRef(false)
@@ -130,10 +125,6 @@ export function Home({ chatId }: HomeProps = {}) {
setIsResourceCollapsed(true)
}, [clearWidth])
- const expandResource = useCallback(() => {
- setIsResourceCollapsed(false)
- }, [])
-
const handleResourceEvent = useCallback(() => {
if (isResourceCollapsedRef.current) {
setIsResourceCollapsed(false)
@@ -225,8 +216,10 @@ export function Home({ chatId }: HomeProps = {}) {
}, [resources])
useEffect(() => {
- posthogRef.current = posthog
- }, [posthog])
+ if (resources.length === 0 && !isResourceCollapsedRef.current) {
+ collapseResource()
+ }
+ }, [resources, collapseResource])
const handleStopGeneration = useCallback(() => {
captureEvent(posthogRef.current, 'task_generation_aborted', {
@@ -299,7 +292,8 @@ export function Home({ chatId }: HomeProps = {}) {
const handleInitialContextRemove = useCallback(
(context: ChatContext) => {
const resolved = resolveResourceFromContext(context)
- if (resolved) removeResource(resolved.type, resolved.id)
+ if (!resolved) return
+ removeResource(resolved.type, resolved.id)
},
[resolveResourceFromContext, removeResource]
)
@@ -426,14 +420,16 @@ export function Home({ chatId }: HomeProps = {}) {
{isResourceCollapsed && (
-
+