@mcp-use/cli 2.2.3-canary.2 → 2.2.3-canary.4

package/dist/index.js

@@ -1227,9 +1227,13 @@ async function startTunnel(port, subdomain) {
       shell: false
     });
     let resolved = false;
+    let isShuttingDown = false;
     proc.stdout?.on("data", (data) => {
       const text = data.toString();
-      process.stdout.write(text);
+      const isShutdownMessage = text.includes("Shutting down") || text.includes("\u{1F6D1}");
+      if (!isShuttingDown && !isShutdownMessage) {
+        process.stdout.write(text);
+      }
       const urlMatch = text.match(/https?:\/\/([a-z0-9-]+\.[a-z0-9.-]+)/i);
       if (urlMatch && !resolved) {
         const url = urlMatch[0];
@@ -1243,7 +1247,10 @@ async function startTunnel(port, subdomain) {
       }
     });
     proc.stderr?.on("data", (data) => {
-      process.stderr.write(data);
+      const text = data.toString();
+      if (!isShuttingDown && !text.includes("INFO") && !text.includes("bore_cli") && !text.includes("Shutting down")) {
+        process.stderr.write(data);
+      }
     });
     proc.on("error", (error) => {
       if (!resolved) {
@@ -1257,6 +1264,9 @@ async function startTunnel(port, subdomain) {
         reject(new Error(`Tunnel process exited with code ${code}`));
       }
     });
+    proc.markShutdown = () => {
+      isShuttingDown = true;
+    };
     const setupTimeout = setTimeout(() => {
       if (!resolved) {
         proc.kill();
@@ -1476,12 +1486,20 @@ program.command("build").description("Build TypeScript and MCP UI widgets").opti
     await runCommand("npx", ["tsc"], projectPath);
     console.log(import_chalk3.default.green("\u2713 TypeScript build complete!"));
     const manifestPath = import_node_path3.default.join(projectPath, "dist", "mcp-use.json");
+    let existingManifest = {};
+    try {
+      const existingContent = await fs3.readFile(manifestPath, "utf-8");
+      existingManifest = JSON.parse(existingContent);
+    } catch {
+    }
     const widgetsData = {};
     for (const widget of builtWidgets) {
       widgetsData[widget.name] = widget.metadata;
     }
     const includeInspector = !!options.withInspector;
     const manifest = {
+      ...existingManifest,
+      // Preserve existing fields like tunnel
       includeInspector,
       buildTime: (/* @__PURE__ */ new Date()).toISOString(),
       widgets: widgetsData
@@ -1595,6 +1613,7 @@ program.command("start").description("Start production server").option("-p, --pa
     );
     let mcpUrl;
     let tunnelProcess = void 0;
+    let tunnelSubdomain = void 0;
     if (options.tunnel) {
       try {
         const manifestPath = import_node_path3.default.join(projectPath, "dist", "mcp-use.json");
@@ -1614,6 +1633,7 @@ program.command("start").description("Start production server").option("-p, --pa
         mcpUrl = tunnelInfo.url;
         tunnelProcess = tunnelInfo.process;
         const subdomain = tunnelInfo.subdomain;
+        tunnelSubdomain = subdomain;
         try {
           let manifest = {};
           try {
@@ -1631,9 +1651,6 @@ program.command("start").description("Start production server").option("-p, --pa
             JSON.stringify(manifest, null, 2),
             "utf-8"
           );
-          console.log(
-            import_chalk3.default.green(`\u2713 Subdomain saved to mcp-use.json: ${subdomain}`)
-          );
         } catch (error) {
           console.warn(
             import_chalk3.default.yellow(
@@ -1667,8 +1684,25 @@ program.command("start").description("Start production server").option("-p, --pa
       stdio: "inherit",
       env
     });
-    const cleanup = () => {
-      console.log("\n\nShutting down...");
+    let cleanupInProgress = false;
+    const cleanup = async () => {
+      if (cleanupInProgress) {
+        return;
+      }
+      cleanupInProgress = true;
+      console.log(import_chalk3.default.gray("\n\nShutting down..."));
+      if (tunnelProcess && typeof tunnelProcess.markShutdown === "function") {
+        tunnelProcess.markShutdown();
+      }
+      if (tunnelSubdomain) {
+        try {
+          const apiBase = process.env.MCP_USE_API || "https://local.mcp-use.run";
+          await fetch(`${apiBase}/api/tunnels/${tunnelSubdomain}`, {
+            method: "DELETE"
+          });
+        } catch (err) {
+        }
+      }
       const processesToKill = 1 + (tunnelProcess ? 1 : 0);
       let killedCount = 0;
       const checkAndExit = () => {
@@ -1681,7 +1715,7 @@ program.command("start").description("Start production server").option("-p, --pa
       serverProc.kill("SIGTERM");
       if (tunnelProcess && typeof tunnelProcess.kill === "function") {
         tunnelProcess.on("exit", checkAndExit);
-        tunnelProcess.kill("SIGTERM");
+        tunnelProcess.kill("SIGINT");
       } else {
         checkAndExit();
       }
@@ -1693,7 +1727,7 @@ program.command("start").description("Start production server").option("-p, --pa
           tunnelProcess.kill("SIGKILL");
         }
         process.exit(0);
-      }, 1e3);
+      }, 2e3);
     };
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);

package/dist/index.mjs

@@ -1206,9 +1206,13 @@ async function startTunnel(port, subdomain) {
       shell: false
     });
     let resolved = false;
+    let isShuttingDown = false;
     proc.stdout?.on("data", (data) => {
       const text = data.toString();
-      process.stdout.write(text);
+      const isShutdownMessage = text.includes("Shutting down") || text.includes("\u{1F6D1}");
+      if (!isShuttingDown && !isShutdownMessage) {
+        process.stdout.write(text);
+      }
       const urlMatch = text.match(/https?:\/\/([a-z0-9-]+\.[a-z0-9.-]+)/i);
       if (urlMatch && !resolved) {
         const url = urlMatch[0];
@@ -1222,7 +1226,10 @@ async function startTunnel(port, subdomain) {
       }
     });
     proc.stderr?.on("data", (data) => {
-      process.stderr.write(data);
+      const text = data.toString();
+      if (!isShuttingDown && !text.includes("INFO") && !text.includes("bore_cli") && !text.includes("Shutting down")) {
+        process.stderr.write(data);
+      }
     });
     proc.on("error", (error) => {
       if (!resolved) {
@@ -1236,6 +1243,9 @@ async function startTunnel(port, subdomain) {
         reject(new Error(`Tunnel process exited with code ${code}`));
       }
     });
+    proc.markShutdown = () => {
+      isShuttingDown = true;
+    };
     const setupTimeout = setTimeout(() => {
       if (!resolved) {
         proc.kill();
@@ -1455,12 +1465,20 @@ program.command("build").description("Build TypeScript and MCP UI widgets").opti
     await runCommand("npx", ["tsc"], projectPath);
     console.log(chalk3.green("\u2713 TypeScript build complete!"));
     const manifestPath = path3.join(projectPath, "dist", "mcp-use.json");
+    let existingManifest = {};
+    try {
+      const existingContent = await fs3.readFile(manifestPath, "utf-8");
+      existingManifest = JSON.parse(existingContent);
+    } catch {
+    }
     const widgetsData = {};
     for (const widget of builtWidgets) {
       widgetsData[widget.name] = widget.metadata;
     }
     const includeInspector = !!options.withInspector;
     const manifest = {
+      ...existingManifest,
+      // Preserve existing fields like tunnel
       includeInspector,
       buildTime: (/* @__PURE__ */ new Date()).toISOString(),
       widgets: widgetsData
@@ -1574,6 +1592,7 @@ program.command("start").description("Start production server").option("-p, --pa
     );
     let mcpUrl;
     let tunnelProcess = void 0;
+    let tunnelSubdomain = void 0;
     if (options.tunnel) {
       try {
         const manifestPath = path3.join(projectPath, "dist", "mcp-use.json");
@@ -1593,6 +1612,7 @@ program.command("start").description("Start production server").option("-p, --pa
         mcpUrl = tunnelInfo.url;
         tunnelProcess = tunnelInfo.process;
         const subdomain = tunnelInfo.subdomain;
+        tunnelSubdomain = subdomain;
         try {
           let manifest = {};
           try {
@@ -1610,9 +1630,6 @@ program.command("start").description("Start production server").option("-p, --pa
             JSON.stringify(manifest, null, 2),
             "utf-8"
           );
-          console.log(
-            chalk3.green(`\u2713 Subdomain saved to mcp-use.json: ${subdomain}`)
-          );
         } catch (error) {
           console.warn(
             chalk3.yellow(
@@ -1646,8 +1663,25 @@ program.command("start").description("Start production server").option("-p, --pa
       stdio: "inherit",
       env
     });
-    const cleanup = () => {
-      console.log("\n\nShutting down...");
+    let cleanupInProgress = false;
+    const cleanup = async () => {
+      if (cleanupInProgress) {
+        return;
+      }
+      cleanupInProgress = true;
+      console.log(chalk3.gray("\n\nShutting down..."));
+      if (tunnelProcess && typeof tunnelProcess.markShutdown === "function") {
+        tunnelProcess.markShutdown();
+      }
+      if (tunnelSubdomain) {
+        try {
+          const apiBase = process.env.MCP_USE_API || "https://local.mcp-use.run";
+          await fetch(`${apiBase}/api/tunnels/${tunnelSubdomain}`, {
+            method: "DELETE"
+          });
+        } catch (err) {
+        }
+      }
       const processesToKill = 1 + (tunnelProcess ? 1 : 0);
       let killedCount = 0;
       const checkAndExit = () => {
@@ -1660,7 +1694,7 @@ program.command("start").description("Start production server").option("-p, --pa
       serverProc.kill("SIGTERM");
       if (tunnelProcess && typeof tunnelProcess.kill === "function") {
         tunnelProcess.on("exit", checkAndExit);
-        tunnelProcess.kill("SIGTERM");
+        tunnelProcess.kill("SIGINT");
       } else {
         checkAndExit();
       }
@@ -1672,7 +1706,7 @@ program.command("start").description("Start production server").option("-p, --pa
           tunnelProcess.kill("SIGKILL");
         }
         process.exit(0);
-      }, 1e3);
+      }, 2e3);
     };
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-use/cli",
-  "version": "2.2.3-canary.2",
+  "version": "2.2.3-canary.4",
   "description": "Build tool for MCP UI widgets - bundles React components into standalone HTML pages for Model Context Protocol servers",
   "author": "mcp-use, Inc.",
   "license": "MIT",
@@ -44,8 +44,8 @@
     "tsx": "^4.0.0",
     "vite": "^6.0.0",
     "ws": "^8.18.0",
-    "@mcp-use/inspector": "0.5.3-canary.2",
-    "mcp-use": "1.3.3-canary.2"
+    "@mcp-use/inspector": "0.5.3-canary.4",
+    "mcp-use": "1.3.3-canary.4"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",