fix(desktop): preserve legacy inbox timestamp precision

Author: waleedlatif1

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

@@ -31,6 +31,7 @@ import {
 import { createDeferred } from '@sim/testing/helpers/deferred'
 import { featureFlagsMock, featureFlagsMockFns } from '@sim/testing/mocks/feature-flags.mock'
 import { generateId } from '@sim/utils/id'
+import { compareStrings } from '@sim/utils/string'
 import { eq, inArray, sql } from 'drizzle-orm'
 import { closeRedisConnection, getRedisClient } from '@/lib/core/config/redis'
 import type { DbTransaction } from '@/lib/db/types'
@@ -887,7 +888,7 @@ describe.runIf(Boolean(redisUrl))('desktop background executor protocol', () =>
       expect((await inbox(desktop)).items.map((item) => item.toolCallId)).toEqual(persisted)
     })
 
-    it('lists pending calls in persistence order even when their doorbell was never heard', async () => {
+    it('preserves legacy sub-millisecond order even when the doorbell was never heard', async () => {
       const desktop = await signedInDesktop()
       const run = await boundRun(desktop)
       const first = await pendingCall(run.runId, 'browser_navigate', { url: 'https://sim.ai' })
@@ -896,13 +897,24 @@ describe.runIf(Boolean(redisUrl))('desktop background executor protocol', () =>
         path: 'user-local/Project--mount-1',
         pattern: 'TODO',
       })
+      const persisted = [first, second, vfs].sort(compareStrings).reverse()
+      const createdAt = new Date(Date.now() - 1000).toISOString()
+      for (const [index, toolCallId] of persisted.entries()) {
+        await db
+          .update(copilotAsyncToolCalls)
+          .set({
+            persistSeq: null,
+            createdAt: sql`${createdAt}::timestamp + ${index} * interval '100 microseconds'`,
+          })
+          .where(eq(copilotAsyncToolCalls.toolCallId, toolCallId))
+      }
       await pendingCall(run.runId, 'run_workflow', {})
       /** Rung while no stream was open: nobody heard it. */
       ringDesktopInbox(desktop.deviceId, 'call')
 
       expect(
         (await inbox(desktop)).items.map((item) => item.kind === 'call' && item.toolCallId)
-      ).toEqual([first, second, vfs])
+      ).toEqual(persisted)
     })
 
     it('counts the device online after a pull or a stream open, and keeps it online when the stream closes', async () => {

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

@@ -89,22 +89,12 @@ const INBOX_ROW_LIMIT = 500
  * can share a millisecond, so the timestamp alone cannot order them. Rows persisted before the
  * sequence existed have none and come first, as they are the oldest.
  */
-const persistOrder = [
-  sql`${copilotAsyncToolCalls.persistSeq} ASC NULLS FIRST`,
-  asc(copilotAsyncToolCalls.createdAt),
-  asc(copilotAsyncToolCalls.toolCallId),
-]
-
-function comparePersistOrder(
-  a: { persistSeq: number | null; createdAt: Date; toolCallId: string },
-  b: { persistSeq: number | null; createdAt: Date; toolCallId: string }
-): number {
-  if (a.persistSeq !== b.persistSeq) {
-    if (a.persistSeq === null) return -1
-    if (b.persistSeq === null) return 1
-    return a.persistSeq - b.persistSeq
-  }
-  return a.createdAt.getTime() - b.createdAt.getTime() || a.toolCallId.localeCompare(b.toolCallId)
+function persistOrder() {
+  return [
+    sql`${copilotAsyncToolCalls.persistSeq} ASC NULLS FIRST`,
+    asc(copilotAsyncToolCalls.createdAt),
+    asc(copilotAsyncToolCalls.toolCallId),
+  ]
 }
 
 export interface DesktopDeviceRegistration {
@@ -232,27 +222,27 @@ export async function listDesktopInboxRows(identity: Omit<DesktopDeviceIdentity,
           state
         )
       )
-      .orderBy(...persistOrder)
+      .orderBy(...persistOrder())
       .limit(INBOX_ROW_LIMIT)
-  const [waiting, cancelled] = await Promise.all([
-    rowsWhere(
-      and(
-        eq(copilotAsyncToolCalls.status, ASYNC_TOOL_STATUS.pending),
-        isNull(copilotAsyncToolCalls.executionOwnerToken),
-        or(sql`${copilotAsyncToolCalls.pickupDeadlineAt} > clock_timestamp()`, awaitingPermission),
-        inArray(copilotRuns.status, LIVE_RUN_STATUSES),
-        isNull(copilotRuns.toolAdmissionClosedAt)
-      )
-    ),
-    rowsWhere(
-      and(
-        isNotNull(copilotAsyncToolCalls.executionOwnerToken),
-        isNull(copilotAsyncToolCalls.executionSettledAt),
-        ne(copilotAsyncToolCalls.status, ASYNC_TOOL_STATUS.running)
+  return rowsWhere(
+    and(
+      eq(copilotAsyncToolCalls.status, ASYNC_TOOL_STATUS.pending),
+      isNull(copilotAsyncToolCalls.executionOwnerToken),
+      or(sql`${copilotAsyncToolCalls.pickupDeadlineAt} > clock_timestamp()`, awaitingPermission),
+      inArray(copilotRuns.status, LIVE_RUN_STATUSES),
+      isNull(copilotRuns.toolAdmissionClosedAt)
+    )
+  )
+    .unionAll(
+      rowsWhere(
+        and(
+          isNotNull(copilotAsyncToolCalls.executionOwnerToken),
+          isNull(copilotAsyncToolCalls.executionSettledAt),
+          ne(copilotAsyncToolCalls.status, ASYNC_TOOL_STATUS.running)
+        )
       )
-    ),
-  ])
-  return [...waiting, ...cancelled].sort(comparePersistOrder)
+    )
+    .orderBy(...persistOrder())
 }
 
 export type DesktopInboxRow = Awaited<ReturnType<typeof listDesktopInboxRows>>[number]
@@ -448,7 +438,7 @@ export async function listOverdueDesktopToolCalls(input: { slackMs: number; limi
         )
       )
     )
-    .orderBy(...persistOrder)
+    .orderBy(...persistOrder())
     .limit(input.limit)
   return rows.map((row) => row.toolCallId)
 }