✨ Feature: MCP market restructure — Repository, My MCPs, Review Center

backend/apps/remote_mcp_app.py

@@ -1,6 +1,6 @@
 import logging
 import json
-from typing import Optional
+from typing import Annotated, Optional
 
 from fastapi import APIRouter, Header, HTTPException, UploadFile, File, Form, Query, Request
 from fastapi.responses import JSONResponse, StreamingResponse
@@ -15,6 +15,7 @@
     McpValidationError,
     McpNameConflictError,
     McpPortConflictError,
+    UnauthorizedError,
 )
 from consts.model import (
     MCPConfigRequest,
@@ -24,6 +25,7 @@
     EnableMcpServiceRequest,
     DisableMcpServiceRequest,
     HealthcheckMcpServiceRequest,
+    TestMcpConnectionRequest,
     ListMcpServicesQuery,
 )
 from services.remote_mcp_service import (
@@ -35,12 +37,14 @@
     attach_mcp_container_permissions,
     get_mcp_record_by_id,
     list_mcp_service_tools_by_id,
+    refresh_mcp_service_tool_count,
     add_mcp_service,
     add_container_mcp_service,
     update_mcp_service,
     update_mcp_service_enabled,
     delete_mcp_service,
     check_mcp_service_health,
+    test_mcp_connection,
     check_container_port_conflict,
     suggest_container_port,
 )
@@ -51,14 +55,16 @@
 router = APIRouter(prefix="/mcp")
 logger = logging.getLogger("remote_mcp_app")
 
+_MCP_SERVICE_ID_DESC = Query(..., description="MCP service ID")
+
 
 # ---------------------------------------------------------------------------
 # Tools Endpoint
 # ---------------------------------------------------------------------------
 
 @router.get("/tools")
 async def get_tools_from_mcp(
-    mcp_id: int = Query(..., description="MCP service ID"),
+    mcp_id: int = _MCP_SERVICE_ID_DESC,
     authorization: Optional[str] = Header(None),
     http_request: Request = None
 ):
@@ -96,6 +102,46 @@
         )
 
 
+# ---------------------------------------------------------------------------
+# Tool Count Refresh Endpoint
+# ---------------------------------------------------------------------------
+
+@router.post("/refresh-tools")
+async def refresh_mcp_tools_endpoint(
+    mcp_id: int = _MCP_SERVICE_ID_DESC,
+    authorization: Optional[str] = Header(None),
+    http_request: Request = None
+):
+    """Connect to the MCP server, fetch tool names, and persist them to the record."""
+    try:
+        user_id, tenant_id, _ = get_current_user_info(authorization, http_request)
+        await refresh_mcp_service_tool_count(
+            tenant_id=tenant_id,
+            user_id=user_id,
+            mcp_id=mcp_id,
+        )
+        return JSONResponse(
+            status_code=HTTPStatus.OK,
+            content={"message": "Tool count refreshed", "status": "success"}
+        )
+    except McpNotFoundError as e:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail=str(e))
+    except McpValidationError as e:
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail=str(e))
+    except MCPConnectionError as e:
+        logger.exception(f"Failed to refresh tool count for mcp_id={mcp_id}")
+        raise HTTPException(
+            status_code=HTTPStatus.SERVICE_UNAVAILABLE,
+            detail="MCP connection failed"
+        )
+    except Exception as e:
+        logger.error(f"Failed to refresh MCP tool count: {e}")
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail="Failed to refresh MCP tool count"
+        )
+
+
 # ---------------------------------------------------------------------------
 # Add Endpoints
 # ---------------------------------------------------------------------------
@@ -125,6 +171,8 @@
             custom_headers=payload.custom_headers,
             container_config=payload.container_config,
             registry_json=payload.registry_json,
+            config_json=payload.config_json,
+            market_id=payload.market_id,
             enabled=payload.enabled if payload.enabled is not None else False,
         )
 
@@ -171,6 +219,8 @@
             tags=payload.tags,
             authorization_token=payload.authorization_token,
             registry_json=payload.registry_json,
+            version=payload.version,
+            market_id=payload.market_id,
             port=payload.port,
             mcp_config=payload.mcp_config,
         )
@@ -241,7 +291,9 @@
             server_url=payload.server_url,
             authorization_token=payload.authorization_token,
             custom_headers=payload.custom_headers,
+            config_json=payload.config_json,
             tags=payload.tags,
+            market_id=payload.market_id,
         )
 
         return JSONResponse(
@@ -385,6 +437,11 @@
                 "status": "success"
             }
         )
