fix(project-files): protect drafts and align file operations

Author: mzxchandra

apps/sim/app/o/[organizationId]/home/organization-home.test.tsx

@@ -249,8 +249,13 @@ it.each([
     mocks.projects = projects
     mocks.projectFiles = projectFiles
     vi.spyOn(toast, 'error').mockReturnValue('lookup-error')
-    const fetch = vi.fn().mockRejectedValue(new Error('Project lookup is disabled'))
-    vi.stubGlobal('fetch', fetch)
+    const requests: unknown[] = []
+    const resources: unknown[] = []
+    vi.stubGlobal('fetch', async (input: unknown) => {
+      requests.push(input)
+      throw new Error('Project lookup is disabled')
+    })
+    mocks.addResource.mockImplementation((resource: unknown) => resources.push(resource))
     await act(async () => renderHome(<OrganizationHome chatId='chat-a' />))
     const selectResource = mocks.renderer.mock.lastCall?.[0].onWorkspaceResourceSelect
     if (!selectResource) throw new Error('Chat resource selection is unavailable')
@@ -262,7 +267,7 @@ it.each([
         owner: { entityType: 'project', entityId: 'project-a' },
       })
     )
-    expect(fetch).not.toHaveBeenCalled()
-    expect(mocks.addResource).not.toHaveBeenCalled()
+    expect(requests).toEqual([])
+    expect(resources).toEqual([])
   }
 )

apps/sim/app/workspace/[workspaceId]/files/components/file-detail/navigation.tsx

@@ -1,8 +1,8 @@
 'use client'
 
 import { createContext, type ReactNode, useCallback, useContext, useRef, useState } from 'react'
-import { ChipConfirmModal } from '@sim/emcn'
 import { useRouter } from 'next/navigation'
+import { useSettingsUnsavedGuard } from '@/components/settings/use-settings-unsaved-guard'
 import type { FileDownloadSource } from '@/lib/uploads/client/download'
 import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
 
