fix(mothership): preserve stopped chat admission and queued corrections

Author: Sg312

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

@@ -115,6 +115,7 @@ describe('POST /api/copilot/chat/abort', () => {
       allowPersonalApiKeys: false,
     })
     mockAuthorize.mockResolvedValue(undefined)
+    mockOrganizationAuthorize.mockResolvedValue(undefined)
     mockBannedUsers.mockResolvedValue([])
     mockWorkspaceContext.mockResolvedValue({
       workspaceId: 'workspace-1',
@@ -271,7 +272,81 @@ describe('POST /api/copilot/chat/abort', () => {
       'chat-1'
     )
     expect(mockRequestExplicitStreamAbort).toHaveBeenCalledWith(
-      expect.objectContaining({ chatId: 'chat-1', userId: 'user-1', workspaceId: 'workspace-1' })
+      expect.objectContaining({ chatId: 'chat-1', userId: 'user-1', streamId: 'stream-1' })
+    )
+  })
+
+  it('preserves organization scope through parsing for a chatless pre-admission Stop', async () => {
+    mockGetLatestRunForStream.mockResolvedValue(null)
+    mockRequestRunStop.mockResolvedValue(null)
+    const response = await POST(
+      createMockRequest('POST', { streamId: 'early-stream', organizationId: 'org-1' })
+    )
+    expect(response.status).toBe(200)
+    expect(await response.json()).toEqual({ aborted: true, settled: true })
+    expect(mockOrganizationAuthorize).toHaveBeenCalledWith(
+      expect.objectContaining({ kind: 'session', userId: 'user-1' }),
+      expect.objectContaining({ id: 'mothership.runs.abort', minimumRole: 'member' }),
+      { organizationId: 'org-1' }
+    )
+    expect(mockRequestRunStop).toHaveBeenCalledWith({
+      streamId: 'early-stream',
+      userId: 'user-1',
+      organizationId: 'org-1',
+      workspaceId: undefined,
+    })
+    expect(mockWorkspaceContext).not.toHaveBeenCalled()
+    expect(mockAuthorize).not.toHaveBeenCalled()
+    expect(mockRequestExplicitStreamAbort).not.toHaveBeenCalled()
+  })
+
+  it('refuses mixed owner scopes in the HTTP contract before protected lookup', async () => {
+    const response = await POST(
+      createMockRequest('POST', {
+        streamId: 'early-stream',
+        organizationId: 'org-1',
+        workspaceId: 'workspace-1',
+      })
+    )
+    expect(response.status).toBe(400)
+    expect(mockGetLatestRunForStream).not.toHaveBeenCalled()
+    expect(mockRequestRunStop).not.toHaveBeenCalled()
+  })
+
+  it('rechecks organization membership before writing a pre-admission Stop', async () => {
+    mockGetLatestRunForStream.mockResolvedValue(null)
+    mockOrganizationAuthorize.mockRejectedValueOnce(
+      new OrchestrationError('forbidden', 'Membership revoked')
+    )
+    const response = await POST(
+      createMockRequest('POST', { streamId: 'early-stream', organizationId: 'org-1' })
+    )
+    expect(response.status).toBe(403)
+    expect(mockRequestRunStop).not.toHaveBeenCalled()
+  })
+
+  it('binds an organization admission that wins the Stop race before signalling it', async () => {
+    mockGetLatestRunForStream.mockResolvedValue(null)
+    mockChatContext.mockResolvedValue({
+      chatId: 'new-chat',
+      userId: 'user-1',
+      organizationId: 'org-1',
+    })
+    mockRequestRunStop.mockResolvedValue({
+      chatId: 'new-chat',
+      workspaceId: null,
+      organizationId: 'org-1',
+    })
+    const response = await POST(
+      createMockRequest('POST', { streamId: 'early-stream', organizationId: 'org-1' })
+    )
+    expect(response.status).toBe(200)
+    expect(await response.json()).toMatchObject({ settled: true })
+    expect(mockRequestExplicitStreamAbort).toHaveBeenCalledWith(
+      expect.objectContaining({
+        streamId: 'early-stream',
+        chatId: 'new-chat',
+      })
     )
   })
 
@@ -296,8 +371,6 @@ describe('POST /api/copilot/chat/abort', () => {
     expect(mockAuthorize).not.toHaveBeenCalled()
     expect(mockRequestExplicitStreamAbort).toHaveBeenCalledWith(
       expect.objectContaining({
-        organizationId: 'org-1',
-        workspaceId: undefined,
         chatId: 'chat-1',
         userId: 'user-1',
       })
@@ -399,7 +472,7 @@ describe('POST /api/copilot/chat/abort', () => {
     )
     expect(response.status).toBe(200)
     expect(mockRequestExplicitStreamAbort).toHaveBeenCalledWith(
-      expect.objectContaining({ chatId: 'chat-1', userId: 'user-1', workspaceId: 'workspace-1' })
+      expect.objectContaining({ chatId: 'chat-1', userId: 'user-1' })
     )
   })
   it('rejects a run admitted in a different scope during the lookup race', async () => {

apps/sim/app/api/mothership/execute/route.ts

@@ -326,7 +326,6 @@ export const POST = withRouteHandler(async (req: NextRequest) => {
         streamId: messageId,
         userId,
         chatId: effectiveChatId,
-        workspaceId,
       }).catch((error) => {
         reqLogger.warn('Failed to send explicit abort for mothership execution', {
           error: toError(error).message,

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

@@ -367,7 +367,6 @@ export const POST = withRouteHandler(
           streamId: messageId,
           userId,
           chatId,
-          workspaceId,
         }).catch((error) => {
           reqLogger.warn('Failed to send explicit abort for chat request', {
             error: toError(error).message,

apps/sim/app/workspace/[workspaceId]/home/components/queued-messages/queued-messages.tsx

@@ -165,6 +165,7 @@ export function QueuedMessages({
                               e.stopPropagation()
                               void onSendNow(msg.id)
                             }}
+                            aria-label='Send now'
                             className='rounded-md p-[5px] text-[var(--text-icon)] transition-colors hover-hover:bg-[var(--surface-active)] hover-hover:text-[var(--text-primary)] disabled:cursor-not-allowed disabled:opacity-40 disabled:hover-hover:bg-transparent disabled:hover-hover:text-[var(--text-icon)]'
                           >
                             <ArrowUp className='size-[13px]' />

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-title-event.test.ts

@@ -0,0 +1,37 @@
+/** @vitest-environment node */
+import { describe, expect, it, vi } from 'vitest'
+import { parsePersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract'
+import { handleSessionEvent } from '@/app/workspace/[workspaceId]/home/hooks/stream/handle-session-event'
+import { createStreamLoopContext } from '@/app/workspace/[workspaceId]/home/hooks/stream/stream-context'
+import { makeStreamLoopDeps } from '@/app/workspace/[workspaceId]/home/hooks/stream/stream-test-helpers'
+import { mothershipChatKeys } from '@/hooks/queries/mothership-chats'
+
+describe('generated chat title sidebar updates', () => {
+  it.each([undefined, 'organization'])(
+    'refreshes the owning sidebar and title callback for organization %s',
+    (organizationId) => {
+      const onTitleUpdate = vi.fn()
+      const deps = makeStreamLoopDeps({
+        organizationId,
+        onTitleUpdateRef: { current: onTitleUpdate },
+      })
+      const parsed = parsePersistedStreamEventEnvelope({
+        v: 1,
+        type: 'session',
+        seq: 1,
+        ts: '2026-09-15T00:00:00.000Z',
+        stream: { streamId: 'stream', chatId: 'chat' },
+        payload: { kind: 'title', title: 'Workflow planning' },
+      })
+      if (!parsed.ok || parsed.event.type !== 'session')
+        throw new Error('Invalid title event fixture')
+      handleSessionEvent(createStreamLoopContext(deps), parsed.event)
+      expect(deps.queryClient.invalidateQueries).toHaveBeenCalledWith({
+        queryKey: organizationId
+          ? mothershipChatKeys.organizationList(organizationId)
+          : mothershipChatKeys.list(deps.workspaceId),
+      })
+      expect(onTitleUpdate).toHaveBeenCalledOnce()
+    }
+  )
+})