@mcp-use/cli 3.2.0-canary.10 → 3.2.0-canary.11

package/dist/index.js

@@ -3245,9 +3245,9 @@ function parseDimension(raw, name) {
   return n;
 }
 var AD_HOC_SESSION_NAME = "__screenshot_ad_hoc__";
-async function resolveSessionForScreenshot(options, headers) {
-  if (options.session) {
-    const result = await getOrRestoreSession(options.session);
+async function resolveSessionForScreenshot(options, sessionName, headers) {
+  if (sessionName) {
+    const result = await getOrRestoreSession(sessionName);
     return result?.session ?? null;
   }
   if (options.mcp) {
@@ -3269,12 +3269,12 @@ async function resolveSessionForScreenshot(options, headers) {
   }
   console.error(
     formatError(
-      "No MCP target. Pass --session <name> (a saved server) or --mcp <url> (ad-hoc)."
+      "No MCP target. Pass --mcp <url> for an ad-hoc connection, or use `mcp-use client <name> screenshot` for a saved server."
     )
   );
   return null;
 }
-async function screenshotCommand(options, argsList) {
+async function screenshotCommand(options, argsList, context) {
   let exitCode = 0;
   try {
     if (!options.tool) {
@@ -3291,7 +3291,7 @@ async function screenshotCommand(options, argsList) {
       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`."
+            "--header is only supported with --mcp <url>. Saved servers carry their own auth from `mcp-use client connect`."
           )
         );
         exitCode = 1;
@@ -3320,7 +3320,11 @@ 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, headers);
+    const session = await resolveSessionForScreenshot(
+      options,
+      context.sessionName,
+      headers
+    );
     if (!session) {
       exitCode = 1;
       return;
@@ -3351,13 +3355,13 @@ async function screenshotCommand(options, argsList) {
         console.log("");
         console.log(formatInfo("Usage:"));
         console.log(
-          `  npx mcp-use screenshot --tool ${options.tool} key=value [key2=value2 ...]`
+          `  npx ${context.usagePrefix} --tool ${options.tool} key=value [key2=value2 ...]`
         );
         console.log(
-          `  npx mcp-use screenshot --tool ${options.tool} nested:='{"a":1}'   # JSON value`
+          `  npx ${context.usagePrefix} --tool ${options.tool} nested:='{"a":1}'   # JSON value`
         );
         console.log(
-          `  npx mcp-use screenshot --tool ${options.tool} '{"key":"value"}'   # full JSON object`
+          `  npx ${context.usagePrefix} --tool ${options.tool} '{"key":"value"}'   # full JSON object`
         );
         if (tool.inputSchema) {
           console.log("");
@@ -3401,10 +3405,8 @@ async function screenshotCommand(options, argsList) {
     await cleanupAndExit(exitCode);
   }
 }
-function createScreenshotCommand() {
-  return new Command("screenshot").description(
-    "Render an MCP Apps view headlessly and save a PNG by calling a tool and rendering its UI resource with the result."
-  ).argument(
+function withCommonScreenshotOptions(cmd) {
+  return cmd.argument(
     "[args...]",
     "Tool args as key=value pairs (use key:=<json> for nested values, or pass a single JSON object)."
   ).option(
@@ -3412,18 +3414,7 @@ function createScreenshotCommand() {
     "Tool to call. Its UI resource is rendered with the result."
   ).option("--width <px>", "Browser viewport width in pixels.", "800").option("--height <px>", "Browser viewport height in pixels.", "600").option(
     "--inspector <url>",
-    "Inspector host that serves /inspector/preview/:view. When omitted, probes localhost:3000 then auto-spawns `mcp-use dev`."
-  ).option(
-    "--session <name>",
-    "Saved server name (from `mcp-use client connect <name> <url>`)."
-  ).option(
-    "--mcp <url>",
-    "Ad-hoc MCP server URL (escape hatch). Use when you don't have a saved server. 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,
-    []
+    "Inspector host that serves /inspector/preview/:view. When omitted, auto-spawns `@mcp-use/inspector` on a free port."
   ).option(
     "--theme <light|dark>",
     "Color scheme to render the view in.",
@@ -3441,9 +3432,42 @@ function createScreenshotCommand() {
   ).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);
+  ).option("--quiet", "Suppress dev-server output.");
+}
+function createClientScreenshotCommand() {
+  const cmd = withCommonScreenshotOptions(
+    new Command("screenshot").description(
+      "Render an MCP Apps view headlessly and save a PNG. Connects to an MCP server inline via --mcp; for a saved server, use `mcp-use client <name> screenshot`."
+    )
+  ).option(
+    "--mcp <url>",
+    "Ad-hoc MCP server URL. Required for the top-level form. 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,
+    []
+  );
+  cmd.action(async (args, opts) => {
+    await screenshotCommand(opts, args, {
+      usagePrefix: "mcp-use client screenshot"
+    });
   });
+  return cmd;
+}
+function createPerClientScreenshotCommand(name) {
+  const cmd = withCommonScreenshotOptions(
+    new Command("screenshot").description(
+      `Render an MCP Apps view headlessly using the saved server '${name}'.`
+    )
+  );
+  cmd.action(async (args, opts) => {
+    await screenshotCommand(opts, args, {
+      sessionName: name,
+      usagePrefix: `mcp-use client ${name} screenshot`
+    });
+  });
+  return cmd;
 }
 
 // src/commands/client.ts
@@ -3451,6 +3475,7 @@ var RESERVED_CLIENT_SUBCOMMANDS = /* @__PURE__ */ new Set([
   "connect",
   "list",
   "remove",
+  "screenshot",
   "help"
 ]);
 var PER_CLIENT_SCOPES = /* @__PURE__ */ new Set([
@@ -3459,7 +3484,8 @@ var PER_CLIENT_SCOPES = /* @__PURE__ */ new Set([
   "prompts",
   "auth",
   "disconnect",
-  "interactive"
+  "interactive",
+  "screenshot"
 ]);
 async function connectCommand(name, urlOrCommand, options) {
   if (!name || !urlOrCommand) {
@@ -4297,6 +4323,7 @@ function createClientCommand() {
   clientCommand.command("remove <name>").description(
     "Remove a saved server. Also clears any OAuth tokens for that URL, unless another saved server still uses it."
   ).action(removeClientCommand);
+  clientCommand.addCommand(createClientScreenshotCommand());
   return clientCommand;
 }
 function createPerClientCommand(name) {
@@ -4347,6 +4374,7 @@ function createPerClientCommand(name) {
   authCommand.command("refresh").description("Force-refresh the OAuth access token").action(() => authRefreshCommand(name));
   authCommand.command("logout").description("Remove stored OAuth tokens for this server's URL").action(() => authLogoutCommand(name));
   cmd.addCommand(authCommand);
+  cmd.addCommand(createPerClientScreenshotCommand(name));
   return cmd;
 }
 
@@ -9208,7 +9236,6 @@ program.addCommand(createClientCommand());
 program.addCommand(createDeploymentsCommand());
 program.addCommand(createServersCommand());
 program.addCommand(createSkillsCommand());
-program.addCommand(createScreenshotCommand());
 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) => {