Skip to content

Codebase intelligence for AI and humans: code health scores, auto-generated docs, git analytics, dead code detection, and architectural decisions via MCP.

fix(server): route MCP tool updates to workspace repo DB (#2241)

Selene29455ec97ea6d5
diff --git a/packages/server/src/repowise/server/routers/mcp.py b/packages/server/src/repowise/server/routers/mcp.py
index f03100c91..ce81083b9 100644
--- a/packages/server/src/repowise/server/routers/mcp.py
+++ b/packages/server/src/repowise/server/routers/mcp.py
@@ -14,7 +14,7 @@ from fastapi import APIRouter, Depends, HTTPException, Request
from repowise.core.persistence import crud
from repowise.core.persistence.database import get_session
from repowise.server import mcp_server as _mcp_server
-from repowise.server.deps import resolve_request_session_factory, verify_api_key
+from repowise.server.deps import resolve_session_factory, verify_api_key
from repowise.server.mcp_server._tool_selection import (
describe_tool_surface,
set_tool_override,
@@ -41,7 +41,7 @@ async def _repo_path_for(request: Request, repo_id: str | None) -> str | None:
if not repo_id:
return None
try:
- factory = resolve_request_session_factory(request)
+ factory = resolve_session_factory(request.app.state, repo_id)
async with get_session(factory) as session:
repo = await crud.get_repository(session, repo_id)
return repo.local_path if repo else None
@@ -55,9 +55,7 @@ def _surface(repo_id: str | None, repo_path: str | None) -> McpToolSurfaceRespon
@router.get("/tools", response_model=McpToolSurfaceResponse)
-async def get_tool_surface(
- request: Request, repo_id: str | None = None
-) -> McpToolSurfaceResponse:
+async def get_tool_surface(request: Request, repo_id: str | None = None) -> McpToolSurfaceResponse:
"""Return the configurable tool surface for a repo.
Pass ``?repo_id=`` so the response reflects that repo's workspace mode and
diff --git a/tests/unit/server/test_mcp_tools_router.py b/tests/unit/server/test_mcp_tools_router.py
index d0ed6a472..ea902bc40 100644
--- a/tests/unit/server/test_mcp_tools_router.py
+++ b/tests/unit/server/test_mcp_tools_router.py
@@ -102,6 +102,61 @@ async def test_router_get_and_patch(tmp_path, monkeypatch):
assert any(t.name == "get_dependency_path" and t.enabled for t in updated.tools)
+async def test_router_patch_routes_body_repo_id_to_workspace_database(tmp_path, session_factory):
+ """A body-only repo ID must select that repo's workspace database."""
+ from fastapi import FastAPI
+ from httpx import ASGITransport, AsyncClient
+ from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+ from sqlalchemy.pool import StaticPool
+
+ from repowise.core.persistence import crud
+ from repowise.core.persistence.database import get_session, init_db
+ from repowise.server.deps import verify_api_key
+ from repowise.server.routers import mcp as mcp_router
+
+ repo_id = "workspace-repo"
+ repo_path = tmp_path / repo_id
+ (repo_path / ".repowise").mkdir(parents=True)
+
+ workspace_engine = create_async_engine(
+ "sqlite+aiosqlite:///:memory:",
+ connect_args={"check_same_thread": False},
+ poolclass=StaticPool,
+ )
+ await init_db(workspace_engine)
+ workspace_factory = async_sessionmaker(
+ workspace_engine, expire_on_commit=False, class_=AsyncSession
+ )
+ async with get_session(workspace_factory) as workspace_session:
+ await crud.upsert_repository(
+ workspace_session,
+ repo_id=repo_id,
+ name="workspace-repo",
+ local_path=str(repo_path),
+ )
+
+ app = FastAPI()
+ app.state.session_factory = session_factory
+ app.state.workspace_sessions = {repo_id: workspace_factory}
+ app.dependency_overrides[verify_api_key] = lambda: None
+ app.include_router(mcp_router.router)
+
+ try:
+ transport = ASGITransport(app=app)
+ async with AsyncClient(transport=transport, base_url="http://test") as client:
+ response = await client.patch(
+ "/api/mcp/tools",
+ json={"repo_id": repo_id, "tools": ["+get_dependency_path"]},
+ )
+
+ assert response.status_code == 200
+ assert response.json()["repo_id"] == repo_id
+ assert response.json()["override"] == ["+get_dependency_path"]
+ finally:
+ await workspace_engine.dispose()
+
+
@pytest.mark.asyncio
async def test_router_patch_unknown_repo_404(monkeypatch):
from fastapi import HTTPException