fix(mothership): keep reads out of resource panels

Author: Sg312

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation.test.ts

@@ -52,6 +52,22 @@ describe('resource cache reconciliation', () => {
     expect(client.getQueryState(file)?.isInvalidated).toBe(true)
   })
 
+  it.each(['file', undefined])(
+    'refreshes addressed file metadata and versioned content after an edit (id: %s)',
+    (id) => {
+      const client = new QueryClient()
+      const affected = [
+        workspaceFilesKeys.record('w', 'file'),
+        workspaceFilesKeys.content('w', 'file', 'text', 'old-storage-key'),
+      ]
+      const other = workspaceFilesKeys.record('other-workspace', 'file')
+      for (const key of [...affected, other]) client.setQueryData(key, {})
+      invalidateResourceQueries(client, 'w', 'file', id)
+      for (const key of affected) expect(client.getQueryState(key)?.isInvalidated).toBe(true)
+      expect(client.getQueryState(other)?.isInvalidated).toBe(id === undefined)
+    }
+  )
+
   it('updates workflow publication metadata shown beside the draft', () => {
     const client = new QueryClient()
     const affected = [

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation.ts

@@ -28,6 +28,7 @@ const RESOURCE_INVALIDATORS: Record<
   },
   file: (qc, wId, id) => {
     invalidate(qc, workspaceFilesKeys.lists())
+    invalidate(qc, id ? workspaceFilesKeys.record(wId, id) : workspaceFilesKeys.records())
     invalidate(qc, id ? workspaceFilesKeys.contentFile(wId, id) : workspaceFilesKeys.contents())
     invalidate(qc, workspaceFilesKeys.storageInfo())
   },

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts

@@ -110,7 +110,7 @@ describe('handleResourceEvent removal', () => {
   })
 
   it.each(['workflow', 'table', 'file', 'knowledgebase', 'log'] as const)(
-    'opens an authorized %s read without invalidating or reconciling editable content',
+    'ignores an authorized %s read without opening, saving or changing focus',
     (type) => {
       const onResourceEvent = vi.fn()
       const deps = makeStreamLoopDeps({ onResourceEventRef: { current: onResourceEvent } })
@@ -124,12 +124,13 @@ describe('handleResourceEvent removal', () => {
           resource: { type, id: 'addressed', title: 'Addressed resource' },
         },
       })
-      expect(onResourceEvent).toHaveBeenCalledWith('addressed')
-      expect(deps.setResources).toHaveBeenCalled()
+      expect(onResourceEvent).not.toHaveBeenCalled()
+      expect(deps.setResources).not.toHaveBeenCalled()
       expect(deps.addResource).not.toHaveBeenCalled()
       expect(mocks.invalidateResourceQueries).not.toHaveBeenCalled()
       expect(mocks.notifyWorkflowExternalUpdate).not.toHaveBeenCalled()
       expect(deps.ensureWorkflowInRegistry).not.toHaveBeenCalled()
+      expect(deps.queryClient.invalidateQueries).not.toHaveBeenCalled()
     }
   )
 
@@ -152,13 +153,12 @@ describe('handleResourceEvent removal', () => {
     expect(deps.setResources).not.toHaveBeenCalled()
     expect(mocks.invalidateResourceQueries).not.toHaveBeenCalled()
     expect(mocks.notifyWorkflowExternalUpdate).not.toHaveBeenCalled()
-    expect(deps.queryClient.invalidateQueries).toHaveBeenCalledWith({
-      queryKey: ['mothership-chats', 'detail', 'chat'],
-    })
+    expect(deps.queryClient.invalidateQueries).not.toHaveBeenCalled()
   })
 
-  it('still reconciles a committed workflow edit after opening it for a read', () => {
-    const deps = makeStreamLoopDeps()
+  it('still opens and reconciles a committed workflow edit after a read', () => {
+    const onResourceEvent = vi.fn()
+    const deps = makeStreamLoopDeps({ onResourceEventRef: { current: onResourceEvent } })
     const event = removeEvent('workflow', 'wf')
     handleResourceEvent(
       { deps } as StreamLoopContext,
@@ -173,6 +173,8 @@ describe('handleResourceEvent removal', () => {
     )
     expect(mocks.invalidateResourceQueries).toHaveBeenCalledTimes(1)
     expect(mocks.notifyWorkflowExternalUpdate).toHaveBeenCalledExactlyOnceWith('wf')
+    expect(deps.addResource).toHaveBeenCalledTimes(1)
+    expect(onResourceEvent).toHaveBeenCalledExactlyOnceWith('wf')
   })
 
   it.each([

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts

@@ -57,6 +57,7 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
   } = ctx.deps
   const onResourceEvent = onResourceEventRef.current
   const payload = parsed.payload
+  if (payload.op === 'upsert' && payload.readOnly) return
   if (payload.resource.type === 'settings') {
     const settings = payload.resource
     if (
@@ -142,10 +143,8 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
   // lists, never from the stream; older servers announced them as resources.
   if (payload.resource.type === 'browser' || payload.resource.type === 'terminal') return
   const resourceType = payload.resource.type
-  const readOnly = payload.op === 'upsert' && payload.readOnly === true
-  if (!readOnly)
-    invalidateResourceQueries(queryClient, workspaceId, resourceType, payload.resource.id)
-  if (!readOnly && resourceType === 'workflow' && payload.op !== 'remove' && payload.resource.id) {
+  invalidateResourceQueries(queryClient, workspaceId, resourceType, payload.resource.id)
+  if (resourceType === 'workflow' && payload.op !== 'remove' && payload.resource.id) {
     notifyWorkflowExternalUpdate(payload.resource.id)
   }
   if (payload.op === 'refresh') return
@@ -303,7 +302,7 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
     } else onResourceEvent?.(getChatResourceSelectionId(resource))
   }
 
-  if (resource.type === 'workflow' && !readOnly) {
+  if (resource.type === 'workflow') {
     ensureWorkflowInRegistry(resource.id, resource.title, workspaceId)
   }
 }

apps/sim/hooks/queries/workspace-files.ts

@@ -44,8 +44,9 @@ export const workspaceFilesKeys = {
   workspaceLists: (workspaceId: string) => [...workspaceFilesKeys.lists(), workspaceId] as const,
   list: (workspaceId: string, scope: WorkspaceFileQueryScope = 'active') =>
     [...workspaceFilesKeys.workspaceLists(workspaceId), scope] as const,
+  records: () => [...workspaceFilesKeys.all, 'record'] as const,
   record: (workspaceId: string, fileId: string) =>
-    [...workspaceFilesKeys.all, 'record', workspaceId, fileId] as const,
+    [...workspaceFilesKeys.records(), workspaceId, fileId] as const,
   contents: () => [...workspaceFilesKeys.all, 'content'] as const,
   contentFile: (workspaceId: string, fileId: string) =>
     [...workspaceFilesKeys.contents(), workspaceId, fileId] as const,

apps/sim/lib/mothership/request/go/stream.test.ts

@@ -379,7 +379,7 @@ describe('copilot go stream helpers', () => {
     { fail: false, readOnly: true },
     { fail: true, readOnly: true },
   ])(
-    'commits worker resource effects before forwarding (failure: $fail, read only: $readOnly)',
+    'persists mutations but never read-only panels (failure: $fail, read only: $readOnly)',
     async ({ fail, readOnly }) => {
       const resource = { type: 'workflow', id: 'wf', title: 'A workflow' }
       const order: string[] = []
@@ -428,8 +428,13 @@ describe('copilot go stream helpers', () => {
           },
         }
       )
-      if (fail) await expect(promise).rejects.toThrow('Resource storage unavailable')
+      if (fail && !readOnly) await expect(promise).rejects.toThrow('Resource storage unavailable')
       else await promise
+      if (readOnly) {
+        expect(order).toEqual(['publish'])
+        expect(changeStoredChatResourcesMock).not.toHaveBeenCalled()
+        return
+      }
       expect(order).toEqual(fail ? ['persist'] : ['persist', 'publish'])
       expect(changeStoredChatResourcesMock).toHaveBeenCalledWith(
         'chat',

apps/sim/lib/mothership/resources/extraction.test.ts

@@ -5,31 +5,34 @@ import { describe, expect, it } from 'vitest'
 import { extractDeletedResourcesFromToolResult, extractResourcesFromToolResult } from './extraction'
 
 describe('extractResourcesFromToolResult', () => {
-  it('extracts file resources from create_empty_file results', () => {
-    const resources = extractResourcesFromToolResult(
-      'create_empty_file',
-      {
-        fileName: 'notes.md',
-      },
-      {
-        success: true,
-        message: 'File "notes.md" created successfully',
-        data: {
-          id: 'file_123',
-          name: 'notes.md',
-          contentType: 'text/markdown',
+  it.each(['create_empty_file', 'prepare_file_edit', 'apply_file_edit'])(
+    'extracts committed file identity from %s results',
+    (toolName) => {
+      const resources = extractResourcesFromToolResult(
+        toolName,
+        {
+          fileName: 'notes.md',
         },
-      }
-    )
+        {
+          success: true,
+          message: 'File "notes.md" created successfully',
+          data: {
+            id: 'file_123',
+            name: 'notes.md',
+            contentType: 'text/markdown',
+          },
+        }
+      )
 
-    expect(resources).toEqual([
-      {
-        type: 'file',
-        id: 'file_123',
-        title: 'notes.md',
-      },
-    ])
-  })
+      expect(resources).toEqual([
+        {
+          type: 'file',
+          id: 'file_123',
+          title: 'notes.md',
+        },
+      ])
+    }
+  )
 
   it('uses the knowledge base id for manage_knowledge_base tag mutations', () => {
     const resources = extractResourcesFromToolResult(

apps/sim/lib/mothership/resources/extraction.ts

@@ -1,5 +1,6 @@
 import { toRecord } from '@sim/utils/object'
 import {
+  ApplyFileEdit,
   CreateEmptyFile,
   CreateWorkflow,
   DownloadFile,
@@ -26,6 +27,7 @@ const RESOURCE_TOOL_NAMES: Set<string> = new Set([
   TableViews.id,
   CreateEmptyFile.id,
   PrepareFileEdit.id,
+  ApplyFileEdit.id,
   DownloadFile.id,
   CreateWorkflow.id,
   EditWorkflow.id,
@@ -111,6 +113,7 @@ export function extractResourcesFromToolResult(
     }
 
     case CreateEmptyFile.id:
+    case ApplyFileEdit.id:
     case PrepareFileEdit.id: {
       const file = toRecord(data.file)
       if (file.id) {

apps/sim/lib/mothership/resources/persist-effect.ts

@@ -7,7 +7,12 @@ export async function persistResourceEffect(
   chatId: string,
   payload: ResourcePayload
 ): Promise<void> {
-  if (!payload.effectId || payload.op === 'refresh') return
+  if (
+    !payload.effectId ||
+    payload.op === 'refresh' ||
+    (payload.op === 'upsert' && payload.readOnly)
+  )
+    return
   if (payload.op === 'clear_view') {
     await changeStoredChatResources(
       chatId,

apps/sim/lib/mothership/tools/server/files/file-edit-roundtrip.test.ts

@@ -51,6 +51,7 @@ vi.mock('@/lib/workspace-files/application/update-workspace-file-content', () =>
   updateWorkspaceFileContent: { execute: vi.fn() },
 }))
 
+import { extractResourcesFromToolResult } from '@/lib/mothership/resources/extraction'
 import { editContentServerTool } from '@/lib/mothership/tools/server/files/edit-content'
 import { consumeLatestFileIntent } from '@/lib/mothership/tools/server/files/file-intent-store'
 import { workspaceFileServerTool } from '@/lib/mothership/tools/server/files/workspace-file'
@@ -102,6 +103,9 @@ describe('prepared file write across tool invocations', () => {
     const applyContext = { ...prepareContext, toolCallId: 'apply' }
     const applied = await editContentServerTool.execute({ content }, applyContext)
     expect(applied.success, applied.message).toBe(true)
+    expect(extractResourcesFromToolResult('apply_file_edit', { content }, applied)).toEqual([
+      { type: 'file', id: created.id, title: created.name },
+    ])
     expect(executeFileUseCase).toHaveBeenNthCalledWith(
       1,
       prepareContext,