@mcp-use/cli 3.1.0-canary.1 → 3.1.0-canary.3

package/dist/index.js

@@ -509,8 +509,8 @@ import { spawn } from "child_process";
 import { readFileSync as readFileSync2 } from "fs";
 import { access, mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
 import { createRequire as createRequire2 } from "module";
-import path7 from "path";
-import { pathToFileURL } from "url";
+import path8 from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
 
 // ../../node_modules/.pnpm/open@11.0.0/node_modules/open/index.js
 import process9 from "process";
@@ -696,15 +696,15 @@ var wslDefaultBrowser = async () => {
   const { stdout } = await executePowerShell(command, { powerShellPath: psPath });
   return stdout.trim();
 };
-var convertWslPathToWindows = async (path8) => {
-  if (/^[a-z]+:\/\//i.test(path8)) {
-    return path8;
+var convertWslPathToWindows = async (path9) => {
+  if (/^[a-z]+:\/\//i.test(path9)) {
+    return path9;
   }
   try {
-    const { stdout } = await execFile2("wslpath", ["-aw", path8], { encoding: "utf8" });
+    const { stdout } = await execFile2("wslpath", ["-aw", path9], { encoding: "utf8" });
     return stdout.trim();
   } catch {
-    return path8;
+    return path9;
   }
 };
 
@@ -1354,8 +1354,8 @@ var McpUseAPI = class _McpUseAPI {
     return this.request(`/servers${q ? `?${q}` : ""}`);
   }
   async getServer(idOrSlug) {
-    const path8 = encodeURIComponent(idOrSlug);
-    return this.request(`/servers/${path8}`);
+    const path9 = encodeURIComponent(idOrSlug);
+    return this.request(`/servers/${path9}`);
   }
   async deleteServer(id) {
     await this.request(
@@ -1569,6 +1569,14 @@ async function pollForDeviceToken(authBaseUrl, deviceCode, intervalSeconds) {
   }
   throw new Error("Login timed out. Please try again.");
 }
+function resolveOrgFromOption(orgs, identifier) {
+  const needle = identifier.trim();
+  if (!needle) return null;
+  const lower = needle.toLowerCase();
+  return orgs.find(
+    (o) => o.slug === needle || o.id === needle || o.name.toLowerCase() === lower
+  ) ?? null;
+}
 async function promptOrgSelection(orgs, defaultOrgId) {
   if (orgs.length === 0) return null;
   if (orgs.length === 1) {
@@ -1615,8 +1623,8 @@ async function loginCommand(options) {
         console.log(source_default.green.bold("\u2713 API key saved."));
         try {
           const api2 = await McpUseAPI.create();
-          const authInfo = await api2.testAuth();
-          console.log(source_default.gray(`  Authenticated as ${authInfo.email}`));
+          const authInfo2 = await api2.testAuth();
+          console.log(source_default.gray(`  Authenticated as ${authInfo2.email}`));
         } catch {
           console.log(
             source_default.gray(
@@ -1668,9 +1676,19 @@ async function loginCommand(options) {
     const keyResp = await api.createApiKeyWithAccessToken(accessToken, "CLI");
     await writeConfig({ apiKey: keyResp.key });
     console.log(source_default.green.bold("\n\u2713 Successfully logged in!"));
+    let authInfo = null;
     try {
       const freshApi = await McpUseAPI.create();
-      const authInfo = await freshApi.testAuth();
+      authInfo = await freshApi.testAuth();
+    } catch {
+      console.log(
+        source_default.gray(
+          `
+  Your API key has been saved to ${source_default.white("~/.mcp-use/config.json")}`
+        )
+      );
+    }
+    if (authInfo) {
       console.log(source_default.cyan.bold("\nCurrent user:\n"));
       console.log(source_default.white("  Email:   ") + source_default.cyan(authInfo.email));
       console.log(source_default.white("  User ID: ") + source_default.gray(authInfo.user_id));
@@ -1682,8 +1700,19 @@ async function loginCommand(options) {
       const orgs = authInfo.orgs ?? [];
       if (orgs.length > 0) {
         let selectedOrg = null;
-        if (orgs.length === 1) {
+        if (options?.org) {
+          selectedOrg = resolveOrgFromOption(orgs, options.org);
+          if (!selectedOrg) {
+            throw new Error(
+              `Organization "${options.org}" not found. Run 'npx mcp-use org list' after logging in to see available organizations.`
+            );
+          }
+        } else if (orgs.length === 1) {
           selectedOrg = orgs[0];
+        } else if (!process.stdin.isTTY) {
+          throw new Error(
+            "Multiple organizations available and no TTY for interactive selection. Re-run with --org <slug|id|name> to pick one non-interactively."
+          );
         } else {
           selectedOrg = await promptOrgSelection(orgs, authInfo.default_org_id);
         }
@@ -1701,13 +1730,6 @@ async function loginCommand(options) {
           );
         }
       }
-    } catch {
-      console.log(
-        source_default.gray(
-          `
-  Your API key has been saved to ${source_default.white("~/.mcp-use/config.json")}`
-        )
-      );
     }
     console.log(
       source_default.gray(
@@ -3555,9 +3577,7 @@ async function deployCommand(options) {
     let resolvedOrgId;
     if (options.org) {
       const authInfo = await api.testAuth();
-      const match = (authInfo.orgs ?? []).find(
-        (o) => o.slug === options.org || o.id === options.org || o.name.toLowerCase() === options.org.toLowerCase()
-      );
+      const match = resolveOrgFromOption(authInfo.orgs ?? [], options.org);
       if (match) {
         api.setOrgId(match.id);
         resolvedOrgId = match.id;
@@ -4781,9 +4801,7 @@ function pickStr(obj, key) {
 async function applyOrgOption(api, org) {
   if (!org) return;
   const authInfo = await api.testAuth();
-  const match = (authInfo.orgs ?? []).find(
-    (o) => o.slug === org || o.id === org || o.name.toLowerCase() === org.toLowerCase()
-  );
+  const match = resolveOrgFromOption(authInfo.orgs ?? [], org);
   if (!match) {
     console.error(
       source_default.red(
@@ -5212,7 +5230,7 @@ async function addSkillsToProject(projectPath) {
       Readable.fromWeb(response.body),
       extract({
         cwd: tempDir,
-        filter: (path8) => path8.includes("/skills/"),
+        filter: (path9) => path9.includes("/skills/"),
         strip: 1
       })
     );
@@ -5277,14 +5295,114 @@ function createSkillsCommand() {
   return skills;
 }
 
+// src/utils/next-shims.ts
+import { existsSync as existsSync3, promises as fs10 } from "fs";
+import path6 from "path";
+import { fileURLToPath as fileURLToPath3, pathToFileURL } from "url";
+async function detectNextJsProject(projectPath) {
+  try {
+    const pkgPath = path6.join(projectPath, "package.json");
+    const content = await fs10.readFile(pkgPath, "utf-8");
+    const pkg = JSON.parse(content);
+    const deps = pkg.dependencies ?? {};
+    const devDeps = pkg.devDependencies ?? {};
+    return "next" in deps || "next" in devDeps;
+  } catch {
+    return false;
+  }
+}
+async function loadNextJsEnvFiles(projectPath) {
+  const files = [
+    ".env",
+    ".env.development",
+    ".env.local",
+    ".env.development.local"
+  ];
+  const dotenv = await import("dotenv");
+  for (const file of files) {
+    const abs = path6.join(projectPath, file);
+    try {
+      await fs10.access(abs);
+    } catch {
+      continue;
+    }
+    dotenv.config({ path: abs, override: true, quiet: true });
+  }
+}
+function getThisDir() {
+  if (typeof __dirname === "string") return __dirname;
+  const url = import.meta.url;
+  return path6.dirname(fileURLToPath3(url));
+}
+function resolveShimPath(filename) {
+  const thisDir = getThisDir();
+  const candidates = [
+    // Production: `dist/` next to this module
+    path6.join(thisDir, "shims", filename),
+    // Test / dev: one level up (e.g., from `dist/utils/` back to `src/shims/`)
+    path6.join(thisDir, "..", "shims", filename),
+    path6.join(thisDir, "..", "..", "src", "shims", filename),
+    path6.join(thisDir, "..", "src", "shims", filename)
+  ];
+  for (const candidate of candidates) {
+    if (existsSync3(candidate)) return candidate;
+  }
+  return void 0;
+}
+function getShimRegisterPath() {
+  return resolveShimPath("next-shims-register.mjs");
+}
+function getShimLoaderPath() {
+  return resolveShimPath("next-shims-loader.mjs");
+}
+function getShimCjsPreloadPath() {
+  return resolveShimPath("next-shims-cjs.cjs");
+}
+async function registerNextShimsInProcess() {
+  let anyRegistered = false;
+  const cjsPath = getShimCjsPreloadPath();
+  if (cjsPath) {
+    const { createRequire: createRequire3 } = await import("module");
+    const req = createRequire3(pathToFileURL(getThisDir() + path6.sep).href);
+    req(cjsPath);
+    anyRegistered = true;
+  }
+  const loaderPath = getShimLoaderPath();
+  if (loaderPath) {
+    const { register } = await import("module");
+    const loaderUrl = pathToFileURL(loaderPath).href;
+    register(loaderUrl, pathToFileURL(getThisDir() + path6.sep).href);
+    anyRegistered = true;
+  }
+  return anyRegistered;
+}
+function withNextShimsEnv(baseEnv) {
+  const additions = [];
+  const cjsPath = getShimCjsPreloadPath();
+  if (cjsPath) additions.push(`-r ${quoteNodeOption(cjsPath)}`);
+  const registerPath = getShimRegisterPath();
+  if (registerPath)
+    additions.push(`--import=${pathToFileURL(registerPath).href}`);
+  if (additions.length === 0) return baseEnv;
+  const existing = baseEnv.NODE_OPTIONS ?? "";
+  const prepended = additions.join(" ");
+  return {
+    ...baseEnv,
+    NODE_OPTIONS: existing ? `${prepended} ${existing}` : prepended
+  };
+}
+function quoteNodeOption(value) {
+  return /\s/.test(value) ? `"${value}"` : value;
+}
+
 // src/utils/update-check.ts
 import { readFileSync } from "fs";
 import { mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
 import { createRequire } from "module";
 import os4 from "os";
-import path6 from "path";
-var CACHE_DIR = path6.join(os4.homedir(), ".mcp-use");
-var CACHE_FILE = path6.join(CACHE_DIR, "update-check.json");
+import path7 from "path";
+var CACHE_DIR = path7.join(os4.homedir(), ".mcp-use");
+var CACHE_FILE = path7.join(CACHE_DIR, "update-check.json");
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 var FETCH_TIMEOUT_MS = 3e3;
 var PACKAGE_NAME = "mcp-use";
@@ -5367,12 +5485,12 @@ function resolveInstalledVersion(projectPath) {
   if (projectPath) {
     attempts.push(() => {
       const projectRequire = createRequire(
-        path6.join(projectPath, "package.json")
+        path7.join(projectPath, "package.json")
       );
       return projectRequire.resolve(`${PACKAGE_NAME}/package.json`);
     });
   }
-  attempts.push(() => path6.join(__dirname, "../../mcp-use/package.json"));
+  attempts.push(() => path7.join(__dirname, "../../mcp-use/package.json"));
   for (const attempt of attempts) {
     try {
       const pkgPath = attempt();
@@ -5410,7 +5528,7 @@ A new release of ${source_default.bold(PACKAGE_NAME)} is available: ${source_def
 // src/index.ts
 var program = new Command6();
 var packageContent = readFileSync2(
-  path7.join(__dirname, "../package.json"),
+  path8.join(__dirname, "../package.json"),
   "utf-8"
 );
 var packageJson = JSON.parse(packageContent);
@@ -5441,14 +5559,14 @@ function displayPackageVersions(projectPath) {
       if (projectPath) {
         try {
           const projectRequire = createRequire2(
-            path7.join(projectPath, "package.json")
+            path8.join(projectPath, "package.json")
           );
           pkgPath = projectRequire.resolve(`${pkg.name}/package.json`);
         } catch (resolveError) {
-          pkgPath = path7.join(__dirname, pkg.relativePath);
+          pkgPath = path8.join(__dirname, pkg.relativePath);
         }
       } else {
-        pkgPath = path7.join(__dirname, pkg.relativePath);
+        pkgPath = path8.join(__dirname, pkg.relativePath);
       }
       const pkgContent = readFileSync2(pkgPath, "utf-8");
       const pkgJson = JSON.parse(pkgContent);
@@ -5600,20 +5718,92 @@ async function startTunnel(port, subdomain) {
     }, 3e4);
   });
 }
-async function findServerFile(projectPath) {
+async function resolveEntryFile(projectPath, cliEntry, mcpDir) {
+  if (cliEntry) {
+    await access(path8.join(projectPath, cliEntry)).catch(() => {
+      throw new Error(`File not found: ${cliEntry}`);
+    });
+    return cliEntry;
+  }
+  if (mcpDir) {
+    const mcpCandidates = [
+      path8.join(mcpDir, "index.ts"),
+      path8.join(mcpDir, "index.tsx"),
+      path8.join(mcpDir, "server.ts"),
+      path8.join(mcpDir, "server.tsx")
+    ];
+    for (const candidate of mcpCandidates) {
+      try {
+        await access(path8.join(projectPath, candidate));
+        return candidate;
+      } catch {
+        continue;
+      }
+    }
+    throw new Error(
+      `No entry file found inside ${mcpDir}.
+
+Expected one of: ${mcpCandidates.map((c) => path8.relative(projectPath, path8.join(projectPath, c))).join(", ")}
+
+Fix this by either:
+  1. Creating ${path8.join(mcpDir, "index.ts")}, or
+  2. Passing --entry <file> on the command line`
+    );
+  }
   const candidates = ["index.ts", "src/index.ts", "server.ts", "src/server.ts"];
   for (const candidate of candidates) {
     try {
-      await access(path7.join(projectPath, candidate));
+      await access(path8.join(projectPath, candidate));
       return candidate;
     } catch {
       continue;
     }
   }
-  throw new Error("No server file found");
+  throw new Error(
+    `No entry file found.
+
+Expected one of: ${candidates.join(", ")}
+
+Fix this by either:
+  1. Creating one of the default entry files above, or
+  2. Passing --entry <file> or --mcp-dir <dir> on the command line`
+  );
+}
+function resolveWidgetsDir(cliWidgetsDir, mcpDir) {
+  if (cliWidgetsDir) return cliWidgetsDir;
+  if (mcpDir) return path8.join(mcpDir, "resources");
+  return "resources";
+}
+function makeWidgetServerOnlyGuard(widgetName) {
+  const rejected = /* @__PURE__ */ new Set([
+    "server-only",
+    "client-only",
+    "next/cache",
+    "next/headers",
+    "next/navigation",
+    "next/server"
+  ]);
+  return {
+    name: "mcp-use-widget-server-only-guard",
+    enforce: "pre",
+    resolveId(id, importer) {
+      if (!rejected.has(id)) return null;
+      const from = importer ? ` (imported from ${importer})` : "";
+      throw new Error(
+        `Widget "${widgetName}" imports "${id}"${from}, which is a Next.js server-only module. Widgets run in a browser iframe and cannot use server APIs.
+
+To fix:
+  \u2022 Remove the import from the widget (or from any module the widget transitively imports)
+  \u2022 If the widget needs data from ${id}, read it inside an MCP tool in your server and pass the result through the widget's props`
+      );
+    }
+  };
+}
+async function findServerFile(projectPath, cliEntry, cliMcpDir) {
+  return resolveEntryFile(projectPath, cliEntry, cliMcpDir);
 }
 async function generateToolRegistryTypesForServer(projectPath, serverFileRelative) {
-  const serverFile = path7.join(projectPath, serverFileRelative);
+  const serverFile = path8.join(projectPath, serverFileRelative);
   const serverFileExists = await access(serverFile).then(() => true).catch(() => false);
   if (!serverFileExists) {
     throw new Error(`Server file not found: ${serverFile}`);
@@ -5622,19 +5812,48 @@ async function generateToolRegistryTypesForServer(projectPath, serverFileRelativ
   try {
     globalThis.__mcpUseHmrMode = true;
     globalThis.__mcpUseLastServer = void 0;
-    const { tsImport } = await import("tsx/esm/api");
-    await tsImport(pathToFileURL(serverFile).href, {
-      parentURL: import.meta.url,
-      tsconfig: path7.join(projectPath, "tsconfig.json")
-    });
+    if (await detectNextJsProject(projectPath)) {
+      await loadNextJsEnvFiles(projectPath);
+      await registerNextShimsInProcess();
+    }
+    const projectTsconfigPath = path8.join(projectPath, "tsconfig.json");
+    const hasTsconfig = await access(projectTsconfigPath).then(() => true).catch(() => false);
+    if (hasTsconfig) {
+      process.env.TSX_TSCONFIG_PATH = projectTsconfigPath;
+    }
+    const previousCwd = process.cwd();
+    if (previousCwd !== projectPath) process.chdir(projectPath);
+    try {
+      const projectRequire = createRequire2(
+        path8.join(projectPath, "package.json")
+      );
+      const tsxEsmApiPath = projectRequire.resolve("tsx/esm/api");
+      const tsxEsmApi = await import(pathToFileURL2(tsxEsmApiPath).href);
+      if (typeof tsxEsmApi.register === "function") {
+        tsxEsmApi.register({
+          tsconfig: hasTsconfig ? projectTsconfigPath : void 0
+        });
+      }
+      try {
+        const tsxCjsApiPath = projectRequire.resolve("tsx/cjs/api");
+        const tsxCjsApi = await import(pathToFileURL2(tsxCjsApiPath).href);
+        if (typeof tsxCjsApi.register === "function") {
+          tsxCjsApi.register();
+        }
+      } catch {
+      }
+      await import(`${pathToFileURL2(serverFile).href}?t=${Date.now()}`);
+    } finally {
+      if (process.cwd() !== previousCwd) process.chdir(previousCwd);
+    }
     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(pathToFileURL(path7.join(mcpUsePath, "dist", "src", "server", "index.js")).href).then((mod) => mod);
+    const mcpUsePath = path8.join(projectPath, "node_modules", "mcp-use");
+    const { generateToolRegistryTypes } = await import(pathToFileURL2(path8.join(mcpUsePath, "dist", "src", "server", "index.js")).href).then((mod) => mod);
     if (!generateToolRegistryTypes) {
       throw new Error("generateToolRegistryTypes not found in mcp-use package");
     }
@@ -5649,21 +5868,24 @@ async function generateToolRegistryTypesForServer(projectPath, serverFileRelativ
 }
 async function buildWidgets(projectPath, options = {}) {
   const { inline = true } = options;
-  const { promises: fs10 } = await import("fs");
+  const { promises: fs11 } = await import("fs");
   const { build } = await import("vite");
-  const resourcesDir = path7.join(projectPath, "resources");
+  const widgetsDirRelative = options.widgetsDir ?? "resources";
+  const resourcesDir = path8.resolve(projectPath, widgetsDirRelative);
   const mcpUrl = process.env.MCP_URL;
   try {
     await access(resourcesDir);
   } catch {
     console.log(
-      source_default.gray("No resources/ directory found - skipping widget build")
+      source_default.gray(
+        `No ${widgetsDirRelative}/ directory found - skipping widget build`
+      )
     );
     return [];
   }
   const entries = [];
   try {
-    const files = await fs10.readdir(resourcesDir, { withFileTypes: true });
+    const files = await fs11.readdir(resourcesDir, { withFileTypes: true });
     for (const dirent of files) {
       if (dirent.name.startsWith("._") || dirent.name.startsWith(".DS_Store")) {
         continue;
@@ -5671,12 +5893,12 @@ async function buildWidgets(projectPath, options = {}) {
       if (dirent.isFile() && (dirent.name.endsWith(".tsx") || dirent.name.endsWith(".ts"))) {
         entries.push({
           name: dirent.name.replace(/\.tsx?$/, ""),
-          path: path7.join(resourcesDir, dirent.name)
+          path: path8.join(resourcesDir, dirent.name)
         });
       } else if (dirent.isDirectory()) {
-        const widgetPath = path7.join(resourcesDir, dirent.name, "widget.tsx");
+        const widgetPath = path8.join(resourcesDir, dirent.name, "widget.tsx");
         try {
-          await fs10.access(widgetPath);
+          await fs11.access(widgetPath);
           entries.push({
             name: dirent.name,
             path: widgetPath
@@ -5686,11 +5908,15 @@ async function buildWidgets(projectPath, options = {}) {
       }
     }
   } catch (error) {
-    console.log(source_default.gray("No widgets found in resources/ directory"));
+    console.log(
+      source_default.gray(`No widgets found in ${widgetsDirRelative}/ directory`)
+    );
     return [];
   }
   if (entries.length === 0) {
-    console.log(source_default.gray("No widgets found in resources/ directory"));
+    console.log(
+      source_default.gray(`No widgets found in ${widgetsDirRelative}/ directory`)
+    );
     return [];
   }
   console.log(
@@ -5700,10 +5926,17 @@ async function buildWidgets(projectPath, options = {}) {
   );
   const react = (await import("@vitejs/plugin-react")).default;
   const tailwindcss = (await import("@tailwindcss/vite")).default;
-  const packageJsonPath = path7.join(projectPath, "package.json");
+  const projectTsconfigPath = path8.join(projectPath, "tsconfig.json");
+  let hasProjectTsconfig = false;
+  try {
+    await access(projectTsconfigPath);
+    hasProjectTsconfig = true;
+  } catch {
+  }
+  const packageJsonPath = path8.join(projectPath, "package.json");
   let favicon = "";
   try {
-    const pkgContent = await fs10.readFile(packageJsonPath, "utf-8");
+    const pkgContent = await fs11.readFile(packageJsonPath, "utf-8");
     const pkg = JSON.parse(pkgContent);
     favicon = pkg.mcpUse?.favicon || "";
   } catch {
@@ -5712,18 +5945,27 @@ async function buildWidgets(projectPath, options = {}) {
     const widgetName = entry.name;
     const entryPath = entry.path.replace(/\\/g, "/");
     console.log(source_default.gray(`  - Building ${widgetName}...`));
-    const tempDir = path7.join(projectPath, ".mcp-use", widgetName);
-    await fs10.mkdir(tempDir, { recursive: true });
-    const relativeResourcesPath = path7.relative(tempDir, resourcesDir).replace(/\\/g, "/");
-    const mcpUsePath = path7.join(projectPath, "node_modules", "mcp-use");
-    const relativeMcpUsePath = path7.relative(tempDir, mcpUsePath).replace(/\\/g, "/");
+    const tempDir = path8.join(projectPath, ".mcp-use", widgetName);
+    await fs11.mkdir(tempDir, { recursive: true });
+    const relativeResourcesPath = path8.relative(tempDir, resourcesDir).replace(/\\/g, "/");
+    const mcpUsePath = path8.join(projectPath, "node_modules", "mcp-use");
+    const relativeMcpUsePath = path8.relative(tempDir, mcpUsePath).replace(/\\/g, "/");
+    const projectSrcDir = path8.join(projectPath, "src");
+    let projectSrcSourceLine = "";
+    try {
+      await access(projectSrcDir);
+      const relativeProjectSrcPath = path8.relative(tempDir, projectSrcDir).replace(/\\/g, "/");
+      projectSrcSourceLine = `@source "${relativeProjectSrcPath}";
+`;
+    } catch {
+    }
     const cssContent = `@import "tailwindcss";
 
 /* Configure Tailwind to scan the resources directory and mcp-use package */
 @source "${relativeResourcesPath}";
 @source "${relativeMcpUsePath}/**/*.{ts,tsx,js,jsx}";
-`;
-    await fs10.writeFile(path7.join(tempDir, "styles.css"), cssContent, "utf8");
+${projectSrcSourceLine}`;
+    await fs11.writeFile(path8.join(tempDir, "styles.css"), cssContent, "utf8");
     const entryContent = `import React from 'react'
 import { createRoot } from 'react-dom/client'
 import './styles.css'
@@ -5748,9 +5990,9 @@ if (container && Component) {
     <script type="module" src="/entry.tsx"></script>
   </body>
 </html>`;
-    await fs10.writeFile(path7.join(tempDir, "entry.tsx"), entryContent, "utf8");
-    await fs10.writeFile(path7.join(tempDir, "index.html"), htmlContent, "utf8");
-    const outDir = path7.join(
+    await fs11.writeFile(path8.join(tempDir, "entry.tsx"), entryContent, "utf8");
+    await fs11.writeFile(path8.join(tempDir, "index.html"), htmlContent, "utf8");
+    const outDir = path8.join(
       projectPath,
       "dist",
       "resources",
@@ -5760,12 +6002,12 @@ if (container && Component) {
     const baseUrl = mcpUrl ? `${mcpUrl}/${widgetName}/` : `/mcp-use/widgets/${widgetName}/`;
     let widgetMetadata = {};
     try {
-      const metadataTempDir = path7.join(
+      const metadataTempDir = path8.join(
         projectPath,
         ".mcp-use",
         `${widgetName}-metadata`
       );
-      await fs10.mkdir(metadataTempDir, { recursive: true });
+      await fs11.mkdir(metadataTempDir, { recursive: true });
       const { createServer } = await import("vite");
       const nodeStubsPlugin = {
         name: "node-stubs",
@@ -5793,15 +6035,16 @@ export default PostHog;
           return null;
         }
       };
+      const serverOnlyGuard = makeWidgetServerOnlyGuard(widgetName);
       const metadataServer = await createServer({
         root: metadataTempDir,
-        cacheDir: path7.join(metadataTempDir, ".vite-cache"),
-        plugins: [nodeStubsPlugin, tailwindcss(), react()],
-        resolve: {
-          alias: {
-            "@": resourcesDir
-          }
-        },
+        cacheDir: path8.join(metadataTempDir, ".vite-cache"),
+        plugins: [serverOnlyGuard, nodeStubsPlugin, tailwindcss(), react()],
+        // When the project has a tsconfig, enable Vite's native tsconfig-paths
+        // resolver so `@/*` (or any custom alias) resolves through the
+        // project's own paths config. Without a tsconfig, fall back to the
+        // legacy hardcoded alias.
+        resolve: hasProjectTsconfig ? { tsconfigPaths: true } : { alias: { "@": resourcesDir } },
         server: {
           middlewareMode: true
         },
@@ -5880,7 +6123,7 @@ export default PostHog;
       } finally {
         await metadataServer.close();
         try {
-          await fs10.rm(metadataTempDir, { recursive: true, force: true });
+          await fs11.rm(metadataTempDir, { recursive: true, force: true });
         } catch {
         }
       }
@@ -5975,12 +6218,14 @@ export default {
           return null;
         }
       };
+      const buildServerOnlyGuard = makeWidgetServerOnlyGuard(widgetName);
       const buildPlugins = inline ? [
+        buildServerOnlyGuard,
         buildNodeStubsPlugin,
         tailwindcss(),
         react(),
         viteSingleFile({ removeViteModuleLoader: true })
-      ] : [buildNodeStubsPlugin, tailwindcss(), react()];
+      ] : [buildServerOnlyGuard, buildNodeStubsPlugin, tailwindcss(), react()];
       await build({
         root: tempDir,
         base: baseUrl,
@@ -5999,11 +6244,10 @@ export default {
             }
           }
         },
-        resolve: {
-          alias: {
-            "@": resourcesDir
-          }
-        },
+        // When a tsconfig exists, enable Vite's native `resolve.tsconfigPaths`
+        // so the project's path aliases resolve naturally. Otherwise fall
+        // back to the legacy `@` → resourcesDir alias.
+        resolve: hasProjectTsconfig ? { tsconfigPaths: true } : { alias: { "@": resourcesDir } },
         optimizeDeps: {
           // Exclude Node.js-only packages from browser bundling
           exclude: ["posthog-node"]
@@ -6025,7 +6269,7 @@ export default {
             // Inline all assets under 100MB (effectively all)
           } : {},
           rolldownOptions: {
-            input: path7.join(tempDir, "index.html"),
+            input: path8.join(tempDir, "index.html"),
             external: (id) => {
               return false;
             }
@@ -6033,12 +6277,12 @@ export default {
         }
       });
       try {
-        const assetsDir = path7.join(outDir, "assets");
-        const assetFiles = await fs10.readdir(assetsDir);
+        const assetsDir = path8.join(outDir, "assets");
+        const assetFiles = await fs11.readdir(assetsDir);
         const jsFiles = assetFiles.filter((f) => f.endsWith(".js"));
         for (const jsFile of jsFiles) {
-          const jsPath = path7.join(assetsDir, jsFile);
-          let content = await fs10.readFile(jsPath, "utf8");
+          const jsPath = path8.join(assetsDir, jsFile);
+          let content = await fs11.readFile(jsPath, "utf8");
           const zodConfigPatterns = [
             // Non-minified: export const globalConfig = {}
             /export\s+const\s+globalConfig\s*=\s*\{\s*\}/g,
@@ -6057,7 +6301,7 @@ export default {
             }
           }
           if (patched) {
-            await fs10.writeFile(jsPath, content, "utf8");
+            await fs11.writeFile(jsPath, content, "utf8");
             console.log(source_default.gray(`    \u2192 Patched Zod JIT in ${jsFile}`));
           }
         }
@@ -6069,8 +6313,8 @@ export default {
       const mcpServerUrl = process.env.MCP_SERVER_URL;
       if (mcpServerUrl) {
         try {
-          const htmlPath = path7.join(outDir, "index.html");
-          let html = await fs10.readFile(htmlPath, "utf8");
+          const htmlPath = path8.join(outDir, "index.html");
+          let html = await fs11.readFile(htmlPath, "utf8");
           const injectionScript = `<script>window.__getFile = (filename) => { return "${mcpUrl}/${widgetName}/"+filename }; window.__mcpPublicUrl = "${mcpServerUrl}/mcp-use/public"; window.__mcpPublicAssetsUrl = "${mcpUrl}/public";</script>`;
           if (!html.includes("window.__mcpPublicUrl")) {
             html = html.replace(
@@ -6091,7 +6335,7 @@ export default {
     <base href="${mcpServerUrl}">`
             );
           }
-          await fs10.writeFile(htmlPath, html, "utf8");
+          await fs11.writeFile(htmlPath, html, "utf8");
           console.log(
             source_default.gray(`    \u2192 Injected MCP_SERVER_URL into ${widgetName}`)
           );
@@ -6105,22 +6349,32 @@ export default {
         }
       }
       console.log(source_default.green(`    \u2713 Built ${widgetName}`));
-      return { name: widgetName, metadata: widgetMetadata };
+      return {
+        status: "built",
+        name: widgetName,
+        metadata: widgetMetadata
+      };
     } catch (error) {
       console.error(source_default.red(`    \u2717 Failed to build ${widgetName}:`), error);
-      return null;
+      return { status: "failed", name: widgetName };
     }
   };
   const buildResults = await Promise.all(
     entries.map((entry) => buildSingleWidget(entry))
   );
-  const builtWidgets = buildResults.filter(
-    (result) => result !== null
+  const failed = buildResults.filter((r) => r.status === "failed");
+  if (failed.length > 0) {
+    const names = failed.map((f) => f.name).join(", ");
+    throw new Error(
+      `${failed.length} widget(s) failed to build: ${names}. See errors above.`
+    );
+  }
+  return buildResults.flatMap(
+    (r) => r.status === "built" ? [{ name: r.name, metadata: r.metadata }] : []
   );
-  return builtWidgets;
 }
 async function collectTsFiles(projectPath, includePatterns, excludePatterns) {
-  const { promises: fs10 } = await import("fs");
+  const { promises: fs11 } = await import("fs");
   const literalFiles = [];
   const dirPrefixes = [];
   for (const pattern of includePatterns) {
@@ -6135,7 +6389,7 @@ async function collectTsFiles(projectPath, includePatterns, excludePatterns) {
   for (const file of literalFiles) {
     if (/\.tsx?$/.test(file) && !file.endsWith(".d.ts")) {
       try {
-        await access(path7.join(projectPath, file));
+        await access(path8.join(projectPath, file));
         files.push(file);
       } catch {
       }
@@ -6143,13 +6397,13 @@ async function collectTsFiles(projectPath, includePatterns, excludePatterns) {
   }
   const excludeSet = new Set(excludePatterns.map((e) => e.replace(/\*+/g, "")));
   for (const prefix of dirPrefixes) {
-    const dirPath = path7.join(projectPath, prefix);
+    const dirPath = path8.join(projectPath, prefix);
     try {
-      const entries = await fs10.readdir(dirPath, { recursive: true });
+      const entries = await fs11.readdir(dirPath, { recursive: true });
       for (const entry of entries) {
         const entryStr = String(entry);
-        const rel = path7.join(prefix, entryStr);
-        if (/\.tsx?$/.test(entryStr) && !entryStr.endsWith(".d.ts") && !excludeSet.has(rel.split(path7.sep)[0])) {
+        const rel = path8.join(prefix, entryStr);
+        if (/\.tsx?$/.test(entryStr) && !entryStr.endsWith(".d.ts") && !excludeSet.has(rel.split(path8.sep)[0])) {
           files.push(rel);
         }
       }
@@ -6160,11 +6414,11 @@ async function collectTsFiles(projectPath, includePatterns, excludePatterns) {
 }
 async function transpileWithEsbuild(projectPath) {
   const esbuild = await import("esbuild");
-  const { promises: fs10 } = await import("fs");
-  const tsconfigPath = path7.join(projectPath, "tsconfig.json");
+  const { promises: fs11 } = await import("fs");
+  const tsconfigPath = path8.join(projectPath, "tsconfig.json");
   let tsconfig = {};
   try {
-    const raw = await fs10.readFile(tsconfigPath, "utf-8");
+    const raw = await fs11.readFile(tsconfigPath, "utf-8");
     tsconfig = JSON.parse(raw);
   } catch {
   }
@@ -6191,10 +6445,10 @@ async function transpileWithEsbuild(projectPath) {
   const target = (compilerOptions.target || "ES2022").toLowerCase();
   const moduleStr = (compilerOptions.module || "ESNext").toLowerCase();
   const format = moduleStr.includes("commonjs") ? "cjs" : "esm";
-  const outbase = compilerOptions.rootDir ? path7.resolve(projectPath, compilerOptions.rootDir) : projectPath;
+  const outbase = compilerOptions.rootDir ? path8.resolve(projectPath, compilerOptions.rootDir) : projectPath;
   await esbuild.build({
-    entryPoints: files.map((f) => path7.join(projectPath, f)),
-    outdir: path7.join(projectPath, outDir),
+    entryPoints: files.map((f) => path8.join(projectPath, f)),
+    outdir: path8.join(projectPath, outDir),
     outbase,
     bundle: false,
     format,
@@ -6206,21 +6460,42 @@ async function transpileWithEsbuild(projectPath) {
     logLevel: "warning"
   });
 }
-program.command("build").description("Build TypeScript and MCP UI widgets").option("-p, --path <path>", "Path to project directory", process.cwd()).option("--with-inspector", "Include inspector in production build").option(
+program.command("build").description("Build TypeScript and MCP UI widgets").option("-p, --path <path>", "Path to project directory", process.cwd()).option(
+  "--entry <file>",
+  "Path to MCP server entry file (relative to project)"
+).option(
+  "--widgets-dir <dir>",
+  "Path to widgets directory (relative to project)"
+).option(
+  "--mcp-dir <dir>",
+  "Folder holding the MCP entry + resources (e.g. 'src/mcp' for Next.js apps)"
+).option("--with-inspector", "Include inspector in production build").option(
   "--inline",
   "Inline all JS/CSS into HTML (required for VS Code MCP Apps)"
 ).option("--no-inline", "Keep JS/CSS as separate files (default)").option("--no-typecheck", "Skip TypeScript type checking (faster builds)").action(async (options) => {
   try {
-    const projectPath = path7.resolve(options.path);
-    const { promises: fs10 } = await import("fs");
+    const projectPath = path8.resolve(options.path);
+    const { promises: fs11 } = await import("fs");
     displayPackageVersions(projectPath);
+    const mcpDir = options.mcpDir;
+    const widgetsDir = resolveWidgetsDir(options.widgetsDir, mcpDir);
     const builtWidgets = await buildWidgets(projectPath, {
-      inline: options.inline ?? false
+      inline: options.inline ?? false,
+      widgetsDir
     });
     let sourceServerFile;
     try {
-      sourceServerFile = await findServerFile(projectPath);
-    } catch {
+      sourceServerFile = await findServerFile(
+        projectPath,
+        options.entry,
+        options.mcpDir
+      );
+    } catch (err) {
+      console.log(
+        source_default.yellow(
+          `\u26A0 Could not locate a server entry file: ${err instanceof Error ? err.message : String(err)}`
+        )
+      );
     }
     if (sourceServerFile) {
       console.log(source_default.gray("Generating tool registry types..."));
@@ -6238,17 +6513,25 @@ program.command("build").description("Build TypeScript and MCP UI widgets").opti
         );
       }
     }
-    console.log(source_default.gray("Building TypeScript..."));
-    await transpileWithEsbuild(projectPath);
-    console.log(source_default.green("\u2713 TypeScript build complete!"));
-    if (options.typecheck !== false) {
+    if (!mcpDir) {
+      console.log(source_default.gray("Building TypeScript..."));
+      await transpileWithEsbuild(projectPath);
+      console.log(source_default.green("\u2713 TypeScript build complete!"));
+    } else {
+      console.log(
+        source_default.gray(
+          "Skipping TypeScript transpile (--mcp-dir mode runs source via tsx at start time)"
+        )
+      );
+    }
+    if (options.typecheck !== false && !mcpDir) {
       console.log(source_default.gray("Type checking..."));
       try {
         await runCommand(
           "node",
           [
             "--max-old-space-size=4096",
-            path7.join(
+            path8.join(
               projectPath,
               "node_modules",
               "typescript",
@@ -6269,39 +6552,43 @@ program.command("build").description("Build TypeScript and MCP UI widgets").opti
     }
     let entryPoint;
     if (sourceServerFile) {
-      const baseName = path7.basename(sourceServerFile, ".ts") + ".js";
-      const possibleOutputs = [
-        `dist/${baseName}`,
-        // rootDir set to project root or src
-        `dist/src/${baseName}`,
-        // no rootDir, source in src/
-        `dist/${sourceServerFile.replace(/\.ts$/, ".js")}`
-        // exact path preserved
-      ];
-      for (const candidate of possibleOutputs) {
-        try {
-          await access(path7.join(projectPath, candidate));
-          entryPoint = candidate;
-          break;
-        } catch {
-          continue;
+      if (mcpDir) {
+        entryPoint = sourceServerFile;
+      } else {
+        const baseName = path8.basename(sourceServerFile, ".ts") + ".js";
+        const possibleOutputs = [
+          `dist/${baseName}`,
+          // rootDir set to project root or src
+          `dist/src/${baseName}`,
+          // no rootDir, source in src/
+          `dist/${sourceServerFile.replace(/\.ts$/, ".js")}`
+          // exact path preserved
+        ];
+        for (const candidate of possibleOutputs) {
+          try {
+            await access(path8.join(projectPath, candidate));
+            entryPoint = candidate;
+            break;
+          } catch {
+            continue;
+          }
         }
       }
     }
-    const publicDir = path7.join(projectPath, "public");
+    const publicDir = path8.join(projectPath, "public");
     try {
-      await fs10.access(publicDir);
+      await fs11.access(publicDir);
       console.log(source_default.gray("Copying public assets..."));
-      await fs10.cp(publicDir, path7.join(projectPath, "dist", "public"), {
+      await fs11.cp(publicDir, path8.join(projectPath, "dist", "public"), {
         recursive: true
       });
       console.log(source_default.green("\u2713 Public assets copied"));
     } catch {
     }
-    const manifestPath = path7.join(projectPath, "dist", "mcp-use.json");
+    const manifestPath = path8.join(projectPath, "dist", "mcp-use.json");
     let existingManifest = {};
     try {
-      const existingContent = await fs10.readFile(manifestPath, "utf-8");
+      const existingContent = await fs11.readFile(manifestPath, "utf-8");
       existingManifest = JSON.parse(existingContent);
     } catch {
     }
@@ -6323,8 +6610,8 @@ program.command("build").description("Build TypeScript and MCP UI widgets").opti
       // Server entry point for `mcp-use start`
       widgets: widgetsData
     };
-    await fs10.mkdir(path7.dirname(manifestPath), { recursive: true });
-    await fs10.writeFile(
+    await fs11.mkdir(path8.dirname(manifestPath), { recursive: true });
+    await fs11.writeFile(
       manifestPath,
       JSON.stringify(manifest, null, 2),
       "utf8"
@@ -6344,14 +6631,23 @@ program.command("build").description("Build TypeScript and MCP UI widgets").opti
     process.exit(1);
   }
 });
-program.command("dev").description("Run development server with auto-reload and inspector").option("-p, --path <path>", "Path to project directory", process.cwd()).option("--port <port>", "Server port", "3000").option(
+program.command("dev").description("Run development server with auto-reload and inspector").option("-p, --path <path>", "Path to project directory", process.cwd()).option(
+  "--entry <file>",
+  "Path to MCP server entry file (relative to project)"
+).option(
+  "--widgets-dir <dir>",
+  "Path to widgets directory (relative to project)"
+).option(
+  "--mcp-dir <dir>",
+  "Folder holding the MCP entry + resources (e.g. 'src/mcp' for Next.js apps)"
+).option("--port <port>", "Server port", "3000").option(
   "--host <host>",
   "Server host (use 0.0.0.0 to listen on all interfaces)",
   "0.0.0.0"
 ).option("--no-open", "Do not auto-open inspector").option("--no-hmr", "Disable hot module reloading (use tsx watch instead)").option("--tunnel", "Expose server through a tunnel").action(async (options) => {
   try {
     process.env.MCP_USE_CLI_DEV = "1";
-    const projectPath = path7.resolve(options.path);
+    const projectPath = path8.resolve(options.path);
     let port = parseInt(options.port, 10);
     const host = options.host;
     const useHmr = options.hmr !== false;
@@ -6362,13 +6658,24 @@ program.command("dev").description("Run development server with auto-reload and
       console.log(source_default.green.bold(`\u2713 Using port ${availablePort} instead`));
       port = availablePort;
     }
-    const serverFile = await findServerFile(projectPath);
+    const serverFile = await findServerFile(
+      projectPath,
+      options.entry,
+      options.mcpDir
+    );
+    {
+      const devMcpDir = options.mcpDir;
+      const devWidgetsDir = resolveWidgetsDir(options.widgetsDir, devMcpDir);
+      if (devWidgetsDir !== "resources") {
+        process.env.MCP_USE_WIDGETS_DIR = devWidgetsDir;
+      }
+    }
     let tunnelProcess = void 0;
     let tunnelSubdomain = void 0;
     let tunnelUrl = void 0;
     if (options.tunnel) {
       try {
-        const manifestPath = path7.join(projectPath, "dist", "mcp-use.json");
+        const manifestPath = path8.join(projectPath, "dist", "mcp-use.json");
         let existingSubdomain;
         try {
           const manifestContent = await readFile3(manifestPath, "utf-8");
@@ -6417,7 +6724,7 @@ program.command("dev").description("Run development server with auto-reload and
             manifest.tunnel = {};
           }
           manifest.tunnel.subdomain = tunnelSubdomain;
-          await mkdir3(path7.dirname(manifestPath), { recursive: true });
+          await mkdir3(path8.dirname(manifestPath), { recursive: true });
           await writeFile3(
             manifestPath,
             JSON.stringify(manifest, null, 2),
@@ -6444,22 +6751,35 @@ program.command("dev").description("Run development server with auto-reload and
     } else if (!process.env.MCP_URL) {
       process.env.MCP_URL = mcpUrl;
     }
+    const isNextJsProject = await detectNextJsProject(projectPath);
+    if (isNextJsProject) {
+      console.log(
+        source_default.gray(
+          "Next.js detected \u2014 installing server-runtime shims (server-only, next/cache, next/headers, next/navigation, next/server)"
+        )
+      );
+      await loadNextJsEnvFiles(projectPath);
+    }
     if (!useHmr) {
       console.log(source_default.gray("HMR disabled, using tsx watch (full restart)"));
       const processes = [];
-      const env2 = {
+      const baseEnv = {
+        // Inherit parent env (PATH, HOME, etc.) — without it, tsx can't
+        // resolve its own tooling in some setups.
+        ...process.env,
         PORT: String(port),
         HOST: host,
         NODE_ENV: "development",
         // Preserve user-provided MCP_URL (e.g., for reverse proxy setups)
         MCP_URL: process.env.MCP_URL || mcpUrl
       };
+      const env2 = isNextJsProject ? withNextShimsEnv(baseEnv) : baseEnv;
       const { createRequire: createRequire4 } = await import("module");
       let cmd;
       let args;
       try {
         const projectRequire = createRequire4(
-          path7.join(projectPath, "package.json")
+          path8.join(projectPath, "package.json")
         );
         const tsxPkgPath = projectRequire.resolve("tsx/package.json");
         const tsxPkg = JSON.parse(await readFile3(tsxPkgPath, "utf-8"));
@@ -6471,7 +6791,7 @@ program.command("dev").description("Run development server with auto-reload and
         } else {
           throw new Error("No bin field found in tsx package.json");
         }
-        const tsxBin = path7.resolve(path7.dirname(tsxPkgPath), binPath);
+        const tsxBin = path8.resolve(path8.dirname(tsxPkgPath), binPath);
         cmd = "node";
         args = [tsxBin, "watch", serverFile];
       } catch (error) {
@@ -6546,18 +6866,56 @@ program.command("dev").description("Run development server with auto-reload and
         "HMR enabled - changes will hot reload without dropping connections"
       )
     );
+    if (isNextJsProject) {
+      const registered = await registerNextShimsInProcess();
+      if (!registered) {
+        console.warn(
+          source_default.yellow(
+            "[HMR] Warning: Next.js shim loader could not be found on disk. Importing server-only / next/cache / etc. will throw. Reinstall @mcp-use/cli to fix."
+          )
+        );
+      }
+    }
     const chokidarModule = await import("chokidar");
     const chokidar = chokidarModule.default || chokidarModule;
-    const { fileURLToPath: fileURLToPath3 } = await import("url");
+    const { fileURLToPath: fileURLToPath4 } = await import("url");
     const { createRequire: createRequire3 } = await import("module");
-    let tsImport = null;
+    const projectTsconfigPath = path8.join(projectPath, "tsconfig.json");
+    let tsconfigAvailable = false;
+    try {
+      await access(projectTsconfigPath);
+      tsconfigAvailable = true;
+      process.env.TSX_TSCONFIG_PATH = projectTsconfigPath;
+      if (process.cwd() !== projectPath) process.chdir(projectPath);
+    } catch {
+    }
+    let tsxLoaderActive = false;
     try {
       const projectRequire = createRequire3(
-        path7.join(projectPath, "package.json")
+        path8.join(projectPath, "package.json")
       );
-      const tsxApiPath = projectRequire.resolve("tsx/esm/api");
-      const tsxApi = await import(pathToFileURL(tsxApiPath).href);
-      tsImport = tsxApi.tsImport;
+      const tsxEsmApiPath = projectRequire.resolve("tsx/esm/api");
+      const tsxEsmApi = await import(pathToFileURL2(tsxEsmApiPath).href);
+      if (typeof tsxEsmApi.register === "function") {
+        tsxEsmApi.register({
+          tsconfig: tsconfigAvailable ? projectTsconfigPath : void 0,
+          onImport: (url) => {
+            const filePath = url.startsWith("file://") ? fileURLToPath4(url) : url;
+            if (!filePath.includes("node_modules") && filePath.startsWith(projectPath)) {
+              console.debug(`[HMR] Loaded: ${url}`);
+            }
+          }
+        });
+        tsxLoaderActive = true;
+      }
+      try {
+        const tsxCjsApiPath = projectRequire.resolve("tsx/cjs/api");
+        const tsxCjsApi = await import(pathToFileURL2(tsxCjsApiPath).href);
+        if (typeof tsxCjsApi.register === "function") {
+          tsxCjsApi.register();
+        }
+      } catch {
+      }
     } catch {
       console.log(
         source_default.yellow(
@@ -6565,25 +6923,15 @@ program.command("dev").description("Run development server with auto-reload and
         )
       );
     }
-    const serverFilePath = path7.join(projectPath, serverFile);
-    const serverFileUrl = pathToFileURL(serverFilePath).href;
+    const serverFilePath = path8.join(projectPath, serverFile);
+    const serverFileUrl = pathToFileURL2(serverFilePath).href;
     globalThis.__mcpUseHmrMode = true;
     const importServerModule = async () => {
       const previousServer = globalThis.__mcpUseLastServer;
       globalThis.__mcpUseLastServer = null;
-      if (tsImport) {
-        await tsImport(`${serverFileUrl}?t=${Date.now()}`, {
-          parentURL: import.meta.url,
-          onImport: (file) => {
-            const filePath = file.startsWith("file://") ? fileURLToPath3(file) : file;
-            if (!filePath.includes("node_modules") && filePath.startsWith(projectPath)) {
-              console.debug(`[HMR] Loaded: ${file}`);
-            }
-          }
-        });
-      } else {
-        await import(`${serverFileUrl}?t=${Date.now()}`);
+      if (!tsxLoaderActive) {
       }
+      await import(`${serverFileUrl}?t=${Date.now()}`);
       const instance = globalThis.__mcpUseLastServer;
       if (!instance) {
         globalThis.__mcpUseLastServer = previousServer;
@@ -6597,7 +6945,7 @@ program.command("dev").description("Run development server with auto-reload and
       if (instance === previousServer) {
         console.warn(
           source_default.yellow(
-            "[HMR] Warning: Module re-import returned the same server instance. The module may not have been re-evaluated. " + (!tsImport ? "Install tsx as a devDependency for reliable TypeScript HMR." : "This may be a tsx caching issue.")
+            "[HMR] Warning: Module re-import returned the same server instance. The module may not have been re-evaluated. " + (!tsxLoaderActive ? "Install tsx as a devDependency for reliable TypeScript HMR." : "This may be a module cache issue.")
           )
         );
         return null;
@@ -6672,8 +7020,8 @@ program.command("dev").description("Run development server with auto-reload and
     }
     let watcher = chokidar.watch(".", {
       cwd: projectPath,
-      ignored: (path8, stats) => {
-        const normalizedPath = path8.replace(/\\/g, "/");
+      ignored: (path9, stats) => {
+        const normalizedPath = path9.replace(/\\/g, "/");
         if (/(^|\/)\.[^/]/.test(normalizedPath)) {
           return true;
         }
@@ -6847,7 +7195,7 @@ program.command("dev").description("Run development server with auto-reload and
       }
       tunnelUrl = void 0;
       if (withTunnel) {
-        const manifestPath = path7.join(projectPath, "dist", "mcp-use.json");
+        const manifestPath = path8.join(projectPath, "dist", "mcp-use.json");
         let existingSubdomain;
         try {
           const manifestContent = await readFile3(manifestPath, "utf-8");
@@ -6884,7 +7232,7 @@ program.command("dev").description("Run development server with auto-reload and
         tunnelSubdomain = tunnelInfo.subdomain;
         process.env.MCP_URL = tunnelUrl;
         try {
-          const mPath = path7.join(projectPath, "dist", "mcp-use.json");
+          const mPath = path8.join(projectPath, "dist", "mcp-use.json");
           let manifest = {};
           try {
             manifest = JSON.parse(await readFile3(mPath, "utf-8"));
@@ -6892,7 +7240,7 @@ program.command("dev").description("Run development server with auto-reload and
           }
           if (!manifest.tunnel) manifest.tunnel = {};
           manifest.tunnel.subdomain = tunnelSubdomain;
-          await mkdir3(path7.dirname(mPath), { recursive: true });
+          await mkdir3(path8.dirname(mPath), { recursive: true });
           await writeFile3(mPath, JSON.stringify(manifest, null, 2), "utf-8");
         } catch {
         }
@@ -6988,9 +7336,15 @@ program.command("dev").description("Run development server with auto-reload and
     process.exit(1);
   }
 });
-program.command("start").description("Start production server").option("-p, --path <path>", "Path to project directory", process.cwd()).option("--port <port>", "Server port", "3000").option("--tunnel", "Expose server through a tunnel").action(async (options) => {
+program.command("start").description("Start production server").option("-p, --path <path>", "Path to project directory", process.cwd()).option(
+  "--entry <file>",
+  "Path to MCP server entry file (relative to project)"
+).option(
+  "--mcp-dir <dir>",
+  "Folder holding the MCP entry + resources (e.g. 'src/mcp' for Next.js apps)"
+).option("--port <port>", "Server port", "3000").option("--tunnel", "Expose server through a tunnel").action(async (options) => {
   try {
-    const projectPath = path7.resolve(options.path);
+    const projectPath = path8.resolve(options.path);
     const portFlagProvided = process.argv.includes("--port") || process.argv.includes("-p") || process.argv.some((arg) => arg.startsWith("--port=")) || process.argv.some((arg) => arg.startsWith("-p="));
     let port = portFlagProvided ? parseInt(options.port, 10) : parseInt(process.env.PORT || options.port || "3000", 10);
     if (!await isPortAvailable(port)) {
@@ -7008,7 +7362,7 @@ program.command("start").description("Start production server").option("-p, --pa
     let tunnelSubdomain = void 0;
     if (options.tunnel) {
       try {
-        const manifestPath2 = path7.join(projectPath, "dist", "mcp-use.json");
+        const manifestPath2 = path8.join(projectPath, "dist", "mcp-use.json");
         let existingSubdomain;
         try {
           const manifestContent = await readFile3(manifestPath2, "utf-8");
@@ -7063,7 +7417,7 @@ program.command("start").description("Start production server").option("-p, --pa
             manifest.tunnel = {};
           }
           manifest.tunnel.subdomain = subdomain;
-          await mkdir3(path7.dirname(manifestPath2), { recursive: true });
+          await mkdir3(path8.dirname(manifestPath2), { recursive: true });
           await writeFile3(
             manifestPath2,
             JSON.stringify(manifest, null, 2),
@@ -7082,18 +7436,25 @@ program.command("start").description("Start production server").option("-p, --pa
       }
     }
     let serverFile;
-    const manifestPath = path7.join(projectPath, "dist", "mcp-use.json");
+    const manifestPath = path8.join(projectPath, "dist", "mcp-use.json");
     try {
       const manifestContent = await readFile3(manifestPath, "utf-8");
       const manifest = JSON.parse(manifestContent);
       if (manifest.entryPoint) {
-        await access(path7.join(projectPath, manifest.entryPoint));
+        await access(path8.join(projectPath, manifest.entryPoint));
         serverFile = manifest.entryPoint;
       }
     } catch {
     }
     if (!serverFile) {
+      const startMcpDir = options.mcpDir;
       const serverCandidates = [
+        ...startMcpDir ? [
+          `${startMcpDir}/index.ts`,
+          `${startMcpDir}/index.tsx`,
+          `dist/${startMcpDir}/index.js`,
+          `dist/${startMcpDir}/server.js`
+        ] : [],
         "dist/index.js",
         "dist/server.js",
         "dist/src/index.js",
@@ -7101,7 +7462,7 @@ program.command("start").description("Start production server").option("-p, --pa
       ];
       for (const candidate of serverCandidates) {
         try {
-          await access(path7.join(projectPath, candidate));
+          await access(path8.join(projectPath, candidate));
           serverFile = candidate;
           break;
         } catch {
@@ -7125,18 +7486,53 @@ Looked for:
       process.exit(1);
     }
     console.log("Starting production server...");
-    const env2 = {
+    const isNextJsProject = await detectNextJsProject(projectPath);
+    if (isNextJsProject) {
+      console.log(
+        source_default.gray(
+          "Next.js detected \u2014 installing server-runtime shims for the production server"
+        )
+      );
+      await loadNextJsEnvFiles(projectPath);
+    }
+    const baseEnv = {
       ...process.env,
       PORT: String(port),
       NODE_ENV: "production"
     };
     if (mcpUrl) {
-      env2.MCP_URL = mcpUrl;
+      baseEnv.MCP_URL = mcpUrl;
       console.log(source_default.whiteBright(`Tunnel:   ${mcpUrl}/mcp`));
-    } else if (!env2.MCP_URL) {
-      env2.MCP_URL = `http://localhost:${port}`;
+    } else if (!baseEnv.MCP_URL) {
+      baseEnv.MCP_URL = `http://localhost:${port}`;
+    }
+    const env2 = isNextJsProject ? withNextShimsEnv(baseEnv) : baseEnv;
+    const isTsEntry = /\.(ts|tsx|mts|cts)$/.test(serverFile);
+    let spawnCmd = "node";
+    let spawnArgs = [serverFile];
+    if (isTsEntry) {
+      try {
+        const projectRequire = createRequire2(
+          path8.join(projectPath, "package.json")
+        );
+        const tsxPkgPath = projectRequire.resolve("tsx/package.json");
+        const tsxPkg = JSON.parse(await readFile3(tsxPkgPath, "utf-8"));
+        const binField = typeof tsxPkg.bin === "string" ? tsxPkg.bin : tsxPkg.bin?.tsx ?? Object.values(tsxPkg.bin ?? {})[0];
+        if (!binField) throw new Error("tsx bin entry not found");
+        const tsxBin = path8.resolve(path8.dirname(tsxPkgPath), binField);
+        spawnCmd = "node";
+        spawnArgs = [tsxBin, serverFile];
+      } catch (error) {
+        console.log(
+          source_default.yellow(
+            `Could not resolve local tsx (${error instanceof Error ? error.message : String(error)}); falling back to npx`
+          )
+        );
+        spawnCmd = "npx";
+        spawnArgs = ["tsx", serverFile];
+      }
     }
-    const serverProc = spawn("node", [serverFile], {
+    const serverProc = spawn(spawnCmd, spawnArgs, {
       cwd: projectPath,
       stdio: "inherit",
       env: env2
@@ -7202,9 +7598,9 @@ Looked for:
 program.command("login").description("Login to mcp-use cloud").option(
   "--api-key <key>",
   "Login with an API key directly (non-interactive, for CI/CD)"
-).action(async (opts) => {
+).option("--org <slug|id|name>", "Select an organization non-interactively").action(async (opts) => {
   try {
-    await loginCommand({ apiKey: opts.apiKey });
+    await loginCommand({ apiKey: opts.apiKey, org: opts.org });
     process.exit(0);
   } catch (error) {
     console.error(
@@ -7272,7 +7668,7 @@ program.addCommand(createSkillsCommand());
 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 projectPath = path8.resolve(options.path);
   try {
     console.log(source_default.blue("Generating tool registry types..."));
     const success = await generateToolRegistryTypesForServer(