move api key under model, update mistral and groq

Author: waleedlatif1

apps/sim/blocks/blocks/agent.ts

@@ -407,18 +407,6 @@ Return ONLY the JSON array.`,
         value: providers.bedrock.models,
       },
     },
-    {
-      id: 'tools',
-      title: 'Tools',
-      type: 'tool-input',
-      defaultValue: [],
-    },
-    {
-      id: 'skills',
-      title: 'Skills',
-      type: 'skill-input',
-      defaultValue: [],
-    },
     {
       id: 'apiKey',
       title: 'API Key',
@@ -445,6 +433,18 @@ Return ONLY the JSON array.`,
             not: true, // Show for all models EXCEPT Ollama, vLLM, Vertex, and Bedrock models
           }),
     },
+    {
+      id: 'tools',
+      title: 'Tools',
+      type: 'tool-input',
+      defaultValue: [],
+    },
+    {
+      id: 'skills',
+      title: 'Skills',
+      type: 'skill-input',
+      defaultValue: [],
+    },
     {
       id: 'memoryType',
       title: 'Memory',

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

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

apps/sim/providers/mistral/index.ts

@@ -141,7 +141,6 @@ export const mistralProvider: ProviderConfig = {
         const streamingParams: ChatCompletionCreateParamsStreaming = {
           ...payload,
           stream: true,
-          stream_options: { include_usage: true },
         }
         const streamResponse = await mistral.chat.completions.create(streamingParams)
 
@@ -453,7 +452,6 @@ export const mistralProvider: ProviderConfig = {
           messages: currentMessages,
           tool_choice: 'auto',
           stream: true,
-          stream_options: { include_usage: true },
         }
         const streamResponse = await mistral.chat.completions.create(streamingParams)