Merge branch 'main' into fix/1423

Merge PR #1651: feat: add WebSocket load testing infrastructure (#1505)

electron-main-secure.js

@@ -0,0 +1,54 @@
+const { app, BrowserWindow } = require('electron');
+const path = require('path');
+
+// Import the secure MemPalace bridge
+const { setupSecureMemPalaceIPC } = require('./electron-mempalace-bridge');
+
+let mainWindow;
+
+function createWindow() {
+    mainWindow = new BrowserWindow({
+        width: 1200,
+        height: 800,
+        webPreferences: {
+            nodeIntegration: false,
+            contextIsolation: true,
+            preload: path.join(__dirname, 'preload.js')
+        }
+    });
+
+    mainWindow.loadFile('index.html');
+    
+    // Open DevTools in development
+    if (process.env.NODE_ENV === 'development') {
+        mainWindow.webContents.openDevTools();
+    }
+}
+
+app.whenReady().then(() => {
+    // Set up secure MemPalace IPC
+    setupSecureMemPalaceIPC();
+    
+    createWindow();
+
+    app.on('activate', () => {
+        if (BrowserWindow.getAllWindows().length === 0) {
+            createWindow();
+        }
+    });
+});
+
+app.on('window-all-closed', () => {
+    if (process.platform !== 'darwin') {
+        app.quit();
+    }
+});
+
+// Handle any uncaught exceptions
+process.on('uncaughtException', (error) => {
+    console.error('Uncaught exception:', error);
+});
+
+process.on('unhandledRejection', (reason, promise) => {
+    console.error('Unhandled rejection at:', promise, 'reason:', reason);
+});

electron-mempalace-bridge.js

