refactor(cli): restructure MCP commands and tools directories, remove tsed-mcp binary, and enhance schema definitions

- Consolidated MCP-related tools and resources under `commands/mcp` for improved organization.
- Removed `tsed-mcp` binary and updated `package.json` and integration scripts accordingly.
- Enhanced support for dynamic input schemas with arrow function handlers in `defineTool`.
- Improved error handling and logging during MCP tool execution.
- Added `initProjectTool` and `McpCommand` for streamlined project initialization in MCP mode.

Author: Romakita

packages/cli-mcp/src/fn/defineTool.ts

@@ -2,6 +2,7 @@ import type {McpServer} from "@modelcontextprotocol/sdk/server/mcp.js";
 import type {RequestHandlerExtra} from "@modelcontextprotocol/sdk/shared/protocol.js";
 import type {CallToolResult, ServerNotification, ServerRequest, Tool} from "@modelcontextprotocol/sdk/types.js";
 import {injectable} from "@tsed/cli-core";
+import {isArrowFn} from "@tsed/core";
 import {DIContext, injector, logger, runInContext, type TokenProvider} from "@tsed/di";
 import {JsonSchema} from "@tsed/schema";
 import {v4} from "uuid";
@@ -17,7 +18,7 @@ type ToolConfig = Parameters<McpServer["registerTool"]>[1];
 export type ToolProps<Input, Output> = Omit<ToolConfig, "inputSchema" | "outputSchema"> & {
   token?: TokenProvider;
   name: string;
-  inputSchema?: JsonSchema<Input> | Tool["inputSchema"];
+  inputSchema?: JsonSchema<Input> | (() => JsonSchema<Input>) | Tool["inputSchema"];
   outputSchema?: JsonSchema<Output> | Tool["outputSchema"];
   handler: ToolCallback<Input>;
 };
@@ -57,7 +58,7 @@ export function defineTool<Input, Output = undefined>(options: ToolProps<Input,
     .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: Input, extra: RequestHandlerExtra<ServerRequest, ServerNotification>) {
         const $ctx = new DIContext({
@@ -73,6 +74,21 @@ export function defineTool<Input, Output = undefined>(options: ToolProps<Input,
           return await runInContext($ctx, () => {
             return options.handler(args as Input, 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 {

packages/cli-mcp/src/index.ts

@@ -2,3 +2,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/package.json

@@ -22,8 +22,7 @@
     "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
   },
   "bin": {
-    "tsed": "lib/esm/bin/tsed.js",
-    "tsed-mcp": "lib/esm/bin/tsed-mcp.js"
+    "tsed": "lib/esm/bin/tsed.js"
   },
   "files": [
     "lib/esm/bin/tsed.js",

packages/cli/src/bin/tsed-mcp.ts

@@ -21,7 +21,7 @@ register(pathToFileURL(join(import.meta.dirname, `../loaders/alias.hook.${EXT}`)
   transferList: []
 });
 
-const {commands, CliCore, PKG, TEMPLATE_DIR, ArchitectureConvention, ProjectConvention} = await import("../index.js");
+const {tools, commands, resources, CliCore, PKG, TEMPLATE_DIR, ArchitectureConvention, ProjectConvention} = await import("../index.js");
 
 CliCore.bootstrap({
   name: "tsed",
@@ -31,6 +31,8 @@ CliCore.bootstrap({
   updateNotifier: true,
   checkPrecondition: true,
   commands,
+  tools,
+  resources,
   defaultProjectPreferences() {
     return {
       convention: ProjectConvention.DEFAULT,

packages/cli/src/bin/tsed.ts

@@ -1,8 +1,9 @@
 import {AddCmd} from "./add/AddCmd.js";
 import {GenerateCmd} from "./generate/GenerateCmd.js";
 import {InitCmd} from "./init/InitCmd.js";
+import {McpCommand} from "./mcp/McpCommand.js";
 import {RunCmd} from "./run/RunCmd.js";
 import {CreateTemplateCommand} from "./template/CreateTemplateCommand.js";
 import {UpdateCmd} from "./update/UpdateCmd.js";
 
-export default [AddCmd, InitCmd, GenerateCmd, UpdateCmd, RunCmd, CreateTemplateCommand];
+export default [AddCmd, InitCmd, GenerateCmd, UpdateCmd, RunCmd, CreateTemplateCommand, McpCommand];

packages/cli/src/commands/index.ts

@@ -37,7 +37,7 @@ import {BunRuntime} from "../../runtimes/supports/BunRuntime.js";
 import {NodeRuntime} from "../../runtimes/supports/NodeRuntime.js";
 import {CliProjectService} from "../../services/CliProjectService.js";
 import {FeaturesMap, FeatureType} from "./config/FeaturesPrompt.js";
-import {InitSchema} from "./config/InitSchema.js";
+import {InitFileSchema} from "./config/InitFileSchema.js";
 import {mapToContext} from "./mappers/mapToContext.js";
 import {getFeaturesPrompt} from "./prompts/getFeaturesPrompt.js";
 
@@ -92,20 +92,16 @@ export class InitCmd implements CommandProvider {
     }
   }
 
-  async $beforePrompt(initialOptions: Partial<InitOptions>) {
+  async $prompt(initialOptions: Partial<InitOptions>): Promise<QuestionOptions> {
     if (initialOptions.file) {
       const file = join(this.packageJson.cwd, initialOptions.file);
 
-      return {
+      initialOptions = {
         ...initialOptions,
-        ...(await this.cliLoadFile.loadFile(file, InitSchema))
+        ...(await this.cliLoadFile.loadFile(file, InitFileSchema))
       };
     }
 
-    return initialOptions;
-  }
-
-  $prompt(initialOptions: Partial<InitOptions>): QuestionOptions {
     if (initialOptions.skipPrompt) {
       return [];
     }
@@ -153,7 +149,7 @@ export class InitCmd implements CommandProvider {
     } as InitOptions;
   }
 
-  async $beforeExec(ctx: InitOptions): Promise<any> {
+  async $exec(ctx: InitOptions): Promise<Task[]> {
     this.fs.ensureDirSync(this.packageJson.cwd);
 
     ctx.projectName && (this.packageJson.name = ctx.projectName);
@@ -199,9 +195,7 @@ export class InitCmd implements CommandProvider {
       ],
       ctx
     );
-  }
 
-  async $exec(ctx: InitOptions): Promise<Task[]> {
     this.checkPrecondition(ctx);
     const runtime = this.runtimes.get();
 

packages/cli/src/commands/init/InitCmd.ts

@@ -1,10 +1,10 @@
 import {PackageManager} from "@tsed/cli-core";
 import {s} from "@tsed/schema";
 
-import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces/index.js";
+import {PlatformType, ProjectConvention} from "../../../interfaces/index.js";
 import {FeatureType} from "./FeaturesPrompt.js";
 
-export const InitSchema = s
+export const InitFileSchema = s
   .object({
     tsedVersion: s.string().optional().description("The CLI will use the given tsed version to generate the project"),
     projectName: s.string().optional().description("The project name"),

…i/src/commands/init/config/InitSchema.ts …c/commands/init/config/InitFileSchema.tspackages/cli/src/commands/init/config/InitSchema.ts renamed to packages/cli/src/commands/init/config/InitFileSchema.ts packages/cli/src/commands/init/config/InitSchema.ts renamed to packages/cli/src/commands/init/config/InitFileSchema.ts

@@ -0,0 +1,12 @@
+import {command} from "@tsed/cli-core";
+import {MCP_SERVER} from "@tsed/cli-mcp";
+import {inject} from "@tsed/di";
+
+export const McpCommand = command({
+  name: "mcp",
+  description: "Run a MCP server",
+  async handler() {
+    await inject(MCP_SERVER).connect();
+    return [];
+  }
+}).token();