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

package/dist/commands/screenshot.d.ts

@@ -13,7 +13,16 @@ interface ScreenshotOptions {
     delay?: string;
     quiet?: boolean;
     timeout: string;
+    cdpUrl?: string;
+    header?: string[];
 }
+/**
+ * Curl-style `Key: Value` parser. Splits on the first `:` so values may
+ * contain colons, and trims both sides so `Authorization:Bearer xyz` and
+ * `Authorization: Bearer xyz` are equivalent.
+ */
+export declare function parseHeaderArg(raw: string): [string, string];
+export declare function parseHeaderArgs(args: string[]): Record<string, string>;
 /**
  * Inspect a tool's `_meta` for the UI resource URI it renders, if any. Falls back
  * to the OpenAI Apps `openai/outputTemplate` key for cross-ecosystem compatibility.
@@ -38,6 +47,12 @@ export interface CaptureToolScreenshotOptions {
     timeoutMs?: number;
     inspector?: string;
     quiet?: boolean;
+    /**
+     * Pre-existing CDP WebSocket URL. When set, the screenshot is captured via
+     * the remote browser instead of spawning a local Chrome. The inspector URL
+     * must be reachable from that remote browser.
+     */
+    cdpUrl?: string;
 }
 export interface CaptureToolScreenshotResult {
     outputPath: string;

package/dist/commands/screenshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../src/commands/screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAkBjD,UAAU,iBAAiB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AASD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG,SAAS,GAAG,IAAI,GAC3D,MAAM,GAAG,IAAI,CAUf;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,2BAA2B;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,2BAA2B,EACnC,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,2BAA2B,CAAC,CAyDtC;AAqLD;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,OAAa,GAAG,MAAM,CAKzD;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAK3D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMhE;AAyCD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC,CAmHf;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAkDjD"}
+{"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../src/commands/screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAkBjD,UAAU,iBAAiB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAa5D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOtE;AAaD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG,SAAS,GAAG,IAAI,GAC3D,MAAM,GAAG,IAAI,CAUf;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,2BAA2B;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,2BAA2B,EACnC,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,2BAA2B,CAAC,CA0DtC;AAqLD;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,OAAa,GAAG,MAAM,CAKzD;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAK3D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMhE;AA2CD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC,CA0If;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CA4DjD"}

package/dist/index.cjs

@@ -2958,52 +2958,67 @@ function waitForDevToolsUrl(child, timeoutMs = 5e3) {
   });
 }
 async function captureScreenshot(opts) {
-  const userDataDir = (0, import_node_fs6.mkdtempSync)(import_node_path4.default.join(import_node_os5.default.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 = (0, import_node_child_process8.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 {
-      (0, import_node_fs6.rmSync)(userDataDir, { recursive: true, force: true });
-    } catch {
+    if (userDataDir) {
+      try {
+        (0, import_node_fs6.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 = (0, import_node_fs6.mkdtempSync)(import_node_path4.default.join(import_node_os5.default.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 = (0, import_node_child_process8.spawn)(opts.chromePath, chromeArgs, {
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      child.stdout?.resume();
+      wsUrl = await waitForDevToolsUrl(child);
+    }
     const ws = new import_ws.default(wsUrl);
     await new Promise((resolve2, reject) => {
       const onOpen = () => {
@@ -3018,14 +3033,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",
@@ -3192,6 +3240,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;
@@ -3205,7 +3278,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),
@@ -3241,6 +3314,7 @@ async function captureToolScreenshot(inputs, options = {}) {
       timeoutMs,
       outputPath,
       chromePath,
+      cdpUrl: options.cdpUrl,
       delayMs: Number.isFinite(delayMs) && delayMs > 0 ? delayMs : 0,
       bundle
     });
@@ -3386,7 +3460,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;
@@ -3395,6 +3469,7 @@ async function resolveSessionForScreenshot(options) {
     const client = new import_client2.MCPClient();
     client.addServer(AD_HOC_SESSION_NAME, {
       url: options.mcp,
+      ...headers ? { headers } : {},
       clientInfo: getCliClientInfo()
     });
     try {
@@ -3422,6 +3497,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) {
@@ -3435,7 +3531,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;
@@ -3501,7 +3597,8 @@ async function screenshotCommand(options, argsList) {
         delayMs,
         timeoutMs: navTimeout,
         inspector: options.inspector,
-        quiet: options.quiet
+        quiet: options.quiet,
+        cdpUrl: options.cdpUrl
       }
     );
     console.log(
@@ -3532,7 +3629,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.",
@@ -3547,7 +3649,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);
   });
 }