Reapply "feat(hosted key): Add exa hosted key (#3221)" (#3495)

This reverts commit 635179d.

Author: Theodore Li

apps/sim/app/api/workspaces/[id]/byok-keys/route.ts

@@ -13,7 +13,7 @@ import { getUserEntityPermissions, getWorkspaceById } from '@/lib/workspaces/per
 
 const logger = createLogger('WorkspaceBYOKKeysAPI')
 
-const VALID_PROVIDERS = ['openai', 'anthropic', 'google', 'mistral'] as const
+const VALID_PROVIDERS = ['openai', 'anthropic', 'google', 'mistral', 'exa'] as const
 
 const UpsertKeySchema = z.object({
   providerId: z.enum(VALID_PROVIDERS),

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts

@@ -3,6 +3,7 @@ import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
   isSubBlockFeatureEnabled,
+  isSubBlockHiddenByHostedKey,
   isSubBlockVisibleForMode,
 } from '@/lib/workflows/subblocks/visibility'
 import type { BlockConfig, SubBlockConfig, SubBlockType } from '@/blocks/types'
@@ -108,6 +109,9 @@ export function useEditorSubblockLayout(
       // Check required feature if specified - declarative feature gating
       if (!isSubBlockFeatureEnabled(block)) return false
 
+      // Hide tool API key fields when hosted
+      if (isSubBlockHiddenByHostedKey(block)) return false
+
       // Special handling for trigger-config type (legacy trigger configuration UI)
       if (block.type === ('trigger-config' as SubBlockType)) {
         const isPureTriggerBlock = config?.triggers?.enabled && config.category === 'triggers'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx

@@ -16,6 +16,7 @@ import {
   evaluateSubBlockCondition,
   hasAdvancedValues,
   isSubBlockFeatureEnabled,
+  isSubBlockHiddenByHostedKey,
   isSubBlockVisibleForMode,
   resolveDependencyValue,
 } from '@/lib/workflows/subblocks/visibility'
@@ -977,6 +978,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
       if (block.hidden) return false
       if (block.hideFromPreview) return false
       if (!isSubBlockFeatureEnabled(block)) return false
+      if (isSubBlockHiddenByHostedKey(block)) return false
 
       const isPureTriggerBlock = config?.triggers?.enabled && config.category === 'triggers'
 

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx

@@ -13,15 +13,15 @@ import {
   ModalFooter,
   ModalHeader,
 } from '@/components/emcn'
-import { AnthropicIcon, GeminiIcon, MistralIcon, OpenAIIcon } from '@/components/icons'
+import { AnthropicIcon, ExaAIIcon, GeminiIcon, MistralIcon, OpenAIIcon } from '@/components/icons'
 import { Skeleton } from '@/components/ui'
 import {
   type BYOKKey,
-  type BYOKProviderId,
   useBYOKKeys,
   useDeleteBYOKKey,
   useUpsertBYOKKey,
 } from '@/hooks/queries/byok-keys'
+import type { BYOKProviderId } from '@/tools/types'
 
 const logger = createLogger('BYOKSettings')
 
@@ -60,6 +60,13 @@ const PROVIDERS: {
     description: 'LLM calls and Knowledge Base OCR',
     placeholder: 'Enter your API key',
   },
+  {
+    id: 'exa',
+    name: 'Exa',
+    icon: ExaAIIcon,
+    description: 'AI-powered search and research',
+    placeholder: 'Enter your Exa API key',
+  },
 ]
 
 function BYOKKeySkeleton() {

apps/sim/blocks/blocks/exa.ts

@@ -309,14 +309,26 @@ export const ExaBlock: BlockConfig<ExaResponse> = {
       value: () => 'exa-research',
       condition: { field: 'operation', value: 'exa_research' },
     },
-    // API Key (common)
+    // API Key — hidden when hosted for operations with hosted key support
     {
       id: 'apiKey',
       title: 'API Key',
       type: 'short-input',
       placeholder: 'Enter your Exa API key',
       password: true,
       required: true,
+      hideWhenHosted: true,
+      condition: { field: 'operation', value: 'exa_research', not: true },
+    },
+    // API Key — always visible for research (no hosted key support)
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input',
+      placeholder: 'Enter your Exa API key',
+      password: true,
+      required: true,
+      condition: { field: 'operation', value: 'exa_research' },
     },
   ],
   tools: {

apps/sim/blocks/types.ts

@@ -253,6 +253,7 @@ export interface SubBlockConfig {
   hidden?: boolean
   hideFromPreview?: boolean // Hide this subblock from the workflow block preview
   requiresFeature?: string // Environment variable name that must be truthy for this subblock to be visible
+  hideWhenHosted?: boolean // Hide this subblock when running on hosted sim
   description?: string
   tooltip?: string // Tooltip text displayed via info icon next to the title
   value?: (params: Record<string, any>) => string

apps/sim/executor/handlers/generic/generic-handler.test.ts

@@ -147,219 +147,4 @@ describe('GenericBlockHandler', () => {
       'Block execution of Some Custom Tool failed with no error message'
     )
   })
-
-  describe('Knowledge block cost tracking', () => {
-    beforeEach(() => {
-      // Set up knowledge block mock
-      mockBlock = {
-        ...mockBlock,
-        config: { tool: 'knowledge_search', params: {} },
-      }
-
-      mockTool = {
-        ...mockTool,
-        id: 'knowledge_search',
-        name: 'Knowledge Search',
-      }
-
-      mockGetTool.mockImplementation((toolId) => {
-        if (toolId === 'knowledge_search') {
-          return mockTool
-        }
-        return undefined
-      })
-    })
-
-    it.concurrent(
-      'should extract and restructure cost information from knowledge tools',
-      async () => {
-        const inputs = { query: 'test query' }
-        const mockToolResponse = {
-          success: true,
-          output: {
-            results: [],
-            query: 'test query',
-            totalResults: 0,
-            cost: {
-              input: 0.00001042,
-              output: 0,
-              total: 0.00001042,
-              tokens: {
-                input: 521,
-                output: 0,
-                total: 521,
-              },
-              model: 'text-embedding-3-small',
-              pricing: {
-                input: 0.02,
-                output: 0,
-                updatedAt: '2025-07-10',
-              },
-            },
-          },
-        }
-
-        mockExecuteTool.mockResolvedValue(mockToolResponse)
-
-        const result = await handler.execute(mockContext, mockBlock, inputs)
-
-        // Verify cost information is restructured correctly for enhanced logging
-        expect(result).toEqual({
-          results: [],
-          query: 'test query',
-          totalResults: 0,
-          cost: {
-            input: 0.00001042,
-            output: 0,
-            total: 0.00001042,
-          },
-          tokens: {
-            input: 521,
-            output: 0,
-            total: 521,
-          },
-          model: 'text-embedding-3-small',
-        })
-      }
-    )
-
-    it.concurrent('should handle knowledge_upload_chunk cost information', async () => {
-      // Update to upload_chunk tool
-      mockBlock.config.tool = 'knowledge_upload_chunk'
-      mockTool.id = 'knowledge_upload_chunk'
-      mockTool.name = 'Knowledge Upload Chunk'
-
-      mockGetTool.mockImplementation((toolId) => {
-        if (toolId === 'knowledge_upload_chunk') {
-          return mockTool
-        }
-        return undefined
-      })
-
-      const inputs = { content: 'test content' }
-      const mockToolResponse = {
-        success: true,
-        output: {
-          data: {
-            id: 'chunk-123',
-            content: 'test content',
-            chunkIndex: 0,
-          },
-          message: 'Successfully uploaded chunk',
-          documentId: 'doc-123',
-          cost: {
-            input: 0.00000521,
-            output: 0,
-            total: 0.00000521,
-            tokens: {
-              input: 260,
-              output: 0,
-              total: 260,
-            },
-            model: 'text-embedding-3-small',
-            pricing: {
-              input: 0.02,
-              output: 0,
-              updatedAt: '2025-07-10',
-            },
-          },
-        },
-      }
-
-      mockExecuteTool.mockResolvedValue(mockToolResponse)
-
-      const result = await handler.execute(mockContext, mockBlock, inputs)
-
-      // Verify cost information is restructured correctly
-      expect(result).toEqual({
-        data: {
-          id: 'chunk-123',
-          content: 'test content',
-          chunkIndex: 0,
-        },
-        message: 'Successfully uploaded chunk',
-        documentId: 'doc-123',
-        cost: {
-          input: 0.00000521,
-          output: 0,
-          total: 0.00000521,
-        },
-        tokens: {
-          input: 260,
-          output: 0,
-          total: 260,
-        },
-        model: 'text-embedding-3-small',
-      })
-    })
-
-    it('should pass through output unchanged for knowledge tools without cost info', async () => {
-      const inputs = { query: 'test query' }
-      const mockToolResponse = {
-        success: true,
-        output: {
-          results: [],
-          query: 'test query',
-          totalResults: 0,
-          // No cost information
-        },
-      }
-
-      mockExecuteTool.mockResolvedValue(mockToolResponse)
-
-      const result = await handler.execute(mockContext, mockBlock, inputs)
-
-      // Should return original output without cost transformation
-      expect(result).toEqual({
-        results: [],
-        query: 'test query',
-        totalResults: 0,
-      })
-    })
-
-    it.concurrent(
-      'should process cost info for all tools (universal cost extraction)',
-      async () => {
-        mockBlock.config.tool = 'some_other_tool'
-        mockTool.id = 'some_other_tool'
-
-        mockGetTool.mockImplementation((toolId) => {
-          if (toolId === 'some_other_tool') {
-            return mockTool
-          }
-          return undefined
-        })
-
-        const inputs = { param: 'value' }
-        const mockToolResponse = {
-          success: true,
-          output: {
-            result: 'success',
-            cost: {
-              input: 0.001,
-              output: 0.002,
-              total: 0.003,
-              tokens: { input: 100, output: 50, total: 150 },
-              model: 'some-model',
-            },
-          },
-        }
-
-        mockExecuteTool.mockResolvedValue(mockToolResponse)
-
-        const result = await handler.execute(mockContext, mockBlock, inputs)
-
-        expect(result).toEqual({
-          result: 'success',
-          cost: {
-            input: 0.001,
-            output: 0.002,
-            total: 0.003,
-          },
-          tokens: { input: 100, output: 50, total: 150 },
-          model: 'some-model',
-        })
-      }
-    )
-  })
 })

apps/sim/executor/handlers/generic/generic-handler.ts

@@ -98,27 +98,7 @@ export class GenericBlockHandler implements BlockHandler {
         throw error
       }
 
-      const output = result.output
-      let cost = null
-
-      if (output?.cost) {
-        cost = output.cost
-      }
-
-      if (cost) {
-        return {
-          ...output,
-          cost: {
-            input: cost.input,
-            output: cost.output,
-            total: cost.total,
-          },
-          tokens: cost.tokens,
-          model: cost.model,
-        }
-      }
-
-      return output
+      return result.output
     } catch (error: any) {
       if (!error.message || error.message === 'undefined (undefined)') {
         let errorMessage = `Block execution of ${tool?.name || block.config.tool} failed`

apps/sim/hooks/queries/byok-keys.ts

@@ -1,11 +1,10 @@
 import { createLogger } from '@sim/logger'
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { API_ENDPOINTS } from '@/stores/constants'
+import type { BYOKProviderId } from '@/tools/types'
 
 const logger = createLogger('BYOKKeysQueries')
 
-export type BYOKProviderId = 'openai' | 'anthropic' | 'google' | 'mistral'
-
 export interface BYOKKey {
   id: string
   providerId: BYOKProviderId

apps/sim/lib/api-key/byok.ts

@@ -7,11 +7,10 @@ import { isHosted } from '@/lib/core/config/feature-flags'
 import { decryptSecret } from '@/lib/core/security/encryption'
 import { getHostedModels } from '@/providers/models'
 import { useProvidersStore } from '@/stores/providers/store'
+import type { BYOKProviderId } from '@/tools/types'
 
 const logger = createLogger('BYOKKeys')
 
-export type BYOKProviderId = 'openai' | 'anthropic' | 'google' | 'mistral'
-
 export interface BYOKKeyResult {
   apiKey: string
   isBYOK: true