revert

client/src/components/BlockEditor/BlockEditor.tsx

@@ -795,9 +795,9 @@ export default function BlockEditor() {
         const block = ws.getBlockById(e.blockId);
         if (block && !block.getParent()) {
           try {
-            const dom = Blockly.Xml.blockToDomWithXY(block);
+            const dom = Blockly.Xml.blockToDom(block, { xy: true } as any);
             const xml = Blockly.Xml.domToText(dom);
-            emitBlockCreateEvent(e.blockId, activeFileId, xml);
+            emitBlockCreateEvent(e.blockId, xml);
           } catch {}
         }
       }

client/src/hooks/useWebSocket.ts

@@ -112,25 +112,12 @@ export function useWebSocket() {
       useCollaborationStore.getState().updateElementHover(userId, elementId);
     });
 
-    s.on('block_state_synced', (data: { fileId: string; xml: string; updatedBy: string; initialBlocksXml?: Record<string, { xml: string; updatedBy: string; updatedAt: number }> }) => {
-      // Handle initial block state for new joiners (sent on join_project).
-      // server sends initialBlocksXml as { fileId: { xml, updatedBy, updatedAt } }
-      if (data.initialBlocksXml) {
-        const store = useEditorStore.getState();
-        for (const [fid, entry] of Object.entries(data.initialBlocksXml)) {
-          if (entry.xml) store.setBlocksXml(fid, entry.xml);
-        }
-        if (store.activeFileId && data.initialBlocksXml[store.activeFileId]?.xml) {
-          store.setVisualElements(store.elementRegistry[store.activeFileId] || []);
-        }
-        return;
-      }
-      // Real-time sync update
-      if (data.updatedBy === useAuthStore.getState().user?.id) return;
-      useEditorStore.getState().setBlocksXml(data.fileId, data.xml);
+    s.on('block_state_synced', ({ fileId, xml, updatedBy }: { fileId: string; xml: string; updatedBy: string }) => {
+      if (updatedBy === useAuthStore.getState().user?.id) return;
+      useEditorStore.getState().setBlocksXml(fileId, xml);
       const store = useEditorStore.getState();
-      if (store.activeFileId === data.fileId) {
-        store.setVisualElements(store.elementRegistry[data.fileId] || []);
+      if (store.activeFileId === fileId) {
+        store.setVisualElements(store.elementRegistry[fileId] || []);
       }
     });
 
@@ -161,14 +148,8 @@ export function useWebSocket() {
       useCollaborationStore.getState().pushPendingBlockChange({ blockId, name, value });
     });
 
-    s.on('collaborator_block_create_event', ({ blockId, fileId, xml }: { blockId: string; fileId: string; xml: string }) => {
-      const store = useEditorStore.getState();
-      // Only apply to the currently active file; otherwise the block would appear
-      // on the wrong file's workspace. The full XML sync (block_state_synced) will
-      // handle it when the collaborator switches to that file.
-      if (store.activeFileId === fileId) {
-        useCollaborationStore.getState().pushPendingBlockCreate({ blockId, xml });
-      }
+    s.on('collaborator_block_create_event', ({ blockId, xml }: { blockId: string; xml: string }) => {
+      useCollaborationStore.getState().pushPendingBlockCreate({ blockId, xml });
     });
 
     s.on('file_updated', ({ fileId, content }: { fileId: string; content: string }) => {
@@ -448,10 +429,10 @@ export function useProjectSocket(projectId: string | undefined) {
     }
   }, [projectId]);
 
-  const emitBlockCreateEvent = useCallback((blockId: string, fileId: string, xml: string) => {
+  const emitBlockCreateEvent = useCallback((blockId: string, xml: string) => {
     const s = globalSocket;
     if (s?.connected && projectId) {
-      s.emit('block_create_event', { projectId, fileId, blockId, xml });
+      s.emit('block_create_event', { projectId, blockId, xml });
     }
   }, [projectId]);
 

server/src/services/realtime.ts

@@ -506,12 +506,11 @@ export function initRealtime(httpServer: HttpServer): Server {
       });
     });
 
-    socket.on('block_create_event', (data: { projectId: string; fileId: string; blockId: string; xml: string }) => {
+    socket.on('block_create_event', (data: { projectId: string; blockId: string; xml: string }) => {
       const session = sessions.get(socket.id);
       if (!session) return;
       socket.to(`project:${data.projectId}`).emit('collaborator_block_create_event', {
         userId: session.userId,
-        fileId: data.fileId,
         blockId: data.blockId,
         xml: data.xml,
       });