fix(desktop): announce a background completion only for the very turn the desktop ran

Desktop activity now names each bound turn's stream, and a completion is
announced only when that turn was seen running on the user's own desktop.
An earlier desktop turn no longer makes a later chat-view turn in the same
chat look eligible.

Author: waleedlatif1

apps/sim/hooks/use-mothership-chat-events.test.ts

@@ -303,7 +303,7 @@ describe('reflectBackgroundChatStatus', () => {
       { id: 'chat-b', name: 'Fix CI' },
     ])
     queryClient.setQueryData(desktopActivityKeys.list('ws-1'), [
-      { chatId: 'chat-b', state: 'running', deviceName: 'Studio Mac' },
+      { chatId: 'chat-b', streamId: 's-1', state: 'running', deviceName: 'Studio Mac' },
     ])
   }
 
@@ -394,4 +394,17 @@ describe('reflectBackgroundChatStatus', () => {
 
     expect(shown).toEqual([])
   })
+
+  it('stays silent for a later turn the chat view ran in a chat a desktop ran before', () => {
+    showing('/workspace/ws-1/chat/chat-c')
+
+    reflectBackgroundChatStatus(
+      queryClient,
+      'ws-1',
+      JSON.stringify({ chatId: 'chat-b', type: 'completed', streamId: 's-later' }),
+      true
+    )
+
+    expect(shown).toEqual([])
+  })
 })

apps/sim/hooks/use-mothership-chat-events.ts

@@ -204,13 +204,17 @@ export function reflectBackgroundChatStatus(
   const payload = parseChatStatusEventPayload(data)
   if (payload?.type !== 'started' && payload?.type !== 'completed') return
   // Read before the refresh below drops it. The events carry every member's chats in the
-  // workspace; only one this user's own desktop was running is theirs to be told about.
+  // workspace; only this very turn, seen running on this user's own desktop, is theirs to be told
+  // about. Matching the turn, not just the chat, keeps an earlier desktop turn from vouching for a
+  // later one the chat view ran.
   const ranOnDesktop =
     typeof owner === 'string' &&
     Boolean(
       queryClient
         .getQueryData<DesktopChatActivity[]>(desktopActivityKeys.list(owner))
-        ?.some((activity) => activity.chatId === payload.chatId)
+        ?.some(
+          (activity) => activity.chatId === payload.chatId && activity.streamId === payload.streamId
+        )
     )
   queryClient.invalidateQueries({ queryKey: desktopActivityKeys.lists() })
   if (!announceCompletions || payload.type !== 'completed' || !payload.chatId) return

apps/sim/lib/api/contracts/desktop-executor.ts

@@ -192,6 +192,8 @@ const desktopActivityQuerySchema = z.object({ workspaceId: workspaceIdSchema })
  */
 const desktopChatActivitySchema = z.object({
   chatId: z.string().min(1),
+  /** The turn the desktop runs, as chat status events name it. */
+  streamId: z.string().min(1),
   state: z.enum(['running', 'needs_input', 'blocked']),
   deviceName: z.string(),
 })

apps/sim/lib/desktop/application/activity.integration.ts

@@ -153,8 +153,18 @@ describe.runIf(Boolean(redisUrl))('background desktop activity', () => {
       ).chats
     ).toEqual(
       expect.arrayContaining([
-        { chatId: running.chatId, state: 'blocked', deviceName: 'Studio Mac' },
-        { chatId: waiting.chatId, state: 'needs_input', deviceName: 'Studio Mac' },
+        {
+          chatId: running.chatId,
+          streamId: expect.any(String),
+          state: 'blocked',
+          deviceName: 'Studio Mac',
+        },
+        {
+          chatId: waiting.chatId,
+          streamId: expect.any(String),
+          state: 'needs_input',
+          deviceName: 'Studio Mac',
+        },
       ])
     )
 
@@ -172,8 +182,18 @@ describe.runIf(Boolean(redisUrl))('background desktop activity', () => {
       expect(chats).toHaveLength(2)
       expect(chats).toEqual(
         expect.arrayContaining([
-          { chatId: running.chatId, state: 'running', deviceName: 'Studio Mac' },
-          { chatId: waiting.chatId, state: 'needs_input', deviceName: 'Studio Mac' },
+          {
+            chatId: running.chatId,
+            streamId: expect.any(String),
+            state: 'running',
+            deviceName: 'Studio Mac',
+          },
+          {
+            chatId: waiting.chatId,
+            streamId: expect.any(String),
+            state: 'needs_input',
+            deviceName: 'Studio Mac',
+          },
         ])
       )
     } finally {

apps/sim/lib/desktop/application/activity.test.ts

@@ -19,7 +19,13 @@ const principal = createSessionPrincipal({ userId: 'user-1', sessionId: 'session
 describe('desktop activity presence', () => {
   beforeEach(() => {
     rows.mockResolvedValue([
-      { chatId: 'chat-1', deviceId: 'device-1', deviceName: 'Studio Mac', needsInput: false },
+      {
+        chatId: 'chat-1',
+        streamId: 's-1',
+        deviceId: 'device-1',
+        deviceName: 'Studio Mac',
+        needsInput: false,
+      },
     ])
   })
 
@@ -32,7 +38,9 @@ describe('desktop activity presence', () => {
       input: { workspaceId: 'ws-1' },
     })
 
-    expect(chats).toEqual([{ chatId: 'chat-1', state: 'running', deviceName: 'Studio Mac' }])
+    expect(chats).toEqual([
+      { chatId: 'chat-1', streamId: 's-1', state: 'running', deviceName: 'Studio Mac' },
+    ])
   })
 
   it('calls a desktop blocked when presence is tracked and it is gone', async () => {
@@ -44,6 +52,8 @@ describe('desktop activity presence', () => {
       input: { workspaceId: 'ws-1' },
     })
 
-    expect(chats).toEqual([{ chatId: 'chat-1', state: 'blocked', deviceName: 'Studio Mac' }])
+    expect(chats).toEqual([
+      { chatId: 'chat-1', streamId: 's-1', state: 'blocked', deviceName: 'Studio Mac' },
+    ])
   })
 })

apps/sim/lib/desktop/application/activity.ts

@@ -18,6 +18,8 @@ type DesktopChatActivityState = 'running' | 'needs_input' | 'blocked'
 
 export interface DesktopChatActivityEntry {
   chatId: string
+  /** The turn the desktop runs, as chat status events name it. */
+  streamId: string
   state: DesktopChatActivityState
   deviceName: string
 }
@@ -66,6 +68,7 @@ export const listDesktopActivity = defineAuthorizedCredentialUserUseCase({
       if (chats.has(run.chatId)) continue
       chats.set(run.chatId, {
         chatId: run.chatId,
+        streamId: run.streamId,
         deviceName: run.deviceName,
         state: run.needsInput ? 'needs_input' : online.get(run.deviceId) ? 'running' : 'blocked',
       })

apps/sim/lib/desktop/executor/repository.ts

@@ -464,6 +464,7 @@ export async function listDesktopActivityRows(input: { userId: string; workspace
     .select({
       runId: copilotRuns.id,
       chatId: copilotRuns.chatId,
+      streamId: copilotRuns.streamId,
       deviceId: desktopDevices.id,
       deviceName: desktopDevices.name,
     })