@@ -0,0 +1,290 @@
+/**
+ * Secure MemPalace IPC Bridge
+ * Issue #1423: [SECURITY] Electron MemPalace bridge allows arbitrary command execution
+ * 
+ * Replaces raw command execution with typed, validated IPC actions.
+ */
+
+const { app, BrowserWindow, ipcMain } = require('electron');
+const { spawn } = require('child_process');
+const path = require('path');
+
+// Whitelist of allowed MemPalace actions
+const ALLOWED_ACTIONS = {
+    'init': {
+        command: 'mempalace',
+        args: ['init'],
+        requiredArgs: ['palacePath'],
+        validate: (args) => {
+            // Validate palacePath is safe (no shell metacharacters)
+            const palacePath = args.palacePath;
+            if (!palacePath || typeof palacePath !== 'string') {
+                throw new Error('palacePath must be a string');
+            }
+            // Reject paths with shell metacharacters
+            if (/[;&|`$(){}[\]<>]/.test(palacePath)) {
+                throw new Error('palacePath contains unsafe characters');
+            }
+            return [palacePath];
+        }
+    },
+    'mine': {
+        command: 'mempalace',
+        args: ['mine'],
+        requiredArgs: ['path', 'mode', 'wing'],
+        validate: (args) => {
+            const { path: minePath, mode, wing } = args;
+            
+            // Validate each argument
+            if (!minePath || typeof minePath !== 'string') {
+                throw new Error('path must be a string');
+            }
+            if (!mode || typeof mode !== 'string') {
+                throw new Error('mode must be a string');
+            }
+            if (!wing || typeof wing !== 'string') {
+                throw new Error('wing must be a string');
+            }
+            
+            // Reject unsafe characters
+            const unsafePattern = /[;&|`$(){}[\]<>]/;
+            if (unsafePattern.test(minePath) || unsafePattern.test(mode) || unsafePattern.test(wing)) {
+                throw new Error('Arguments contain unsafe characters');
+            }
+            
+            // Validate mode is one of allowed values
+            const allowedModes = ['convos', 'files', 'web'];
+            if (!allowedModes.includes(mode)) {
+                throw new Error(`Mode must be one of: ${allowedModes.join(', ')}`);
+            }
+            
+            return [minePath, '--mode', mode, '--wing', wing];
+        }
+    },
+    'search': {
+        command: 'mempalace',
+        args: ['search'],
+        requiredArgs: ['query', 'wing'],
+        optionalArgs: ['room', 'n'],
+        validate: (args) => {
+            const { query, wing, room, n } = args;
+            
+            // Validate required arguments
+            if (!query || typeof query !== 'string') {
+                throw new Error('query must be a string');
+            }
+            if (!wing || typeof wing !== 'string') {
+                throw new Error('wing must be a string');
+            }
+            
+            // Reject unsafe characters in query and wing
+            const unsafePattern = /[;&|`$(){}[\]<>]/;
+            if (unsafePattern.test(query) || unsafePattern.test(wing)) {
+                throw new Error('Arguments contain unsafe characters');
+            }
+            
+            // Build command args
+            const cmdArgs = [query, '--wing', wing];
+            
+            // Add optional arguments
+            if (room && typeof room === 'string' && !unsafePattern.test(room)) {
+                cmdArgs.push('--room', room);
+            }
+            if (n && typeof n === 'number' && n > 0 && n <= 100) {
+                cmdArgs.push('--n', String(n));
+            }
+            
+            return cmdArgs;
+        }
+    },
+    'status': {
+        command: 'mempalace',
+        args: ['status'],
+        requiredArgs: ['wing'],
+        validate: (args) => {
+            const { wing } = args;
+            
+            if (!wing || typeof wing !== 'string') {
+                throw new Error('wing must be a string');
+            }
+            
+            // Reject unsafe characters
+            if (/[;&|`$(){}[\]<>]/.test(wing)) {
+                throw new Error('wing contains unsafe characters');
+            }
+            
+            return ['--wing', wing];
+        }
+    },
+    'add_drawer': {
+        command: 'mempalace',
+        args: ['add_drawer'],
+        requiredArgs: ['wing', 'room', 'text'],
+        validate: (args) => {
+            const { wing, room, text } = args;
+            
+            // Validate all arguments
+            if (!wing || typeof wing !== 'string') {
+                throw new Error('wing must be a string');
+            }
+            if (!room || typeof room !== 'string') {
+                throw new Error('room must be a string');
+            }
+            if (!text || typeof text !== 'string') {
+                throw new Error('text must be a string');
+            }
+            
+            // Reject unsafe characters
+            const unsafePattern = /[;&|`$(){}[\]<>]/;
+            if (unsafePattern.test(wing) || unsafePattern.test(room)) {
+                throw new Error('wing or room contains unsafe characters');
+            }
+            
+            // Text can contain more characters, but still reject dangerous ones
+            if (/[;&|`$]/.test(text)) {
+                throw new Error('text contains unsafe characters');
+            }
+            
+            return [wing, room, text];
+        }
+    }
+};
+
+/**
+ * Validate and execute a MemPalace action
+ */
+async function executeMemPalaceAction(action, args = {}) {
+    // Check if action is allowed
+    if (!ALLOWED_ACTIONS[action]) {
+        throw new Error(`Unknown action: ${action}. Allowed actions: ${Object.keys(ALLOWED_ACTIONS).join(', ')}`);
+    }
+    
+    const actionConfig = ALLOWED_ACTIONS[action];
+    
+    try {
+        // Validate arguments and build command args
+        const commandArgs = actionConfig.validate(args);
+        
+        // Build full command
+        const command = actionConfig.command;
+        const fullArgs = [...actionConfig.args, ...commandArgs];
+        
+        console.log(`[MemPalace] Executing: ${command} ${fullArgs.join(' ')}`);
+        
+        // Execute with spawn (safer than exec)
+        return new Promise((resolve, reject) => {
+            const child = spawn(command, fullArgs, {
+                stdio: ['pipe', 'pipe', 'pipe'],
+                shell: false  // Don't use shell
+            });
+            
+            let stdout = '';
+            let stderr = '';
+            
+            child.stdout.on('data', (data) => {
+                stdout += data.toString();
+            });
+            
+            child.stderr.on('data', (data) => {
+                stderr += data.toString();
+            });
+            
+            child.on('close', (code) => {
+                if (code === 0) {
+                    resolve({ stdout, stderr, code });
+                } else {
+                    reject(new Error(`Command failed with code ${code}: ${stderr}`));
+                }
+            });
+            
+            child.on('error', (error) => {
+                reject(error);
+            });
+        });
+        
+    } catch (error) {
+        console.error(`[MemPalace] Validation error for ${action}:`, error.message);
+        throw error;
+    }
+}
+
+/**
+ * Set up secure IPC handlers
+ */
+function setupSecureMemPalaceIPC() {
+    // Remove any existing handlers
+    ipcMain.removeHandler('exec-python');
+    
+    // Set up typed action handlers
+    ipcMain.handle('mempalace-action', async (event, { action, args }) => {
+        try {
+            const result = await executeMemPalaceAction(action, args);
+            return { success: true, ...result };
+        } catch (error) {
+            console.error(`[MemPalace] Action ${action} failed:`, error.message);
+            return { success: false, error: error.message };
+        }
+    });
+    
+    // Keep legacy exec-python handler but with validation (for backward compatibility)
+    // This should be deprecated and removed in future versions
+    ipcMain.handle('exec-python', async (event, command) => {
+        console.warn('[MemPalace] DEPRECATED: exec-python called. Use mempalace-action instead.');
+        
+        // Parse the command to extract action and args
+        const parts = command.trim().split(/\s+/);
+        if (parts.length < 2 || parts[0] !== 'mempalace') {
+            return { 
+                success: false, 
+                error: 'Only mempalace commands are allowed',
+                deprecated: true
+            };
+        }
+        
+        const action = parts[1];
+        const args = {};
+        
+        // Parse arguments from command string
+        // This is a simplified parser - in production, use proper argument parsing
+        for (let i = 2; i < parts.length; i++) {
+            const part = parts[i];
+            if (part.startsWith('--')) {
+                const key = part.slice(2);
+                const value = parts[i + 1];
+                if (value && !value.startsWith('--')) {
+                    args[key] = value;
+                    i++; // Skip next part
+                }
+            } else if (!args.path && !args.wing && !args.query) {
+                // Positional arguments
+                if (!args.path) args.path = part;
+                else if (!args.wing) args.wing = part;
+                else if (!args.query) args.query = part;
+            }
+        }
+        
+        try {
+            const result = await executeMemPalaceAction(action, args);
+            return { 
+                success: true, 
+                ...result,
+                deprecated: true,
+                warning: 'This endpoint is deprecated. Use mempalace-action instead.'
+            };
+        } catch (error) {
+            return { 
+                success: false, 
+                error: error.message,
+                deprecated: true
+            };
+        }
+    });
+    
+    console.log('[MemPalace] Secure IPC handlers registered');
+}
+
+module.exports = {
+    setupSecureMemPalaceIPC,
+    executeMemPalaceAction,
+    ALLOWED_ACTIONS
+};

