fix(forking): preserve edits during fork sync

Author: icecrasher321

apps/sim/ee/workspace-forking/components/fork-sync/use-fork-sync.test.tsx

@@ -123,6 +123,23 @@ const UNTOUCHED_FIELD = dependent({
 
 const DEPENDENTS = [PARENT_FIELD, CHILD_FIELD, CLEARED_FIELD, UNTOUCHED_FIELD]
 
+const SUCCESSFUL_PROMOTE_RESULT = {
+  promoteRunId: 'run-1',
+  blockers: [],
+  unmappedRequired: [],
+  droppedReferences: [],
+  triggerUrlChanges: [],
+  deployFailed: 0,
+}
+
+function createDeferred<T>() {
+  let resolve!: (value: T) => void
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise
+  })
+  return { promise, resolve }
+}
+
 const mappedRepickContext = (previousValue: string) => ({
   previousValue,
   baselineValueFor: (field: ForkDependentReconfig) => field.currentValue,
@@ -217,14 +234,7 @@ beforeEach(() => {
     isPlaceholderData: false,
   })
   mockUpdateMutateAsync.mockResolvedValue({ success: true, updated: 1 })
-  mockPromote.mockResolvedValue({
-    promoteRunId: 'run-1',
-    blockers: [],
-    unmappedRequired: [],
-    droppedReferences: [],
-    triggerUrlChanges: [],
-    deployFailed: 0,
-  })
+  mockPromote.mockResolvedValue(SUCCESSFUL_PROMOTE_RESULT)
 })
 
 afterEach(() => {
@@ -471,4 +481,78 @@ describe('useForkSync post-sync reset', () => {
 
     expect(get().reconfig[dependentKey(PARENT_FIELD)]).toBe('sheet-2')
   })
+
+  it('keeps a newer target mapping selected while Sync was in flight', async () => {
+    const pendingPromote = createDeferred<typeof SUCCESSFUL_PROMOTE_RESULT>()
+    mockPromote.mockReturnValue(pendingPromote.promise)
+    const { get } = renderForkSync()
+    let syncPromise!: Promise<void>
+
+    act(() => {
+      syncPromise = get().sync()
+    })
+    await act(async () => Promise.resolve())
+    expect(mockPromote).toHaveBeenCalledTimes(1)
+
+    act(() => get().setTarget(CREDENTIAL_ENTRY, 'cred-newer'))
+    pendingPromote.resolve(SUCCESSFUL_PROMOTE_RESULT)
+    await act(async () => syncPromise)
+
+    expect(get().targetFor(CREDENTIAL_ENTRY)).toBe('cred-newer')
+    expect(get().dirty).toBe(true)
+  })
+
+  it('keeps a newer dependent re-pick made while Sync was in flight', async () => {
+    const pendingPromote = createDeferred<typeof SUCCESSFUL_PROMOTE_RESULT>()
+    mockPromote.mockReturnValue(pendingPromote.promise)
+    const { get } = renderForkSync()
+    let syncPromise!: Promise<void>
+
+    act(() => {
+      syncPromise = get().sync()
+    })
+    await act(async () => Promise.resolve())
+    expect(mockPromote).toHaveBeenCalledTimes(1)
+
+    act(() => {
+      get().setReconfig((current) => ({
+        ...current,
+        [dependentKey(PARENT_FIELD)]: 'sheet-newer',
+      }))
+    })
+    pendingPromote.resolve(SUCCESSFUL_PROMOTE_RESULT)
+    await act(async () => syncPromise)
+
+    expect(get().reconfig[dependentKey(PARENT_FIELD)]).toBe('sheet-newer')
+    expect(get().dirty).toBe(true)
+  })
+
+  it('keeps newer mapping edits made while Save was in flight', () => {
+    let finishSave: (() => void) | undefined
+    mockUpdateMutate.mockImplementation((_variables, options) => {
+      finishSave = options.onSuccess
+    })
+    const { get } = renderForkSync()
+
+    act(() => {
+      get().setReconfig((current) => ({
+        ...current,
+        [dependentKey(PARENT_FIELD)]: 'sheet-submitted',
+      }))
+    })
+    act(() => get().save())
+
+    act(() => {
+      get().setTarget(CREDENTIAL_ENTRY, 'cred-newer')
+      get().setReconfig((current) => ({
+        ...current,
+        [dependentKey(PARENT_FIELD)]: 'sheet-newer',
+      }))
+    })
+    act(() => finishSave?.())
+
+    expect(get().targetFor(CREDENTIAL_ENTRY)).toBe('cred-newer')
+    expect(get().reconfig[dependentKey(PARENT_FIELD)]).toBe('sheet-newer')
+    expect(get().dirty).toBe(true)
+  })
 })

