fix agent tool input

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx

@@ -24,12 +24,7 @@ import {
   getMcpToolIssue as validateMcpTool,
 } from '@/lib/mcp/tool-validation'
 import type { McpToolSchema } from '@/lib/mcp/types'
-import {
-  getCanonicalScopesForProvider,
-  getProviderIdFromServiceId,
-  type OAuthProvider,
-  type OAuthService,
-} from '@/lib/oauth'
+import { getProviderIdFromServiceId, type OAuthProvider, type OAuthService } from '@/lib/oauth'
 import { extractInputFieldsFromBlocks } from '@/lib/workflows/input-format'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import {
@@ -1414,16 +1409,6 @@ export const ToolInput = memo(function ToolInput({
     isToolAlreadySelected,
   ])
 
-  const toolRequiresOAuth = (toolId: string): boolean => {
-    const toolParams = getToolParametersConfig(toolId)
-    return toolParams?.toolConfig?.oauth?.required || false
-  }
-
-  const getToolOAuthConfig = (toolId: string) => {
-    const toolParams = getToolParametersConfig(toolId)
-    return toolParams?.toolConfig?.oauth
-  }
-
   return (
     <div className='w-full space-y-[8px]'>
       <Combobox
@@ -1537,16 +1522,11 @@ export const ToolInput = memo(function ToolInput({
             ? subBlocksResult!.subBlocks
             : []
 
-          const requiresOAuth =
-            !isCustomTool && !isMcpTool && currentToolId && toolRequiresOAuth(currentToolId)
-          const oauthConfig =
-            !isCustomTool && !isMcpTool && currentToolId ? getToolOAuthConfig(currentToolId) : null
-
           const hasOperations = !isCustomTool && !isMcpTool && hasMultipleOperations(tool.type)
           const hasParams = useSubBlocks
             ? displaySubBlocks.length > 0
             : displayParams.filter((param) => evaluateParameterCondition(param, tool)).length > 0
-          const hasToolBody = hasOperations || (requiresOAuth && oauthConfig) || hasParams
+          const hasToolBody = hasOperations || hasParams
 
           const isExpandedForDisplay = hasToolBody
             ? isPreview
@@ -1746,39 +1726,6 @@ export const ToolInput = memo(function ToolInput({
                   {(() => {
                     const renderedElements: React.ReactNode[] = []
 
-                    const showOAuth =
-                      requiresOAuth && oauthConfig && tool.params?.authMethod !== 'bot_token'
-
-                    const renderOAuthAccount = (): React.ReactNode => {
-                      if (!showOAuth || !oauthConfig) return null
-                      const credentialSubBlock = toolBlock?.subBlocks?.find(
-                        (s) => s.type === 'oauth-input'
-                      )
-                      return (
-                        <div key='oauth-account' className='relative min-w-0 space-y-[6px]'>
-                          <div className='font-medium text-[13px] text-[var(--text-primary)]'>
-                            {credentialSubBlock?.title || 'Account'}{' '}
-                            <span className='ml-0.5'>*</span>
-                          </div>
-                          <div className='w-full min-w-0'>
-                            <ToolCredentialSelector
-                              value={tool.params?.credential || ''}
-                              onChange={(value: string) =>
-                                handleParamChange(toolIndex, 'credential', value)
-                              }
-                              provider={oauthConfig.provider as OAuthProvider}
-                              requiredScopes={
-                                credentialSubBlock?.requiredScopes ||
-                                getCanonicalScopesForProvider(oauthConfig.provider)
-                              }
-                              serviceId={oauthConfig.provider}
-                              disabled={disabled}
-                            />
-                          </div>
-                        </div>
-                      )
-                    }
-
                     const renderSubBlock = (sb: BlockSubBlockConfig): React.ReactNode => {
                       const effectiveParamId = sb.id
                       const canonicalId = toolCanonicalIndex?.canonicalIdBySubBlockId[sb.id]
@@ -1848,44 +1795,8 @@ export const ToolInput = memo(function ToolInput({
                         })
                       )
 
-                      type RenderItem =
-                        | { kind: 'subblock'; sb: BlockSubBlockConfig }
-                        | { kind: 'oauth' }
-
-                      const renderOrder: RenderItem[] = displaySubBlocks.map((sb) => ({
-                        kind: 'subblock' as const,
-                        sb,
-                      }))
-
-                      if (showOAuth) {
-                        const credentialIdx = allBlockSubBlocks.findIndex(
-                          (sb) => sb.type === 'oauth-input'
-                        )
-                        if (credentialIdx >= 0) {
-                          const sbPositions = new Map(allBlockSubBlocks.map((sb, i) => [sb.id, i]))
-                          const insertAt = renderOrder.findIndex(
-                            (item) =>
-                              item.kind === 'subblock' &&
-                              (sbPositions.get(item.sb.id) ?? Number.POSITIVE_INFINITY) >
-                                credentialIdx
-                          )
-                          if (insertAt === -1) {
-                            renderOrder.push({ kind: 'oauth' })
-                          } else {
-                            renderOrder.splice(insertAt, 0, { kind: 'oauth' })
-                          }
-                        } else {
-                          renderOrder.unshift({ kind: 'oauth' })
-                        }
-                      }
-
-                      for (const item of renderOrder) {
-                        if (item.kind === 'oauth') {
-                          const el = renderOAuthAccount()
-                          if (el) renderedElements.push(el)
-                        } else {
-                          renderedElements.push(renderSubBlock(item.sb))
-                        }
+                      for (const sb of displaySubBlocks) {
+                        renderedElements.push(renderSubBlock(sb))
                       }
 
                       const uncoveredParams = displayParams.filter(
@@ -1924,11 +1835,6 @@ export const ToolInput = memo(function ToolInput({
                       )
                     }
 
-                    {
-                      const el = renderOAuthAccount()
-                      if (el) renderedElements.push(el)
-                    }
-
                     const filteredParams = displayParams.filter((param) =>
                       evaluateParameterCondition(param, tool)
                     )

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

@@ -1004,6 +1004,7 @@ export class AgentBlockHandler implements BlockHandler {
       responseFormat,
       workflowId: ctx.workflowId,
       workspaceId: ctx.workspaceId,
+      userId: ctx.userId,
       stream: streaming,
       messages: messages?.map(({ executionId, ...msg }) => msg),
       environmentVariables: ctx.environmentVariables || {},

apps/sim/tools/index.ts

@@ -298,7 +298,10 @@ export async function executeTool(
       throw new Error(`Tool not found: ${toolId}`)
     }
 
-    // If we have a credential parameter, fetch the access token
+    if (contextParams.oauthCredential) {
+      contextParams.credential = contextParams.oauthCredential
+    }
+
     if (contextParams.credential) {
       logger.info(
         `[${requestId}] Tool ${toolId} needs access token for credential: ${contextParams.credential}`
@@ -330,7 +333,7 @@ export async function executeTool(
         const tokenHeaders: Record<string, string> = { 'Content-Type': 'application/json' }
         if (typeof window === 'undefined') {
           try {
-            const internalToken = await generateInternalToken()
+            const internalToken = await generateInternalToken(userId)
             tokenHeaders.Authorization = `Bearer ${internalToken}`
           } catch (_e) {
             // Swallow token generation errors; the request will fail and be reported upstream

apps/sim/tools/params.ts

@@ -942,8 +942,10 @@ export function getSubBlocksForToolInput(
         // Infer from structural checks
         if (STRUCTURAL_SUBBLOCK_IDS.has(sb.id)) {
           visibility = 'hidden'
-        } else if (AUTH_SUBBLOCK_TYPES.has(sb.type)) {
+        } else if (AUTH_SUBBLOCK_TYPES.has(sb.type) && sb.canonicalParamId !== 'oauthCredential') {
           visibility = 'hidden'
+        } else if (sb.canonicalParamId === 'oauthCredential') {
+          visibility = 'user-only'
         } else if (
           sb.password &&
           (sb.id === 'botToken' || sb.id === 'accessToken' || sb.id === 'apiKey')