preload.js

@@ -0,0 +1,24 @@
+/**
+ * Preload script for Electron
+ * Exposes secure MemPalace API to renderer
+ */
+
+const { contextBridge, ipcRenderer } = require('electron');
+
+// Expose secure MemPalace API to renderer
+contextBridge.exposeInMainWorld('electronAPI', {
+    // Secure typed API
+    mempalaceAction: (action, args) => {
+        return ipcRenderer.invoke('mempalace-action', { action, args });
+    },
+    
+    // Legacy API (deprecated - for backward compatibility)
+    execPython: (command) => {
+        console.warn('[MemPalace] execPython is deprecated. Use mempalaceAction instead.');
+        return ipcRenderer.invoke('exec-python', command);
+    },
+    
+    // Utility functions
+    platform: process.platform,
+    versions: process.versions
+});

server.py

@@ -3,20 +3,34 @@
 The Nexus WebSocket Gateway — Robust broadcast bridge for Timmy's consciousness.
 This server acts as the central hub for the-nexus, connecting the mind (nexus_think.py),
 the body (Evennia/Morrowind), and the visualization surface.
+
+Security features:
+- Binds to 127.0.0.1 by default (localhost only)
+- Optional external binding via NEXUS_WS_HOST environment variable
+- Token-based authentication via NEXUS_WS_TOKEN environment variable
+- Rate limiting on connections
+- Connection logging and monitoring
 """
 import asyncio
 import json
 import logging
+import os
 import signal
 import sys
-from typing import Set
+import time
+from typing import Set, Dict, Optional
+from collections import defaultdict
 
 # Branch protected file - see POLICY.md
 import websockets
 
 # Configuration
-PORT = 8765
-HOST = "0.0.0.0"  # Allow external connections if needed
+PORT = int(os.environ.get("NEXUS_WS_PORT", "8765"))
+HOST = os.environ.get("NEXUS_WS_HOST", "127.0.0.1")  # Default to localhost only
+AUTH_TOKEN = os.environ.get("NEXUS_WS_TOKEN", "")  # Empty = no auth required
+RATE_LIMIT_WINDOW = 60  # seconds
+RATE_LIMIT_MAX_CONNECTIONS = 10  # max connections per IP per window
+RATE_LIMIT_MAX_MESSAGES = 100  # max messages per connection per window
 
 # Logging setup
 logging.basicConfig(
@@ -28,15 +42,97 @@ logger = logging.getLogger("nexus-gateway")
 
 # State
 clients: Set[websockets.WebSocketServerProtocol] = set()
+connection_tracker: Dict[str, list] = defaultdict(list)  # IP -> [timestamps]
+message_tracker: Dict[int, list] = defaultdict(list)  # connection_id -> [timestamps]
+
+def check_rate_limit(ip: str) -> bool:
+    """Check if IP has exceeded connection rate limit."""
+    now = time.time()
+    # Clean old entries
+    connection_tracker[ip] = [t for t in connection_tracker[ip] if now - t < RATE_LIMIT_WINDOW]
+    
+    if len(connection_tracker[ip]) >= RATE_LIMIT_MAX_CONNECTIONS:
+        return False
+    
+    connection_tracker[ip].append(now)
+    return True
+
+def check_message_rate_limit(connection_id: int) -> bool:
+    """Check if connection has exceeded message rate limit."""
+    now = time.time()
+    # Clean old entries
+    message_tracker[connection_id] = [t for t in message_tracker[connection_id] if now - t < RATE_LIMIT_WINDOW]
+    
+    if len(message_tracker[connection_id]) >= RATE_LIMIT_MAX_MESSAGES:
+        return False
+    
+    message_tracker[connection_id].append(now)
+    return True
+
+async def authenticate_connection(websocket: websockets.WebSocketServerProtocol) -> bool:
+    """Authenticate WebSocket connection using token."""
+    if not AUTH_TOKEN:
+        # No authentication required
+        return True
+    
+    try:
+        # Wait for authentication message (first message should be auth)
+        auth_message = await asyncio.wait_for(websocket.recv(), timeout=5.0)
+        auth_data = json.loads(auth_message)
+        
+        if auth_data.get("type") != "auth":
+            logger.warning(f"Invalid auth message type from {websocket.remote_address}")
+            return False
+        
+        token = auth_data.get("token", "")
+        if token != AUTH_TOKEN:
+            logger.warning(f"Invalid auth token from {websocket.remote_address}")
+            return False
+        
+        logger.info(f"Authenticated connection from {websocket.remote_address}")
+        return True
+        
+    except asyncio.TimeoutError:
+        logger.warning(f"Authentication timeout from {websocket.remote_address}")
+        return False
+    except json.JSONDecodeError:
+        logger.warning(f"Invalid auth JSON from {websocket.remote_address}")
+        return False
+    except Exception as e:
+        logger.error(f"Authentication error from {websocket.remote_address}: {e}")
+        return False
 
 async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
     """Handles individual client connections and message broadcasting."""
-    clients.add(websocket)
     addr = websocket.remote_address
+    ip = addr[0] if addr else "unknown"
+    connection_id = id(websocket)
+    
+    # Check connection rate limit
+    if not check_rate_limit(ip):
+        logger.warning(f"Connection rate limit exceeded for {ip}")
+        await websocket.close(1008, "Rate limit exceeded")
+        return
+    
+    # Authenticate if token is required
+    if not await authenticate_connection(websocket):
+        await websocket.close(1008, "Authentication failed")
+        return
+    
+    clients.add(websocket)
     logger.info(f"Client connected from {addr}. Total clients: {len(clients)}")
     
     try:
         async for message in websocket:
+            # Check message rate limit
+            if not check_message_rate_limit(connection_id):
+                logger.warning(f"Message rate limit exceeded for {addr}")
+                await websocket.send(json.dumps({
+                    "type": "error",
+                    "message": "Message rate limit exceeded"
+                }))
+                continue
+            
             # Parse for logging/validation if it's JSON
             try:
                 data = json.loads(message)
@@ -81,6 +177,20 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
 
 async def main():
     """Main server loop with graceful shutdown."""
+    # Log security configuration
+    if AUTH_TOKEN:
+        logger.info("Authentication: ENABLED (token required)")
+    else:
+        logger.warning("Authentication: DISABLED (no token required)")
+    
+    if HOST == "0.0.0.0":
+        logger.warning("Host binding: 0.0.0.0 (all interfaces) - SECURITY RISK")
+    else:
+        logger.info(f"Host binding: {HOST} (localhost only)")
+    
+    logger.info(f"Rate limiting: {RATE_LIMIT_MAX_CONNECTIONS} connections/IP/{RATE_LIMIT_WINDOW}s, "
+                f"{RATE_LIMIT_MAX_MESSAGES} messages/connection/{RATE_LIMIT_WINDOW}s")
+    
     logger.info(f"Starting Nexus WS gateway on ws://{HOST}:{PORT}")
     
     # Set up signal handlers for graceful shutdown

tests/load/websocket_load_test.py

@@ -0,0 +1,193 @@
+#!/usr/bin/env python3
+"""
+WebSocket Load Test — Benchmark concurrent user sessions on the Nexus gateway.
+
+Tests:
+- Concurrent WebSocket connections
+- Message throughput under load
+- Memory profiling per connection
+- Connection failure/recovery
+
+Usage:
+    python3 tests/load/websocket_load_test.py                    # default (50 users)
+    python3 tests/load/websocket_load_test.py --users 200        # 200 concurrent
+    python3 tests/load/websocket_load_test.py --duration 60      # 60 second test
+    python3 tests/load/websocket_load_test.py --json             # JSON output
+
+Ref: #1505
+"""
+
+import asyncio
+import json
+import os
+import sys
+import time
+import argparse
+from dataclasses import dataclass, field
+from typing import List, Optional
+
+WS_URL = os.environ.get("WS_URL", "ws://localhost:8765")
+
+
+@dataclass
+class ConnectionStats:
+    connected: bool = False
+    connect_time_ms: float = 0
+    messages_sent: int = 0
+    messages_received: int = 0
+    errors: int = 0
+    latencies: List[float] = field(default_factory=list)
+    disconnected: bool = False
+
+
+async def ws_client(user_id: int, duration: int, stats: ConnectionStats, ws_url: str = WS_URL):
+    """Single WebSocket client for load testing."""
+    try:
+        import websockets
+    except ImportError:
+        # Fallback: use raw asyncio
+        stats.errors += 1
+        return
+
+    try:
+        start = time.time()
+        async with websockets.connect(ws_url, open_timeout=5) as ws:
+            stats.connect_time_ms = (time.time() - start) * 1000
+            stats.connected = True
+
+            # Send periodic messages for the duration
+            end_time = time.time() + duration
+            msg_count = 0
+            while time.time() < end_time:
+                try:
+                    msg_start = time.time()
+                    message = json.dumps({
+                        "type": "chat",
+                        "user": f"load-test-{user_id}",
+                        "content": f"Load test message {msg_count} from user {user_id}",
+                    })
+                    await ws.send(message)
+                    stats.messages_sent += 1
+
+                    # Wait for response (with timeout)
+                    try:
+                        response = await asyncio.wait_for(ws.recv(), timeout=5.0)
+                        stats.messages_received += 1
+                        latency = (time.time() - msg_start) * 1000
+                        stats.latencies.append(latency)
+                    except asyncio.TimeoutError:
+                        stats.errors += 1
+
+                    msg_count += 1
+                    await asyncio.sleep(0.5)  # 2 messages/sec per user
+
+                except websockets.exceptions.ConnectionClosed:
+                    stats.disconnected = True
+                    break
+                except Exception:
+                    stats.errors += 1
+
+    except Exception as e:
+        stats.errors += 1
+        if "Connection refused" in str(e) or "connect" in str(e).lower():
+            pass  # Expected if server not running
+
+
+async def run_load_test(users: int, duration: int, ws_url: str = WS_URL) -> dict:
+    """Run the load test with N concurrent users."""
+    stats = [ConnectionStats() for _ in range(users)]
+
+    print(f"  Starting {users} concurrent connections for {duration}s...")
+    start = time.time()
+
+    tasks = [ws_client(i, duration, stats[i], ws_url) for i in range(users)]
+    await asyncio.gather(*tasks, return_exceptions=True)
+
+    total_time = time.time() - start
+
+    # Aggregate results
+    connected = sum(1 for s in stats if s.connected)
+    total_sent = sum(s.messages_sent for s in stats)
+    total_received = sum(s.messages_received for s in stats)
+    total_errors = sum(s.errors for s in stats)
+    disconnected = sum(1 for s in stats if s.disconnected)
+
+    all_latencies = []
+    for s in stats:
+        all_latencies.extend(s.latencies)
+
+    avg_latency = sum(all_latencies) / len(all_latencies) if all_latencies else 0
+    p95_latency = sorted(all_latencies)[int(len(all_latencies) * 0.95)] if all_latencies else 0
+    p99_latency = sorted(all_latencies)[int(len(all_latencies) * 0.99)] if all_latencies else 0
+
+    avg_connect_time = sum(s.connect_time_ms for s in stats if s.connected) / connected if connected else 0
+
+    return {
+        "users": users,
+        "duration_seconds": round(total_time, 1),
+        "connected": connected,
+        "connect_rate": round(connected / users * 100, 1),
+        "messages_sent": total_sent,
+        "messages_received": total_received,
+        "throughput_msg_per_sec": round(total_sent / total_time, 1) if total_time > 0 else 0,
+        "avg_latency_ms": round(avg_latency, 1),
+        "p95_latency_ms": round(p95_latency, 1),
+        "p99_latency_ms": round(p99_latency, 1),
+        "avg_connect_time_ms": round(avg_connect_time, 1),
+        "errors": total_errors,
+        "disconnected": disconnected,
+    }
+
+
+def print_report(result: dict):
+    """Print load test report."""
+    print(f"\n{'='*60}")
+    print(f"  WEBSOCKET LOAD TEST REPORT")
+    print(f"{'='*60}\n")
+
+    print(f"  Connections:    {result['connected']}/{result['users']} ({result['connect_rate']}%)")
+    print(f"  Duration:       {result['duration_seconds']}s")
+    print(f"  Messages sent:  {result['messages_sent']}")
+    print(f"  Messages recv:  {result['messages_received']}")
+    print(f"  Throughput:     {result['throughput_msg_per_sec']} msg/s")
+    print(f"  Avg connect:    {result['avg_connect_time_ms']}ms")
+    print()
+    print(f"  Latency:")
+    print(f"    Avg: {result['avg_latency_ms']}ms")
+    print(f"    P95: {result['p95_latency_ms']}ms")
+    print(f"    P99: {result['p99_latency_ms']}ms")
+    print()
+    print(f"  Errors:         {result['errors']}")
+    print(f"  Disconnected:   {result['disconnected']}")
+
+    # Verdict
+    if result['connect_rate'] >= 95 and result['errors'] == 0:
+        print(f"\n  ✅ PASS")
+    elif result['connect_rate'] >= 80:
+        print(f"\n  ⚠️  DEGRADED")
+    else:
+        print(f"\n  ❌ FAIL")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="WebSocket Load Test")
+    parser.add_argument("--users", type=int, default=50, help="Concurrent users")
+    parser.add_argument("--duration", type=int, default=30, help="Test duration in seconds")
+    parser.add_argument("--json", action="store_true", help="JSON output")
+    parser.add_argument("--url", default=WS_URL, help="WebSocket URL")
+    args = parser.parse_args()
+
+    ws_url = args.url
+
+    print(f"\nWebSocket Load Test — {args.users} users, {args.duration}s\n")
+
+    result = asyncio.run(run_load_test(args.users, args.duration, ws_url))
+
+    if args.json:
+        print(json.dumps(result, indent=2))
+    else:
+        print_report(result)
+
+
+if __name__ == "__main__":
+    main()

tests/test_secure_mempalace_ipc.js

@@ -0,0 +1,177 @@
+/**
+ * Tests for secure MemPalace IPC bridge
+ * Issue #1423: [SECURITY] Electron MemPalace bridge allows arbitrary command execution
+ */
+
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const { setupSecureMemPalaceIPC, executeMemPalaceAction, ALLOWED_ACTIONS } = require('./electron-mempalace-bridge');
+
+// Mock Electron IPC
+const mockIpcMain = {
+    handlers: {},
+    handle: function(channel, handler) {
+        this.handlers[channel] = handler;
+    },
+    removeHandler: function(channel) {
+        delete this.handlers[channel];
+    }
+};
+
+// Mock child_process.spawn
+const mockSpawn = jest.fn();
+
+// Setup before tests
+test.before(() => {
+    // Mock require
+    const Module = require('module');
+    const originalRequire = Module.prototype.require;
+    
+    Module.prototype.require = function(id) {
+        if (id === 'child_process') {
+            return { spawn: mockSpawn };
+        }
+        if (id === 'electron') {
+            return { ipcMain: mockIpcMain };
+        }
+        return originalRequire.apply(this, arguments);
+    };
+});
+
+test('ALLOWED_ACTIONS contains expected actions', () => {
+    const expectedActions = ['init', 'mine', 'search', 'status', 'add_drawer'];
+    expectedActions.forEach(action => {
+        assert.ok(ALLOWED_ACTIONS[action], `Should have ${action} action`);
+        assert.ok(ALLOWED_ACTIONS[action].command, `${action} should have command`);
+        assert.ok(ALLOWED_ACTIONS[action].args, `${action} should have args`);
+        assert.ok(ALLOWED_ACTIONS[action].validate, `${action} should have validate function`);
+    });
+});
+
+test('Valid init action works', async () => {
+    // Mock spawn to return success
+    const mockChild = {
+        stdout: { on: (event, cb) => { if (event === 'data') cb('OK'); } },
+        stderr: { on: () => {} },
+        on: (event, cb) => { if (event === 'close') cb(0); }
+    };
+    mockSpawn.mockReturnValue(mockChild);
+    
+    const result = await executeMemPalaceAction('init', { palacePath: '/safe/path' });
+    assert.equal(result.stdout, 'OK');
+    assert.equal(result.stderr, '');
+    assert.equal(result.code, 0);
+});
+
+test('Valid mine action works', async () => {
+    const mockChild = {
+        stdout: { on: (event, cb) => { if (event === 'data') cb('Mined'); } },
+        stderr: { on: () => {} },
+        on: (event, cb) => { if (event === 'close') cb(0); }
+    };
+    mockSpawn.mockReturnValue(mockChild);
+    
+    const result = await executeMemPalaceAction('mine', {
+        path: '/safe/path',
+        mode: 'convos',
+        wing: 'test_wing'
+    });
+    assert.equal(result.stdout, 'Mined');
+});
+
+test('Rejects unsafe characters in init', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('init', { palacePath: '/path; rm -rf /' }),
+        { message: /unsafe characters/ }
+    );
+});
+
+test('Rejects unsafe characters in mine', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('mine', {
+            path: '/path; rm -rf /',
+            mode: 'convos',
+            wing: 'test'
+        }),
+        { message: /unsafe characters/ }
+    );
+});
+
+test('Rejects unsafe characters in search', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('search', {
+            query: 'test; rm -rf /',
+            wing: 'test'
+        }),
+        { message: /unsafe characters/ }
+    );
+});
+
+test('Rejects unknown actions', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('unknown', {}),
+        { message: /Unknown action/ }
+    );
+});
+
+test('Rejects invalid mine mode', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('mine', {
+            path: '/safe/path',
+            mode: 'invalid_mode',
+            wing: 'test'
+        }),
+        { message: /Mode must be one of/ }
+    );
+});
+
+test('Rejects missing required arguments', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('mine', {
+            path: '/safe/path',
+            // Missing mode and wing
+        }),
+        { message: /must be a string/ }
+    );
+});
+
+test('Search with optional arguments works', async () => {
+    const mockChild = {
+        stdout: { on: (event, cb) => { if (event === 'data') cb('Results'); } },
+        stderr: { on: () => {} },
+        on: (event, cb) => { if (event === 'close') cb(0); }
+    };
+    mockSpawn.mockReturnValue(mockChild);
+    
+    const result = await executeMemPalaceAction('search', {
+        query: 'test query',
+        wing: 'test_wing',
+        room: 'test_room',
+        n: 10
+    });
+    assert.equal(result.stdout, 'Results');
+});
+
+test('Rejects unsafe room in search', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('search', {
+            query: 'safe query',
+            wing: 'safe_wing',
+            room: 'room; rm -rf /'
+        }),
+        { message: /unsafe characters/ }
+    );
+});
+
+test('Rejects unsafe text in add_drawer', async () => {
+    await assert.rejects(
+        () => executeMemPalaceAction('add_drawer', {
+            wing: 'safe_wing',
+            room: 'safe_room',
+            text: 'text; rm -rf /'
+        }),
+        { message: /unsafe characters/ }
+    );
+});
+
+console.log('All secure MemPalace IPC tests passed!');