@@ -40,7 +40,6 @@ export function FileNavigationProvider({ owner, fileId, children }: FileNavigati
   const router = useRouter()
   const [isDirty, updateIsDirty] = useState(false)
   const [saveStatus, updateSaveStatus] = useState<SaveStatus>('idle')
-  const [pendingUrl, setPendingUrl] = useState<string | null>(null)
   const setIsDirty = useCallback((dirty: boolean) => {
     dirtyRef.current = dirty
     updateIsDirty(dirty)
@@ -49,28 +48,25 @@ export function FileNavigationProvider({ owner, fileId, children }: FileNavigati
     savingRef.current = status
     updateSaveStatus(status)
   }, [])
-  const navigate = useCallback(
-    (url: string) => {
-      if (dirtyRef.current) setPendingUrl(url)
-      else router.push(url)
+  const { guardBack } = useSettingsUnsavedGuard({
+    isDirty,
+    navigationBlocked: saveStatus === 'saving',
+    onDiscard: () => {
+      discardRef.current?.()
+      setIsDirty(false)
+      setSaveStatus('idle')
     },
-    [router]
+  })
+  const navigate = useCallback(
+    (url: string) => guardBack(() => router.push(url)),
+    [guardBack, router]
   )
   const save = useCallback(async () => {
     if (saveRef.current && dirtyRef.current && savingRef.current !== 'saving') {
       await saveRef.current()
     }
   }, [])
 
-  function discardAndNavigate() {
-    if (!pendingUrl) return
-    discardRef.current?.()
-    setIsDirty(false)
-    setSaveStatus('idle')
-    setPendingUrl(null)
-    router.push(pendingUrl)
-  }
-
   return (
     <FileNavigationContext.Provider
       value={{
@@ -88,17 +84,6 @@ export function FileNavigationProvider({ owner, fileId, children }: FileNavigati
       }}
     >
       {children}
-      <ChipConfirmModal
-        open={pendingUrl !== null}
-        onOpenChange={(open) => {
-          if (!open) setPendingUrl(null)
-        }}
-        srTitle='Unsaved Changes'
-        title='Unsaved Changes'
-        text='You have unsaved changes. Are you sure you want to discard them?'
-        dismissLabel='Keep editing'
-        confirm={{ label: 'Discard Changes', onClick: discardAndNavigate }}
-      />
     </FileNavigationContext.Provider>
   )
 }

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

@@ -32,6 +32,7 @@ import {
 } from '@/app/workspace/[workspaceId]/home/hooks/use-resource-panel'
 import { useRestoredChatEntry } from '@/app/workspace/[workspaceId]/home/hooks/use-restored-chat-entry'
 import { resolveWorkspaceResourceRef } from '@/app/workspace/[workspaceId]/home/resolve-resource-ref'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
 import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
 import { getProjectFileQueryOptions } from '@/hooks/queries/project-files'
@@ -69,6 +70,8 @@ export function Home(props: HomeProps) {
 
 function HomeContent({ chatId, userName, userId }: HomeProps) {
   useOAuthReturnRouter()
+  const projectsEnabled = useFeatureFlag('projects')
+  const projectFilesEnabled = useFeatureFlag('project-files')
   const { workspaceId } = useParams<{ workspaceId: string }>()
   const queryClient = useQueryClient()
   const controller = useResourcePanelController()
@@ -382,6 +385,7 @@ function HomeContent({ chatId, userName, userId }: HomeProps) {
    */
   async function handleWorkspaceResourceSelect(ref: WorkspaceResourceRef) {
     if (ref.type === 'file' && ref.owner?.entityType === 'project') {
+      if (!projectsEnabled || !projectFilesEnabled) return
       if (!ref.id) {
         toast.error('This Project file reference is missing its ID')
         return

apps/sim/components/settings/use-settings-browser-navigation.test.tsx

@@ -1,13 +1,17 @@
 /** @vitest-environment jsdom */
 
-import { act, useState } from 'react'
+import { act, useEffect, useState } from 'react'
 import { nextNavigationMockFns } from '@sim/testing/mocks/next-navigation.mock'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { SettingsIntentLink } from '@/components/settings/settings-intent-link'
 import { SettingsNavigationGuard } from '@/components/settings/settings-navigation-guard'
 import { useSettingsBrowserNavigation } from '@/components/settings/use-settings-browser-navigation'
 import { useSettingsUnsavedGuard } from '@/components/settings/use-settings-unsaved-guard'
+import {
+  FileNavigationProvider,
+  useFileNavigation,
+} from '@/app/workspace/[workspaceId]/files/components/file-detail/navigation'
 import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
 
 vi.mock(
@@ -587,3 +591,63 @@ describe('native settings navigation', () => {
     expect(unload.defaultPrevented).toBe(false)
   })
 })
+
+function FileDraft() {
+  const [draft, setDraft] = useState('')
+  const { setIsDirty, discardRef } = useFileNavigation({
+    owner: { entityType: 'project', entityId: 'project' },
+  })
+  useEffect(() => {
+    discardRef.current = () => setDraft('')
+    return () => {
+      discardRef.current = null
+    }
+  }, [discardRef])
+  return (
+    <input
+      value={draft}
+      onChange={(event) => {
+        setDraft(event.target.value)
+        setIsDirty(Boolean(event.target.value))
+      }}
+    />
+  )
+}
+
+it.each([-1, 1])(
+  'keeps a file draft through native history cancellation and discards only on confirmed traversal %s',
+  async (delta) => {
+    window.history.pushState({ router: 'future' }, '', '/future')
+    nativeGo.call(window.history, -1)
+    await settle()
+    act(() =>
+      root.render(
+        <FileNavigationProvider
+          owner={{ entityType: 'project', entityId: 'project' }}
+          fileId='file'
+        >
+          <FileDraft />
+        </FileNavigationProvider>
+      )
+    )
+    const field = container.querySelector('input')
+    const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set
+    if (!field || !setter) throw new Error('Missing file draft')
+    act(() => {
+      setter.call(field, 'unsaved file draft')
+      field.dispatchEvent(new Event('input', { bubbles: true }))
+    })
+    nativeGo.call(window.history, delta)
+    await settle()
+    expect(window.location.pathname).toBe('/editor')
+    expect(field.value).toBe('unsaved file draft')
+    act(() => useSettingsDirtyStore.getState().cancelLeave())
+    expect(field.value).toBe('unsaved file draft')
+    nativeGo.call(window.history, delta)
+    await settle()
+    act(() => useSettingsDirtyStore.getState().confirmLeave())
+    await settle()
+    expect(window.location.pathname).toBe(delta === -1 ? '/prior' : '/future')
+    expect(field.value).toBe('')
+  }
+)

apps/sim/hooks/queries/workspace-files.test.tsx

@@ -9,6 +9,7 @@
  */
 
 import { act, type ReactNode } from 'react'
+import { toast } from '@sim/emcn'
 import { flushMacrotask } from '@sim/testing/helpers/async'
 import { createDeferred } from '@sim/testing/helpers/deferred'
 import {
@@ -32,6 +33,7 @@ import {
   useAddressedWorkspaceFileRecord,
   useReloadWorkspaceFileContent,
   useUpdateWorkspaceFileContent,
+  useUploadWorkspaceFile,
   useWorkspaceFileContent,
   useWorkspaceFiles,
   type WorkspaceFileContentResult,
@@ -430,3 +432,51 @@ describe('addressed file metadata fallback', () => {
     }
   })
 })
+
+it.each(['abort-error', 'aborted-signal', 'failure'] as const)(
+  'suppresses only intentional upload cancellation notifications (%s)',
+  async (scenario) => {
+    const notifications: unknown[] = []
+    vi.spyOn(toast, 'error').mockImplementation((message) => {
+      notifications.push(message)
+      return 'toast'
+    })
+    const controller = new AbortController()
+    if (scenario === 'aborted-signal') controller.abort()
+    const failure =
+      scenario === 'abort-error'
+        ? new DOMException('Cancelled', 'AbortError')
+        : new Error('Provider failed')
+    mockRequestJson.mockRejectedValueOnce(failure)
+    const client = new QueryClient({ defaultOptions: { mutations: { retry: false } } })
+    const container = document.createElement('div')
+    const root = createRoot(container)
+    let upload: ReturnType<typeof useUploadWorkspaceFile> | undefined
+    function Probe() {
+      upload = useUploadWorkspaceFile()
+      return null
+    }
+    try {
+      await act(async () =>
+        root.render(
+          <QueryClientProvider client={client}>
+            <Probe />
+          </QueryClientProvider>
+        )
+      )
+      await act(async () => {
+        await expect(
+          upload?.mutateAsync({
+            workspaceId: 'workspace',
+            file: new File(['content'], 'upload.txt'),
+            signal: controller.signal,
+          })
+        ).rejects.toBe(failure)
+      })
+      expect(notifications.length).toBe(scenario === 'failure' ? 1 : 0)
+    } finally {
+      await act(async () => root.unmount())
+      client.clear()
+    }
+  }
+)

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

@@ -543,6 +543,7 @@ export function useUploadWorkspaceFile() {
       }
     },
     onError: (error, variables) => {
+      if (error.name === 'AbortError' || variables.signal?.aborted) return
       logger.error('Failed to upload file:', error)
       if (!variables.skipToast) {
         toast.error(`Failed to upload "${variables.file.name}": ${error.message}`, {

apps/sim/lib/mothership/agent-cli/engines/universal-grep.ts

@@ -145,6 +145,11 @@ async function listAll(runtime: GrepRuntime, path: string): Promise<Record<strin
   return out
 }
 
+/** File adapters share bounded reads and wait for every provenance import before returning. */
+export function mapGrepFileReads<T, R>(items: T[], read: (item: T) => Promise<R>): Promise<R[]> {
+  return mapConcurrent(items, FILE_READ_CONCURRENCY, read)
+}
+
 async function mapConcurrent<T, R>(
   items: T[],
   limit: number,

apps/sim/lib/mothership/agent-cli/project-file-grep.test.ts

@@ -1,4 +1,7 @@
 /** @vitest-environment node */
+
+import { flushMacrotask } from '@sim/testing/helpers/async'
+import { createDeferred } from '@sim/testing/helpers/deferred'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { list, artifact } = vi.hoisted(() => ({ list: vi.fn(), artifact: vi.fn() }))
@@ -80,3 +83,46 @@ describe('Project grep corpus', () => {
     expect(result.stdout).toBe('')
   })
 })
+
+it('reads five Project artifacts concurrently while preserving inventory result order', async () => {
+  const gates = Array.from({ length: 6 }, () => createDeferred<void>())
+  let active = 0
+  let peak = 0
+  list.mockResolvedValue({
+    files: Array.from({ length: 6 }, (_, index) => ({
+      id: `file-${index}`,
+      name: `notes-${index}.txt`,
+      folderPath: '/',
+    })),
+    nextKeys: null,
+  })
+  artifact.mockImplementation(async ({ fileId }: { fileId: string }) => {
+    active++
+    peak = Math.max(peak, active)
+    await gates[Number(fileId.slice(5))].promise
+    active--
+    return {
+      file: { id: fileId, name: `${fileId}.txt` },
+      contentType: 'text/plain',
+      buffer: Buffer.from('needle'),
+      secretProvenance: { status: 'exact', entries: [] },
+    }
+  })
+  const pending = grepProjectFiles(invocation, context(), 'project')
+  try {
+    await flushMacrotask()
+    expect(active).toBe(5)
+    for (const index of [4, 3, 2, 1, 0, 5]) {
+      gates[index].resolve()
+      await flushMacrotask()
+    }
+  } finally {
+    for (const gate of gates) gate.resolve()
+    await pending
+  }
+  const result = await pending
+  expect(peak).toBe(5)
+  expect(result.stdout.split('\n')).toEqual(
+    Array.from({ length: 6 }, (_, index) => `files/notes-${index}.txt (file-${index}):1: needle`)
+  )
+})