auto-webmcp 0.3.6 → 0.3.8

package/dist/auto-webmcp.esm.js

@@ -611,13 +611,14 @@ function buildSchema(form) {
       required.push(key);
     }
   }
-  return { schema: { type: "object", properties, required }, fieldElements };
+  return { schema: { "$schema": "https://json-schema.org/draft/2020-12/schema", type: "object", properties, required }, fieldElements };
 }
+var AUTO_GENERATED_ID_RE = /^_r_[0-9a-z]+_$|^:[a-z0-9]+:$/i;
 function resolveNativeControlFallbackKey(control) {
   const el = control;
   if (el.dataset["webmcpName"])
     return sanitizeName(el.dataset["webmcpName"]);
-  if (control.id)
+  if (control.id && !AUTO_GENERATED_ID_RE.test(control.id))
     return sanitizeName(control.id);
   const label = control.getAttribute("aria-label");
   if (label)
@@ -816,7 +817,24 @@ function analyzeOrphanInputGroup(container, inputs, submitBtn) {
   const name = inferOrphanToolName(container, submitBtn);
   const description = inferOrphanToolDescription(container);
   const { schema: inputSchema, fieldElements } = buildSchemaFromInputs(inputs);
-  return { name, description, inputSchema, fieldElements };
+  const annotations = inferOrphanAnnotations(submitBtn);
+  return { name, description, inputSchema, annotations, fieldElements };
+}
+function inferOrphanAnnotations(submitBtn) {
+  const annotations = {};
+  const submitText = submitBtn instanceof HTMLInputElement ? submitBtn.value.trim() : submitBtn?.textContent?.trim() ?? "";
+  if (READONLY_BUTTON_PATTERNS.test(submitText)) {
+    annotations.readOnlyHint = true;
+    annotations.idempotentHint = true;
+  }
+  if (DESTRUCTIVE_BUTTON_PATTERNS.test(submitText)) {
+    annotations.destructiveHint = true;
+  }
+  if (annotations.readOnlyHint !== true) {
+    annotations.openWorldHint = true;
+  }
+  const hasNonDefault = annotations.readOnlyHint === true || annotations.destructiveHint === true || annotations.idempotentHint === true || annotations.openWorldHint === false;
+  return hasNonDefault ? annotations : {};
 }
 function inferOrphanToolName(container, submitBtn) {
   if (submitBtn) {
@@ -871,8 +889,8 @@ function buildSchemaFromInputs(inputs) {
   const processedRadioGroups = /* @__PURE__ */ new Set();
   const processedCheckboxGroups = /* @__PURE__ */ new Set();
   for (const control of inputs) {
-    const name = control.name;
-    const fieldKey = name || resolveNativeControlFallbackKey(control);
+    const rawName = control.name;
+    const fieldKey = (rawName ? sanitizeName(rawName) : null) || resolveNativeControlFallbackKey(control);
     if (!fieldKey)
       continue;
     if (control instanceof HTMLInputElement && control.type === "radio") {
@@ -911,12 +929,12 @@ function buildSchemaFromInputs(inputs) {
       }
     }
     properties[fieldKey] = schemaProp;
-    if (!name)
+    if (!rawName)
       fieldElements.set(fieldKey, control);
     if (control.required)
       required.push(fieldKey);
   }
-  return { schema: { type: "object", properties, required }, fieldElements };
+  return { schema: { "$schema": "https://json-schema.org/draft/2020-12/schema", type: "object", properties, required }, fieldElements };
 }
 
 // src/discovery.ts
@@ -1423,7 +1441,7 @@ async function registerForm(form, config) {
   registeredForms.add(form);
   registeredFormCount++;
   if (config.debug) {
-    console.debug(`[auto-webmcp] Registered: ${metadata.name}`, metadata);
+    console.log(`[auto-webmcp] Registered: ${metadata.name}`, metadata);
   }
   emit("form:registered", form, metadata.name);
 }
@@ -1435,7 +1453,7 @@ async function unregisterForm(form, config) {
   await unregisterFormTool(form);
   registeredForms.delete(form);
   if (config.debug) {
-    console.debug(`[auto-webmcp] Unregistered: ${name}`);
+    console.log(`[auto-webmcp] Unregistered: ${name}`);
   }
   emit("form:unregistered", form, name);
 }
@@ -1536,7 +1554,7 @@ 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"], button:not([type])';
+  const SUBMIT_BTN_GROUPING_SELECTOR = '[type="submit"]';
   const SUBMIT_TEXT_RE = /subscribe|submit|sign[\s-]?up|send|join|go|search/i;
   const orphanInputs = Array.from(
     document.querySelectorAll(
@@ -1544,11 +1562,17 @@ async function scanOrphanInputs(config) {
     )
   ).filter((el) => {
     if (el instanceof HTMLInputElement && ORPHAN_EXCLUDED_TYPES.has(el.type.toLowerCase())) {
+      console.log(`[auto-webmcp] orphan: skipping excluded type "${el.type}" (name="${el.name}" id="${el.id}")`);
       return false;
     }
     const rect = el.getBoundingClientRect();
-    return rect.width > 0 && rect.height > 0;
+    if (rect.width === 0 || rect.height === 0) {
+      console.log(`[auto-webmcp] orphan: skipping invisible input (name="${el.name}" id="${el.id}")`);
+      return false;
+    }
+    return true;
   });
+  console.log(`[auto-webmcp] orphan: found ${orphanInputs.length} visible orphan input(s)`);
   if (orphanInputs.length === 0)
     return;
   const groups = /* @__PURE__ */ new Map();
@@ -1565,10 +1589,12 @@ async function scanOrphanInputs(config) {
       }
       container = container.parentElement;
     }
+    console.log(`[auto-webmcp] orphan: input (name="${input.name}" id="${input.id}") grouped into container`, foundContainer);
     if (!groups.has(foundContainer))
       groups.set(foundContainer, []);
     groups.get(foundContainer).push(input);
   }
+  console.log(`[auto-webmcp] orphan: ${groups.size} group(s) found`);
   for (const [container, inputs] of groups) {
     const allCandidates = Array.from(
       container.querySelectorAll(SUBMIT_BTN_SELECTOR)
@@ -1577,6 +1603,12 @@ 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 pageBtns = Array.from(document.querySelectorAll("button")).filter(
         (b) => {
@@ -1585,36 +1617,82 @@ async function scanOrphanInputs(config) {
         }
       );
       submitBtn = pageBtns[pageBtns.length - 1] ?? null;
+      if (submitBtn)
+        console.log(`[auto-webmcp] orphan: using page-wide fallback submit button: "${submitBtn.textContent?.trim()}"`);
     }
+    console.log(`[auto-webmcp] orphan: submit button for group:`, submitBtn ? `"${submitBtn.textContent?.trim()}" disabled=${submitBtn.disabled}` : "none");
     const metadata = analyzeOrphanInputGroup(container, inputs, submitBtn);
+    console.log(`[auto-webmcp] orphan: tool="${metadata.name}" schema keys:`, Object.keys(metadata.inputSchema.properties));
     const inputPairs = [];
     const schemaProps = metadata.inputSchema.properties;
+    const AUTO_ID_RE = /^_r_[0-9a-z]+_$/i;
     for (const el of inputs) {
-      const key = el.name || el.dataset["webmcpName"] || el.id || el.getAttribute("aria-label") || null;
+      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 safeKey = key ? key.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 64) : null;
-      if (safeKey && schemaProps[safeKey]) {
+      const matched = !!(safeKey && schemaProps[safeKey]);
+      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`);
     const toolName = metadata.name;
     const execute = async (params) => {
+      console.log(`[auto-webmcp] orphan execute: tool="${toolName}" params=`, params);
+      console.log(`[auto-webmcp] orphan execute: inputPairs=`, inputPairs.map((p) => p.key));
       for (const { key, el } of inputPairs) {
         if (params[key] !== void 0) {
+          console.log(`[auto-webmcp] orphan execute: filling key="${key}" value=`, params[key], "element=", el);
           fillElement(el, params[key]);
+          console.log(`[auto-webmcp] orphan execute: after fill, element value=`, el.value);
+        } else {
+          console.log(`[auto-webmcp] orphan execute: key="${key}" not in params, skipping`);
         }
       }
       window.dispatchEvent(new CustomEvent("toolactivated", { detail: { toolName } }));
-      return { content: [{ type: "text", text: "Fields filled. Ready to submit." }] };
+      if (!config.autoSubmit) {
+        console.log(`[auto-webmcp] orphan execute: autoSubmit=false, returning without clicking submit`);
+        return { content: [{ type: "text", text: "Fields filled. Ready to submit." }] };
+      }
+      console.log(`[auto-webmcp] orphan execute: polling for enabled submit button (up to 2s)...`);
+      let btn = null;
+      const deadline = Date.now() + 2e3;
+      while (Date.now() < deadline) {
+        const candidates = Array.from(
+          container.querySelectorAll(SUBMIT_BTN_SELECTOR)
+        ).filter((b) => {
+          const r = b.getBoundingClientRect();
+          return r.width > 0 && r.height > 0;
+        });
+        const last = candidates[candidates.length - 1] ?? null;
+        if (last) {
+          btn = last;
+          break;
+        }
+        await new Promise((r) => setTimeout(r, 100));
+      }
+      if (!btn) {
+        console.warn(`[auto-webmcp] orphan execute: submit button still disabled after 2s`);
+        return { content: [{ type: "text", text: "Fields filled but the submit button is still disabled. The page may require additional input before submitting." }] };
+      }
+      console.log(`[auto-webmcp] orphan execute: clicking submit button "${btn.textContent?.trim()}"`);
+      btn.click();
+      return { content: [{ type: "text", text: "Fields filled and form submitted." }] };
     };
     try {
-      await navigator.modelContext.registerTool({
+      const toolDef = {
         name: metadata.name,
         description: metadata.description,
         inputSchema: metadata.inputSchema,
         execute
-      });
+      };
+      if (metadata.annotations && Object.keys(metadata.annotations).length > 0) {
+        toolDef.annotations = metadata.annotations;
+      }
+      await navigator.modelContext.registerTool(toolDef);
       if (config.debug) {
-        console.debug(`[auto-webmcp] Orphan tool registered: ${metadata.name}`, metadata);
+        console.log(`[auto-webmcp] Orphan tool registered: ${metadata.name}`, metadata);
       }
     } catch {
     }