refactor(cli-mcp): remove CLIMCPServer and refactor MCP server lifecycle and logging

Author: Romakita

packages/cli-mcp/src/index.ts

@@ -1,5 +1,4 @@
 export * from "./fn/definePrompt.js";
 export * from "./fn/defineResource.js";
 export * from "./fn/defineTool.js";
-export * from "./services/CLIMCPServer.js";
 export * from "./services/McpServerFactory.js";

packages/cli-mcp/src/services/CLIMCPServer.spec.ts

@@ -65,24 +65,11 @@ describe("McpServerFactory", () => {
         injector().settings.set("mcp.mode", "stdio");
 
         const result = inject(MCP_SERVER);
-        const loggerSpy = vi.spyOn(logger(), "info");
 
         await result.connect();
 
-        expect(loggerSpy).toHaveBeenCalledWith({event: "MCP_SERVER_CONNECT"});
-        expect(loggerSpy).toHaveBeenCalledWith({event: "MCP_SERVER_CONNECTED"});
         expect(mcpStdioServer).toHaveBeenCalledWith(result.server);
       });
-      it("should log connection events", async () => {
-        const result = injector().invoke(MCP_SERVER);
-        const loggerSpy = vi.spyOn(logger(), "info");
-
-        await result.connect();
-
-        expect(loggerSpy).toHaveBeenCalledTimes(2);
-        expect(loggerSpy).toHaveBeenNthCalledWith(1, {event: "MCP_SERVER_CONNECT"});
-        expect(loggerSpy).toHaveBeenNthCalledWith(2, {event: "MCP_SERVER_CONNECTED"});
-      });
     });
     describe("http", () => {
       beforeEach(() =>
@@ -102,10 +89,9 @@ describe("McpServerFactory", () => {
         const result = inject(MCP_SERVER);
         const loggerSpy = vi.spyOn(logger(), "info");
 
-        await result.connect();
+        await result.connect("streamable-http");
 
-        expect(loggerSpy).toHaveBeenCalledWith({event: "MCP_SERVER_CONNECT"});
-        expect(loggerSpy).toHaveBeenCalledWith({event: "MCP_SERVER_CONNECTED"});
+        expect(loggerSpy).toHaveBeenCalledWith({event: "MCP_SERVER_CONNECT", mode: "streamable-http"});
         expect(mcpStreamableServer).toHaveBeenCalled();
       });
     });

packages/cli-mcp/src/services/CLIMCPServer.ts

@@ -9,7 +9,7 @@ import {mcpStreamableServer} from "./McpStreamableServer.js";
 
 export const MCP_SERVER = injectable(McpServer)
   .factory(() => {
-    const mode = constant<"streamable-http" | "stdio">("mcp.mode");
+    const defaultMode = constant<"streamable-http" | "stdio">("mcp.mode");
     const name = constant<string>("name")!;
 
     const server = new McpServer({
@@ -42,16 +42,14 @@ export const MCP_SERVER = injectable(McpServer)
 
     return {
       server,
-      async connect() {
-        logger().info({event: "MCP_SERVER_CONNECT"});
-
+      async connect(mode: "streamable-http" | "stdio" | undefined = defaultMode) {
         if (mode === "streamable-http") {
+          logger().info({event: "MCP_SERVER_CONNECT", mode});
+
           await mcpStreamableServer(server);
         } else {
           await mcpStdioServer(server);
         }
-
-        logger().info({event: "MCP_SERVER_CONNECTED"});
       }
     };
   })

packages/cli-mcp/src/services/McpServerFactory.spec.ts

@@ -1,4 +1,5 @@
 import {McpServer} from "@modelcontextprotocol/sdk/server/mcp.js";
+import {DITest} from "@tsed/di";
 import {beforeEach, describe, expect, it, vi} from "vitest";
 
 import {mcpStdioServer} from "./McpStdioServer.js";
@@ -15,6 +16,7 @@ describe("mcpStdioServer", () => {
   let mockServer: McpServer;
   let mockConnect: any;
 
+  beforeEach(() => DITest.create());
   beforeEach(async () => {
     vi.clearAllMocks();
 

packages/cli-mcp/src/services/McpServerFactory.ts

@@ -1,9 +1,12 @@
 import type {McpServer} from "@modelcontextprotocol/sdk/server/mcp.js";
+import {logger} from "@tsed/di";
 
 export async function mcpStdioServer(server: McpServer) {
   const {StdioServerTransport} = await import("@modelcontextprotocol/sdk/server/stdio.js");
 
   const transport = new StdioServerTransport();
 
+  logger().stop();
+
   return server.connect(transport);
 }

packages/cli-mcp/src/services/McpStdioServer.spec.ts

@@ -1,4 +1,5 @@
 import type {McpServer} from "@modelcontextprotocol/sdk/server/mcp.js";
+import {logger} from "@tsed/di";
 
 export async function mcpStreamableServer(server: McpServer) {
   const {StreamableHTTPServerTransport} = await import("@modelcontextprotocol/sdk/server/streamableHttp.js");
@@ -25,12 +26,23 @@ export async function mcpStreamableServer(server: McpServer) {
 
   const port = parseInt(process.env.PORT || "3000");
 
-  app
-    .listen(port, () => {
-      console.log(`Demo MCP Server running on http://localhost:${port}/mcp`);
-    })
-    .on("error", (error: any) => {
-      console.error("Server error:", error);
-      process.exit(1);
-    });
+  return new Promise((resolve, reject) => {
+    app
+      .listen(port, () => {
+        logger().info({
+          event: "MCP_STREAMABLE_SERVER",
+          state: "OK",
+          message: `Running http://localhost:${port}/mcp`
+        });
+      })
+      .on("close", () => resolve(true))
+      .on("error", (error: any) => {
+        logger().error({
+          event: "MCP_STREAMABLE_SERVER",
+          state: "KO",
+          message: error.message
+        });
+        reject(error);
+      });
+  });
 }