fix(mothership): preserve resource effects and execution recovery

Author: Sg312

apps/sim/app/api/copilot/chat/stop/route.test.ts

@@ -54,7 +54,7 @@ describe('copilot chat stop route', () => {
     authMockFns.mockGetSession.mockResolvedValue({ user: { id: 'user-1' } })
   })
 
-  it('preserves task, plan and subagent identity through the partial-response contract', async () => {
+  it('preserves task and subagent identity through the partial-response contract', async () => {
     mockReads({
       chat: { workspaceId: 'ws-1', conversationId: 'stream-1', model: null },
       last: { messageId: 'stream-1', role: 'user' },
@@ -70,7 +70,6 @@ describe('copilot chat stop route', () => {
           note: 'Watch invoice run',
         },
       },
-      { type: 'plan', planItems: [{ step: 'Check the result', status: 'active' }] },
       {
         type: 'span',
         kind: 'subagent',

apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.test.ts

@@ -122,7 +122,7 @@ describe('execution stream reconnect route', () => {
     expect(mockReadExecutionEventsState).toHaveBeenNthCalledWith(2, 'exec-1', 3)
   })
 
-  it('fails closed when terminal metadata has no terminal event to replay', async () => {
+  it('leaves a missing terminal event as a transport error rather than a workflow failure', async () => {
     mockReadExecutionMetaState
       .mockResolvedValueOnce({
         status: 'found',
@@ -147,11 +147,9 @@ describe('execution stream reconnect route', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = await response.text()
-
-    expect(body).toContain('"type":"execution:error"')
-    expect(body).toContain('its final event could not be recovered')
-    expect(body).toContain('data: [DONE]')
+    await expect(response.text()).rejects.toThrow(
+      'Execution terminal event is no longer available in the replay buffer'
+    )
   })
 
   it('allows replay event id gaps from reserved but unused writer ids', async () => {

apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts

@@ -230,21 +230,9 @@ export const GET = withRouteHandler(
 
           const closeAfterTerminalEvent = (events: ExecutionEventEntry[]) => {
             if (!enqueueEvents(events)) {
-              logger.warn('Execution reached terminal metadata without a terminal event', {
-                executionId,
-              })
-              enqueue(
-                formatSSEEvent({
-                  type: 'execution:error',
-                  timestamp: new Date().toISOString(),
-                  executionId,
-                  workflowId,
-                  data: {
-                    error:
-                      'Execution reached a terminal state, but its final event could not be recovered',
-                    duration: 0,
-                  },
-                })
+              /** The reconnect client resolves missing delivery from the durable status resource. */
+              throw new Error(
+                'Execution terminal event is no longer available in the replay buffer'
               )
             }
             closeWithDone()

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/plan-checklist/index.ts

@@ -12,7 +12,7 @@ import {
 } from 'react'
 import { cn } from '@sim/emcn'
 import { PrepareFileEdit, Read as ReadTool } from '@/lib/mothership/generated/tool-catalog-v1'
-import type { AgentPlanItem, TaskBlockInfo } from '@/lib/mothership/request/types'
+import type { TaskBlockInfo } from '@/lib/mothership/request/types'
 import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools'
 import { resolveToolDisplay } from '@/lib/mothership/tools/client/store-utils'
 import { ClientToolCallState } from '@/lib/mothership/tools/client/tool-call-state'
@@ -22,7 +22,6 @@ import {
   humanizeToolName,
 } from '@/lib/mothership/tools/tool-display'
 import { useChatSurface } from '@/app/workspace/[workspaceId]/home/components/chat-surface-context'
-import { PlanChecklist } from '@/app/workspace/[workspaceId]/home/components/message-content/components/plan-checklist'
 import type { CredentialSubmissionPayload } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
 import { TaskPill } from '@/app/workspace/[workspaceId]/home/components/message-content/components/task-pill'
 import { useCustomBlockOverlayVersion } from '@/blocks/custom/client-overlay'
@@ -78,11 +77,6 @@ interface StoppedSegment {
   type: 'stopped'
 }
 
-interface PlanSegment {
-  type: 'plan'
-  items: AgentPlanItem[]
-}
-
 interface TaskSegment {
   type: 'task'
   task: TaskBlockInfo
@@ -93,7 +87,6 @@ type MessageSegment =
   | AgentGroupSegment
   | OptionsSegment
   | StoppedSegment
-  | PlanSegment
   | TaskSegment
 
 function getAgentGroupActivityKey(items: AgentGroupItem[]): string {
@@ -135,9 +128,6 @@ function getVisibleStreamActivityKey(segments: MessageSegment[]): string {
         return `options:${segment.items.map((item) => `${item.id}:${item.label.length}`).join(',')}`
       }
       if (segment.type === 'stopped') return 'stopped'
-      if (segment.type === 'plan') {
-        return `plan:${segment.items.map((item) => `${item.status}:${item.step.length}`).join(',')}`
-      }
       if (segment.type === 'task') {
         return `task:${segment.task.taskId}:${segment.task.status ?? 'pending'}`
       }
@@ -489,12 +479,6 @@ function parseBlocksWithSpanTree(blocks: ContentBlock[]): MessageSegment[] {
       continue
     }
 
-    if (block.type === 'plan') {
-      if (!block.planItems?.length) continue
-      segments.push({ type: 'plan', items: block.planItems })
-      continue
-    }
-
     if (block.type === 'task') {
       if (!block.task) continue
       segments.push({ type: 'task', task: block.task })
@@ -759,13 +743,6 @@ function parseBlocksLegacy(blocks: ContentBlock[]): MessageSegment[] {
       continue
     }
 
-    if (block.type === 'plan') {
-      if (!block.planItems?.length) continue
-      flushLanes()
-      segments.push({ type: 'plan', items: block.planItems })
-      continue
-    }
-
     if (block.type === 'task') {
       if (!block.task) continue
       flushLanes()
@@ -1107,8 +1084,6 @@ function MessageContentInner({
                   <Options items={segment.items} onSelect={onOptionSelect} />
                 </div>
               )
-            case 'plan':
-              return <PlanChecklist key={`plan-${i}`} items={segment.items} />
             case 'task':
               return <TaskPill key={`task-${segment.task.taskId}`} task={segment.task} />
             // The stopped row renders in the tail region below, in the

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/plan-checklist/plan-checklist.tsx

@@ -1,8 +1,8 @@
+export { invalidateResourceQueries } from './resource-invalidation'
 export type { ResourceTypeConfig } from './resource-registry'
 export {
   byResourceMenuOrder,
   getResourceConfig,
-  invalidateResourceQueries,
   MENTION_PREVIEW_DEFAULT_LIMIT,
   RESOURCE_MENU_ORDER,
   RESOURCE_REGISTRY,

apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx

@@ -0,0 +1,106 @@
+/** @vitest-environment node */
+import { QueryClient } from '@tanstack/react-query'
+import { describe, expect, it } from 'vitest'
+import { invalidateResourceQueries } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation'
+import { deploymentKeys } from '@/hooks/queries/deployments'
+import { connectorDocumentKeys, connectorKeys } from '@/hooks/queries/kb/connectors'
+import { logKeys } from '@/hooks/queries/logs'
+import { mothershipChatKeys } from '@/hooks/queries/mothership-chats'
+import { folderKeys } from '@/hooks/queries/utils/folder-keys'
+import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
+import { tableKeys } from '@/hooks/queries/utils/table-keys'
+import { workflowKeys } from '@/hooks/queries/utils/workflow-keys'
+import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
+
+describe('resource cache reconciliation', () => {
+  it('refreshes table rows, schema and saved views without expiring another table', () => {
+    const client = new QueryClient()
+    const affected = [
+      tableKeys.detail('t'),
+      tableKeys.views('t'),
+      tableKeys.infiniteRows('t', 'filter'),
+    ]
+    for (const key of [...affected, tableKeys.views('other')]) client.setQueryData(key, {})
+    invalidateResourceQueries(client, 'w', 'table', 't')
+    for (const key of affected) expect(client.getQueryState(key)?.isInvalidated).toBe(true)
+    expect(client.getQueryState(tableKeys.views('other'))?.isInvalidated).toBe(false)
+  })
+
+  it('covers knowledge documents, chunks, tags and connectors through the parent key', () => {
+    const client = new QueryClient()
+    const affected = [
+      knowledgeKeys.documents('kb', 'page'),
+      knowledgeKeys.chunks('kb', 'document', 'page'),
+      knowledgeKeys.tagDefinitions('kb'),
+      connectorKeys.detail('kb', 'connector'),
+      connectorDocumentKeys.list('kb', 'connector', true),
+    ]
+    for (const key of affected) client.setQueryData(key, {})
+    invalidateResourceQueries(client, 'w', 'knowledgebase', 'kb')
+    for (const key of affected) expect(client.getQueryState(key)?.isInvalidated).toBe(true)
+  })
+
+  it('invalidates stored workflow state and file contents, including collection refreshes', () => {
+    const client = new QueryClient()
+    const workflow = workflowKeys.state('wf')
+    const file = workspaceFilesKeys.contentFile('w', 'file')
+    client.setQueryData(workflow, {})
+    client.setQueryData(file, {})
+    invalidateResourceQueries(client, 'w', 'workflow', 'wf')
+    invalidateResourceQueries(client, 'w', 'file')
+    expect(client.getQueryState(workflow)?.isInvalidated).toBe(true)
+    expect(client.getQueryState(file)?.isInvalidated).toBe(true)
+  })
+
+  it('updates workflow publication metadata shown beside the draft', () => {
+    const client = new QueryClient()
+    const affected = [
+      deploymentKeys.info('wf'),
+      deploymentKeys.deployedState('wf'),
+      deploymentKeys.versions('wf'),
+      deploymentKeys.chatStatus('wf'),
+    ]
+    for (const key of affected) client.setQueryData(key, {})
+    invalidateResourceQueries(client, 'w', 'workflow', 'wf')
+    for (const key of affected) expect(client.getQueryState(key)?.isInvalidated).toBe(true)
+  })
+
+  it('refreshes every folder family and both task navigation scopes', () => {
+    const client = new QueryClient()
+    const affected = [
+      folderKeys.list('w', 'active', 'workflow'),
+      folderKeys.list('w', 'active', 'table'),
+      folderKeys.list('w', 'archived', 'knowledge_base'),
+      mothershipChatKeys.list('w', 'active'),
+      mothershipChatKeys.list('w', 'archived'),
+      mothershipChatKeys.detail('chat'),
+    ]
+    for (const key of affected) client.setQueryData(key, {})
+    invalidateResourceQueries(client, 'w', 'folder')
+    invalidateResourceQueries(client, 'w', 'task', 'chat')
+    for (const key of affected) expect(client.getQueryState(key)?.isInvalidated).toBe(true)
+  })
+
+  it('leaves desktop and ephemeral panels under their existing owners', () => {
+    const client = new QueryClient()
+    client.setQueryData(tableKeys.detail('t'), {})
+    for (const type of ['browser', 'terminal', 'generic'] as const)
+      invalidateResourceQueries(client, 'w', type)
+    expect(client.getQueryState(tableKeys.detail('t'))?.isInvalidated).toBe(false)
+  })
+
+  it('refreshes log navigation and execution lookup while preserving other workspaces', () => {
+    const client = new QueryClient()
+    const affected = [
+      [...logKeys.lists(), 'w', { workflowIds: ['workflow'] }],
+      logKeys.stat('w', {}),
+      logKeys.detail('w', 'row'),
+      logKeys.byExecution('w', 'execution'),
+    ]
+    const unrelated = [logKeys.detail('other', 'row'), logKeys.byExecution('other', 'execution')]
+    for (const key of [...affected, ...unrelated]) client.setQueryData(key, {})
+    invalidateResourceQueries(client, 'w', 'log', 'row')
+    for (const key of affected) expect(client.getQueryState(key)?.isInvalidated).toBe(true)
+    for (const key of unrelated) expect(client.getQueryState(key)?.isInvalidated).toBe(false)
+  })
+})