@mcp-use/cli 2.17.1-canary.1 → 2.18.0-canary.3

package/dist/index.js

@@ -3629,7 +3629,19 @@ async function deployCommand(options) {
       }
     }
     console.log(source_default.cyan.bold("\u{1F680} Deploying to Manufact cloud...\n"));
-    const isMcp = await isMcpProject(cwd);
+    const projectDir = options.rootDir ? path5.resolve(cwd, options.rootDir) : cwd;
+    if (options.rootDir) {
+      try {
+        await fs9.access(projectDir);
+      } catch {
+        console.log(
+          source_default.red(`\u2717 Root directory not found: ${options.rootDir}`)
+        );
+        process.exit(1);
+      }
+      console.log(source_default.gray(`  Root dir:   `) + source_default.cyan(options.rootDir));
+    }
+    const isMcp = await isMcpProject(projectDir);
     if (!isMcp) {
       console.log(
         source_default.yellow(
@@ -3722,17 +3734,22 @@ async function deployCommand(options) {
       console.log(source_default.gray("Deployment cancelled."));
       process.exit(0);
     }
-    const projectName = options.name || await getProjectName(cwd);
-    const runtime = options.runtime || await detectRuntime(cwd);
+    const projectName = options.name || await getProjectName(projectDir);
+    const runtime = options.runtime || await detectRuntime(projectDir);
     const port = options.port || 3e3;
-    const buildCommand = await detectBuildCommand(cwd);
-    const startCommand = await detectStartCommand(cwd);
+    const buildCommand = await detectBuildCommand(projectDir);
+    const startCommand = await detectStartCommand(projectDir);
     const envVars = await buildEnvVars(options);
     console.log();
     console.log(source_default.white("Deployment configuration:"));
     console.log(source_default.gray(`  Name:          `) + source_default.cyan(projectName));
     console.log(source_default.gray(`  Runtime:       `) + source_default.cyan(runtime));
     console.log(source_default.gray(`  Port:          `) + source_default.cyan(port));
+    if (options.rootDir) {
+      console.log(
+        source_default.gray(`  Root dir:      `) + source_default.cyan(options.rootDir)
+      );
+    }
     if (buildCommand) {
       console.log(source_default.gray(`  Build command: `) + source_default.cyan(buildCommand));
     }
@@ -3870,7 +3887,8 @@ async function deployCommand(options) {
             buildCommand,
             startCommand,
             ...options.port !== void 0 ? { port: options.port } : {},
-            env: Object.keys(envVars).length > 0 ? envVars : void 0
+            env: Object.keys(envVars).length > 0 ? envVars : void 0,
+            rootDir: options.rootDir || void 0
           };
           const deployment2 = await api.redeployDeployment(
             existingLink.deploymentId,
@@ -3914,6 +3932,7 @@ async function deployCommand(options) {
         type: "github",
         repo: `${gitInfo.owner}/${gitInfo.repo}`,
         branch: gitInfo.branch || "main",
+        rootDir: options.rootDir || void 0,
         runtime,
         port,
         buildCommand,
@@ -4932,6 +4951,37 @@ async function findServerFile(projectPath) {
   }
   throw new Error("No server file found");
 }
+async function generateToolRegistryTypesForServer(projectPath, serverFileRelative) {
+  const serverFile = path7.join(projectPath, serverFileRelative);
+  const serverFileExists = await 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: import.meta.url,
+      tsconfig: path7.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 = path7.join(projectPath, "node_modules", "mcp-use");
+    const { generateToolRegistryTypes } = await import(path7.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");
@@ -5420,6 +5470,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",
@@ -6172,7 +6227,10 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
 ).option(
   "--env <key=value...>",
   "Environment variables (can be used multiple times)"
-).option("--env-file <path>", "Path to .env file with environment variables").action(async (options) => {
+).option("--env-file <path>", "Path to .env file with environment variables").option(
+  "--root-dir <path>",
+  "Root directory within repo to deploy from (for monorepos)"
+).action(async (options) => {
   await deployCommand({
     open: options.open,
     name: options.name,
@@ -6180,7 +6238,8 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
     runtime: options.runtime,
     new: options.new,
     env: options.env,
-    envFile: options.envFile
+    envFile: options.envFile,
+    rootDir: options.rootDir
   });
 });
 program.addCommand(createClientCommand());
@@ -6190,36 +6249,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 = path7.resolve(options.path);
-  const serverFile = path7.join(projectPath, options.server);
   try {
-    if (!await 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: import.meta.url,
-      tsconfig: path7.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 = path7.join(projectPath, "node_modules", "mcp-use");
-    const { generateToolRegistryTypes } = await import(path7.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) {
@@ -6231,8 +6263,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) => {