waleedlatif1 · Oct 1, 2026 · Oct 1, 2026 · Oct 1, 2026 · Oct 1, 2026
diff --git a/apps/sim/lib/api/contracts/mothership-resource-tools.ts b/apps/sim/lib/api/contracts/mothership-resource-tools.ts
@@ -29,7 +29,6 @@ export const openResourceOutputSchema = z.object({
       type: z.enum(['workflow', 'table', 'knowledgebase', 'file', 'dashboard', 'log']),
       id: z.string(),
       title: z.string(),
-      workspaceId: z.string(),
       viewId: z.string().optional(),
       executionId: z.string().optional(),
     })

diff --git a/apps/sim/lib/mothership/agent-cli/index.ts b/apps/sim/lib/mothership/agent-cli/index.ts
@@ -177,7 +177,8 @@ async function executeBoundAgentCliRequest(
   } else throw new Error('Service invocation must use the service bridge')
   if (resources.length)
     result = { ...result, resources: [...resources, ...(result.resources ?? [])] }
-  if (result.resources?.length)
+  // Only organization chats address a workspace; a workspace chat's resources leave it implicit.
+  if (context.chatOrganizationId && result.resources?.length)
     result = {
       ...result,
       resources: result.resources.map((effect) => {

diff --git a/apps/sim/lib/mothership/agent-cli/resource-owner.test.ts b/apps/sim/lib/mothership/agent-cli/resource-owner.test.ts
@@ -85,7 +85,7 @@ beforeEach(() => {
 })
 
 describe('scoped CLI resource ownership', () => {
-  it('gives a workspace upload completion and explicit open the same resource identity', async () => {
+  it('gives a workspace upload completion, explicit open, and an open tab one identity', async () => {
     const upload = await executeAgentCliRequest(
       { invocation: { kind: 'cli', argv: ['files', 'upload', '@/tmp/upload-acceptance.txt'] } },
       context
@@ -102,9 +102,10 @@ describe('scoped CLI resource ownership', () => {
       id: fileId,
       title: file.name,
       path: 'files/upload-acceptance.txt',
-      workspaceId: first,
     })
-    expect(getChatResourceKey(resource)).toBe(getChatResourceKey(opened.resources[0]))
+    const openTab = getChatResourceKey({ type: 'file', id: fileId })
+    expect(getChatResourceKey(resource)).toBe(openTab)
+    expect(getChatResourceKey(opened.resources[0])).toBe(openTab)
     expect(mocks.transport).toHaveBeenCalledTimes(1)
   })
 

diff --git a/apps/sim/lib/mothership/request/tools/executor.ts b/apps/sim/lib/mothership/request/tools/executor.ts
@@ -1040,7 +1040,9 @@ async function executeToolAndReportInner(
           execContext.chatId,
           options?.onEvent,
           () => abortRequested(context, execContext, options),
-          toolCall.targetWorkspaceId ?? execContext.workspaceId,
+          execContext.organizationId
+            ? (toolCall.targetWorkspaceId ?? execContext.workspaceId)
+            : undefined,
           execContext.userId
         )
       }

diff --git a/apps/sim/lib/mothership/tools/registry/server-tool-adapter.test.ts b/apps/sim/lib/mothership/tools/registry/server-tool-adapter.test.ts
@@ -120,9 +120,7 @@ describe('server tool adapter authority boundary', () => {
 })
 
 it('forwards canonical open-resource effects without replacing target assertions or injecting a workflow', async () => {
-  const resources = [
-    { type: 'workflow', id: 'flow', title: 'Canonical', workspaceId: 'workspace-1' },
-  ]
+  const resources = [{ type: 'workflow', id: 'flow', title: 'Canonical' }]
   mocks.routeExecution.mockResolvedValue({ resources })
   const params = {
     workspaceId: 'asserted-workspace',

diff --git a/apps/sim/lib/mothership/tools/server/open-resource.test.ts b/apps/sim/lib/mothership/tools/server/open-resource.test.ts
@@ -87,7 +87,6 @@ describe('resource opening authorization boundary', () => {
       'Canonical knowledge',
       'Workflow run',
     ])
-    expect(result.resources.every((resource) => resource.workspaceId === 'ws-a')).toBe(true)
     for (const read of Object.values(mocks))
       expect(read).toHaveBeenCalledWith(
         expect.objectContaining({

diff --git a/apps/sim/lib/mothership/tools/server/open-resource.ts b/apps/sim/lib/mothership/tools/server/open-resource.ts
@@ -56,7 +56,7 @@ export const openResourceServerTool: BaseServerTool<OpenResourceInput, OpenResou
       assertServerToolNotAborted(context)
       if (resource.viewId && resource.type !== 'table')
         throw new OrchestrationError('validation', 'Saved views apply only to tables')
-      const base = { type: resource.type, id: resource.id, workspaceId }
+      const base = { type: resource.type, id: resource.id }
       switch (resource.type) {
         case 'workflow': {
           const { workflow } = await executeCopilotWorkflowUseCase(context, readWorkflowMetadata, {