address comments

Author: icecrasher321

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

@@ -93,8 +93,14 @@ export async function POST(req: NextRequest) {
     const canAppendAssistant =
       userIdx >= 0 && userIdx === messages.length - 1 && !alreadyHasResponse
 
+    const updateWhere = and(
+      eq(copilotChats.id, chatId),
+      eq(copilotChats.userId, session.user.id),
+      eq(copilotChats.conversationId, streamId)
+    )
+
     const setClause: Record<string, unknown> = {
-      conversationId: sql`CASE WHEN ${copilotChats.conversationId} = ${streamId} THEN NULL ELSE ${copilotChats.conversationId} END`,
+      conversationId: null,
       updatedAt: new Date(),
     }
 
@@ -116,7 +122,7 @@ export async function POST(req: NextRequest) {
     const [updated] = await db
       .update(copilotChats)
       .set(setClause)
-      .where(and(eq(copilotChats.id, chatId), eq(copilotChats.userId, session.user.id)))
+      .where(updateWhere)
       .returning({ workspaceId: copilotChats.workspaceId })
 
     if (updated?.workspaceId) {

apps/sim/lib/copilot/chat/terminal-state.test.ts

@@ -2,6 +2,8 @@
  * @vitest-environment node
  */
 
+import { copilotChats } from '@sim/db/schema'
+import { and, eq } from 'drizzle-orm'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { selectLimit, selectWhere, selectFrom, select, updateWhere, updateSet, update } = vi.hoisted(
@@ -63,10 +65,13 @@ describe('finalizeAssistantTurn', () => {
     expect(updateSet).toHaveBeenCalledWith(
       expect.objectContaining({
         updatedAt: expect.any(Date),
-        conversationId: expect.anything(),
+        conversationId: null,
         messages: expect.anything(),
       })
     )
+    expect(updateWhere).toHaveBeenCalledWith(
+      and(eq(copilotChats.id, 'chat-1'), eq(copilotChats.conversationId, 'user-1'))
+    )
   })
 
   it('only clears the active stream marker when a response is already persisted', async () => {
@@ -90,13 +95,21 @@ describe('finalizeAssistantTurn', () => {
       },
     })
 
-    const updateArg = updateSet.mock.calls[0]?.[0] as Record<string, unknown>
+    const updateCalls = updateSet.mock.calls as unknown as Array<[Record<string, unknown>]>
+    const updateArg = updateCalls[0]?.[0]
+    expect(updateArg).toBeDefined()
+    if (!updateArg) {
+      throw new Error('Expected updateSet to be called')
+    }
     expect(updateArg).toEqual(
       expect.objectContaining({
         updatedAt: expect.any(Date),
-        conversationId: expect.anything(),
+        conversationId: null,
       })
     )
     expect(Object.hasOwn(updateArg, 'messages')).toBe(false)
+    expect(updateWhere).toHaveBeenCalledWith(
+      and(eq(copilotChats.id, 'chat-1'), eq(copilotChats.conversationId, 'user-1'))
+    )
   })
 })

apps/sim/lib/copilot/chat/terminal-state.ts

@@ -1,6 +1,6 @@
 import { db } from '@sim/db'
 import { copilotChats } from '@sim/db/schema'
-import { eq, sql } from 'drizzle-orm'
+import { and, eq, sql } from 'drizzle-orm'
 import type { PersistedMessage } from '@/lib/copilot/chat/persisted-message'
 
 interface FinalizeAssistantTurnParams {
@@ -32,9 +32,13 @@ export async function finalizeAssistantTurn({
     userIdx + 1 < messages.length &&
     (messages[userIdx + 1] as Record<string, unknown>)?.role === 'assistant'
   const canAppendAssistant = userIdx >= 0 && userIdx === messages.length - 1 && !alreadyHasResponse
+  const updateWhere = and(
+    eq(copilotChats.id, chatId),
+    eq(copilotChats.conversationId, userMessageId)
+  )
 
   const baseUpdate = {
-    conversationId: sql`CASE WHEN ${copilotChats.conversationId} = ${userMessageId} THEN NULL ELSE ${copilotChats.conversationId} END`,
+    conversationId: null,
     updatedAt: new Date(),
   }
 
@@ -45,9 +49,9 @@ export async function finalizeAssistantTurn({
         ...baseUpdate,
         messages: sql`${copilotChats.messages} || ${JSON.stringify([assistantMessage])}::jsonb`,
       })
-      .where(eq(copilotChats.id, chatId))
+      .where(updateWhere)
     return
   }
 
-  await db.update(copilotChats).set(baseUpdate).where(eq(copilotChats.id, chatId))
+  await db.update(copilotChats).set(baseUpdate).where(updateWhere)
 }

apps/sim/lib/copilot/request/session/contract.ts

@@ -1,4 +1,5 @@
-import Ajv2020, { type ErrorObject, type ValidateFunction } from 'ajv/dist/2020'
+import type { ErrorObject, ValidateFunction } from 'ajv'
+import Ajv2020 from 'ajv/dist/2020.js'
 import type {
   MothershipStreamV1EventEnvelope,
   MothershipStreamV1StreamRef,

apps/sim/package.json

@@ -97,6 +97,7 @@
     "@trigger.dev/sdk": "4.4.3",
     "@types/react-window": "2.0.0",
     "@types/three": "0.177.0",
+    "ajv": "8.18.0",
     "better-auth": "1.3.12",
     "better-auth-harmony": "1.3.1",
     "binary-extensions": "^2.0.0",