auto-webmcp 0.3.8 → 0.3.10

package/dist/auto-webmcp.esm.js

@@ -631,6 +631,19 @@ function resolveNativeControlFallbackKey(control) {
   }
   return null;
 }
+function resolveAriaElementKey(el) {
+  if (el.dataset["webmcpName"])
+    return sanitizeName(el.dataset["webmcpName"]);
+  if (el.id && !AUTO_GENERATED_ID_RE.test(el.id))
+    return sanitizeName(el.id);
+  const label = el.getAttribute("aria-label");
+  if (label)
+    return sanitizeName(label);
+  const placeholder = el.getAttribute("placeholder");
+  if (placeholder)
+    return sanitizeName(placeholder);
+  return null;
+}
 function collectAriaControls(form) {
   const selector = ARIA_ROLES_TO_SCAN.map((r) => `[role="${r}"]`).join(", ");
   const rawResults = [];
@@ -889,6 +902,22 @@ function buildSchemaFromInputs(inputs) {
   const processedRadioGroups = /* @__PURE__ */ new Set();
   const processedCheckboxGroups = /* @__PURE__ */ new Set();
   for (const control of inputs) {
+    if (!(control instanceof HTMLInputElement) && !(control instanceof HTMLTextAreaElement) && !(control instanceof HTMLSelectElement)) {
+      const fieldKey2 = resolveAriaElementKey(control);
+      if (!fieldKey2)
+        continue;
+      if (!isControlVisible(control))
+        continue;
+      const prop = { type: "string" };
+      prop.title = control.getAttribute("aria-label") ?? fieldKey2;
+      const desc2 = control.getAttribute("aria-description") ?? control.getAttribute("aria-describedby") ? null : null;
+      if (desc2)
+        prop.description = desc2;
+      properties[fieldKey2] = prop;
+      fieldElements.set(fieldKey2, control);
+      required.push(fieldKey2);
+      continue;
+    }
     const rawName = control.name;
     const fieldKey = (rawName ? sanitizeName(rawName) : null) || resolveNativeControlFallbackKey(control);
     if (!fieldKey)
@@ -1284,10 +1313,17 @@ function fillAriaField(el, value) {
   }
   const htmlEl = el;
   if (htmlEl.isContentEditable) {
-    htmlEl.textContent = String(value ?? "");
+    htmlEl.focus();
+    const range = document.createRange();
+    range.selectNodeContents(htmlEl);
+    const sel = window.getSelection();
+    sel?.removeAllRanges();
+    sel?.addRange(range);
+    document.execCommand("insertText", false, String(value ?? ""));
+  } else {
+    el.dispatchEvent(new Event("input", { bubbles: true }));
+    el.dispatchEvent(new Event("change", { bubbles: true }));
   }
-  el.dispatchEvent(new Event("input", { bubbles: true }));
-  el.dispatchEvent(new Event("change", { bubbles: true }));
 }
 function serializeFormData(form, params, fieldEls) {
   const result = {};
@@ -1440,6 +1476,11 @@ async function registerForm(form, config) {
   await registerFormTool(form, metadata, execute);
   registeredForms.add(form);
   registeredFormCount++;
+  const formSubmitBtn = form.querySelector(
+    '[type="submit"], button[data-variant="primary"], button:not([type])'
+  ) ?? null;
+  const pendingBtns = window["__pendingSubmitBtns"] ??= {};
+  pendingBtns[metadata.name] = formSubmitBtn;
   if (config.debug) {
     console.log(`[auto-webmcp] Registered: ${metadata.name}`, metadata);
   }
@@ -1553,12 +1594,12 @@ var ORPHAN_EXCLUDED_TYPES = /* @__PURE__ */ new Set([
 async function scanOrphanInputs(config) {
   if (!isWebMCPSupported())
     return;
-  const SUBMIT_BTN_SELECTOR = '[type="submit"]:not([disabled]), button:not([type]):not([disabled])';
-  const SUBMIT_BTN_GROUPING_SELECTOR = '[type="submit"]';
-  const SUBMIT_TEXT_RE = /subscribe|submit|sign[\s-]?up|send|join|go|search/i;
+  const SUBMIT_BTN_SELECTOR = '[type="submit"]:not([disabled]), button[data-variant="primary"]:not([disabled])';
+  const SUBMIT_BTN_GROUPING_SELECTOR = '[type="submit"], button[data-variant="primary"]';
+  const SUBMIT_TEXT_RE = /subscribe|submit|sign[\s-]?up|send|join|go|search|post|tweet|publish/i;
   const orphanInputs = Array.from(
     document.querySelectorAll(
-      "input:not(form input), textarea:not(form textarea), select:not(form select)"
+      'input:not(form input), textarea:not(form textarea), select:not(form select), [role="textbox"]:not(form [role="textbox"]):not(input):not(textarea), [role="searchbox"]:not(form [role="searchbox"]):not(input):not(textarea), [contenteditable="true"]:not(form [contenteditable="true"]):not(input):not(textarea)'
     )
   ).filter((el) => {
     if (el instanceof HTMLInputElement && ORPHAN_EXCLUDED_TYPES.has(el.type.toLowerCase())) {
@@ -1603,11 +1644,25 @@ async function scanOrphanInputs(config) {
       return r.width > 0 && r.height > 0;
     });
     let submitBtn = allCandidates[allCandidates.length - 1] ?? null;
-    const disabledCandidates = Array.from(
-      container.querySelectorAll(SUBMIT_BTN_GROUPING_SELECTOR)
-    ).filter((b) => b.disabled);
-    if (!submitBtn && disabledCandidates.length > 0) {
-      console.log(`[auto-webmcp] orphan: no enabled submit button found in container \u2014 ${disabledCandidates.length} disabled button(s) present:`, disabledCandidates.map((b) => b.textContent?.trim()));
+    if (!submitBtn) {
+      const disabledCandidates = Array.from(
+        container.querySelectorAll(SUBMIT_BTN_GROUPING_SELECTOR)
+      ).filter((b) => {
+        const r = b.getBoundingClientRect();
+        return r.width > 0 && r.height > 0 && b.disabled;
+      });
+      submitBtn = disabledCandidates[disabledCandidates.length - 1] ?? null;
+      if (submitBtn)
+        console.log(`[auto-webmcp] orphan: using disabled submit button as reference: "${submitBtn.textContent?.trim()}"`);
+    }
+    if (!submitBtn) {
+      const containerBtns = Array.from(container.querySelectorAll("button")).filter((b) => {
+        const r = b.getBoundingClientRect();
+        return r.width > 0 && r.height > 0 && !b.disabled && SUBMIT_TEXT_RE.test(b.textContent ?? "");
+      });
+      submitBtn = containerBtns[containerBtns.length - 1] ?? null;
+      if (submitBtn)
+        console.log(`[auto-webmcp] orphan: using text-matched button in container: "${submitBtn.textContent?.trim()}"`);
     }
     if (!submitBtn) {
       const pageBtns = Array.from(document.querySelectorAll("button")).filter(
@@ -1628,15 +1683,19 @@ async function scanOrphanInputs(config) {
     const AUTO_ID_RE = /^_r_[0-9a-z]+_$/i;
     for (const el of inputs) {
       const id = el.id && !AUTO_ID_RE.test(el.id) ? el.id : null;
-      const key = el.name || el.dataset["webmcpName"] || id || el.getAttribute("aria-label") || (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement ? el.placeholder || null : null) || null;
+      const key = el.name || el.getAttribute("name") || el.dataset["webmcpName"] || id || el.getAttribute("aria-label") || el.getAttribute("placeholder") || null;
       const safeKey = key ? key.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 64) : null;
       const matched = !!(safeKey && schemaProps[safeKey]);
-      console.log(`[auto-webmcp] orphan: field (name="${el.name}" id="${el.id}") rawKey="${key}" safeKey="${safeKey}" matched=${matched}`);
+      console.log(`[auto-webmcp] orphan: field (name="${el.name ?? ""}" id="${el.id}") rawKey="${key}" safeKey="${safeKey}" matched=${matched}`);
       if (matched) {
         inputPairs.push({ key: safeKey, el });
       }
     }
     console.log(`[auto-webmcp] orphan: ${inputPairs.length}/${inputs.length} input(s) mapped to schema keys`);
+    if (inputPairs.length === 0) {
+      console.log(`[auto-webmcp] orphan: skipping group "${metadata.name}" \u2014 no inputs mapped to schema keys`);
+      continue;
+    }
     const toolName = metadata.name;
     const execute = async (params) => {
       console.log(`[auto-webmcp] orphan execute: tool="${toolName}" params=`, params);
@@ -1651,7 +1710,8 @@ async function scanOrphanInputs(config) {
         }
       }
       window.dispatchEvent(new CustomEvent("toolactivated", { detail: { toolName } }));
-      if (!config.autoSubmit) {
+      const shouldAutoSubmit = config.autoSubmit || !!submitBtn?.hasAttribute("toolautosubmit") || submitBtn instanceof HTMLElement && submitBtn.dataset["webmcpAutosubmit"] !== void 0 || container.hasAttribute("toolautosubmit") || container instanceof HTMLElement && container.dataset["webmcpAutosubmit"] !== void 0;
+      if (!shouldAutoSubmit) {
         console.log(`[auto-webmcp] orphan execute: autoSubmit=false, returning without clicking submit`);
         return { content: [{ type: "text", text: "Fields filled. Ready to submit." }] };
       }
@@ -1691,6 +1751,8 @@ async function scanOrphanInputs(config) {
         toolDef.annotations = metadata.annotations;
       }
       await navigator.modelContext.registerTool(toolDef);
+      const pendingBtns = window["__pendingSubmitBtns"] ??= {};
+      pendingBtns[metadata.name] = submitBtn;
       if (config.debug) {
         console.log(`[auto-webmcp] Orphan tool registered: ${metadata.name}`, metadata);
       }