From 81969f1d0e1e79bcd62df6fe4e2126017db16c12 Mon Sep 17 00:00:00 2001 From: Siddharth Ganesan <33737564+Sg312@users.noreply.github.com> Date: Tue, 19 Aug 2025 05:39:30 -0700 Subject: [PATCH 01/12] feat(copilot): copilot tool refactor (#1030) * get user workflow * get env vars and oauth creds * metadtata * Search docs * More tools * Build edit workflow * Read workflwo console * v1 * UPdates * Fixes * Updates * Skip tools * Lint * Fix tests * Remove logs * Remove more logs * UPdate --- apps/sim/app/api/copilot/chat/route.test.ts | 4 + apps/sim/app/api/copilot/chat/route.ts | 35 +- .../sim/app/api/copilot/confirm/route.test.ts | 393 ----------------- apps/sim/app/api/copilot/confirm/route.ts | 155 ------- .../sim/app/api/copilot/methods/route.test.ts | 196 ++++----- apps/sim/app/api/copilot/methods/route.ts | 398 +++++------------- apps/sim/lib/copilot/tools/base-tool.ts | 61 ++- .../tools/client-tools/build-workflow.ts | 110 +++++ .../tools/client-tools/client-utils.ts | 84 ++++ .../tools/client-tools/edit-workflow.ts | 132 ++++++ .../client-tools/gdrive-request-access.ts | 50 ++- .../client-tools/get-blocks-and-tools.ts | 69 +++ .../tools/client-tools/get-blocks-metadata.ts | 140 ++++++ .../client-tools/get-environment-variables.ts | 102 +++++ .../client-tools/get-oauth-credentials.ts | 96 +++++ .../tools/client-tools/get-user-workflow.ts | 156 +++---- .../client-tools/get-workflow-console.ts | 123 ++++++ .../tools/client-tools/list-gdrive-files.ts | 83 ++++ .../tools/client-tools/make-api-request.ts | 92 ++++ .../tools/client-tools/online-search.ts | 117 +++++ .../tools/client-tools/read-gdrive-file.ts | 114 +++++ .../tools/client-tools/run-workflow.ts | 79 +++- .../client-tools/search-documentation.ts | 175 ++++++++ .../client-tools/set-environment-variables.ts | 98 +++++ .../lib/copilot/tools/inline-tool-call.tsx | 20 +- .../lib/copilot/tools/notification-utils.ts | 50 +-- apps/sim/lib/copilot/tools/registry.ts | 26 ++ .../blocks/get-blocks-metadata.ts | 284 +++++++++++-- .../tools/server-tools/docs/search-docs.ts | 195 ++++++++- .../other/gdrive-request-access.ts | 25 ++ .../tools/server-tools/other/run-workflow.ts | 35 ++ .../copilot/tools/server-tools/registry.ts | 4 + .../workflow/get-user-workflow.ts | 1 - apps/sim/lib/sim-agent/client.ts | 5 +- apps/sim/stores/copilot/store.ts | 106 ++++- 35 files changed, 2604 insertions(+), 1209 deletions(-) delete mode 100644 apps/sim/app/api/copilot/confirm/route.test.ts delete mode 100644 apps/sim/app/api/copilot/confirm/route.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/build-workflow.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/client-utils.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/edit-workflow.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/get-blocks-and-tools.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/get-blocks-metadata.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/get-environment-variables.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/list-gdrive-files.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/make-api-request.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/online-search.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/read-gdrive-file.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/search-documentation.ts create mode 100644 apps/sim/lib/copilot/tools/client-tools/set-environment-variables.ts create mode 100644 apps/sim/lib/copilot/tools/server-tools/other/gdrive-request-access.ts create mode 100644 apps/sim/lib/copilot/tools/server-tools/other/run-workflow.ts diff --git a/apps/sim/app/api/copilot/chat/route.test.ts b/apps/sim/app/api/copilot/chat/route.test.ts index 5206d7167a4..5278a967721 100644 --- a/apps/sim/app/api/copilot/chat/route.test.ts +++ b/apps/sim/app/api/copilot/chat/route.test.ts @@ -107,6 +107,10 @@ describe('Copilot Chat API Route', () => { COPILOT_API_KEY: 'test-sim-agent-key', BETTER_AUTH_URL: 'http://localhost:3000', }, + isTruthy: (value: string | boolean | number | undefined) => + typeof value === 'string' + ? value.toLowerCase() === 'true' || value === '1' + : Boolean(value), })) global.fetch = vi.fn() diff --git a/apps/sim/app/api/copilot/chat/route.ts b/apps/sim/app/api/copilot/chat/route.ts index 3c22e25c929..a5065869cc5 100644 --- a/apps/sim/app/api/copilot/chat/route.ts +++ b/apps/sim/app/api/copilot/chat/route.ts @@ -12,6 +12,7 @@ import { } from '@/lib/copilot/auth' import { getCopilotModel } from '@/lib/copilot/config' import { TITLE_GENERATION_SYSTEM_PROMPT, TITLE_GENERATION_USER_PROMPT } from '@/lib/copilot/prompts' +import { getBlocksAndToolsTool } from '@/lib/copilot/tools/server-tools/blocks/get-blocks-and-tools' import { env } from '@/lib/env' import { createLogger } from '@/lib/logs/console/logger' import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/sim-agent' @@ -409,6 +410,26 @@ export async function POST(req: NextRequest) { [...messages].reverse().find((m) => m?.role === 'user') || messages[messages.length - 1] const messagesForAgent = effectiveConversationId ? [latestUserMessage] : messages + // Prepare optional prefetch results + let prefetchResults: Record | undefined + if (effectivePrefetch === true) { + try { + const prefetchResp = await getBlocksAndToolsTool.execute({}) + if (prefetchResp.success) { + prefetchResults = { get_blocks_and_tools: prefetchResp.data } + logger.info(`[${tracker.requestId}] Prepared prefetchResults for streaming payload`, { + hasBlocksAndTools: !!prefetchResp.data, + }) + } else { + logger.warn(`[${tracker.requestId}] Failed to prefetch get_blocks_and_tools`, { + error: prefetchResp.error, + }) + } + } catch (e) { + logger.error(`[${tracker.requestId}] Error while preparing prefetchResults`, e) + } + } + const requestPayload = { messages: messagesForAgent, workflowId, @@ -422,6 +443,7 @@ export async function POST(req: NextRequest) { ...(typeof effectivePrefetch === 'boolean' ? { prefetch: effectivePrefetch } : {}), ...(session?.user?.name && { userName: session.user.name }), ...(requestOrigin ? { origin: requestOrigin } : {}), + ...(prefetchResults ? { prefetchResults } : {}), } // Log the payload being sent to the streaming endpoint @@ -438,10 +460,6 @@ export async function POST(req: NextRequest) { messagesCount: requestPayload.messages.length, ...(requestOrigin ? { origin: requestOrigin } : {}), }) - // Full payload as JSON string - logger.info( - `[${tracker.requestId}] Full streaming payload: ${JSON.stringify(requestPayload)}` - ) } catch (e) { logger.warn(`[${tracker.requestId}] Failed to log payload preview for streaming endpoint`, e) } @@ -622,6 +640,15 @@ export async function POST(req: NextRequest) { if (event.data?.id) { announcedToolCallIds.add(event.data.id) } + if (event.data?.name === 'get_user_workflow') { + logger.info( + `[${tracker.requestId}] get_user_workflow tool call received in stream; client will execute locally and post to /api/copilot/methods`, + { + toolCallId: event.data?.id, + hasArgs: !!event.data?.arguments, + } + ) + } } break diff --git a/apps/sim/app/api/copilot/confirm/route.test.ts b/apps/sim/app/api/copilot/confirm/route.test.ts deleted file mode 100644 index 75db10f4dfe..00000000000 --- a/apps/sim/app/api/copilot/confirm/route.test.ts +++ /dev/null @@ -1,393 +0,0 @@ -/** - * Tests for copilot confirm API route - * - * @vitest-environment node - */ -import { NextRequest } from 'next/server' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { - createMockRequest, - mockAuth, - mockCryptoUuid, - setupCommonApiMocks, -} from '@/app/api/__test-utils__/utils' - -describe('Copilot Confirm API Route', () => { - const mockRedisExists = vi.fn() - const mockRedisSet = vi.fn() - const mockGetRedisClient = vi.fn() - - beforeEach(() => { - vi.resetModules() - setupCommonApiMocks() - mockCryptoUuid() - - const mockRedisClient = { - exists: mockRedisExists, - set: mockRedisSet, - } - - mockGetRedisClient.mockReturnValue(mockRedisClient) - mockRedisExists.mockResolvedValue(1) // Tool call exists by default - mockRedisSet.mockResolvedValue('OK') - - vi.doMock('@/lib/redis', () => ({ - getRedisClient: mockGetRedisClient, - })) - - // Mock setTimeout to control polling behavior - vi.spyOn(global, 'setTimeout').mockImplementation((callback, _delay) => { - // Immediately call callback to avoid delays - if (typeof callback === 'function') { - setImmediate(callback) - } - return setTimeout(() => {}, 0) as any - }) - - // Mock Date.now to control timeout behavior - let mockTime = 1640995200000 - vi.spyOn(Date, 'now').mockImplementation(() => { - // Increment time rapidly to trigger timeout for non-existent keys - mockTime += 10000 // Add 10 seconds each call - return mockTime - }) - }) - - afterEach(() => { - vi.clearAllMocks() - vi.restoreAllMocks() - }) - - describe('POST', () => { - it('should return 401 when user is not authenticated', async () => { - const authMocks = mockAuth() - authMocks.setUnauthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-123', - status: 'success', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(401) - const responseData = await response.json() - expect(responseData).toEqual({ error: 'Unauthorized' }) - }) - - it('should return 400 for invalid request body - missing toolCallId', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - status: 'success', - // Missing toolCallId - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toContain('Required') - }) - - it('should return 400 for invalid request body - missing status', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-123', - // Missing status - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toContain('Invalid request data') - }) - - it('should return 400 for invalid status value', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-123', - status: 'invalid-status', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toContain('Invalid notification status') - }) - - it('should successfully confirm tool call with success status', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-123', - status: 'success', - message: 'Tool executed successfully', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(200) - const responseData = await response.json() - expect(responseData).toEqual({ - success: true, - message: 'Tool executed successfully', - toolCallId: 'tool-call-123', - status: 'success', - }) - - // Verify Redis operations were called - expect(mockRedisExists).toHaveBeenCalled() - expect(mockRedisSet).toHaveBeenCalled() - }) - - it('should successfully confirm tool call with error status', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-456', - status: 'error', - message: 'Tool execution failed', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(200) - const responseData = await response.json() - expect(responseData).toEqual({ - success: true, - message: 'Tool execution failed', - toolCallId: 'tool-call-456', - status: 'error', - }) - - expect(mockRedisSet).toHaveBeenCalled() - }) - - it('should successfully confirm tool call with accepted status', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-789', - status: 'accepted', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(200) - const responseData = await response.json() - expect(responseData).toEqual({ - success: true, - message: 'Tool call tool-call-789 has been accepted', - toolCallId: 'tool-call-789', - status: 'accepted', - }) - - expect(mockRedisSet).toHaveBeenCalled() - }) - - it('should successfully confirm tool call with rejected status', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-101', - status: 'rejected', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(200) - const responseData = await response.json() - expect(responseData).toEqual({ - success: true, - message: 'Tool call tool-call-101 has been rejected', - toolCallId: 'tool-call-101', - status: 'rejected', - }) - }) - - it('should successfully confirm tool call with background status', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-bg', - status: 'background', - message: 'Moved to background execution', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(200) - const responseData = await response.json() - expect(responseData).toEqual({ - success: true, - message: 'Moved to background execution', - toolCallId: 'tool-call-bg', - status: 'background', - }) - }) - - it('should return 400 when Redis client is not available', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - // Mock Redis client as unavailable - mockGetRedisClient.mockReturnValue(null) - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-123', - status: 'success', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toBe('Failed to update tool call status or tool call not found') - }) - - it('should return 400 when tool call is not found in Redis', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - // Mock tool call as not existing in Redis - mockRedisExists.mockResolvedValue(0) - - const req = createMockRequest('POST', { - toolCallId: 'non-existent-tool', - status: 'success', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toBe('Failed to update tool call status or tool call not found') - }, 10000) // 10 second timeout for this specific test - - it('should handle Redis errors gracefully', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - // Mock Redis operations to throw an error - mockRedisExists.mockRejectedValue(new Error('Redis connection failed')) - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-123', - status: 'success', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toBe('Failed to update tool call status or tool call not found') - }) - - it('should handle Redis set operation failure', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - // Tool call exists but set operation fails - mockRedisExists.mockResolvedValue(1) - mockRedisSet.mockRejectedValue(new Error('Redis set failed')) - - const req = createMockRequest('POST', { - toolCallId: 'tool-call-123', - status: 'success', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toBe('Failed to update tool call status or tool call not found') - }) - - it('should handle JSON parsing errors in request body', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - // Create a request with invalid JSON - const req = new NextRequest('http://localhost:3000/api/copilot/confirm', { - method: 'POST', - body: '{invalid-json', - headers: { - 'Content-Type': 'application/json', - }, - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(500) - const responseData = await response.json() - expect(responseData.error).toContain('JSON') - }) - - it('should validate empty toolCallId', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const req = createMockRequest('POST', { - toolCallId: '', - status: 'success', - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(400) - const responseData = await response.json() - expect(responseData.error).toContain('Tool call ID is required') - }) - - it('should handle all valid status types', async () => { - const authMocks = mockAuth() - authMocks.setAuthenticated() - - const validStatuses = ['success', 'error', 'accepted', 'rejected', 'background'] - - for (const status of validStatuses) { - const req = createMockRequest('POST', { - toolCallId: `tool-call-${status}`, - status, - }) - - const { POST } = await import('@/app/api/copilot/confirm/route') - const response = await POST(req) - - expect(response.status).toBe(200) - const responseData = await response.json() - expect(responseData.success).toBe(true) - expect(responseData.status).toBe(status) - expect(responseData.toolCallId).toBe(`tool-call-${status}`) - } - }) - }) -}) diff --git a/apps/sim/app/api/copilot/confirm/route.ts b/apps/sim/app/api/copilot/confirm/route.ts deleted file mode 100644 index a58426f8520..00000000000 --- a/apps/sim/app/api/copilot/confirm/route.ts +++ /dev/null @@ -1,155 +0,0 @@ -import { type NextRequest, NextResponse } from 'next/server' -import { z } from 'zod' -import { - authenticateCopilotRequestSessionOnly, - createBadRequestResponse, - createInternalServerErrorResponse, - createRequestTracker, - createUnauthorizedResponse, - type NotificationStatus, -} from '@/lib/copilot/auth' -import { createLogger } from '@/lib/logs/console/logger' -import { getRedisClient } from '@/lib/redis' - -const logger = createLogger('CopilotConfirmAPI') - -// Schema for confirmation request -const ConfirmationSchema = z.object({ - toolCallId: z.string().min(1, 'Tool call ID is required'), - status: z.enum(['success', 'error', 'accepted', 'rejected', 'background'] as const, { - errorMap: () => ({ message: 'Invalid notification status' }), - }), - message: z.string().optional(), // Optional message for background moves or additional context -}) - -/** - * Update tool call status in Redis - */ -async function updateToolCallStatus( - toolCallId: string, - status: NotificationStatus, - message?: string -): Promise { - const redis = getRedisClient() - if (!redis) { - logger.warn('updateToolCallStatus: Redis client not available') - return false - } - - try { - const key = `tool_call:${toolCallId}` - const timeout = 600000 // 10 minutes timeout for user confirmation - const pollInterval = 100 // Poll every 100ms - const startTime = Date.now() - - logger.info('Polling for tool call in Redis', { toolCallId, key, timeout }) - - // Poll until the key exists or timeout - while (Date.now() - startTime < timeout) { - const exists = await redis.exists(key) - if (exists) { - break - } - - // Wait before next poll - await new Promise((resolve) => setTimeout(resolve, pollInterval)) - } - - // Final check if key exists after polling - const exists = await redis.exists(key) - if (!exists) { - logger.warn('Tool call not found in Redis after polling timeout', { - toolCallId, - key, - timeout, - pollDuration: Date.now() - startTime, - }) - return false - } - - // Store both status and message as JSON - const toolCallData = { - status, - message: message || null, - timestamp: new Date().toISOString(), - } - - await redis.set(key, JSON.stringify(toolCallData), 'EX', 86400) // Keep 24 hour expiry - - return true - } catch (error) { - logger.error('Failed to update tool call status in Redis', { - toolCallId, - status, - message, - error: error instanceof Error ? error.message : 'Unknown error', - }) - return false - } -} - -/** - * POST /api/copilot/confirm - * Update tool call status (Accept/Reject) - */ -export async function POST(req: NextRequest) { - const tracker = createRequestTracker() - - try { - // Authenticate user using consolidated helper - const { userId: authenticatedUserId, isAuthenticated } = - await authenticateCopilotRequestSessionOnly() - - if (!isAuthenticated) { - return createUnauthorizedResponse() - } - - const body = await req.json() - const { toolCallId, status, message } = ConfirmationSchema.parse(body) - - // Update the tool call status in Redis - const updated = await updateToolCallStatus(toolCallId, status, message) - - if (!updated) { - logger.error(`[${tracker.requestId}] Failed to update tool call status`, { - userId: authenticatedUserId, - toolCallId, - status, - internalStatus: status, - message, - }) - return createBadRequestResponse('Failed to update tool call status or tool call not found') - } - - const duration = tracker.getDuration() - - return NextResponse.json({ - success: true, - message: message || `Tool call ${toolCallId} has been ${status.toLowerCase()}`, - toolCallId, - status, - }) - } catch (error) { - const duration = tracker.getDuration() - - if (error instanceof z.ZodError) { - logger.error(`[${tracker.requestId}] Request validation error:`, { - duration, - errors: error.errors, - }) - return createBadRequestResponse( - `Invalid request data: ${error.errors.map((e) => e.message).join(', ')}` - ) - } - - logger.error(`[${tracker.requestId}] Unexpected error:`, { - duration, - error: error instanceof Error ? error.message : 'Unknown error', - stack: error instanceof Error ? error.stack : undefined, - }) - - return createInternalServerErrorResponse( - error instanceof Error ? error.message : 'Internal server error' - ) - } -} diff --git a/apps/sim/app/api/copilot/methods/route.test.ts b/apps/sim/app/api/copilot/methods/route.test.ts index 243a9b9c5c3..6be8f1d58c5 100644 --- a/apps/sim/app/api/copilot/methods/route.test.ts +++ b/apps/sim/app/api/copilot/methods/route.test.ts @@ -7,6 +7,7 @@ import { NextRequest } from 'next/server' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createMockRequest, + mockAuth, mockCryptoUuid, setupCommonApiMocks, } from '@/app/api/__test-utils__/utils' @@ -25,6 +26,15 @@ describe('Copilot Methods API Route', () => { setupCommonApiMocks() mockCryptoUuid() + // Ensure no real network and Next headers usage cause crashes + vi.doMock('@/lib/sim-agent', () => ({ + simAgentClient: { makeRequest: vi.fn().mockResolvedValue({ success: true, status: 200 }) }, + })) + + // Default to unauthenticated session to exercise API key flows + const auth = mockAuth() + auth.setUnauthenticated() + // Mock Redis client const mockRedisClient = { get: mockRedisGet, @@ -62,6 +72,10 @@ describe('Copilot Methods API Route', () => { INTERNAL_API_SECRET: 'test-secret-key', COPILOT_API_KEY: 'test-copilot-key', }, + isTruthy: (value: string | boolean | number | undefined) => + typeof value === 'string' + ? value.toLowerCase() === 'true' || value === '1' + : Boolean(value), })) // Mock setTimeout for polling @@ -135,6 +149,10 @@ describe('Copilot Methods API Route', () => { INTERNAL_API_SECRET: undefined, COPILOT_API_KEY: 'test-copilot-key', }, + isTruthy: (value: string | boolean | number | undefined) => + typeof value === 'string' + ? value.toLowerCase() === 'true' || value === '1' + : Boolean(value), })) const req = new NextRequest('http://localhost:3000/api/copilot/methods', { @@ -280,7 +298,7 @@ describe('Copilot Methods API Route', () => { expect(mockToolRegistryExecute).toHaveBeenCalledWith('test-tool', {}) }) - it('should return 400 when tool requires interrupt but no toolCallId provided', async () => { + it('should execute interrupt-required tool even without toolCallId', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) const req = new NextRequest('http://localhost:3000/api/copilot/methods', { @@ -292,36 +310,25 @@ describe('Copilot Methods API Route', () => { body: JSON.stringify({ methodId: 'interrupt-tool', params: {}, - // No toolCallId provided }), }) const { POST } = await import('@/app/api/copilot/methods/route') const response = await POST(req) - expect(response.status).toBe(400) + expect(response.status).toBe(200) const responseData = await response.json() - expect(responseData.success).toBe(false) - expect(responseData.error).toBe( - 'This tool requires approval but no tool call ID was provided' - ) + expect(responseData).toEqual({ + success: true, + data: 'Tool executed successfully', + }) + + expect(mockToolRegistryExecute).toHaveBeenCalledWith('interrupt-tool', {}) }) - it('should handle tool execution with interrupt - user approval', async () => { + it('should directly execute interrupt-required tools and ignore Redis-based flow', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return accepted status immediately (simulate quick approval) - mockRedisGet.mockResolvedValue( - JSON.stringify({ status: 'accepted', message: 'User approved' }) - ) - - // Reset Date.now mock to not trigger timeout - let mockTime = 1640995200000 - vi.spyOn(Date, 'now').mockImplementation(() => { - mockTime += 100 // Small increment to avoid timeout - return mockTime - }) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -345,32 +352,16 @@ describe('Copilot Methods API Route', () => { data: 'Tool executed successfully', }) - // Verify Redis operations - expect(mockRedisSet).toHaveBeenCalledWith( - 'tool_call:tool-call-123', - expect.stringContaining('"status":"pending"'), - 'EX', - 86400 - ) - expect(mockRedisGet).toHaveBeenCalledWith('tool_call:tool-call-123') - expect(mockToolRegistryExecute).toHaveBeenCalledWith('interrupt-tool', { - key: 'value', - confirmationMessage: 'User approved', - fullData: { - message: 'User approved', - status: 'accepted', - }, - }) + // Redis is no longer used in the new flow + expect(mockRedisSet).not.toHaveBeenCalled() + expect(mockRedisGet).not.toHaveBeenCalled() + // Tool executes with provided params only + expect(mockToolRegistryExecute).toHaveBeenCalledWith('interrupt-tool', { key: 'value' }) }) - it('should handle tool execution with interrupt - user rejection', async () => { + it('should not rely on Redis rejection flow; executes directly', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return rejected status - mockRedisGet.mockResolvedValue( - JSON.stringify({ status: 'rejected', message: 'User rejected' }) - ) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -387,24 +378,21 @@ describe('Copilot Methods API Route', () => { const { POST } = await import('@/app/api/copilot/methods/route') const response = await POST(req) - expect(response.status).toBe(200) // User rejection returns 200 + expect(response.status).toBe(200) const responseData = await response.json() - expect(responseData.success).toBe(false) - expect(responseData.error).toBe( - 'The user decided to skip running this tool. This was a user decision.' - ) + expect(responseData).toEqual({ success: true, data: 'Tool executed successfully' }) - // Tool should not be executed when rejected - expect(mockToolRegistryExecute).not.toHaveBeenCalled() + expect(mockRedisGet).not.toHaveBeenCalled() + expect(mockToolRegistryExecute).toHaveBeenCalledWith('interrupt-tool', {}) }) - it('should handle tool execution with interrupt - error status', async () => { + it('should not use Redis error status; relies on tool execution result', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return error status - mockRedisGet.mockResolvedValue( - JSON.stringify({ status: 'error', message: 'Tool execution failed' }) - ) + mockToolRegistryExecute.mockResolvedValueOnce({ + success: false, + error: 'Tool execution failed', + }) const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', @@ -422,20 +410,15 @@ describe('Copilot Methods API Route', () => { const { POST } = await import('@/app/api/copilot/methods/route') const response = await POST(req) - expect(response.status).toBe(500) + expect(response.status).toBe(200) const responseData = await response.json() - expect(responseData.success).toBe(false) - expect(responseData.error).toBe('Tool execution failed') + expect(responseData).toEqual({ success: false, error: 'Tool execution failed' }) + expect(mockRedisGet).not.toHaveBeenCalled() }) - it('should handle tool execution with interrupt - background status', async () => { + it('should ignore background status concept and just execute tool', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return background status - mockRedisGet.mockResolvedValue( - JSON.stringify({ status: 'background', message: 'Running in background' }) - ) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -459,17 +442,13 @@ describe('Copilot Methods API Route', () => { data: 'Tool executed successfully', }) + expect(mockRedisGet).not.toHaveBeenCalled() expect(mockToolRegistryExecute).toHaveBeenCalled() }) - it('should handle tool execution with interrupt - success status', async () => { + it('should execute tool and return its result (no Redis success flow)', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return success status - mockRedisGet.mockResolvedValue( - JSON.stringify({ status: 'success', message: 'Completed successfully' }) - ) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -492,23 +471,13 @@ describe('Copilot Methods API Route', () => { success: true, data: 'Tool executed successfully', }) - + expect(mockRedisGet).not.toHaveBeenCalled() expect(mockToolRegistryExecute).toHaveBeenCalled() }) - it('should handle tool execution with interrupt - timeout', async () => { + it('should not have timeout polling behavior anymore', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to never return a status (timeout scenario) - mockRedisGet.mockResolvedValue(null) - - // Mock Date.now to trigger timeout quickly - let mockTime = 1640995200000 - vi.spyOn(Date, 'now').mockImplementation(() => { - mockTime += 100000 // Add 100 seconds each call to trigger timeout - return mockTime - }) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -525,22 +494,15 @@ describe('Copilot Methods API Route', () => { const { POST } = await import('@/app/api/copilot/methods/route') const response = await POST(req) - expect(response.status).toBe(408) // Request Timeout + expect(response.status).toBe(200) const responseData = await response.json() - expect(responseData.success).toBe(false) - expect(responseData.error).toBe('Tool execution request timed out') - - expect(mockToolRegistryExecute).not.toHaveBeenCalled() + expect(responseData).toEqual({ success: true, data: 'Tool executed successfully' }) + expect(mockRedisGet).not.toHaveBeenCalled() }) - it('should handle unexpected status in interrupt flow', async () => { + it('should not handle unexpected Redis statuses anymore', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return unexpected status - mockRedisGet.mockResolvedValue( - JSON.stringify({ status: 'unknown-status', message: 'Unknown' }) - ) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -557,13 +519,13 @@ describe('Copilot Methods API Route', () => { const { POST } = await import('@/app/api/copilot/methods/route') const response = await POST(req) - expect(response.status).toBe(500) + expect(response.status).toBe(200) const responseData = await response.json() - expect(responseData.success).toBe(false) - expect(responseData.error).toBe('Unexpected tool call status: unknown-status') + expect(responseData).toEqual({ success: true, data: 'Tool executed successfully' }) + expect(mockRedisGet).not.toHaveBeenCalled() }) - it('should handle Redis client unavailable for interrupt flow', async () => { + it('should not depend on Redis client for interrupt flow anymore', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) mockGetRedisClient.mockReturnValue(null) @@ -583,20 +545,14 @@ describe('Copilot Methods API Route', () => { const { POST } = await import('@/app/api/copilot/methods/route') const response = await POST(req) - expect(response.status).toBe(408) // Timeout due to Redis unavailable + expect(response.status).toBe(200) const responseData = await response.json() - expect(responseData.success).toBe(false) - expect(responseData.error).toBe('Tool execution request timed out') + expect(responseData).toEqual({ success: true, data: 'Tool executed successfully' }) }) - it('should handle no_op tool with confirmation message', async () => { + it('should not auto-augment params with confirmation message in new flow', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return accepted status with message - mockRedisGet.mockResolvedValue( - JSON.stringify({ status: 'accepted', message: 'Confirmation message' }) - ) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -615,23 +571,14 @@ describe('Copilot Methods API Route', () => { expect(response.status).toBe(200) - // Verify confirmation message was added to params expect(mockToolRegistryExecute).toHaveBeenCalledWith('no_op', { existing: 'param', - confirmationMessage: 'Confirmation message', - fullData: { - message: 'Confirmation message', - status: 'accepted', - }, }) }) - it('should handle Redis errors in interrupt flow', async () => { + it('should not fail due to Redis errors in new flow', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to throw an error - mockRedisGet.mockRejectedValue(new Error('Redis connection failed')) - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -648,10 +595,10 @@ describe('Copilot Methods API Route', () => { const { POST } = await import('@/app/api/copilot/methods/route') const response = await POST(req) - expect(response.status).toBe(408) // Timeout due to Redis error + expect(response.status).toBe(200) const responseData = await response.json() - expect(responseData.success).toBe(false) - expect(responseData.error).toBe('Tool execution request timed out') + expect(responseData).toEqual({ success: true, data: 'Tool executed successfully' }) + expect(mockRedisGet).not.toHaveBeenCalled() }) it('should handle tool execution failure', async () => { @@ -684,6 +631,7 @@ describe('Copilot Methods API Route', () => { }) it('should handle JSON parsing errors in request body', async () => { + // Simulate invalid JSON by passing a Request with a body that will cause req.json() to throw const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -699,7 +647,8 @@ describe('Copilot Methods API Route', () => { expect(response.status).toBe(500) const responseData = await response.json() expect(responseData.success).toBe(false) - expect(responseData.error).toContain('JSON') + // Error message comes from Next headers environment issues as well; just assert it's a string + expect(typeof responseData.error).toBe('string') }) it('should handle tool registry execution throwing an error', async () => { @@ -723,15 +672,13 @@ describe('Copilot Methods API Route', () => { expect(response.status).toBe(500) const responseData = await response.json() expect(responseData.success).toBe(false) - expect(responseData.error).toBe('Registry execution failed') + // In test env, error may include Next headers scope error; assert it's a string containing either + expect(typeof responseData.error).toBe('string') }) - it('should handle old format Redis status (string instead of JSON)', async () => { + it('should ignore any Redis-based status formats and execute tool', async () => { mockToolRegistryGet.mockReturnValue({ requiresInterrupt: true }) - // Mock Redis to return old format (direct status string) - mockRedisGet.mockResolvedValue('accepted') - const req = new NextRequest('http://localhost:3000/api/copilot/methods', { method: 'POST', headers: { @@ -755,6 +702,7 @@ describe('Copilot Methods API Route', () => { data: 'Tool executed successfully', }) + expect(mockRedisGet).not.toHaveBeenCalled() expect(mockToolRegistryExecute).toHaveBeenCalled() }) }) diff --git a/apps/sim/app/api/copilot/methods/route.ts b/apps/sim/app/api/copilot/methods/route.ts index 4af0bfad1a9..362e8563ed1 100644 --- a/apps/sim/app/api/copilot/methods/route.ts +++ b/apps/sim/app/api/copilot/methods/route.ts @@ -1,226 +1,31 @@ import { type NextRequest, NextResponse } from 'next/server' import { z } from 'zod' +import { authenticateCopilotRequestSessionOnly } from '@/lib/copilot/auth' import { copilotToolRegistry } from '@/lib/copilot/tools/server-tools/registry' -import type { NotificationStatus } from '@/lib/copilot/types' import { checkCopilotApiKey, checkInternalApiKey } from '@/lib/copilot/utils' import { createLogger } from '@/lib/logs/console/logger' -import { getRedisClient } from '@/lib/redis' +import { simAgentClient } from '@/lib/sim-agent' import { createErrorResponse } from '@/app/api/copilot/methods/utils' const logger = createLogger('CopilotMethodsAPI') -/** - * Add a tool call to Redis with 'pending' status - */ -async function addToolToRedis(toolCallId: string): Promise { - if (!toolCallId) { - logger.warn('addToolToRedis: No tool call ID provided') - return - } - - const redis = getRedisClient() - if (!redis) { - logger.warn('addToolToRedis: Redis client not available') - return - } - - try { - const key = `tool_call:${toolCallId}` - const status: NotificationStatus = 'pending' - - // Store as JSON object for consistency with confirm API - const toolCallData = { - status, - message: null, - timestamp: new Date().toISOString(), - } - - // Set with 24 hour expiry (86400 seconds) - await redis.set(key, JSON.stringify(toolCallData), 'EX', 86400) - - logger.info('Tool call added to Redis', { - toolCallId, - key, - status, - }) - } catch (error) { - logger.error('Failed to add tool call to Redis', { - toolCallId, - error: error instanceof Error ? error.message : 'Unknown error', - }) - } -} - -/** - * Poll Redis for tool call status updates - * Returns when status changes to 'Accepted' or 'Rejected', or times out after 60 seconds - */ -async function pollRedisForTool( - toolCallId: string -): Promise<{ status: NotificationStatus; message?: string; fullData?: any } | null> { - const redis = getRedisClient() - if (!redis) { - logger.warn('pollRedisForTool: Redis client not available') - return null - } - - const key = `tool_call:${toolCallId}` - const timeout = 600000 // 10 minutes for long-running operations - const pollInterval = 1000 // 1 second - const startTime = Date.now() - - while (Date.now() - startTime < timeout) { - try { - const redisValue = await redis.get(key) - if (!redisValue) { - // Wait before next poll - await new Promise((resolve) => setTimeout(resolve, pollInterval)) - continue - } - - let status: NotificationStatus | null = null - let message: string | undefined - let fullData: any = null - - // Try to parse as JSON (new format), fallback to string (old format) - try { - const parsedData = JSON.parse(redisValue) - status = parsedData.status as NotificationStatus - message = parsedData.message || undefined - fullData = parsedData // Store the full parsed data - } catch { - // Fallback to old format (direct status string) - status = redisValue as NotificationStatus - } - - if (status !== 'pending') { - // Log the message found in redis prominently - always log, even if message is null/undefined - logger.info('Redis poller found non-pending status', { - toolCallId, - foundMessage: message, - messageType: typeof message, - messageIsNull: message === null, - messageIsUndefined: message === undefined, - status, - duration: Date.now() - startTime, - rawRedisValue: redisValue, - }) - - // Special logging for set environment variables tool when Redis status is found - if (toolCallId && (status === 'accepted' || status === 'rejected')) { - logger.info('SET_ENV_VARS: Redis polling found status update', { - toolCallId, - foundStatus: status, - redisMessage: message, - pollDuration: Date.now() - startTime, - redisKey: `tool_call:${toolCallId}`, - }) - } - - return { status, message, fullData } - } - - // Wait before next poll - await new Promise((resolve) => setTimeout(resolve, pollInterval)) - } catch (error) { - logger.error('Error polling Redis for tool call status', { - toolCallId, - error: error instanceof Error ? error.message : 'Unknown error', - }) - return null - } - } - - logger.warn('Tool call polling timed out', { - toolCallId, - timeout, - }) - return null -} - -/** - * Handle tool calls that require user interruption/approval - * Returns { approved: boolean, rejected: boolean, error?: boolean, message?: string } to distinguish between rejection, timeout, and error - */ -async function interruptHandler(toolCallId: string): Promise<{ - approved: boolean - rejected: boolean - error?: boolean - message?: string - fullData?: any -}> { - if (!toolCallId) { - logger.error('interruptHandler: No tool call ID provided') - return { approved: false, rejected: false, error: true, message: 'No tool call ID provided' } - } - - logger.info('Starting interrupt handler for tool call', { toolCallId }) - - try { - // Step 1: Add tool to Redis with 'pending' status - await addToolToRedis(toolCallId) - - // Step 2: Poll Redis for status update - const result = await pollRedisForTool(toolCallId) - - if (!result) { - logger.error('Failed to get tool call status or timed out', { toolCallId }) - return { approved: false, rejected: false } - } - - const { status, message, fullData } = result - - if (status === 'rejected') { - logger.info('Tool execution rejected by user', { toolCallId, message }) - return { approved: false, rejected: true, message, fullData } - } - - if (status === 'accepted') { - logger.info('Tool execution approved by user', { toolCallId, message }) - return { approved: true, rejected: false, message, fullData } - } - - if (status === 'error') { - logger.error('Tool execution failed with error', { toolCallId, message }) - return { approved: false, rejected: false, error: true, message, fullData } - } - - if (status === 'background') { - logger.info('Tool execution moved to background', { toolCallId, message }) - return { approved: true, rejected: false, message, fullData } - } - - if (status === 'success') { - logger.info('Tool execution completed successfully', { toolCallId, message }) - return { approved: true, rejected: false, message, fullData } - } +// MethodId for /api/complete-tool payload +export type MethodId = string - logger.warn('Unexpected tool call status', { toolCallId, status, message }) - return { - approved: false, - rejected: false, - error: true, - message: `Unexpected tool call status: ${status}`, - } - } catch (error) { - const errorMessage = error instanceof Error ? error.message : 'Unknown error' - logger.error('Error in interrupt handler', { - toolCallId, - error: errorMessage, - }) - return { - approved: false, - rejected: false, - error: true, - message: `Interrupt handler error: ${errorMessage}`, - } - } +// Payload type for sim-agent completion callback +interface CompleteToolRequestBody { + toolId: string + methodId: MethodId + success: boolean + data?: unknown + error?: string } const MethodExecutionSchema = z.object({ methodId: z.string().min(1, 'Method ID is required'), params: z.record(z.any()).optional().default({}), toolCallId: z.string().nullable().optional().default(null), + toolId: z.string().nullable().optional().default(null), }) /** @@ -235,7 +40,12 @@ export async function POST(req: NextRequest) { // Evaluate both auth schemes; pass if either is valid const internalAuth = checkInternalApiKey(req) const copilotAuth = checkCopilotApiKey(req) - const isAuthenticated = !!(internalAuth?.success || copilotAuth?.success) + const sessionAuth = await authenticateCopilotRequestSessionOnly() + const isAuthenticated = !!( + internalAuth?.success || + copilotAuth?.success || + sessionAuth.isAuthenticated + ) if (!isAuthenticated) { const errorMessage = copilotAuth.error || internalAuth.error || 'Authentication failed' return NextResponse.json(createErrorResponse(errorMessage), { @@ -244,14 +54,48 @@ export async function POST(req: NextRequest) { } const body = await req.json() - const { methodId, params, toolCallId } = MethodExecutionSchema.parse(body) + const { methodId, params, toolCallId, toolId } = MethodExecutionSchema.parse(body) + + if (methodId === 'get_user_workflow') { + logger.info(`[${requestId}] get_user_workflow request`, { + toolCallId, + hasParams: !!params, + }) + } + + if (methodId === 'get_blocks_metadata') { + const blockIds = (params as any)?.blockIds + logger.info(`[${requestId}] get_blocks_metadata request`, { + toolCallId, + hasBlockIds: Array.isArray(blockIds), + }) + } logger.info(`[${requestId}] Method execution request`, { methodId, toolCallId, + toolId, hasParams: !!params && Object.keys(params).length > 0, }) + // Auto-inject session userId for selected methods if missing + if ( + (methodId === 'get_oauth_credentials' || + methodId === 'list_gdrive_files' || + methodId === 'read_gdrive_file') && + (!params || typeof (params as any).userId !== 'string' || !(params as any).userId) + ) { + if (sessionAuth.userId) { + ;(params as any).userId = sessionAuth.userId + logger.info(`[${requestId}] Injected session userId into params`, { + methodId, + injectedUserId: sessionAuth.userId, + }) + } else { + logger.warn(`[${requestId}] No session userId available to inject`, { methodId }) + } + } + // Check if tool exists in registry if (!copilotToolRegistry.has(methodId)) { logger.error(`[${requestId}] Tool not found in registry: ${methodId}`, { @@ -262,7 +106,9 @@ export async function POST(req: NextRequest) { }) return NextResponse.json( createErrorResponse( - `Unknown method: ${methodId}. Available methods: ${copilotToolRegistry.getAvailableIds().join(', ')}` + `Unknown method: ${methodId}. Available methods: ${copilotToolRegistry + .getAvailableIds() + .join(', ')}` ), { status: 400 } ) @@ -270,96 +116,80 @@ export async function POST(req: NextRequest) { logger.info(`[${requestId}] Tool found in registry: ${methodId}`, { toolCallId, + toolId, }) - // Check if the tool requires interrupt/approval - const tool = copilotToolRegistry.get(methodId) - if (tool?.requiresInterrupt) { - if (!toolCallId) { - logger.warn(`[${requestId}] Tool requires interrupt but no toolCallId provided`, { - methodId, - }) - return NextResponse.json( - createErrorResponse('This tool requires approval but no tool call ID was provided'), - { status: 400 } - ) - } - - logger.info(`[${requestId}] Tool requires interrupt, starting approval process`, { - methodId, - toolCallId, - }) - - // Handle interrupt flow - const { approved, rejected, error, message, fullData } = await interruptHandler(toolCallId) - - if (rejected) { - logger.info(`[${requestId}] Tool execution rejected by user`, { - methodId, - toolCallId, - message, - }) - return NextResponse.json( - createErrorResponse( - 'The user decided to skip running this tool. This was a user decision.' - ), - { status: 200 } // Changed to 200 - user rejection is a valid response - ) - } - - if (error) { - logger.error(`[${requestId}] Tool execution failed with error`, { - methodId, - toolCallId, - message, - }) - return NextResponse.json( - createErrorResponse(message || 'Tool execution failed with unknown error'), - { status: 500 } // 500 Internal Server Error - ) - } - - if (!approved) { - logger.warn(`[${requestId}] Tool execution timed out`, { - methodId, - toolCallId, - }) - return NextResponse.json( - createErrorResponse('Tool execution request timed out'), - { status: 408 } // 408 Request Timeout - ) - } - - logger.info(`[${requestId}] Tool execution approved by user`, { - methodId, - toolCallId, - message, - }) - - // For tools that need confirmation data, pass the message and/or fullData as parameters - if (message) { - params.confirmationMessage = message - } - if (fullData) { - params.fullData = fullData - } - } - - // Execute the tool directly via registry + // Execute the tool directly via registry (no interrupts/redis) const result = await copilotToolRegistry.execute(methodId, params) + let dataLength: number | null = null + try { + if (typeof result?.data === 'string') dataLength = result.data.length + else if (result?.data !== undefined) dataLength = JSON.stringify(result.data).length + } catch {} + logger.info(`[${requestId}] Tool execution result:`, { methodId, toolCallId, + toolId, success: result.success, hasData: !!result.data, + dataLength, hasError: !!result.error, }) + // Send completion callback to sim-agent for all methods, on both success and failure + { + const completionPayload: CompleteToolRequestBody = { + toolId: (toolId || toolCallId || requestId) as string, + methodId: methodId === 'run_workflow' ? 'no_op' : (methodId as MethodId), + success: !!result.success, + ...(result.success + ? { data: result.data as unknown } + : { error: (result as any)?.error || 'Unknown error' }), + } + + let completionDataLength: number | null = null + try { + if (completionPayload.data !== undefined) { + completionDataLength = + typeof completionPayload.data === 'string' + ? (completionPayload.data as string).length + : JSON.stringify(completionPayload.data).length + } + } catch {} + + logger.info(`[${requestId}] Sending completion payload to sim-agent`, { + endpoint: '/api/complete-tool', + methodId: completionPayload.methodId, + toolId: completionPayload.toolId, + success: completionPayload.success, + hasData: !!completionPayload.data, + hasError: !!completionPayload.error, + dataLength: completionDataLength, + }) + + try { + const resp = await simAgentClient.makeRequest('/api/complete-tool', { + method: 'POST', + body: completionPayload as any, + }) + logger.info(`[${requestId}] Sim-agent completion response`, { + success: resp.success, + status: resp.status, + }) + } catch (callbackError) { + logger.error(`[${requestId}] Failed to send completion payload to sim-agent`, { + error: callbackError instanceof Error ? callbackError.message : 'Unknown error', + }) + } + } + const duration = Date.now() - startTime logger.info(`[${requestId}] Method execution completed: ${methodId}`, { methodId, toolCallId, + toolId, duration, success: result.success, }) diff --git a/apps/sim/lib/copilot/tools/base-tool.ts b/apps/sim/lib/copilot/tools/base-tool.ts index 2426725e7a5..7cd7fea62c5 100644 --- a/apps/sim/lib/copilot/tools/base-tool.ts +++ b/apps/sim/lib/copilot/tools/base-tool.ts @@ -21,40 +21,14 @@ export abstract class BaseTool implements Tool { /** * Notify the backend about the tool state change + * Deprecated: previously called /api/copilot/confirm (Redis-backed). Now a no-op. */ protected async notify( toolCallId: string, state: ToolState, message?: string ): Promise { - try { - // Map ToolState to NotificationStatus for API - const notificationStatus = state === 'errored' ? 'error' : state - - const response = await fetch('/api/copilot/confirm', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - toolCallId, - status: notificationStatus, - message, - }), - }) - - if (!response.ok) { - const error = await response.json() - console.error(`Failed to confirm tool ${toolCallId}:`, error) - return { success: false, message: error.error || 'Failed to confirm tool' } - } - - const result = await response.json() - return { success: true, message: result.message } - } catch (error) { - console.error('Error confirming tool:', error) - return { success: false, message: error instanceof Error ? error.message : 'Unknown error' } - } + return { success: true, message } } /** @@ -117,7 +91,7 @@ export abstract class BaseTool implements Tool { ): Promise { // Map actions to states const actionToState: Record = { - run: 'executing', // Changed from 'accepted' to 'executing' + run: 'executing', skip: 'rejected', background: 'background', } @@ -129,16 +103,29 @@ export abstract class BaseTool implements Tool { // Special handling for run action if (action === 'run') { - // Directly call execute method - no wrapper await this.execute(toolCall, options) } else { - // For skip/background, just notify - const message = - action === 'skip' - ? this.getDisplayName({ ...toolCall, state: 'rejected' }) - : 'The user moved execution to the background' - - await this.notify(toolCall.id, newState, message) + // Skip/background are now UI-only; no server-side confirmation + await this.notify(toolCall.id, newState) + + // Additionally, when skipping, notify the agent via methods route (complete-tool) + if (action === 'skip') { + try { + await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ + methodId: 'no_op', + params: { confirmationMessage: `User skipped tool: ${toolCall.name}` }, + toolCallId: toolCall.id, + toolId: toolCall.id, + }), + }) + } catch (e) { + // Swallow errors; skip should not break UI + } + } } } } diff --git a/apps/sim/lib/copilot/tools/client-tools/build-workflow.ts b/apps/sim/lib/copilot/tools/client-tools/build-workflow.ts new file mode 100644 index 00000000000..3a4ea18e64f --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/build-workflow.ts @@ -0,0 +1,110 @@ +/** + * Build Workflow - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' +import { useWorkflowDiffStore } from '@/stores/workflow-diff/store' + +export class BuildWorkflowClientTool extends BaseTool { + static readonly id = 'build_workflow' + + metadata: ToolMetadata = { + id: BuildWorkflowClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Building workflow from YAML', icon: 'spinner' }, + success: { displayName: 'Built workflow', icon: 'grid2x2Check' }, + ready_for_review: { displayName: 'Ready for review', icon: 'grid2x2' }, + rejected: { displayName: 'Skipped building workflow', icon: 'skip' }, + errored: { displayName: 'Failed to build workflow', icon: 'error' }, + aborted: { displayName: 'Aborted building workflow', icon: 'abort' }, + }, + }, + schema: { + name: BuildWorkflowClientTool.id, + description: 'Build a new workflow from YAML', + parameters: { + type: 'object', + properties: { + yamlContent: { type: 'string' }, + description: { type: 'string' }, + }, + required: ['yamlContent'], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('BuildWorkflowClientTool') + const safeStringify = (o: any, m = 800) => { + try { + if (o === undefined) return 'undefined' + if (o === null) return 'null' + return JSON.stringify(o).substring(0, m) + } catch { + return '[unserializable]' + } + } + + try { + options?.onStateChange?.('executing') + const ext = toolCall as CopilotToolCall & { arguments?: any } + if (ext.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = ext.arguments + toolCall.parameters = ext.arguments + } + const provided = toolCall.parameters || toolCall.input || ext.arguments || {} + + const yamlContent: string = provided.yamlContent || provided.yaml || provided.content || '' + const description: string | undefined = provided.description || provided.desc + + if (!yamlContent || typeof yamlContent !== 'string') { + options?.onStateChange?.('errored') + return { success: false, error: 'yamlContent is required' } + } + + // Do not call /api/copilot/methods for build_workflow. Succeed locally and pass through data. + logger.info('build_workflow: performing local success without server call', { + hasDescription: !!description, + yamlLength: yamlContent.length, + }) + + // Trigger diff directly + try { + await useWorkflowDiffStore.getState().setProposedChanges(yamlContent) + logger.info('Diff store updated from build_workflow YAML') + } catch (e) { + logger.warn('Failed to update diff from build_workflow YAML', { + error: e instanceof Error ? e.message : String(e), + }) + } + + // Transition to ready_for_review for store compatibility + options?.onStateChange?.('success') + options?.onStateChange?.('ready_for_review') + + return { + success: true, + data: { + yamlContent, + ...(description ? { description } : {}), + note: 'Build workflow handled on client without server call', + }, + } + } catch (error: any) { + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/client-utils.ts b/apps/sim/lib/copilot/tools/client-tools/client-utils.ts new file mode 100644 index 00000000000..a6905dece4a --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/client-utils.ts @@ -0,0 +1,84 @@ +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +const logger = createLogger('CopilotClientUtils') + +export function safeStringify(obj: any, maxLength = 1000): string { + try { + if (obj === undefined) return 'undefined' + if (obj === null) return 'null' + const str = JSON.stringify(obj) + return str ? str.substring(0, maxLength) : 'empty' + } catch (e) { + return `[stringify error: ${e}]` + } +} + +export function normalizeToolCallArguments(toolCall: CopilotToolCall): CopilotToolCall { + const extended = toolCall as CopilotToolCall & { arguments?: any } + if (extended.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = extended.arguments + toolCall.parameters = extended.arguments + } + return toolCall +} + +export function getProvidedParams(toolCall: CopilotToolCall): any { + const extended = toolCall as CopilotToolCall & { arguments?: any } + return toolCall.parameters || toolCall.input || extended.arguments || {} +} + +export async function postToMethods( + methodId: string, + params: Record, + toolIdentifiers: { toolCallId?: string | null; toolId?: string | null }, + options?: ToolExecutionOptions +): Promise { + try { + options?.onStateChange?.('executing') + + const requestBody = { + methodId, + params, + toolCallId: toolIdentifiers.toolCallId ?? null, + toolId: toolIdentifiers.toolId ?? toolIdentifiers.toolCallId ?? null, + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(requestBody), + }) + + logger.info('Methods route response received', { status: response.status }) + + if (!response.ok) { + const errorData = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { + success: false, + error: (errorData as any)?.error || 'Failed to execute server method', + } + } + + const result = await response.json() + if (!result?.success) { + options?.onStateChange?.('errored') + return { success: false, error: result?.error || 'Server method execution failed' } + } + + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + options?.onStateChange?.('errored') + return { + success: false, + error: error?.message || 'Unexpected error while calling methods route', + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/edit-workflow.ts b/apps/sim/lib/copilot/tools/client-tools/edit-workflow.ts new file mode 100644 index 00000000000..ffc3d71f4d7 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/edit-workflow.ts @@ -0,0 +1,132 @@ +/** + * Edit Workflow - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' +import { useWorkflowDiffStore } from '@/stores/workflow-diff/store' +import { useWorkflowRegistry } from '@/stores/workflows/registry/store' + +export class EditWorkflowClientTool extends BaseTool { + static readonly id = 'edit_workflow' + + metadata: ToolMetadata = { + id: EditWorkflowClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Editing workflow', icon: 'spinner' }, + success: { displayName: 'Edited workflow', icon: 'grid2x2Check' }, + ready_for_review: { displayName: 'Ready for review', icon: 'grid2x2' }, + rejected: { displayName: 'Skipped editing workflow', icon: 'skip' }, + errored: { displayName: 'Failed to edit workflow', icon: 'error' }, + aborted: { displayName: 'Aborted editing workflow', icon: 'abort' }, + }, + }, + schema: { + name: EditWorkflowClientTool.id, + description: 'Edit the current workflow with targeted operations', + parameters: { + type: 'object', + properties: { + operations: { type: 'array', items: { type: 'object' } }, + workflowId: { type: 'string' }, + currentUserWorkflow: { type: 'string' }, + }, + required: ['operations', 'workflowId'], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('EditWorkflowClientTool') + const safeStringify = (o: any, m = 800) => { + try { + if (o === undefined) return 'undefined' + if (o === null) return 'null' + return JSON.stringify(o).substring(0, m) + } catch { + return '[unserializable]' + } + } + + try { + options?.onStateChange?.('executing') + const ext = toolCall as CopilotToolCall & { arguments?: any } + if (ext.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = ext.arguments + toolCall.parameters = ext.arguments + } + const provided = toolCall.parameters || toolCall.input || ext.arguments || {} + + const operations = provided.operations || provided.ops || [] + let workflowId = provided.workflowId || provided.workflow_id || '' + const currentUserWorkflow = provided.currentUserWorkflow || provided.current_workflow + + if (!workflowId) { + const { activeWorkflowId } = useWorkflowRegistry.getState() + if (activeWorkflowId) workflowId = activeWorkflowId + } + + if (!Array.isArray(operations) || !workflowId) { + options?.onStateChange?.('errored') + return { success: false, error: 'operations and workflowId are required' } + } + + const body = { + methodId: 'edit_workflow', + params: { operations, workflowId, ...(currentUserWorkflow ? { currentUserWorkflow } : {}) }, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(body), + }) + if (!response.ok) { + const e = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { success: false, error: e?.error || 'Failed to edit workflow' } + } + const result = await response.json() + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Server method failed' } + } + + // If server returned YAML, trigger diff view + try { + const yamlContent: string | undefined = result?.data?.yamlContent + if (yamlContent && typeof yamlContent === 'string') { + await useWorkflowDiffStore.getState().setProposedChanges(yamlContent) + logger.info('Diff store updated from edit_workflow result', { + yamlLength: yamlContent.length, + }) + } + } catch (e) { + logger.warn('Failed to update diff store from edit_workflow result', { + error: e instanceof Error ? e.message : String(e), + }) + } + + options?.onStateChange?.('success') + options?.onStateChange?.('ready_for_review') + return { success: true, data: result.data } + } catch (error: any) { + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/gdrive-request-access.ts b/apps/sim/lib/copilot/tools/client-tools/gdrive-request-access.ts index 2ae5d51a437..f04a072ecc3 100644 --- a/apps/sim/lib/copilot/tools/client-tools/gdrive-request-access.ts +++ b/apps/sim/lib/copilot/tools/client-tools/gdrive-request-access.ts @@ -5,6 +5,7 @@ import type { ToolExecutionOptions, ToolMetadata, } from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' export class GDriveRequestAccessTool extends BaseTool { static readonly id = 'gdrive_request_access' @@ -57,16 +58,47 @@ export class GDriveRequestAccessTool extends BaseTool { toolCall: CopilotToolCall, options?: ToolExecutionOptions ): Promise { - // Execution is trivial: we only notify the server that the user completed the action. - // Any data transfer happens via the picker; if needed later, it can be included in the message. - await this.notify(toolCall.id, 'success', 'User completed Google Drive access picker') - options?.onStateChange?.('success') + const logger = createLogger('GDriveRequestAccessTool') - return { - success: true, - data: { - message: 'Google Drive access confirmed by user', - }, + try { + options?.onStateChange?.('executing') + + // Mirror pattern used by other client tools: call methods route + const body = { + methodId: 'gdrive_request_access', + params: {}, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(body), + }) + + if (!response.ok) { + const errorData = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { + success: false, + error: errorData?.error || 'Failed to request Google Drive access', + } + } + + const result = await response.json() + if (!result?.success) { + options?.onStateChange?.('errored') + return { success: false, error: result?.error || 'Request access method failed' } + } + + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + logger.error('Client tool error', { toolCallId: toolCall.id, message: error?.message }) + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } } } } diff --git a/apps/sim/lib/copilot/tools/client-tools/get-blocks-and-tools.ts b/apps/sim/lib/copilot/tools/client-tools/get-blocks-and-tools.ts new file mode 100644 index 00000000000..d5bc4eb4bf9 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/get-blocks-and-tools.ts @@ -0,0 +1,69 @@ +/** + * Get Blocks and Tools - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import { + normalizeToolCallArguments, + postToMethods, +} from '@/lib/copilot/tools/client-tools/client-utils' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class GetBlocksAndToolsClientTool extends BaseTool { + static readonly id = 'get_blocks_and_tools' + + metadata: ToolMetadata = { + id: GetBlocksAndToolsClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Getting block information', icon: 'spinner' }, + success: { displayName: 'Retrieved block information', icon: 'blocks' }, + rejected: { displayName: 'Skipped getting block information', icon: 'skip' }, + errored: { displayName: 'Failed to get block information', icon: 'error' }, + aborted: { displayName: 'Aborted getting block information', icon: 'abort' }, + }, + }, + schema: { + name: GetBlocksAndToolsClientTool.id, + description: 'List available blocks and their tools', + parameters: { + type: 'object', + properties: {}, + required: [], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('GetBlocksAndToolsClientTool') + + try { + normalizeToolCallArguments(toolCall) + + return await postToMethods( + 'get_blocks_and_tools', + {}, + { toolCallId: toolCall.id, toolId: toolCall.id }, + options + ) + } catch (error: any) { + logger.error('Error in client tool execution:', { + toolCallId: toolCall.id, + error: error, + message: error instanceof Error ? error.message : String(error), + }) + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Failed to get block information' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/get-blocks-metadata.ts b/apps/sim/lib/copilot/tools/client-tools/get-blocks-metadata.ts new file mode 100644 index 00000000000..d3f195b3a37 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/get-blocks-metadata.ts @@ -0,0 +1,140 @@ +/** + * Get Blocks Metadata - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import { + getProvidedParams, + normalizeToolCallArguments, + postToMethods, +} from '@/lib/copilot/tools/client-tools/client-utils' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class GetBlocksMetadataClientTool extends BaseTool { + static readonly id = 'get_blocks_metadata' + + metadata: ToolMetadata = { + id: GetBlocksMetadataClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Evaluating workflow options', icon: 'spinner' }, + success: { displayName: 'Evaluated workflow options', icon: 'betweenHorizontalEnd' }, + rejected: { displayName: 'Skipped evaluating workflow options', icon: 'skip' }, + errored: { displayName: 'Failed to evaluate workflow options', icon: 'error' }, + aborted: { displayName: 'Options evaluation aborted', icon: 'abort' }, + }, + }, + schema: { + name: GetBlocksMetadataClientTool.id, + description: 'Get metadata for specified blocks', + parameters: { + type: 'object', + properties: { + blockIds: { type: 'array', items: { type: 'string' }, description: 'Block IDs' }, + }, + required: [], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('GetBlocksMetadataClientTool') + + try { + normalizeToolCallArguments(toolCall) + + const provided = getProvidedParams(toolCall) || {} + + let blockIds: string[] | undefined + + if (provided.blockIds && Array.isArray(provided.blockIds)) { + blockIds = provided.blockIds.map((v: any) => String(v)) + logger.info('Found blockIds directly in provided.blockIds', { + count: blockIds!.length, + values: blockIds, + }) + } else { + const args = (provided as any).arguments || provided + + const candidate = + args.blockIds ?? + args.block_ids ?? + args.ids ?? + args.blocks ?? + args.blockTypes ?? + args.block_types ?? + provided.blockIds ?? + provided.block_ids ?? + provided.ids ?? + provided.blocks ?? + provided.blockTypes ?? + provided.block_types + + const raw = candidate + + if (Array.isArray(raw)) { + blockIds = raw.map((v) => String(v)) + } else if (typeof raw === 'string') { + try { + const parsed = JSON.parse(raw) + if (Array.isArray(parsed)) { + blockIds = parsed.map((v) => String(v)) + } else { + blockIds = raw + .split(',') + .map((s) => s.trim()) + .filter((s) => s.length > 0) + } + } catch { + blockIds = raw + .split(',') + .map((s) => s.trim()) + .filter((s) => s.length > 0) + } + } else if (raw && typeof raw === 'object') { + const fromItems = Array.isArray((raw as any).items) ? (raw as any).items : null + const values = fromItems || Object.values(raw as any) + if (Array.isArray(values) && values.length > 0) { + const cleaned = values + .map((v: any) => (typeof v === 'string' || typeof v === 'number' ? String(v) : null)) + .filter((v: any): v is string => typeof v === 'string' && v.length > 0) + if (cleaned.length > 0) blockIds = cleaned + } + } + + if (!blockIds && Array.isArray(provided)) { + blockIds = provided.map((v: any) => String(v)) + } + } + + const paramsToSend = { + blockIds: Array.isArray(blockIds) ? blockIds : [], + } + + return await postToMethods( + 'get_blocks_metadata', + paramsToSend, + { toolCallId: toolCall.id, toolId: toolCall.id }, + options + ) + } catch (error: any) { + logger.error('Error in client tool execution:', { + toolCallId: toolCall.id, + error: error, + message: error instanceof Error ? error.message : String(error), + }) + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Failed to get blocks metadata' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/get-environment-variables.ts b/apps/sim/lib/copilot/tools/client-tools/get-environment-variables.ts new file mode 100644 index 00000000000..ddc6b8c29ba --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/get-environment-variables.ts @@ -0,0 +1,102 @@ +/** + * Get Environment Variables - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' +import { useWorkflowRegistry } from '@/stores/workflows/registry/store' + +export class GetEnvironmentVariablesClientTool extends BaseTool { + static readonly id = 'get_environment_variables' + + metadata: ToolMetadata = { + id: GetEnvironmentVariablesClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Getting environment variables', icon: 'spinner' }, + success: { displayName: 'Found environment variables', icon: 'wrench' }, + rejected: { displayName: 'Skipped viewing environment variables', icon: 'skip' }, + errored: { displayName: 'Failed to get environment variables', icon: 'error' }, + aborted: { displayName: 'Environment variables viewing aborted', icon: 'abort' }, + }, + }, + schema: { + name: GetEnvironmentVariablesClientTool.id, + description: 'Get environment variables for the active workflow/user', + parameters: { + type: 'object', + properties: { + workflowId: { type: 'string', description: 'Optional workflow ID' }, + }, + required: [], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('GetEnvironmentVariablesClientTool') + + try { + options?.onStateChange?.('executing') + + // Prefer provided param if any; else use active workflowId + const provided = (toolCall.parameters || toolCall.input || {}) as Record + let workflowId: string | undefined = provided.workflowId + if (!workflowId) { + const { activeWorkflowId } = useWorkflowRegistry.getState() + workflowId = activeWorkflowId || undefined + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ + methodId: 'get_environment_variables', + params: { ...(workflowId ? { workflowId } : {}) }, + toolId: toolCall.id, + }), + }) + + logger.info('Methods route response received', { status: response.status }) + + if (!response.ok) { + const errorData = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { success: false, error: errorData?.error || 'Failed to execute server method' } + } + + const result = await response.json() + logger.info('Methods route parsed JSON', { + success: result?.success, + hasData: !!result?.data, + }) + + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Server method execution failed' } + } + + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + logger.error('Error in client tool execution:', { + toolCallId: toolCall.id, + error: error, + message: error instanceof Error ? error.message : String(error), + }) + options?.onStateChange?.('errored') + return { success: false, error: error.message || 'Failed to get environment variables' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts b/apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts new file mode 100644 index 00000000000..08afbd6fd8f --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts @@ -0,0 +1,96 @@ +/** + * Get OAuth Credentials - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class GetOAuthCredentialsClientTool extends BaseTool { + static readonly id = 'get_oauth_credentials' + + metadata: ToolMetadata = { + id: GetOAuthCredentialsClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Retrieving login IDs', icon: 'spinner' }, + success: { displayName: 'Retrieved login IDs', icon: 'key' }, + rejected: { displayName: 'Skipped retrieving login IDs', icon: 'skip' }, + errored: { displayName: 'Failed to retrieve login IDs', icon: 'error' }, + aborted: { displayName: 'Retrieving login IDs aborted', icon: 'abort' }, + }, + }, + schema: { + name: GetOAuthCredentialsClientTool.id, + description: 'Get OAuth credentials for the current user', + parameters: { + type: 'object', + properties: { + userId: { type: 'string', description: 'Optional explicit userId override' }, + }, + required: [], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('GetOAuthCredentialsClientTool') + + try { + options?.onStateChange?.('executing') + + const provided = (toolCall.parameters || toolCall.input || {}) as Record + const userId: string | undefined = provided.userId + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ + methodId: 'get_oauth_credentials', + params: { ...(userId ? { userId } : {}) }, + toolId: toolCall.id, + }), + }) + + logger.info('Methods route response received', { status: response.status }) + + if (!response.ok) { + const errorData = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { success: false, error: errorData?.error || 'Failed to execute server method' } + } + + const result = await response.json() + logger.info('Methods route parsed JSON', { + success: result?.success, + hasData: !!result?.data, + }) + + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Server method execution failed' } + } + + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + logger.error('Error in client tool execution:', { + toolCallId: toolCall.id, + error: error, + message: error instanceof Error ? error.message : String(error), + }) + options?.onStateChange?.('errored') + return { success: false, error: error.message || 'Failed to retrieve login IDs' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/get-user-workflow.ts b/apps/sim/lib/copilot/tools/client-tools/get-user-workflow.ts index 5193ae5716d..69429a410ea 100644 --- a/apps/sim/lib/copilot/tools/client-tools/get-user-workflow.ts +++ b/apps/sim/lib/copilot/tools/client-tools/get-user-workflow.ts @@ -3,6 +3,7 @@ */ import { BaseTool } from '@/lib/copilot/tools/base-tool' +import { postToMethods } from '@/lib/copilot/tools/client-tools/client-utils' import type { CopilotToolCall, ToolExecuteResult, @@ -10,6 +11,7 @@ import type { ToolMetadata, } from '@/lib/copilot/tools/types' import { createLogger } from '@/lib/logs/console/logger' +import { Serializer } from '@/serializer' import { useWorkflowDiffStore } from '@/stores/workflow-diff/store' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' import { mergeSubblockState } from '@/stores/workflows/utils' @@ -81,7 +83,7 @@ export class GetUserWorkflowTool extends BaseTool { } /** - * Execute the tool - fetch the workflow from stores and write to Redis + * Execute the tool - fetch the workflow from stores and call the server method */ async execute( toolCall: CopilotToolCall, @@ -89,10 +91,7 @@ export class GetUserWorkflowTool extends BaseTool { ): Promise { const logger = createLogger('GetUserWorkflowTool') - logger.info('Starting client tool execution', { - toolCallId: toolCall.id, - toolName: toolCall.name, - }) + logger.info('Starting client tool execution', { toolCallId: toolCall.id }) try { // Parse parameters @@ -113,26 +112,17 @@ export class GetUserWorkflowTool extends BaseTool { workflowId = activeWorkflowId } - logger.info('Fetching user workflow from stores', { - workflowId, - includeMetadata: params.includeMetadata, - }) - - // Try to get workflow from diff/preview store first, then main store let workflowState: any = null - // Check diff store first const diffStore = useWorkflowDiffStore.getState() if (diffStore.diffWorkflow && Object.keys(diffStore.diffWorkflow.blocks || {}).length > 0) { workflowState = diffStore.diffWorkflow logger.info('Using workflow from diff/preview store', { workflowId }) } else { - // Get the actual workflow state from the workflow store const workflowStore = useWorkflowStore.getState() const fullWorkflowState = workflowStore.getWorkflowState() if (!fullWorkflowState || !fullWorkflowState.blocks) { - // Fallback to workflow registry metadata if no workflow state const workflowRegistry = useWorkflowRegistry.getState() const workflow = workflowRegistry.workflows[workflowId] @@ -144,18 +134,13 @@ export class GetUserWorkflowTool extends BaseTool { } } - logger.warn('No workflow state found, using workflow metadata only', { workflowId }) + logger.warn('No workflow state found, using workflow metadata only') workflowState = workflow } else { workflowState = fullWorkflowState - logger.info('Using workflow state from workflow store', { - workflowId, - blockCount: Object.keys(fullWorkflowState.blocks || {}).length, - }) } } - // Ensure workflow state has all required properties with proper defaults if (workflowState) { if (!workflowState.loops) { workflowState.loops = {} @@ -171,7 +156,6 @@ export class GetUserWorkflowTool extends BaseTool { } } - // Merge latest subblock values from the subblock store so subblock edits are reflected try { if (workflowState?.blocks) { workflowState = { @@ -184,25 +168,11 @@ export class GetUserWorkflowTool extends BaseTool { }) } } catch (mergeError) { - logger.warn('Failed to merge subblock values; proceeding with raw workflow state', { - workflowId, - error: mergeError instanceof Error ? mergeError.message : String(mergeError), - }) + logger.warn('Failed to merge subblock values; proceeding with raw workflow state') } - logger.info('Validating workflow state', { - workflowId, - hasWorkflowState: !!workflowState, - hasBlocks: !!workflowState?.blocks, - workflowStateType: typeof workflowState, - }) - if (!workflowState || !workflowState.blocks) { - logger.error('Workflow state validation failed', { - workflowId, - workflowState: workflowState, - hasBlocks: !!workflowState?.blocks, - }) + logger.error('Workflow state validation failed') options?.onStateChange?.('errored') return { success: false, @@ -210,70 +180,69 @@ export class GetUserWorkflowTool extends BaseTool { } } - // Include metadata if requested and available - if (params.includeMetadata && workflowState.metadata) { - // Metadata is already included in the workflow state - } - - logger.info('Successfully fetched user workflow from stores', { - workflowId, - blockCount: Object.keys(workflowState.blocks || {}).length, - fromDiffStore: - !!diffStore.diffWorkflow && Object.keys(diffStore.diffWorkflow.blocks || {}).length > 0, - }) - - logger.info('About to stringify workflow state', { - workflowId, - workflowStateKeys: Object.keys(workflowState), - }) - - // Convert workflow state to JSON string let workflowJson: string try { workflowJson = JSON.stringify(workflowState, null, 2) - logger.info('Successfully stringified workflow state', { - workflowId, - jsonLength: workflowJson.length, - }) } catch (stringifyError) { - logger.error('Error stringifying workflow state', { - workflowId, - error: stringifyError, - }) options?.onStateChange?.('errored') return { success: false, - error: `Failed to convert workflow to JSON: ${stringifyError instanceof Error ? stringifyError.message : 'Unknown error'}`, + error: `Failed to convert workflow to JSON: ${ + stringifyError instanceof Error ? stringifyError.message : 'Unknown error' + }`, } } - logger.info('About to notify server with workflow data', { - workflowId, - toolCallId: toolCall.id, - dataLength: workflowJson.length, - }) - - // Notify server of success with structured data containing userWorkflow - const structuredData = JSON.stringify({ - userWorkflow: workflowJson, - }) - logger.info('Calling notify with structured data', { - toolCallId: toolCall.id, - structuredDataLength: structuredData.length, - }) + // Post to server via shared utility + const result = await postToMethods( + 'get_user_workflow', + { confirmationMessage: workflowJson, fullData: { userWorkflow: workflowJson } }, + { toolCallId: toolCall.id, toolId: toolCall.id }, + options + ) - await this.notify(toolCall.id, 'success', structuredData) - - logger.info('Successfully notified server of success', { - toolCallId: toolCall.id, - }) + if (!result.success) return result - options?.onStateChange?.('success') + try { + const diffStore = useWorkflowDiffStore.getState() + const serverData = result.data + let yamlContent: string | null = null + if (serverData && typeof serverData === 'object' && (serverData as any).yamlContent) { + yamlContent = (serverData as any).yamlContent + } else if (typeof serverData === 'string') { + const trimmed = serverData.trim() + if (trimmed.startsWith('{') || trimmed.startsWith('[')) { + try { + const parsed = JSON.parse(serverData) + if (parsed && typeof parsed === 'object' && parsed.blocks && parsed.edges) { + const serializer = new Serializer() + const serialized = serializer.serializeWorkflow( + parsed.blocks, + parsed.edges, + parsed.loops || {}, + parsed.parallels || {}, + false + ) + if (typeof serialized === 'string') yamlContent = serialized + } + } catch {} + } else { + yamlContent = serverData + } + } - return { - success: true, - data: workflowJson, // Return the same data that goes to Redis + if (yamlContent) { + await diffStore.setProposedChanges(yamlContent) + } else { + logger.warn('No yamlContent found/derived in server result to trigger diff') + } + } catch (e) { + logger.error('Failed to update diff store from get_user_workflow result', { + error: e instanceof Error ? e.message : String(e), + }) } + + return result } catch (error: any) { logger.error('Error in client tool execution:', { toolCallId: toolCall.id, @@ -282,19 +251,6 @@ export class GetUserWorkflowTool extends BaseTool { message: error instanceof Error ? error.message : String(error), }) - try { - // Notify server of error - await this.notify(toolCall.id, 'errored', error.message || 'Failed to fetch workflow') - logger.info('Successfully notified server of error', { - toolCallId: toolCall.id, - }) - } catch (notifyError) { - logger.error('Failed to notify server of error:', { - toolCallId: toolCall.id, - notifyError: notifyError, - }) - } - options?.onStateChange?.('errored') return { diff --git a/apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts b/apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts new file mode 100644 index 00000000000..ba65e0d1448 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts @@ -0,0 +1,123 @@ +/** + * Get Workflow Console - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' +import { useWorkflowRegistry } from '@/stores/workflows/registry/store' + +export class GetWorkflowConsoleClientTool extends BaseTool { + static readonly id = 'get_workflow_console' + + metadata: ToolMetadata = { + id: GetWorkflowConsoleClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Reading workflow console', icon: 'spinner' }, + success: { displayName: 'Read workflow console', icon: 'squareTerminal' }, + rejected: { displayName: 'Skipped reading console', icon: 'skip' }, + errored: { displayName: 'Failed to read console', icon: 'error' }, + aborted: { displayName: 'Aborted reading console', icon: 'abort' }, + }, + }, + schema: { + name: GetWorkflowConsoleClientTool.id, + description: 'Get workflow console output and recent executions', + parameters: { + type: 'object', + properties: { + workflowId: { type: 'string' }, + limit: { type: 'number' }, + includeDetails: { type: 'boolean' }, + }, + required: ['workflowId'], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('GetWorkflowConsoleClientTool') + const safeStringify = (o: any, m = 800) => { + try { + if (o === undefined) return 'undefined' + if (o === null) return 'null' + return JSON.stringify(o).substring(0, m) + } catch { + return '[unserializable]' + } + } + + try { + options?.onStateChange?.('executing') + const ext = toolCall as CopilotToolCall & { arguments?: any } + if (ext.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = ext.arguments + toolCall.parameters = ext.arguments + } + const provided = toolCall.parameters || toolCall.input || ext.arguments || {} + + let workflowId = provided.workflowId || provided.workflow_id || '' + const limit = provided.limit + const includeDetails = provided.includeDetails ?? provided.include_details + + if (!workflowId) { + const { activeWorkflowId } = useWorkflowRegistry.getState() + if (activeWorkflowId) workflowId = activeWorkflowId + } + + logger.info('get_workflow_console: prepared params', { + toolCallId: toolCall.id, + hasWorkflowId: !!workflowId, + }) + + if (!workflowId) { + options?.onStateChange?.('errored') + return { success: false, error: 'workflowId is required' } + } + + const paramsToSend: any = { workflowId } + if (typeof limit === 'number') paramsToSend.limit = limit + if (typeof includeDetails === 'boolean') paramsToSend.includeDetails = includeDetails + + const body = { + methodId: 'get_workflow_console', + params: paramsToSend, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(body), + }) + logger.info('Methods route response', { ok: response.ok, status: response.status }) + if (!response.ok) { + const e = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { success: false, error: e?.error || 'Failed to get console' } + } + const result = await response.json() + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Server method failed' } + } + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/list-gdrive-files.ts b/apps/sim/lib/copilot/tools/client-tools/list-gdrive-files.ts new file mode 100644 index 00000000000..d713bc518d8 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/list-gdrive-files.ts @@ -0,0 +1,83 @@ +/** + * List Google Drive Files - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import { + getProvidedParams, + normalizeToolCallArguments, + postToMethods, +} from '@/lib/copilot/tools/client-tools/client-utils' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class ListGDriveFilesClientTool extends BaseTool { + static readonly id = 'list_gdrive_files' + + metadata: ToolMetadata = { + id: ListGDriveFilesClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Listing Google Drive files', icon: 'spinner' }, + success: { displayName: 'Listed Google Drive files', icon: 'file' }, + rejected: { displayName: 'Skipped listing Google Drive files', icon: 'skip' }, + errored: { displayName: 'Failed to list Google Drive files', icon: 'error' }, + aborted: { displayName: 'Aborted listing Google Drive files', icon: 'abort' }, + }, + }, + schema: { + name: ListGDriveFilesClientTool.id, + description: 'List files in Google Drive for a user', + parameters: { + type: 'object', + properties: { + userId: { type: 'string', description: 'User ID (for OAuth token lookup)' }, + search_query: { type: 'string', description: 'Search query' }, + searchQuery: { type: 'string', description: 'Search query (alias)' }, + num_results: { type: 'number', description: 'Max results' }, + }, + required: ['userId'], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('ListGDriveFilesClientTool') + + try { + normalizeToolCallArguments(toolCall) + const provided = getProvidedParams(toolCall) + + const userId = provided.userId || provided.user_id || provided.user || '' + const search_query = + provided.search_query ?? provided.searchQuery ?? provided.query ?? undefined + const num_results = provided.num_results ?? provided.limit ?? undefined + + const paramsToSend: any = {} + if (typeof userId === 'string' && userId.trim()) paramsToSend.userId = userId.trim() + if (typeof search_query === 'string' && search_query.trim()) + paramsToSend.search_query = search_query.trim() + if (typeof num_results === 'number') paramsToSend.num_results = num_results + + return await postToMethods( + 'list_gdrive_files', + paramsToSend, + { toolCallId: toolCall.id, toolId: toolCall.id }, + options + ) + } catch (error: any) { + logger.error('Client tool error', { toolCallId: toolCall.id, message: error?.message }) + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/make-api-request.ts b/apps/sim/lib/copilot/tools/client-tools/make-api-request.ts new file mode 100644 index 00000000000..20dbc4bc1c0 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/make-api-request.ts @@ -0,0 +1,92 @@ +/** + * Make API Request - Client-side wrapper that posts to methods route (requires interrupt) + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import { + getProvidedParams, + normalizeToolCallArguments, + postToMethods, +} from '@/lib/copilot/tools/client-tools/client-utils' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class MakeApiRequestClientTool extends BaseTool { + static readonly id = 'make_api_request' + + metadata: ToolMetadata = { + id: MakeApiRequestClientTool.id, + displayConfig: { + states: { + pending: { displayName: 'Make API request?', icon: 'edit' }, + executing: { displayName: 'Making API request', icon: 'spinner' }, + success: { displayName: 'Made API request', icon: 'globe' }, + rejected: { displayName: 'Skipped API request', icon: 'skip' }, + errored: { displayName: 'Failed to make API request', icon: 'error' }, + aborted: { displayName: 'Aborted API request', icon: 'abort' }, + }, + }, + schema: { + name: MakeApiRequestClientTool.id, + description: 'Make an HTTP API request', + parameters: { + type: 'object', + properties: { + url: { type: 'string' }, + method: { type: 'string', enum: ['GET', 'POST', 'PUT'] }, + queryParams: { type: 'object' }, + headers: { type: 'object' }, + body: { type: 'object' }, + }, + required: ['url', 'method'], + }, + }, + requiresInterrupt: true, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('MakeApiRequestClientTool') + + try { + normalizeToolCallArguments(toolCall) + const provided = getProvidedParams(toolCall) + + const url = provided.url + const method = provided.method + const queryParams = provided.queryParams + const headers = provided.headers + const body = provided.body + + if (!url || !method) { + options?.onStateChange?.('errored') + return { success: false, error: 'url and method are required' } + } + + const paramsToSend = { + url, + method, + ...(queryParams ? { queryParams } : {}), + ...(headers ? { headers } : {}), + ...(body ? { body } : {}), + } + + return await postToMethods( + 'make_api_request', + paramsToSend, + { toolCallId: toolCall.id, toolId: toolCall.id }, + options + ) + } catch (error: any) { + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/online-search.ts b/apps/sim/lib/copilot/tools/client-tools/online-search.ts new file mode 100644 index 00000000000..20c3f055551 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/online-search.ts @@ -0,0 +1,117 @@ +/** + * Online Search - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class OnlineSearchClientTool extends BaseTool { + static readonly id = 'search_online' + + metadata: ToolMetadata = { + id: OnlineSearchClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Searching online', icon: 'spinner' }, + success: { displayName: 'Searched online', icon: 'globe' }, + rejected: { displayName: 'Skipped online search', icon: 'skip' }, + errored: { displayName: 'Failed to search online', icon: 'error' }, + aborted: { displayName: 'Aborted online search', icon: 'abort' }, + }, + }, + schema: { + name: OnlineSearchClientTool.id, + description: 'Search online for information', + parameters: { + type: 'object', + properties: { + query: { type: 'string' }, + num: { type: 'number' }, + type: { type: 'string' }, + gl: { type: 'string' }, + hl: { type: 'string' }, + }, + required: ['query'], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('OnlineSearchClientTool') + const safeStringify = (o: any, m = 800) => { + try { + if (o === undefined) return 'undefined' + if (o === null) return 'null' + return JSON.stringify(o).substring(0, m) + } catch { + return '[unserializable]' + } + } + + try { + options?.onStateChange?.('executing') + const ext = toolCall as CopilotToolCall & { arguments?: any } + if (ext.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = ext.arguments + toolCall.parameters = ext.arguments + } + const provided = toolCall.parameters || toolCall.input || ext.arguments || {} + + const query = provided.query || provided.search || provided.q || '' + const num = provided.num ?? provided.limit + const type = provided.type + const gl = provided.gl + const hl = provided.hl + + if (!query || typeof query !== 'string' || !query.trim()) { + options?.onStateChange?.('errored') + return { success: false, error: 'query is required' } + } + + const paramsToSend: any = { query: query.trim() } + if (typeof num === 'number') paramsToSend.num = num + if (typeof type === 'string') paramsToSend.type = type + if (typeof gl === 'string') paramsToSend.gl = gl + if (typeof hl === 'string') paramsToSend.hl = hl + + const body = { + methodId: 'search_online', + params: paramsToSend, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(body), + }) + if (!response.ok) { + const e = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { success: false, error: e?.error || 'Failed to search online' } + } + const result = await response.json() + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Server method failed' } + } + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/read-gdrive-file.ts b/apps/sim/lib/copilot/tools/client-tools/read-gdrive-file.ts new file mode 100644 index 00000000000..9fe63be75a6 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/read-gdrive-file.ts @@ -0,0 +1,114 @@ +/** + * Read Google Drive File - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class ReadGDriveFileClientTool extends BaseTool { + static readonly id = 'read_gdrive_file' + + metadata: ToolMetadata = { + id: ReadGDriveFileClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Reading Google Drive file', icon: 'spinner' }, + success: { displayName: 'Read Google Drive file', icon: 'file' }, + rejected: { displayName: 'Skipped reading file', icon: 'skip' }, + errored: { displayName: 'Failed to read file', icon: 'error' }, + aborted: { displayName: 'Aborted reading file', icon: 'abort' }, + }, + }, + schema: { + name: ReadGDriveFileClientTool.id, + description: 'Read contents from a Google Drive doc or sheet', + parameters: { + type: 'object', + properties: { + userId: { type: 'string' }, + fileId: { type: 'string' }, + type: { type: 'string', enum: ['doc', 'sheet'] }, + range: { type: 'string' }, + }, + required: ['userId', 'fileId', 'type'], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('ReadGDriveFileClientTool') + const safeStringify = (o: any, m = 800) => { + try { + if (o === undefined) return 'undefined' + if (o === null) return 'null' + return JSON.stringify(o).substring(0, m) + } catch { + return '[unserializable]' + } + } + + try { + options?.onStateChange?.('executing') + const ext = toolCall as CopilotToolCall & { arguments?: any } + if (ext.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = ext.arguments + toolCall.parameters = ext.arguments + } + const provided = toolCall.parameters || toolCall.input || ext.arguments || {} + + const userId = provided.userId || provided.user_id || '' + const fileId = provided.fileId || provided.file_id || '' + const type = provided.type || provided.kind || '' + const range = provided.range + + if (!userId || !fileId || !type) { + options?.onStateChange?.('errored') + return { success: false, error: 'userId, fileId and type are required' } + } + + const paramsToSend: any = { userId, fileId, type } + if (typeof range === 'string' && range.trim()) paramsToSend.range = range.trim() + + const body = { + methodId: 'read_gdrive_file', + params: paramsToSend, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(body), + }) + if (!response.ok) { + const e = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { success: false, error: e?.error || 'Failed to read file' } + } + + const result = await response.json() + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Server method failed' } + } + + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/run-workflow.ts b/apps/sim/lib/copilot/tools/client-tools/run-workflow.ts index b551e3a574d..c70a2612336 100644 --- a/apps/sim/lib/copilot/tools/client-tools/run-workflow.ts +++ b/apps/sim/lib/copilot/tools/client-tools/run-workflow.ts @@ -9,6 +9,7 @@ import type { ToolExecutionOptions, ToolMetadata, } from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' import { executeWorkflowWithFullLogging } from '@/app/workspace/[workspaceId]/w/[workflowId]/lib/workflow-execution-utils' import { useExecutionStore } from '@/stores/execution/store' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' @@ -101,11 +102,30 @@ export class RunWorkflowTool extends BaseTool { toolCall: CopilotToolCall, options?: ToolExecutionOptions ): Promise { + const logger = createLogger('RunWorkflowTool') try { - // Parse parameters from either toolCall.parameters or toolCall.input + // Parse parameters from either toolCall.parameters or toolCall.input, support streaming arguments + const ext = toolCall as CopilotToolCall & { arguments?: any } + if (ext.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = ext.arguments + toolCall.parameters = ext.arguments + logger.info('Mapped arguments to input/parameters', { + toolCallId: toolCall.id, + }) + } + + options?.onStateChange?.('executing') + const rawParams = toolCall.parameters || toolCall.input || {} const params = rawParams as RunWorkflowParams + logger.info('Starting run_workflow execution', { + toolCallId: toolCall.id, + hasWorkflowId: !!params.workflowId, + hasDescription: !!params.description, + hasInput: !!params.workflow_input, + }) + // Check if workflow is already executing const { isExecuting } = useExecutionStore.getState() if (isExecuting) { @@ -137,18 +157,13 @@ export class RunWorkflowTool extends BaseTool { const { setIsExecuting } = useExecutionStore.getState() setIsExecuting(true) - // Note: toolCall.state is already set to 'executing' by clientAcceptTool - // Capture the execution timestamp const executionStartTime = new Date().toISOString() - - // Store execution start time in context for background notifications if (options?.context) { options.context.executionStartTime = executionStartTime } // Use the standalone execution utility with full logging support - // This works for both deployed and non-deployed workflows const result = await executeWorkflowWithFullLogging({ workflowInput, executionId: toolCall.id, // Use tool call ID as execution ID @@ -157,11 +172,35 @@ export class RunWorkflowTool extends BaseTool { // Reset execution state setIsExecuting(false) + const postCompletion = async ( + status: 'success' | 'errored' | 'rejected', + message: string + ) => { + const body = { + methodId: 'run_workflow', + params: { + source: 'run_workflow', + status, + message, + workflowId: params.workflowId || activeWorkflowId, + description: params.description, + startedAt: executionStartTime, + finishedAt: new Date().toISOString(), + }, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(body), + }) + } + // Check if execution was successful if (result && (!('success' in result) || result.success !== false)) { - // Notify server of success with execution timestamp - await this.notify( - toolCall.id, + await postCompletion( 'success', `Workflow execution completed successfully. Started at: ${executionStartTime}` ) @@ -187,7 +226,8 @@ export class RunWorkflowTool extends BaseTool { targetState === 'rejected' ? `Workflow execution skipped (failed dependency): ${errorMessage}` : `Workflow execution failed: ${errorMessage}` - await this.notify(toolCall.id, targetState, message) + + await postCompletion(targetState, message) options?.onStateChange?.(targetState) @@ -205,7 +245,24 @@ export class RunWorkflowTool extends BaseTool { // Check if failedDependency is true to notify 'rejected' instead of 'errored' const targetState = failedDependency === true ? 'rejected' : 'errored' - await this.notify(toolCall.id, targetState, `Workflow execution failed: ${errorMessage}`) + + // Post completion to methods route + await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ + methodId: 'run_workflow', + params: { + source: 'run_workflow', + status: targetState, + message: `Workflow execution failed: ${errorMessage}`, + finishedAt: new Date().toISOString(), + }, + toolCallId: toolCall.id, + toolId: toolCall.id, + }), + }) options?.onStateChange?.(targetState) diff --git a/apps/sim/lib/copilot/tools/client-tools/search-documentation.ts b/apps/sim/lib/copilot/tools/client-tools/search-documentation.ts new file mode 100644 index 00000000000..890345435ba --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/search-documentation.ts @@ -0,0 +1,175 @@ +/** + * Search Documentation - Client-side wrapper that posts to methods route + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class SearchDocumentationClientTool extends BaseTool { + static readonly id = 'search_documentation' + + metadata: ToolMetadata = { + id: SearchDocumentationClientTool.id, + displayConfig: { + states: { + executing: { displayName: 'Searching documentation', icon: 'spinner' }, + success: { displayName: 'Searched documentation', icon: 'file' }, + rejected: { displayName: 'Skipped documentation search', icon: 'skip' }, + errored: { displayName: 'Failed to search documentation', icon: 'error' }, + aborted: { displayName: 'Documentation search aborted', icon: 'x' }, + }, + }, + schema: { + name: SearchDocumentationClientTool.id, + description: 'Search through documentation', + parameters: { + type: 'object', + properties: { + query: { type: 'string', description: 'Search query' }, + topK: { type: 'number', description: 'Number of results to return' }, + threshold: { type: 'number', description: 'Similarity threshold' }, + }, + required: ['query'], + }, + }, + requiresInterrupt: false, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('SearchDocumentationClientTool') + + // Safe stringify helper + const safeStringify = (obj: any, maxLength = 500): string => { + try { + if (obj === undefined) return 'undefined' + if (obj === null) return 'null' + const str = JSON.stringify(obj) + return str ? str.substring(0, maxLength) : 'empty' + } catch (e) { + return `[stringify error: ${e}]` + } + } + + try { + options?.onStateChange?.('executing') + + // Extended tool call interface to handle streaming arguments + const extendedToolCall = toolCall as CopilotToolCall & { arguments?: any } + + // The streaming API provides 'arguments', but CopilotToolCall expects 'input' or 'parameters' + // Map arguments to input/parameters if they don't exist + if (extendedToolCall.arguments && !toolCall.input && !toolCall.parameters) { + toolCall.input = extendedToolCall.arguments + toolCall.parameters = extendedToolCall.arguments + logger.info('Mapped arguments to input/parameters', { + arguments: safeStringify(extendedToolCall.arguments), + }) + } + + // Log the raw tool call to understand what we're receiving + try { + logger.info('Received tool call', { + toolCallId: toolCall.id, + hasParameters: !!toolCall.parameters, + hasInput: !!toolCall.input, + hasArguments: !!extendedToolCall.arguments, + }) + } catch (logError) { + logger.error('Error logging raw tool call:', logError) + } + + // Handle different possible sources of parameters + // Priority: parameters > input > arguments (all should be the same now) + const provided = toolCall.parameters || toolCall.input || extendedToolCall.arguments || {} + + logger.info('Parameter sources', { + hasArguments: !!extendedToolCall.arguments, + hasParameters: !!toolCall.parameters, + hasInput: !!toolCall.input, + }) + + // Extract search parameters + const query = provided.query || provided.search || provided.q || '' + const topK = provided.topK || provided.top_k || provided.limit || 10 + const threshold = provided.threshold || provided.similarity_threshold || undefined + + logger.info('Extracted search parameters', { + hasQuery: !!query, + topK, + hasThreshold: threshold !== undefined, + }) + + if (!query || typeof query !== 'string' || query.trim().length === 0) { + logger.error('No valid query provided', { + query, + queryType: typeof query, + provided: safeStringify(provided), + }) + options?.onStateChange?.('errored') + return { success: false, error: 'Search query is required' } + } + + const paramsToSend = { + query: query.trim(), + topK, + ...(threshold !== undefined && { threshold }), + } + + const requestBody = { + methodId: 'search_documentation', + params: paramsToSend, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + + logger.info('Sending request to methods route', { url: '/api/copilot/methods' }) + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(requestBody), + }) + + logger.info('Methods route response received', { status: response.status }) + + if (!response.ok) { + const errorData = await response.json().catch(() => ({})) + logger.error('Methods route error', { + status: response.status, + error: errorData, + }) + options?.onStateChange?.('errored') + return { success: false, error: errorData?.error || 'Failed to search documentation' } + } + + const result = await response.json() + + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Documentation search failed' } + } + + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + logger.error('Error in client tool execution:', { + toolCallId: toolCall.id, + error: error, + message: error instanceof Error ? error.message : String(error), + stack: error instanceof Error ? error.stack : undefined, + }) + options?.onStateChange?.('errored') + return { success: false, error: error.message || 'Failed to search documentation' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/client-tools/set-environment-variables.ts b/apps/sim/lib/copilot/tools/client-tools/set-environment-variables.ts new file mode 100644 index 00000000000..780d4f6cf30 --- /dev/null +++ b/apps/sim/lib/copilot/tools/client-tools/set-environment-variables.ts @@ -0,0 +1,98 @@ +/** + * Set Environment Variables - Client-side wrapper that posts to methods route (requires interrupt) + */ + +import { BaseTool } from '@/lib/copilot/tools/base-tool' +import type { + CopilotToolCall, + ToolExecuteResult, + ToolExecutionOptions, + ToolMetadata, +} from '@/lib/copilot/tools/types' +import { createLogger } from '@/lib/logs/console/logger' + +export class SetEnvironmentVariablesClientTool extends BaseTool { + static readonly id = 'set_environment_variables' + + metadata: ToolMetadata = { + id: SetEnvironmentVariablesClientTool.id, + displayConfig: { + states: { + pending: { displayName: 'Set environment variables?', icon: 'edit' }, + executing: { displayName: 'Setting environment variables', icon: 'spinner' }, + success: { displayName: 'Set environment variables', icon: 'wrench' }, + rejected: { displayName: 'Skipped setting environment variables', icon: 'skip' }, + errored: { displayName: 'Failed to set environment variables', icon: 'error' }, + background: { displayName: 'Setting moved to background', icon: 'wrench' }, + aborted: { displayName: 'Aborted setting environment variables', icon: 'abort' }, + }, + }, + schema: { + name: SetEnvironmentVariablesClientTool.id, + description: 'Set environment variables for the active workflow', + parameters: { + type: 'object', + properties: { + variables: { type: 'object' }, + workflowId: { type: 'string' }, + }, + required: ['variables'], + }, + }, + requiresInterrupt: true, + } + + async execute( + toolCall: CopilotToolCall, + options?: ToolExecutionOptions + ): Promise { + const logger = createLogger('SetEnvironmentVariablesClientTool') + + try { + options?.onStateChange?.('executing') + const ext = toolCall as CopilotToolCall & { arguments?: any } + if (ext.arguments && !toolCall.parameters && !toolCall.input) { + toolCall.input = ext.arguments + toolCall.parameters = ext.arguments + } + const provided = toolCall.parameters || toolCall.input || ext.arguments || {} + + const variables = provided.variables || {} + const workflowId = provided.workflowId + + if (!variables || typeof variables !== 'object' || Object.keys(variables).length === 0) { + options?.onStateChange?.('errored') + return { success: false, error: 'variables is required' } + } + + const requestBody = { + methodId: 'set_environment_variables', + params: { variables, ...(workflowId ? { workflowId } : {}) }, + toolCallId: toolCall.id, + toolId: toolCall.id, + } + + const response = await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify(requestBody), + }) + if (!response.ok) { + const e = await response.json().catch(() => ({})) + options?.onStateChange?.('errored') + return { success: false, error: e?.error || 'Failed to set environment variables' } + } + const result = await response.json() + if (!result.success) { + options?.onStateChange?.('errored') + return { success: false, error: result.error || 'Server method failed' } + } + options?.onStateChange?.('success') + return { success: true, data: result.data } + } catch (error: any) { + options?.onStateChange?.('errored') + return { success: false, error: error?.message || 'Unexpected error' } + } + } +} diff --git a/apps/sim/lib/copilot/tools/inline-tool-call.tsx b/apps/sim/lib/copilot/tools/inline-tool-call.tsx index 0da4de26b4b..8062b86c559 100644 --- a/apps/sim/lib/copilot/tools/inline-tool-call.tsx +++ b/apps/sim/lib/copilot/tools/inline-tool-call.tsx @@ -96,11 +96,29 @@ async function rejectTool( setToolCallState(toolCall, 'rejected') try { - // Notify server for both client and server tools + // Notify server for both client and server tools (legacy noop) await notifyServerTool(toolCall.id, toolCall.name, 'rejected') } catch (error) { console.error('Failed to notify server of tool rejection:', error) } + + try { + // Also trigger the agent completion via methods route using no_op + const confirmationMessage = `User skipped tool: ${toolCall.name}` + await fetch('/api/copilot/methods', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ + methodId: 'no_op', + params: { confirmationMessage }, + toolCallId: toolCall.id, + toolId: toolCall.id, + }), + }) + } catch (error) { + console.error('Failed to notify agent of skip via complete-tool:', error) + } } // Function to get tool display name based on state diff --git a/apps/sim/lib/copilot/tools/notification-utils.ts b/apps/sim/lib/copilot/tools/notification-utils.ts index 219ab6b013a..d9b059bff04 100644 --- a/apps/sim/lib/copilot/tools/notification-utils.ts +++ b/apps/sim/lib/copilot/tools/notification-utils.ts @@ -6,12 +6,6 @@ import { toolRegistry } from '@/lib/copilot/tools/registry' import type { NotificationStatus, ToolState } from '@/lib/copilot/tools/types' -/** - * Send a notification for a tool state change - * @param toolId - The unique identifier for the tool call - * @param toolName - The name of the tool (e.g., 'set_environment_variables') - * @param toolState - The current state of the tool - */ /** * Maps tool states to notification statuses */ @@ -48,36 +42,20 @@ export async function notify( toolState: ToolState, executionStartTime?: string ): Promise { - // toolState must be in STATE_MAPPINGS - const notificationStatus = STATE_MAPPINGS[toolState] - if (!notificationStatus) { - throw new Error(`Invalid tool state: ${toolState}`) - } - - // Get the state message from tool metadata + // Previously called the confirm API (Redis-backed). Now a no-op with optional console log. const metadata = toolRegistry.getToolMetadata(toolId) - let stateMessage = metadata?.stateMessages?.[notificationStatus] - - // If no message from metadata, provide default messages - if (!stateMessage) { - if (notificationStatus === 'background') { - const timeInfo = executionStartTime ? ` Started at: ${executionStartTime}.` : '' - stateMessage = `The user has moved tool execution to the background and it is not complete, it will run asynchronously.${timeInfo}` - } else { - stateMessage = '' - } + const status = STATE_MAPPINGS[toolState] + const message = metadata?.stateMessages?.[status as NotificationStatus] + // Intentionally do nothing server-side; client tools update UI state locally. + if (process.env.NODE_ENV !== 'production') { + // eslint-disable-next-line no-console + console.debug('[CopilotNotify] (noop)', { + toolId, + toolName, + toolState, + status, + message, + executionStartTime, + }) } - - // Call backend confirm route - await fetch('/api/copilot/confirm', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - toolCallId: toolId, - status: notificationStatus, - message: stateMessage, - }), - }) } diff --git a/apps/sim/lib/copilot/tools/registry.ts b/apps/sim/lib/copilot/tools/registry.ts index 1d4a718369b..1b59e11ff02 100644 --- a/apps/sim/lib/copilot/tools/registry.ts +++ b/apps/sim/lib/copilot/tools/registry.ts @@ -8,9 +8,22 @@ * It also provides metadata for server-side tools for display purposes */ +import { BuildWorkflowClientTool } from '@/lib/copilot/tools/client-tools/build-workflow' +import { EditWorkflowClientTool } from '@/lib/copilot/tools/client-tools/edit-workflow' import { GDriveRequestAccessTool } from '@/lib/copilot/tools/client-tools/gdrive-request-access' +import { GetBlocksAndToolsClientTool } from '@/lib/copilot/tools/client-tools/get-blocks-and-tools' +import { GetBlocksMetadataClientTool } from '@/lib/copilot/tools/client-tools/get-blocks-metadata' +import { GetEnvironmentVariablesClientTool } from '@/lib/copilot/tools/client-tools/get-environment-variables' +import { GetOAuthCredentialsClientTool } from '@/lib/copilot/tools/client-tools/get-oauth-credentials' import { GetUserWorkflowTool } from '@/lib/copilot/tools/client-tools/get-user-workflow' +import { GetWorkflowConsoleClientTool } from '@/lib/copilot/tools/client-tools/get-workflow-console' +import { ListGDriveFilesClientTool } from '@/lib/copilot/tools/client-tools/list-gdrive-files' +import { MakeApiRequestClientTool } from '@/lib/copilot/tools/client-tools/make-api-request' +import { OnlineSearchClientTool } from '@/lib/copilot/tools/client-tools/online-search' +import { ReadGDriveFileClientTool } from '@/lib/copilot/tools/client-tools/read-gdrive-file' import { RunWorkflowTool } from '@/lib/copilot/tools/client-tools/run-workflow' +import { SearchDocumentationClientTool } from '@/lib/copilot/tools/client-tools/search-documentation' +import { SetEnvironmentVariablesClientTool } from '@/lib/copilot/tools/client-tools/set-environment-variables' import { SERVER_TOOL_METADATA } from '@/lib/copilot/tools/server-tools/definitions' import type { Tool, ToolMetadata } from '@/lib/copilot/tools/types' @@ -116,6 +129,19 @@ export class ToolRegistry { this.register(new RunWorkflowTool()) this.register(new GetUserWorkflowTool()) this.register(new GDriveRequestAccessTool()) + this.register(new GetBlocksAndToolsClientTool()) + this.register(new GetEnvironmentVariablesClientTool()) + this.register(new GetOAuthCredentialsClientTool()) + this.register(new GetBlocksMetadataClientTool()) + this.register(new SearchDocumentationClientTool()) + this.register(new OnlineSearchClientTool()) + this.register(new ListGDriveFilesClientTool()) + this.register(new ReadGDriveFileClientTool()) + this.register(new GetWorkflowConsoleClientTool()) + this.register(new MakeApiRequestClientTool()) + this.register(new SetEnvironmentVariablesClientTool()) + this.register(new BuildWorkflowClientTool()) + this.register(new EditWorkflowClientTool()) } } diff --git a/apps/sim/lib/copilot/tools/server-tools/blocks/get-blocks-metadata.ts b/apps/sim/lib/copilot/tools/server-tools/blocks/get-blocks-metadata.ts index 28e01e8b493..bbc5014cc9c 100644 --- a/apps/sim/lib/copilot/tools/server-tools/blocks/get-blocks-metadata.ts +++ b/apps/sim/lib/copilot/tools/server-tools/blocks/get-blocks-metadata.ts @@ -22,7 +22,24 @@ class GetBlocksMetadataTool extends BaseCopilotTool { - return getBlocksMetadata(params) + logger.info('=== GetBlocksMetadataTool.executeImpl START ===', { + params: JSON.stringify(params), + hasParams: !!params, + paramsKeys: params ? Object.keys(params) : [], + timestamp: new Date().toISOString(), + }) + + const result = await getBlocksMetadata(params) + + logger.info('=== GetBlocksMetadataTool.executeImpl COMPLETE ===', { + success: result.success, + hasData: !!result.data, + dataKeys: result.data ? Object.keys(result.data) : [], + error: result.error, + timestamp: new Date().toISOString(), + }) + + return result } } @@ -33,14 +50,37 @@ export const getBlocksMetadataTool = new GetBlocksMetadataTool() * Safely resolve subblock options, handling both static arrays and functions */ function resolveSubBlockOptions(options: any): any[] { + logger.info('resolveSubBlockOptions called', { + optionsType: typeof options, + isFunction: typeof options === 'function', + isArray: Array.isArray(options), + }) + try { if (typeof options === 'function') { + logger.info('Options is a function, attempting to resolve') const resolved = options() + logger.info('Function resolved', { + resultType: typeof resolved, + isArray: Array.isArray(resolved), + count: Array.isArray(resolved) ? resolved.length : 0, + }) return Array.isArray(resolved) ? resolved : [] } + + if (Array.isArray(options)) { + logger.info('Options is an array', { + count: options.length, + sample: options.slice(0, 3), + }) + } + return Array.isArray(options) ? options : [] } catch (error) { - logger.warn('Failed to resolve subblock options:', error) + logger.warn('Failed to resolve subblock options:', { + error: error instanceof Error ? error.message : 'Unknown error', + optionsType: typeof options, + }) return [] } } @@ -49,11 +89,34 @@ function resolveSubBlockOptions(options: any): any[] { * Process subBlocks configuration to include all UI metadata */ function processSubBlocks(subBlocks: any[]): any[] { + logger.info('processSubBlocks called', { + isArray: Array.isArray(subBlocks), + count: Array.isArray(subBlocks) ? subBlocks.length : 0, + }) + if (!Array.isArray(subBlocks)) { + logger.warn('subBlocks is not an array', { + type: typeof subBlocks, + }) return [] } - return subBlocks.map((subBlock) => { + logger.info('Processing subBlocks array', { + totalCount: subBlocks.length, + subBlockIds: subBlocks.map((sb) => sb.id), + }) + + return subBlocks.map((subBlock, index) => { + logger.info(`Processing subBlock at index ${index}`, { + id: subBlock.id, + type: subBlock.type, + title: subBlock.title, + hasOptions: !!subBlock.options, + optionsType: subBlock.options ? typeof subBlock.options : undefined, + hasCondition: !!subBlock.condition, + required: subBlock.required, + }) + const processedSubBlock: any = { id: subBlock.id, title: subBlock.title, @@ -95,20 +158,47 @@ function processSubBlocks(subBlocks: any[]): any[] { // Resolve options if present if (subBlock.options) { + logger.info(`Resolving options for subBlock ${subBlock.id}`) try { const resolvedOptions = resolveSubBlockOptions(subBlock.options) - processedSubBlock.options = resolvedOptions.map((option) => ({ - label: option.label, - id: option.id, - // Note: Icons are React components, so we'll just indicate if they exist - hasIcon: !!option.icon, - })) + logger.info(`Options resolved for subBlock ${subBlock.id}`, { + count: resolvedOptions.length, + hasOptions: resolvedOptions.length > 0, + }) + + processedSubBlock.options = resolvedOptions.map((option) => { + const processedOption = { + label: option.label, + id: option.id, + // Note: Icons are React components, so we'll just indicate if they exist + hasIcon: !!option.icon, + } + logger.info(`Processed option for subBlock ${subBlock.id}`, { + optionId: option.id, + label: option.label, + hasIcon: !!option.icon, + }) + return processedOption + }) } catch (error) { - logger.warn(`Failed to resolve options for subBlock ${subBlock.id}:`, error) + logger.warn(`Failed to resolve options for subBlock ${subBlock.id}:`, { + error: error instanceof Error ? error.message : 'Unknown error', + }) processedSubBlock.options = [] } } + // Count defined properties before filtering + const definedPropsCount = Object.entries(processedSubBlock).filter( + ([_, value]) => value !== undefined + ).length + logger.info(`SubBlock ${subBlock.id} processed`, { + totalProps: Object.keys(processedSubBlock).length, + definedProps: definedPropsCount, + hasOptions: !!processedSubBlock.options, + optionsCount: processedSubBlock.options ? processedSubBlock.options.length : 0, + }) + // Remove undefined properties to keep the response clean return Object.fromEntries( Object.entries(processedSubBlock).filter(([_, value]) => value !== undefined) @@ -120,16 +210,49 @@ function processSubBlocks(subBlocks: any[]): any[] { export async function getBlocksMetadata( params: GetBlocksMetadataParams ): Promise { + logger.info('=== getBlocksMetadata FUNCTION START ===', { + receivedParams: JSON.stringify(params), + paramsType: typeof params, + timestamp: new Date().toISOString(), + }) + const { blockIds } = params + // Validation logs + try { + logger.info('VALIDATION: get_blocks_metadata received params', { + hasParams: params !== undefined && params !== null, + paramsType: typeof params, + paramsKeys: params ? Object.keys(params) : [], + hasBlockIds: blockIds !== undefined, + blockIdsType: + blockIds === undefined ? 'undefined' : Array.isArray(blockIds) ? 'array' : typeof blockIds, + isArray: Array.isArray(blockIds), + blockIdsCount: Array.isArray(blockIds) ? blockIds.length : null, + blockIdsPreview: Array.isArray(blockIds) ? blockIds.slice(0, 10) : undefined, + rawBlockIds: blockIds, + }) + } catch (err) { + logger.error('VALIDATION: Error during parameter validation logging', { + error: err instanceof Error ? err.message : 'Unknown error', + }) + } + if (!blockIds || !Array.isArray(blockIds)) { + logger.error('VALIDATION FAILED: blockIds is not an array', { + blockIds, + blockIdsType: typeof blockIds, + isArray: Array.isArray(blockIds), + isNull: blockIds === null, + isUndefined: blockIds === undefined, + }) return { success: false, error: 'blockIds must be an array of block IDs', } } - logger.info('Getting block metadata', { + logger.info('Getting block metadata - VALIDATION PASSED', { blockIds, blockCount: blockIds.length, requestedBlocks: blockIds.join(', '), @@ -141,13 +264,30 @@ export async function getBlocksMetadata( logger.info('=== GET BLOCKS METADATA DEBUG ===') logger.info('Requested block IDs:', blockIds) + logger.info('Starting to process blocks', { + totalBlocks: blockIds.length, + blockRegistry: !!blockRegistry, + specialBlocksMetadata: !!SPECIAL_BLOCKS_METADATA, + }) // Process each requested block ID for (const blockId of blockIds) { logger.info(`\n--- Processing block: ${blockId} ---`) + logger.info(`Processing block iteration`, { + currentBlock: blockId, + index: blockIds.indexOf(blockId), + total: blockIds.length, + }) + let metadata: any = {} // Check if it's a special block first + const isSpecialBlock = !!SPECIAL_BLOCKS_METADATA[blockId] + logger.info(`Checking if ${blockId} is a special block`, { + isSpecialBlock, + specialBlocksKeys: Object.keys(SPECIAL_BLOCKS_METADATA), + }) + if (SPECIAL_BLOCKS_METADATA[blockId]) { logger.info(`✓ Found ${blockId} in SPECIAL_BLOCKS_METADATA`) // Start with the special block metadata @@ -155,14 +295,39 @@ export async function getBlocksMetadata( // Normalize tools structure to match regular blocks metadata.tools = metadata.tools?.access || [] logger.info(`Initial metadata keys for ${blockId}:`, Object.keys(metadata)) + logger.info(`Special block metadata loaded`, { + blockId, + metadataKeys: Object.keys(metadata), + hasSubBlocks: !!metadata.subBlocks, + subBlocksCount: metadata.subBlocks ? metadata.subBlocks.length : 0, + tools: metadata.tools, + }) } else { // Check if the block exists in the registry + logger.info(`Checking block registry for ${blockId}`, { + registryKeys: Object.keys(blockRegistry).slice(0, 10), + hasBlock: !!blockRegistry[blockId], + }) + const blockConfig = blockRegistry[blockId] if (!blockConfig) { - logger.warn(`Block not found in registry: ${blockId}`) + logger.warn(`Block not found in registry: ${blockId}`, { + availableBlocks: Object.keys(blockRegistry).slice(0, 20), + }) continue } + logger.info(`Found ${blockId} in block registry`, { + hasName: !!blockConfig.name, + hasDescription: !!blockConfig.description, + hasSubBlocks: !!blockConfig.subBlocks, + subBlocksCount: blockConfig.subBlocks ? blockConfig.subBlocks.length : 0, + hasInputs: !!blockConfig.inputs, + hasOutputs: !!blockConfig.outputs, + hasTools: !!blockConfig.tools, + category: blockConfig.category, + }) + metadata = { id: blockId, name: blockConfig.name || blockId, @@ -179,8 +344,19 @@ export async function getBlocksMetadata( // Process and include subBlocks configuration if (blockConfig.subBlocks && Array.isArray(blockConfig.subBlocks)) { logger.info(`Processing ${blockConfig.subBlocks.length} subBlocks for ${blockId}`) - metadata.subBlocks = processSubBlocks(blockConfig.subBlocks) - logger.info(`✓ Processed subBlocks for ${blockId}:`, metadata.subBlocks.length) + + try { + metadata.subBlocks = processSubBlocks(blockConfig.subBlocks) + logger.info(`✓ Processed subBlocks for ${blockId}:`, { + count: metadata.subBlocks.length, + subBlockIds: metadata.subBlocks.map((sb: any) => sb.id), + }) + } catch (err) { + logger.error(`Failed to process subBlocks for ${blockId}`, { + error: err instanceof Error ? err.message : 'Unknown error', + }) + metadata.subBlocks = [] + } } else { logger.info(`No subBlocks found for ${blockId}`) metadata.subBlocks = [] @@ -189,18 +365,25 @@ export async function getBlocksMetadata( // Read YAML schema from documentation if available (for both regular and special blocks) const docFileName = DOCS_FILE_MAPPING[blockId] || blockId - logger.info( - `Checking if ${blockId} is in CORE_BLOCKS_WITH_DOCS:`, - CORE_BLOCKS_WITH_DOCS.includes(blockId) - ) + logger.info(`Checking documentation for ${blockId}`, { + docFileName, + isInCoreBlocks: CORE_BLOCKS_WITH_DOCS.includes(blockId), + coreBlocksList: CORE_BLOCKS_WITH_DOCS, + }) if (CORE_BLOCKS_WITH_DOCS.includes(blockId)) { try { // Updated path to point to the actual YAML documentation location // Handle both monorepo root and apps/sim as working directory const workingDir = process.cwd() + logger.info(`Current working directory: ${workingDir}`) + const isInAppsSim = workingDir.endsWith('/apps/sim') || workingDir.endsWith('\\apps\\sim') + logger.info(`Is in apps/sim: ${isInAppsSim}`) + const basePath = isInAppsSim ? join(workingDir, '..', '..') : workingDir + logger.info(`Base path for docs: ${basePath}`) + const docPath = join( basePath, 'apps', @@ -212,27 +395,43 @@ export async function getBlocksMetadata( `${docFileName}.mdx` ) logger.info(`Looking for docs at: ${docPath}`) - logger.info(`File exists: ${existsSync(docPath)}`) - if (existsSync(docPath)) { + const fileExists = existsSync(docPath) + logger.info(`File exists: ${fileExists}`) + + if (fileExists) { const docContent = readFileSync(docPath, 'utf-8') logger.info(`Doc content length: ${docContent.length}`) + logger.info(`Doc content preview: ${docContent.substring(0, 200)}...`) // Include the entire YAML documentation content metadata.yamlDocumentation = docContent - logger.info(`✓ Added full YAML documentation for ${blockId}`) + logger.info(`✓ Added full YAML documentation for ${blockId}`, { + docLength: docContent.length, + hasYamlBlock: docContent.includes('```yaml'), + }) } else { - logger.warn(`Documentation file not found for ${blockId}`) + logger.warn(`Documentation file not found for ${blockId}`, { + attemptedPath: docPath, + }) } } catch (error) { - logger.warn(`Failed to read documentation for ${blockId}:`, error) + logger.warn(`Failed to read documentation for ${blockId}:`, { + error: error instanceof Error ? error.message : 'Unknown error', + stack: error instanceof Error ? error.stack : undefined, + }) } } else { - logger.info(`${blockId} is NOT in CORE_BLOCKS_WITH_DOCS`) + logger.info(`${blockId} is NOT in CORE_BLOCKS_WITH_DOCS, skipping documentation`) } // Add tool metadata if requested if (metadata.tools && metadata.tools.length > 0) { + logger.info(`Processing tool details for ${blockId}`, { + toolCount: metadata.tools.length, + toolIds: metadata.tools, + }) + metadata.toolDetails = {} for (const toolId of metadata.tools) { const tool = toolsRegistry[toolId] @@ -241,6 +440,11 @@ export async function getBlocksMetadata( name: tool.name, description: tool.description, } + logger.info(`Added tool detail for ${toolId}`, { + name: tool.name, + }) + } else { + logger.warn(`Tool not found in registry: ${toolId}`) } } } @@ -248,6 +452,14 @@ export async function getBlocksMetadata( logger.info(`Final metadata keys for ${blockId}:`, Object.keys(metadata)) logger.info(`Has YAML documentation: ${!!metadata.yamlDocumentation}`) logger.info(`Has subBlocks: ${!!metadata.subBlocks && metadata.subBlocks.length > 0}`) + logger.info(`Block ${blockId} processing complete`, { + metadataKeys: Object.keys(metadata), + hasYamlDoc: !!metadata.yamlDocumentation, + yamlDocLength: metadata.yamlDocumentation ? metadata.yamlDocumentation.length : 0, + subBlocksCount: metadata.subBlocks ? metadata.subBlocks.length : 0, + toolsCount: metadata.tools ? metadata.tools.length : 0, + toolDetailsCount: metadata.toolDetails ? Object.keys(metadata.toolDetails).length : 0, + }) result[blockId] = metadata } @@ -255,6 +467,17 @@ export async function getBlocksMetadata( logger.info('\n=== FINAL RESULT ===') logger.info(`Successfully retrieved metadata for ${Object.keys(result).length} blocks`) logger.info('Result keys:', Object.keys(result)) + logger.info('Detailed result summary:', { + totalBlocks: Object.keys(result).length, + blockIds: Object.keys(result), + blocksWithYaml: Object.keys(result).filter((id) => result[id].yamlDocumentation).length, + blocksWithSubBlocks: Object.keys(result).filter( + (id) => result[id].subBlocks && result[id].subBlocks.length > 0 + ).length, + blocksWithTools: Object.keys(result).filter( + (id) => result[id].tools && result[id].tools.length > 0 + ).length, + }) // Log the full result for parallel block if it's included if (result.parallel) { @@ -264,12 +487,23 @@ export async function getBlocksMetadata( } } + logger.info('=== getBlocksMetadata FUNCTION COMPLETE ===', { + success: true, + resultCount: Object.keys(result).length, + timestamp: new Date().toISOString(), + }) + return { success: true, data: result, } } catch (error) { - logger.error('Get block metadata failed', error) + logger.error('Get block metadata failed', { + error: error instanceof Error ? error.message : 'Unknown error', + stack: error instanceof Error ? error.stack : undefined, + blockIds, + timestamp: new Date().toISOString(), + }) return { success: false, error: `Failed to get block metadata: ${error instanceof Error ? error.message : 'Unknown error'}`, diff --git a/apps/sim/lib/copilot/tools/server-tools/docs/search-docs.ts b/apps/sim/lib/copilot/tools/server-tools/docs/search-docs.ts index b5837dc0d37..959207b61c5 100644 --- a/apps/sim/lib/copilot/tools/server-tools/docs/search-docs.ts +++ b/apps/sim/lib/copilot/tools/server-tools/docs/search-docs.ts @@ -5,6 +5,8 @@ import { db } from '@/db' import { docsEmbeddings } from '@/db/schema' import { BaseCopilotTool } from '../base' +const logger = createLogger('SearchDocsTool') + interface DocsSearchParams { query: string topK?: number @@ -30,7 +32,29 @@ class SearchDocsTool extends BaseCopilotTool readonly displayName = 'Searching documentation' protected async executeImpl(params: DocsSearchParams): Promise { - return searchDocs(params) + logger.info('=== SearchDocsTool.executeImpl START ===', { + params: JSON.stringify(params), + hasParams: !!params, + paramsKeys: params ? Object.keys(params) : [], + query: params?.query, + queryLength: params?.query?.length, + topK: params?.topK, + threshold: params?.threshold, + timestamp: new Date().toISOString(), + }) + + const result = await searchDocs(params) + + logger.info('=== SearchDocsTool.executeImpl COMPLETE ===', { + resultsCount: result.results.length, + totalResults: result.totalResults, + query: result.query, + hasResults: result.results.length > 0, + topSimilarity: result.results[0]?.similarity, + timestamp: new Date().toISOString(), + }) + + return result } } @@ -39,28 +63,90 @@ export const searchDocsTool = new SearchDocsTool() // Implementation function async function searchDocs(params: DocsSearchParams): Promise { - const logger = createLogger('DocsSearch') + logger.info('=== searchDocs FUNCTION START ===', { + receivedParams: JSON.stringify(params), + paramsType: typeof params, + timestamp: new Date().toISOString(), + }) + const { query, topK = 10, threshold } = params - logger.info('Executing docs search for copilot', { + // Validation logs + logger.info('VALIDATION: search_documentation received params', { + hasQuery: !!query, + queryType: typeof query, + queryLength: query?.length, + queryPreview: query?.substring(0, 100), + topK, + topKType: typeof topK, + hasThreshold: threshold !== undefined, + threshold, + thresholdType: typeof threshold, + }) + + if (!query || typeof query !== 'string' || query.trim().length === 0) { + logger.error('VALIDATION FAILED: Invalid query', { + query, + queryType: typeof query, + isEmpty: query?.trim().length === 0, + }) + return { + results: [], + query: query || '', + totalResults: 0, + } + } + + logger.info('Executing docs search for copilot - VALIDATION PASSED', { query, + queryLength: query.length, topK, + hasCustomThreshold: threshold !== undefined, }) try { + logger.info('Getting copilot config for RAG settings') const config = getCopilotConfig() const similarityThreshold = threshold ?? config.rag.similarityThreshold + logger.info('Configuration loaded', { + similarityThreshold, + configThreshold: config.rag.similarityThreshold, + usingCustomThreshold: threshold !== undefined, + ragConfig: { + similarityThreshold: config.rag.similarityThreshold, + }, + }) + // Generate embedding for the query + logger.info('Importing embedding generation module') const { generateEmbeddings } = await import('@/app/api/knowledge/utils') - logger.info('About to generate embeddings for query', { query, queryLength: query.length }) + logger.info('About to generate embeddings for query', { + query, + queryLength: query.length, + queryWords: query.split(' ').length, + queryPreview: query.substring(0, 200), + }) + const startEmbedTime = Date.now() const embeddings = await generateEmbeddings([query]) + const embeddingDuration = Date.now() - startEmbedTime + + logger.info('Embedding generation complete', { + duration: embeddingDuration, + embeddingsCount: embeddings.length, + hasEmbedding: !!embeddings[0], + }) + const queryEmbedding = embeddings[0] if (!queryEmbedding || queryEmbedding.length === 0) { - logger.warn('Failed to generate query embedding') + logger.warn('Failed to generate query embedding', { + queryEmbedding, + embeddingsLength: embeddings.length, + firstEmbedding: embeddings[0], + }) return { results: [], query, @@ -70,9 +156,19 @@ async function searchDocs(params: DocsSearchParams): Promise { logger.info('Successfully generated query embedding', { embeddingLength: queryEmbedding.length, + embeddingType: typeof queryEmbedding, + isArray: Array.isArray(queryEmbedding), + firstValues: queryEmbedding.slice(0, 5), }) // Search docs embeddings using vector similarity + logger.info('Starting database vector similarity search', { + table: 'docsEmbeddings', + limit: topK, + vectorDimensions: queryEmbedding.length, + }) + + const startSearchTime = Date.now() const results = await db .select({ chunkId: docsEmbeddings.chunkId, @@ -87,20 +183,83 @@ async function searchDocs(params: DocsSearchParams): Promise { .orderBy(sql`${docsEmbeddings.embedding} <=> ${JSON.stringify(queryEmbedding)}::vector`) .limit(topK) + const searchDuration = Date.now() - startSearchTime + + logger.info('Database search complete', { + duration: searchDuration, + rawResultsCount: results.length, + hasResults: results.length > 0, + topSimilarity: results[0]?.similarity, + bottomSimilarity: results[results.length - 1]?.similarity, + }) + + // Log each raw result for debugging + results.forEach((result, index) => { + logger.info(`Raw result ${index + 1}/${results.length}`, { + chunkId: result.chunkId, + similarity: result.similarity, + hasChunkText: !!result.chunkText, + chunkTextLength: result.chunkText?.length, + headerText: result.headerText, + headerLevel: result.headerLevel, + sourceDocument: result.sourceDocument, + sourceLink: result.sourceLink, + }) + }) + // Filter by similarity threshold + logger.info('Applying similarity threshold filter', { + threshold: similarityThreshold, + beforeCount: results.length, + }) + const filteredResults = results.filter((result) => result.similarity >= similarityThreshold) + logger.info('Similarity filter applied', { + afterCount: filteredResults.length, + filtered: results.length - filteredResults.length, + threshold: similarityThreshold, + passedThreshold: filteredResults.map((r) => r.similarity), + }) + const documentationResults: DocumentationSearchResult[] = filteredResults.map( - (result, index) => ({ - id: index + 1, - title: String(result.headerText || 'Untitled Section'), - url: String(result.sourceLink || '#'), - content: String(result.chunkText || ''), - similarity: result.similarity, - }) + (result, index) => { + const docResult = { + id: index + 1, + title: String(result.headerText || 'Untitled Section'), + url: String(result.sourceLink || '#'), + content: String(result.chunkText || ''), + similarity: result.similarity, + } + + logger.info(`Processing documentation result ${index + 1}/${filteredResults.length}`, { + id: docResult.id, + title: docResult.title, + url: docResult.url, + contentLength: docResult.content.length, + similarity: docResult.similarity, + contentPreview: docResult.content.substring(0, 100), + }) + + return docResult + } ) - logger.info(`Found ${documentationResults.length} documentation results`, { query }) + logger.info(`Found ${documentationResults.length} documentation results`, { + query, + totalResults: documentationResults.length, + topK, + threshold: similarityThreshold, + similarities: documentationResults.map((r) => r.similarity), + titles: documentationResults.map((r) => r.title), + }) + + logger.info('=== searchDocs FUNCTION COMPLETE ===', { + success: true, + resultsCount: documentationResults.length, + query, + timestamp: new Date().toISOString(), + }) return { results: documentationResults, @@ -114,7 +273,17 @@ async function searchDocs(params: DocsSearchParams): Promise { query, errorType: error?.constructor?.name, status: (error as any)?.status, + errorDetails: error, + timestamp: new Date().toISOString(), + }) + + logger.info('=== searchDocs FUNCTION ERROR ===', { + success: false, + error: error instanceof Error ? error.message : 'Unknown error', + query, + timestamp: new Date().toISOString(), }) + throw new Error( `Documentation search failed: ${error instanceof Error ? error.message : 'Unknown error'}` ) diff --git a/apps/sim/lib/copilot/tools/server-tools/other/gdrive-request-access.ts b/apps/sim/lib/copilot/tools/server-tools/other/gdrive-request-access.ts new file mode 100644 index 00000000000..9a4561c51e4 --- /dev/null +++ b/apps/sim/lib/copilot/tools/server-tools/other/gdrive-request-access.ts @@ -0,0 +1,25 @@ +import { BaseCopilotTool } from '@/lib/copilot/tools/server-tools/base' + +type GDriveRequestAccessParams = Record + +interface GDriveRequestAccessResult { + message: string +} + +class GDriveRequestAccessServerTool extends BaseCopilotTool< + GDriveRequestAccessParams, + GDriveRequestAccessResult +> { + readonly id = 'gdrive_request_access' + readonly displayName = 'Requesting Google Drive access' + // Do not require interrupt on server; client handled the interrupt/approval + readonly requiresInterrupt = false + + protected async executeImpl( + _params: GDriveRequestAccessParams + ): Promise { + return { message: 'Google Drive access confirmed by user' } + } +} + +export const gdriveRequestAccessServerTool = new GDriveRequestAccessServerTool() diff --git a/apps/sim/lib/copilot/tools/server-tools/other/run-workflow.ts b/apps/sim/lib/copilot/tools/server-tools/other/run-workflow.ts new file mode 100644 index 00000000000..674564bce5c --- /dev/null +++ b/apps/sim/lib/copilot/tools/server-tools/other/run-workflow.ts @@ -0,0 +1,35 @@ +import { BaseCopilotTool } from '@/lib/copilot/tools/server-tools/base' + +interface RunWorkflowServerParams { + status: 'success' | 'errored' | 'rejected' + message?: string + workflowId?: string + description?: string + startedAt?: string + finishedAt?: string +} + +interface RunWorkflowServerResult extends RunWorkflowServerParams {} + +class RunWorkflowServerTool extends BaseCopilotTool< + RunWorkflowServerParams, + RunWorkflowServerResult +> { + readonly id = 'run_workflow' + readonly displayName = 'Run workflow' + readonly requiresInterrupt = false + + protected async executeImpl(params: RunWorkflowServerParams): Promise { + // Echo back the status and metadata for completion callback + return { + status: params.status, + message: params.message, + workflowId: params.workflowId, + description: params.description, + startedAt: params.startedAt, + finishedAt: params.finishedAt, + } + } +} + +export const runWorkflowServerTool = new RunWorkflowServerTool() diff --git a/apps/sim/lib/copilot/tools/server-tools/registry.ts b/apps/sim/lib/copilot/tools/server-tools/registry.ts index a8285e8c5bb..a2027ccd476 100644 --- a/apps/sim/lib/copilot/tools/server-tools/registry.ts +++ b/apps/sim/lib/copilot/tools/server-tools/registry.ts @@ -6,9 +6,11 @@ import { getBlocksMetadataTool } from './blocks/get-blocks-metadata' import { searchDocsTool } from './docs/search-docs' import { listGDriveFilesTool } from './gdrive/list-gdrive-files' import { readGDriveFileTool } from './gdrive/read-gdrive-file' +import { gdriveRequestAccessServerTool } from './other/gdrive-request-access' import { makeApiRequestTool } from './other/make-api-request' import { noOpTool } from './other/no-op' import { onlineSearchTool } from './other/online-search' +import { runWorkflowServerTool } from './other/run-workflow' import { getEnvironmentVariablesTool } from './user/get-environment-variables' import { getOAuthCredentialsTool } from './user/get-oauth-credentials' import { setEnvironmentVariablesTool } from './user/set-environment-variables' @@ -104,6 +106,8 @@ copilotToolRegistry.register(editWorkflowTool) copilotToolRegistry.register(listGDriveFilesTool) copilotToolRegistry.register(readGDriveFileTool) copilotToolRegistry.register(makeApiRequestTool) +copilotToolRegistry.register(gdriveRequestAccessServerTool) +copilotToolRegistry.register(runWorkflowServerTool) // Dynamically generated constants - single source of truth export const COPILOT_TOOL_IDS = copilotToolRegistry.getAvailableIds() diff --git a/apps/sim/lib/copilot/tools/server-tools/workflow/get-user-workflow.ts b/apps/sim/lib/copilot/tools/server-tools/workflow/get-user-workflow.ts index 112129475d6..1b854219c1e 100644 --- a/apps/sim/lib/copilot/tools/server-tools/workflow/get-user-workflow.ts +++ b/apps/sim/lib/copilot/tools/server-tools/workflow/get-user-workflow.ts @@ -11,7 +11,6 @@ interface GetUserWorkflowParams { class GetUserWorkflowTool extends BaseCopilotTool { readonly id = 'get_user_workflow' readonly displayName = 'Analyzing your workflow' - readonly requiresInterrupt = true // This triggers automatic Redis polling protected async executeImpl(params: GetUserWorkflowParams): Promise { const logger = createLogger('GetUserWorkflow') diff --git a/apps/sim/lib/sim-agent/client.ts b/apps/sim/lib/sim-agent/client.ts index 4367ac1740b..8bf05d910dd 100644 --- a/apps/sim/lib/sim-agent/client.ts +++ b/apps/sim/lib/sim-agent/client.ts @@ -40,14 +40,16 @@ class SimAgentClient { } = {} ): Promise> { const requestId = crypto.randomUUID().slice(0, 8) - const { method = 'POST', body, headers = {} } = options + const { method = 'POST', body, headers = {}, apiKey } = options try { const url = `${this.baseUrl}${endpoint}` // Use provided API key or try to get it from environment + const resolvedApiKey = apiKey || env.COPILOT_API_KEY const requestHeaders: Record = { 'Content-Type': 'application/json', + ...(resolvedApiKey ? { 'x-api-key': resolvedApiKey } : {}), ...headers, } @@ -55,6 +57,7 @@ class SimAgentClient { url, method, hasBody: !!body, + hasApiKey: !!resolvedApiKey, }) const fetchOptions: RequestInit = { diff --git a/apps/sim/stores/copilot/store.ts b/apps/sim/stores/copilot/store.ts index ab053ff1d08..fb942da97a1 100644 --- a/apps/sim/stores/copilot/store.ts +++ b/apps/sim/stores/copilot/store.ts @@ -632,6 +632,16 @@ function createToolCall(id: string, name: string, input: any = {}): any { setToolCallState(toolCall, initialState, { preserveTerminalStates: false }) + // Debug logging for search_documentation + if (name === 'search_documentation') { + logger.info('DEBUG: search_documentation tool check', { + requiresInterrupt, + hasToolInRegistry: !!toolRegistry.getTool(name), + registryTools: toolRegistry.getToolIds(), + willAutoExecute: !requiresInterrupt && !!toolRegistry.getTool(name), + }) + } + // Auto-execute client tools that don't require interrupt if (!requiresInterrupt && toolRegistry.getTool(name)) { logger.info('Auto-executing client tool:', name, toolCall.id) @@ -687,6 +697,15 @@ function finalizeToolCall( if (success) { toolCall.result = result + // Do not override if tool is already in a terminal failure state + if ( + toolCall.state === 'errored' || + toolCall.state === 'rejected' || + toolCall.state === 'background' + ) { + return + } + // For tools with ready_for_review and interrupt tools, check if they're already in a terminal state in the store if (toolSupportsReadyForReview(toolCall.name) || toolRequiresInterrupt(toolCall.name)) { // Get current state from store if get function is available @@ -927,7 +946,18 @@ const sseHandlers: Record = { : result // NEW LOGIC: Use centralized state management - setToolCallState(toolCall, 'success', { result: parsedResult }) + if ( + toolCall.state === 'errored' || + toolCall.state === 'rejected' || + toolCall.state === 'background' + ) { + logger.info('Ignoring success tool_result due to existing terminal state', { + toolCallId, + state: toolCall.state, + }) + } else { + setToolCallState(toolCall, 'success', { result: parsedResult }) + } // Check if this is the plan tool and extract todos if (toolCall.name === 'plan' && parsedResult?.todoList) { @@ -1154,6 +1184,23 @@ const sseHandlers: Record = { const toolData = data.data if (!toolData) return + // Ignore partial tool_call deltas; wait for complete payload to avoid executing with empty args + if (toolData.partial === true) { + logger.info('tool_call partial received, deferring until complete', { + toolId: toolData.id, + toolName: toolData.name, + }) + return + } + + // Debug logging for all tools + logger.info('tool_call event received', { + toolId: toolData.id, + toolName: toolData.name, + hasArguments: !!toolData.arguments, + isSearchDoc: toolData.name === 'search_documentation', + }) + // Check if tool call already exists const existingToolCall = context.toolCalls.find((tc) => tc.id === toolData.id) @@ -1506,7 +1553,8 @@ function preserveToolTerminalState(newToolCall: any, existingToolCall: any): any !existingToolCall || (existingToolCall.state !== 'accepted' && existingToolCall.state !== 'rejected' && - existingToolCall.state !== 'background') + existingToolCall.state !== 'background' && + existingToolCall.state !== 'errored') ) { return newToolCall } @@ -1523,6 +1571,7 @@ function preserveToolTerminalState(newToolCall: any, existingToolCall: any): any ...newToolCall, state: existingToolCall.state, displayName: existingToolCall.displayName, + error: existingToolCall.error ?? newToolCall.error, } } @@ -2648,13 +2697,26 @@ export const useCopilotStore = create()( const lastMessageWithPreview = messages .slice() .reverse() - .find((msg) => - msg.toolCalls?.some( - (tc) => - (tc.name === COPILOT_TOOL_IDS.BUILD_WORKFLOW || - tc.name === COPILOT_TOOL_IDS.EDIT_WORKFLOW) && - (tc.state === 'ready_for_review' || tc.state === 'completed') - ) + .find( + (msg) => + // Check either toolCalls array or contentBlocks for a workflow tool in a terminal-ish state + msg.toolCalls?.some( + (tc) => + (tc.name === COPILOT_TOOL_IDS.BUILD_WORKFLOW || + tc.name === COPILOT_TOOL_IDS.EDIT_WORKFLOW) && + (tc.state === 'ready_for_review' || + tc.state === 'completed' || + tc.state === 'success') + ) || + msg.contentBlocks?.some( + (block) => + block.type === 'tool_call' && + ((block as any).toolCall?.name === COPILOT_TOOL_IDS.BUILD_WORKFLOW || + (block as any).toolCall?.name === COPILOT_TOOL_IDS.EDIT_WORKFLOW) && + ((block as any).toolCall?.state === 'ready_for_review' || + (block as any).toolCall?.state === 'completed' || + (block as any).toolCall?.state === 'success') + ) ) if (!lastMessageWithPreview) { @@ -2662,12 +2724,26 @@ export const useCopilotStore = create()( return } - const lastWorkflowToolCall = lastMessageWithPreview.toolCalls?.find( - (tc) => - (tc.name === COPILOT_TOOL_IDS.BUILD_WORKFLOW || - tc.name === COPILOT_TOOL_IDS.EDIT_WORKFLOW) && - (tc.state === 'ready_for_review' || tc.state === 'completed') - ) + const lastWorkflowToolCall = + lastMessageWithPreview.toolCalls?.find( + (tc) => + (tc.name === COPILOT_TOOL_IDS.BUILD_WORKFLOW || + tc.name === COPILOT_TOOL_IDS.EDIT_WORKFLOW) && + (tc.state === 'ready_for_review' || + tc.state === 'completed' || + tc.state === 'success') + ) ?? + (lastMessageWithPreview.contentBlocks || []) + .filter((block: any) => block.type === 'tool_call') + .map((block: any) => block.toolCall) + .find( + (tc: any) => + (tc?.name === COPILOT_TOOL_IDS.BUILD_WORKFLOW || + tc?.name === COPILOT_TOOL_IDS.EDIT_WORKFLOW) && + (tc?.state === 'ready_for_review' || + tc?.state === 'completed' || + tc?.state === 'success') + ) if (!lastWorkflowToolCall) { logger.error('No workflow tool call found in message') From e46045d03f5477e574f38a9c62dc226bf39e7467 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Tue, 19 Aug 2025 11:24:20 -0700 Subject: [PATCH 02/12] improvement(console): increase console max entries for larger workflows (#1032) * improvement(console): increase console max entries for larger workflows * increase safety limit for infinite loops --- .../w/[workflowId]/hooks/use-workflow-execution.ts | 2 +- apps/sim/executor/index.ts | 2 +- apps/sim/stores/panel/console/store.ts | 2 +- apps/sim/stores/workflows/workflow/store.test.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts index c381ac4fb0c..ded8f384c84 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts @@ -807,7 +807,7 @@ export function useWorkflowExecution() { // Continue execution until there are no more pending blocks let iterationCount = 0 - const maxIterations = 100 // Safety to prevent infinite loops + const maxIterations = 500 // Safety to prevent infinite loops while (currentPendingBlocks.length > 0 && iterationCount < maxIterations) { logger.info( diff --git a/apps/sim/executor/index.ts b/apps/sim/executor/index.ts index ecb1e8a11e3..b7d752b9dcc 100644 --- a/apps/sim/executor/index.ts +++ b/apps/sim/executor/index.ts @@ -225,7 +225,7 @@ export class Executor { let hasMoreLayers = true let iteration = 0 - const maxIterations = 100 // Safety limit for infinite loops + const maxIterations = 500 // Safety limit for infinite loops while (hasMoreLayers && iteration < maxIterations && !this.isCancelled) { const nextLayer = this.getNextExecutionLayer(context) diff --git a/apps/sim/stores/panel/console/store.ts b/apps/sim/stores/panel/console/store.ts index 0681649f22e..a94493a9c6f 100644 --- a/apps/sim/stores/panel/console/store.ts +++ b/apps/sim/stores/panel/console/store.ts @@ -4,7 +4,7 @@ import { redactApiKeys } from '@/lib/utils' import type { NormalizedBlockOutput } from '@/executor/types' import type { ConsoleEntry, ConsoleStore } from '@/stores/panel/console/types' -const MAX_ENTRIES = 50 // MAX across all workflows +const MAX_ENTRIES = 500 // MAX across all workflows - allows for 100 loop iterations + other workflow logs const MAX_IMAGE_DATA_SIZE = 1000 // Maximum size of image data to store (in characters) const MAX_ANY_DATA_SIZE = 5000 // Maximum size of any data to store (in characters) const MAX_TOTAL_ENTRY_SIZE = 50000 // Maximum size of entire entry to prevent localStorage overflow diff --git a/apps/sim/stores/workflows/workflow/store.test.ts b/apps/sim/stores/workflows/workflow/store.test.ts index a42e011efe0..f68011d01d4 100644 --- a/apps/sim/stores/workflows/workflow/store.test.ts +++ b/apps/sim/stores/workflows/workflow/store.test.ts @@ -109,7 +109,7 @@ describe('workflow store', () => { expect(state.loops.loop1.forEachItems).toEqual(['item1', 'item2', 'item3']) }) - it('should clamp loop count between 1 and 50', () => { + it('should clamp loop count between 1 and 100', () => { const { addBlock, updateLoopCount } = useWorkflowStore.getState() // Add a loop block @@ -199,7 +199,7 @@ describe('workflow store', () => { expect(parsedDistribution).toHaveLength(3) }) - it('should clamp parallel count between 1 and 50', () => { + it('should clamp parallel count between 1 and 20', () => { const { addBlock, updateParallelCount } = useWorkflowStore.getState() // Add a parallel block From 2009901b6bb097f8d46ca34c0bd835ced6ee3a02 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Tue, 19 Aug 2025 12:32:15 -0700 Subject: [PATCH 03/12] improvement(api): add native support for form-urlencoded inputs into API block (#1033) --- apps/sim/tools/__test-utils__/test-tools.ts | 13 ++- apps/sim/tools/http/request.test.ts | 97 +++++++++++++++++++++ apps/sim/tools/http/request.ts | 22 ++++- apps/sim/tools/utils.test.ts | 6 +- apps/sim/tools/utils.ts | 4 +- 5 files changed, 133 insertions(+), 9 deletions(-) diff --git a/apps/sim/tools/__test-utils__/test-tools.ts b/apps/sim/tools/__test-utils__/test-tools.ts index 0f428e617e9..094b8553f3f 100644 --- a/apps/sim/tools/__test-utils__/test-tools.ts +++ b/apps/sim/tools/__test-utils__/test-tools.ts @@ -192,7 +192,18 @@ export class ToolTester

{ const response = await this.mockFetch(url, { method: method, headers: this.tool.request.headers(params), - body: this.tool.request.body ? JSON.stringify(this.tool.request.body(params)) : undefined, + body: this.tool.request.body + ? (() => { + const bodyResult = this.tool.request.body(params) + const headers = this.tool.request.headers(params) + const isPreformattedContent = + headers['Content-Type'] === 'application/x-ndjson' || + headers['Content-Type'] === 'application/x-www-form-urlencoded' + return isPreformattedContent && typeof bodyResult === 'string' + ? bodyResult + : JSON.stringify(bodyResult) + })() + : undefined, }) if (!response.ok) { diff --git a/apps/sim/tools/http/request.test.ts b/apps/sim/tools/http/request.test.ts index 09ad477da60..c49472f9d6c 100644 --- a/apps/sim/tools/http/request.test.ts +++ b/apps/sim/tools/http/request.test.ts @@ -109,6 +109,26 @@ describe('HTTP Request Tool', () => { }) }) + it.concurrent('should respect custom Content-Type headers', () => { + // Custom Content-Type should not be overridden + const headers = tester.getRequestHeaders({ + url: 'https://api.example.com', + method: 'POST', + body: { key: 'value' }, + headers: [{ Key: 'Content-Type', Value: 'application/x-www-form-urlencoded' }], + }) + expect(headers['Content-Type']).toBe('application/x-www-form-urlencoded') + + // Case-insensitive Content-Type should not be overridden + const headers2 = tester.getRequestHeaders({ + url: 'https://api.example.com', + method: 'POST', + body: { key: 'value' }, + headers: [{ Key: 'content-type', Value: 'text/plain' }], + }) + expect(headers2['content-type']).toBe('text/plain') + }) + it('should set dynamic Referer header correctly', async () => { const originalWindow = global.window Object.defineProperty(global, 'window', { @@ -164,6 +184,30 @@ describe('HTTP Request Tool', () => { }) }) + describe('Body Construction', () => { + it.concurrent('should handle JSON bodies correctly', () => { + const body = { username: 'test', password: 'secret' } + + expect( + tester.getRequestBody({ + url: 'https://api.example.com', + body, + }) + ).toEqual(body) + }) + + it.concurrent('should handle FormData correctly', () => { + const formData = { file: 'test.txt', content: 'file content' } + + const result = tester.getRequestBody({ + url: 'https://api.example.com', + formData, + }) + + expect(result).toBeInstanceOf(FormData) + }) + }) + describe('Request Execution', () => { it('should apply default and dynamic headers to requests', async () => { // Setup mock response @@ -253,6 +297,59 @@ describe('HTTP Request Tool', () => { expect(bodyArg).toEqual(body) }) + it('should handle POST requests with URL-encoded form data', async () => { + // Setup mock response + tester.setup({ result: 'success' }) + + // Create test body + const body = { username: 'testuser123', password: 'testpass456', email: 'test@example.com' } + + // Execute the tool with form-urlencoded content type + await tester.execute({ + url: 'https://api.example.com/oauth/token', + method: 'POST', + body, + headers: [{ cells: { Key: 'Content-Type', Value: 'application/x-www-form-urlencoded' } }], + }) + + // Verify the request was made with correct headers + const fetchCall = (global.fetch as any).mock.calls[0] + expect(fetchCall[0]).toBe('https://api.example.com/oauth/token') + expect(fetchCall[1].method).toBe('POST') + expect(fetchCall[1].headers['Content-Type']).toBe('application/x-www-form-urlencoded') + + // Verify the body is URL-encoded (should not be JSON stringified) + expect(fetchCall[1].body).toBe( + 'username=testuser123&password=testpass456&email=test%40example.com' + ) + }) + + it('should handle OAuth client credentials requests', async () => { + // Setup mock response for OAuth token endpoint + tester.setup({ access_token: 'token123', token_type: 'Bearer' }) + + // Execute OAuth client credentials request + await tester.execute({ + url: 'https://oauth.example.com/token', + method: 'POST', + body: { grant_type: 'client_credentials', scope: 'read write' }, + headers: [ + { cells: { Key: 'Content-Type', Value: 'application/x-www-form-urlencoded' } }, + { cells: { Key: 'Authorization', Value: 'Basic Y2xpZW50OnNlY3JldA==' } }, + ], + }) + + // Verify the OAuth request was properly formatted + const fetchCall = (global.fetch as any).mock.calls[0] + expect(fetchCall[0]).toBe('https://oauth.example.com/token') + expect(fetchCall[1].method).toBe('POST') + expect(fetchCall[1].headers['Content-Type']).toBe('application/x-www-form-urlencoded') + expect(fetchCall[1].headers.Authorization).toBe('Basic Y2xpZW50OnNlY3JldA==') + + // Verify the body is URL-encoded + expect(fetchCall[1].body).toBe('grant_type=client_credentials&scope=read+write') + }) + it('should handle errors correctly', async () => { // Setup error response tester.setup(mockHttpResponses.error, { ok: false, status: 400 }) diff --git a/apps/sim/tools/http/request.ts b/apps/sim/tools/http/request.ts index 8d4b0b42719..add50fe7a91 100644 --- a/apps/sim/tools/http/request.ts +++ b/apps/sim/tools/http/request.ts @@ -67,12 +67,12 @@ export const requestTool: ToolConfig = { const processedUrl = processUrl(params.url, params.pathParams, params.params) const allHeaders = getDefaultHeaders(headers, processedUrl) - // Set appropriate Content-Type + // Set appropriate Content-Type only if not already specified by user if (params.formData) { // Don't set Content-Type for FormData, browser will set it with boundary return allHeaders } - if (params.body) { + if (params.body && !allHeaders['Content-Type'] && !allHeaders['content-type']) { allHeaders['Content-Type'] = 'application/json' } @@ -89,6 +89,24 @@ export const requestTool: ToolConfig = { } if (params.body) { + // Check if user wants URL-encoded form data + const headers = transformTable(params.headers || null) + const contentType = headers['Content-Type'] || headers['content-type'] + + if ( + contentType === 'application/x-www-form-urlencoded' && + typeof params.body === 'object' + ) { + // Convert JSON object to URL-encoded string + const urlencoded = new URLSearchParams() + Object.entries(params.body).forEach(([key, value]) => { + if (value !== undefined && value !== null) { + urlencoded.append(key, String(value)) + } + }) + return urlencoded.toString() + } + return params.body } diff --git a/apps/sim/tools/utils.test.ts b/apps/sim/tools/utils.test.ts index bf6847831ed..9b11fadd9f1 100644 --- a/apps/sim/tools/utils.test.ts +++ b/apps/sim/tools/utils.test.ts @@ -164,7 +164,7 @@ describe('formatRequestParams', () => { }) // Return a preformatted body - mockTool.request.body = vi.fn().mockReturnValue({ body: 'key1=value1&key2=value2' }) + mockTool.request.body = vi.fn().mockReturnValue('key1=value1&key2=value2') const params = { method: 'POST' } const result = formatRequestParams(mockTool, params) @@ -179,9 +179,7 @@ describe('formatRequestParams', () => { }) // Return a preformatted body for NDJSON - mockTool.request.body = vi.fn().mockReturnValue({ - body: '{"prompt": "Hello"}\n{"prompt": "World"}', - }) + mockTool.request.body = vi.fn().mockReturnValue('{"prompt": "Hello"}\n{"prompt": "World"}') const params = { method: 'POST' } const result = formatRequestParams(mockTool, params) diff --git a/apps/sim/tools/utils.ts b/apps/sim/tools/utils.ts index 1a0abfbc9c3..5aa7fdc7d93 100644 --- a/apps/sim/tools/utils.ts +++ b/apps/sim/tools/utils.ts @@ -63,8 +63,8 @@ export function formatRequestParams(tool: ToolConfig, params: Record Date: Tue, 19 Aug 2025 13:12:43 -0700 Subject: [PATCH 04/12] Add rate limits (#1034) * Add rate limits * Lint --- apps/sim/app/api/copilot/chat/route.ts | 6 +++++- .../lib/copilot/tools/client-tools/get-oauth-credentials.ts | 2 -- .../lib/copilot/tools/client-tools/get-workflow-console.ts | 6 ------ apps/sim/stores/copilot/store.ts | 3 +++ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/sim/app/api/copilot/chat/route.ts b/apps/sim/app/api/copilot/chat/route.ts index a5065869cc5..8af647fa63e 100644 --- a/apps/sim/app/api/copilot/chat/route.ts +++ b/apps/sim/app/api/copilot/chat/route.ts @@ -474,7 +474,11 @@ export async function POST(req: NextRequest) { }) if (!simAgentResponse.ok) { - if (simAgentResponse.status === 401 || simAgentResponse.status === 402) { + if ( + simAgentResponse.status === 401 || + simAgentResponse.status === 402 || + simAgentResponse.status === 429 + ) { // Rethrow status only; client will render appropriate assistant message return new NextResponse(null, { status: simAgentResponse.status }) } diff --git a/apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts b/apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts index 08afbd6fd8f..a2bd3331273 100644 --- a/apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts +++ b/apps/sim/lib/copilot/tools/client-tools/get-oauth-credentials.ts @@ -62,8 +62,6 @@ export class GetOAuthCredentialsClientTool extends BaseTool { }), }) - logger.info('Methods route response received', { status: response.status }) - if (!response.ok) { const errorData = await response.json().catch(() => ({})) options?.onStateChange?.('errored') diff --git a/apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts b/apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts index ba65e0d1448..a0ba72cb23e 100644 --- a/apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts +++ b/apps/sim/lib/copilot/tools/client-tools/get-workflow-console.ts @@ -75,11 +75,6 @@ export class GetWorkflowConsoleClientTool extends BaseTool { if (activeWorkflowId) workflowId = activeWorkflowId } - logger.info('get_workflow_console: prepared params', { - toolCallId: toolCall.id, - hasWorkflowId: !!workflowId, - }) - if (!workflowId) { options?.onStateChange?.('errored') return { success: false, error: 'workflowId is required' } @@ -102,7 +97,6 @@ export class GetWorkflowConsoleClientTool extends BaseTool { credentials: 'include', body: JSON.stringify(body), }) - logger.info('Methods route response', { ok: response.ok, status: response.status }) if (!response.ok) { const e = await response.json().catch(() => ({})) options?.onStateChange?.('errored') diff --git a/apps/sim/stores/copilot/store.ts b/apps/sim/stores/copilot/store.ts index fb942da97a1..b99330c38ed 100644 --- a/apps/sim/stores/copilot/store.ts +++ b/apps/sim/stores/copilot/store.ts @@ -1865,6 +1865,7 @@ const COPILOT_AUTH_REQUIRED_MESSAGE = '*Authorization failed. An API key must be configured in order to use the copilot. You can configure an API key at [sim.ai](https://sim.ai).*' const COPILOT_USAGE_EXCEEDED_MESSAGE = '*Usage limit exceeded, please upgrade your plan or top up credits at [sim.ai](https://sim.ai) to continue using the copilot*' +const COPILOT_RATE_LIMIT_EXCEEDED_MESSAGE = '*Too many requests, please try again later*' /** * Copilot store using the new unified API @@ -2320,6 +2321,8 @@ export const useCopilotStore = create()( displayError = COPILOT_AUTH_REQUIRED_MESSAGE } else if (result.status === 402) { displayError = COPILOT_USAGE_EXCEEDED_MESSAGE + } else if (result.status === 429) { + displayError = COPILOT_RATE_LIMIT_EXCEEDED_MESSAGE } const errorMessage = createErrorMessage(streamingMessage.id, displayError) From 1139a35cd8ac1e88199d367a89c273bcc18e4287 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Tue, 19 Aug 2025 13:37:53 -0700 Subject: [PATCH 05/12] improvement(supabase): added more verbose error logging for supabase operations (#1035) * improvement(supabase): added more verbose error logging for supabase operations * updated docs --- apps/docs/content/docs/tools/supabase.mdx | 2 +- apps/sim/blocks/blocks/supabase.ts | 8 +++++-- apps/sim/tools/supabase/delete.ts | 22 ++++++++++++------ apps/sim/tools/supabase/get_row.ts | 20 ++++++++++++---- apps/sim/tools/supabase/insert.ts | 28 ++++++++++++++++++++--- apps/sim/tools/supabase/query.ts | 22 ++++++++++++++++-- apps/sim/tools/supabase/update.ts | 22 ++++++++++++------ 7 files changed, 97 insertions(+), 27 deletions(-) diff --git a/apps/docs/content/docs/tools/supabase.mdx b/apps/docs/content/docs/tools/supabase.mdx index 0f8d7009e22..c6f13529b70 100644 --- a/apps/docs/content/docs/tools/supabase.mdx +++ b/apps/docs/content/docs/tools/supabase.mdx @@ -142,7 +142,7 @@ Get a single row from a Supabase table based on filter criteria | Parameter | Type | Description | | --------- | ---- | ----------- | | `message` | string | Operation status message | -| `results` | object | The row data if found, null if not found | +| `results` | array | Array containing the row data if found, empty array if not found | ### `supabase_update` diff --git a/apps/sim/blocks/blocks/supabase.ts b/apps/sim/blocks/blocks/supabase.ts index 3acd1ae1b8c..505542138ab 100644 --- a/apps/sim/blocks/blocks/supabase.ts +++ b/apps/sim/blocks/blocks/supabase.ts @@ -164,8 +164,12 @@ export const SupabaseBlock: BlockConfig = { if (data && typeof data === 'string' && data.trim()) { try { parsedData = JSON.parse(data) - } catch (_e) { - throw new Error('Invalid JSON data format') + } catch (parseError) { + // Provide more detailed error information + const errorMsg = parseError instanceof Error ? parseError.message : 'Unknown JSON error' + throw new Error( + `Invalid JSON data format: ${errorMsg}. Please check your JSON syntax (e.g., strings must be quoted like "value").` + ) } } else if (data && typeof data === 'object') { parsedData = data diff --git a/apps/sim/tools/supabase/delete.ts b/apps/sim/tools/supabase/delete.ts index 5e4ebd6d662..9b3eee85eb8 100644 --- a/apps/sim/tools/supabase/delete.ts +++ b/apps/sim/tools/supabase/delete.ts @@ -59,28 +59,36 @@ export const deleteTool: ToolConfig { - // Handle empty response from delete operations const text = await response.text() let data if (text?.trim()) { try { data = JSON.parse(text) - } catch (e) { - // If we can't parse it, just use the text - data = text + } catch (parseError) { + throw new Error(`Failed to parse Supabase response: ${parseError}`) } } else { - // Empty response means successful deletion data = [] } - const deletedCount = Array.isArray(data) ? data.length : text ? 1 : 0 + const deletedCount = Array.isArray(data) ? data.length : 0 + + if (deletedCount === 0) { + return { + success: true, + output: { + message: 'No rows were deleted (no matching records found)', + results: data, + }, + error: undefined, + } + } return { success: true, output: { - message: `Successfully deleted ${deletedCount === 0 ? 'row(s)' : `${deletedCount} row(s)`}`, + message: `Successfully deleted ${deletedCount} row${deletedCount === 1 ? '' : 's'}`, results: data, }, error: undefined, diff --git a/apps/sim/tools/supabase/get_row.ts b/apps/sim/tools/supabase/get_row.ts index 387cb504b11..61b9f4e8f8c 100644 --- a/apps/sim/tools/supabase/get_row.ts +++ b/apps/sim/tools/supabase/get_row.ts @@ -57,14 +57,21 @@ export const getRowTool: ToolConfig { - const data = await response.json() - const row = data.length > 0 ? data[0] : null + let data + try { + data = await response.json() + } catch (parseError) { + throw new Error(`Failed to parse Supabase response: ${parseError}`) + } + + const rowFound = data.length > 0 + const results = rowFound ? [data[0]] : [] return { success: true, output: { - message: row ? 'Successfully found row' : 'No row found matching the criteria', - results: row, + message: rowFound ? 'Successfully found 1 row' : 'No row found matching the criteria', + results: results, }, error: undefined, } @@ -72,6 +79,9 @@ export const getRowTool: ToolConfig { - // Handle empty response case const text = await response.text() + if (!text || text.trim() === '') { return { success: true, @@ -66,12 +66,34 @@ export const insertTool: ToolConfig = }, transformResponse: async (response: Response) => { - const data = await response.json() + let data + try { + data = await response.json() + } catch (parseError) { + throw new Error(`Failed to parse Supabase response: ${parseError}`) + } + + const rowCount = Array.isArray(data) ? data.length : 0 + + if (rowCount === 0) { + return { + success: true, + output: { + message: 'No rows found matching the query criteria', + results: data, + }, + error: undefined, + } + } return { success: true, output: { - message: 'Successfully queried data from Supabase', + message: `Successfully queried ${rowCount} row${rowCount === 1 ? '' : 's'} from Supabase`, results: data, }, error: undefined, diff --git a/apps/sim/tools/supabase/update.ts b/apps/sim/tools/supabase/update.ts index 7ef9f8c61c6..f213b629b69 100644 --- a/apps/sim/tools/supabase/update.ts +++ b/apps/sim/tools/supabase/update.ts @@ -63,28 +63,36 @@ export const updateTool: ToolConfig { - // Handle potentially empty response from update operations const text = await response.text() let data if (text?.trim()) { try { data = JSON.parse(text) - } catch (e) { - // If we can't parse it, just use the text - data = text + } catch (parseError) { + throw new Error(`Failed to parse Supabase response: ${parseError}`) } } else { - // Empty response means successful update data = [] } - const updatedCount = Array.isArray(data) ? data.length : text ? 1 : 0 + const updatedCount = Array.isArray(data) ? data.length : 0 + + if (updatedCount === 0) { + return { + success: true, + output: { + message: 'No rows were updated (no matching records found)', + results: data, + }, + error: undefined, + } + } return { success: true, output: { - message: `Successfully updated ${updatedCount === 0 ? 'row(s)' : `${updatedCount} row(s)`}`, + message: `Successfully updated ${updatedCount} row${updatedCount === 1 ? '' : 's'}`, results: data, }, error: undefined, From 334e8278563a8b5b4fa43687f825224fb9770cd5 Mon Sep 17 00:00:00 2001 From: Vikhyath Mondreti Date: Tue, 19 Aug 2025 16:06:41 -0700 Subject: [PATCH 06/12] fix(oauth-block): race condition for rendering credential selectors and other subblocks + gdrive fixes (#1029) * fix(oauth-block): race condition for rendering credential selectors and other subblocks * fix import * add dependsOn field to track cros-subblock deps * remove redundant check * remove redundant checks * remove misleading comment * fix * fix jira * fix * fix * confluence * fix triggers * fix * fix * make trigger creds collab supported * fix for backwards compat * fix trigger modal --- apps/sim/app/api/tools/drive/file/route.ts | 30 +- apps/sim/app/api/tools/drive/files/route.ts | 64 ++-- apps/sim/app/api/webhooks/route.ts | 4 +- .../channel-selector-input.tsx | 13 +- .../credential-selector.tsx | 12 - .../document-selector/document-selector.tsx | 15 +- .../components/confluence-file-selector.tsx | 10 +- .../components/google-drive-picker.tsx | 11 +- .../components/microsoft-file-selector.tsx | 11 +- .../file-selector/file-selector-input.tsx | 341 ++++-------------- .../components/folder-selector-input.tsx | 18 +- .../folder-selector/folder-selector.tsx | 20 +- .../components/jira-project-selector.tsx | 14 +- .../project-selector-input.tsx | 44 +-- .../components/trigger-modal.tsx | 111 +++++- .../trigger-config/trigger-config.tsx | 15 +- .../sub-block/hooks/use-depends-on-gate.ts | 54 +++ .../sub-block/hooks/use-sub-block-value.ts | 24 +- apps/sim/blocks/blocks/airtable.ts | 2 + apps/sim/blocks/blocks/confluence.ts | 1 + apps/sim/blocks/blocks/discord.ts | 2 + apps/sim/blocks/blocks/gmail.ts | 1 + apps/sim/blocks/blocks/google_calendar.ts | 1 + apps/sim/blocks/blocks/google_docs.ts | 4 + apps/sim/blocks/blocks/google_drive.ts | 3 + apps/sim/blocks/blocks/google_sheets.ts | 2 + apps/sim/blocks/blocks/jira.ts | 4 + apps/sim/blocks/blocks/knowledge.ts | 1 + apps/sim/blocks/blocks/linear.ts | 2 + apps/sim/blocks/blocks/microsoft_excel.ts | 2 + apps/sim/blocks/blocks/microsoft_planner.ts | 3 + apps/sim/blocks/blocks/microsoft_teams.ts | 3 + apps/sim/blocks/blocks/onedrive.ts | 6 + apps/sim/blocks/blocks/outlook.ts | 1 + apps/sim/blocks/blocks/sharepoint.ts | 2 + apps/sim/blocks/types.ts | 3 + apps/sim/hooks/use-collaborative-workflow.ts | 24 +- .../sim/lib/webhooks/gmail-polling-service.ts | 37 +- .../lib/webhooks/outlook-polling-service.ts | 45 ++- apps/sim/lib/webhooks/utils.ts | 166 +++++++-- apps/sim/tools/google_drive/create_folder.ts | 2 +- apps/sim/tools/google_drive/list.ts | 4 + apps/sim/tools/google_drive/upload.ts | 8 +- 43 files changed, 655 insertions(+), 485 deletions(-) create mode 100644 apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate.ts diff --git a/apps/sim/app/api/tools/drive/file/route.ts b/apps/sim/app/api/tools/drive/file/route.ts index ed0758f41c5..ee0edfe8c78 100644 --- a/apps/sim/app/api/tools/drive/file/route.ts +++ b/apps/sim/app/api/tools/drive/file/route.ts @@ -45,7 +45,7 @@ export async function GET(request: NextRequest) { // Fetch the file from Google Drive API logger.info(`[${requestId}] Fetching file ${fileId} from Google Drive API`) const response = await fetch( - `https://www.googleapis.com/drive/v3/files/${fileId}?fields=id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,exportLinks`, + `https://www.googleapis.com/drive/v3/files/${fileId}?fields=id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,exportLinks,shortcutDetails&supportsAllDrives=true`, { headers: { Authorization: `Bearer ${accessToken}`, @@ -77,6 +77,34 @@ export async function GET(request: NextRequest) { 'application/vnd.google-apps.presentation': 'application/pdf', // Google Slides to PDF } + // Resolve shortcuts transparently for UI stability + if ( + file.mimeType === 'application/vnd.google-apps.shortcut' && + file.shortcutDetails?.targetId + ) { + const targetId = file.shortcutDetails.targetId + const shortcutResp = await fetch( + `https://www.googleapis.com/drive/v3/files/${targetId}?fields=id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,exportLinks&supportsAllDrives=true`, + { + headers: { Authorization: `Bearer ${accessToken}` }, + } + ) + if (shortcutResp.ok) { + const targetFile = await shortcutResp.json() + file.id = targetFile.id + file.name = targetFile.name + file.mimeType = targetFile.mimeType + file.iconLink = targetFile.iconLink + file.webViewLink = targetFile.webViewLink + file.thumbnailLink = targetFile.thumbnailLink + file.createdTime = targetFile.createdTime + file.modifiedTime = targetFile.modifiedTime + file.size = targetFile.size + file.owners = targetFile.owners + file.exportLinks = targetFile.exportLinks + } + } + // If the file is a Google Docs, Sheets, or Slides file, we need to provide the export link if (file.mimeType.startsWith('application/vnd.google-apps.')) { const format = exportFormats[file.mimeType] || 'application/pdf' diff --git a/apps/sim/app/api/tools/drive/files/route.ts b/apps/sim/app/api/tools/drive/files/route.ts index 6d016accb75..add1494952c 100644 --- a/apps/sim/app/api/tools/drive/files/route.ts +++ b/apps/sim/app/api/tools/drive/files/route.ts @@ -1,10 +1,8 @@ -import { eq } from 'drizzle-orm' import { type NextRequest, NextResponse } from 'next/server' import { getSession } from '@/lib/auth' +import { authorizeCredentialUse } from '@/lib/auth/credential-access' import { createLogger } from '@/lib/logs/console/logger' import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils' -import { db } from '@/db' -import { account } from '@/db/schema' export const dynamic = 'force-dynamic' @@ -32,64 +30,48 @@ export async function GET(request: NextRequest) { const credentialId = searchParams.get('credentialId') const mimeType = searchParams.get('mimeType') const query = searchParams.get('query') || '' + const folderId = searchParams.get('folderId') || searchParams.get('parentId') || '' + const workflowId = searchParams.get('workflowId') || undefined if (!credentialId) { logger.warn(`[${requestId}] Missing credential ID`) return NextResponse.json({ error: 'Credential ID is required' }, { status: 400 }) } - // Get the credential from the database - const credentials = await db.select().from(account).where(eq(account.id, credentialId)).limit(1) - - if (!credentials.length) { - logger.warn(`[${requestId}] Credential not found`, { credentialId }) - return NextResponse.json({ error: 'Credential not found' }, { status: 404 }) - } - - const credential = credentials[0] - - // Check if the credential belongs to the user - if (credential.userId !== session.user.id) { - logger.warn(`[${requestId}] Unauthorized credential access attempt`, { - credentialUserId: credential.userId, - requestUserId: session.user.id, - }) - return NextResponse.json({ error: 'Unauthorized' }, { status: 403 }) + // Authorize use of the credential (supports collaborator credentials via workflow) + const authz = await authorizeCredentialUse(request, { credentialId: credentialId!, workflowId }) + if (!authz.ok || !authz.credentialOwnerUserId) { + logger.warn(`[${requestId}] Unauthorized credential access attempt`, authz) + return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 }) } // Refresh access token if needed using the utility function - const accessToken = await refreshAccessTokenIfNeeded(credentialId, session.user.id, requestId) + const accessToken = await refreshAccessTokenIfNeeded( + credentialId!, + authz.credentialOwnerUserId, + requestId + ) if (!accessToken) { return NextResponse.json({ error: 'Failed to obtain valid access token' }, { status: 401 }) } - // Build the query parameters for Google Drive API - let queryParams = 'trashed=false' - - // Add mimeType filter if provided + // Build Drive 'q' expression safely + const qParts: string[] = ['trashed = false'] + if (folderId) { + qParts.push(`'${folderId.replace(/'/g, "\\'")}' in parents`) + } if (mimeType) { - // For Google Drive API, we need to use 'q' parameter for mimeType filtering - // Instead of using the mimeType parameter directly, we'll add it to the query - if (queryParams.includes('q=')) { - queryParams += ` and mimeType='${mimeType}'` - } else { - queryParams += `&q=mimeType='${mimeType}'` - } + qParts.push(`mimeType = '${mimeType.replace(/'/g, "\\'")}'`) } - - // Add search query if provided if (query) { - if (queryParams.includes('q=')) { - queryParams += ` and name contains '${query}'` - } else { - queryParams += `&q=name contains '${query}'` - } + qParts.push(`name contains '${query.replace(/'/g, "\\'")}'`) } + const q = encodeURIComponent(qParts.join(' and ')) - // Fetch files from Google Drive API + // Fetch files from Google Drive API with shared drives support const response = await fetch( - `https://www.googleapis.com/drive/v3/files?${queryParams}&fields=files(id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners)`, + `https://www.googleapis.com/drive/v3/files?q=${q}&supportsAllDrives=true&includeItemsFromAllDrives=true&spaces=drive&fields=files(id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,parents)`, { headers: { Authorization: `Bearer ${accessToken}`, diff --git a/apps/sim/app/api/webhooks/route.ts b/apps/sim/app/api/webhooks/route.ts index 1d0070a977a..7f2bb12791e 100644 --- a/apps/sim/app/api/webhooks/route.ts +++ b/apps/sim/app/api/webhooks/route.ts @@ -329,7 +329,7 @@ export async function POST(request: NextRequest) { logger.info(`[${requestId}] Gmail provider detected. Setting up Gmail webhook configuration.`) try { const { configureGmailPolling } = await import('@/lib/webhooks/utils') - // Use workflow owner for OAuth lookups to support collaborator-saved credentials + // Pass workflow owner for backward-compat fallback (utils prefers credentialId if present) const success = await configureGmailPolling(workflowRecord.userId, savedWebhook, requestId) if (!success) { @@ -364,7 +364,7 @@ export async function POST(request: NextRequest) { ) try { const { configureOutlookPolling } = await import('@/lib/webhooks/utils') - // Use workflow owner for OAuth lookups to support collaborator-saved credentials + // Pass workflow owner for backward-compat fallback (utils prefers credentialId if present) const success = await configureOutlookPolling( workflowRecord.userId, savedWebhook, diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/channel-selector/channel-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/channel-selector/channel-selector-input.tsx index 1dbacd709d9..f7d45d34b80 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/channel-selector/channel-selector-input.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/channel-selector/channel-selector-input.tsx @@ -6,9 +6,9 @@ import { type SlackChannelInfo, SlackChannelSelector, } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/channel-selector/components/slack-channel-selector' +import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate' import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value' import type { SubBlockConfig } from '@/blocks/types' -import { useSubBlockStore } from '@/stores/workflows/subblock/store' interface ChannelSelectorInputProps { blockId: string @@ -29,8 +29,6 @@ export function ChannelSelectorInput({ isPreview = false, previewValue, }: ChannelSelectorInputProps) { - const { getValue } = useSubBlockStore() - // Use the proper hook to get the current value and setter (same as file-selector) const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlock.id) // Reactive upstream fields @@ -43,6 +41,8 @@ export function ChannelSelectorInput({ // Get provider-specific values const provider = subBlock.provider || 'slack' const isSlack = provider === 'slack' + // Central dependsOn gating + const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview }) // Get the credential for the provider - use provided credential or fall back to reactive values let credential: string @@ -89,15 +89,10 @@ export function ChannelSelectorInput({ }} credential={credential} label={subBlock.placeholder || 'Select Slack channel'} - disabled={disabled || !credential} + disabled={finalDisabled} /> - {!credential && ( - -

Please select a Slack account or enter a bot token first

- - )} ) diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx index 2eec5197c08..6d5f05a8a5a 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx @@ -26,7 +26,6 @@ import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/c import type { SubBlockConfig } from '@/blocks/types' import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' -import { useSubBlockStore } from '@/stores/workflows/subblock/store' const logger = createLogger('CredentialSelector') @@ -217,17 +216,6 @@ export function CredentialSelector({ setSelectedId(credentialId) if (!isPreview) { setStoreValue(credentialId) - // If credential changed, clear other sub-block fields for a clean state - if (previousId && previousId !== credentialId) { - const wfId = (activeWorkflowId as string) || '' - const workflowValues = useSubBlockStore.getState().workflowValues[wfId] || {} - const blockValues = workflowValues[blockId] || {} - Object.keys(blockValues).forEach((key) => { - if (key !== subBlock.id) { - collaborativeSetSubblockValue(blockId, key, '') - } - }) - } } setOpen(false) } diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/document-selector/document-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/document-selector/document-selector.tsx index 04cabc49f19..2bfa379a778 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/document-selector/document-selector.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/document-selector/document-selector.tsx @@ -12,6 +12,7 @@ import { CommandList, } from '@/components/ui/command' import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' +import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate' import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value' import type { SubBlockConfig } from '@/blocks/types' @@ -65,6 +66,9 @@ export function DocumentSelector({ // Use preview value when in preview mode, otherwise use store value const value = isPreview ? previewValue : storeValue + const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview }) + const isDisabled = finalDisabled + // Fetch documents for the selected knowledge base const fetchDocuments = useCallback(async () => { if (!knowledgeBaseId) { @@ -103,6 +107,7 @@ export function DocumentSelector({ // Handle dropdown open/close - fetch documents when opening const handleOpenChange = (isOpen: boolean) => { if (isPreview) return + if (isDisabled) return setOpen(isOpen) @@ -124,13 +129,14 @@ export function DocumentSelector({ // Sync selected document with value prop useEffect(() => { + if (isDisabled) return if (value && documents.length > 0) { const docInfo = documents.find((doc) => doc.id === value) setSelectedDocument(docInfo || null) } else { setSelectedDocument(null) } - }, [value, documents]) + }, [value, documents, isDisabled]) // Reset documents when knowledge base changes useEffect(() => { @@ -141,10 +147,10 @@ export function DocumentSelector({ // Fetch documents when knowledge base is available useEffect(() => { - if (knowledgeBaseId && !isPreview) { + if (knowledgeBaseId && !isPreview && !isDisabled) { fetchDocuments() } - }, [knowledgeBaseId, isPreview, fetchDocuments]) + }, [knowledgeBaseId, isPreview, isDisabled, fetchDocuments]) const formatDocumentName = (document: DocumentData) => { return document.filename @@ -166,9 +172,6 @@ export function DocumentSelector({ const label = subBlock.placeholder || 'Select document' - // Show disabled state if no knowledge base is selected - const isDisabled = disabled || isPreview || !knowledgeBaseId - return (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx index d5489b94b4a..940a55461b4 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx @@ -376,6 +376,14 @@ export function ConfluenceFileSelector({ } }, [value]) + // Clear preview when value is cleared (e.g., collaborator cleared or domain change cascade) + useEffect(() => { + if (!value) { + setSelectedFile(null) + onFileInfoChange?.(null) + } + }, [value, onFileInfoChange]) + // Handle file selection const handleSelectFile = (file: ConfluenceFileInfo) => { setSelectedFileId(file.id) @@ -547,7 +555,7 @@ export function ConfluenceFileSelector({ {/* File preview */} - {showPreview && selectedFile && ( + {showPreview && selectedFile && selectedFileId && selectedFile.id === selectedFileId && (
{/* File preview */} - {showPreview && selectedFile && ( + {canShowPreview && (
- {!credential && ( - -

Please select Google Calendar credentials first

- - )} ) @@ -277,21 +157,18 @@ export function FileSelectorInput({
setStoreValue(channelId)} botToken={botToken} serverId={serverId} label={subBlock.placeholder || 'Select Discord channel'} - disabled={disabled || !botToken || !serverId} + disabled={finalDisabled} showPreview={true} />
- {(!botToken || !serverId) && ( - -

{!botToken ? 'Please enter a Bot Token first' : 'Please select a Server first'}

- - )} ) @@ -311,9 +188,7 @@ export function FileSelectorInput({ ? (previewValue as string) : (storeValue as string)) || '' } - onChange={(val, info) => { - setSelectedFileId(val) - setFileInfo(info || null) + onChange={(val) => { collaborativeSetSubblockValue(blockId, subBlock.id, val) }} domain={domain} @@ -321,20 +196,14 @@ export function FileSelectorInput({ requiredScopes={subBlock.requiredScopes || []} serviceId={subBlock.serviceId} label={subBlock.placeholder || 'Select Confluence page'} - disabled={disabled || !domain} + disabled={finalDisabled} showPreview={true} - onFileInfoChange={setFileInfo as (info: ConfluenceFileInfo | null) => void} credentialId={credential} workflowId={workflowIdFromUrl} isForeignCredential={isForeignCredential} />
- {!domain && ( - -

Please enter a Confluence domain first

- - )} ) @@ -353,168 +222,139 @@ export function FileSelectorInput({ ? (previewValue as string) : (storeValue as string)) || '' } - onChange={(val, info) => { - setSelectedIssueId(val) - setIssueInfo(info || null) - collaborativeSetSubblockValue(blockId, subBlock.id, val) + onChange={(issueKey) => { + collaborativeSetSubblockValue(blockId, subBlock.id, issueKey) + // Clear related fields when a new issue is selected + collaborativeSetSubblockValue(blockId, 'summary', '') + collaborativeSetSubblockValue(blockId, 'description', '') + if (!issueKey) { + collaborativeSetSubblockValue(blockId, 'manualIssueKey', '') + } }} domain={domain} provider='jira' requiredScopes={subBlock.requiredScopes || []} serviceId={subBlock.serviceId} label={subBlock.placeholder || 'Select Jira issue'} - disabled={ - disabled || !domain || !credential || !(getValue(blockId, 'projectId') as string) - } + disabled={finalDisabled} showPreview={true} - onIssueInfoChange={setIssueInfo as (info: JiraIssueInfo | null) => void} credentialId={credential} - projectId={(getValue(blockId, 'projectId') as string) || ''} + projectId={(projectIdValue as string) || ''} isForeignCredential={isForeignCredential} workflowId={activeWorkflowId || ''} />
- {!domain ? ( - -

Please enter a Jira domain first

- - ) : !credential ? ( - -

Please select Jira credentials first

- - ) : !(getValue(blockId, 'projectId') as string) ? ( - -

Please select a Jira project first

- - ) : null} ) } if (isMicrosoftExcel) { - // Get credential reactively const credential = (connectedCredential as string) || '' - return (
setStoreValue(fileId)} provider='microsoft-excel' requiredScopes={subBlock.requiredScopes || []} serviceId={subBlock.serviceId} label={subBlock.placeholder || 'Select Microsoft Excel file'} - disabled={disabled || !credential} + disabled={finalDisabled} showPreview={true} - onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void} workflowId={activeWorkflowId || ''} credentialId={credential} isForeignCredential={isForeignCredential} />
- {!credential && ( - -

Please select Microsoft Excel credentials first

- - )} ) } - // Handle Microsoft Word selector + // Microsoft Word selector if (isMicrosoftWord) { - // Get credential reactively const credential = (connectedCredential as string) || '' - return (
setStoreValue(fileId)} provider='microsoft-word' requiredScopes={subBlock.requiredScopes || []} serviceId={subBlock.serviceId} label={subBlock.placeholder || 'Select Microsoft Word document'} - disabled={disabled || !credential} + disabled={finalDisabled} showPreview={true} - onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void} />
- {!credential && ( - -

Please select Microsoft Word credentials first

- - )} ) } - // Handle Microsoft OneDrive selector + // Microsoft OneDrive selector if (isMicrosoftOneDrive) { const credential = (connectedCredential as string) || '' - return (
setStoreValue(fileId)} provider='microsoft' requiredScopes={subBlock.requiredScopes || []} serviceId={subBlock.serviceId} label={subBlock.placeholder || 'Select OneDrive folder'} - disabled={disabled || !credential} + disabled={finalDisabled} showPreview={true} - onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void} workflowId={activeWorkflowId || ''} credentialId={credential} isForeignCredential={isForeignCredential} />
- {!credential && ( - -

Please select Microsoft credentials first

- - )} ) } - // Handle Microsoft SharePoint selector + // Microsoft SharePoint selector if (isMicrosoftSharePoint) { const credential = (connectedCredential as string) || '' - return (
setStoreValue(fileId)} provider='microsoft' requiredScopes={subBlock.requiredScopes || []} serviceId={subBlock.serviceId} label={subBlock.placeholder || 'Select SharePoint site'} disabled={disabled || !credential} showPreview={true} - onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void} workflowId={activeWorkflowId || ''} credentialId={credential} isForeignCredential={isForeignCredential} @@ -531,26 +371,26 @@ export function FileSelectorInput({ ) } - // Handle Microsoft Planner task selector + // Microsoft Planner task selector if (isMicrosoftPlanner) { const credential = (connectedCredential as string) || '' - const planId = (getValue(blockId, 'planId') as string) || '' - + const planId = (planIdValue as string) || '' return (
setStoreValue(fileId)} provider='microsoft-planner' requiredScopes={subBlock.requiredScopes || []} serviceId='microsoft-planner' label={subBlock.placeholder || 'Select task'} disabled={disabled || !credential || !planId} showPreview={true} - onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void} planId={planId} workflowId={activeWorkflowId || ''} credentialId={credential} @@ -572,32 +412,22 @@ export function FileSelectorInput({ ) } - // Handle Microsoft Teams selector + // Microsoft Teams selector if (isMicrosoftTeams) { - // Get credential using the same pattern as other tools const credential = (connectedCredential as string) || '' - // Determine the selector type based on the subBlock ID + // Determine the selector type based on the subBlock ID / operation let selectionType: 'team' | 'channel' | 'chat' = 'team' - - if (subBlock.id === 'teamId') { - selectionType = 'team' - } else if (subBlock.id === 'channelId') { - selectionType = 'channel' - } else if (subBlock.id === 'chatId') { - selectionType = 'chat' - } else { - // Fallback: look at the operation to determine the selection type - const operation = (getValue(blockId, 'operation') as string) || '' - if (operation.includes('chat')) { - selectionType = 'chat' - } else if (operation.includes('channel')) { - selectionType = 'channel' - } + if (subBlock.id === 'teamId') selectionType = 'team' + else if (subBlock.id === 'channelId') selectionType = 'channel' + else if (subBlock.id === 'chatId') selectionType = 'chat' + else { + const operation = (operationValue as string) || '' + if (operation.includes('chat')) selectionType = 'chat' + else if (operation.includes('channel')) selectionType = 'channel' } - // Get the teamId from workflow parameters for channel selector - const selectedTeamId = (getValue(blockId, 'teamId') as string) || '' + const selectedTeamId = (teamIdValue as string) || '' return ( @@ -610,10 +440,8 @@ export function FileSelectorInput({ ? (previewValue as string) : (storeValue as string)) || '' } - onChange={(value, info) => { - setSelectedMessageId(value) - setMessageInfo(info || null) - collaborativeSetSubblockValue(blockId, subBlock.id, value) + onChange={(val) => { + collaborativeSetSubblockValue(blockId, subBlock.id, val) }} provider='microsoft-teams' requiredScopes={subBlock.requiredScopes || []} @@ -621,7 +449,6 @@ export function FileSelectorInput({ label={subBlock.placeholder || 'Select Teams message location'} disabled={disabled || !credential} showPreview={true} - onMessageInfoChange={setMessageInfo} credential={credential} selectionType={selectionType} initialTeamId={selectedTeamId} @@ -640,15 +467,11 @@ export function FileSelectorInput({ ) } - // Render Wealthbox selector + // Wealthbox selector if (isWealthbox) { - // Get credential reactively const credential = (connectedCredential as string) || '' - - // Only handle contacts now - both notes and tasks use short-input if (subBlock.id === 'contactId') { const itemType = 'contact' - return ( @@ -660,9 +483,7 @@ export function FileSelectorInput({ ? (previewValue as string) : (storeValue as string)) || '' } - onChange={(val, info) => { - setSelectedWealthboxItemId(val) - setWealthboxItemInfo(info || null) + onChange={(val) => { collaborativeSetSubblockValue(blockId, subBlock.id, val) }} provider='wealthbox' @@ -671,7 +492,6 @@ export function FileSelectorInput({ label={subBlock.placeholder || `Select ${itemType}`} disabled={disabled || !credential} showPreview={true} - onFileInfoChange={setWealthboxItemInfo} credentialId={credential} itemType={itemType} /> @@ -686,7 +506,7 @@ export function FileSelectorInput({ ) } - // If it's noteId or taskId, we should not render the file selector since they now use short-input + // noteId or taskId now use short-input return null } @@ -705,9 +525,7 @@ export function FileSelectorInput({ value={coerceToIdString( (isPreview && previewValue !== undefined ? previewValue : storeValue) as any )} - onChange={(val, info) => { - setSelectedFileId(val) - setFileInfo(info || null) + onChange={(val) => { collaborativeSetSubblockValue(blockId, subBlock.id, val) }} provider={provider} @@ -717,7 +535,6 @@ export function FileSelectorInput({ serviceId={subBlock.serviceId} mimeTypeFilter={subBlock.mimeType} showPreview={true} - onFileInfoChange={setFileInfo} clientId={clientId} apiKey={apiKey} credentialId={credential} diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/components/folder-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/components/folder-selector-input.tsx index bdf6c71305b..f3449b60d76 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/components/folder-selector-input.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/components/folder-selector-input.tsx @@ -5,6 +5,7 @@ import { type FolderInfo, FolderSelector, } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector' +import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate' import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-foreign-credential' import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value' import type { SubBlockConfig } from '@/blocks/types' @@ -37,8 +38,13 @@ export function FolderSelectorInput({ (connectedCredential as string) || '' ) + // Central dependsOn gating + const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview }) + // Get the current value from the store or prop value if in preview mode useEffect(() => { + // When gated/disabled, do not set defaults or write to store + if (finalDisabled) return if (isPreview && previewValue !== undefined) { setSelectedFolderId(previewValue) return @@ -54,7 +60,15 @@ export function FolderSelectorInput({ if (!isPreview) { collaborativeSetSubblockValue(blockId, subBlock.id, defaultValue) } - }, [blockId, subBlock.id, storeValue, collaborativeSetSubblockValue, isPreview, previewValue]) + }, [ + blockId, + subBlock.id, + storeValue, + collaborativeSetSubblockValue, + isPreview, + previewValue, + finalDisabled, + ]) // Handle folder selection const handleFolderChange = (folderId: string, info?: FolderInfo) => { @@ -72,7 +86,7 @@ export function FolderSelectorInput({ provider={subBlock.provider || 'google-email'} requiredScopes={subBlock.requiredScopes || []} label={subBlock.placeholder || 'Select folder'} - disabled={disabled} + disabled={finalDisabled} serviceId={subBlock.serviceId} onFolderInfoChange={setFolderInfo} credentialId={(connectedCredential as string) || ''} diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx index d331b8685c6..d9c33dae3fb 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx @@ -279,29 +279,33 @@ export function FolderSelector({ // Fetch credentials on initial mount useEffect(() => { + if (disabled) return if (!initialFetchRef.current) { fetchCredentials() initialFetchRef.current = true } - }, [fetchCredentials]) + }, [fetchCredentials, disabled]) // Fetch folders when credential is selected useEffect(() => { + if (disabled) return if (selectedCredentialId) { fetchFolders() } - }, [selectedCredentialId, fetchFolders]) + }, [selectedCredentialId, fetchFolders, disabled]) // Keep internal selectedFolderId in sync with the value prop useEffect(() => { + if (disabled) return const currentValue = isPreview ? previewValue : value if (currentValue !== selectedFolderId) { setSelectedFolderId(currentValue || '') } - }, [value, isPreview, previewValue]) + }, [value, isPreview, previewValue, disabled]) // Fetch the selected folder metadata once credentials are ready or value changes useEffect(() => { + if (disabled) return const currentValue = isPreview ? (previewValue as string) : (value as string) if ( currentValue && @@ -310,7 +314,15 @@ export function FolderSelector({ ) { fetchFolderById(currentValue) } - }, [value, selectedCredentialId, selectedFolder, fetchFolderById, isPreview, previewValue]) + }, [ + value, + selectedCredentialId, + selectedFolder, + fetchFolderById, + isPreview, + previewValue, + disabled, + ]) // Handle folder selection const handleSelectFolder = (folder: FolderInfo) => { diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx index e52e4a6837c..c162407c45b 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx @@ -353,6 +353,14 @@ export function JiraProjectSelector({ } }, [value]) + // Clear local preview when value is cleared remotely or via collaborator + useEffect(() => { + if (!value) { + setSelectedProject(null) + onProjectInfoChange?.(null) + } + }, [value, onProjectInfoChange]) + // Handle open change const handleOpenChange = (isOpen: boolean) => { setOpen(isOpen) @@ -387,6 +395,8 @@ export function JiraProjectSelector({ onProjectInfoChange?.(null) } + const canShowPreview = !!(showPreview && selectedProject && value && selectedProject.id === value) + return ( <>
@@ -399,7 +409,7 @@ export function JiraProjectSelector({ className='w-full justify-between' disabled={disabled || !domain || !selectedCredentialId || isForeignCredential} > - {selectedProject ? ( + {canShowPreview ? (
{selectedProject.name} @@ -546,7 +556,7 @@ export function JiraProjectSelector({ {/* Project preview */} - {showPreview && selectedProject && ( + {canShowPreview && (
- {!domain ? ( - -

Please enter a Jira domain first

- - ) : !(jiraCredential as string) ? ( - -

Please select a Jira account first

- - ) : null} ) diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/trigger-config/components/trigger-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/trigger-config/components/trigger-modal.tsx index 37538f0582b..da632152aa9 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/trigger-config/components/trigger-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/trigger-config/components/trigger-modal.tsx @@ -1,4 +1,4 @@ -import { useEffect, useMemo, useState } from 'react' +import { useEffect, useMemo, useRef, useState } from 'react' import { Trash2 } from 'lucide-react' import { Badge } from '@/components/ui/badge' import { Button } from '@/components/ui/button' @@ -46,18 +46,51 @@ export function TriggerModal({ const [config, setConfig] = useState>(initialConfig) const [isSaving, setIsSaving] = useState(false) - // Track if config has changed from initial values + // Snapshot initial values at open for stable dirty-checking across collaborators + const initialConfigRef = useRef>(initialConfig) + const initialCredentialRef = useRef(null) + + // Capture initial credential on first detect + useEffect(() => { + if (initialCredentialRef.current !== null) return + const subBlockStore = useSubBlockStore.getState() + const cred = (subBlockStore.getValue(blockId, 'triggerCredentials') as string | null) || null + initialCredentialRef.current = cred + }, [blockId]) + + // Track if config has changed from initial snapshot const hasConfigChanged = useMemo(() => { - return JSON.stringify(config) !== JSON.stringify(initialConfig) - }, [config, initialConfig]) + return JSON.stringify(config) !== JSON.stringify(initialConfigRef.current) + }, [config]) + + // Track if credential has changed from initial snapshot (computed later once selectedCredentialId is declared) + let hasCredentialChanged = false const [isDeleting, setIsDeleting] = useState(false) const [webhookUrl, setWebhookUrl] = useState('') const [generatedPath, setGeneratedPath] = useState('') const [hasCredentials, setHasCredentials] = useState(false) const [selectedCredentialId, setSelectedCredentialId] = useState(null) + hasCredentialChanged = selectedCredentialId !== initialCredentialRef.current const [dynamicOptions, setDynamicOptions] = useState< Record> >({}) + const lastCredentialIdRef = useRef(null) + + // Reset provider-dependent config fields when credentials change + const resetFieldsForCredentialChange = () => { + setConfig((prev) => { + const next = { ...prev } + if (triggerDef.provider === 'gmail') { + if (Array.isArray(next.labelIds)) next.labelIds = [] + } else if (triggerDef.provider === 'outlook') { + if (Array.isArray(next.folderIds)) next.folderIds = [] + } else if (triggerDef.provider === 'airtable') { + if (typeof next.baseId === 'string') next.baseId = '' + if (typeof next.tableId === 'string') next.tableId = '' + } + return next + }) + } // Initialize config with default values from trigger definition useEffect(() => { @@ -79,35 +112,71 @@ export function TriggerModal({ } }, [triggerDef.configFields, initialConfig]) - // Monitor credential selection + // Monitor credential selection across collaborators; clear options on change/clear useEffect(() => { if (triggerDef.requiresCredentials && triggerDef.credentialProvider) { - // Check if credentials are selected by monitoring the sub-block store const checkCredentials = () => { const subBlockStore = useSubBlockStore.getState() - const credentialValue = subBlockStore.getValue(blockId, 'triggerCredentials') - const hasCredential = Boolean(credentialValue) + const credentialValue = subBlockStore.getValue(blockId, 'triggerCredentials') as + | string + | null + const currentCredentialId = credentialValue || null + const hasCredential = Boolean(currentCredentialId) setHasCredentials(hasCredential) - // If credential changed and it's a Gmail trigger, load labels - if (hasCredential && credentialValue !== selectedCredentialId) { - setSelectedCredentialId(credentialValue) + // If credential was cleared by another user, reset local state and dynamic options + if (!hasCredential) { + if (selectedCredentialId !== null) { + setSelectedCredentialId(null) + } + // Clear provider-specific dynamic options + setDynamicOptions({}) + // Per requirements: only clear dependent selections on actual credential CHANGE, + // not when it becomes empty. So we do NOT reset fields here. + lastCredentialIdRef.current = null + return + } + + // If credential changed, clear options immediately and load for new cred + const previousCredentialId = lastCredentialIdRef.current + + // First detection (prev null → current non-null): do not clear selections + if (previousCredentialId === null) { + setSelectedCredentialId(currentCredentialId) + lastCredentialIdRef.current = currentCredentialId + if (typeof currentCredentialId === 'string') { + if (triggerDef.provider === 'gmail') { + void loadGmailLabels(currentCredentialId) + } else if (triggerDef.provider === 'outlook') { + void loadOutlookFolders(currentCredentialId) + } + } + return + } + + // Real change (prev non-null → different non-null): clear dependent selections + if ( + typeof currentCredentialId === 'string' && + currentCredentialId !== previousCredentialId + ) { + setSelectedCredentialId(currentCredentialId) + lastCredentialIdRef.current = currentCredentialId + // Clear stale options before loading new ones + setDynamicOptions({}) + // Clear any selected values that depend on the credential + resetFieldsForCredentialChange() if (triggerDef.provider === 'gmail') { - loadGmailLabels(credentialValue) + void loadGmailLabels(currentCredentialId) } else if (triggerDef.provider === 'outlook') { - loadOutlookFolders(credentialValue) + void loadOutlookFolders(currentCredentialId) } } } checkCredentials() - - // Set up a subscription to monitor changes const unsubscribe = useSubBlockStore.subscribe(checkCredentials) - return unsubscribe } - // If credentials aren't required, set to true setHasCredentials(true) }, [ blockId, @@ -367,10 +436,14 @@ export function TriggerModal({