diff --git a/src/server/lib/mcp_tool_convert.ts b/src/server/lib/mcp_tool_convert.ts
index 614f420..0ddec63 100644
--- a/src/server/lib/mcp_tool_convert.ts
+++ b/src/server/lib/mcp_tool_convert.ts
@@ -17,7 +17,7 @@ interface McpTool {
 
 /**
  * Convert OpenAPI 3.x JSON spec into MCP-compatible tool definitions (without run()).
- * Each tool corresponds to an endpoint, with metadata stored under `x-props`.
+ * Hanya menyertakan endpoint yang memiliki tag berisi "mcp".
  */
 export function convertOpenApiToMcpTools(openApiJson: any): McpTool[] {
     const tools: McpTool[] = [];
@@ -28,10 +28,14 @@ export function convertOpenApiToMcpTools(openApiJson: any): McpTool[] {
         if (path.startsWith("/mcp")) continue;
 
         for (const [method, operation] of Object.entries<any>(methods as any)) {
+            const tags: string[] = Array.isArray(operation.tags) ? operation.tags : [];
+
+            // ✅ exclude semua yang tidak punya tag atau tag-nya tidak mengandung "mcp"
+            if (!tags.length || !tags.some(t => t.toLowerCase().includes("mcp"))) continue;
+
             const rawName = _.snakeCase(operation.operationId || `${method}_${path}`) || "unnamed_tool";
             const name = cleanToolName(rawName);
 
-            const summary = operation.summary || `Execute ${method.toUpperCase()} ${path}`;
             const description =
                 operation.description ||
                 operation.summary ||
@@ -51,9 +55,9 @@ export function convertOpenApiToMcpTools(openApiJson: any): McpTool[] {
                     method: method.toUpperCase(),
                     path,
                     operationId: operation.operationId,
-                    tag: Array.isArray(operation.tags) ? operation.tags[0] : undefined,
+                    tag: tags[0],
                     deprecated: operation.deprecated || false,
-                    summary: operation.summary, // ✅ tambahkan summary ke metadata
+                    summary: operation.summary,
                 },
                 inputSchema: {
                     ...schema,
@@ -87,19 +91,18 @@ function cleanToolName(name: string): string {
         .replace(/(^_|_$)/g, "");
 }
 
-// === Contoh Pemakaian ===
-// import openApiJson from "./openapi.json";
-// const tools = convertOpenApiToMcpTools(openApiJson, "https://api.wibudev.com");
-// console.log(JSON.stringify(tools, null, 2));
-
-export async function getMcpTools(){
+/**
+ * Ambil OpenAPI JSON dari endpoint dan konversi ke tools MCP
+ */
+export async function getMcpTools() {
     const data = await fetch(`${process.env.BUN_PUBLIC_BASE_URL}/docs/json`);
     const openApiJson = await data.json();
     const tools = convertOpenApiToMcpTools(openApiJson);
     return tools;
 }
 
+// === CLI Mode ===
 if (import.meta.main) {
     const tools = await getMcpTools();
-    Bun.write("./tools.json", JSON.stringify(tools, null, 2));
+    await Bun.write("./tools.json", JSON.stringify(tools, null, 2));
 }
diff --git a/src/server/routes/layanan_route.ts b/src/server/routes/layanan_route.ts
index f9b8a66..1f9aaed 100644
--- a/src/server/routes/layanan_route.ts
+++ b/src/server/routes/layanan_route.ts
@@ -96,6 +96,7 @@ const LayananRoute = new Elysia({
       detail: {
         summary: "Create Layanan KTP/KK",
         description: "Create a new service request for KTP or KK.",
+        tags: ["mcp"],
       },
     }
   )
@@ -131,6 +132,7 @@ const LayananRoute = new Elysia({
       detail: {
         summary: "Cek Status KTP",
         description: "Retrieve the current status of a KTP/KK request by unique ID.",
+        tags: ["mcp"],
       },
     }
   );
diff --git a/src/server/routes/mcp_route.ts b/src/server/routes/mcp_route.ts
index 8fd4086..2f52212 100644
--- a/src/server/routes/mcp_route.ts
+++ b/src/server/routes/mcp_route.ts
@@ -151,7 +151,7 @@ async function handleMCPRequestAsync(
 // Elysia MCP Server
 // =====================
 export const MCPRoute = new Elysia({
-    tags: ["MCP"]
+    tags: ["MCP Server"]
 })
     .post("/mcp", async ({ request, set }) => {
         if (!tools.length) {