Typesafe file content restoration

Author: huntercaron

packages/code-link-cli/src/controller.ts

@@ -1163,7 +1163,7 @@ export async function start(config: Config): Promise<void> {
                     await processEvent({
                         type: "LOCAL_DELETE_REJECTED",
                         fileName: file.fileName,
-                        content: file.content ?? "",
+                        content: file.content,
                     })
                 }
 

packages/code-link-shared/src/index.ts

@@ -19,6 +19,7 @@ export { getPortFromHash } from "./ports.ts"
 // Sync tracker
 export { createSyncTracker, type SyncTracker } from "./sync-tracker.ts"
 export type {
+    CancelledDelete,
     CliToPluginMessage,
     ConflictSummary,
     ConflictVersionData,

packages/code-link-shared/src/types.ts

@@ -12,6 +12,12 @@ export interface PendingDelete {
     content?: string
 }
 
+/** File with content to restore when delete is cancelled - content is required */
+export interface CancelledDelete {
+    fileName: string
+    content: string
+}
+
 export interface ConflictSummary {
     fileName: string
     /** null means the file was deleted on this side */
@@ -78,7 +84,7 @@ export type PluginToCliMessage =
     | { type: "file-change"; fileName: string; content: string }
     | { type: "file-delete"; fileNames: string[] }
     | { type: "delete-confirmed"; fileNames: string[] }
-    | { type: "delete-cancelled"; files: PendingDelete[] }
+    | { type: "delete-cancelled"; files: CancelledDelete[] }
     | { type: "file-synced"; fileName: string; remoteModifiedAt: number }
     | {
           type: "conflicts-resolved"

plugins/code-link/src/App.tsx

@@ -659,7 +659,14 @@ function createMessageHandler({
                     const files: PendingDelete[] = []
                     for (const fileName of message.fileNames) {
                         const content = await api.readCurrentContent(fileName)
-                        files.push({ fileName, content })
+                        // Only include files that exist in Framer (have content to restore)
+                        if (content !== undefined) {
+                            files.push({ fileName, content })
+                        }
+                    }
+                    if (files.length === 0) {
+                        // No files exist in Framer, nothing to confirm
+                        break
                     }
                     dispatch({
                         type: "pending-deletes",