@mcp-use/cli 3.5.2-canary.7 → 3.5.2-canary.9

package/dist/index.js

@@ -4031,6 +4031,71 @@ async function describeToolCommand(name, toolName) {
   }
   await cleanupAndExit(0);
 }
+async function processToolScreenshot(session, toolName, args, callResult, options) {
+  const toolWithMeta = session.tools.find((t) => t.name === toolName);
+  const resourceUri = detectToolResourceUri(toolWithMeta);
+  const wantsScreenshot = options?.screenshot === true || options?.screenshotOutput !== void 0 || options?.screenshotDeviceScaleFactor !== void 0;
+  let screenshot = null;
+  let screenshotError = null;
+  let widgetHintUri = null;
+  if (resourceUri) {
+    if (wantsScreenshot) {
+      console.error(
+        formatInfo(`Capturing widget screenshot (${resourceUri})...`)
+      );
+      try {
+        const screenshotOpts = {};
+        if (options?.screenshotOutput) {
+          screenshotOpts.output = options.screenshotOutput;
+        }
+        if (options?.screenshotDeviceScaleFactor) {
+          screenshotOpts.deviceScaleFactor = parseDeviceScaleFactor(
+            options.screenshotDeviceScaleFactor
+          );
+        }
+        const shot = await captureToolScreenshot(
+          {
+            session,
+            toolName,
+            toolArgs: args,
+            toolOutput: callResult,
+            resourceUri
+          },
+          screenshotOpts
+        );
+        screenshot = {
+          path: shot.outputPath,
+          width: shot.width,
+          height: shot.height,
+          view: shot.view
+        };
+      } catch (err) {
+        screenshotError = err?.message ?? String(err);
+      }
+    } else {
+      widgetHintUri = resourceUri;
+    }
+  }
+  if (screenshot) {
+    console.error(
+      formatSuccess(
+        `Saved widget screenshot: ${screenshot.path} (${screenshot.width}\xD7${screenshot.height})`
+      )
+    );
+  }
+  if (screenshotError) {
+    console.error(
+      formatWarning(`Skipped widget screenshot: ${screenshotError}`)
+    );
+  }
+  if (widgetHintUri) {
+    console.error(
+      formatInfo(
+        `This tool renders a widget (${widgetHintUri}). Re-run with --screenshot to save a PNG of it.`
+      )
+    );
+  }
+}
 async function callToolCommand(name, toolName, argsList, options) {
   try {
     const result = await getOrRestoreSession(name);
@@ -4080,74 +4145,12 @@ async function callToolCommand(name, toolName, argsList, options) {
     const callResult = await session.callTool(toolName, args, {
       timeout: options?.timeout
     });
-    const toolWithMeta = session.tools.find((t) => t.name === toolName);
-    const resourceUri = detectToolResourceUri(toolWithMeta);
-    const wantsScreenshot = options?.screenshot === true || options?.screenshotOutput !== void 0 || options?.screenshotDeviceScaleFactor !== void 0;
-    let screenshot = null;
-    let screenshotError = null;
-    let widgetHintUri = null;
-    if (resourceUri) {
-      if (wantsScreenshot) {
-        console.error(
-          formatInfo(`Capturing widget screenshot (${resourceUri})...`)
-        );
-        try {
-          const screenshotOpts = {};
-          if (options?.screenshotOutput) {
-            screenshotOpts.output = options.screenshotOutput;
-          }
-          if (options?.screenshotDeviceScaleFactor) {
-            screenshotOpts.deviceScaleFactor = parseDeviceScaleFactor(
-              options.screenshotDeviceScaleFactor
-            );
-          }
-          const shot = await captureToolScreenshot(
-            {
-              session,
-              toolName,
-              toolArgs: args,
-              toolOutput: callResult,
-              resourceUri
-            },
-            screenshotOpts
-          );
-          screenshot = {
-            path: shot.outputPath,
-            width: shot.width,
-            height: shot.height,
-            view: shot.view
-          };
-        } catch (err) {
-          screenshotError = err?.message ?? String(err);
-        }
-      } else {
-        widgetHintUri = resourceUri;
-      }
-    }
+    await processToolScreenshot(session, toolName, args, callResult, options);
     if (options?.json) {
       console.log(formatJson(callResult));
     } else {
       console.log(formatToolCall(callResult));
     }
-    if (screenshot) {
-      console.error(
-        formatSuccess(
-          `Saved widget screenshot: ${screenshot.path} (${screenshot.width}\xD7${screenshot.height})`
-        )
-      );
-    }
-    if (screenshotError) {
-      console.error(
-        formatWarning(`Skipped widget screenshot: ${screenshotError}`)
-      );
-    }
-    if (widgetHintUri) {
-      console.error(
-        formatInfo(
-          `This tool renders a widget (${widgetHintUri}). Re-run with --screenshot to save a PNG of it.`
-        )
-      );
-    }
     if (callResult.isError) {
       await cleanupAndExit(1);
     }
@@ -4239,6 +4242,14 @@ async function subscribeResourceCommand(name, uri) {
       }
     });
     console.log(formatInfo("Listening for updates... (Press Ctrl+C to stop)"));
+    process.once("SIGINT", async () => {
+      console.log(formatInfo("\nUnsubscribing and shutting down..."));
+      try {
+        await session.unsubscribeFromResource(uri);
+      } catch (e) {
+      }
+      await cleanupAndExit(0);
+    });
     await new Promise(() => {
     });
   } catch (error) {
@@ -4369,7 +4380,7 @@ async function interactiveCommand(name) {
     console.log(source_default.gray("  tools list              - List available tools"));
     console.log(
       source_default.gray(
-        "  tools call <name>       - Call a tool (will prompt for args)"
+        "  tools call <name> [--screenshot] - Call a tool (will prompt for args)"
       )
     );
     console.log(source_default.gray("  tools describe <name>   - Show tool details"));
@@ -4416,6 +4427,7 @@ async function interactiveCommand(name) {
               )
             );
           } else if (command === "call" && arg) {
+            const wantsScreenshot = parts.includes("--screenshot");
             rl.question(
               "Arguments (JSON, or press Enter for none): ",
               async (argsInput) => {
@@ -4423,6 +4435,9 @@ async function interactiveCommand(name) {
                   const args = argsInput.trim() ? JSON.parse(argsInput) : {};
                   const result2 = await session.callTool(arg, args);
                   console.log(formatToolCall(result2));
+                  await processToolScreenshot(session, arg, args, result2, {
+                    screenshot: wantsScreenshot
+                  });
                 } catch (error) {
                   console.error(formatError(error.message));
                 }