@trusty-squire/mcp 0.1.11 → 0.1.12

package/dist/bot/agent.d.ts

@@ -1,4 +1,4 @@
-import type { BrowserController, CaptchaVariant } from "./browser.js";
+import type { BrowserController, CaptchaVariant, InteractiveElement } from "./browser.js";
 import { type LLMClient, type LLMPair } from "./llm-client.js";
 export interface AgentInbox {
     waitForEmail(input: {
@@ -95,7 +95,9 @@ export type PostVerifyStep = {
 };
 declare const FILL_VALUE_KINDS: readonly ["email", "password", "name", "username", "company", "literal"];
 type FillValueKind = (typeof FILL_VALUE_KINDS)[number];
-export declare function parseSignupPlan(raw: string): SignupPlan;
+export declare function parseSignupPlan(raw: string, allowedSelectors?: ReadonlySet<string>): SignupPlan;
+export declare function formatInventory(inventory: readonly InteractiveElement[]): string;
+export declare function isOauthOnlyChooser(inventory: readonly InteractiveElement[]): boolean;
 export declare function parsePostVerifyStep(raw: string): PostVerifyStep;
 export declare function extractApiKeyFromText(text: string): string | null;
 export declare function pickVerificationLink(links: readonly string[]): string | null;
@@ -108,6 +110,9 @@ export declare class SignupAgent {
     private resultTail;
     private runCaptchaGate;
     private executePlan;
+    private planExecuteWithRetry;
+    private buildInventory;
+    private verifyPlan;
     constructor(browser: BrowserController, llm?: LLMClient | LLMPair);
     get backends(): readonly string[];
     private callLLM;
@@ -116,7 +121,6 @@ export declare class SignupAgent {
     signup(task: SignupTask): Promise<SignupResult>;
     private runSignup;
     private planSignupForm;
-    private extractFormHtml;
     private looksLikeValidationFailure;
     private pickVerificationLink;
     private waitForVerificationEmail;

package/dist/bot/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/bot/agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/bot/agent.ts"],"names":[],"mappings":"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"}

package/dist/bot/agent.js

@@ -7,6 +7,7 @@
 // The "plan" is a small JSON schema Claude emits, so this file stays a thin
 // executor; the prompt is the contract. If a service breaks we tweak the
 // prompt rather than threading service-specific logic through the agent.
+import { rankAndCapInventory, scoreSignupButton } from "./browser.js";
 import { saveDebugSnapshot } from "./debug.js";
 import { wasRecentlyPrewarmed, recordPrewarmSuccess } from "./prewarm-cache.js";
 import { pickLLMPair, } from "./llm-client.js";
@@ -134,7 +135,7 @@ function validateAction(value, index) {
             throw new Error(`action[${index}]: unknown kind ${JSON.stringify(kind)}`);
     }
 }
-export function parseSignupPlan(raw) {
+export function parseSignupPlan(raw, allowedSelectors) {
     const obj = extractJsonObject(raw);
     const rawActions = obj["actions"];
     if (!Array.isArray(rawActions)) {
@@ -146,11 +147,77 @@ export function parseSignupPlan(raw) {
     if (confidence !== "high" && confidence !== "medium" && confidence !== "low") {
         throw new Error(`signup plan: invalid confidence ${JSON.stringify(confidence)}`);
     }
+    // F3 T4: when the page inventory is supplied, every selector the
+    // planner emits must be one the bot computed and put in the
+    // inventory. This makes selector hallucination a parse-time
+    // rejection (the throw triggers a re-plan) before any DOM
+    // round-trip — and an invalid selector like `:contains()` simply
+    // isn't in the inventory, so it is caught here too.
+    if (allowedSelectors !== undefined) {
+        for (const a of actions) {
+            if (!allowedSelectors.has(a.selector)) {
+                throw new Error(`signup plan: action selector ${JSON.stringify(a.selector)} is not in the page inventory`);
+            }
+        }
+        if (!allowedSelectors.has(submitSelector)) {
+            throw new Error(`signup plan: submit_selector ${JSON.stringify(submitSelector)} is not in the page inventory`);
+        }
+    }
     const notes = typeof obj["notes"] === "string" ? obj["notes"] : undefined;
     return notes !== undefined
         ? { actions, submit_selector: submitSelector, confidence, notes }
         : { actions, submit_selector: submitSelector, confidence };
 }
+// Render the element inventory as a compact text block for the
+// planner — one line per element, ending with the verified
+// `selector=` the planner must copy verbatim (F3 T3).
+export function formatInventory(inventory) {
+    if (inventory.length === 0)
+        return "(no interactive elements found on the page)";
+    return inventory
+        .map((e) => {
+        const bits = [`[${e.index}] ${e.tag}`];
+        if (e.type !== null)
+            bits.push(`type=${e.type}`);
+        if (e.name !== null)
+            bits.push(`name=${e.name}`);
+        if (e.placeholder !== null) {
+            bits.push(`placeholder=${JSON.stringify(e.placeholder)}`);
+        }
+        const label = e.labelText ?? e.ariaLabel;
+        if (label !== null && label !== undefined) {
+            bits.push(`label=${JSON.stringify(label)}`);
+        }
+        if (e.tag !== "input" &&
+            e.tag !== "textarea" &&
+            e.tag !== "select" &&
+            e.visibleText !== null) {
+            bits.push(`text=${JSON.stringify(e.visibleText)}`);
+        }
+        if (e.inConsentWidget)
+            bits.push("[cookie-consent — avoid]");
+        bits.push(`selector=${e.selector}`);
+        return bits.join("  ");
+    })
+        .join("\n");
+}
+// True when the page has no fillable text input AND no button that
+// reads as an email-signup option — a genuinely OAuth/SSO-only
+// service with no form to automate (F3 Issue 4).
+export function isOauthOnlyChooser(inventory) {
+    const TEXTLIKE = new Set([
+        "text",
+        "email",
+        "password",
+        "tel",
+        null,
+    ]);
+    const hasFillableInput = inventory.some((e) => (e.tag === "input" && TEXTLIKE.has(e.type)) || e.tag === "textarea");
+    if (hasFillableInput)
+        return false;
+    const hasEmailOption = inventory.some((e) => scoreSignupButton(`${e.visibleText ?? ""} ${e.ariaLabel ?? ""} ${e.labelText ?? ""}`) > 0);
+    return !hasEmailOption;
+}
 export function parsePostVerifyStep(raw) {
     const obj = extractJsonObject(raw);
     const kind = obj["kind"];
@@ -363,16 +430,31 @@ export class SignupAgent {
     // the initial-plan and the validation re-plan paths so the step
     // logging stays consistent (the re-plan copy historically dropped
     // the per-action steps.push entries the initial path had).
-    async executePlan(plan, fillValues, steps) {
+    async executePlan(plan, fillValues, steps, bySelector) {
         for (const action of plan.actions) {
+            const el = bySelector.get(action.selector);
+            // Belt-and-suspenders: the planner is told to skip
+            // cookie-consent elements; never act on one even if it slips
+            // through (Render's TOS check hit an Osano consent toggle).
+            if (el !== undefined && el.inConsentWidget) {
+                steps.push(`Skip ${action.kind} ${action.selector} — inside a cookie-consent widget`);
+                continue;
+            }
             try {
                 if (action.kind === "fill") {
                     // `literal` is per-action; everything else is a fixed value.
                     const value = action.value_kind === "literal"
                         ? action.literal ?? ""
                         : fillValues[action.value_kind];
-                    steps.push(`Fill ${action.value_kind} → ${action.selector}`);
-                    await this.browser.type(action.selector, value);
+                    if (el !== undefined && el.tag === "select") {
+                        // A <select> needs selectOption, not type() (Sentry bug).
+                        steps.push(`Select ${action.selector}`);
+                        await this.browser.selectOption(action.selector);
+                    }
+                    else {
+                        steps.push(`Fill ${action.value_kind} → ${action.selector}`);
+                        await this.browser.type(action.selector, value);
+                    }
                 }
                 else if (action.kind === "check") {
                     steps.push(`Check ${action.selector} (${action.reason})`);
@@ -389,6 +471,153 @@ export class SignupAgent {
             }
         }
     }
+    // F3 T5: the verify-and-replan loop. Builds a DOM-grounded element
+    // inventory, has the planner pick from it, verifies the picks
+    // resolve, executes, and submits. A bad pick re-plans instead of
+    // cascading through 10s timeouts. Replan caps are split (Tension
+    // 3): a selector-miss ("the bot erred") is capped tight; a reveal
+    // click or a post-submit validation error ("the page advanced")
+    // gets more headroom. All bounded by the 15-call LLM breaker + the
+    // F2 top-level deadline.
+    async planExecuteWithRetry(task, fillValues, steps) {
+        const MAX_ERROR_REPLANS = 2;
+        const MAX_PROGRESS_REPLANS = 4;
+        let errorReplans = 0;
+        let progressReplans = 0;
+        let hint;
+        for (;;) {
+            await this.browser.waitForFormReady();
+            await saveDebugSnapshot(this.browser, "before-fill");
+            const state = await this.browser.getState();
+            const inventory = await this.buildInventory(steps);
+            // OAuth-only: no fillable input AND no button that reads as an
+            // email-signup option — nothing to automate (Issue 4).
+            if (isOauthOnlyChooser(inventory)) {
+                return { kind: "oauth_required" };
+            }
+            steps.push("Asking Claude to plan the signup form fill...");
+            let plan;
+            try {
+                plan = await this.planSignupForm({
+                    service: task.service,
+                    url: state.url,
+                    inventory,
+                    screenshot: state.screenshot,
+                    ...(hint !== undefined ? { hint } : {}),
+                });
+            }
+            catch (err) {
+                // Parse/validation failure — includes a hallucinated selector
+                // rejected by the inventory check. An error replan.
+                const reason = err instanceof Error ? err.message : String(err);
+                if (++errorReplans > MAX_ERROR_REPLANS) {
+                    return { kind: "planning_failed", reason: `planner output never validated: ${reason}` };
+                }
+                steps.push(`⚠ plan rejected (${reason}) — re-planning`);
+                hint =
+                    "Your previous plan used a selector not in the inventory. Use ONLY selectors copied verbatim from a `selector=` field.";
+                continue;
+            }
+            steps.push(`Plan: ${plan.actions.length} action(s), confidence=${plan.confidence}` +
+                (plan.notes !== undefined ? ` — ${plan.notes}` : ""));
+            // Verify the picks resolve on the live page — also catches a
+            // stale selector resolving to a recycled wrong node (Tension 4).
+            const bySelector = new Map(inventory.map((e) => [e.selector, e]));
+            const miss = await this.verifyPlan(plan, bySelector);
+            if (miss !== null) {
+                if (++errorReplans > MAX_ERROR_REPLANS) {
+                    return { kind: "planning_failed", reason: `planned selectors kept missing: ${miss}` };
+                }
+                steps.push(`⚠ planned selectors did not verify (${miss}) — re-planning`);
+                hint = `These selectors did not resolve correctly: ${miss}. Pick different inventory entries.`;
+                continue;
+            }
+            await this.executePlan(plan, fillValues, steps, bySelector);
+            // A plan with no fill actions only revealed/advanced the page (a
+            // cookie banner, a two-stage "sign up with email" chooser) — the
+            // real form should now be present. Re-extract and plan it.
+            const hadFill = plan.actions.some((a) => a.kind === "fill");
+            if (!hadFill) {
+                if (++progressReplans > MAX_PROGRESS_REPLANS) {
+                    return { kind: "planning_failed", reason: "never reached a fillable form" };
+                }
+                steps.push("Plan only revealed the page — re-planning the now-visible form");
+                hint =
+                    "The previous step revealed or advanced the page. Plan the signup form that should now be visible.";
+                continue;
+            }
+            // Captcha gate + submit.
+            const preGate = await this.runCaptchaGate("Pre-submit", steps);
+            if (preGate.blocked)
+                return { kind: "captcha_blocked", captchaKind: preGate.kind };
+            steps.push(`Submit → ${plan.submit_selector}`);
+            try {
+                await this.browser.clickSubmit(plan.submit_selector);
+            }
+            catch (err) {
+                const reason = err instanceof Error ? err.message : String(err);
+                steps.push(`⚠ submit click failed: ${reason}`);
+                return { kind: "submit_failed", reason };
+            }
+            await this.browser.wait(5);
+            const postGate = await this.runCaptchaGate("Post-submit", steps);
+            if (postGate.blocked)
+                return { kind: "captcha_blocked", captchaKind: postGate.kind };
+            if (postGate.found && postGate.solved) {
+                // Re-click submit so the populated token ships with the form.
+                try {
+                    await this.browser.click(plan.submit_selector);
+                    await this.browser.wait(3);
+                }
+                catch (err) {
+                    steps.push(`⚠ post-captcha submit retry failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
+            }
+            // Post-submit validation errors → the page advanced; re-plan
+            // against the new state (a progress replan).
+            const afterText = (await this.browser.extractText()).slice(0, 4000);
+            if (this.looksLikeValidationFailure(afterText)) {
+                if (++progressReplans > MAX_PROGRESS_REPLANS) {
+                    // Out of replan headroom — proceed; credential extraction
+                    // confirms whether the signup actually went through.
+                    return { kind: "submitted" };
+                }
+                steps.push("Post-submit validation errors — re-planning");
+                hint = `The previous submit produced validation errors. Visible page text: ${afterText.slice(0, 600)}`;
+                continue;
+            }
+            return { kind: "submitted" };
+        }
+    }
+    // Extract + rank the page's interactive elements (F3 T1/T2).
+    async buildInventory(steps) {
+        const raw = await this.browser.extractInteractiveElements();
+        const { inventory, buttonsDropped } = rankAndCapInventory(raw);
+        steps.push(`Inventory: ${inventory.length} element(s)` +
+            (buttonsDropped > 0 ? ` (${buttonsDropped} low-ranked button(s) dropped)` : ""));
+        return inventory;
+    }
+    // Verify every selector the plan references still resolves on the
+    // live page, and — when the inventory entry had an id — that it
+    // resolves to that same element (Tension 4: a stale structural
+    // selector can resolve to a recycled wrong node). Returns a
+    // human-readable miss list, or null when every selector is good.
+    async verifyPlan(plan, bySelector) {
+        const selectors = [...plan.actions.map((a) => a.selector), plan.submit_selector];
+        const misses = [];
+        for (const sel of new Set(selectors)) {
+            const info = await this.browser.inspectSelector(sel);
+            if (info.count === 0) {
+                misses.push(sel);
+                continue;
+            }
+            const inv = bySelector.get(sel);
+            if (inv !== undefined && inv.id !== null && info.id !== inv.id) {
+                misses.push(`${sel} (resolved to the wrong element)`);
+            }
+        }
+        return misses.length > 0 ? misses.join(", ") : null;
+    }
     constructor(browser, llm) {
         this.browser = browser;
         if (llm === undefined) {
@@ -587,136 +816,53 @@ export class SignupAgent {
                     await this.browser.wait(2);
                 }
             }
-            // Wait for the form to actually render before planning (F1) —
-            // SPA and two-stage signup pages render late, and screenshotting
-            // a skeleton makes the planner emit selectors that don't exist.
-            steps.push("Waiting for the signup form to render...");
-            await this.browser.waitForFormReady();
-            // Step 2: Plan the form fill with Claude.
-            steps.push("Asking Claude to plan the signup form fill...");
-            await saveDebugSnapshot(this.browser, "before-fill");
-            const state = await this.browser.getState();
-            const plan = await this.planSignupForm({
-                service: task.service,
-                url: state.url,
-                html: state.html,
-                screenshot: state.screenshot,
-            });
-            steps.push(`Plan: ${plan.actions.length} action(s), confidence=${plan.confidence}${plan.notes !== undefined ? ` — ${plan.notes}` : ""}`);
-            // Step 3: Execute the plan.
+            // Steps 2-5: plan the form, fill it, submit — via the
+            // verify-and-replan loop (F3). The planner picks selectors from
+            // a DOM-grounded element inventory; a bad pick re-plans instead
+            // of cascading through 10s timeouts to total failure.
             const fillValues = {
                 email: task.email,
                 password,
                 name: displayName,
                 username,
                 company: "Trusty Squire",
-                // `literal` has no fixed value — resolved per-action below.
+                // `literal` has no fixed value — resolved per-action.
                 literal: "",
             };
-            await this.executePlan(plan, fillValues, steps);
-            // Tier 2 captcha (pre-submit): check for a visible
-            // Turnstile/reCAPTCHA widget rendered inline with the form.
-            // Many sites render the widget alongside the form on first
-            // load; failing to interact with it leaves cf-turnstile-response
-            // empty and the submit gets server-side-rejected with a generic
-            // validation error we'd waste a re-plan trying to debug.
-            const preSubmitGate = await this.runCaptchaGate("Pre-submit", steps);
-            if (preSubmitGate.blocked) {
-                return {
-                    success: false,
-                    error: `captcha_blocked: visible ${preSubmitGate.kind} challenge did not resolve. The site flagged this session.`,
-                    steps,
-                    ...this.resultTail(),
-                };
-            }
-            // Step 4: Submit. clickSubmit() disambiguates when the planned
-            // selector matches several button[type=submit] (OAuth buttons are
-            // submit-typed too). A submit click that fails means the form was
-            // never submitted — fail fast here rather than fall through into
-            // the multi-minute verification-email poll for an email that can
-            // never arrive.
-            steps.push(`Submit → ${plan.submit_selector}`);
-            try {
-                await this.browser.clickSubmit(plan.submit_selector);
-            }
-            catch (err) {
-                const reason = err instanceof Error ? err.message : String(err);
-                steps.push(`⚠ submit click failed: ${reason}`);
-                return {
-                    success: false,
-                    error: `submit_failed: could not click the signup button — ${reason}`,
-                    steps,
-                    ...this.resultTail(),
-                };
-            }
-            await this.browser.wait(5);
-            // Tier 2 captcha (post-submit): some services only render the
-            // challenge after form submission (deferred rendering). Same
-            // shape as the pre-submit check.
-            const postSubmitGate = await this.runCaptchaGate("Post-submit", steps);
-            if (postSubmitGate.blocked) {
-                return {
-                    success: false,
-                    error: `captcha_blocked: post-submit ${postSubmitGate.kind} challenge did not resolve.`,
-                    steps,
-                    ...this.resultTail(),
-                };
-            }
-            if (postSubmitGate.found && postSubmitGate.solved) {
-                // Re-click submit so the populated token ships with the form.
-                try {
-                    await this.browser.click(plan.submit_selector);
-                    await this.browser.wait(3);
-                }
-                catch (err) {
-                    steps.push(`⚠ post-captcha submit retry failed: ${err instanceof Error ? err.message : String(err)}`);
-                }
-            }
-            await saveDebugSnapshot(this.browser, "after-submit");
-            // Step 5: Detect post-submit validation errors — if visible text contains
-            // hints like "required", "must be between", "please accept", we re-plan
-            // once with the new state. This handles the Postmark-style server-side
-            // validation case.
-            const afterSubmitText = (await this.browser.extractText()).slice(0, 4000);
-            if (this.looksLikeValidationFailure(afterSubmitText)) {
-                steps.push("Post-submit text suggests validation errors — re-planning...");
-                const state2 = await this.browser.getState();
-                const plan2 = await this.planSignupForm({
-                    service: task.service,
-                    url: state2.url,
-                    html: state2.html,
-                    screenshot: state2.screenshot,
-                    hint: `Previous submit produced validation errors. Visible page text snippet: ${afterSubmitText.slice(0, 800)}`,
-                });
-                await this.executePlan(plan2, fillValues, steps);
-                // Re-plan path: same captcha guard as initial submit. If the
-                // first submit triggered captcha rendering, the second pass
-                // sees it inline.
-                const replanGate = await this.runCaptchaGate("Re-plan", steps);
-                if (replanGate.blocked) {
+            const outcome = await this.planExecuteWithRetry(task, fillValues, steps);
+            switch (outcome.kind) {
+                case "captcha_blocked":
                     return {
                         success: false,
-                        error: `captcha_blocked: re-plan ${replanGate.kind} challenge did not resolve.`,
+                        error: `captcha_blocked: ${outcome.captchaKind} challenge did not resolve. The site flagged this session.`,
                         steps,
                         ...this.resultTail(),
                     };
-                }
-                try {
-                    await this.browser.clickSubmit(plan2.submit_selector);
-                }
-                catch (err) {
-                    const reason = err instanceof Error ? err.message : String(err);
-                    steps.push(`⚠ re-plan submit click failed: ${reason}`);
+                case "submit_failed":
                     return {
                         success: false,
-                        error: `submit_failed: re-plan submit could not click the signup button — ${reason}`,
+                        error: `submit_failed: could not click the signup button — ${outcome.reason}`,
                         steps,
                         ...this.resultTail(),
                     };
-                }
-                await this.browser.wait(5);
-                await saveDebugSnapshot(this.browser, "after-resubmit");
+                case "planning_failed":
+                    return {
+                        success: false,
+                        error: `planning_failed: ${outcome.reason}`,
+                        steps,
+                        ...this.resultTail(),
+                    };
+                case "oauth_required":
+                    return {
+                        success: false,
+                        error: `oauth_required: ${task.service} offers only OAuth/SSO signup — there is no email/password form to automate.`,
+                        steps,
+                        ...this.resultTail(),
+                    };
+                case "submitted":
+                    break;
             }
+            await saveDebugSnapshot(this.browser, "after-submit");
             // Step 6: Extract creds from page.
             steps.push("Extracting credentials from page...");
             let credentials = await this.extractCredentials();
@@ -794,62 +940,62 @@ export class SignupAgent {
     }
     // ------------ Claude planner ------------
     async planSignupForm(input) {
-        // Trim HTML to just <form>...</form> regions if possible — the prompt
-        // budget matters and most pages have a lot of marketing chrome.
-        const trimmedHtml = this.extractFormHtml(input.html);
-        const systemPrompt = `You analyze a web signup form and emit a JSON plan describing how to fill it.
+        const systemPrompt = `You plan how to fill a web signup form.
+
+You are given a screenshot of the page and an INVENTORY of its
+interactive elements — each line carries a precise \`selector=\` the
+bot has already verified resolves. Your job: pick which inventory
+elements to fill / check / click.
+
 Output rules:
 - Reply with ONE JSON object only. No prose, no markdown.
 - Schema:
   {
     "actions": [
-      {"kind":"fill","selector":"CSS_SELECTOR","value_kind":"email|password|name|username|company|literal","literal":"only when value_kind=literal","reason":"why"},
-      {"kind":"check","selector":"CSS_SELECTOR","reason":"TOS / marketing-opt-in / etc."},
-      {"kind":"click","selector":"CSS_SELECTOR","reason":"e.g. accept cookies before form is reachable"}
+      {"kind":"fill","selector":"<a selector= copied verbatim from the inventory>","value_kind":"email|password|name|username|company|literal","literal":"only when value_kind=literal","reason":"why"},
+      {"kind":"check","selector":"<from inventory>","reason":"TOS checkbox etc."},
+      {"kind":"click","selector":"<from inventory>","reason":"e.g. reveal the email form"}
     ],
-    "submit_selector": "CSS_SELECTOR for the primary signup button",
+    "submit_selector": "<a selector= from the inventory — the primary signup button>",
     "confidence": "high|medium|low",
-    "notes": "optional caveats"
+    "notes": "optional"
   }
-- Prefer stable selectors: name attributes, id, then aria-label. Avoid nth-child unless unavoidable.
-- Include the TOS/agree checkbox if one is required.
-- If a cookie banner is blocking the form, click "Accept" first.
-- Do NOT include password confirmation as a separate action unless the form has a visible second password field.
-- Skip optional/marketing-opt-in checkboxes.
-- For "name" use a realistic full name. For "username" generate a plausible 7-15 char handle.`;
+- CRITICAL: every "selector" you emit MUST be copied verbatim from a
+  \`selector=\` field in the inventory below. Never invent, guess, or
+  modify a selector. A selector not in the inventory is rejected and
+  you will be asked to re-plan.
+- Include the TOS/agree checkbox if the form has one.
+- Skip elements marked [cookie-consent — avoid], and skip optional
+  marketing-opt-in checkboxes.
+- Do NOT add a separate password-confirmation fill unless the
+  inventory shows a second password field.
+- Two-stage pages: if the inventory has only buttons (e.g. "Sign up
+  with email" / "Continue with Google") and no input fields, emit a
+  single click action on the EMAIL-signup button, and set
+  submit_selector to that same button.
+- For "name" use a realistic full name; for "username" a plausible
+  7-15 char handle.`;
+        const hintLine = input.hint !== undefined ? `\nHint: ${input.hint}` : "";
         const userBlocks = [
             { kind: "image", media_type: "image/png", data_base64: input.screenshot },
             {
                 kind: "text",
                 text: `Service: ${input.service}
-URL: ${input.url}
-${input.hint !== undefined ? `Hint: ${input.hint}\n` : ""}
-Form HTML (trimmed):
-${trimmedHtml}`,
+URL: ${input.url}${hintLine}
+
+Interactive element inventory:
+${formatInventory(input.inventory)}`,
             },
         ];
+        // F3 T4: the planner may only pick selectors the bot supplied.
+        const allowed = new Set(input.inventory.map((e) => e.selector));
         return this.callLLM({
             system: systemPrompt,
             userBlocks,
             maxTokens: 1500,
-            parse: parseSignupPlan,
+            parse: (raw) => parseSignupPlan(raw, allowed),
         });
     }
-    // Extract just <form> elements from the HTML — drops marketing + scripts.
-    extractFormHtml(html) {
-        const forms = [];
-        const re = /<form\b[\s\S]*?<\/form>/gi;
-        let m;
-        while ((m = re.exec(html)) !== null)
-            forms.push(m[0]);
-        const joined = forms.join("\n");
-        if (joined.length === 0) {
-            // No <form> — fall back to body but cap aggressively
-            return html.slice(0, 20000);
-        }
-        // Cap at 20k chars (~5k tokens) to leave room for the screenshot and reply
-        return joined.slice(0, 20000);
-    }
     looksLikeValidationFailure(text) {
         const t = text.toLowerCase();
         return (t.includes("must be between") ||