fix: copilot, improvement: tables, mothership

Author: emir-karabeg

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

@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
 import { copilotChats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { eq } from 'drizzle-orm'
+import { eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
@@ -123,14 +123,20 @@ export async function POST(req: NextRequest) {
         timestamp: new Date().toISOString(),
       }
 
-      await db
+      const [updated] = await db
         .update(copilotChats)
         .set({
-          messages: [...conversationHistory, userMsg],
+          messages: sql`${copilotChats.messages} || ${JSON.stringify([userMsg])}::jsonb`,
           conversationId: userMessageId,
           updatedAt: new Date(),
         })
         .where(eq(copilotChats.id, actualChatId))
+        .returning({ messages: copilotChats.messages })
+
+      if (updated) {
+        const freshMessages: any[] = Array.isArray(updated.messages) ? updated.messages : []
+        conversationHistory = freshMessages.filter((m: any) => m.id !== userMessageId)
+      }
     }
 
     const [workspaceContext, userPermission] = await Promise.all([
@@ -177,13 +183,6 @@ export async function POST(req: NextRequest) {
         onComplete: async (result: OrchestratorResult) => {
           if (!actualChatId) return
 
-          const userMessage = {
-            id: userMessageId,
-            role: 'user' as const,
-            content: message,
-            timestamp: new Date().toISOString(),
-          }
-
           const assistantMessage: Record<string, unknown> = {
             id: crypto.randomUUID(),
             role: 'assistant' as const,
@@ -194,16 +193,29 @@ export async function POST(req: NextRequest) {
             assistantMessage.toolCalls = result.toolCalls
           }
 
-          const updatedMessages = [...conversationHistory, userMessage, assistantMessage]
-
           try {
-            await db
-              .update(copilotChats)
-              .set({
-                messages: updatedMessages,
-                conversationId: null,
-              })
+            const [row] = await db
+              .select({ messages: copilotChats.messages })
+              .from(copilotChats)
               .where(eq(copilotChats.id, actualChatId))
+              .limit(1)
+
+            const msgs: any[] = Array.isArray(row?.messages) ? row.messages : []
+            const userIdx = msgs.findIndex((m: any) => m.id === userMessageId)
+            const alreadyHasResponse =
+              userIdx >= 0 &&
+              userIdx + 1 < msgs.length &&
+              (msgs[userIdx + 1] as any)?.role === 'assistant'
+
+            if (!alreadyHasResponse) {
+              await db
+                .update(copilotChats)
+                .set({
+                  messages: sql`${copilotChats.messages} || ${JSON.stringify([assistantMessage])}::jsonb`,
+                  conversationId: sql`CASE WHEN ${copilotChats.conversationId} = ${userMessageId} THEN NULL ELSE ${copilotChats.conversationId} END`,
+                })
+                .where(eq(copilotChats.id, actualChatId))
+            }
           } catch (error) {
             logger.error(`[${tracker.requestId}] Failed to persist chat messages`, {
               chatId: actualChatId,

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

@@ -0,0 +1,65 @@
+import { db } from '@sim/db'
+import { copilotChats } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { and, eq, sql } from 'drizzle-orm'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { getSession } from '@/lib/auth'
+
+const logger = createLogger('MothershipChatStopAPI')
+
+const StopSchema = z.object({
+  chatId: z.string(),
+  streamId: z.string(),
+  content: z.string(),
+})
+
+/**
+ * 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.
+ */
+export async function POST(req: NextRequest) {
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const { chatId, streamId, content } = StopSchema.parse(await req.json())
+
+    const setClause: Record<string, unknown> = {
+      conversationId: null,
+      updatedAt: new Date(),
+    }
+
+    if (content.trim()) {
+      const assistantMessage = {
+        id: crypto.randomUUID(),
+        role: 'assistant' as const,
+        content,
+        timestamp: new Date().toISOString(),
+      }
+      setClause.messages = sql`${copilotChats.messages} || ${JSON.stringify([assistantMessage])}::jsonb`
+    }
+
+    await db
+      .update(copilotChats)
+      .set(setClause)
+      .where(
+        and(
+          eq(copilotChats.id, chatId),
+          eq(copilotChats.userId, session.user.id),
+          eq(copilotChats.conversationId, streamId)
+        )
+      )
+
+    return NextResponse.json({ success: true })
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json({ error: 'Invalid request' }, { status: 400 })
+    }
+    logger.error('Error stopping chat stream:', error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx

@@ -2,7 +2,10 @@
 
 import { lazy, Suspense, useMemo } from 'react'
 import { Skeleton } from '@/components/emcn'
-import { FileViewer } from '@/app/workspace/[workspaceId]/files/components/file-viewer'
+import {
+  FileViewer,
+  isPreviewable,
+} from '@/app/workspace/[workspaceId]/files/components/file-viewer'
 import type { MothershipResource } from '@/app/workspace/[workspaceId]/home/types'
 import { Table } from '@/app/workspace/[workspaceId]/tables/[tableId]/components'
 import { useWorkspaceFiles } from '@/hooks/queries/workspace-files'
@@ -68,7 +71,13 @@ function EmbeddedFile({ workspaceId, fileId }: EmbeddedFileProps) {
 
   return (
     <div className='flex h-full flex-col overflow-hidden'>
-      <FileViewer key={file.id} file={file} workspaceId={workspaceId} canEdit={true} />
+      <FileViewer
+        key={file.id}
+        file={file}
+        workspaceId={workspaceId}
+        canEdit={true}
+        showPreview={isPreviewable(file)}
+      />
     </div>
   )
 }

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx

@@ -1,36 +1,60 @@
 'use client'
 
+import type { ElementType } from 'react'
+import { Button } from '@/components/emcn'
+import { Table as TableIcon } from '@/components/emcn/icons'
+import { WorkflowIcon } from '@/components/icons'
+import { getDocumentIcon } from '@/components/icons/document-icons'
 import { cn } from '@/lib/core/utils/cn'
-import type { MothershipResource } from '@/app/workspace/[workspaceId]/home/types'
+import type {
+  MothershipResource,
+  MothershipResourceType,
+} from '@/app/workspace/[workspaceId]/home/types'
 
 interface ResourceTabsProps {
   resources: MothershipResource[]
   activeId: string | null
   onSelect: (id: string) => void
 }
 
+const RESOURCE_ICONS: Record<Exclude<MothershipResourceType, 'file'>, ElementType> = {
+  table: TableIcon,
+  workflow: WorkflowIcon,
+}
+
+function getResourceIcon(resource: MothershipResource): ElementType {
+  if (resource.type === 'file') {
+    return getDocumentIcon('', resource.title)
+  }
+  return RESOURCE_ICONS[resource.type]
+}
+
 /**
  * Horizontal tab bar for switching between mothership resources.
- * Mirrors the role of ResourceHeader in the Resource abstraction.
+ * Renders each resource as a subtle Button matching ResourceHeader actions.
  */
 export function ResourceTabs({ resources, activeId, onSelect }: ResourceTabsProps) {
   return (
-    <div className='flex shrink-0 gap-[2px] overflow-x-auto border-[var(--border)] border-b px-[12px]'>
-      {resources.map((resource) => (
-        <button
-          key={resource.id}
-          type='button'
-          onClick={() => onSelect(resource.id)}
-          className={cn(
-            'shrink-0 cursor-pointer border-b-[2px] px-[12px] py-[10px] text-[13px] transition-colors',
-            activeId === resource.id
-              ? 'border-[var(--text-primary)] font-medium text-[var(--text-primary)]'
-              : 'border-transparent text-[var(--text-secondary)] hover:text-[var(--text-primary)]'
-          )}
-        >
-          {resource.title}
-        </button>
-      ))}
+    <div className='flex shrink-0 items-center gap-[6px] overflow-x-auto border-[var(--border)] border-b px-[16px] py-[8.5px] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden'>
+      {resources.map((resource) => {
+        const Icon = getResourceIcon(resource)
+        const isActive = activeId === resource.id
+
+        return (
+          <Button
+            key={resource.id}
+            variant='subtle'
+            onClick={() => onSelect(resource.id)}
+            className={cn(
+              'shrink-0 border border-transparent bg-transparent px-[8px] py-[4px] text-[12px]',
+              isActive && 'border-[var(--border)] bg-[var(--surface-4)]'
+            )}
+          >
+            <Icon className={cn('mr-[6px] h-[14px] w-[14px] text-[var(--text-icon)]')} />
+            {resource.title}
+          </Button>
+        )
+      })}
     </div>
   )
 }

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -46,7 +46,7 @@ export interface UseChatReturn {
       size: number
     }>
   ) => Promise<void>
-  stopGeneration: () => void
+  stopGeneration: () => Promise<void>
   chatBottomRef: React.RefObject<HTMLDivElement | null>
   resources: MothershipResource[]
   activeResourceId: string | null
@@ -140,6 +140,7 @@ export function useChat(workspaceId: string, initialChatId?: string): UseChatRet
   const sendingRef = useRef(false)
   const toolArgsMapRef = useRef<Map<string, Record<string, unknown>>>(new Map())
   const streamGenRef = useRef(0)
+  const streamingContentRef = useRef('')
 
   const isHomePage = pathname.endsWith('/home')
 
@@ -212,6 +213,7 @@ export function useChat(workspaceId: string, initialChatId?: string): UseChatRet
       let lastWorkflowId: string | null = null
       let runningText = ''
 
+      streamingContentRef.current = ''
       toolArgsMapRef.current.clear()
 
       const ensureTextBlock = (): ContentBlock => {
@@ -283,6 +285,7 @@ export function useChat(workspaceId: string, initialChatId?: string): UseChatRet
                 const tb = ensureTextBlock()
                 tb.content = (tb.content ?? '') + chunk
                 runningText += chunk
+                streamingContentRef.current = runningText
                 flush()
               }
               break
@@ -427,6 +430,24 @@ export function useChat(workspaceId: string, initialChatId?: string): UseChatRet
     [workspaceId, queryClient, addResource]
   )
 
+  const persistPartialResponse = useCallback(async () => {
+    const chatId = chatIdRef.current
+    const streamId = streamIdRef.current
+    if (!chatId || !streamId) return
+
+    const content = streamingContentRef.current
+    try {
+      const res = await fetch('/api/mothership/chat/stop', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ chatId, streamId, content }),
+      })
+      if (res.ok) streamingContentRef.current = ''
+    } catch (err) {
+      logger.warn('Failed to persist partial response', err)
+    }
+  }, [])
+
   const invalidateChatQueries = useCallback(() => {
     const activeChatId = chatIdRef.current
     if (activeChatId) {
@@ -495,6 +516,9 @@ export function useChat(workspaceId: string, initialChatId?: string): UseChatRet
     ) => {
       if (!message.trim() || !workspaceId) return
 
+      if (sendingRef.current) {
+        await persistPartialResponse()
+      }
       abortControllerRef.current?.abort()
 
       const gen = ++streamGenRef.current
@@ -566,17 +590,20 @@ export function useChat(workspaceId: string, initialChatId?: string): UseChatRet
         }
       }
     },
-    [workspaceId, queryClient, processSSEStream, finalize]
+    [workspaceId, queryClient, processSSEStream, finalize, persistPartialResponse]
   )
 
-  const stopGeneration = useCallback(() => {
+  const stopGeneration = useCallback(async () => {
+    if (sendingRef.current) {
+      await persistPartialResponse()
+    }
     streamGenRef.current++
     abortControllerRef.current?.abort()
     abortControllerRef.current = null
     sendingRef.current = false
     setIsSending(false)
     invalidateChatQueries()
-  }, [invalidateChatQueries])
+  }, [invalidateChatQueries, persistPartialResponse])
 
   useEffect(() => {
     return () => {