cleanup code and fix types

Author: icecrasher321

apps/sim/app/api/mothership/chats/[chatId]/route.test.ts

@@ -123,7 +123,7 @@ describe('GET /api/mothership/chats/[chatId]', () => {
     mockGetLatestRunForStream.mockResolvedValue(null)
   })
 
-  it('clears conversationId when the redis lock has expired (stuck-yellow bug)', async () => {
+  it('clears activeStreamId when the redis lock has expired (stuck-yellow bug)', async () => {
     mockGetAccessibleCopilotChat.mockResolvedValueOnce({
       id: 'chat-stuck',
       type: 'mothership',
@@ -147,12 +147,12 @@ describe('GET /api/mothership/chats/[chatId]', () => {
       { repairVerifiedStaleMarkers: true }
     )
     expect(body.success).toBe(true)
-    expect(body.chat.conversationId).toBeNull()
+    expect(body.chat.activeStreamId).toBeNull()
     expect(body.chat.streamSnapshot).toBeUndefined()
     expect(mockReadEvents).not.toHaveBeenCalled()
   })
 
-  it('returns the live conversationId when redis confirms the lock', async () => {
+  it('returns the live activeStreamId when redis confirms the lock', async () => {
     mockGetAccessibleCopilotChat.mockResolvedValueOnce({
       id: 'chat-live',
       type: 'mothership',
@@ -169,13 +169,13 @@ describe('GET /api/mothership/chats/[chatId]', () => {
     expect(response.status).toBe(200)
     const body = await response.json()
 
-    expect(body.chat.conversationId).toBe('stream-live')
+    expect(body.chat.activeStreamId).toBe('stream-live')
     expect(mockReadEvents).toHaveBeenCalledWith('stream-live', '0')
     expect(body.chat.streamSnapshot).toBeDefined()
     expect(body.chat.streamSnapshot.status).toBe('active')
   })
 
-  it('uses the Redis lock owner when it differs from a stale conversationId', async () => {
+  it('uses the Redis lock owner when it differs from a stale persisted streamId', async () => {
     mockGetAccessibleCopilotChat.mockResolvedValueOnce({
       id: 'chat-mismatch',
       type: 'mothership',
@@ -196,11 +196,11 @@ describe('GET /api/mothership/chats/[chatId]', () => {
     expect(response.status).toBe(200)
     const body = await response.json()
 
-    expect(body.chat.conversationId).toBe('stream-live')
+    expect(body.chat.activeStreamId).toBe('stream-live')
     expect(mockReadEvents).toHaveBeenCalledWith('stream-live', '0')
   })
 
-  it('returns null when conversationId is already null', async () => {
+  it('returns null when the persisted stream marker is already null', async () => {
     mockGetAccessibleCopilotChat.mockResolvedValueOnce({
       id: 'chat-idle',
       type: 'mothership',
@@ -220,7 +220,7 @@ describe('GET /api/mothership/chats/[chatId]', () => {
       { repairVerifiedStaleMarkers: true }
     )
     const body = await response.json()
-    expect(body.chat.conversationId).toBeNull()
+    expect(body.chat.activeStreamId).toBeNull()
   })
 
   it('returns 404 when the chat does not exist', async () => {

apps/sim/app/api/mothership/chats/[chatId]/route.ts

@@ -57,25 +57,25 @@ export const GET = withRouteHandler(
         [{ chatId: chat.id, streamId: chat.conversationId }],
         { repairVerifiedStaleMarkers: true }
       )
-      const liveConversationId = reconciledMarkers.get(chat.id)?.streamId ?? null
+      const liveStreamId = reconciledMarkers.get(chat.id)?.streamId ?? null
 
-      if (liveConversationId) {
+      if (liveStreamId) {
         try {
           const [events, previewSessions] = await Promise.all([
-            readEvents(liveConversationId, '0'),
-            readFilePreviewSessions(liveConversationId).catch((error) => {
+            readEvents(liveStreamId, '0'),
+            readFilePreviewSessions(liveStreamId).catch((error) => {
               logger.warn('Failed to read preview sessions for mothership chat', {
                 chatId,
-                conversationId: liveConversationId,
+                streamId: liveStreamId,
                 error: toError(error).message,
               })
               return []
             }),
           ])
-          const run = await getLatestRunForStream(liveConversationId, userId).catch((error) => {
+          const run = await getLatestRunForStream(liveStreamId, userId).catch((error) => {
             logger.warn('Failed to fetch latest run for mothership chat snapshot', {
               chatId,
-              conversationId: liveConversationId,
+              streamId: liveStreamId,
               error: toError(error).message,
             })
             return null
@@ -94,7 +94,7 @@ export const GET = withRouteHandler(
         } catch (error) {
           logger.warn('Failed to read stream snapshot for mothership chat', {
             chatId,
-            conversationId: liveConversationId,
+            streamId: liveStreamId,
             error: toError(error).message,
           })
         }
@@ -107,7 +107,7 @@ export const GET = withRouteHandler(
         : []
       const effectiveMessages = buildEffectiveChatTranscript({
         messages: normalizedMessages,
-        activeStreamId: liveConversationId || null,
+        activeStreamId: liveStreamId,
         ...(streamSnapshot ? { streamSnapshot } : {}),
       })
 
@@ -117,7 +117,7 @@ export const GET = withRouteHandler(
           id: chat.id,
           title: chat.title,
           messages: effectiveMessages,
-          conversationId: liveConversationId || null,
+          activeStreamId: liveStreamId,
           resources: Array.isArray(chat.resources) ? chat.resources : [],
           createdAt: chat.createdAt,
           updatedAt: chat.updatedAt,

apps/sim/hooks/queries/tasks.test.ts

@@ -100,7 +100,7 @@ describe('tasks query boundary parsing', () => {
           id: 'chat-1',
           title: 'Task history',
           messages: [],
-          conversationId: 'stream-1',
+          activeStreamId: 'stream-1',
           resources: [{ type: 'file', id: 'file-1', title: 'Spec.md' }],
           streamSnapshot: {
             events: [],
@@ -144,7 +144,7 @@ describe('tasks query boundary parsing', () => {
       )
 
     await expect(fetchChatHistory('chat-1')).rejects.toThrow(
-      'Invalid copilot chat response: chat.resources[0].type is invalid'
+      'Invalid chat response: chat.resources[0].type is invalid'
     )
   })
 

apps/sim/hooks/queries/tasks.ts

@@ -57,8 +57,6 @@ export const taskKeys = {
   detail: (chatId: string | undefined) => [...taskKeys.details(), chatId ?? ''] as const,
 }
 
-type ChatHistorySource = 'copilot' | 'mothership'
-
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
 }
@@ -150,30 +148,28 @@ function parseStrictStreamSnapshot(
   return snapshot
 }
 
-function parseChatHistory(value: unknown, source: ChatHistorySource): TaskChatHistory {
-  const responseContext = `Invalid ${source} chat response`
+function parseChatHistory(value: unknown): TaskChatHistory {
+  const responseContext = 'Invalid chat response'
   const chatContext = `${responseContext}: chat`
 
   assertValid(isRecord(value), `${responseContext}: body must be an object`)
   assertValid(isRecord(value.chat), `${chatContext} must be an object`)
 
   const chat = value.chat
-  const activeStreamField = source === 'mothership' ? 'conversationId' : 'activeStreamId'
-  const activeStreamId = chat[activeStreamField]
 
   assertValid(typeof chat.id === 'string', `${chatContext}.id must be a string`)
   assertValid(isNullableString(chat.title), `${chatContext}.title must be a string or null`)
   assertValid(Array.isArray(chat.messages), `${chatContext}.messages must be an array`)
   assertValid(
-    isNullableString(activeStreamId),
-    `${chatContext}.${activeStreamField} must be a string or null`
+    isNullableString(chat.activeStreamId),
+    `${chatContext}.activeStreamId must be a string or null`
   )
 
   return {
     id: chat.id,
     title: chat.title,
     messages: normalizeMessages(chat.messages),
-    activeStreamId,
+    activeStreamId: chat.activeStreamId,
     resources: parseResources(chat.resources, `${chatContext}.resources`),
     streamSnapshot: parseStrictStreamSnapshot(chat.streamSnapshot, `${chatContext}.streamSnapshot`),
   }
@@ -233,7 +229,7 @@ export async function fetchChatHistory(
       params: { chatId },
       signal,
     })
-    return parseChatHistory(data, 'mothership')
+    return parseChatHistory(data)
   } catch (error) {
     if (!isApiClientError(error)) throw error
     // Fall through to the legacy copilot-shape alias on any HTTP error (typically 404
@@ -251,7 +247,7 @@ export async function fetchChatHistory(
     throw new Error('Failed to load chat')
   }
 
-  return parseChatHistory(await copilotRes.json(), 'copilot')
+  return parseChatHistory(await copilotRes.json())
 }
 
 /**

apps/sim/lib/api/contracts/mothership-tasks.ts

@@ -283,7 +283,7 @@ export const getMothershipChatResponseSchema = z.object({
       id: z.string(),
       title: z.string().nullable(),
       messages: z.array(z.unknown()),
-      conversationId: z.string().nullable(),
+      activeStreamId: z.string().nullable(),
       resources: z.array(z.unknown()),
       createdAt: z.union([z.string(), z.date()]).nullable().optional(),
       updatedAt: z.union([z.string(), z.date()]).nullable().optional(),

apps/sim/lib/copilot/chat/stream-liveness.ts

@@ -100,10 +100,14 @@ async function repairVerifiedStaleMarkers(
   candidates: ChatStreamMarkerCandidate[],
   results: Map<string, ReconciledChatStreamMarker>
 ): Promise<void> {
-  const staleCandidates = candidates.filter((candidate) => {
-    const result = results.get(candidate.chatId)
-    return candidate.streamId !== null && result?.status === 'inactive' && result.streamId === null
-  })
+  const staleCandidates = candidates.filter(
+    (candidate): candidate is { chatId: string; streamId: string } => {
+      const result = results.get(candidate.chatId)
+      return (
+        candidate.streamId !== null && result?.status === 'inactive' && result.streamId === null
+      )
+    }
+  )
 
   if (staleCandidates.length === 0) return