Update based on feedback

Author: huntercaron

packages/code-link-cli/src/helpers/watcher.test.ts

@@ -435,6 +435,38 @@ describe("rename detection", () => {
         await fs.rm(tmpDir, { recursive: true, force: true })
     })
 
+    it("replaces a buffered add on the same path without leaking the old timer", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "framer-watcher-"))
+
+        const events: WatcherEvent[] = []
+        const watcher: Watcher = initWatcher(tmpDir)
+        watcher.on("change", event => events.push(event))
+        const rawWatcher = createdWatchers.at(-1)
+        if (!rawWatcher) throw new Error("No watcher created")
+
+        const filePath = path.join(tmpDir, "Component.tsx")
+        await fs.writeFile(filePath, "export const Version = 1", "utf-8")
+        await rawWatcher.__emit("add", filePath)
+
+        await fs.writeFile(filePath, "export const Version = 2", "utf-8")
+        await rawWatcher.__emit("add", filePath)
+
+        expect(events).toHaveLength(0)
+
+        await waitForBuffer()
+
+        expect(events).toEqual([
+            {
+                kind: "add",
+                relativePath: "Component.tsx",
+                content: "export const Version = 2",
+            },
+        ])
+
+        await watcher.close()
+        await fs.rm(tmpDir, { recursive: true, force: true })
+    })
+
     it("emits add and delete separately when content differs", async () => {
         const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "framer-watcher-"))
 

packages/code-link-cli/src/helpers/watcher.ts

@@ -298,6 +298,11 @@ export function initWatcher(filesDir: string): Watcher {
             }
 
             // No pending delete match — buffer this add in case a delete arrives soon
+            const existingPendingAdd = pendingAdds.get(relativePath)
+            if (existingPendingAdd) {
+                clearTimeout(existingPendingAdd.timer)
+            }
+            const retainedPreviousContentHash = existingPendingAdd?.previousContentHash ?? previousContentHash
             const timer = setTimeout(() => {
                 pendingAdds.delete(relativePath)
                 dispatchEvent({ kind: "add", relativePath, content })
@@ -308,7 +313,7 @@ export function initWatcher(filesDir: string): Watcher {
                 contentHash,
                 content,
                 timer,
-                previousContentHash,
+                previousContentHash: retainedPreviousContentHash,
             })
             return
         }

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

@@ -221,6 +221,33 @@ describe("CodeFilesAPI", () => {
         expect(trackerRemember).not.toHaveBeenCalled()
     })
 
+    it("seeds snapshot before a remote write finishes to avoid echoing subscription updates", async () => {
+        const { api, socket, tracker, trackerRemember } = setup()
+        const oldContent = "export const Race = 1"
+        const newContent = "export const Race = 2"
+        const existing = createCodeFile({ name: "Race.tsx", content: oldContent })
+
+        await publishSnapshotAndClear({
+            api,
+            socket,
+            files: [createCodeFile({ name: "Race.tsx", content: oldContent })],
+        })
+
+        framerMock.getCodeFiles.mockResolvedValueOnce([existing])
+        existing.setFileContent.mockImplementation(async (content: string) => {
+            existing.content = content
+            framerMock.getCodeFiles.mockResolvedValue([existing])
+            await api.handleFramerFilesChanged(socket as unknown as WebSocket, tracker)
+        })
+
+        await api.applyRemoteChange("Race.tsx", newContent, socket as unknown as WebSocket)
+
+        const sentMessages = getSentMessages(socket)
+        expect(sentMessages).toHaveLength(1)
+        expectFileSyncedMessage(sentMessages[0], "Race.tsx")
+        expect(trackerRemember).not.toHaveBeenCalled()
+    })
+
     it("does not update snapshot state when a remote write fails", async () => {
         const { api, socket, tracker, trackerRemember } = setup()
         const oldContent = "export const Broken = 1"

plugins/code-link/src/api.ts

@@ -78,8 +78,23 @@ export class CodeFilesAPI {
 
     async applyRemoteChange(fileName: string, content: string, socket: WebSocket) {
         const normalizedName = normalizeCodeFileName(fileName)
-        const updatedAt = await upsertFramerFile(normalizedName, content)
+        const previousSnapshot = this.lastSnapshot.get(normalizedName)
+
+        // Update snapshot BEFORE upsert to prevent race with file subscription.
         this.lastSnapshot.set(normalizedName, content)
+
+        let updatedAt: number | undefined
+        try {
+            updatedAt = await upsertFramerFile(normalizedName, content)
+        } catch (error) {
+            if (previousSnapshot !== undefined) {
+                this.lastSnapshot.set(normalizedName, previousSnapshot)
+            } else {
+                this.lastSnapshot.delete(normalizedName)
+            }
+            throw error
+        }
+
         // Send file-synced message with timestamp
         const syncTimestamp = updatedAt ?? Date.now()
         log.debug(