fix(ui): synchronize resource selection updates

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/home.tsx

@@ -36,7 +36,10 @@ import { captureEvent } from '@/lib/posthog/client'
 import { persistImportedWorkflow } from '@/lib/workflows/operations/import-export'
 import { RESOURCE_HEADER_CLASSES } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
 import { resolveWorkspaceResourceRef } from '@/app/workspace/[workspaceId]/home/resolve-resource-ref'
-import { resolveResourceEventPresentation } from '@/app/workspace/[workspaceId]/home/resource-view-policy'
+import {
+  resolveResourceEventPresentation,
+  resolveResourceSelectionUpdate,
+} from '@/app/workspace/[workspaceId]/home/resource-view-policy'
 import { resourceParam, resourceUrlKeys } from '@/app/workspace/[workspaceId]/home/search-params'
 import { useFolders } from '@/hooks/queries/folders'
 import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
@@ -103,6 +106,8 @@ export function Home({ chatId, userName, userId }: HomeProps) {
     ...resourceParam.parser,
     ...resourceUrlKeys,
   })
+  const activeResourceParamRef = useRef(activeResourceParam)
+  activeResourceParamRef.current = activeResourceParam
   /**
    * Strips any leftover URL fragment on selection change, preserving the old
    * effect's `url.hash = ''` (the only hash usage on this surface) without a
@@ -115,11 +120,13 @@ export function Home({ chatId, userName, userId }: HomeProps) {
    */
   const setActiveResourceUrl = useCallback<Dispatch<SetStateAction<string | null>>>(
     (action) => {
+      const nextResourceId = resolveResourceSelectionUpdate(activeResourceParamRef.current, action)
+      activeResourceParamRef.current = nextResourceId
       if (typeof window !== 'undefined' && window.location.hash) {
         const { pathname, search } = window.location
         window.history.replaceState(window.history.state, '', `${pathname}${search}`)
       }
-      void setResourceParam(action)
+      void setResourceParam(nextResourceId)
     },
     [setResourceParam]
   )
@@ -213,8 +220,6 @@ export function Home({ chatId, userName, userId }: HomeProps) {
   }, [])
   const resourceCollapseOwnedByUserRef = useRef(false)
   const resourceSelectionOwnedByUserRef = useRef(false)
-  const activeResourceParamRef = useRef(activeResourceParam)
-  activeResourceParamRef.current = activeResourceParam
 
   function handleResourceEvent(resourceId: string, options?: ResourceEventOptions) {
     const activeResourceId = activeResourceParamRef.current

apps/sim/app/workspace/[workspaceId]/home/resource-view-policy.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { resolveResourceEventPresentation } from '@/app/workspace/[workspaceId]/home/resource-view-policy'
+import {
+  resolveResourceEventPresentation,
+  resolveResourceSelectionUpdate,
+} from '@/app/workspace/[workspaceId]/home/resource-view-policy'
 
 const DEFAULT_INPUT = {
   activeResourceId: 'file-1',
@@ -80,11 +83,15 @@ describe('resolveResourceEventPresentation', () => {
     })
   })
 
-  it('follows agent work after the user-selected resource is removed', () => {
+  it('follows same-batch agent work after the user-selected resource is removed', () => {
+    const activeResourceId = resolveResourceSelectionUpdate('file-1', (currentResourceId) =>
+      currentResourceId === 'file-1' ? null : currentResourceId
+    )
+
     expect(
       resolveResourceEventPresentation({
         ...DEFAULT_INPUT,
-        activeResourceId: null,
+        activeResourceId,
         selectionOwnedByUser: true,
       })
     ).toEqual({

apps/sim/app/workspace/[workspaceId]/home/resource-view-policy.ts

@@ -1,3 +1,12 @@
+import type { SetStateAction } from 'react'
+
+export function resolveResourceSelectionUpdate(
+  currentResourceId: string | null,
+  update: SetStateAction<string | null>
+): string | null {
+  return typeof update === 'function' ? update(currentResourceId) : update
+}
+
 export interface ResourceEventPresentationInput {
   activeResourceId: string | null
   activationRequested: boolean