improvement(superagent): nuke superagent

Author: Sg312

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-item.test.tsx

@@ -1,9 +1,10 @@
 /**
  * @vitest-environment node
  */
-import type { ReactNode } from 'react'
+import type { ReactNode, SVGProps } from 'react'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { describe, expect, it, vi } from 'vitest'
+import { getBlockByToolName } from '@/blocks/registry'
 import { ToolCallItem } from './tool-call-item'
 
 vi.mock('@/components/ui', () => ({
@@ -39,4 +40,21 @@ describe('ToolCallItem', () => {
     expect(markup).toContain('Wrote brief.md')
     expect(markup).not.toContain('Writing brief.md')
   })
+
+  it('renders the owning integration icon for a resolved integration operation', () => {
+    vi.mocked(getBlockByToolName).mockReturnValueOnce({
+      name: 'Gmail',
+      icon: (props: SVGProps<SVGSVGElement>) => <svg {...props} data-testid='gmail-icon' />,
+    } as ReturnType<typeof getBlockByToolName>)
+    const markup = renderToStaticMarkup(
+      <ToolCallItem
+        toolName='gmail_read_v2'
+        displayTitle='Gmail: Searching for invoice emails'
+        status='executing'
+      />
+    )
+
+    expect(markup).toContain('<svg')
+    expect(markup).toContain('Gmail: Searching for invoice emails')
+  })
 })

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-item.tsx

@@ -4,6 +4,7 @@ import { Read as ReadTool, WorkspaceFile } from '@/lib/copilot/generated/tool-ca
 import { getReadTargetBlock } from '@/lib/copilot/tools/client/read-block'
 import { getToolCompletedTitle } from '@/lib/copilot/tools/tool-display'
 import { getBareIconStyle } from '@/blocks/icon-color'
+import { getBlockByToolName } from '@/blocks/registry'
 import type { ToolCallStatus } from '../../../../types'
 import { resolveToolDisplayState } from '../../utils'
 
@@ -88,7 +89,7 @@ export function ToolCallItem({
       ? (getToolCompletedTitle(liveTitle) ?? liveTitle)
       : liveTitle
 
-  const BlockIcon = readBlock?.icon
+  const BlockIcon = (readBlock ?? getBlockByToolName(toolName))?.icon
 
   return (
     <div className='flex items-center gap-[6px] pl-6'>

apps/sim/lib/copilot/chat/payload.test.ts

@@ -33,6 +33,8 @@ vi.mock('@/tools/registry', () => ({
       id: 'gmail_send',
       name: 'Gmail Send',
       description: 'Send emails using Gmail',
+      outputs: { messageId: { type: 'string', description: 'Sent message ID' } },
+      oauth: { required: true, provider: 'google-email' },
     },
     brandfetch_search: {
       id: 'brandfetch_search',
@@ -67,7 +69,13 @@ vi.mock('@/lib/copilot/integration-tools', () => ({
   getExposedIntegrationTools: vi.fn(() => [
     {
       toolId: 'gmail_send',
-      config: { id: 'gmail_send', name: 'Gmail Send', description: 'Send emails using Gmail' },
+      config: {
+        id: 'gmail_send',
+        name: 'Gmail Send',
+        description: 'Send emails using Gmail',
+        outputs: { messageId: { type: 'string', description: 'Sent message ID' } },
+        oauth: { required: true, provider: 'google-email' },
+      },
       service: 'gmail',
       operation: 'send',
     },
@@ -154,6 +162,22 @@ describe('buildIntegrationToolSchemas', () => {
     expect(runTool?.executeLocally).toBe(true)
   })
 
+  it('preserves operation, outputs, and OAuth discovery metadata', async () => {
+    mockGetHighestPrioritySubscription.mockResolvedValue({ plan: 'pro', status: 'active' })
+
+    const toolSchemas = await buildIntegrationToolSchemas('user-metadata')
+    const gmailTool = toolSchemas.find((tool) => tool.name === 'gmail_send')
+
+    expect(gmailTool).toEqual(
+      expect.objectContaining({
+        service: 'gmail',
+        operation: 'send',
+        outputs: { messageId: { type: 'string', description: 'Sent message ID' } },
+        oauth: { required: true, provider: 'google-email' },
+      })
+    )
+  })
+
   it('uses copilot-facing file schemas for integration tools', async () => {
     mockGetHighestPrioritySubscription.mockResolvedValue({ plan: 'pro', status: 'active' })
 
@@ -174,11 +198,13 @@ describe('buildIntegrationToolSchemas', () => {
 
     const first = await buildIntegrationToolSchemas('user-cache')
     first[0].input_schema.mutated = true
+    if (first[0].outputs) first[0].outputs.mutated = true
     const second = await buildIntegrationToolSchemas('user-cache')
 
     expect(mockGetHighestPrioritySubscription).toHaveBeenCalledTimes(1)
     expect(mockCreateUserToolSchema).toHaveBeenCalledTimes(3)
     expect(second[0].input_schema).not.toHaveProperty('mutated')
+    expect(second[0].outputs).not.toHaveProperty('mutated')
   })
 })
 

apps/sim/lib/copilot/chat/payload.ts

@@ -57,6 +57,7 @@ export interface ToolSchema {
   name: string
   description: string
   input_schema: Record<string, unknown>
+  outputs?: Record<string, unknown>
   defer_loading?: boolean
   executeLocally?: boolean
   params?: Record<string, unknown>
@@ -104,6 +105,7 @@ function cloneToolSchemas(toolSchemas: ToolSchema[]): ToolSchema[] {
       input_schema: { ...tool.input_schema },
     }
     if (tool.params) cloned.params = { ...tool.params }
+    if (tool.outputs) cloned.outputs = structuredClone(tool.outputs)
     if (tool.oauth) cloned.oauth = { ...tool.oauth }
     return cloned
   })
@@ -236,6 +238,16 @@ async function buildIntegrationToolSchemasUncached(
             appendEmailTagline: shouldAppendEmailTagline,
           }),
           input_schema: { ...userSchema },
+          ...(toolConfig.outputs && {
+            outputs: Object.fromEntries(
+              Object.entries(toolConfig.outputs)
+                .filter(([, output]) => output != null)
+                .map(([key, output]) => [
+                  key,
+                  { type: output.type, description: output.description },
+                ])
+            ),
+          }),
           defer_loading: true,
           executeLocally:
             catalogEntry?.clientExecutable === true || catalogEntry?.route === 'client',
@@ -357,7 +369,9 @@ export async function buildCopilotRequestPayload(
   let mothershipTools: ToolSchema[] = []
   const payloadLogger = logger.withMetadata({ messageId: userMessageId })
 
-  if (effectiveMode === 'build') {
+  // "superagent" is a legacy wire value for Direct Action mode; both modes
+  // execute connected-service operations through the main-agent gateway.
+  if (effectiveMode === 'build' || effectiveMode === 'superagent') {
     integrationTools = await buildIntegrationToolSchemas(
       userId,
       userMessageId,

apps/sim/lib/copilot/generated/tool-catalog-v1.ts

@@ -9,6 +9,7 @@ export interface ToolCatalogEntry {
   id:
     | 'agent'
     | 'auth'
+    | 'call_integration_tool'
     | 'check_deployment_status'
     | 'complete_scheduled_task'
     | 'cp'
@@ -85,14 +86,14 @@ export interface ToolCatalogEntry {
     | 'scrape_page'
     | 'search'
     | 'search_documentation'
+    | 'search_integration_tools'
     | 'search_knowledge_base'
     | 'search_library_docs'
     | 'search_online'
     | 'search_patterns'
     | 'set_block_enabled'
     | 'set_environment_variables'
     | 'set_global_workflow_variables'
-    | 'superagent'
     | 'table'
     | 'update_deployment_version'
     | 'update_scheduled_task_history'
@@ -105,6 +106,7 @@ export interface ToolCatalogEntry {
   name:
     | 'agent'
     | 'auth'
+    | 'call_integration_tool'
     | 'check_deployment_status'
     | 'complete_scheduled_task'
     | 'cp'
@@ -181,14 +183,14 @@ export interface ToolCatalogEntry {
     | 'scrape_page'
     | 'search'
     | 'search_documentation'
+    | 'search_integration_tools'
     | 'search_knowledge_base'
     | 'search_library_docs'
     | 'search_online'
     | 'search_patterns'
     | 'set_block_enabled'
     | 'set_environment_variables'
     | 'set_global_workflow_variables'
-    | 'superagent'
     | 'table'
     | 'update_deployment_version'
     | 'update_scheduled_task_history'
@@ -210,7 +212,6 @@ export interface ToolCatalogEntry {
     | 'run'
     | 'scheduled_task'
     | 'search'
-    | 'superagent'
     | 'table'
     | 'workflow'
 }
@@ -248,6 +249,35 @@ export const Auth: ToolCatalogEntry = {
   internal: true,
 }
 
+export const CallIntegrationTool: ToolCatalogEntry = {
+  id: 'call_integration_tool',
+  name: 'call_integration_tool',
+  route: 'go',
+  mode: 'sync',
+  parameters: {
+    properties: {
+      arguments: {
+        additionalProperties: true,
+        description: "Inputs matching the selected operation's server-owned inputSchema.",
+        type: 'object',
+      },
+      credentialId: {
+        description:
+          'Optional OAuth credential ID convenience field. It is injected into operation arguments when that schema accepts credentialId.',
+        type: 'string',
+      },
+      description: {
+        description:
+          'Short present-progressive UI phrase describing this invocation, without the integration name (for example "Searching for invoice emails").',
+        type: 'string',
+      },
+      toolId: { description: 'Exact toolId returned by search_integration_tools.', type: 'string' },
+    },
+    required: ['toolId', 'description', 'arguments'],
+    type: 'object',
+  },
+}
+
 export const CheckDeploymentStatus: ToolCatalogEntry = {
   id: 'check_deployment_status',
   name: 'check_deployment_status',
@@ -1501,6 +1531,12 @@ export const FunctionExecute: ToolCatalogEntry = {
           },
         },
       },
+      timeout: {
+        type: 'number',
+        description:
+          'Maximum execution time in seconds. The sandbox stops execution and returns a timeout error after this duration. Defaults to 10 seconds; the platform execution limit still applies.',
+        default: 10,
+      },
       title: {
         type: 'string',
         description:
@@ -3633,6 +3669,34 @@ export const SearchDocumentation: ToolCatalogEntry = {
   },
 }
 
+export const SearchIntegrationTools: ToolCatalogEntry = {
+  id: 'search_integration_tools',
+  name: 'search_integration_tools',
+  route: 'go',
+  mode: 'sync',
+  parameters: {
+    properties: {
+      limit: {
+        description: 'Maximum matches to return. Defaults to 5.',
+        maximum: 10,
+        minimum: 1,
+        type: 'integer',
+      },
+      query: {
+        description: 'What the service operation must do, in plain language.',
+        type: 'string',
+      },
+      service: {
+        description:
+          'Optional canonical service name, such as "gmail", "slack", or "google_sheets".',
+        type: 'string',
+      },
+    },
+    required: ['query'],
+    type: 'object',
+  },
+}
+
 export const SearchKnowledgeBase: ToolCatalogEntry = {
   id: 'search_knowledge_base',
   name: 'search_knowledge_base',
@@ -3858,26 +3922,6 @@ export const SetGlobalWorkflowVariables: ToolCatalogEntry = {
   requiredPermission: 'write',
 }
 
-export const Superagent: ToolCatalogEntry = {
-  id: 'superagent',
-  name: 'superagent',
-  route: 'subagent',
-  mode: 'async',
-  parameters: {
-    properties: {
-      task: {
-        description:
-          "A single sentence — the agent has full conversation context. Do NOT pre-read credentials or look up configs. Example: 'send the email we discussed' or 'check my calendar for tomorrow'.",
-        type: 'string',
-      },
-    },
-    required: ['task'],
-    type: 'object',
-  },
-  subagentId: 'superagent',
-  internal: true,
-}
-
 export const Table: ToolCatalogEntry = {
   id: 'table',
   name: 'table',
@@ -4307,7 +4351,7 @@ export const Workflow: ToolCatalogEntry = {
       },
       sessionId: {
         description:
-          'Reusable session ID returned by an earlier workflow call in this chat. Supply it only on a later user message that continues the same task; the agent resumes from its saved transcript and receives unseen parent conversation messages. Omit it for a new or independent task.',
+          'Reusable session ID returned by an earlier workflow call in this chat. Supply it only on a later user message that continues the same task, and at most once per user message — never re-pass a sessionId already used this turn; the agent resumes from its saved transcript and receives unseen parent conversation messages. Omit it for a new or independent task.',
         type: 'string',
       },
       title: {
@@ -4747,6 +4791,7 @@ export const WorkspaceFileOperationValues = [
 export const TOOL_CATALOG: Record<string, ToolCatalogEntry> = {
   [Agent.id]: Agent,
   [Auth.id]: Auth,
+  [CallIntegrationTool.id]: CallIntegrationTool,
   [CheckDeploymentStatus.id]: CheckDeploymentStatus,
   [CompleteScheduledTask.id]: CompleteScheduledTask,
   [Cp.id]: Cp,
@@ -4823,14 +4868,14 @@ export const TOOL_CATALOG: Record<string, ToolCatalogEntry> = {
   [ScrapePage.id]: ScrapePage,
   [Search.id]: Search,
   [SearchDocumentation.id]: SearchDocumentation,
+  [SearchIntegrationTools.id]: SearchIntegrationTools,
   [SearchKnowledgeBase.id]: SearchKnowledgeBase,
   [SearchLibraryDocs.id]: SearchLibraryDocs,
   [SearchOnline.id]: SearchOnline,
   [SearchPatterns.id]: SearchPatterns,
   [SetBlockEnabled.id]: SetBlockEnabled,
   [SetEnvironmentVariables.id]: SetEnvironmentVariables,
   [SetGlobalWorkflowVariables.id]: SetGlobalWorkflowVariables,
-  [Superagent.id]: Superagent,
   [Table.id]: Table,
   [UpdateDeploymentVersion.id]: UpdateDeploymentVersion,
   [UpdateScheduledTaskHistory.id]: UpdateScheduledTaskHistory,