fix(project-files): retire a restored document only when this restore revived the file

Author: waleedlatif1

apps/sim/lib/projects/files/application/documents.test.ts

@@ -28,9 +28,10 @@ const args = {
 }
 
 describe('persistProjectFileDoc conflict retries', () => {
-  it('reports a document conflict after a revision keeps moving', async () => {
+  it('retries a moving revision before reporting a document conflict', async () => {
     mockReadContent.mockRejectedValue(new ProjectFileRevisionConflictError('File changed'))
     await expect(persistProjectFileDoc.execute(args)).resolves.toEqual({ status: 'conflict' })
+    expect(mockReadContent).toHaveBeenCalledTimes(3)
   })
 
   it('surfaces a Project lock conflict instead of reporting a document conflict', async () => {

apps/sim/lib/projects/files/application/lifecycle.ts

@@ -166,10 +166,9 @@ export const restoreProjectFile = defineAuthorizedProjectFileUseCase({
   operation: projectFileOperations.restore,
   invalidatesFileList: ({ context }) => Boolean(context.file?.deletedAt),
   async execute({ input, context, tx }: LifecycleArgs<ProjectFileTarget & { fileId: string }>) {
-    const restored = await restoreFileInTx(tx, context.owner, input.fileId)
-    const result = { restored: true as const, file: await projectFileRecord(tx, context, restored) }
-    if (context.file?.deletedAt)
-      await retireDocuments(tx, context.projectId, [input.fileId], result)
+    const { file, restored } = await restoreFileInTx(tx, context.owner, input.fileId)
+    const result = { restored: true as const, file: await projectFileRecord(tx, context, file) }
+    if (restored) await retireDocuments(tx, context.projectId, [input.fileId], result)
     return result
   },
   projectAudit: ({ context, result }) => ({

apps/sim/lib/uploads/contexts/workspace/file-manager.ts

@@ -3048,12 +3048,15 @@ export async function restoreWorkspaceFile(workspaceId: string, fileId: string):
   }
 }
 
-/** Restores a retained head, re-rooting and deduplicating within its canonical owner. */
+/**
+ * Restores a retained head, re-rooting and deduplicating within its canonical owner. `restored`
+ * reports whether this call restored it, read under the file's row lock.
+ */
 export async function restoreFileInTx(
   tx: DbTransaction,
   owner: EditableFileOwner,
   fileId: string
-): Promise<WorkspaceFileRow> {
+): Promise<{ file: WorkspaceFileRow; restored: boolean }> {
   if (owner.entityType === 'workspace') await lockWorkspaceProject(tx, owner.entityId)
   await lockFileDirectories(tx, [owner])
   const [file] = await tx
@@ -3063,7 +3066,7 @@ export async function restoreFileInTx(
     .for('update')
     .limit(1)
   if (!file) throw new OrchestrationError('not_found', 'File not found')
-  if (!file.deletedAt) return file
+  if (!file.deletedAt) return { file, restored: false }
   let folderId = file.folderId
   if (folderId) {
     const [parent] = await tx
@@ -3119,5 +3122,5 @@ export async function restoreFileInTx(
       throw error
     })
   if (!restored) throw new OrchestrationError('conflict', 'File changed during restoration')
-  return restored
+  return { file: restored, restored: true }
 }