Seems solid

Author: huntercaron

plugins/code-link/src/api.test.ts

@@ -336,6 +336,32 @@ describe("CodeFilesAPI", () => {
         expect(trackerRemember).not.toHaveBeenCalled()
     })
 
+    it("seeds snapshot before a remote rename finishes to avoid echoing subscription updates", async () => {
+        const { api, socket, tracker, trackerRemember } = setup()
+        const content = "export const Old = 1"
+        const existing = createCodeFile({ name: "Old.tsx", content })
+
+        await publishSnapshotAndClear({
+            api,
+            socket,
+            files: [createCodeFile({ name: "Old.tsx", content })],
+        })
+
+        framerMock.getCodeFiles.mockResolvedValueOnce([existing])
+        existing.rename.mockImplementation(async (nextName: string) => {
+            existing.name = nextName
+            framerMock.getCodeFiles.mockResolvedValue([existing])
+            await api.handleFramerFilesChanged(socket as unknown as WebSocket, tracker)
+        })
+
+        await expect(api.applyRemoteRename("Old.tsx", "New", socket as unknown as WebSocket)).resolves.toBe(true)
+
+        const sentMessages = getSentMessages(socket)
+        expect(sentMessages).toHaveLength(1)
+        expectFileSyncedMessage(sentMessages[0], "New.tsx")
+        expect(trackerRemember).not.toHaveBeenCalled()
+    })
+
     it("finds an extensionless rename source using its normalized name", async () => {
         const { api, socket, tracker, trackerRemember } = setup()
         const content = "export const Old = 1"

plugins/code-link/src/api.ts

@@ -209,13 +209,16 @@ export class CodeFilesAPI {
             return false
         }
 
+        const previousSourceSnapshot = this.lastSnapshot.get(sourceFileName)
+        const previousTargetSnapshot = this.lastSnapshot.get(targetFileName)
+        const renamedContent = previousSourceSnapshot ?? existing.content
+
+        // Update snapshot BEFORE rename to prevent race with file subscription.
+        this.lastSnapshot.delete(sourceFileName)
+        this.lastSnapshot.set(targetFileName, renamedContent)
+
         try {
             await existing.rename(targetFileName)
-            const content = this.lastSnapshot.get(sourceFileName)
-            if (content !== undefined) {
-                this.lastSnapshot.delete(sourceFileName)
-                this.lastSnapshot.set(targetFileName, content)
-            }
             socket.send(
                 JSON.stringify({
                     type: "file-synced",
@@ -225,6 +228,16 @@ export class CodeFilesAPI {
             )
             return true
         } catch (err) {
+            if (previousSourceSnapshot !== undefined) {
+                this.lastSnapshot.set(sourceFileName, previousSourceSnapshot)
+            }
+
+            if (previousTargetSnapshot !== undefined) {
+                this.lastSnapshot.set(targetFileName, previousTargetSnapshot)
+            } else {
+                this.lastSnapshot.delete(targetFileName)
+            }
+
             const message = `Failed to rename ${oldFileName} -> ${newFileName}`
             log.error(message, err)
             socket.send(