Fix input duplication bug

project/src/blocks/text.js

@@ -130,18 +130,19 @@ Blockly.Extensions.registerMutator(
         // Check if we need to find existing reference blocks in the workspace
         // This happens after deserialization when the blocks exist but aren't tracked
         if (this.inputRefBlocks_.size === 0 && this.inputNames_ && this.inputNames_.length > 0) {
-          const allBlocks = this.workspace.getAllBlocks(false);
           for (let i = 0; i < this.inputNames_.length; i++) {
             const name = this.inputNames_[i];
-            const blockType = `input_reference_${name}`;
-            // Find orphaned reference blocks that belong to this block
-            const refBlock = allBlocks.find(b =>
-              b.type === blockType &&
-              b._ownerBlockId === this.id &&
-              !b.getParent()
-            );
-            if (refBlock) {
-              this.inputRefBlocks_.set(name, refBlock);
+            const input = this.getInput('X' + i);
+            
+            // Check if there's already a connected block in this input
+            if (input && input.connection && input.connection.targetBlock()) {
+              const connectedBlock = input.connection.targetBlock();
+              const expectedType = `input_reference_${name}`;
+              
+              // If this is the expected reference block, track it
+              if (connectedBlock.type === expectedType && connectedBlock._ownerBlockId === this.id) {
+                this.inputRefBlocks_.set(name, connectedBlock);
+              }
             }
           }
         }
@@ -309,8 +310,16 @@ Blockly.Extensions.registerMutator(
           this.moveInputBefore('X' + j, 'BODY');
 
           const blockType = createInputRefBlockType(name);
-          if (!existingRefBlock) {
-            // Only create a new reference block if none exists
+          
+          // Check if there's already a block connected to this input
+          const currentlyConnected = input.connection ? input.connection.targetBlock() : null;
+          
+          if (currentlyConnected && currentlyConnected.type === blockType) {
+            // There's already the correct reference block connected, just track it
+            currentlyConnected._ownerBlockId = this.id;
+            this.inputRefBlocks_.set(name, currentlyConnected);
+          } else if (!existingRefBlock) {
+            // Only create a new reference block if none exists and nothing is connected
             const refBlock = this.workspace.newBlock(blockType);
             refBlock.initSvg();
             refBlock.setDeletable(false);

project/src/index.js

@@ -784,39 +784,51 @@ const updateChatCode = () => {
 try {
   load(ws);
 
-  // After loading, create the reference blocks that should be in the inputs
+  // After loading, ensure reference blocks are properly connected and tracked
   setTimeout(() => {
     const mutatorBlocks = ws.getAllBlocks(false).filter(b =>
       (b.type === 'create_mcp' || b.type === 'func_def')
     );
 
     for (const block of mutatorBlocks) {
+      // Initialize the reference block map if needed
+      if (!block.inputRefBlocks_) {
+        block.inputRefBlocks_ = new Map();
+      }
+      
       // Create reference blocks for each input if they don't exist
       if (block.inputNames_ && block.inputNames_.length > 0) {
         for (let i = 0; i < block.inputNames_.length; i++) {
           const name = block.inputNames_[i];
           const input = block.getInput('X' + i);
 
-          // Only create if input exists AND has no connected block yet
-          if (input && input.connection && !input.connection.targetBlock()) {
-            // Create the reference block
-            const blockType = `input_reference_${name}`;
-            const refBlock = ws.newBlock(blockType);
-            refBlock.initSvg();
-            refBlock.setDeletable(false);
-            refBlock._ownerBlockId = block.id;
-            refBlock.render();
-
-            // Connect it
-            if (input.connection && refBlock.outputConnection) {
-              input.connection.connect(refBlock.outputConnection);
-            }
+          if (input && input.connection) {
+            const connectedBlock = input.connection.targetBlock();
+            const expectedType = `input_reference_${name}`;
+            
+            // If there's already the correct block connected, just track it
+            if (connectedBlock && connectedBlock.type === expectedType) {
+              connectedBlock._ownerBlockId = block.id;
+              connectedBlock.setDeletable(false);
+              block.inputRefBlocks_.set(name, connectedBlock);
+            } 
+            // Only create if input exists AND has no connected block yet
+            else if (!connectedBlock) {
+              // Create the reference block
+              const refBlock = ws.newBlock(expectedType);
+              refBlock.initSvg();
+              refBlock.setDeletable(false);
+              refBlock._ownerBlockId = block.id;
+              refBlock.render();
+
+              // Connect it
+              if (refBlock.outputConnection) {
+                input.connection.connect(refBlock.outputConnection);
+              }
 
-            // Track it
-            if (!block.inputRefBlocks_) {
-              block.inputRefBlocks_ = new Map();
+              // Track it
+              block.inputRefBlocks_.set(name, refBlock);
             }
-            block.inputRefBlocks_.set(name, refBlock);
           }
         }
       }