all the thing

FILE_STRUCTURE.md

@@ -29,18 +29,12 @@ IntegraChat/
 │   │   │   └── tool_selector.py             # Multi-tool selection logic
 │   │   └── utils/
 │   │       └── text_extractor.py            # Text extraction utilities
-│   ├── mcp_servers/
-│   │   ├── admin_server.py                  # Admin MCP server
-│   │   ├── database.py                      # Database connection utilities
-│   │   ├── embeddings.py                    # Embedding generation
-│   │   ├── main.py                          # RAG MCP server main
-│   │   ├── rag_server.py                    # RAG MCP server
-│   │   ├── web_server.py                    # Web search MCP server (English results)
-│   │   └── models/
-│   │       ├── __init__.py
-│   │       ├── admin.py                     # Admin request models
-│   │       ├── rag.py                       # RAG request models
-│   │       └── web.py                       # Web search request models
+│   ├── mcp_server/
+│   │   ├── server.py                        # Unified MCP entrypoint (rag/web/admin)
+│   │   ├── rag/                             # RAG tool handlers (search/ingest/delete)
+│   │   ├── web/                             # Web search tool handler
+│   │   ├── admin/                           # Admin rules + violations tools
+│   │   └── common/                          # Shared tenant/logging/utils helpers
 │   ├── tests/
 │   │   ├── conftest.py                      # Pytest configuration
 │   │   ├── test_agent_orchestrator.py       # Orchestrator tests
@@ -64,9 +58,10 @@ IntegraChat/
 - **`redflag_detector.py`** - Detects policy violations
 
 ### MCP Servers
-- **`rag_server.py`** - RAG/knowledge retrieval server
-- **`web_server.py`** - Web search server (forces English results)
-- **`admin_server.py`** - Admin/governance server
+- **`backend/mcp_server/server.py`** - Unified MCP entrypoint (rag/web/admin tools)
+- **`backend/mcp_server/rag/*.py`** - RAG tool handlers (search/ingest/delete)
+- **`backend/mcp_server/web/search.py`** - DuckDuckGo handler
+- **`backend/mcp_server/admin/*.py`** - Admin rules & violations tools
 
 ### API Routes
 - **`agent.py`** - Main chat/agent endpoint

TESTING_GUIDE.md

@@ -264,17 +264,8 @@ python test_api_manual.py
 cd backend/api
 uvicorn main:app --port 8000 --reload
 
-# Terminal 2: Start RAG MCP server
-cd backend/mcp_servers
-python main.py  # or uvicorn main:app --port 8001
-
-# Terminal 3: Start Web MCP server
-cd backend/mcp_servers
-python web_server.py  # or uvicorn web_server:app --port 8002
-
-# Terminal 4: Start Admin MCP server
-cd backend/mcp_servers
-python admin_server.py  # or uvicorn admin_server:app --port 8003
+# Terminal 2: Start unified MCP server (rag/web/admin tools)
+python backend/mcp_server/server.py
 
 # Optional: Start Ollama for LLM
 ollama serve

check_rag_database.py

@@ -18,7 +18,7 @@ def check_database():
     print("="*60)
     
     try:
-        from mcp_servers.database import get_connection
+        from mcp_server.common.database import get_connection
         import psycopg2.extras
         
         conn = get_connection()
@@ -65,8 +65,8 @@ def check_database():
         
         # Test search_vectors function directly
         print("\n4. Testing search_vectors function directly...")
-        from mcp_servers.embeddings import embed_text
-        from mcp_servers.database import search_vectors
+        from mcp_server.common.embeddings import embed_text
+        from mcp_server.common.database import search_vectors
         
         # Search for tenant1's secret as tenant1
         query = "TENANT1_SECRET"

env.example

@@ -21,12 +21,16 @@ OLLAMA_MODEL=llama3.1:latest
 LLM_BACKEND=ollama
 
 # =============================================================
-# MCP SERVER URLs
+# MCP SERVER CONFIG
 # =============================================================
+# Legacy FastAPI endpoints (remove once all callers use the unified MCP server)
 RAG_MCP_URL=http://localhost:8001
 WEB_MCP_URL=http://localhost:8002
 ADMIN_MCP_URL=http://localhost:8003
 
+# Unified MCP server identifier (namespaced tools)
+MCP_SERVER_ID=integrachat
+
 # =============================================================
 # BACKEND CONFIG
 # =============================================================

start.bat

@@ -87,13 +87,31 @@ if not exist "%VENV_PYTHON%" (
     exit /b 1
 )
 
-REM Launch MCP servers in separate windows
+REM Launch unified MCP server (in its own window so you can see logs)
+if not exist "backend\mcp_server\server.py" (
+    echo ERROR: backend\mcp_server\server.py not found!
+    pause
+    exit /b 1
+)
+
+REM Configure default MCP endpoints if not provided
+if "%MCP_PORT%"=="" (
+    set "MCP_PORT=8900"
+)
+if "%RAG_MCP_URL%"=="" (
+    set "RAG_MCP_URL=http://localhost:%MCP_PORT%/rag"
+)
+if "%WEB_MCP_URL%"=="" (
+    set "WEB_MCP_URL=http://localhost:%MCP_PORT%/web"
+)
+if "%ADMIN_MCP_URL%"=="" (
+    set "ADMIN_MCP_URL=http://localhost:%MCP_PORT%/admin"
+)
 echo.
-echo Launching MCP servers in separate windows...
-start "RAG MCP (8001)" "%VENV_PYTHON%" -m uvicorn backend.mcp_servers.main:app --host 0.0.0.0 --port 8001
-start "WEB MCP (8002)" "%VENV_PYTHON%" -m uvicorn backend.mcp_servers.web_server:web_app --host 0.0.0.0 --port 8002
-start "ADMIN MCP (8003)" "%VENV_PYTHON%" -m uvicorn backend.mcp_servers.admin_server:admin_app --host 0.0.0.0 --port 8003
-echo MCP servers started. Close their windows or press Ctrl+C inside them to stop.
+echo Launching unified MCP server (rag/web/admin)...
+start "Unified MCP" cmd /k ""%VENV_PYTHON%" -m backend.mcp_server.server"
+timeout /t 2 >nul
+echo Unified MCP server window opened (titled 'Unified MCP'). Close it manually to stop the MCP server.
 echo.
 
 REM Start the FastAPI server

verify_tenant_isolation.py

@@ -319,7 +319,7 @@ def verify_rag_isolation():
     except requests.exceptions.ConnectionError:
         print("\n⚠️ Cannot connect to API/RAG server. Make sure they're running:")
         print("   uvicorn backend.api.main:app --port 8000")
-        print("   python -m backend.mcp_servers.rag_server")
+        print("   python backend/mcp_server/server.py")
         return None
     except Exception as e:
         print(f"\n❌ Error: {e}")
@@ -435,7 +435,7 @@ def main():
     if total == 0:
         print("\n⚠️ No tests could run. Make sure services are running:")
         print("   - API: uvicorn backend.api.main:app --port 8000")
-        print("   - RAG Server: python -m backend.mcp_servers.rag_server")
+        print("   - MCP Server: python backend/mcp_server/server.py")
     elif failed == 0 and passed > 0:
         print("\n✅ All tenant isolation tests PASSED!")
     elif failed > 0: