@mcp-use/cli 2.18.0-canary.2 → 2.18.0-canary.3

package/dist/index.cjs

@@ -4969,6 +4969,37 @@ async function findServerFile(projectPath) {
   }
   throw new Error("No server file found");
 }
+async function generateToolRegistryTypesForServer(projectPath, serverFileRelative) {
+  const serverFile = import_node_path8.default.join(projectPath, serverFileRelative);
+  const serverFileExists = await (0, import_promises7.access)(serverFile).then(() => true).catch(() => false);
+  if (!serverFileExists) {
+    throw new Error(`Server file not found: ${serverFile}`);
+  }
+  const previousHmrMode = globalThis.__mcpUseHmrMode;
+  try {
+    globalThis.__mcpUseHmrMode = true;
+    globalThis.__mcpUseLastServer = void 0;
+    const { tsImport } = await import("tsx/esm/api");
+    await tsImport(serverFile, {
+      parentURL: importMetaUrl,
+      tsconfig: import_node_path8.default.join(projectPath, "tsconfig.json")
+    });
+    const server = globalThis.__mcpUseLastServer;
+    if (!server) {
+      throw new Error(
+        "No MCPServer instance found. Make sure your server file creates an MCPServer instance."
+      );
+    }
+    const mcpUsePath = import_node_path8.default.join(projectPath, "node_modules", "mcp-use");
+    const { generateToolRegistryTypes } = await import(import_node_path8.default.join(mcpUsePath, "dist", "src", "server", "index.js")).then((mod) => mod);
+    if (!generateToolRegistryTypes) {
+      throw new Error("generateToolRegistryTypes not found in mcp-use package");
+    }
+    await generateToolRegistryTypes(server.registrations.tools, projectPath);
+  } finally {
+    globalThis.__mcpUseHmrMode = previousHmrMode ?? false;
+  }
+}
 async function buildWidgets(projectPath, options = {}) {
   const { inline = true } = options;
   const { promises: fs10 } = await import("fs");
@@ -5457,6 +5488,11 @@ program.command("build").description("Build TypeScript and MCP UI widgets").opti
       sourceServerFile = await findServerFile(projectPath);
     } catch {
     }
+    if (sourceServerFile) {
+      console.log(source_default.gray("Generating tool registry types..."));
+      await generateToolRegistryTypesForServer(projectPath, sourceServerFile);
+      console.log(source_default.green("\u2713 Tool registry types generated"));
+    }
     console.log(source_default.gray("Building TypeScript..."));
     await runCommand(
       "node",
@@ -6231,36 +6267,9 @@ program.command("generate-types").description(
   "Generate TypeScript type definitions for tools (writes .mcp-use/tool-registry.d.ts)"
 ).option("-p, --path <path>", "Path to project directory", process.cwd()).option("--server <file>", "Server entry file", "index.ts").action(async (options) => {
   const projectPath = import_node_path8.default.resolve(options.path);
-  const serverFile = import_node_path8.default.join(projectPath, options.server);
   try {
-    if (!await (0, import_promises7.access)(serverFile).then(() => true).catch(() => false)) {
-      console.error(source_default.red(`Server file not found: ${serverFile}`));
-      process.exit(1);
-    }
     console.log(source_default.blue("Generating tool registry types..."));
-    globalThis.__mcpUseHmrMode = true;
-    const { tsImport } = await import("tsx/esm/api");
-    await tsImport(serverFile, {
-      parentURL: importMetaUrl,
-      tsconfig: import_node_path8.default.join(projectPath, "tsconfig.json")
-    });
-    const server = globalThis.__mcpUseLastServer;
-    if (!server) {
-      console.error(
-        source_default.red(
-          "No MCPServer instance found. Make sure your server file creates an MCPServer instance."
-        )
-      );
-      process.exit(1);
-    }
-    const mcpUsePath = import_node_path8.default.join(projectPath, "node_modules", "mcp-use");
-    const { generateToolRegistryTypes } = await import(import_node_path8.default.join(mcpUsePath, "dist", "src", "server", "index.js")).then((mod) => mod);
-    if (!generateToolRegistryTypes) {
-      throw new Error(
-        "generateToolRegistryTypes not found in mcp-use package"
-      );
-    }
-    await generateToolRegistryTypes(server.registrations.tools, projectPath);
+    await generateToolRegistryTypesForServer(projectPath, options.server);
     console.log(source_default.green("\u2713 Tool registry types generated successfully"));
     process.exit(0);
   } catch (error) {
@@ -6272,8 +6281,6 @@ program.command("generate-types").description(
       console.error(source_default.gray(error.stack));
     }
     process.exit(1);
-  } finally {
-    globalThis.__mcpUseHmrMode = false;
   }
 });
 program.hook("preAction", async (_thisCommand, actionCommand) => {