Skip to content

High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.

feat: add --dismiss-banners flag for nav and click

Boschf7d9f7d9c4dc
diff --git a/.gitignore b/.gitignore
index b1bafa45..ab10d389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ pinchtab-small
pinchtab.exe
plugins/*/.venv/
tests/e2e/results/*
+tests/tools/browserbench/results/
/runner
tests/tools/scripts/runner
skills/agent-browser
diff --git a/cmd/pinchtab/cmd_cli_register.go b/cmd/pinchtab/cmd_cli_register.go
index 0526c45a..8fbb0ae3 100644
--- a/cmd/pinchtab/cmd_cli_register.go
+++ b/cmd/pinchtab/cmd_cli_register.go
@@ -176,6 +176,7 @@ func configureBrowserFlags() {
clickCmd.Flags().String("css", "", "CSS selector instead of ref")
addPointFlags(clickCmd, "click")
clickCmd.Flags().Bool("wait-nav", false, "Wait for navigation after click")
+ clickCmd.Flags().Bool("dismiss-banners", false, "Dismiss cookie/consent banners after a wait-nav click (no-op without --wait-nav)")
clickCmd.Flags().Bool("snap", false, "Output interactive snapshot after action")
clickCmd.Flags().Bool("snap-diff", false, "Output snapshot diff after action (changes only)")
clickCmd.Flags().Bool("text", false, "Output page text after action (for verification)")
@@ -210,6 +211,9 @@ func configureBrowserFlags() {
mouseWheelCmd.Flags().Bool("humanize", false, "Use humanized bezier+jitter input path (overrides instance config)")
typeCmd.Flags().Bool("humanize", false, "Use humanized per-character keypress timing (overrides instance config)")
+ pressCmd.Flags().Bool("snap", false, "Output interactive snapshot after key press")
+ pressCmd.Flags().Bool("snap-diff", false, "Output snapshot diff after key press (changes only)")
+ pressCmd.Flags().Bool("text", false, "Output page text after key press (for verification)")
mouseWheelCmd.Flags().Int("dx", 0, "Wheel delta X")
mouseWheelCmd.Flags().Int("dy", 0, "Wheel delta Y")
@@ -286,16 +290,20 @@ func configureBrowserFlags() {
navCmd.Flags().Bool("block-ads", false, "Block ads")
navCmd.Flags().Bool("snap", false, "Output interactive snapshot after navigation")
navCmd.Flags().Bool("snap-diff", false, "Output snapshot diff after navigation (changes only)")
+ navCmd.Flags().Bool("dismiss-banners", false, "After landing, click any visible cookie/consent dismissal button or remove obvious overlay containers")
backCmd.Flags().Bool("snap", false, "Output interactive snapshot after navigation")
backCmd.Flags().Bool("snap-diff", false, "Output snapshot diff after navigation (changes only)")
backCmd.Flags().Bool("text", false, "Output page text after navigation (for verification)")
+ backCmd.Flags().Bool("dismiss-banners", false, "After landing, dismiss cookie/consent banners")
forwardCmd.Flags().Bool("snap", false, "Output interactive snapshot after navigation")
forwardCmd.Flags().Bool("snap-diff", false, "Output snapshot diff after navigation (changes only)")
forwardCmd.Flags().Bool("text", false, "Output page text after navigation (for verification)")
+ forwardCmd.Flags().Bool("dismiss-banners", false, "After landing, dismiss cookie/consent banners")
reloadCmd.Flags().Bool("snap", false, "Output interactive snapshot after reload")
reloadCmd.Flags().Bool("snap-diff", false, "Output snapshot diff after reload (changes only)")
reloadCmd.Flags().Bool("text", false, "Output page text after reload (for verification)")
+ reloadCmd.Flags().Bool("dismiss-banners", false, "After reload, dismiss cookie/consent banners")
fillCmd.Flags().Bool("snap", false, "Output interactive snapshot after fill")
fillCmd.Flags().Bool("snap-diff", false, "Output snapshot diff after fill (changes only)")
fillCmd.Flags().Bool("text", false, "Output page text after fill (for verification)")
diff --git a/internal/bridge/action_request.go b/internal/bridge/action_request.go
index fb0bac93..186dfe8b 100644
--- a/internal/bridge/action_request.go
+++ b/internal/bridge/action_request.go
@@ -65,6 +65,13 @@ type ActionRequest struct {
Fast bool `json:"fast"`
Owner string `json:"owner"`
+ // DismissBanners, when true and combined with WaitNav, runs a best-effort
+ // cookie/consent-banner dismissal pass after a click that triggered a
+ // navigation. Bridge layer ignores this field; the handler reads it and
+ // invokes the dismissal helper post-action. No effect on actions that
+ // don't trigger navigation.
+ DismissBanners bool `json:"dismissBanners,omitempty"`
+
// Humanize, when set, overrides the per-instance `humanize` default for
// this action only. nil = use the configured default. true forces the
// bezier/jitter/pre-press-sleep code path; false forces the raw
diff --git a/internal/cli/actions/actions_element.go b/internal/cli/actions/actions_element.go
index dbdcd10c..5c099093 100644
--- a/internal/cli/actions/actions_element.go
+++ b/internal/cli/actions/actions_element.go
@@ -42,9 +42,17 @@ func Action(client *http.Client, base, token, kind, selectorArg string, cmd *cob
}
if kind == "click" {
- if v, _ := cmd.Flags().GetBool("wait-nav"); v {
+ waitNav, _ := cmd.Flags().GetBool("wait-nav")
+ if waitNav {
body["waitNav"] = true
}
+ // --dismiss-banners only fires when --wait-nav is set; without nav,
+ // banners haven't changed and the dismissal pass would be wasted.
+ if waitNav {
+ if v, _ := cmd.Flags().GetBool("dismiss-banners"); v {
+ body["dismissBanners"] = true
+ }
+ }
// --dialog-action arms a one-shot JS dialog handler before the click.
// Mirrors the HTTP action body field {"dialogAction":"accept"|"dismiss"}.
// Without this, a click that opens an alert/confirm hangs until
diff --git a/internal/cli/actions/actions_element_test.go b/internal/cli/actions/actions_element_test.go
index 9289bc71..485d05d5 100644
--- a/internal/cli/actions/actions_element_test.go
+++ b/internal/cli/actions/actions_element_test.go
@@ -11,6 +11,7 @@ func newActionCmd() *cobra.Command {
cmd := &cobra.Command{}
cmd.Flags().String("css", "", "")
cmd.Flags().Bool("wait-nav", false, "")
+ cmd.Flags().Bool("dismiss-banners", false, "")
cmd.Flags().String("tab", "", "")
cmd.Flags().Float64("x", 0, "")
cmd.Flags().Float64("y", 0, "")
@@ -25,6 +26,9 @@ func newActionCmd() *cobra.Command {
func newSimpleCmd() *cobra.Command {
cmd := &cobra.Command{}
cmd.Flags().String("tab", "", "")
+ cmd.Flags().Bool("snap", false, "")
+ cmd.Flags().Bool("snap-diff", false, "")
+ cmd.Flags().Bool("text", false, "")
return cmd
}
@@ -63,6 +67,40 @@ func TestClickWaitNav(t *testing.T) {
}
}
+func TestClickDismissBannersWithWaitNav(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+
+ cmd := newActionCmd()
+ _ = cmd.Flags().Set("wait-nav", "true")
+ _ = cmd.Flags().Set("dismiss-banners", "true")
+ Action(client, m.base(), "", "click", "e5", cmd)
+ var body map[string]any
+ _ = json.Unmarshal([]byte(m.lastBody), &body)
+ if body["waitNav"] != true {
+ t.Error("expected waitNav=true")
+ }
+ if body["dismissBanners"] != true {
+ t.Errorf("expected dismissBanners=true, got %v", body["dismissBanners"])
+ }
+}
+
+func TestClickDismissBannersWithoutWaitNavIsNoop(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+
+ cmd := newActionCmd()
+ _ = cmd.Flags().Set("dismiss-banners", "true")
+ Action(client, m.base(), "", "click", "e5", cmd)
+ var body map[string]any
+ _ = json.Unmarshal([]byte(m.lastBody), &body)
+ if _, ok := body["dismissBanners"]; ok {
+ t.Errorf("expected dismissBanners not sent without --wait-nav, got %v", body["dismissBanners"])
+ }
+}
+
func TestClickDialogAction(t *testing.T) {
m := newMockServer()
defer m.close()
@@ -133,6 +171,27 @@ func TestPress(t *testing.T) {
}
}
+func TestPressWithSnapDiffFetchesSnapshot(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+ m.setResponse("GET", "/snapshot", 200, "snapshot")
+
+ cmd := newSimpleCmd()
+ _ = cmd.Flags().Set("snap-diff", "true")
+ ActionSimple(client, m.base(), "", "press", []string{"Enter"}, cmd)
+
+ if len(m.requests) != 2 {
+ t.Fatalf("expected 2 requests (action + snapshot), got %d", len(m.requests))
+ }
+ if m.requests[1].Path != "/snapshot" {
+ t.Fatalf("snapshot path = %q, want /snapshot", m.requests[1].Path)
+ }
+ if m.requests[1].Query != "filter=interactive&format=compact&diff=true" {
+ t.Fatalf("snapshot query = %q", m.requests[1].Query)
+ }
+}
+
func TestClickWithCSS(t *testing.T) {
m := newMockServer()
defer m.close()
diff --git a/internal/cli/actions/actions_navigate.go b/internal/cli/actions/actions_navigate.go
index a3125d1b..42bd9a0e 100644
--- a/internal/cli/actions/actions_navigate.go
+++ b/internal/cli/actions/actions_navigate.go
@@ -18,6 +18,7 @@ func Back(client *http.Client, base, token string, cmd *cobra.Command) {
if tabID != "" {
path = "/tabs/" + tabID + "/back"
}
+ path = appendDismissBannersQuery(path, cmd)
jsonOutput, _ := cmd.Flags().GetBool("json")
if jsonOutput {
@@ -50,6 +51,7 @@ func Forward(client *http.Client, base, token string, cmd *cobra.Command) {
if tabID != "" {
path = "/tabs/" + tabID + "/forward"
}
+ path = appendDismissBannersQuery(path, cmd)
jsonOutput, _ := cmd.Flags().GetBool("json")
if jsonOutput {
@@ -82,6 +84,7 @@ func Reload(client *http.Client, base, token string, cmd *cobra.Command) {
if tabID != "" {
path = "/tabs/" + tabID + "/reload"
}
+ path = appendDismissBannersQuery(path, cmd)
jsonOutput, _ := cmd.Flags().GetBool("json")
if jsonOutput {
@@ -152,6 +155,9 @@ func buildNavigateRequest(url string, cmd *cobra.Command) navigateRequest {
if v, _ := cmd.Flags().GetBool("block-ads"); v {
body["blockAds"] = true
}
+ if v, _ := cmd.Flags().GetBool("dismiss-banners"); v {
+ body["dismissBanners"] = true
+ }
tabID, _ := cmd.Flags().GetString("tab")
path := "/navigate"
explicitTab := cmd.Flags().Changed("tab")
@@ -197,3 +203,18 @@ func tabIDFromNavigateResult(result map[string]any) string {
}
return ""
}
+
+// appendDismissBannersQuery appends ?dismissBanners=true (or &dismissBanners=true)
+// to the given path when the cobra command's --dismiss-banners flag is set.
+// Used by /back, /forward, /reload which don't carry a JSON body.
+func appendDismissBannersQuery(path string, cmd *cobra.Command) string {
+ v, _ := cmd.Flags().GetBool("dismiss-banners")
+ if !v {
+ return path
+ }
+ sep := "?"
+ if strings.Contains(path, "?") {
+ sep = "&"
+ }
+ return path + sep + "dismissBanners=true"
+}
diff --git a/internal/cli/actions/actions_navigate_test.go b/internal/cli/actions/actions_navigate_test.go
index dff011ba..c80a264b 100644
--- a/internal/cli/actions/actions_navigate_test.go
+++ b/internal/cli/actions/actions_navigate_test.go
@@ -14,11 +14,23 @@ func newNavigateCmd() *cobra.Command {
cmd.Flags().Bool("new-tab", false, "")
cmd.Flags().Bool("block-images", false, "")
cmd.Flags().Bool("block-ads", false, "")
+ cmd.Flags().Bool("dismiss-banners", false, "")
cmd.Flags().String("tab", "", "")
cmd.Flags().Bool("print-tab-id", false, "")
return cmd
}
+func newHistoryCmd() *cobra.Command {
+ cmd := &cobra.Command{}
+ cmd.Flags().String("tab", "", "")
+ cmd.Flags().Bool("snap", false, "")
+ cmd.Flags().Bool("snap-diff", false, "")
+ cmd.Flags().Bool("text", false, "")
+ cmd.Flags().Bool("dismiss-banners", false, "")
+ cmd.Flags().Bool("json", false, "")
+ return cmd
+}
+
func TestNavigate(t *testing.T) {
m := newMockServer()
defer m.close()
@@ -133,6 +145,82 @@ func TestNavigateWithBlockAds(t *testing.T) {
}
}
+func TestNavigateDismissBanners(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+
+ cmd := newNavigateCmd()
+ _ = cmd.Flags().Set("dismiss-banners", "true")
+ Navigate(client, m.base(), "", "https://pinchtab.com", cmd)
+ var body map[string]any
+ _ = json.Unmarshal([]byte(m.lastBody), &body)
+ if body["dismissBanners"] != true {
+ t.Errorf("expected dismissBanners=true in body, got %v", body["dismissBanners"])
+ }
+}
+
+func TestReloadDismissBannersAppendsQuery(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+
+ cmd := newHistoryCmd()
+ _ = cmd.Flags().Set("dismiss-banners", "true")
+ Reload(client, m.base(), "", cmd)
+ if m.lastPath != "/reload" {
+ t.Errorf("expected /reload path, got %q", m.lastPath)
+ }
+ if !strings.Contains(m.lastQuery, "dismissBanners=true") {
+ t.Errorf("expected dismissBanners=true in query, got %q", m.lastQuery)
+ }
+}
+
+func TestBackDismissBannersAppendsQuery(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+
+ cmd := newHistoryCmd()
+ _ = cmd.Flags().Set("dismiss-banners", "true")
+ Back(client, m.base(), "", cmd)
+ if m.lastPath != "/back" {
+ t.Errorf("expected /back path, got %q", m.lastPath)
+ }
+ if !strings.Contains(m.lastQuery, "dismissBanners=true") {
+ t.Errorf("expected dismissBanners=true in query, got %q", m.lastQuery)
+ }
+}
+
+func TestForwardDismissBannersAppendsQueryWithTab(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+
+ cmd := newHistoryCmd()
+ _ = cmd.Flags().Set("tab", "TAB1")
+ _ = cmd.Flags().Set("dismiss-banners", "true")
+ Forward(client, m.base(), "", cmd)
+ if m.lastPath != "/tabs/TAB1/forward" {
+ t.Errorf("expected /tabs/TAB1/forward, got %q", m.lastPath)
+ }
+ if !strings.Contains(m.lastQuery, "dismissBanners=true") {
+ t.Errorf("expected dismissBanners=true in query, got %q", m.lastQuery)
+ }
+}
+
+func TestReloadWithoutDismissBannersOmitsQuery(t *testing.T) {
+ m := newMockServer()
+ defer m.close()
+ client := m.server.Client()
+
+ cmd := newHistoryCmd()
+ Reload(client, m.base(), "", cmd)
+ if m.lastQuery != "" {
+ t.Errorf("expected empty query, got %q", m.lastQuery)
+ }
+}
+
// TestNavigatePrintTabID verifies that --print-tab-id makes `nav` emit only
// the tab ID on stdout so agents can capture it via `$(pinchtab nav URL)`.
func TestNavigatePrintTabID(t *testing.T) {
diff --git a/internal/handlers/actions.go b/internal/handlers/actions.go
index 71d262b3..e1951c40 100644
--- a/internal/handlers/actions.go
+++ b/internal/handlers/actions.go
@@ -102,6 +102,11 @@ func (h *Handlers) HandleAction(w http.ResponseWriter, r *http.Request) {
}
}
req.Button = q.Get("button")
+ if v := q.Get("dismissBanners"); v != "" {
+ if b, err := strconv.ParseBool(v); err == nil {
+ req.DismissBanners = b
+ }
+ }
if vals, ok := q["deltaX"]; ok && len(vals) > 0 {
if n, err := strconv.Atoi(vals[0]); err == nil {
req.DeltaX = n
@@ -324,6 +329,13 @@ func (h *Handlers) HandleAction(w http.ResponseWriter, r *http.Request) {
}
if engineName != "lite" {
h.maybeAutoSolve(tCtx, resolvedTabID, autoSolverTriggerAction)
+ // Banner dismissal only makes sense when the click triggered a
+ // navigation (waitNav settles us on a fresh page). Without waitNav we
+ // skip — the caller is interacting within the current document and
+ // any banner has either been dismissed already or is irrelevant.
+ if req.WaitNav && req.DismissBanners {
+ h.dismissBanners(tCtx, resolvedTabID, true)
+ }
}
w.Header().Set("X-Engine", engineName)
h.recordEngine(r, engineName)
diff --git a/internal/handlers/banner_dismiss.go b/internal/handlers/banner_dismiss.go
new file mode 100644
index 00000000..842a1b81
--- /dev/null
+++ b/internal/handlers/banner_dismiss.go
@@ -0,0 +1,110 @@
+package handlers
+
+import (
+ "context"
+ "log/slog"
+ "time"
+
+ "github.com/chromedp/chromedp"
+)
+
+// bannerDismissJS is a best-effort routine that clears cookie/consent/login
+// overlays after a navigation completes. Runs entirely in the page context;
+// returns a small JSON-shaped result for telemetry but the Go side ignores it.
+//
+// Strategy:
+// 1. Phase 1 — click the most permissive labelled dismissal button
+// ("Accept all", "I agree", "OK", "Got it", "Close", "Dismiss", ...).
+// Permissive labels are tried first because rejection paths often gate
+// further interaction behind another modal.
+// 2. Phase 2 — if no button matched, hard-remove DOM nodes whose id, class,
+// or aria-label contains "cookie"/"consent", plus role=dialog modals and
+// fixed/absolute "overlay" containers. Re-enables document scrolling that
+// banners commonly lock with overflow:hidden.
+//
+// The script is wrapped in try/catch and bounded to a short timeout from the
+// caller so it can never wedge a navigation response.
+const bannerDismissJS = `(() => {
+ try {
+ const labels = [
+ "accept all", "accept", "i agree", "agree",
+ "got it", "ok", "okay", "close", "dismiss", "no thanks",
+ "continue", "allow all"
+ ];
+ const matchLabel = (s) => {
+ const t = (s || "").trim().toLowerCase();
+ if (t.length < 2 || t.length > 40) return false;
+ return labels.includes(t) || labels.some(l => t === l || t.startsWith(l + " ") || t.endsWith(" " + l));
+ };
+
+ const isVisible = (el) => {
+ if (!el || !el.getBoundingClientRect) return false;
+ const r = el.getBoundingClientRect();
+ if (r.width <= 0 || r.height <= 0) return false;
+ const cs = getComputedStyle(el);
+ if (cs.visibility === "hidden" || cs.display === "none" || cs.opacity === "0") return false;
+ return true;
+ };
+
+ // Phase 1: try a labelled dismissal button.
+ const clickables = document.querySelectorAll('button, [role=button], a[href]');
+ for (const el of clickables) {
+ const text = (el.innerText || el.textContent || el.getAttribute("aria-label") || "").trim();
+ if (!matchLabel(text)) continue;
+ if (!isVisible(el)) continue;
+ try { el.click(); return JSON.stringify({action: "click", label: text}); } catch (_) {}
+ }
+
+ // Phase 2: hard-remove obvious overlay containers.
+ const sel = '[id*="cookie" i], [class*="cookie" i], [id*="consent" i], [class*="consent" i],' +
+ '[aria-label*="cookie" i], [aria-label*="consent" i],' +
+ '[class*="overlay" i], [role="dialog"], [aria-modal="true"]';
+ const removed = [];
+ document.querySelectorAll(sel).forEach((el) => {
+ if (el === document.body || el === document.documentElement) return;
+ const cs = getComputedStyle(el);
+ // Only remove if positioned like an overlay or covers most of the viewport.
+ const looksOverlay = cs.position === "fixed" || cs.position === "absolute";
+ const r = el.getBoundingClientRect();
+ const covers = r.width >= window.innerWidth * 0.5 && r.height >= window.innerHeight * 0.3;
+ if (!looksOverlay && !covers) return;
+ removed.push((el.tagName || "").toLowerCase() + (el.id ? "#" + el.id : "") + (el.className ? "." + String(el.className).slice(0, 30) : ""));
+ try { el.remove(); } catch (_) {}
+ });
+
+ // Re-enable scroll if a banner locked it.
+ document.documentElement.style.overflow = "";
+ if (document.body) document.body.style.overflow = "";
+
+ return JSON.stringify({action: removed.length ? "remove" : "none", removed: removed.slice(0, 5)});
+ } catch (e) {
+ return JSON.stringify({action: "error", message: String(e && e.message || e)});
+ }
+})();`
+
+// bannerDismissTimeout caps how long the dismissal script can run end-to-end.
+// Hard upper bound — if the page is unresponsive we silently skip.
+const bannerDismissTimeout = 750 * time.Millisecond
+
+// dismissBanners runs the dismissal script on the current page of the given
+// chromedp context. Errors are swallowed: dismissal is purely best-effort.
+//
+// Pass enabled=false to no-op (lets call-sites wire the helper unconditionally
+// and decide based on the request flag).
+func (h *Handlers) dismissBanners(ctx context.Context, tabID string, enabled bool) {
+ if !enabled || ctx == nil || tabID == "" {
+ return
+ }
+
+ tCtx, cancel := context.WithTimeout(ctx, bannerDismissTimeout)
+ defer cancel()
+
+ var result string
+ if err := chromedp.Run(tCtx, chromedp.Evaluate(bannerDismissJS, &result)); err != nil {
+ slog.Debug("banner dismiss skipped", "tab_id", tabID, "error", err)
+ return
+ }
+ if result != "" {
+ slog.Debug("banner dismiss ran", "tab_id", tabID, "result", result)
+ }
+}
diff --git a/internal/handlers/banner_dismiss_test.go b/internal/handlers/banner_dismiss_test.go
new file mode 100644
index 00000000..e60a2b0f
--- /dev/null
+++ b/internal/handlers/banner_dismiss_test.go
@@ -0,0 +1,40 @@
+package handlers
+
+import (
+ "context"
+ "net/http/httptest"
+ "testing"
+)
+
+func TestHistoryDismissBannersFlag(t *testing.T) {
+ cases := []struct {
+ raw string
+ want bool
+ }{
+ {"true", true},
+ {"True", true},
+ {"TRUE", true},
+ {"1", true},
+ {"false", false},
+ {"0", false},
+ {"", false},
+ {"yes", false},
+ }
+ for _, c := range cases {
+ req := httptest.NewRequest("POST", "/back?dismissBanners="+c.raw, nil)
+ got := historyDismissBannersFlag(req)
+ if got != c.want {
+ t.Errorf("dismissBanners=%q -> %v, want %v", c.raw, got, c.want)
+ }
+ }
+}
+
+// dismissBanners is a no-op when enabled=false or when tabID is empty. The
+// helper guards against both so call-sites can wire the post-action hook
+// unconditionally without checking the flag and without re-validating the
+// resolved tab ID.
+func TestDismissBannersDisabledIsNoop(t *testing.T) {
+ h := &Handlers{}
+ h.dismissBanners(context.Background(), "tab", false)
+ h.dismissBanners(context.Background(), "", true)
+}
diff --git a/internal/handlers/history.go b/internal/handlers/history.go
index 860c72ee..dd543181 100644
--- a/internal/handlers/history.go
+++ b/internal/handlers/history.go
@@ -41,6 +41,7 @@ func (h *Handlers) HandleBack(w http.ResponseWriter, r *http.Request) {
return
}
tabID := r.URL.Query().Get("tabId")
+ dismissBanners := historyDismissBannersFlag(r)
ctx, resolvedID, err := h.tabContext(r, tabID)
if err != nil {
WriteTabContextError(w, err, 404)
@@ -66,6 +67,7 @@ func (h *Handlers) HandleBack(w http.ResponseWriter, r *http.Request) {
}
if !noHistory {
time.Sleep(200 * time.Millisecond)
+ h.dismissBanners(ctx, resolvedID, dismissBanners)
}
var curURL string
@@ -79,6 +81,7 @@ func (h *Handlers) HandleForward(w http.ResponseWriter, r *http.Request) {
return
}
tabID := r.URL.Query().Get("tabId")
+ dismissBanners := historyDismissBannersFlag(r)
ctx, resolvedID, err := h.tabContext(r, tabID)
if err != nil {
WriteTabContextError(w, err, 404)
@@ -102,6 +105,7 @@ func (h *Handlers) HandleForward(w http.ResponseWriter, r *http.Request) {
}
if !noHistory {
time.Sleep(200 * time.Millisecond)
+ h.dismissBanners(ctx, resolvedID, dismissBanners)
}
var curURL string
@@ -115,6 +119,7 @@ func (h *Handlers) HandleReload(w http.ResponseWriter, r *http.Request) {
return
}
tabID := r.URL.Query().Get("tabId")
+ dismissBanners := historyDismissBannersFlag(r)
ctx, resolvedID, err := h.tabContext(r, tabID)
if err != nil {
WriteTabContextError(w, err, 404)
@@ -127,8 +132,24 @@ func (h *Handlers) HandleReload(w http.ResponseWriter, r *http.Request) {
httpx.Error(w, 500, fmt.Errorf("reload: %w", err))
return
}
+ // page.Reload() returns when the nav kicks off, not when the document
+ // commits — give the new DOM time to render before the dismissal helper
+ // looks for cookie/consent buttons. Mirrors the 200 ms sleep on back/
+ // forward. Skipped when the flag is off so vanilla reloads stay fast.
+ if dismissBanners {
+ time.Sleep(200 * time.Millisecond)
+ h.dismissBanners(ctx, resolvedID, true)
+ }
var curURL string
_ = chromedp.Run(ctx, chromedp.Location(&curURL))
httpx.JSON(w, 200, map[string]any{"tabId": resolvedID, "url": curURL})
}
+
+// historyDismissBannersFlag reads the dismissBanners flag from a back/forward/
+// reload request. These endpoints don't carry a JSON body, so we accept it as
+// a query string parameter only.
+func historyDismissBannersFlag(r *http.Request) bool {
+ v := r.URL.Query().Get("dismissBanners")
+ return v == "1" || v == "true" || v == "TRUE" || v == "True"
+}
diff --git a/internal/handlers/navigation.go b/internal/handlers/navigation.go
index fa6bed92..e2ef5033 100644
--- a/internal/handlers/navigation.go
+++ b/internal/handlers/navigation.go
@@ -52,16 +52,17 @@ import (
// pinchtab nav https://pinchtab.com
func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {
var req struct {
- TabID string `json:"tabId"`
- URL string `json:"url"`
- NewTab bool `json:"newTab"`
- WaitTitle float64 `json:"waitTitle"`
- Timeout float64 `json:"timeout"`
- BlockImages *bool `json:"blockImages"`
- BlockMedia *bool `json:"blockMedia"`
- BlockAds *bool `json:"blockAds"`
- WaitFor string `json:"waitFor"`
- WaitSelector string `json:"waitSelector"`
+ TabID string `json:"tabId"`
+ URL string `json:"url"`
+ NewTab bool `json:"newTab"`
+ WaitTitle float64 `json:"waitTitle"`
+ Timeout float64 `json:"timeout"`
+ BlockImages *bool `json:"blockImages"`
+ BlockMedia *bool `json:"blockMedia"`
+ BlockAds *bool `json:"blockAds"`
+ WaitFor string `json:"waitFor"`
+ WaitSelector string `json:"waitSelector"`
+ DismissBanners bool `json:"dismissBanners"`
}
if r.Method == http.MethodGet {
@@ -71,6 +72,7 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {
req.NewTab = strings.EqualFold(q.Get("newTab"), "true") || q.Get("newTab") == "1"
req.WaitFor = q.Get("waitFor")
req.WaitSelector = q.Get("waitSelector")
+ req.DismissBanners = strings.EqualFold(q.Get("dismissBanners"), "true") || q.Get("dismissBanners") == "1"
if v := q.Get("waitTitle"); v != "" {
if n, err := strconv.ParseFloat(v, 64); err == nil {
req.WaitTitle = n
@@ -217,14 +219,15 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {
if req.NewTab {
h.navigateNewTabChrome(w, r, navigateChromeOptions{
- URL: req.URL,
- WaitFor: req.WaitFor,
- WaitSelector: req.WaitSelector,
- NavTimeout: navTimeout,
- TitleWait: titleWait,
- Target: target,
- TrustedCIDRs: trustedCIDRs,
- BlockPatterns: blockPatterns,
+ URL: req.URL,
+ WaitFor: req.WaitFor,
+ WaitSelector: req.WaitSelector,
+ NavTimeout: navTimeout,
+ TitleWait: titleWait,
+ Target: target,
+ TrustedCIDRs: trustedCIDRs,
+ BlockPatterns: blockPatterns,
+ DismissBanners: req.DismissBanners,
})
return
}
@@ -233,14 +236,15 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {
if err != nil {
if scopedCurrentForNavigate {
h.navigateNewTabChrome(w, r, navigateChromeOptions{
- URL: req.URL,
- WaitFor: req.WaitFor,
- WaitSelector: req.WaitSelector,
- NavTimeout: navTimeout,
- TitleWait: titleWait,
- Target: target,
- TrustedCIDRs: trustedCIDRs,
- BlockPatterns: blockPatterns,
+ URL: req.URL,
+ WaitFor: req.WaitFor,
+ WaitSelector: req.WaitSelector,
+ NavTimeout: navTimeout,
+ TitleWait: titleWait,
+ Target: target,
+ TrustedCIDRs: trustedCIDRs,
+ BlockPatterns: blockPatterns,
+ DismissBanners: req.DismissBanners,
})
return
}
@@ -291,6 +295,7 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {
}
h.maybeAutoSolve(tCtx, resolvedTabID, autoSolverTriggerNavigate)
+ h.dismissBanners(tCtx, resolvedTabID, req.DismissBanners)
var navURL string
_ = chromedp.Run(tCtx, chromedp.Location(&navURL))
@@ -302,14 +307,15 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {
}
type navigateChromeOptions struct {
- URL string
- WaitFor string
- WaitSelector string
- NavTimeout time.Duration
- TitleWait time.Duration
- Target *validatedNavigateTarget
- TrustedCIDRs []*net.IPNet
- BlockPatterns []string
+ URL string
+ WaitFor string
+ WaitSelector string
+ NavTimeout time.Duration
+ TitleWait time.Duration
+ Target *validatedNavigateTarget
+ TrustedCIDRs []*net.IPNet
+ BlockPatterns []string
+ DismissBanners bool
}
func (h *Handlers) navigateNewTabChrome(w http.ResponseWriter, r *http.Request, opts navigateChromeOptions) {
@@ -358,6 +364,7 @@ func (h *Handlers) navigateNewTabChrome(w http.ResponseWriter, r *http.Request,
}
h.maybeAutoSolve(tCtx, newTabID, autoSolverTriggerNavigate)
+ h.dismissBanners(tCtx, newTabID, opts.DismissBanners)
var navURL string
_ = chromedp.Run(tCtx, chromedp.Location(&navURL))
diff --git a/tests/e2e/fixtures/cookie-banner.html b/tests/e2e/fixtures/cookie-banner.html
new file mode 100644
index 00000000..485e8460
--- /dev/null
+++ b/tests/e2e/fixtures/cookie-banner.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Cookie Banner Fixture</title>
+ <style>
+ body { margin: 0; padding: 24px; font-family: system-ui, sans-serif; }
+ h1 { color: #222; }
+ a { color: #06c; }
+
+ /* A realistic cookie banner: fixed-position overlay covering the bottom
+ of the viewport. Set wide+tall so the dismissal heuristic's
+ overlay-detection branch (looksOverlay || covers half the viewport)
+ matches reliably even if the labelled-button click is somehow missed. */
+ #cookie-banner {
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ height: 200px;
+ background: #fff8e1;
+ border-top: 2px solid #f0ad4e;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 24px;
+ box-sizing: border-box;
+ box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.15);
+ z-index: 9999;
+ }
+ #cookie-banner.dismissed { display: none; }
+ #cookie-banner button {
+ padding: 10px 20px;
+ font-size: 16px;
+ cursor: pointer;
+ background: #06c;
+ color: white;
+ border: none;
+ border-radius: 4px;
+ }
+ </style>
+</head>
+<body>
+ <h1>Page with cookie banner</h1>
+ <p>Static fixture for testing <code>--dismiss-banners</code>.</p>
+ <p><a id="link-to-form" href="/form.html">Go to form</a></p>
+
+ <div id="cookie-banner" role="dialog" aria-label="Cookie consent">
+ <span>This site uses cookies for marketing and analytics.</span>
+ <button id="cookie-accept" type="button" onclick="dismissBanner()">Accept all</button>
+ </div>
+
+ <script>
+ function dismissBanner() {
+ var b = document.getElementById('cookie-banner');
+ if (b) b.classList.add('dismissed');
+ document.body.dataset.cookieDismissed = 'true';
+ }
+ </script>
+</body>
+</html>