fix(mothership): keep display activity out of integration and mcp tool arguments

Author: waleedlatif1

apps/sim/lib/mothership/tool-executor/executor.test.ts

@@ -306,6 +306,20 @@ describe('copilot tool executor fallback', () => {
     )
   })
 
+  it('keeps display activity out of integration and MCP execution parameters', async () => {
+    isKnownTool.mockReturnValue(false)
+    isClientExecuted.mockReturnValue(false)
+    executeAppTool.mockResolvedValue({ success: true })
+    await executeTool(
+      'mcp-server-get_overview',
+      { activity: { id: 'gauge-read' }, category_id: null },
+      { userId: 'person', workspaceId: 'workspace', requestMode: 'agent' }
+    )
+    const [, appParams] = executeAppTool.mock.calls[0]
+    expect(appParams).not.toHaveProperty('activity')
+    expect(appParams).toMatchObject({ category_id: null })
+  })
+
   it('projects resolved secrets before logging registered handler failures', async () => {
     const secret = 'mounted-secret-value'
     const registry = new ResolvedSecretTraceRegistry([

apps/sim/lib/mothership/tool-executor/executor.ts

@@ -42,9 +42,11 @@ export function clearHandlers(): void {
 
 export async function executeTool(
   toolId: string,
-  params: Record<string, unknown>,
+  args: Record<string, unknown>,
   context: ToolExecutionContext
 ): Promise<ToolExecutionResult> {
+  /** `activity` is the chat's display label for the call; no tool takes it as an argument. */
+  const { activity: _activity, ...params } = args
   if (
     context.benchmark &&
     !(context.benchmark === 'distill'
@@ -293,8 +295,7 @@ async function executeGatedTool(
     }
 
     try {
-      const { activity: _activity, ...executionParams } = params
-      return await handler(executionParams, context)
+      return await handler(params, context)
     } catch (error) {
       const message = toError(error).message
       logger.error('Tool execution failed', {