fix(mothership): scope tool side-effect resources inside handleResourceSideEffects

Author: waleedlatif1

apps/sim/lib/mothership/request/tools/executor.ts

@@ -1040,9 +1040,10 @@ async function executeToolAndReportInner(
           execContext.chatId,
           options?.onEvent,
           () => abortRequested(context, execContext, options),
-          execContext.organizationId
-            ? (toolCall.targetWorkspaceId ?? execContext.workspaceId)
-            : undefined,
+          {
+            organizationId: execContext.organizationId,
+            workspaceId: toolCall.targetWorkspaceId ?? execContext.workspaceId,
+          },
           execContext.userId
         )
       }

apps/sim/lib/mothership/request/tools/resources.test.ts

@@ -97,31 +97,35 @@ describe('handleResourceSideEffects', () => {
       })
     }
   )
-  it.each(['workspace-a'])('addresses extracted exports to admitted %s', async (workspaceId) => {
-    const resource = { type: 'file' as const, id: 'export', title: 'decisions.csv' }
-    mocks.extractResourcesFromToolResult.mockReturnValue([resource])
-    const onEvent = vi.fn()
-    await handleResourceSideEffects(
-      'run_function',
-      undefined,
-      { success: true, output: {} },
-      { success: true, output: {} },
-      'org-chat',
-      onEvent,
-      () => false,
-      workspaceId
-    )
-    expect(mocks.persistChatResources).toHaveBeenCalledWith('org-chat', [
-      { ...resource, workspaceId },
-    ])
-    expect(onEvent).toHaveBeenCalledWith({
-      type: 'resource',
-      payload: {
-        op: 'upsert',
-        resource: { ...resource, workspaceId },
-      },
-    })
-  })
+  it.each([
+    { chat: 'organization', organizationId: 'org', expected: { workspaceId: 'workspace-a' } },
+    { chat: 'workspace', organizationId: undefined, expected: {} },
+  ])(
+    'addresses extracted exports in a $chat chat like its open tabs',
+    async ({ organizationId, expected }) => {
+      const resource = { type: 'file' as const, id: 'export', title: 'decisions.csv' }
+      mocks.extractResourcesFromToolResult.mockReturnValue([resource])
+      mocks.persistChatResources.mockClear()
+      const onEvent = vi.fn()
+      await handleResourceSideEffects(
+        'run_function',
+        undefined,
+        { success: true, output: {} },
+        { success: true, output: {} },
+        'chat',
+        onEvent,
+        () => false,
+        { organizationId, workspaceId: 'workspace-a' }
+      )
+      expect(mocks.persistChatResources).toHaveBeenCalledWith('chat', [
+        { ...resource, ...expected },
+      ])
+      expect(onEvent).toHaveBeenCalledWith({
+        type: 'resource',
+        payload: { op: 'upsert', resource: { ...resource, ...expected } },
+      })
+    }
+  )
 })
 
 it('emits authorized Search results beside the persisted address, never inside it', async () => {

apps/sim/lib/mothership/request/tools/resources.ts

@@ -36,9 +36,11 @@ export async function handleResourceSideEffects(
   chatId: string,
   onEvent: ((event: StreamEvent) => void | Promise<void>) | undefined,
   isAborted: () => boolean,
-  workspaceId?: string,
+  owner?: { organizationId?: string; workspaceId?: string },
   actorUserId?: string
 ): Promise<void> {
+  // Only organization chats address a workspace; a workspace chat's resources leave it implicit.
+  const workspaceId = owner?.organizationId ? owner.workspaceId : undefined
   // Cheap early exit so we don't emit a span for tools that can never
   // produce resources (most of them). The span only shows up for tools
   // that might actually do resource work.