@weavetab/mcp 2.5.0-beta.5 → 2.5.1

package/dist/tools/clipboard.js

@@ -46,18 +46,24 @@ export async function browserClipboard(session, options, _config) {
                 throw new Error("browser_clipboard: image write requires a secure context (https or chrome://). Current page is non-secure (file:// or http://).");
             }
             const mime = mimeType || (dataUrl.includes(';') ? dataUrl.split(';')[0].split(':')[1] : "image/png");
+            // When both text and an image are supplied, put them in a single ClipboardItem
+            // so the plain-text flavor is not silently dropped (Windows keeps both).
+            const textFlavor = hasText
+                ? `itemData['text/plain'] = new Blob([${JSON.stringify(text)}], { type: 'text/plain' });`
+                : "";
             const res = await session.Runtime.evaluate({
-                expression: `(async function() {
-          try {
-            const resp = await fetch(${JSON.stringify(dataUrl)});
-            const blob = await resp.blob();
-            await navigator.clipboard.write([
-              new ClipboardItem({ ${JSON.stringify(mime)}: blob })
-            ]);
-            return "ok";
-          } catch(e) {
-            return "ERR:" + e.message;
-          }
+                expression: `(async function() {
+          try {
+            const resp = await fetch(${JSON.stringify(dataUrl)});
+            const blob = await resp.blob();
+            const itemData = {};
+            itemData[${JSON.stringify(mime)}] = blob;
+            ${textFlavor}
+            await navigator.clipboard.write([ new ClipboardItem(itemData) ]);
+            return "ok";
+          } catch(e) {
+            return "ERR:" + e.message;
+          }
         })()`,
                 awaitPromise: true,
                 returnByValue: true
@@ -77,13 +83,13 @@ export async function browserClipboard(session, options, _config) {
             }
             catch { /* fallback to browser API */ }
             const res = await session.Runtime.evaluate({
-                expression: `(async function() {
-          try {
-            ${secureCtx ? `await navigator.clipboard.writeText(${JSON.stringify(text)});` : `throw new Error('non-secure');`}
-            return true;
-          } catch(e) {
-            return false;
-          }
+                expression: `(async function() {
+          try {
+            ${secureCtx ? `await navigator.clipboard.writeText(${JSON.stringify(text)});` : `throw new Error('non-secure');`}
+            return true;
+          } catch(e) {
+            return false;
+          }
         })()`,
                 awaitPromise: true,
                 returnByValue: true
@@ -116,15 +122,15 @@ export async function browserClipboard(session, options, _config) {
     }
     async function readViaCdpPaste() {
         const { result } = await session.Runtime.evaluate({
-            expression: `(function() {
-        try {
-          var ta = document.createElement('textarea');
-          ta.style.cssText = 'position:fixed;top:-999px;left:-999px;opacity:0;width:1px;height:1px';
-          document.body.appendChild(ta);
-          ta.focus();
-          ta.select();
-          return true;
-        } catch(e) { return false; }
+            expression: `(function() {
+        try {
+          var ta = document.createElement('textarea');
+          ta.style.cssText = 'position:fixed;top:-999px;left:-999px;opacity:0;width:1px;height:1px';
+          document.body.appendChild(ta);
+          ta.focus();
+          ta.select();
+          return true;
+        } catch(e) { return false; }
       })()`,
             returnByValue: true
         });
@@ -134,12 +140,12 @@ export async function browserClipboard(session, options, _config) {
         await session.Input.dispatchKeyEvent({ type: "keyUp", key: "v", windowsVirtualKeyCode: 86, nativeVirtualKeyCode: 86, modifiers: 2 });
         await new Promise(r => setTimeout(r, 100));
         const { result: valRes } = await session.Runtime.evaluate({
-            expression: `(function() {
-        var ta = document.querySelector('textarea[style*="top:-999px"]');
-        if (!ta) return null;
-        var v = ta.value;
-        ta.remove();
-        return v || null;
+            expression: `(function() {
+        var ta = document.querySelector('textarea[style*="top:-999px"]');
+        if (!ta) return null;
+        var v = ta.value;
+        ta.remove();
+        return v || null;
       })()`,
             returnByValue: true
         });
@@ -170,36 +176,36 @@ export async function browserClipboard(session, options, _config) {
         if (!secureCtx)
             return null;
         const res = await session.Runtime.evaluate({
-            expression: `(async function() {
-        try {
-          if (typeof ClipboardItem !== 'undefined') {
-            var items = await navigator.clipboard.read();
-            var textVal = null, dataUrlVal = null;
-            for (var i = 0; i < items.length; i++) {
-              var item = items[i];
-              var types = item.types;
-              for (var j = 0; j < types.length; j++) {
-                var type = types[j];
-                var blob = await item.getType(type);
-                if (type.indexOf('text/') === 0) {
-                  textVal = await blob.text();
-                } else if (type.indexOf('image/') === 0) {
-                  dataUrlVal = await new Promise(function(rsv) {
-                    var r = new FileReader();
-                    r.onload = function() { rsv(r.result); };
-                    r.readAsDataURL(blob);
-                  });
-                }
-              }
-            }
-            if (textVal || dataUrlVal) return JSON.stringify({ text: textVal, dataUrl: dataUrlVal });
-          }
-          var t = await navigator.clipboard.readText();
-          if (t) return JSON.stringify({ text: t });
-          return null;
-        } catch(e) {
-          return 'ERR:' + e.message;
-        }
+            expression: `(async function() {
+        try {
+          if (typeof ClipboardItem !== 'undefined') {
+            var items = await navigator.clipboard.read();
+            var textVal = null, dataUrlVal = null;
+            for (var i = 0; i < items.length; i++) {
+              var item = items[i];
+              var types = item.types;
+              for (var j = 0; j < types.length; j++) {
+                var type = types[j];
+                var blob = await item.getType(type);
+                if (type.indexOf('text/') === 0) {
+                  textVal = await blob.text();
+                } else if (type.indexOf('image/') === 0) {
+                  dataUrlVal = await new Promise(function(rsv) {
+                    var r = new FileReader();
+                    r.onload = function() { rsv(r.result); };
+                    r.readAsDataURL(blob);
+                  });
+                }
+              }
+            }
+            if (textVal || dataUrlVal) return JSON.stringify({ text: textVal, dataUrl: dataUrlVal });
+          }
+          var t = await navigator.clipboard.readText();
+          if (t) return JSON.stringify({ text: t });
+          return null;
+        } catch(e) {
+          return 'ERR:' + e.message;
+        }
       })()`,
             awaitPromise: true,
             returnByValue: true,
@@ -242,17 +248,17 @@ export async function browserClipboard(session, options, _config) {
         try {
             const evalResult = await Promise.race([
                 session.Runtime.evaluate({
-                    expression: `(function() {
-            try {
-              var ta = document.createElement('textarea');
-              ta.style.cssText = 'position:fixed;top:-999px;left:-999px;opacity:0';
-              document.body.appendChild(ta);
-              ta.focus();
-              var ok = document.execCommand('paste');
-              var v = ta.value;
-              ta.remove();
-              return ok && v ? JSON.stringify({ text: v }) : null;
-            } catch(e) { return null; }
+                    expression: `(function() {
+            try {
+              var ta = document.createElement('textarea');
+              ta.style.cssText = 'position:fixed;top:-999px;left:-999px;opacity:0';
+              document.body.appendChild(ta);
+              ta.focus();
+              var ok = document.execCommand('paste');
+              var v = ta.value;
+              ta.remove();
+              return ok && v ? JSON.stringify({ text: v }) : null;
+            } catch(e) { return null; }
           })()`,
                     returnByValue: true
                 }),