Reconcile Plan feature with staging contracts and validation gates

Author: Sg312

apps/desktop/src/main/ipc.test.ts

@@ -654,7 +654,8 @@ describe('registerIpcHandlers', () => {
     })
     deps.computerUse = service
     const cancel = vi.spyOn(service, 'cancel')
-    const execute = collectHandlers().invoke.get('computer-use:execute-tool')!
+    const execute = collectHandlers().invoke.get('computer-use:execute-tool')
+    if (!execute) throw new Error('Computer use handler was not registered')
     return { native, approveApp, status, cancel, execute }
   }
 

apps/docs/content/docs/integrations/gmail.mdx

@@ -315,8 +315,6 @@ List all labels in a Gmail account
 | --------- | ---- | ----------- |
 | `labels` | json | Array of label objects with id, name, type, and visibility settings |
 
-
-
 ## Triggers
 
 A **Trigger** is a block that starts a workflow when an event happens in this service.

apps/sim/app/api/copilot/chat/stream/route.test.ts

@@ -156,7 +156,7 @@ describe('copilot chat stream replay route', () => {
           executionId: 'exec-1',
           id: 'run-1',
         })
-        .mockResolvedValueOnce({
+        .mockResolvedValue({
           status: 'cancelled',
           executionId: 'exec-1',
           id: 'run-1',
@@ -167,14 +167,21 @@ describe('copilot chat stream replay route', () => {
       )
 
       const chunks = await readAllChunks(response)
+      if (elapsedMs >= 3_600_000) {
+        expect(chunks.join('')).not.toContain('"type":"complete"')
+        const reattached = await GET(
+          new NextRequest('http://localhost:3000/api/copilot/chat/stream?streamId=stream-1&after=0')
+        )
+        chunks.push(...(await readAllChunks(reattached)))
+      }
       expect(chunks[0]).toBe(': accepted\n\n')
       expect(chunks.join('')).toContain(
         JSON.stringify({
           status: MothershipStreamV1CompletionStatus.cancelled,
           reason: 'terminal_status',
         })
       )
-      expect(getLatestRunForStream).toHaveBeenCalledTimes(2)
+      expect(getLatestRunForStream).toHaveBeenCalledTimes(elapsedMs >= 3_600_000 ? 3 : 2)
       clock.mockRestore()
     }
   )

apps/sim/app/api/desktop/computer/authorize/route.test.ts

@@ -1,10 +1,11 @@
 /** @vitest-environment node */
 import { authMockFns } from '@sim/testing'
+import { rateLimiterMock, rateLimiterMockFns } from '@sim/testing/mocks/rate-limiter.mock'
 import { NextRequest } from 'next/server'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 
-const mocks = vi.hoisted(() => ({ execute: vi.fn(), rate: vi.fn() }))
+const mocks = vi.hoisted(() => ({ execute: vi.fn() }))
 vi.mock('@/lib/computer-use/application/authorize', () => ({
   authorizeComputerUse: {
     operation: {
@@ -15,10 +16,6 @@ vi.mock('@/lib/computer-use/application/authorize', () => ({
     execute: mocks.execute,
   },
 }))
-vi.mock('@/lib/core/rate-limiter', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('@/lib/core/rate-limiter')>()),
-  enforceUserRateLimit: mocks.rate,
-}))
 
 import { POST } from '@/app/api/desktop/computer/authorize/route'
 
@@ -30,12 +27,11 @@ const request = (body: unknown) =>
   })
 describe('computer authorization route', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
     authMockFns.mockGetSession.mockResolvedValue({
       user: { id: 'user-1' },
       session: { id: 'session-1' },
     })
-    mocks.rate.mockResolvedValue(null)
+    rateLimiterMockFns.mockEnforceUserRateLimit.mockResolvedValue(null)
     mocks.execute.mockResolvedValue({
       toolName: 'computer',
       chatId: 'chat-1',
@@ -68,7 +64,11 @@ describe('computer authorization route', () => {
         input: { toolCallId: 'call-1' },
       })
     )
-    expect(mocks.rate).toHaveBeenCalledWith('desktop-computer-use', 'user-1', undefined)
+    expect(rateLimiterMockFns.mockEnforceUserRateLimit).toHaveBeenCalledWith(
+      'desktop-computer-use',
+      'user-1',
+      undefined
+    )
   })
   it.each([
     ['not_found', 404],
@@ -78,3 +78,5 @@ describe('computer authorization route', () => {
     expect((await POST(request({ toolCallId: 'call-1' }))).status).toBe(status)
   })
 })
+
+vi.mock('@/lib/core/rate-limiter', () => rateLimiterMock)

apps/sim/app/o/[organizationId]/benchmark/components/index.ts

@@ -1,6 +1,2 @@
 export { BenchmarkDetail } from '@/app/o/[organizationId]/benchmark/components/benchmark-detail'
-export { BenchmarkJson } from '@/app/o/[organizationId]/benchmark/components/benchmark-json'
-export { BenchmarkReference } from '@/app/o/[organizationId]/benchmark/components/benchmark-reference'
-export { BenchmarkResults } from '@/app/o/[organizationId]/benchmark/components/benchmark-results'
-export { BenchmarkStep } from '@/app/o/[organizationId]/benchmark/components/benchmark-step'
 export { CreateBenchmark } from '@/app/o/[organizationId]/benchmark/components/create-benchmark'

apps/sim/app/o/[organizationId]/layout.tsx

@@ -4,8 +4,8 @@ import { redirect } from 'next/navigation'
 import { SettingsNavigationProvider } from '@/components/settings/settings-navigation-provider'
 import { getSession } from '@/lib/auth'
 import { getActiveOrganizationId } from '@/lib/auth/session-response'
-import { isDashboardsEnabled } from '@/lib/dashboards/feature-flag'
 import { canUseBenchmarks } from '@/lib/benchmarks/application/access'
+import { isDashboardsEnabled } from '@/lib/dashboards/feature-flag'
 import {
   isMemorySpacesEnabled,
   isMothershipModelSelectorEnabled,

apps/sim/hooks/queries/benchmarks.ts

@@ -22,7 +22,7 @@ import {
   updateBenchmarkContract,
 } from '@/lib/api/contracts/benchmarks'
 
-export const benchmarkKeys = {
+const benchmarkKeys = {
   all: ['benchmarks'] as const,
   lists: () => [...benchmarkKeys.all, 'list'] as const,
   list: (organizationId: string, runAsUserId?: string) =>
@@ -49,7 +49,7 @@ export const benchmarkKeys = {
     [...benchmarkKeys.runs(), organizationId, benchmarkId, runId] as const,
 }
 
-export const BENCHMARK_STALE_TIME = 10_000
+const BENCHMARK_STALE_TIME = 10_000
 const BENCHMARK_POLL_INTERVAL = 2_000
 const BENCHMARK_PAGE_SIZE = 20
 

apps/sim/hooks/queries/computer-use.ts

@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'
 import { requestJson } from '@/lib/api/client'
 import { computerUseAvailabilityContract } from '@/lib/api/contracts/computer-use'
 
-export const computerUseKeys = {
+const computerUseKeys = {
   all: ['computer-use'] as const,
   availability: () => [...computerUseKeys.all, 'availability'] as const,
 }

apps/sim/hooks/queries/memory-spaces.ts

@@ -9,7 +9,7 @@ import {
 } from '@/lib/api/contracts/memory-spaces'
 
 const MEMORY_SPACES_STALE_TIME = 10_000
-export const memorySpacesKeys = {
+const memorySpacesKeys = {
   all: ['memory-spaces'] as const,
   list: (organizationId: string) => [...memorySpacesKeys.all, organizationId] as const,
 }

apps/sim/lib/api/contracts/benchmarks.ts

@@ -15,44 +15,44 @@ import {
   benchmarkSummarySchema,
 } from '@/lib/benchmarks/types'
 
-export const benchmarkOrganizationParamsSchema = z.object({ id: organizationIdSchema })
-export const benchmarkParamsSchema = benchmarkOrganizationParamsSchema.extend({
+const benchmarkOrganizationParamsSchema = z.object({ id: organizationIdSchema })
+const benchmarkParamsSchema = benchmarkOrganizationParamsSchema.extend({
   benchmarkId: z.string().min(1).max(128),
 })
-export const benchmarkRunParamsSchema = benchmarkParamsSchema.extend({
+const benchmarkRunParamsSchema = benchmarkParamsSchema.extend({
   runId: z.string().min(1).max(128),
 })
-export const listBenchmarksQuerySchema = z.object({
+const listBenchmarksQuerySchema = z.object({
   runAsUserId: z.string().min(1).max(128).optional(),
   cursor: z.string().min(1).max(512).optional(),
   limit: z.coerce.number().int().min(1).max(50).default(20),
 })
-export const createBenchmarkBodySchema = z
+const createBenchmarkBodySchema = z
   .object({
     runAsUserId: z.string().min(1).max(128),
     sourceWorkspaceId: workspaceIdSchema,
     name: benchmarkNameSchema,
     taskBrief: benchmarkBriefSchema.optional(),
   })
   .strict()
-export const updateBenchmarkBodySchema = benchmarkEditablePatchSchema
+const updateBenchmarkBodySchema = benchmarkEditablePatchSchema
   .extend({ version: z.number().int().min(1) })
   .strict()
-export const deleteBenchmarkBodySchema = z.object({ version: z.number().int().min(1) }).strict()
-export const runBenchmarkStageBodySchema = deleteBenchmarkBodySchema
+const deleteBenchmarkBodySchema = z.object({ version: z.number().int().min(1) }).strict()
+const runBenchmarkStageBodySchema = deleteBenchmarkBodySchema
   .extend({ stage: benchmarkStageSchema, runLabel: benchmarkRunLabelSchema.optional() })
   .strict()
-export const benchmarkResponseSchema = z.object({ benchmark: benchmarkCaseSchema })
-export const listBenchmarksResponseSchema = z.object({
+const benchmarkResponseSchema = z.object({ benchmark: benchmarkCaseSchema })
+const listBenchmarksResponseSchema = z.object({
   benchmarks: z.array(benchmarkSummarySchema).max(50),
   nextCursor: z.string().max(512).nullable(),
 })
-export const listBenchmarkRunsResponseSchema = z.object({
+const listBenchmarkRunsResponseSchema = z.object({
   runs: z.array(benchmarkRunSummarySchema).max(50),
   nextCursor: z.string().max(512).nullable(),
 })
-export const benchmarkRunResponseSchema = z.object({ run: benchmarkRunSchema })
-export const reviewBenchmarkRunBodySchema = z
+const benchmarkRunResponseSchema = z.object({ run: benchmarkRunSchema })
+const reviewBenchmarkRunBodySchema = z
   .object({
     version: z.number().int().min(1),
     blankId: benchmarkBlankSchema.shape.id,
@@ -124,21 +124,16 @@ export const reviewBenchmarkRunContract = defineRouteContract({
   response: { mode: 'json', schema: benchmarkRunResponseSchema },
 })
 
-export type ListBenchmarksResponse = z.infer<typeof listBenchmarksResponseSchema>
 export type BenchmarkResponse = z.infer<typeof benchmarkResponseSchema>
 export type BenchmarkCase = z.infer<typeof benchmarkCaseSchema>
-export type BenchmarkSummary = z.infer<typeof benchmarkSummarySchema>
 export type CreateBenchmarkBody = z.input<typeof createBenchmarkBodySchema>
 export type UpdateBenchmarkBody = z.input<typeof updateBenchmarkBodySchema>
 export type DeleteBenchmarkBody = z.input<typeof deleteBenchmarkBodySchema>
 export type RunBenchmarkStageBody = z.input<typeof runBenchmarkStageBodySchema>
 export type BenchmarkRun = z.infer<typeof benchmarkRunSchema>
-export type BenchmarkRunSummary = z.infer<typeof benchmarkRunSummarySchema>
-export type BenchmarkRunResponse = z.infer<typeof benchmarkRunResponseSchema>
-export type ListBenchmarkRunsResponse = z.infer<typeof listBenchmarkRunsResponseSchema>
 export type ReviewBenchmarkRunBody = z.input<typeof reviewBenchmarkRunBodySchema>
 
-export const benchmarkSelectionQuerySchema = z.object({
+const benchmarkSelectionQuerySchema = z.object({
   search: z.string().trim().max(200).default(''),
   cursor: z.string().min(1).max(128).optional(),
   selectedId: z.string().min(1).max(128).optional(),
@@ -148,25 +143,25 @@ const selectionOptionSchema = z.object({
   name: z.string().max(1_000),
 })
 const userOptionSchema = selectionOptionSchema.extend({ email: z.string().max(320) })
-export const benchmarkOrganizationsResponseSchema = z.object({
+const benchmarkOrganizationsResponseSchema = z.object({
   organizations: z.array(selectionOptionSchema).max(50),
   selected: selectionOptionSchema.nullable(),
   nextCursor: z.string().max(128).nullable(),
 })
-export const benchmarkUsersResponseSchema = z.object({
+const benchmarkUsersResponseSchema = z.object({
   users: z.array(userOptionSchema).max(50),
   selected: userOptionSchema.nullable(),
   nextCursor: z.string().max(128).nullable(),
 })
-export const benchmarkWorkspacesQuerySchema = benchmarkSelectionQuerySchema
+const benchmarkWorkspacesQuerySchema = benchmarkSelectionQuerySchema
   .omit({ selectedId: true })
   .extend({ runAsUserId: z.string().min(1).max(128) })
-export const benchmarkWorkspacesResponseSchema = z.object({
+const benchmarkWorkspacesResponseSchema = z.object({
   workspaces: z.array(selectionOptionSchema).max(50),
   nextCursor: z.string().max(128).nullable(),
   canPlan: z.boolean(),
 })
-export const benchmarkAvailabilityResponseSchema = z.object({ available: z.boolean() })
+const benchmarkAvailabilityResponseSchema = z.object({ available: z.boolean() })
 export const benchmarkOrganizationsContract = defineRouteContract({
   method: 'GET',
   path: '/api/benchmarks/organizations',
@@ -192,9 +187,3 @@ export const benchmarkAvailabilityContract = defineRouteContract({
   path: '/api/benchmarks/availability',
   response: { mode: 'json', schema: benchmarkAvailabilityResponseSchema },
 })
-export type BenchmarkSelectionQuery = z.input<typeof benchmarkSelectionQuerySchema>
-export type BenchmarkWorkspacesQuery = z.input<typeof benchmarkWorkspacesQuerySchema>
-export type BenchmarkOrganizationsResponse = z.output<typeof benchmarkOrganizationsResponseSchema>
-export type BenchmarkUsersResponse = z.output<typeof benchmarkUsersResponseSchema>
-export type BenchmarkWorkspacesResponse = z.output<typeof benchmarkWorkspacesResponseSchema>
-export type BenchmarkAvailabilityResponse = z.output<typeof benchmarkAvailabilityResponseSchema>