fix(search): align review limits and isolate OAuth token refresh

Author: waleedlatif1

apps/desktop/e2e/source-connect.spec.ts

@@ -94,6 +94,7 @@ test('source authorization returns to its desktop screen and refreshes live', as
       json({
         credentialGroup: null,
         availableProviders: [],
+        assistantProviders: [],
         availableMcpConnectors: [],
         canManage: false,
         indexingAvailable: true,

apps/docs/public/static/search/assistant-action-review.png

@@ -12,7 +12,10 @@ export const GET = defineInternalJsonRoute({
   contract: listAssistantActionsContract,
   auth: internalSessionAuth,
   operation: assistantActionOperations.list,
-  rateLimit: internalRateLimits.user({ bucketName: 'assistant-actions-review' }),
+  rateLimit: internalRateLimits.user({
+    bucketName: 'assistant-actions-review',
+    config: { maxTokens: 120, refillRate: 120, refillIntervalMs: 60_000 },
+  }),
   errorPolicy: internalOrchestrationErrorPolicy,
   mapInput: ({ params, query }) => ({
     organizationId: params.id,

apps/sim/app/api/organizations/[id]/chats/[chatId]/actions/route.ts

@@ -15,6 +15,10 @@ import { Hand } from '@sim/emcn/icons'
 import { getErrorMessage } from '@sim/utils/errors'
 import { omit } from '@sim/utils/object'
 import type { AssistantActionsResponse } from '@/lib/api/contracts/assistant-actions'
+import {
+  ASSISTANT_ACTION_MAX_BYTES,
+  ASSISTANT_REVIEW_FIELD_MAX_CHARS,
+} from '@/lib/assistant-actions/limits'
 import {
   useAssistantActionReview,
   useDecideAssistantAction,
@@ -116,7 +120,8 @@ export function AssistantActionReviewProvider({
         </ChipModalHeader>
         <ChipModalBody>
           <p className='px-2 text-[var(--text-muted)] text-small'>
-            Review each action before it runs. Allow and Cancel apply only to these proposals.
+            Review each action before it runs. Allow and Cancel apply only to these proposals. Each
+            action has a {ASSISTANT_ACTION_MAX_BYTES / 1024} KB total limit across all fields.
           </p>
           {actions.map((action) => (
             <ActionReview
@@ -208,7 +213,7 @@ function ActionReview({ action, edits, disabled, onEdit, onDecide }: ActionRevie
               title={field.label}
               value={edits[field.name] ?? field.value}
               disabled={disabled}
-              maxLength={65_536}
+              maxLength={ASSISTANT_REVIEW_FIELD_MAX_CHARS}
               onChange={(value) => onEdit(field.name, value)}
               rows={field.format === 'multiline' ? 4 : 2}
             />

apps/sim/components/assistant-actions/review.tsx

@@ -19,7 +19,8 @@ const assistantActionKeys = {
 }
 
 const ASSISTANT_PERMISSIONS_STALE_TIME = 10_000
-const ASSISTANT_REVIEW_STALE_TIME = 1_000
+const ASSISTANT_REVIEW_STALE_TIME = 3_000
+const ASSISTANT_REVIEW_POLL_INTERVAL = 3_000
 
 export function useAssistantToolPermissions(organizationId: string, credentialId: string) {
   return useQuery({
@@ -51,7 +52,7 @@ export function useAssistantActionReview(
     enabled: enabled && Boolean(organizationId && chatId),
     staleTime: ASSISTANT_REVIEW_STALE_TIME,
     refetchInterval: (query) =>
-      active || query.state.data?.actions.length ? ASSISTANT_REVIEW_STALE_TIME : false,
+      active || query.state.data?.actions.length ? ASSISTANT_REVIEW_POLL_INTERVAL : false,
   })
 }
 

apps/sim/hooks/queries/assistant-actions.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { organizationIdSchema } from '@/lib/api/contracts/primitives'
 import { defineRouteContract } from '@/lib/api/contracts/types'
+import { ASSISTANT_REVIEW_FIELD_MAX_CHARS } from '@/lib/assistant-actions/limits'
 
 const policySchema = z.enum(['allow', 'ask', 'block'])
 const toolIdSchema = z.string().min(1).max(256)
@@ -113,7 +114,7 @@ export const listAssistantActionsContract = defineRouteContract({
                   target: z.boolean(),
                   editable: z.boolean(),
                   format: z.enum(['text', 'multiline', 'json']),
-                  value: z.string().max(65_536),
+                  value: z.string().max(ASSISTANT_REVIEW_FIELD_MAX_CHARS),
                 })
               )
               .max(256),
@@ -131,7 +132,7 @@ const decisionBodySchema = z
     proposalVersion: z.string().regex(/^[a-f0-9]{64}$/),
     decision: z.enum(['allow', 'skip']),
     edits: z
-      .record(z.string().min(1).max(256), z.string().max(65_536))
+      .record(z.string().min(1).max(256), z.string().max(ASSISTANT_REVIEW_FIELD_MAX_CHARS))
       .refine((value) => Object.keys(value).length <= 32, 'Too many edited fields')
       .optional(),
   })

apps/sim/lib/api/contracts/assistant-actions.ts

@@ -1,4 +1,5 @@
 import type { AssistantActionBinding } from '@sim/db/schema'
+import { ASSISTANT_ACTION_MAX_BYTES } from '@/lib/assistant-actions/limits'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { assertAssistantIntegrationCall } from '@/lib/mothership/assistant/tool-policy'
 import { getToolMetadata } from '@/tools/metadata'
@@ -8,10 +9,10 @@ export function resolveAssistantActionBinding(
   toolId: string,
   args: Record<string, unknown>
 ): AssistantActionBinding {
-  if (Buffer.byteLength(JSON.stringify(args), 'utf8') > 65_536)
+  if (Buffer.byteLength(JSON.stringify(args), 'utf8') > ASSISTANT_ACTION_MAX_BYTES)
     throw new OrchestrationError(
       'payload_too_large',
-      'This action is too large to review. Ask Assistant to split it into smaller actions.'
+      `This action exceeds the ${ASSISTANT_ACTION_MAX_BYTES / 1024} KB total review limit. Shorten the text or ask Assistant to split it into smaller actions.`
     )
   const { credentialId, operation } = assertAssistantIntegrationCall(getToolMetadata(toolId), args)
   return { credentialId, operationVersion: operation.version, effect: operation.effect }

apps/sim/lib/assistant-actions/binding.ts

@@ -0,0 +1,2 @@
+export const ASSISTANT_ACTION_MAX_BYTES = 64 * 1024
+export const ASSISTANT_REVIEW_FIELD_MAX_CHARS = 64 * 1024

apps/sim/lib/assistant-actions/limits.ts

@@ -45,7 +45,11 @@ import {
 import * as providerTransport from '@/lib/core/security/input-validation.server'
 import { credentialGroupScopePolicyVersion } from '@/lib/credential-groups/provider-adapter'
 import { getCredentialGroupProviderAdapter } from '@/lib/credential-groups/provider-registry'
-import { encryptManagedOAuthTokenSet } from '@/lib/credentials/managed-oauth'
+import {
+  decryptManagedOAuthTokenSet,
+  encryptManagedOAuthTokenSet,
+  rejectManagedOAuthToken,
+} from '@/lib/credentials/managed-oauth'
 import {
   claimToolExecution,
   recordToolPermissionDecision,
@@ -1113,7 +1117,7 @@ describe('Assistant Google Docs delivery', () => {
 })
 
 describe('Assistant writes cannot escape their admitted invocation', () => {
-  it.each(['missing', 'changed', 'consumed'] as const)(
+  it.each(['missing', 'workspace', 'unscoped', 'changed', 'consumed'] as const)(
     'refuses %s execution authority before reaching the provider',
     async (attempt) => {
       const provider = vi.spyOn(globalThis, 'fetch').mockImplementation(async () => {
@@ -1130,7 +1134,11 @@ describe('Assistant writes cannot escape their admitted invocation', () => {
       const context = {
         userId: ownerId,
         workflowId: '',
-        organizationId,
+        ...(attempt === 'workspace'
+          ? { workspaceId: generateId() }
+          : attempt === 'unscoped'
+            ? {}
+            : { organizationId }),
         chatId,
         toolCallId,
         requestMode: 'assistant' as const,
@@ -1143,7 +1151,7 @@ describe('Assistant writes cannot escape their admitted invocation', () => {
           { operationContext: context }
         )
       try {
-        if (attempt === 'missing') {
+        if (attempt === 'missing' || attempt === 'workspace' || attempt === 'unscoped') {
           expect(await execute()).toMatchObject({
             success: false,
             error: expect.stringContaining('approved, durable'),
@@ -1317,6 +1325,70 @@ describe('Assistant Jira sprint delivery', () => {
 })
 
 describe('Assistant Salesforce reviewed updates', () => {
+  it('preserves a refreshed grant during rejection without resolving its API destination', async () => {
+    const [saved] = await db
+      .select({
+        encryptedOauthTokenSet: credential.encryptedOauthTokenSet,
+        accessTokenExpiresAt: credential.accessTokenExpiresAt,
+        refreshTokenExpiresAt: credential.refreshTokenExpiresAt,
+        lastRefreshedAt: credential.lastRefreshedAt,
+        managedOauthStatus: credential.managedOauthStatus,
+        updatedAt: credential.updatedAt,
+      })
+      .from(credential)
+      .where(eq(credential.id, salesforceCredentialId))
+    if (!saved?.encryptedOauthTokenSet) throw new Error('Expected a saved Salesforce grant')
+    const policy = await getCredentialGroupProviderAdapter('salesforce').getPolicy(undefined, {})
+    const requests: string[] = []
+    const originalFetch = globalThis.fetch
+    const provider = vi.spyOn(globalThis, 'fetch').mockImplementation(async (input, init) => {
+      const request = new Request(input, init)
+      const url = new URL(request.url)
+      if (url.hostname !== 'login.salesforce.com') return originalFetch(input, init)
+      requests.push(url.pathname)
+      if (url.pathname === '/services/oauth2/token') {
+        expect(request.method).toBe('POST')
+        expect(new URLSearchParams(await request.text()).get('refresh_token')).toBe(
+          'assistant-salesforce-refresh'
+        )
+        return Response.json({
+          access_token: 'refreshed-salesforce-token',
+          refresh_token: 'rotated-salesforce-refresh',
+          expires_in: 3600,
+          token_type: 'Bearer',
+        })
+      }
+      return new Response(null, { status: 503 })
+    })
+    try {
+      await expect(
+        rejectManagedOAuthToken({
+          organizationId,
+          credentialId: salesforceCredentialId,
+          expectedProviderId: 'salesforce',
+          requiredScopes: policy.requiredScopes,
+          rejectedAccessToken: 'assistant-salesforce-token',
+        })
+      ).resolves.toBe(false)
+      expect(requests).toEqual(['/services/oauth2/token'])
+      const [current] = await db
+        .select()
+        .from(credential)
+        .where(eq(credential.id, salesforceCredentialId))
+      if (!current?.encryptedOauthTokenSet) throw new Error('Expected the refreshed grant')
+      expect(current.managedOauthStatus).toBe('active')
+      expect(current.lastRefreshedAt).toBeInstanceOf(Date)
+      expect(current.accessTokenExpiresAt?.getTime()).toBeGreaterThan(Date.now())
+      expect(await decryptManagedOAuthTokenSet(current.encryptedOauthTokenSet)).toMatchObject({
+        accessToken: 'refreshed-salesforce-token',
+        refreshToken: 'rotated-salesforce-refresh',
+      })
+    } finally {
+      provider.mockRestore()
+      await db.update(credential).set(saved).where(eq(credential.id, salesforceCredentialId))
+    }
+  })
+
   it.each(['clear', 'blank_status', 'blank_priority'] as const)(
     'honors reviewed edits with a real-shaped managed grant: %s',
     async (scenario) => {

apps/sim/lib/assistant-actions/tool-permissions.integration.ts

@@ -349,7 +349,7 @@ export async function rejectManagedOAuthToken(input: {
   if (updated.length === 0) return false
   if (!tokenSet.refreshToken) return true
   try {
-    await resolveManagedOAuthToken({
+    await resolveManagedOAuthAccessToken({
       credentialId: input.credentialId,
       workspaceId: input.workspaceId,
       organizationId: input.organizationId,
@@ -374,10 +374,10 @@ export async function rejectManagedOAuthToken(input: {
 }
 
 async function resolveProviderTokenContext(
-  providerId: string | null,
+  providerId: string,
   token: ResolvedManagedOAuthToken
 ): Promise<ResolvedManagedOAuthToken> {
-  if (!providerId || !isSalesforceOAuthProviderId(providerId)) return token
+  if (!isSalesforceOAuthProviderId(providerId)) return token
   const instanceUrl = await fetchSalesforceInstanceUrl(providerId, token.accessToken)
   if (!instanceUrl)
     throw new ManagedOAuthCredentialError(
@@ -391,6 +391,15 @@ async function resolveProviderTokenContext(
 /** Resolves a managed credential ID into a usable token without exposing it to list APIs. */
 export async function resolveManagedOAuthToken(
   params: ResolveManagedOAuthTokenParams
+): Promise<ResolvedManagedOAuthToken> {
+  return resolveProviderTokenContext(
+    params.expectedProviderId,
+    await resolveManagedOAuthAccessToken(params)
+  )
+}
+
+async function resolveManagedOAuthAccessToken(
+  params: ResolveManagedOAuthTokenParams
 ): Promise<ResolvedManagedOAuthToken> {
   const initial = await getManagedCredential(db, params.credentialId, params)
   if (!initial) {
@@ -423,11 +432,11 @@ export async function resolveManagedOAuthToken(
   const initialTokenSet = await decryptManagedOAuthTokenSet(initial.encryptedOauthTokenSet!)
   const now = new Date()
   if (hasFreshAccessToken(initial.accessTokenExpiresAt, now)) {
-    return resolveProviderTokenContext(initial.providerId, {
+    return {
       accessToken: initialTokenSet.accessToken,
       ...(initialTokenSet.idToken ? { idToken: initialTokenSet.idToken } : {}),
       refreshed: false,
-    })
+    }
   }
 
   const refreshOutcome = await db.transaction(async (tx) => {
@@ -549,8 +558,7 @@ export async function resolveManagedOAuthToken(
   })
 
   if ('error' in refreshOutcome && refreshOutcome.error) throw refreshOutcome.error
-  if ('token' in refreshOutcome && refreshOutcome.token)
-    return resolveProviderTokenContext(initial.providerId, refreshOutcome.token)
+  if ('token' in refreshOutcome && refreshOutcome.token) return refreshOutcome.token
   throw new ManagedOAuthCredentialError(
     'MANAGED_CREDENTIAL_REFRESH_FAILED',
     'Managed credential refresh returned no token',