fix: Adjust metadata ID resolution order in Deepnote data handling (#338)

* fix: Adjust metadata ID resolution order in Deepnote data handling

Updated the order of ID resolution in the DeepnoteDataConverter, DeepnoteFileChangeWatcher, and Pocket modules to prioritize '__deepnoteBlockId' over 'id'. Added a test to ensure updates are not applied when cells lack block IDs and no fallback is available.

* test: Update snapshot reading logic in deepnoteFileChangeWatcher unit tests

Replaced the setTimeout with a waitFor function to ensure that readSnapshot is called at least once after the snapshot change event is fired. This improves the reliability of the test by directly waiting for the expected condition.

Author: tkislan

src/notebooks/deepnote/deepnoteDataConverter.ts

@@ -437,7 +437,7 @@ export class DeepnoteDataConverter {
 
     private createFallbackBlock(cell: NotebookCellData, index: number): DeepnoteBlock {
         const meta = cell.metadata as Record<string, unknown> | undefined;
-        const preservedId = (meta?.id ?? meta?.__deepnoteBlockId ?? meta?.deepnoteBlockId) as string | undefined;
+        const preservedId = (meta?.__deepnoteBlockId ?? meta?.id ?? meta?.deepnoteBlockId) as string | undefined;
         const preservedSortingKey = (meta?.sortingKey ?? meta?.deepnoteSortingKey) as string | undefined;
         const preservedBlockGroup = meta?.blockGroup as string | undefined;
 

src/notebooks/deepnote/deepnoteFileChangeWatcher.ts

@@ -520,7 +520,7 @@ export class DeepnoteFileChangeWatcher implements IExtensionSyncActivationServic
     }
 
     private getBlockIdFromMetadata(metadata: Record<string, unknown> | undefined): string | undefined {
-        return (metadata?.id ?? metadata?.__deepnoteBlockId) as string | undefined;
+        return (metadata?.__deepnoteBlockId ?? metadata?.id) as string | undefined;
     }
 
     private handleFileChange(uri: Uri): void {

src/notebooks/deepnote/deepnoteFileChangeWatcher.unit.test.ts

@@ -1052,6 +1052,34 @@ project:
             execOnDidCreate.dispose();
         });
 
+        test('should not apply updates when cells have no block IDs and no fallback', async () => {
+            const snapshotUri = Uri.file('/workspace/snapshots/my-project_project-1_latest.snapshot.deepnote');
+            const notebook = createMockNotebook({
+                uri: Uri.file('/workspace/test.deepnote'),
+                cells: [
+                    {
+                        metadata: {},
+                        outputs: [],
+                        kind: NotebookCellKind.Code,
+                        document: { getText: () => 'print("hello")' }
+                    }
+                ]
+            });
+
+            when(mockedVSCodeNamespaces.workspace.notebookDocuments).thenReturn([notebook]);
+
+            snapshotOnDidChange.fire(snapshotUri);
+
+            await waitFor(() => readSnapshotCallCount >= 1);
+
+            assert.isAtLeast(readSnapshotCallCount, 1, 'readSnapshot should be called');
+            assert.strictEqual(
+                snapshotApplyEditCount,
+                0,
+                'applyEdit should NOT be called when no block IDs can be resolved'
+            );
+        });
+
         test('should fall back to replaceCells when no kernel is active', async () => {
             const fbDisposables: IDisposableRegistry = [];
             const fbOnDidChange = new EventEmitter<Uri>();

src/platform/deepnote/pocket.ts

@@ -76,7 +76,7 @@ export function createBlockFromPocket(cell: NotebookCellData, index: number): De
     const metadata = cell.metadata ? { ...cell.metadata } : undefined;
     // Get id from top-level metadata before cleaning it up
     // Check both 'id' and backup '__deepnoteBlockId' in case VS Code modifies 'id'
-    const cellId = (metadata?.id as string | undefined) || (metadata?.__deepnoteBlockId as string | undefined);
+    const cellId = (metadata?.__deepnoteBlockId as string | undefined) || (metadata?.id as string | undefined);
 
     logger.debug(
         `[Pocket] createBlockFromPocket index=${index}: cell.metadata.id=${metadata?.id}, __deepnoteBlockId=${metadata?.__deepnoteBlockId}, using cellId=${cellId}, metadata keys=${