apps/sim/ee/workspace-forking/components/fork-sync/use-fork-sync.ts

@@ -744,6 +744,8 @@ export function useForkSync(params: {
 
   const save = () => {
     if (!otherWorkspaceId || !dirty || updateMapping.isPending) return
+    const submittedTargets = targets
+    const submittedReconfig = reconfig
     updateMapping.mutate(
       {
         workspaceId,
@@ -759,8 +761,8 @@ export function useForkSync(params: {
       },
       {
         onSuccess: () => {
-          setTargets({})
-          setReconfig({})
+          setTargets((current) => (current === submittedTargets ? {} : current))
+          setReconfig((current) => (current === submittedReconfig ? {} : current))
           toast.success('Mapping saved')
         },
         onError: (error) => toast.error(getErrorMessage(error, 'Failed to save mapping')),
@@ -836,6 +838,8 @@ export function useForkSync(params: {
   const sync = async () => {
     if (!otherWorkspaceId) return
     setSubmitting(true)
+    const submittedTargets = targets
+    const submittedReconfig = reconfig
     // Capture every payload from the state at confirm time, before any await - the page's
     // controls stay mounted during the run (unlike the old modal, which blocked its UI), so a
     // mid-flight edit must not leak into the promote body.
@@ -931,10 +935,10 @@ export function useForkSync(params: {
       }
 
       // The run committed the in-session choices: the mapping entries and dependent values are
-      // stored, so keeping the overrides would leave every touched field's card on screen against
-      // a freshly refetched diff. Drop them exactly as a successful Save does.
-      setTargets({})
-      setReconfig({})
+      // stored. Drop only the exact snapshots it submitted; edits made while the request was in
+      // flight were not committed by this run and must remain available for the next Save/Sync.
+      setTargets((current) => (current === submittedTargets ? {} : current))
+      setReconfig((current) => (current === submittedReconfig ? {} : current))
 
       const target = otherWorkspaceName || 'the workspace'
       const label = direction === 'pull' ? `Pulled from "${target}"` : `Pushed to "${target}"`

apps/sim/ee/workspace-forking/lib/copy/copy-files.test.ts

@@ -382,6 +382,7 @@ describe('executeForkFileBlobCopies target name collisions', () => {
       targetKey: 'workspace/child-ws/target-budget.xlsx',
       contentType: 'application/vnd.ms-excel',
       targetFolderId: 'target-reports',
+      displayName: 'budget.xlsx',
     })
 
   beforeEach(() => {
@@ -427,6 +428,7 @@ describe('executeForkFileBlobCopies target name collisions', () => {
       workspaceId: 'child-ws',
       folderId: 'target-reports',
       originalName: 'budget (1).xlsx',
+      displayName: 'budget (1).xlsx',
       deletedAt: null,
     })
     // The blob backing the surviving row must never be swept.
@@ -463,6 +465,7 @@ describe('executeForkFileBlobCopies target name collisions', () => {
     expect(fileRows.find((row) => row.id === 'target-file-1')).toMatchObject({
       folderId: 'target-reports',
       originalName: 'budget.xlsx',
+      displayName: 'budget.xlsx',
     })
     expect(storageServiceMockFns.mockDeleteFile).not.toHaveBeenCalled()
   })

apps/sim/ee/workspace-forking/lib/copy/copy-files.ts

@@ -325,6 +325,8 @@ export async function executeForkFileBlobCopies(
 
         const billingContext = await resolveStorageBillingContext(task.workspaceId)
         const targetOriginalName = await resolveTargetOriginalName(task)
+        const targetDisplayName =
+          targetOriginalName === task.fileName ? task.displayName : targetOriginalName
         await db.transaction(async (tx) => {
           const [inserted] = await tx
             .insert(workspaceFiles)
@@ -337,7 +339,7 @@ export async function executeForkFileBlobCopies(
               context: task.context,
               chatId: null,
               originalName: targetOriginalName,
-              displayName: task.displayName,
+              displayName: targetDisplayName,
               contentType: task.contentType,
               size: task.size,
               deletedAt: null,
@@ -385,7 +387,7 @@ export async function executeForkFileBlobCopies(
                 context: task.context,
                 chatId: null,
                 originalName: targetOriginalName,
-                displayName: task.displayName,
+                displayName: targetDisplayName,
                 contentType: task.contentType,
                 size: task.size,
                 deletedAt: null,