fix(mothership): strip activity from desktop-authorized tool args

Author: waleedlatif1

apps/sim/app/api/desktop/tool/authorize/route.test.ts

@@ -87,6 +87,25 @@ describe('desktop tool authorization', () => {
     expect(claimPendingAsyncToolCall).toHaveBeenCalledWith('browser-tool', 'desktop-browser')
   })
 
+  it('never returns presentation activity as an executable browser argument', async () => {
+    const fields = [{ elementId: 1, kind: 'text', text: 'a' }]
+    getAsyncToolCall.mockResolvedValueOnce({
+      toolCallId: 'form-tool',
+      runId: 'run-1',
+      status: 'pending',
+      toolName: 'browser_fill_form',
+      args: { activity: { description: 'Filling the form' }, fields },
+    })
+
+    const response = await POST(request('form-tool'))
+    expect(response.status).toBe(200)
+    expect(await response.json()).toEqual({
+      chatId: 'chat-1',
+      toolName: 'browser_fill_form',
+      args: { fields },
+    })
+  })
+
   it('rejects retired browser tools retained only for history', async () => {
     getAsyncToolCall.mockResolvedValueOnce({
       toolCallId: 'retired-browser-tool',

apps/sim/app/api/desktop/tool/authorize/route.ts

@@ -1,6 +1,6 @@
 import { isCurrentBrowserToolName } from '@sim/browser-protocol'
 import { isTerminalToolName } from '@sim/terminal-protocol'
-import { isRecordLike } from '@sim/utils/object'
+import { isRecordLike, omit } from '@sim/utils/object'
 import { type NextRequest, NextResponse } from 'next/server'
 import { authorizeDesktopToolContract } from '@/lib/api/contracts/desktop-tool-authorization'
 import { parseRequest } from '@/lib/api/server'
@@ -24,7 +24,8 @@ import { isUserLocalVfsToolCall } from '@/lib/mothership/tools/local-filesystem'
  * Electron calls this endpoint from the main process before every privileged
  * native model action. It returns only server-persisted canonical tool args;
  * Electron validates local-file requests against them and uses them directly
- * for browser and terminal tools.
+ * for browser and terminal tools. The presentation-only `activity` field is
+ * dropped: desktop actions reject arguments they do not declare.
  */
 export const POST = withRouteHandler(async (request: NextRequest) => {
   const { userId, isAuthenticated } = await authenticateCopilotRequestSessionOnly()
@@ -117,7 +118,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
 
   return NextResponse.json({
     toolName: toolCall.toolName,
-    args,
+    args: omit(args, ['activity']),
     chatId: run.chatId,
   })
 })

apps/sim/lib/mothership/tools/client/browser-tool-execution.test.ts

@@ -110,27 +110,6 @@ describe('executeBrowserToolOnClient', () => {
     expect(mockExecuteBrowserTool).toHaveBeenCalledTimes(1)
   })
 
-  it('never forwards presentation activity to the desktop driver', async () => {
-    mockExecuteBrowserTool.mockResolvedValue({ completed: true, results: [] })
-    const toolCallId = nextToolCallId()
-    const fields = [{ elementId: 1, kind: 'text', text: 'a' }]
-    executeBrowserToolOnClient(
-      toolCallId,
-      'browser_fill_form',
-      { activity: { description: 'Filling the form' }, fields },
-      CHAT_SCOPE
-    )
-    await flush()
-    expect(mockExecuteBrowserTool).toHaveBeenCalledWith(
-      toolCallId,
-      'browser_fill_form',
-      { fields },
-      expect.anything(),
-      CHAT_SCOPE,
-      expect.any(Function)
-    )
-  })
-
   it('reports a batch as failed only when one of its actions failed', async () => {
     const actions = [
       { tool: 'browser_click', args: { elementId: 1 } },

apps/sim/lib/mothership/tools/client/browser-tool-execution.ts

@@ -898,16 +898,14 @@ async function doExecuteBrowserTool(
 
     logger.info('Executing browser tool via the desktop agent browser', { toolCallId, toolName })
 
-    /** `activity` is presentation metadata for the chat row; desktop actions reject unknown keys. */
-    const { activity: _activity, ...actionParams } = params
     let result: unknown
     try {
       nativeDispatchStarted = true
       result = await executeBrowserTool(
         toolCallId,
         toolName,
-        actionParams,
-        timeoutForTool(toolName, actionParams),
+        params,
+        timeoutForTool(toolName, params),
         scopeId,
         () => {
           cancelled = true