@tsed/cli-mcp 7.0.0-beta.3 → 7.0.0-beta.5

package/lib/esm/fn/defineTool.js

@@ -1,4 +1,5 @@
 import { injectable } from "@tsed/cli-core";
+import { isArrowFn } from "@tsed/core";
 import { DIContext, injector, logger, runInContext } from "@tsed/di";
 import { JsonSchema } from "@tsed/schema";
 import { v4 } from "uuid";
@@ -38,7 +39,7 @@ export function defineTool(options) {
         .type("CLI_MCP_TOOLS")
         .factory(() => ({
         ...options,
-        inputSchema: toZod(options.inputSchema),
+        inputSchema: toZod(isArrowFn(options.inputSchema) ? options.inputSchema() : options.inputSchema),
         outputSchema: toZod(options.outputSchema),
         async handler(args, extra) {
             const $ctx = new DIContext({
@@ -54,6 +55,21 @@ export function defineTool(options) {
                     return options.handler(args, extra);
                 });
             }
+            catch (er) {
+                $ctx.logger.error({
+                    event: "MCP_TOOL_ERROR",
+                    tool: options.name,
+                    error_message: er.message,
+                    stack: er.stack
+                });
+                return {
+                    content: [],
+                    structuredContent: {
+                        code: "E_MCP_TOOL_ERROR",
+                        message: er.message
+                    }
+                };
+            }
             finally {
                 // Ensure per-invocation context is destroyed to avoid leaks
                 try {

package/lib/esm/index.js

@@ -1,4 +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";

package/lib/esm/services/McpServerFactory.js

@@ -4,7 +4,7 @@ import { mcpStdioServer } from "./McpStdioServer.js";
 import { mcpStreamableServer } from "./McpStreamableServer.js";
 export const MCP_SERVER = injectable(McpServer)
     .factory(() => {
-    const mode = constant("mcp.mode");
+    const defaultMode = constant("mcp.mode");
     const name = constant("name");
     const server = new McpServer({
         name,
@@ -17,7 +17,7 @@ export const MCP_SERVER = injectable(McpServer)
     });
     const resources = constant("resources", []);
     resources.map((token) => {
-        const { name, uri, template, handler, ...opts } = inject(token);
+        const { name, handler, uri, template, ...opts } = inject(token);
         server.registerResource(name, (uri || template), opts, handler);
     });
     const prompts = constant("prompts", []);
@@ -27,15 +27,14 @@ export const MCP_SERVER = injectable(McpServer)
     });
     return {
         server,
-        async connect() {
-            logger().info({ event: "MCP_SERVER_CONNECT" });
+        async connect(mode = 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" });
         }
     };
 })

package/lib/esm/services/McpStdioServer.js

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

package/lib/esm/services/McpStreamableServer.js

@@ -1,3 +1,4 @@
+import { logger } from "@tsed/di";
 export async function mcpStreamableServer(server) {
     const { StreamableHTTPServerTransport } = await import("@modelcontextprotocol/sdk/server/streamableHttp.js");
     // @ts-ignore
@@ -17,12 +18,23 @@ export async function mcpStreamableServer(server) {
         await transport.handleRequest(req, res, req.body);
     });
     const port = parseInt(process.env.PORT || "3000");
-    app
-        .listen(port, () => {
-        console.log(`Demo MCP Server running on http://localhost:${port}/mcp`);
-    })
-        .on("error", (error) => {
-        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) => {
+            logger().error({
+                event: "MCP_STREAMABLE_SERVER",
+                state: "KO",
+                message: error.message
+            });
+            reject(error);
+        });
     });
 }