+    except UnauthorizedError as e:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail=str(e)
+        )
     except Exception as e:
         logger.error(f"Failed to get MCP list: {e}")
         raise HTTPException(
@@ -553,7 +610,7 @@
 
 @router.get("/healthcheck")
 async def check_mcp_health(
-    mcp_id: int = Query(..., description="MCP service ID"),
+    mcp_id: int = _MCP_SERVICE_ID_DESC,
     authorization: Optional[str] = Header(None),
     http_request: Request = None
 ):
@@ -589,6 +646,43 @@
         )
 
 
+# ---------------------------------------------------------------------------
+# Test Connection Endpoint
+# ---------------------------------------------------------------------------
+
+
+@router.post("/test-connection")
+async def test_mcp_connection_endpoint(
+    payload: TestMcpConnectionRequest,
+    authorization: Annotated[Optional[str], Header()] = None,
+    http_request: Request = None
+):
+    """Lightweight MCP connectivity test. Performs only the initialize handshake.
+
+    This is faster than a full health check (which calls list_tools()) and is
+    intended for pre-install validation in the Quick Add modal.
+    """
+    try:
+        get_current_user_info(authorization, http_request)
+
+        success = await test_mcp_connection(
+            server_url=payload.server_url,
+            authorization_token=payload.authorization_token,
+            custom_headers=payload.custom_headers,
+        )
+
+        return JSONResponse(
+            status_code=HTTPStatus.OK,
+            content={"success": success}
+        )
+    except Exception as e:
+        logger.exception("MCP test connection failed")
+        return JSONResponse(
+            status_code=HTTPStatus.OK,
+            content={"success": False, "error": str(e) or "Connection failed"}
+        )
+
+
 # ---------------------------------------------------------------------------
 # Port Management Endpoints
 # ---------------------------------------------------------------------------

backend/consts/mcp_market.py

@@ -0,0 +1,15 @@
+"""Domain constants for MCP marketplace listing statuses."""
+
+# Listing status: not_shared (未共享), pending_review (待审核),
+# rejected (审核驳回), shared (已共享)
+STATUS_NOT_SHARED = "not_shared"
+STATUS_PENDING_REVIEW = "pending_review"
+STATUS_REJECTED = "rejected"
+STATUS_SHARED = "shared"
+
+VALID_MARKET_STATUSES = frozenset({
+    STATUS_NOT_SHARED,
+    STATUS_PENDING_REVIEW,
+    STATUS_REJECTED,
+    STATUS_SHARED,
+})

backend/consts/model.py

@@ -1356,9 +1356,12 @@
     custom_headers: Optional[Dict[str, Any]] = Field(None, description="Custom HTTP headers as JSON object")
     container_config: Optional[Dict[str, Any]] = Field(None, description="Container configuration")
     registry_json: Optional[Dict[str, Any]] = Field(None, description="Registry metadata JSON")
+    config_json: Optional[Dict[str, Any]] = Field(None, description="MCP configuration JSON (e.g. OpenAPI spec for API-type MCP)")
+    version: Optional[str] = Field(None, description="MCP version")
+    market_id: Optional[int] = Field(None, gt=0, description="Linked market record ID")
     enabled: Optional[bool] = Field(default=False, description="Whether the MCP is enabled after creation")
 
-    @field_validator("name", "server_url", "description", "authorization_token", mode="before")
+    @field_validator("name", "server_url", "description", "authorization_token", "version", mode="before")
     @classmethod
     def _strip_text(cls, value: Any):
         if isinstance(value, str):
@@ -1374,10 +1377,12 @@
     tags: List[str] = Field(default_factory=list, description="MCP tags")
     authorization_token: Optional[str] = Field(None, description="Authorization token for MCP server")
     registry_json: Optional[Dict[str, Any]] = Field(None, description="Registry metadata JSON")
+    version: Optional[str] = Field(None, description="MCP version")
+    market_id: Optional[int] = Field(None, gt=0, description="Linked market record ID")
     port: int = Field(..., ge=1, le=65535, description="Host port for the container")
     mcp_config: MCPConfigRequest = Field(..., description="MCP server configuration")
 
-    @field_validator("name", "description", "authorization_token", mode="before")
+    @field_validator("name", "description", "authorization_token", "version", mode="before")
     @classmethod
     def _strip_text(cls, value: Any):
         if isinstance(value, str):
@@ -1394,8 +1399,11 @@
     tags: List[str] = Field(default_factory=list, description="MCP tags")
     authorization_token: Optional[str] = Field(None, description="Authorization token for MCP server")
     custom_headers: Optional[Dict[str, Any]] = Field(None, description="Custom HTTP headers as JSON object")
