Merge remote-tracking branch 'origin/staging' into feat/docs-academy

Author: ouiliame

apps/sim/app/_shell/providers/session-provider.test.tsx

@@ -107,12 +107,18 @@ function renderProvider(): Harness {
   }
 }
 
-/** Flush pending microtasks inside an act() boundary. */
+/**
+ * Flush pending work inside an act() boundary. Drains the microtask queue and
+ * then yields one macrotask tick, so React Query's notifyManager (which can
+ * schedule observer notifications on a timer) and any deferred renders settle
+ * deterministically — microtask-only flushing raced the query→render update.
+ */
 async function flush() {
   await act(async () => {
     await Promise.resolve()
     await Promise.resolve()
     await Promise.resolve()
+    await new Promise<void>((resolve) => setTimeout(resolve, 0))
   })
 }
 

apps/sim/app/api/table/[tableId]/delete-async/route.test.ts

@@ -39,6 +39,9 @@ vi.mock('@/lib/core/config/env-flags', () => ({
   },
 }))
 vi.mock('@/background/table-delete', () => ({ tableDeleteTask: { id: 'table-delete' } }))
+vi.mock('@/lib/core/async-jobs/region', () => ({
+  resolveTriggerRegion: vi.fn().mockResolvedValue('us-east-1'),
+}))
 vi.mock('@trigger.dev/sdk', () => ({
   tasks: { trigger: mockTasksTrigger },
   task: (config: unknown) => config,
@@ -196,7 +199,7 @@ describe('POST /api/table/[tableId]/delete-async', () => {
         excludeRowIds: ['row_keep'],
         cutoff: expect.any(String),
       }),
-      { tags: ['tableId:tbl_1', 'jobId:job-id-xyz'] }
+      { tags: ['tableId:tbl_1', 'jobId:job-id-xyz'], region: 'us-east-1' }
     )
   })
 

apps/sim/app/api/table/[tableId]/delete-async/route.ts

