auto-webmcp 0.2.6 → 0.2.8

package/dist/analyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAA8H,MAAM,aAAa,CAAC;AACrK,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,6FAA6F;IAC7F,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAKD,iDAAiD;AACjD,wBAAgB,cAAc,IAAI,IAAI,CAErC;AAED,gDAAgD;AAChD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,YAAY,CAMxF;AAkaD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,KAAK,CAAC,gBAAgB,GAAG,mBAAmB,GAAG,iBAAiB,CAAC,EACzE,SAAS,EAAE,iBAAiB,GAAG,gBAAgB,GAAG,IAAI,GACrD,YAAY,CAKd"}
+{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAA8H,MAAM,aAAa,CAAC;AACrK,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,6FAA6F;IAC7F,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAKD,iDAAiD;AACjD,wBAAgB,cAAc,IAAI,IAAI,CAErC;AAED,gDAAgD;AAChD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,YAAY,CAMxF;AAgcD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,KAAK,CAAC,gBAAgB,GAAG,mBAAmB,GAAG,iBAAiB,CAAC,EACzE,SAAS,EAAE,iBAAiB,GAAG,gBAAgB,GAAG,IAAI,GACrD,YAAY,CAKd"}

package/dist/auto-webmcp.cjs.js

@@ -189,15 +189,55 @@ function buildStringSchema(input) {
     prop.maxLength = input.maxLength;
   if (input.pattern)
     prop.pattern = input.pattern;
+  const listId = input.getAttribute("list");
+  if (listId) {
+    const datalist = input.ownerDocument.getElementById(listId);
+    if (datalist instanceof HTMLDataListElement) {
+      const options = Array.from(datalist.options).filter(
+        (o) => !o.disabled && o.value.trim() !== ""
+      );
+      if (options.length > 0) {
+        prop.enum = options.map((o) => o.value.trim());
+        prop.oneOf = options.map((o) => ({
+          const: o.value.trim(),
+          title: o.textContent?.trim() || o.value.trim()
+        }));
+      }
+    }
+  }
   return prop;
 }
 function mapSelectElement(select) {
-  const filtered = Array.from(select.options).filter((o) => o.value !== "");
-  if (filtered.length === 0) {
-    return { type: "string" };
+  const enumValues = [];
+  const oneOf = [];
+  for (const child of Array.from(select.children)) {
+    if (child instanceof HTMLOptGroupElement) {
+      if (child.disabled)
+        continue;
+      const groupLabel = child.label?.trim() ?? "";
+      for (const opt of Array.from(child.children)) {
+        if (!(opt instanceof HTMLOptionElement))
+          continue;
+        if (opt.disabled || opt.value === "")
+          continue;
+        enumValues.push(opt.value);
+        const entry = {
+          const: opt.value,
+          title: opt.text.trim() || opt.value
+        };
+        if (groupLabel)
+          entry.group = groupLabel;
+        oneOf.push(entry);
+      }
+    } else if (child instanceof HTMLOptionElement) {
+      if (child.disabled || child.value === "")
+        continue;
+      enumValues.push(child.value);
+      oneOf.push({ const: child.value, title: child.text.trim() || child.value });
+    }
   }
-  const enumValues = filtered.map((o) => o.value);
-  const oneOf = filtered.map((o) => ({ const: o.value, title: o.text.trim() || o.value }));
+  if (enumValues.length === 0)
+    return { type: "string" };
   return { type: "string", enum: enumValues, oneOf };
 }
 function collectRadioEnum(form, name) {
@@ -404,6 +444,8 @@ function buildSchema(form) {
     const schemaProp = inputTypeToSchema(control);
     if (!schemaProp)
       continue;
+    if (!isControlVisible(control))
+      continue;
     schemaProp.title = inferFieldTitle(control);
     const desc = inferFieldDescription(control);
     if (desc)
@@ -597,6 +639,24 @@ function labelTextWithoutNested(label) {
 function humanizeName(raw) {
   return raw.replace(/[-_]/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2").trim().replace(/\b\w/g, (c) => c.toUpperCase());
 }
+function isControlVisible(el) {
+  const style = window.getComputedStyle(el);
+  if (style.display === "none")
+    return false;
+  if (style.visibility === "hidden")
+    return false;
+  if (el.offsetParent === null && style.position !== "fixed")
+    return false;
+  let node = el;
+  while (node && node !== document.body) {
+    if (node.getAttribute("aria-hidden") === "true")
+      return false;
+    node = node.parentElement;
+  }
+  if (el.closest("fieldset")?.disabled)
+    return false;
+  return true;
+}
 function analyzeOrphanInputGroup(container, inputs, submitBtn) {
   const name = inferOrphanToolName(container, submitBtn);
   const description = inferOrphanToolDescription(container);
@@ -667,6 +727,8 @@ function buildSchemaFromInputs(inputs) {
     const schemaProp = inputTypeToSchema(control);
     if (!schemaProp)
       continue;
+    if (!isControlVisible(control))
+      continue;
     schemaProp.title = inferFieldTitle(control);
     const desc = inferFieldDescription(control);
     if (desc)
@@ -687,6 +749,7 @@ init_registry();
 var pendingExecutions = /* @__PURE__ */ new WeakMap();
 var lastParams = /* @__PURE__ */ new WeakMap();
 var formFieldElements = /* @__PURE__ */ new WeakMap();
+var pendingWarnings = /* @__PURE__ */ new WeakMap();
 var _inputValueSetter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")?.set;
 var _textareaValueSetter = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")?.set;
 var _checkedSetter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "checked")?.set;
@@ -701,22 +764,36 @@ function buildExecuteHandler(form, config, toolName, metadata) {
     return new Promise((resolve, reject) => {
       pendingExecutions.set(form, { resolve, reject });
       if (config.autoSubmit || form.hasAttribute("toolautosubmit") || form.dataset["webmcpAutosubmit"] !== void 0) {
-        setTimeout(() => {
-          fillFormFields(form, params);
-          let submitForm = form;
-          if (!form.isConnected) {
-            const liveBtn = document.querySelector(
-              'button[type="submit"]:not([disabled]), input[type="submit"]:not([disabled])'
-            );
-            const found = liveBtn?.closest("form");
-            if (found) {
-              submitForm = found;
-              pendingExecutions.set(submitForm, { resolve, reject });
-              attachSubmitInterceptor(submitForm, toolName);
+        waitForDomStable(form).then(async () => {
+          try {
+            fillFormFields(form, params);
+            for (let attempt = 0; attempt < 2; attempt++) {
+              const reset = getResetFields(form, params, formFieldElements.get(form));
+              if (reset.length === 0)
+                break;
+              fillFormFields(form, params);
+              await waitForDomStable(form, 400, 100);
             }
+            let submitForm = form;
+            if (!form.isConnected) {
+              const liveBtn = document.querySelector(
+                'button[type="submit"]:not([disabled]), input[type="submit"]:not([disabled])'
+              );
+              const found = liveBtn?.closest("form");
+              if (found) {
+                submitForm = found;
+                pendingExecutions.set(submitForm, { resolve, reject });
+                attachSubmitInterceptor(submitForm, toolName);
+              }
+            }
+            const missing = getMissingRequired(metadata, params);
+            if (missing.length > 0)
+              pendingWarnings.set(submitForm, missing);
+            submitForm.requestSubmit();
+          } catch (err) {
+            reject(err instanceof Error ? err : new Error(String(err)));
           }
-          submitForm.requestSubmit();
-        }, 300);
+        });
       }
     });
   };
@@ -732,7 +809,10 @@ function attachSubmitInterceptor(form, toolName) {
     const { resolve } = pending;
     pendingExecutions.delete(form);
     const formData = serializeFormData(form, lastParams.get(form), formFieldElements.get(form));
-    const text = `Form submitted. Fields: ${JSON.stringify(formData)}`;
+    const missing = pendingWarnings.get(form);
+    pendingWarnings.delete(form);
+    const warningText = missing?.length ? ` Note: required fields were not filled: ${missing.join(", ")}.` : "";
+    const text = `Form submitted. Fields: ${JSON.stringify(formData)}${warningText}`;
     const result = { content: [{ type: "text", text }] };
     if (e.agentInvoked && typeof e.respondWith === "function") {
       e.preventDefault();
@@ -938,6 +1018,50 @@ function fillElement(el, value) {
     fillAriaField(el, value);
   }
 }
+function waitForDomStable(form, maxMs = 800, debounceMs = 150) {
+  return new Promise((resolve) => {
+    let settled = false;
+    let debounceTimer = null;
+    const settle = () => {
+      if (settled)
+        return;
+      settled = true;
+      observer2.disconnect();
+      if (debounceTimer !== null)
+        clearTimeout(debounceTimer);
+      resolve();
+    };
+    const observer2 = new MutationObserver(() => {
+      if (debounceTimer !== null)
+        clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(settle, debounceMs);
+    });
+    observer2.observe(form, { childList: true, subtree: true, attributes: true, characterData: true });
+    setTimeout(settle, maxMs);
+    debounceTimer = setTimeout(settle, debounceMs);
+  });
+}
+function getResetFields(form, params, fieldEls) {
+  const reset = [];
+  for (const [key, expected] of Object.entries(params)) {
+    const el = findNativeField(form, key) ?? (fieldEls?.get(key) ?? null);
+    if (!el)
+      continue;
+    if (el instanceof HTMLInputElement && el.type === "checkbox") {
+      if (el.checked !== Boolean(expected))
+        reset.push(key);
+    } else if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement) {
+      if (el.value !== String(expected ?? ""))
+        reset.push(key);
+    }
+  }
+  return reset;
+}
+function getMissingRequired(metadata, params) {
+  if (!metadata?.inputSchema?.required?.length)
+    return [];
+  return metadata.inputSchema.required.filter((fieldKey) => !(fieldKey in params));
+}
 
 // src/enhancer.ts
 async function enrichMetadata(metadata, enhancer) {