@mcp-use/cli 3.2.0-canary.6 → 3.2.0-canary.8

package/dist/index.js

@@ -2945,52 +2945,67 @@ function waitForDevToolsUrl(child, timeoutMs = 5e3) {
   });
 }
 async function captureScreenshot(opts) {
-  const userDataDir = mkdtempSync(path4.join(os4.tmpdir(), "mcp-use-chrome-"));
-  const chromeArgs = [
-    "--headless=new",
-    "--remote-debugging-port=0",
-    `--user-data-dir=${userDataDir}`,
-    "--no-first-run",
-    "--no-default-browser-check",
-    "--disable-extensions",
-    "--disable-gpu",
-    "--hide-scrollbars",
-    "--mute-audio",
-    `--window-size=${opts.width},${opts.height}`,
-    "about:blank"
-  ];
-  const child = spawn(opts.chromePath, chromeArgs, {
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  child.stdout?.resume();
+  let userDataDir;
+  let child;
   let cdp;
   let cleanedUp = false;
   const cleanup = () => {
     if (cleanedUp) return;
     cleanedUp = true;
     cdp?.close();
-    if (!child.killed) {
+    if (child && !child.killed) {
       try {
         child.kill("SIGTERM");
       } catch {
       }
+      const localChild = child;
       const killTimer = setTimeout(() => {
-        if (!child.killed) {
+        if (!localChild.killed) {
           try {
-            child.kill("SIGKILL");
+            localChild.kill("SIGKILL");
           } catch {
           }
         }
       }, 2e3);
       killTimer.unref();
     }
-    try {
-      rmSync(userDataDir, { recursive: true, force: true });
-    } catch {
+    if (userDataDir) {
+      try {
+        rmSync(userDataDir, { recursive: true, force: true });
+      } catch {
+      }
     }
   };
   try {
-    const wsUrl = await waitForDevToolsUrl(child);
+    let wsUrl;
+    if (opts.cdpUrl) {
+      wsUrl = opts.cdpUrl;
+    } else {
+      if (!opts.chromePath) {
+        throw new Error(
+          "captureScreenshot requires either `cdpUrl` or `chromePath`"
+        );
+      }
+      userDataDir = mkdtempSync(path4.join(os4.tmpdir(), "mcp-use-chrome-"));
+      const chromeArgs = [
+        "--headless=new",
+        "--remote-debugging-port=0",
+        `--user-data-dir=${userDataDir}`,
+        "--no-first-run",
+        "--no-default-browser-check",
+        "--disable-extensions",
+        "--disable-gpu",
+        "--hide-scrollbars",
+        "--mute-audio",
+        `--window-size=${opts.width},${opts.height}`,
+        "about:blank"
+      ];
+      child = spawn(opts.chromePath, chromeArgs, {
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      child.stdout?.resume();
+      wsUrl = await waitForDevToolsUrl(child);
+    }
     const ws = new WebSocket(wsUrl);
     await new Promise((resolve2, reject) => {
       const onOpen = () => {
@@ -3005,14 +3020,47 @@ async function captureScreenshot(opts) {
       ws.once("error", onError);
     });
     cdp = new CdpClient(ws);
-    const { targetId } = await cdp.send(
-      "Target.createTarget",
-      { url: "about:blank" }
-    );
-    const { sessionId } = await cdp.send(
-      "Target.attachToTarget",
-      { targetId, flatten: true }
-    );
+    let sessionId;
+    if (opts.cdpUrl) {
+      const attachPromise = new Promise((resolve2, reject) => {
+        const timer = setTimeout(
+          () => reject(
+            new Error(
+              "Timed out waiting for Target.attachedToTarget event from remote CDP"
+            )
+          ),
+          1e4
+        );
+        const onMessage = (data) => {
+          try {
+            const msg = JSON.parse(data.toString());
+            if (msg.method === "Target.attachedToTarget" && msg.params?.targetInfo?.type === "page" && typeof msg.params.sessionId === "string") {
+              clearTimeout(timer);
+              ws.off("message", onMessage);
+              resolve2(msg.params.sessionId);
+            }
+          } catch {
+          }
+        };
+        ws.on("message", onMessage);
+      });
+      await cdp.send("Target.setAutoAttach", {
+        autoAttach: true,
+        waitForDebuggerOnStart: false,
+        flatten: true
+      });
+      sessionId = await attachPromise;
+    } else {
+      const { targetId } = await cdp.send(
+        "Target.createTarget",
+        { url: "about:blank" }
+      );
+      const attach = await cdp.send(
+        "Target.attachToTarget",
+        { targetId, flatten: true }
+      );
+      sessionId = attach.sessionId;
+    }
     await cdp.send("Page.enable", {}, sessionId);
     await cdp.send(
       "Emulation.setDeviceMetricsOverride",
@@ -3179,6 +3227,31 @@ function resolveChromePath() {
 }
 
 // src/commands/screenshot.ts
+function parseHeaderArg(raw) {
+  const idx = raw.indexOf(":");
+  if (idx === -1) {
+    throw new Error(
+      `Invalid --header value "${raw}". Expected "Key: Value" (e.g. "Authorization: Bearer xyz").`
+    );
+  }
+  const key = raw.slice(0, idx).trim();
+  const value = raw.slice(idx + 1).trim();
+  if (!key) {
+    throw new Error(`Invalid --header value "${raw}". Header name is empty.`);
+  }
+  return [key, value];
+}
+function parseHeaderArgs(args) {
+  const headers = {};
+  for (const raw of args) {
+    const [key, value] = parseHeaderArg(raw);
+    headers[key] = value;
+  }
+  return headers;
+}
+function collectHeader(value, previous = []) {
+  return previous.concat([value]);
+}
 function detectToolResourceUri(tool) {
   if (!tool) return null;
   const meta = tool._meta;
@@ -3192,7 +3265,7 @@ async function captureToolScreenshot(inputs, options = {}) {
   const theme = options.theme ?? "light";
   const timeoutMs = options.timeoutMs ?? 3e4;
   const delayMs = options.delayMs ?? 0;
-  const chromePath = resolveChromePath();
+  const chromePath = options.cdpUrl ? void 0 : resolveChromePath();
   const view = extractViewName(inputs.resourceUri);
   const devOptions = {
     width: String(width),
@@ -3228,6 +3301,7 @@ async function captureToolScreenshot(inputs, options = {}) {
       timeoutMs,
       outputPath,
       chromePath,
+      cdpUrl: options.cdpUrl,
       delayMs: Number.isFinite(delayMs) && delayMs > 0 ? delayMs : 0,
       bundle
     });
@@ -3373,7 +3447,7 @@ function parseDimension(raw, name) {
   return n;
 }
 var AD_HOC_SESSION_NAME = "__screenshot_ad_hoc__";
-async function resolveSessionForScreenshot(options) {
+async function resolveSessionForScreenshot(options, headers) {
   if (options.session) {
     const result2 = await getOrRestoreSession(options.session);
     return result2?.session ?? null;
@@ -3382,6 +3456,7 @@ async function resolveSessionForScreenshot(options) {
     const client = new MCPClient2();
     client.addServer(AD_HOC_SESSION_NAME, {
       url: options.mcp,
+      ...headers ? { headers } : {},
       clientInfo: getCliClientInfo()
     });
     try {
@@ -3409,6 +3484,27 @@ async function screenshotCommand(options, argsList) {
       exitCode = 1;
       return;
     }
+    let headers;
+    if (options.header && options.header.length > 0) {
+      if (!options.mcp) {
+        console.error(
+          formatError(
+            "--header is only supported with --mcp <url>. Saved sessions (use --session) carry their own auth from `mcp-use client connect`."
+          )
+        );
+        exitCode = 1;
+        return;
+      }
+      try {
+        headers = parseHeaderArgs(options.header);
+      } catch (err) {
+        console.error(
+          formatError(err instanceof Error ? err.message : String(err))
+        );
+        exitCode = 1;
+        return;
+      }
+    }
     try {
       resolveChromePath();
     } catch (err) {
@@ -3422,7 +3518,7 @@ async function screenshotCommand(options, argsList) {
     const height = parseDimension(options.height, "height");
     const navTimeout = parseInt(options.timeout, 10) || 3e4;
     const delayMs = options.delay ? parseInt(options.delay, 10) : 0;
-    const session = await resolveSessionForScreenshot(options);
+    const session = await resolveSessionForScreenshot(options, headers);
     if (!session) {
       exitCode = 1;
       return;
@@ -3488,7 +3584,8 @@ async function screenshotCommand(options, argsList) {
         delayMs,
         timeoutMs: navTimeout,
         inspector: options.inspector,
-        quiet: options.quiet
+        quiet: options.quiet,
+        cdpUrl: options.cdpUrl
       }
     );
     console.log(
@@ -3519,7 +3616,12 @@ function createScreenshotCommand() {
     "Saved session name (from `mcp-use client connect`). Defaults to the active session."
   ).option(
     "--mcp <url>",
-    "Ad-hoc MCP server URL (escape hatch). Used only when no --session and no active saved session. No authentication."
+    "Ad-hoc MCP server URL (escape hatch). Used only when no --session and no active saved session. No authentication unless --header is supplied."
+  ).option(
+    "-H, --header <header>",
+    'HTTP header to send to the --mcp <url> server, formatted "Key: Value". Repeatable. Use to pass an Authorization bearer token or other auth headers when screenshotting an authenticated MCP server.',
+    collectHeader,
+    []
   ).option(
     "--theme <light|dark>",
     "Color scheme to render the view in.",
@@ -3534,7 +3636,10 @@ function createScreenshotCommand() {
     "--delay <ms>",
     "Extra wait after readiness, to let chart animations / async layouts settle.",
     "0"
-  ).option("--timeout <ms>", "Navigation + readiness timeout in ms.", "30000").option("--quiet", "Suppress dev-server output.").action(async (args, opts) => {
+  ).option("--timeout <ms>", "Navigation + readiness timeout in ms.", "30000").option(
+    "--cdp-url <url>",
+    "Connect to an existing CDP WebSocket (ws:// or wss://) instead of spawning local Chrome. Useful for hosted browsers like Notte."
+  ).option("--quiet", "Suppress dev-server output.").action(async (args, opts) => {
     await screenshotCommand(opts, args);
   });
 }