Improve tool search

Sg312 · Sg312 · commit 5a8e66ba831c · 2026-05-28T17:13:34.000-07:00
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx
@@ -2,6 +2,7 @@
 
 import { memo, useMemo } from 'react'
 import { Read as ReadTool, WorkspaceFile } from '@/lib/copilot/generated/tool-catalog-v1'
+import { isToolHiddenInUi } from '@/lib/copilot/tools/client/hidden-tools'
 import { resolveToolDisplay } from '@/lib/copilot/tools/client/store-utils'
 import { ClientToolCallState } from '@/lib/copilot/tools/client/tool-call-state'
 import type { ContentBlock, MothershipResource, OptionItem, ToolCallData } from '../../types'
@@ -17,11 +18,6 @@ import {
 } from './components'
 
 const FILE_SUBAGENT_ID = 'file'
-const HIDDEN_TOOL_NAMES = new Set([
-  'tool_search_tool_regex',
-  'load_agent_skill',
-  'load_custom_tool',
-])
 
 interface TextSegment {
   type: 'text'
@@ -80,7 +76,7 @@ function isToolResultRead(params?: Record<string, unknown>): boolean {
 }
 
 function isHiddenToolCall(toolName: string | undefined): boolean {
-  return !!toolName && HIDDEN_TOOL_NAMES.has(toolName)
+  return isToolHiddenInUi(toolName)
 }
 
 function formatToolName(name: string): string {
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -77,7 +77,6 @@ import {
   RunWorkflowUntilBlock,
   ScrapePage,
   SearchOnline,
-  ToolSearchToolRegex,
   WorkspaceFile,
   WorkspaceFileOperation,
 } from '@/lib/copilot/generated/tool-catalog-v1'
@@ -3268,7 +3267,7 @@ export function useChat(
               const isPartial =
                 payload.partial === true ||
                 payload.status === MothershipStreamV1ToolStatus.generating
-              if (name === ToolSearchToolRegex.id || isToolHiddenInUi(name)) {
+              if (isToolHiddenInUi(name)) {
                 break
               }
               const ui = getToolUI(payload.ui)
diff --git a/apps/sim/executor/handlers/mothership/mothership-handler.test.ts b/apps/sim/executor/handlers/mothership/mothership-handler.test.ts
@@ -302,6 +302,59 @@ describe('MothershipBlockHandler', () => {
     })
   })
 
+  it('preserves failed tool calls as output metadata without throwing', async () => {
+    mockGenerateId.mockReturnValueOnce('chat-uuid')
+    mockGenerateId.mockReturnValueOnce('message-uuid')
+    mockGenerateId.mockReturnValueOnce('request-uuid')
+
+    fetchMock.mockResolvedValue(
+      createNdjsonResponse([
+        {
+          type: 'final',
+          data: {
+            content: 'The lookup failed, so I could not use that result.',
+            model: 'mothership',
+            conversationId: 'chat-uuid',
+            tokens: { total: 7 },
+            toolCalls: [
+              {
+                name: 'lookup_customer',
+                status: 'error',
+                params: { email: 'missing@example.com' },
+                result: { success: false, error: 'Customer not found' },
+                error: 'Customer not found',
+                durationMs: 42,
+              },
+            ],
+          },
+        },
+      ])
+    )
+
+    const result = await handler.execute(context, block, { prompt: 'Hello from workflow' })
+
+    expect(result).toEqual({
+      content: 'The lookup failed, so I could not use that result.',
+      model: 'mothership',
+      conversationId: 'chat-uuid',
+      tokens: { total: 7 },
+      toolCalls: {
+        list: [
+          expect.objectContaining({
+            name: 'lookup_customer',
+            status: 'error',
+            arguments: { email: 'missing@example.com' },
+            result: { success: false, error: 'Customer not found' },
+            error: 'Customer not found',
+            duration: 42,
+          }),
+        ],
+        count: 1,
+      },
+      cost: undefined,
+    })
+  })
+
   it('surfaces mothership execute stream errors', async () => {
     mockGenerateId.mockReturnValueOnce('chat-uuid')
     mockGenerateId.mockReturnValueOnce('message-uuid')
diff --git a/apps/sim/executor/handlers/mothership/mothership-handler.ts b/apps/sim/executor/handlers/mothership/mothership-handler.ts
@@ -63,11 +63,9 @@ function formatMothershipBlockOutput(
 ): NormalizedBlockOutput {
   const formattedList = (result.toolCalls || []).map((tc: Record<string, unknown>) => ({
     name: typeof tc.name === 'string' ? tc.name : String(tc.name ?? ''),
-    arguments: (tc.params && typeof tc.params === 'object' ? tc.params : {}) as Record<
-      string,
-      unknown
-    >,
-    result: tc.result as any,
+    ...(typeof tc.status === 'string' ? { status: tc.status } : {}),
+    arguments: (tc.arguments || tc.params || tc.input || {}) as Record<string, unknown>,
+    result: (tc.result ?? tc.output) as any,
     error: typeof tc.error === 'string' ? tc.error : undefined,
     duration: typeof tc.durationMs === 'number' ? tc.durationMs : 0,
   }))
diff --git a/apps/sim/lib/copilot/chat/payload.test.ts b/apps/sim/lib/copilot/chat/payload.test.ts
@@ -53,6 +53,33 @@ vi.mock('@/tools/utils', () => ({
   stripVersionSuffix: vi.fn((toolId: string) => toolId),
 }))
 
+vi.mock('@/lib/copilot/integration-tools', () => ({
+  getExposedIntegrationTools: vi.fn(() => [
+    {
+      toolId: 'gmail_send',
+      config: { id: 'gmail_send', name: 'Gmail Send', description: 'Send emails using Gmail' },
+      service: 'gmail',
+      operation: 'send',
+    },
+    {
+      toolId: 'brandfetch_search',
+      config: {
+        id: 'brandfetch_search',
+        name: 'Brandfetch Search',
+        description: 'Search for brands by company name',
+      },
+      service: 'brandfetch',
+      operation: 'search',
+    },
+    {
+      toolId: 'run_workflow',
+      config: { id: 'run_workflow', name: 'Run Workflow', description: 'Run a workflow from the client' },
+      service: 'run',
+      operation: 'workflow',
+    },
+  ]),
+}))
+
 vi.mock('@/tools/params', () => ({
   createUserToolSchema: mockCreateUserToolSchema,
 }))
diff --git a/apps/sim/lib/copilot/chat/payload.ts b/apps/sim/lib/copilot/chat/payload.ts
@@ -3,14 +3,14 @@ import { toError } from '@sim/utils/errors'
 import { LRUCache } from 'lru-cache'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { isPaid } from '@/lib/billing/plan-helpers'
+import { getExposedIntegrationTools } from '@/lib/copilot/integration-tools'
 import { getToolEntry } from '@/lib/copilot/tool-executor/router'
 import { getCopilotToolDescription } from '@/lib/copilot/tools/descriptions'
 import { isHosted } from '@/lib/core/config/feature-flags'
 import { registerCache } from '@/lib/monitoring/cache-registry'
 import { buildMothershipToolsForRequest } from '@/lib/mothership/settings/runtime'
 import { trackChatUpload } from '@/lib/uploads/contexts/workspace/workspace-file-manager'
-import { tools } from '@/tools/registry'
-import { getLatestVersionTools, stripVersionSuffix } from '@/tools/utils'
+import { stripVersionSuffix } from '@/tools/utils'
 
 const logger = createLogger('CopilotChatPayload')
 const TOOL_SCHEMA_CACHE_TTL_MS = 30_000
@@ -91,7 +91,6 @@ export async function buildIntegrationToolSchemas(
     const integrationTools: ToolSchema[] = []
     try {
       const { createUserToolSchema } = await import('@/tools/params')
-      const latestTools = getLatestVersionTools(tools)
       let shouldAppendEmailTagline = false
 
       try {
@@ -135,24 +134,23 @@ export async function buildIntegrationToolSchemas(
         }
       }
 
-      for (const [toolId, toolConfig] of Object.entries(latestTools)) {
+      for (const { toolId, config: toolConfig } of getExposedIntegrationTools()) {
         try {
-          const strippedName = stripVersionSuffix(toolId)
           if (allowedIntegrations && toolIdToBlockType) {
-            const owningBlock = toolIdToBlockType.get(strippedName)
+            const owningBlock = toolIdToBlockType.get(stripVersionSuffix(toolId))
             if (owningBlock && !allowedIntegrations.has(owningBlock)) {
               continue
             }
           }
           const userSchema = createUserToolSchema(toolConfig, {
             surface: options.schemaSurface ?? 'copilot',
           })
-          const catalogEntry = getToolEntry(strippedName)
+          const catalogEntry = getToolEntry(toolId)
           integrationTools.push({
-            name: strippedName,
+            name: toolId,
             description: getCopilotToolDescription(toolConfig, {
               isHosted,
-              fallbackName: strippedName,
+              fallbackName: toolId,
               appendEmailTagline: shouldAppendEmailTagline,
             }),
             input_schema: { ...userSchema },
diff --git a/apps/sim/lib/copilot/generated/tool-catalog-v1.ts b/apps/sim/lib/copilot/generated/tool-catalog-v1.ts
@@ -55,6 +55,7 @@ export interface ToolCatalogEntry {
     | 'list_folders'
     | 'list_user_workspaces'
     | 'list_workspace_mcp_servers'
+    | 'load_integration_tool'
     | 'manage_credential'
     | 'manage_custom_tool'
     | 'manage_job'
@@ -92,7 +93,6 @@ export interface ToolCatalogEntry {
     | 'set_global_workflow_variables'
     | 'superagent'
     | 'table'
-    | 'tool_search_tool_regex'
     | 'touch_plan'
     | 'update_job_history'
     | 'update_workspace_mcp_server'
@@ -151,6 +151,7 @@ export interface ToolCatalogEntry {
     | 'list_folders'
     | 'list_user_workspaces'
     | 'list_workspace_mcp_servers'
+    | 'load_integration_tool'
     | 'manage_credential'
     | 'manage_custom_tool'
     | 'manage_job'
@@ -188,7 +189,6 @@ export interface ToolCatalogEntry {
     | 'set_global_workflow_variables'
     | 'superagent'
     | 'table'
-    | 'tool_search_tool_regex'
     | 'touch_plan'
     | 'update_job_history'
     | 'update_workspace_mcp_server'
@@ -1944,6 +1944,25 @@ export const ListWorkspaceMcpServers: ToolCatalogEntry = {
   },
 }
 
+export const LoadIntegrationTool: ToolCatalogEntry = {
+  id: 'load_integration_tool',
+  name: 'load_integration_tool',
+  route: 'sim',
+  mode: 'async',
+  parameters: {
+    properties: {
+      tool_ids: {
+        description:
+          'Exact integration tool ids to load before calling them, e.g. ["gmail_send_v2"]. Copy the "id" field verbatim from components/integrations/{service}/{operation}.json (including any version suffix).',
+        items: { type: 'string' },
+        type: 'array',
+      },
+    },
+    required: ['tool_ids'],
+    type: 'object',
+  },
+}
+
 export const ManageCredential: ToolCatalogEntry = {
   id: 'manage_credential',
   name: 'manage_credential',
@@ -3029,31 +3048,6 @@ export const Table: ToolCatalogEntry = {
   internal: true,
 }
 
-export const ToolSearchToolRegex: ToolCatalogEntry = {
-  id: 'tool_search_tool_regex',
-  name: 'tool_search_tool_regex',
-  route: 'sim',
-  mode: 'async',
-  parameters: {
-    properties: {
-      case_insensitive: {
-        description: 'Whether the regex should be case-insensitive (default true).',
-        type: 'boolean',
-      },
-      max_results: {
-        description: 'Maximum number of tools to return (optional).',
-        type: 'integer',
-      },
-      pattern: {
-        description: 'Regular expression to match tool names or descriptions.',
-        type: 'string',
-      },
-    },
-    required: ['pattern'],
-    type: 'object',
-  },
-}
-
 export const TouchPlan: ToolCatalogEntry = {
   id: 'touch_plan',
   name: 'touch_plan',
@@ -3896,6 +3890,7 @@ export const TOOL_CATALOG: Record<string, ToolCatalogEntry> = {
   [ListFolders.id]: ListFolders,
   [ListUserWorkspaces.id]: ListUserWorkspaces,
   [ListWorkspaceMcpServers.id]: ListWorkspaceMcpServers,
+  [LoadIntegrationTool.id]: LoadIntegrationTool,
   [ManageCredential.id]: ManageCredential,
   [ManageCustomTool.id]: ManageCustomTool,
   [ManageJob.id]: ManageJob,
@@ -3933,7 +3928,6 @@ export const TOOL_CATALOG: Record<string, ToolCatalogEntry> = {
   [SetGlobalWorkflowVariables.id]: SetGlobalWorkflowVariables,
   [Superagent.id]: Superagent,
   [Table.id]: Table,
-  [ToolSearchToolRegex.id]: ToolSearchToolRegex,
   [TouchPlan.id]: TouchPlan,
   [UpdateJobHistory.id]: UpdateJobHistory,
   [UpdateWorkspaceMcpServer.id]: UpdateWorkspaceMcpServer,
diff --git a/apps/sim/lib/copilot/generated/tool-schemas-v1.ts b/apps/sim/lib/copilot/generated/tool-schemas-v1.ts
@@ -1733,6 +1733,23 @@ export const TOOL_RUNTIME_SCHEMAS: Record<string, ToolRuntimeSchemaEntry> = {
     },
     resultSchema: undefined,
   },
+  ['load_integration_tool']: {
+    parameters: {
+      properties: {
+        tool_ids: {
+          description:
+            'Exact integration tool ids to load before calling them, e.g. ["gmail_send_v2"]. Copy the "id" field verbatim from components/integrations/{service}/{operation}.json (including any version suffix).',
+          items: {
+            type: 'string',
+          },
+          type: 'array',
+        },
+      },
+      required: ['tool_ids'],
+      type: 'object',
+    },
+    resultSchema: undefined,
+  },
   ['manage_credential']: {
     parameters: {
       type: 'object',
@@ -2786,27 +2803,6 @@ export const TOOL_RUNTIME_SCHEMAS: Record<string, ToolRuntimeSchemaEntry> = {
     },
     resultSchema: undefined,
   },
-  ['tool_search_tool_regex']: {
-    parameters: {
-      properties: {
-        case_insensitive: {
-          description: 'Whether the regex should be case-insensitive (default true).',
-          type: 'boolean',
-        },
-        max_results: {
-          description: 'Maximum number of tools to return (optional).',
-          type: 'integer',
-        },
-        pattern: {
-          description: 'Regular expression to match tool names or descriptions.',
-          type: 'string',
-        },
-      },
-      required: ['pattern'],
-      type: 'object',
-    },
-    resultSchema: undefined,
-  },
   ['touch_plan']: {
     parameters: {
       type: 'object',
diff --git a/apps/sim/lib/copilot/integration-tools.ts b/apps/sim/lib/copilot/integration-tools.ts
diff --git a/apps/sim/lib/copilot/tools/client/hidden-tools.ts b/apps/sim/lib/copilot/tools/client/hidden-tools.ts
diff --git a/apps/sim/lib/copilot/vfs/serializers.ts b/apps/sim/lib/copilot/vfs/serializers.ts
diff --git a/apps/sim/lib/copilot/vfs/workspace-vfs.ts b/apps/sim/lib/copilot/vfs/workspace-vfs.ts
