diff --git a/Makefile b/Makefile
index 7b9b0d4..afb7934 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ setup:
 		echo "Created backend/.env - add your Gemini API key!"; \
 	fi
 	@echo "Setting up frontend..."
+	cd packages/mcp-server && npm install
 	cd frontend && npm install && npm run compile
 	@echo "Setup complete!"
 
diff --git a/frontend/.gitignore b/frontend/.gitignore
index bd98881..fcfde15 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -2,6 +2,7 @@
 # Codag cache directory
 .codag-cache/
 
-# Test/dev scripts
-scripts/
+# Test/dev scripts (keep copy-wasm.js which is required for builds)
+scripts/*
+!scripts/copy-wasm.js
 _test_*.ts
diff --git a/frontend/scripts/copy-wasm.js b/frontend/scripts/copy-wasm.js
new file mode 100644
index 0000000..9d579b8
--- /dev/null
+++ b/frontend/scripts/copy-wasm.js
@@ -0,0 +1,27 @@
+const fs = require('fs');
+const path = require('path');
+
+const destDir = path.join(__dirname, '..', 'out');
+if (!fs.existsSync(destDir)) {
+  fs.mkdirSync(destDir, { recursive: true });
+}
+
+const wasmSourceDir = path.join(__dirname, '..', 'node_modules', 'tree-sitter-wasms', 'out');
+const treeSitterWasm = path.join(__dirname, '..', 'node_modules', 'web-tree-sitter', 'tree-sitter.wasm');
+
+if (fs.existsSync(treeSitterWasm)) {
+  fs.copyFileSync(treeSitterWasm, path.join(destDir, 'tree-sitter.wasm'));
+  console.log('Copied: tree-sitter.wasm');
+} else {
+  console.warn('Warning: tree-sitter.wasm not found');
+}
+
+if (fs.existsSync(wasmSourceDir)) {
+  const files = fs.readdirSync(wasmSourceDir).filter(f => f.endsWith('.wasm'));
+  for (const file of files) {
+    fs.copyFileSync(path.join(wasmSourceDir, file), path.join(destDir, file));
+    console.log(`Copied: ${file}`);
+  }
+} else {
+  console.warn('Warning: tree-sitter-wasms/out not found');
+}