+    config_json: Optional[Dict[str, Any]] = Field(None, description="MCP configuration JSON")
+    version: Optional[str] = Field(None, description="MCP version")
+    market_id: Optional[int] = Field(None, gt=0, description="Linked market record ID")
 
-    @field_validator("name", "server_url", "description", "authorization_token", mode="before")
+    @field_validator("name", "server_url", "description", "authorization_token", "version", mode="before")
     @classmethod
     def _strip_text(cls, value: Any):
         if isinstance(value, str):
@@ -1418,6 +1426,13 @@
     mcp_id: int = Field(..., gt=0, description="MCP record ID to health check")
 
 
+class TestMcpConnectionRequest(BaseModel):
+    """Request model for testing MCP server connectivity (lightweight handshake)"""
+    server_url: str = Field(..., min_length=1, description="MCP server URL to test")
+    authorization_token: Optional[str] = Field(None, description="Authorization token for MCP server")
+    custom_headers: Optional[Dict[str, Any]] = Field(None, description="Custom HTTP headers as JSON object")
+
+
 class ListMcpToolsRequest(BaseModel):
     """Request model for listing MCP service tools"""
     mcp_id: int = Field(..., gt=0, description="MCP record ID")
@@ -1476,18 +1491,35 @@
         return value
 
 
+class CommunityReviewListRequest(CommunityListRequest):
+    """Request model for listing MCP community review submissions"""
+    status: Optional[str] = Field(None, description="Review status filter")
+
+    @field_validator("status", mode="before")
+    @classmethod
+    def _strip_status(cls, value: Any):
+        if isinstance(value, str):
+            stripped = value.strip()
+            return stripped or None
+        return value
+
+
+class CommunityReviewActionRequest(BaseModel):
+    """Request model for approving or rejecting an MCP community submission"""
+    review_id: int = Field(..., gt=0, description="Review record ID")
+
+
 class CommunityPublishRequest(BaseModel):
     """Publish a local MCP to the community; optional fields override the snapshot."""
 
     mcp_id: int = Field(..., gt=0, description="MCP record ID to publish")
     name: Optional[str] = Field(None, description="Community display name override")
     description: Optional[str] = Field(None, description="Description override")
-    version: Optional[str] = Field(None, description="Version override")
     tags: Optional[List[str]] = Field(None, description="Tags override")
     mcp_server: Optional[str] = Field(None, max_length=500, description="Remote MCP server URL override (URL / HTTP / SSE transports)")
     config_json: Optional[Dict[str, Any]] = Field(None, description="Container MCP configuration JSON override")
 
-    @field_validator("name", "description", "version", "mcp_server", mode="before")
+    @field_validator("name", "description", "mcp_server", mode="before")
     @classmethod
     def _strip_publish_optional_text(cls, value: Any):
         if isinstance(value, str):
@@ -1498,18 +1530,19 @@
 
 class CommunityUpdateRequest(BaseModel):
     """Request model for updating community MCP service"""
-    community_id: int = Field(..., gt=0, description="Community record ID")
+    market_id: int = Field(..., gt=0, description="Market record ID")
     name: Optional[str] = Field(default=None, min_length=1, description="New MCP service name")
     description: Optional[str] = Field(None, description="MCP service description")
     tags: List[str] = Field(default_factory=list, description="MCP tags")
-    version: Optional[str] = Field(None, description="MCP version")
     registry_json: Optional[Dict[str, Any]] = Field(None, description="Registry metadata JSON")
+    mcp_server: Optional[str] = Field(None, max_length=500, description="MCP server URL")
+    transport_type: Optional[str] = Field(None, description="Transport type")
     config_json: Optional[Dict[str, Any]] = Field(
         None,
         description="Container MCP configuration JSON (omit to leave unchanged)",
     )
 
-    @field_validator("name", "description", "version", mode="before")
+    @field_validator("name", "description", "mcp_server", "transport_type", mode="before")
     @classmethod
     def _strip_text(cls, value: Any):
         if isinstance(value, str):
@@ -1518,6 +1551,11 @@
         return value
 
 
+class CommunityStatusUpdateRequest(BaseModel):
+    """Request model for changing MCP market listing status (PATCH)."""
+    status: str = Field(..., description="New status: shared / rejected / not_shared / pending_review")
+
+
 class DeleteMcpServiceRequest(BaseModel):
     """Request model for deleting an MCP service"""
     mcp_id: int = Field(..., gt=0, description="MCP record ID to delete")