@@ -86,14 +86,15 @@ export const POST = withRouteHandler(async (request: NextRequest, { params }: Ro
     // Trigger.dev runs the delete outside the web container (survives deploys) and retries —
     // safe: the keyset + cutoff walk just deletes whatever remains.
     try {
-      const [{ tableDeleteTask }, { tasks }] = await Promise.all([
+      const [{ tableDeleteTask }, { tasks }, { resolveTriggerRegion }] = await Promise.all([
         import('@/background/table-delete'),
         import('@trigger.dev/sdk'),
+        import('@/lib/core/async-jobs/region'),
       ])
       await tasks.trigger<typeof tableDeleteTask>(
         'table-delete',
         { jobId, tableId, workspaceId, filter, excludeRowIds, cutoff: cutoff.toISOString() },
-        { tags: [`tableId:${tableId}`, `jobId:${jobId}`] }
+        { tags: [`tableId:${tableId}`, `jobId:${jobId}`], region: await resolveTriggerRegion() }
       )
     } catch (error) {
       // A failed dispatch must not leave a ghost `running` job holding the

apps/sim/app/api/table/[tableId]/export-async/route.ts

@@ -61,12 +61,14 @@ export const POST = withRouteHandler(async (request: NextRequest, { params }: Ro
   const payload: TableExportPayload = { jobId, tableId, workspaceId, format }
   if (isTriggerDevEnabled) {
     try {
-      const [{ tableExportTask }, { tasks }] = await Promise.all([
+      const [{ tableExportTask }, { tasks }, { resolveTriggerRegion }] = await Promise.all([
         import('@/background/table-export'),
         import('@trigger.dev/sdk'),
+        import('@/lib/core/async-jobs/region'),
       ])
       await tasks.trigger<typeof tableExportTask>('table-export', payload, {
         tags: [`tableId:${tableId}`, `jobId:${jobId}`],
+        region: await resolveTriggerRegion(),
       })
     } catch (error) {
       // A failed dispatch must not leave a ghost `running` job holding the

apps/sim/app/api/table/[tableId]/import-async/route.ts

@@ -83,12 +83,14 @@ export const POST = withRouteHandler(async (request: NextRequest, { params }: Ro
   if (isTriggerDevEnabled) {
     // Trigger.dev runs the import outside the web container, so it survives app deploys.
     try {
-      const [{ tableImportTask }, { tasks }] = await Promise.all([
+      const [{ tableImportTask }, { tasks }, { resolveTriggerRegion }] = await Promise.all([
         import('@/background/table-import'),
         import('@trigger.dev/sdk'),
+        import('@/lib/core/async-jobs/region'),
       ])
       await tasks.trigger<typeof tableImportTask>('table-import', importPayload, {
         tags: [`tableId:${tableId}`, `jobId:${importId}`],
+        region: await resolveTriggerRegion(),
       })
     } catch (error) {
       // A failed dispatch must not leave a ghost `running` job holding the

apps/sim/app/api/table/import-async/route.ts

@@ -115,12 +115,14 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
   if (isTriggerDevEnabled) {
     // Trigger.dev runs the import outside the web container, so it survives app deploys.
     try {
-      const [{ tableImportTask }, { tasks }] = await Promise.all([
+      const [{ tableImportTask }, { tasks }, { resolveTriggerRegion }] = await Promise.all([
         import('@/background/table-import'),
         import('@trigger.dev/sdk'),
+        import('@/lib/core/async-jobs/region'),
       ])
       await tasks.trigger<typeof tableImportTask>('table-import', importPayload, {
         tags: [`tableId:${table.id}`, `jobId:${importId}`],
+        region: await resolveTriggerRegion(),
       })
     } catch (error) {
       // A failed dispatch must not leave a ghost `running` job holding the

apps/sim/app/api/webhooks/agentmail/route.ts

@@ -19,6 +19,7 @@ import {
   agentMailMessageSchema,
   webhookSvixHeadersSchema,
 } from '@/lib/api/contracts/webhooks'
+import { resolveTriggerRegion } from '@/lib/core/async-jobs/region'
 import { isTriggerDevEnabled } from '@/lib/core/config/env-flags'
 import {
   assertContentLengthWithinLimit,
@@ -234,6 +235,7 @@ export const POST = withRouteHandler(async (req: Request) => {
           { taskId },
           {
             tags: [`workspaceId:${result.id}`, `taskId:${taskId}`],
+            region: await resolveTriggerRegion(),
           }
         )
         await db

apps/sim/components/icons.tsx

@@ -3439,6 +3439,16 @@ export const DeepseekIcon = (props: SVGProps<SVGSVGElement>) => (
   </svg>
 )
 
+export const SakanaIcon = (props: SVGProps<SVGSVGElement>) => (
+  <svg {...props} height='1em' viewBox='152 5 38 30' width='1em' xmlns='http://www.w3.org/2000/svg'>
+    <title>Sakana AI</title>
+    <path
+      d='m187.2 7.8-2.5-0.7c-6.3-1.8-12.7-1.2-18 1.5l-10.2 5.7c-1.2 0.7-0.2 2.5 1 1.8l7.6-4.4c0.8 1.7 1.5 4 1.1 7.7-1.4-0.3-6-1.4-10.9 1.5-0.6 0.3-0.8 1.1-0.3 1.7 0.5 0.5 1.2 0.3 1.3 0.2 2.2-1.3 5.6-2.4 9.6-1.4-0.7 2.5-2.5 5.6-6 7.8-1.5 0.7-0.4 2.3 0.7 1.8 1.8-1 5.3-3.4 6.9-9 2.1 0.9 4.2 2.4 5.9 4.6l-7.2 4.1c-1.2 0.6-0.3 2.4 1.1 1.7l9-5c4.6-2.7 8.3-7.5 10.1-13.1l1.3-5.3c0.4-0.4 0-1.1-0.5-1.2zm-11.5 17.5-0.6 0.4c-2-2.6-4.5-4.7-7.5-5.7 0.5-3.8-0.3-6.8-1.2-9.1l1.1-0.6c4.8-2 9.8-2.7 16.2-0.9l1.6 0.4-0.8 2.7c-1.5 4.9-4.5 9.6-8.8 12.8z'
+      fill='#E60000'
+    />
+  </svg>
+)
+
 export function GeminiIcon(props: SVGProps<SVGSVGElement>) {
   const id = useId()
   const gradientId = `gemini_gradient_${id}`

apps/sim/lib/a2a/push-notifications.ts

@@ -111,13 +111,15 @@ export async function notifyTaskStateChange(taskId: string, state: TaskState): P
 
   if (isTriggerDevEnabled) {
     try {
-      const { a2aPushNotificationTask } = await import(
-        '@/background/a2a-push-notification-delivery'
-      )
+      const [{ a2aPushNotificationTask }, { resolveTriggerRegion }] = await Promise.all([
+        import('@/background/a2a-push-notification-delivery'),
+        import('@/lib/core/async-jobs/region'),
+      ])
       await a2aPushNotificationTask.trigger(
         { taskId, state },
         {
           tags: [`taskId:${taskId}`],
+          region: await resolveTriggerRegion(),
         }
       )
       logger.info('Push notification queued to trigger.dev', { taskId, state })

apps/sim/lib/billing/cleanup-dispatcher.ts

@@ -10,6 +10,7 @@ import { getPlanType, type PlanCategory } from '@/lib/billing/plan-helpers'
 import { chunkArray } from '@/lib/cleanup/batch-delete'
 import { getJobQueue } from '@/lib/core/async-jobs'
 import { shouldExecuteInline } from '@/lib/core/async-jobs/config'
+import { resolveTriggerRegion } from '@/lib/core/async-jobs/region'
 import type { EnqueueOptions } from '@/lib/core/async-jobs/types'
 import { isTriggerAvailable } from '@/lib/knowledge/documents/service'
 import { isOrganizationWorkspace, WORKSPACE_MODE } from '@/lib/workspaces/policy'
@@ -314,13 +315,15 @@ export async function dispatchCleanupJobs(jobType: CleanupJobType): Promise<{
       if (batch.length === 0) return
       const currentBatch = batch
       batch = []
+      const region = await resolveTriggerRegion()
       const batchResult = await tasks.batchTrigger(
         jobType,
         currentBatch.map((payload) => ({
           payload,
           options: {
             tags: [`plan:${payload.plan}`, `jobType:${jobType}`],
             concurrencyKey: getCleanupConcurrencyKey(jobType),
+            region,
           },
         }))
       )