pi-browser-harness 0.10.2 → 0.12.0

package/src/domains/fill-engine.ts

@@ -0,0 +1,80 @@
+export type FillOptions = {
+  readonly rejectSelect: boolean;
+  readonly focusFirst: boolean;
+};
+
+const ENGINE = `
+  const el = this;
+  if (!el || el.nodeType !== 1) return { ok: false, reason: "ref does not point to an element" };
+  const tagName = el.tagName || "";
+  const tag = tagName.toLowerCase();
+  const type = (el.type || "").toLowerCase();
+
+  if (__rejectSelect && tag === "select") {
+    return { ok: false, reason: "element is a <select>", kind: "select", tag: tagName };
+  }
+  if (el.disabled) return { ok: false, reason: "element is disabled", tag: tagName };
+
+  const fire = function (t) { el.dispatchEvent(new Event(t, { bubbles: true })); };
+  if (__focusFirst) { try { el.focus(); } catch (e) {} }
+
+  if (tag === "select") {
+    const want = String(value);
+    let matched = null;
+    for (let i = 0; i < el.options.length; i++) {
+      const o = el.options[i];
+      if (o.value === want || o.label === want || o.text === want) { matched = o; break; }
+    }
+    if (!matched) {
+      const opts = [];
+      for (let i = 0; i < el.options.length; i++) opts.push({ value: el.options[i].value, text: el.options[i].text });
+      return { ok: false, reason: "no matching option", kind: "select", options: opts, tag: tagName };
+    }
+    el.value = matched.value;
+    fire("input"); fire("change");
+    return { ok: true, kind: "select", value: el.value, text: matched.text, tag: tagName };
+  }
+
+  if (tag === "input" && (type === "checkbox" || type === "radio")) {
+    const want = value === true || value === "true" || value === "on" || value === 1;
+    let changed = false;
+    if (el.checked !== want) {
+      try { el.click(); } catch (e) {}
+      if (el.checked !== want) { el.checked = want; fire("input"); fire("change"); }
+      changed = true;
+    }
+    return { ok: true, kind: type, checked: el.checked, changed: changed, tag: tagName };
+  }
+
+  if (el.isContentEditable) {
+    try { el.focus(); } catch (e) {}
+    let done = false;
+    try {
+      const sel = window.getSelection();
+      if (sel) { sel.removeAllRanges(); const rng = document.createRange(); rng.selectNodeContents(el); sel.addRange(rng); }
+      done = document.execCommand("insertText", false, String(value));
+    } catch (e) { done = false; }
+    if (!done) {
+      el.textContent = String(value);
+      el.dispatchEvent(new InputEvent("input", { bubbles: true }));
+    }
+    return { ok: true, kind: "contenteditable", value: el.textContent || "", tag: tagName };
+  }
+
+  if (tag === "input" || tag === "textarea") {
+    const proto = tag === "textarea" ? window.HTMLTextAreaElement.prototype : window.HTMLInputElement.prototype;
+    const desc = Object.getOwnPropertyDescriptor(proto, "value");
+    if (desc && desc.set) desc.set.call(el, String(value));
+    else el.value = String(value);
+    fire("input"); fire("change");
+    return { ok: true, kind: el.type || tag, value: el.value, tag: tagName };
+  }
+
+  return { ok: false, reason: "element is not a fillable field (tag=" + tag + ")", tag: tagName };
+`;
+
+export const fillBody = (opts: FillOptions): string =>
+  `const __rejectSelect = ${opts.rejectSelect}; const __focusFirst = ${opts.focusFirst};\n${ENGINE}`;
+
+export const fillDeclaration = (opts: FillOptions): string =>
+  `function (value) { ${fillBody(opts)} }`;

package/src/domains/form-batch.ts

@@ -0,0 +1,64 @@
+import { Type } from "typebox";
+import { type Result, err, ok } from "../util/result";
+import { defineBrowserTool, type ToolErr, type ToolOk } from "../util/tool";
+import { fillDeclaration } from "./fill-engine";
+import { detailsOf, resolveAndCall } from "./element-call";
+
+const FILL_FN = fillDeclaration({ rejectSelect: false, focusFirst: true });
+
+const FieldValue = Type.Union([Type.String(), Type.Boolean()], {
+  description: "Value to set. String for text inputs / textareas / selects / contenteditable; boolean for checkboxes & radios.",
+});
+
+const FillFormArgs = Type.Object({
+  fields: Type.Array(
+    Type.Object({
+      ref: Type.String({ description: "Stable element ref from browser_snapshot (e.g. 'e7')." }),
+      value: FieldValue,
+    }),
+    { minItems: 1, description: "Fields to fill in one batch, each by ref." },
+  ),
+});
+
+export const fillFormTool = defineBrowserTool({
+  name: "browser_fill_form",
+  label: "Browser Fill Form",
+  description:
+    "Fill multiple form fields in one call — the efficient way to complete a form. Each field is { ref, value }; refs come from browser_snapshot's [eN]. Handles text inputs, textareas, selects, checkboxes, radios, and contenteditable, drives React/Vue controlled inputs correctly, and reports the resulting value of every field.",
+  promptSnippet: "Fill many form fields at once by ref — React-safe, self-confirming",
+  promptGuidelines: [
+    "Preferred for forms: snapshot once, then fill all fields in a single browser_fill_form call.",
+    "The result summarizes how many fields filled cleanly and flags any value mismatches or per-field errors.",
+    "Re-run browser_snapshot afterwards to verify the form state if needed.",
+  ],
+  parameters: FillFormArgs,
+  concurrency: "serialized",
+  async handler(args, { client }): Promise<Result<ToolOk, ToolErr>> {
+    const results: Array<Readonly<Record<string, unknown>>> = [];
+    let okCount = 0;
+    const issues: string[] = [];
+    for (const f of args.fields) {
+      const r = await resolveAndCall(client, f.ref, FILL_FN, [f.value]);
+      if (!r.success) {
+        results.push({ ref: f.ref, ok: false, error: r.error.message });
+        issues.push(`ref ${f.ref} (${r.error.message})`);
+        continue;
+      }
+      const res = r.data;
+      const wanted = typeof f.value === "boolean" ? undefined : String(f.value);
+      const got = res.value !== undefined ? String(res.value) : undefined;
+      const mismatch = wanted !== undefined && got !== undefined && got !== wanted && res.text !== wanted;
+      const fieldOk = res.ok === true && !mismatch;
+      if (fieldOk) okCount++;
+      else issues.push(`ref ${f.ref} (${res.ok === false ? (res.reason ?? "failed") : "value mismatch"})`);
+      results.push({ ref: f.ref, ok: fieldOk, mismatch, ...detailsOf(f.ref, res) });
+    }
+    const text =
+      `Filled ${okCount}/${args.fields.length} fields` +
+      (issues.length > 0 ? `; issues: ${issues.join(", ")}` : "");
+    if (okCount === 0) {
+      return err({ kind: "invalid_state", message: text, details: { results } });
+    }
+    return ok({ text, details: { results } });
+  },
+});

package/src/domains/form.ts

@@ -1,9 +1,9 @@
 import { Type } from "typebox";
-import type { BrowserClient } from "../client";
-import { safeJs } from "../util/js-template";
 import { type Result, err, ok } from "../util/result";
 import { defineBrowserTool, type ToolErr, type ToolOk } from "../util/tool";
-import { interactiveDiff, resolveRefToObjectId } from "./ref-resolve";
+import { detailsOf, isPageResult, type PageResult, resolveAndCall, runOnElement } from "./element-call";
+import { fillBody } from "./fill-engine";
+import { interactiveDiff } from "./ref-resolve";
 
 const FillArgs = Type.Object({
   ref: Type.Optional(
@@ -16,137 +16,71 @@ const FillArgs = Type.Object({
   value: Type.String({ description: "Value to set in the field" }),
 });
 
-/**
- * Run an element-scoped function either against a CSS selector (querySelector +
- * apply) or a ref (resolve to objectId, callFunctionOn with element as `this`).
- * The shared `fnBody` is a function body where `this` is the target element and
- * the single argument is the value — identical logic on both paths. Returns the
- * function's return value (parsed) or a ToolErr.
- *
- * On the ref path a detached node yields a stale-ref error; on the selector path
- * a missing element returns { status: "not_found" } from the function body.
- */
-const runOnElement = async (
-  client: BrowserClient,
-  opts: { ref?: string | undefined; selector?: string | undefined; fnBody: string; arg: unknown },
-): Promise<Result<unknown, ToolErr>> => {
-  if (opts.ref !== undefined) {
-    const objectId = await resolveRefToObjectId(client, opts.ref);
-    if (!objectId.success) return objectId;
-    const r = await client.session().call("Runtime.callFunctionOn", {
-      objectId: objectId.data,
-      functionDeclaration: `function (arg) { ${opts.fnBody} }`,
-      arguments: [{ value: opts.arg }],
-      returnByValue: true,
-    });
-    if (!r.success) return err({ kind: "cdp_error", message: r.error.message });
-    return ok((r.data as { result?: { value?: unknown } }).result?.value);
-  }
-  if (opts.selector === undefined) {
-    return err({ kind: "invalid_state", message: "Provide either `ref` or `selector`." });
-  }
-  // Selector path: bind the same trusted function body to the matched element
-  // via .call(). fnBody is harness-authored (not user input); only the selector
-  // and value are interpolated, and those go through safeJs.
-  const prelude = safeJs`
-    (() => {
-      const el = document.querySelector(${opts.selector});
-      if (!el) return { status: "not_found" };
-      const __arg = ${opts.arg};
-      return (function (arg) {`;
-  const expr = `${prelude} ${opts.fnBody} }).call(el, __arg); })()`;
-  const r = await client.evaluateJs(expr);
-  if (!r.success) return err({ kind: "cdp_error", message: r.error.message });
-  return ok(r.data);
-};
+const FILL_BODY = `const value = arg;\n${fillBody({ rejectSelect: true, focusFirst: false })}`;
 
-/**
- * Result shape returned by the in-page fill script. Discriminated by `status`
- * so the handler can map page-level outcomes to typed ToolErr kinds.
- */
-type FillResult =
-  | { status: "ok"; tag: string; kind: string; value: string }
-  | { status: "not_found" }
-  | { status: "not_fillable"; tag: string };
-
-// Element-scoped fill logic. `this` is the target element, `arg` is the value.
-// Write via the native prototype value setter so React's _valueTracker
-// registers the change — assigning el.value directly does NOT, which is why
-// controlled inputs revert on re-render. Shared verbatim by the ref path
-// (callFunctionOn) and the selector path (querySelector + .call).
-const FILL_FN = `
-  const el = this;
-  const tag = el.tagName;
-  const proto =
-    el instanceof HTMLTextAreaElement ? HTMLTextAreaElement.prototype
-    : el instanceof HTMLInputElement ? HTMLInputElement.prototype
-    : null;
-  if (proto) {
-    const desc = Object.getOwnPropertyDescriptor(proto, "value");
-    const setter = desc && desc.set;
-    if (setter) setter.call(el, arg);
-    else el.value = arg;
-    el.dispatchEvent(new Event("input", { bubbles: true }));
-    el.dispatchEvent(new Event("change", { bubbles: true }));
-    return { status: "ok", tag, kind: el.type || tag.toLowerCase(), value: el.value };
-  }
-  if (el.isContentEditable) {
-    // Rich-text editors (Slack/Notion/ProseMirror) listen for beforeinput/input.
-    el.focus();
-    let done = false;
-    try {
-      const sel = window.getSelection();
-      if (sel) { sel.removeAllRanges(); const rng = document.createRange(); rng.selectNodeContents(el); sel.addRange(rng); }
-      done = document.execCommand("insertText", false, arg);
-    } catch (e) { done = false; }
-    if (!done) {
-      el.textContent = arg;
-      el.dispatchEvent(new InputEvent("input", { bubbles: true }));
-    }
-    return { status: "ok", tag, kind: "contenteditable", value: el.textContent || "" };
-  }
-  return { status: "not_fillable", tag };
-`;
+const NOT_FOUND: PageResult = { ok: false, reason: "not_found" };
 
 export const fillTool = defineBrowserTool({
   name: "browser_fill",
   label: "Browser Fill",
   description:
-    "Fill a form field (input/textarea/contenteditable). PREFERRED: pass `ref` (e.g. 'e7') from browser_snapshot — survives re-renders. Fallback: a CSS `selector`. Writes through the native value setter and fires bubbling 'input'/'change' events, so React/Vue/Angular controlled components and rich-text editors update correctly — unlike browser_type. Returns the field's value after writing, plus a compact diff of page changes.",
+    "Fill a form field (input/textarea/contenteditable), or tick a checkbox/radio by passing 'true'/'false'. PREFERRED: pass `ref` (e.g. 'e7') from browser_snapshot — survives re-renders. Fallback: a CSS `selector`. Writes through the native value setter and fires bubbling 'input'/'change' events, so React/Vue/Angular controlled components and rich-text editors update correctly — unlike browser_type. Refuses a disabled field rather than writing a value the page will ignore. Returns the field's value after writing, plus a compact diff of page changes.",
   promptSnippet: "Fill a form field by ref (preferred) or selector (works with React/Vue controlled inputs)",
   promptGuidelines: [
-    "PREFER `ref` from browser_snapshot (the '[eN]' handle) over a guessed CSS selector — refs survive re-renders and don't require you to invent a selector.",
     "Pass the desired value; no browser_click is needed first.",
-    "A 'ref is stale' error means the page changed — re-run browser_snapshot to get fresh refs.",
+    "For a checkbox or radio pass 'true' or 'false' — it toggles `checked`, not the submit value. browser_set_checked does the same thing with a boolean.",
     "Use browser_type instead only for keystroke-sensitive widgets (autocomplete, masked/segmented inputs).",
     "Fill sets the value but does not focus or submit. To submit a tag/autocomplete input, follow with browser_dispatch_key({ ref, key: 'Enter' }) — not browser_press_key, which targets the focused element and may miss this field.",
     "For a custom (div-based) dropdown, browser_fill won't validate against its option list — open it, run browser_snapshot, then browser_click the option's ref.",
-    "The result reports the field's value after writing and an appended page-changes diff — confirm both match what you intended before moving on.",
+    "Confirm the field value browser_fill returns matches what you intended.",
   ],
   parameters: FillArgs,
+  concurrency: "serialized",
   async handler(args, { client }): Promise<Result<ToolOk, ToolErr>> {
-    const r = await runOnElement(client, { ref: args.ref, selector: args.selector, fnBody: FILL_FN, arg: args.value });
+    const r = await runOnElement(client, {
+      ref: args.ref,
+      selector: args.selector,
+      fnBody: FILL_BODY,
+      arg: args.value,
+      notFound: NOT_FOUND,
+    });
     if (!r.success) return r;
-    const res = r.data as FillResult | undefined;
+    const res = isPageResult(r.data) ? r.data : undefined;
     const target = args.ref ?? args.selector ?? "";
-    if (res === undefined || res.status === "not_found") {
+    if (res === undefined || res.reason === "not_found") {
       return err({
         kind: "invalid_state",
         message: `No element matched: ${target}`,
         details: { ref: args.ref, selector: args.selector },
       });
     }
-    if (res.status === "not_fillable") {
+    if (!res.ok) {
+      const details = { ref: args.ref, selector: args.selector, ...(res.tag !== undefined ? { tag: res.tag } : {}) };
+      if (res.kind === "select") {
+        return err({
+          kind: "invalid_state",
+          message: `Element <select> is not fillable (not an input, textarea, or contenteditable): ${target}. For <select> use browser_select_option.`,
+          details,
+        });
+      }
       return err({
         kind: "invalid_state",
-        message: `Element <${res.tag.toLowerCase()}> is not fillable (not an input, textarea, or contenteditable): ${target}. For <select> use browser_select_option.`,
-        details: { ref: args.ref, selector: args.selector, tag: res.tag },
+        message: `Could not fill ${target}: ${res.reason ?? "unknown reason"}`,
+        details,
       });
     }
+    const shown = res.value !== undefined ? JSON.stringify(res.value) : `checked=${res.checked === true}`;
     const diff = await interactiveDiff(client);
     return ok({
-      text: `Filled ${target} = ${JSON.stringify(res.value)}${diff}`,
-      details: { ref: args.ref, selector: args.selector, value: args.value, verified: res.value, tag: res.tag, kind: res.kind },
+      text: `Filled ${target} = ${shown}${diff}`,
+      details: {
+        ref: args.ref,
+        selector: args.selector,
+        value: args.value,
+        verified: res.value ?? res.checked,
+        ...(res.tag !== undefined ? { tag: res.tag } : {}),
+        ...(res.kind !== undefined ? { kind: res.kind } : {}),
+      },
     });
   },
 });
@@ -160,6 +94,13 @@ const FocusArgs = Type.Object({
 
 type FocusResult = { status: "ok"; tag: string } | { status: "not_found" } | { status: "not_focusable"; tag: string };
 
+const isFocusResult = (v: unknown): v is FocusResult => {
+  if (typeof v !== "object" || v === null || !("status" in v)) return false;
+  if (v.status === "not_found") return true;
+  if (v.status === "ok" || v.status === "not_focusable") return "tag" in v && typeof v.tag === "string";
+  return false;
+};
+
 const FOCUS_FN = `
   const el = this;
   if (typeof el.focus !== "function") return { status: "not_focusable", tag: el.tagName };
@@ -174,15 +115,14 @@ export const focusTool = defineBrowserTool({
     "Focus an element via the DOM .focus() method — deterministic, no coordinate accuracy needed. PREFERRED: pass `ref` from browser_snapshot; fallback: a CSS `selector`. Use before browser_type when a click might miss the field.",
   promptSnippet: "Focus an element by ref (preferred) or selector",
   promptGuidelines: [
-    "PREFER `ref` from browser_snapshot over a CSS selector — survives re-renders.",
-    "Use before browser_type to guarantee the right field is focused without relying on click coordinates.",
     "For simply setting a value, prefer browser_fill (it doesn't need a separate focus step).",
   ],
   parameters: FocusArgs,
+  concurrency: "serialized",
   async handler(args, { client }): Promise<Result<ToolOk, ToolErr>> {
     const r = await runOnElement(client, { ref: args.ref, selector: args.selector, fnBody: FOCUS_FN, arg: "" });
     if (!r.success) return r;
-    const res = r.data as FocusResult | undefined;
+    const res = isFocusResult(r.data) ? r.data : undefined;
     const target = args.ref ?? args.selector ?? "";
     if (res === undefined || res.status === "not_found") {
       return err({ kind: "invalid_state", message: `No element matched: ${target}`, details: { ref: args.ref, selector: args.selector } });
@@ -210,7 +150,24 @@ type SelectResult =
   | { status: "not_select"; tag: string }
   | { status: "no_match"; options: ReadonlyArray<{ value: string; label: string }> };
 
-// `this` is the <select>; `arg` is { wv, wl, wi } (null = not provided).
+const isSelectOption = (v: unknown): v is { value: string; label: string } =>
+  typeof v === "object" && v !== null
+  && "value" in v && typeof v.value === "string"
+  && "label" in v && typeof v.label === "string";
+
+const isSelectResult = (v: unknown): v is SelectResult => {
+  if (typeof v !== "object" || v === null || !("status" in v)) return false;
+  if (v.status === "not_found") return true;
+  if (v.status === "not_select") return "tag" in v && typeof v.tag === "string";
+  if (v.status === "ok") {
+    return "value" in v && typeof v.value === "string" && "label" in v && typeof v.label === "string";
+  }
+  if (v.status === "no_match") {
+    return "options" in v && Array.isArray(v.options) && v.options.every(isSelectOption);
+  }
+  return false;
+};
+
 const SELECT_FN = `
   const el = this;
   if (el.tagName !== "SELECT") return { status: "not_select", tag: el.tagName };
@@ -234,12 +191,11 @@ export const selectOptionTool = defineBrowserTool({
     "Select an option in a native <select> element by value, visible label, or index. PREFERRED: pass `ref` from browser_snapshot; fallback: a CSS `selector`. Sets the selection and fires bubbling 'input'/'change' events so framework listeners update. On no match, returns the available options.",
   promptSnippet: "Select an option in a native <select> by ref (preferred) or selector",
   promptGuidelines: [
-    "PREFER `ref` from browser_snapshot over a CSS selector — survives re-renders.",
     "Provide exactly one of value, label, or index to choose the option.",
     "For custom (non-native) dropdowns built from divs, click to open then browser_click the option instead.",
-    "If no option matches, the error details list the available options so you can retry.",
   ],
   parameters: SelectOptionArgs,
+  concurrency: "serialized",
   async handler(args, { client }): Promise<Result<ToolOk, ToolErr>> {
     if (args.value === undefined && args.label === undefined && args.index === undefined) {
       return err({ kind: "invalid_state", message: "Provide one of value, label, or index." });
@@ -248,7 +204,7 @@ export const selectOptionTool = defineBrowserTool({
     const arg = { wv: args.value ?? null, wl: args.label ?? null, wi: args.index ?? null };
     const r = await runOnElement(client, { ref: args.ref, selector: args.selector, fnBody: SELECT_FN, arg });
     if (!r.success) return r;
-    const res = r.data as SelectResult | undefined;
+    const res = isSelectResult(r.data) ? r.data : undefined;
     const target = args.ref ?? args.selector ?? "";
     if (res === undefined || res.status === "not_found") {
       return err({ kind: "invalid_state", message: `No element matched: ${target}`, details: { ref: args.ref, selector: args.selector } });
@@ -270,3 +226,50 @@ export const selectOptionTool = defineBrowserTool({
     });
   },
 });
+
+const CHECK_FN = `
+function(checked) {
+  const el = this;
+  const tag = (el.tagName || "").toLowerCase();
+  const type = (el.type || "").toLowerCase();
+  if (tag !== "input" || (type !== "checkbox" && type !== "radio")) return { ok: false, reason: "ref is not a checkbox or radio" };
+  if (el.disabled) return { ok: false, reason: "element is disabled" };
+  const want = checked === true;
+  let changed = false;
+  if (el.checked !== want) {
+    try { el.click(); } catch (e) {}
+    if (el.checked !== want) { el.checked = want; el.dispatchEvent(new Event("change", { bubbles: true })); }
+    changed = true;
+  }
+  return { ok: true, checked: el.checked, changed: changed };
+}`;
+
+const SetCheckedArgs = Type.Object({
+  ref: Type.String({ description: "Stable element ref of a checkbox or radio from browser_snapshot (e.g. 'e7')." }),
+  checked: Type.Boolean({ description: "Desired checked state." }),
+});
+
+export const setCheckedTool = defineBrowserTool({
+  name: "browser_set_checked",
+  label: "Browser Set Checked",
+  description:
+    "Set a checkbox or radio to a desired checked state by ref. Only acts if the current state differs, fires change, and reports the final state. Get the ref from browser_snapshot's [eN].",
+  promptSnippet: "Set a checkbox/radio checked state by ref",
+  promptGuidelines: [
+    "For radios, set checked:true on the option you want; the group deselects the others.",
+  ],
+  parameters: SetCheckedArgs,
+  concurrency: "serialized",
+  async handler(args, { client }): Promise<Result<ToolOk, ToolErr>> {
+    const r = await resolveAndCall(client, args.ref, CHECK_FN, [args.checked]);
+    if (!r.success) return r;
+    const res = r.data;
+    if (!res.ok) {
+      return err({ kind: "invalid_state", message: `Could not set checked on ref ${args.ref}: ${res.reason ?? "unknown reason"}`, details: detailsOf(args.ref, res) });
+    }
+    return ok({
+      text: `Set ref ${args.ref} checked=${res.checked}` + (res.changed === false ? " (already)" : ""),
+      details: detailsOf(args.ref, res),
+    });
+  },
+});

package/src/domains/headers.ts

@@ -0,0 +1,89 @@
+import { Type } from "typebox";
+import type { BrowserClient } from "../client";
+import { type Result, err, ok } from "../util/result";
+import { defineBrowserTool, type ToolErr, type ToolOk } from "../util/tool";
+import { cdpCall } from "./cdp-call";
+
+const HeaderValue = Type.String({
+  maxLength: 8192,
+  pattern: "^[^\\r\\n]*$",
+});
+
+const SetHeadersArgs = Type.Object({
+  headers: Type.Record(Type.String(), HeaderValue, {
+    minProperties: 1,
+    maxProperties: 64,
+    description: "Extra HTTP request headers for the current owned tab. Names must be valid HTTP tokens.",
+  }),
+});
+
+const HEADER_NAME = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+
+const currentOwnedTarget = (
+  client: BrowserClient,
+): Result<{ readonly targetId: string }, ToolErr> => {
+  const current = client.current();
+  if (current === undefined || current === null) {
+    return err({ kind: "invalid_state", message: "No tab attached." });
+  }
+  if (!client.owns(current.targetId)) {
+    return err({
+      kind: "invalid_state",
+      message: `Current tab ${current.targetId} is not owned by this harness session.`,
+    });
+  }
+  return ok({ targetId: current.targetId });
+};
+
+export const setHeadersTool = defineBrowserTool({
+  name: "browser_set_headers",
+  label: "Browser Set Headers",
+  description:
+    "Set extra HTTP request headers on the current owned tab. Headers persist for subsequent document, subresource, fetch, and XHR requests until cleared or the tab closes.",
+  promptSnippet: "Set extra request headers on the current owned tab",
+  promptGuidelines: [
+    "If no tab is attached yet, call browser_new_tab without a URL first.",
+    "Call before navigation when a site requires routing or environment headers.",
+    "Call browser_clear_headers before switching tabs or navigating this tab to another origin.",
+    "Header values are never echoed in tool output.",
+  ],
+  parameters: SetHeadersArgs,
+  concurrency: "serialized",
+  async handler(args, { client }): Promise<Result<ToolOk, ToolErr>> {
+    const target = currentOwnedTarget(client);
+    if (!target.success) return target;
+    const invalidName = Object.keys(args.headers).find((name) => !HEADER_NAME.test(name));
+    if (invalidName !== undefined) {
+      return err({ kind: "invalid_state", message: `Invalid HTTP header name: ${JSON.stringify(invalidName)}` });
+    }
+    const result = await cdpCall(client, "Network.setExtraHTTPHeaders", { headers: args.headers });
+    if (!result.success) return result;
+    const headerNames = Object.keys(args.headers).sort();
+    return ok({
+      text: `Set ${headerNames.length} extra HTTP header(s) on tab ${target.data.targetId}: ${headerNames.join(", ")}. Values are hidden. Clear them before switching tabs or navigating to another origin.`,
+      details: { targetId: target.data.targetId, headerNames, count: headerNames.length },
+    });
+  },
+});
+
+export const clearHeadersTool = defineBrowserTool({
+  name: "browser_clear_headers",
+  label: "Browser Clear Headers",
+  description: "Clear all extra HTTP request headers previously set on the current owned tab.",
+  promptSnippet: "Clear extra request headers from the current owned tab",
+  promptGuidelines: [
+    "Call after finishing an environment-specific workflow, before switching tabs, or before navigating to another origin.",
+  ],
+  parameters: Type.Object({}),
+  concurrency: "serialized",
+  async handler(_args, { client }): Promise<Result<ToolOk, ToolErr>> {
+    const target = currentOwnedTarget(client);
+    if (!target.success) return target;
+    const result = await cdpCall(client, "Network.setExtraHTTPHeaders", { headers: {} });
+    if (!result.success) return result;
+    return ok({
+      text: `Cleared extra HTTP headers from tab ${target.data.targetId}.`,
+      details: { targetId: target.data.targetId },
+    });
+  },
+});

package/src/domains/history.ts

@@ -2,14 +2,15 @@ import { Type } from "typebox";
 import type { BrowserClient } from "../client";
 import { type Result, err, ok } from "../util/result";
 import { defineBrowserTool, type ToolErr, type ToolOk } from "../util/tool";
+import { cdpCall } from "./cdp-call";
 
 type HistoryEntry = { readonly id: number; readonly url: string; readonly title: string };
 type History = { readonly entries: ReadonlyArray<HistoryEntry>; readonly currentIndex: number };
 
 const fetchHistory = async (client: BrowserClient): Promise<Result<History, ToolErr>> => {
-  const r = await client.session().call("Page.getNavigationHistory");
-  if (!r.success) return err({ kind: "cdp_error", message: r.error.message });
-  return ok(r.data as History);
+  const r = await cdpCall(client, "Page.getNavigationHistory", {});
+  if (!r.success) return r;
+  return ok(r.data);
 };
 
 export const goBackTool = defineBrowserTool({
@@ -17,16 +18,17 @@ export const goBackTool = defineBrowserTool({
   label: "Browser Go Back",
   description: "Navigate back one page in history.",
   promptSnippet: "Go back one page",
-  promptGuidelines: ["Use to return to the previous page after navigating."],
+  promptGuidelines: [],
   parameters: Type.Object({}),
+  concurrency: "serialized",
   async handler(_a, { client }): Promise<Result<ToolOk, ToolErr>> {
     const h = await fetchHistory(client);
     if (!h.success) return h;
     if (h.data.currentIndex <= 0) return ok({ text: "Already at the beginning of history." });
     const target = h.data.entries[h.data.currentIndex - 1];
     if (!target) return err({ kind: "internal", message: "history entry missing at index" });
-    const nav = await client.session().call("Page.navigateToHistoryEntry", { entryId: target.id });
-    if (!nav.success) return err({ kind: "cdp_error", message: nav.error.message });
+    const nav = await cdpCall(client, "Page.navigateToHistoryEntry", { entryId: target.id });
+    if (!nav.success) return nav;
     return ok({ text: `Navigated back to: ${target.url}`, details: { url: target.url } });
   },
 });
@@ -36,16 +38,17 @@ export const goForwardTool = defineBrowserTool({
   label: "Browser Go Forward",
   description: "Navigate forward one page in history.",
   promptSnippet: "Go forward one page",
-  promptGuidelines: ["Use to undo a browser_go_back."],
+  promptGuidelines: [],
   parameters: Type.Object({}),
+  concurrency: "serialized",
   async handler(_a, { client }): Promise<Result<ToolOk, ToolErr>> {
     const h = await fetchHistory(client);
     if (!h.success) return h;
     if (h.data.currentIndex >= h.data.entries.length - 1) return ok({ text: "Already at the end of history." });
     const target = h.data.entries[h.data.currentIndex + 1];
     if (!target) return err({ kind: "internal", message: "history entry missing at index" });
-    const nav = await client.session().call("Page.navigateToHistoryEntry", { entryId: target.id });
-    if (!nav.success) return err({ kind: "cdp_error", message: nav.error.message });
+    const nav = await cdpCall(client, "Page.navigateToHistoryEntry", { entryId: target.id });
+    if (!nav.success) return nav;
     return ok({ text: `Navigated forward to: ${target.url}`, details: { url: target.url } });
   },
 });
@@ -55,11 +58,12 @@ export const reloadTool = defineBrowserTool({
   label: "Browser Reload",
   description: "Reload the current page.",
   promptSnippet: "Reload the page",
-  promptGuidelines: ["Use to refresh the page, e.g. after server-side changes."],
+  promptGuidelines: [],
   parameters: Type.Object({}),
+  concurrency: "serialized",
   async handler(_a, { client }): Promise<Result<ToolOk, ToolErr>> {
-    const r = await client.session().call("Page.reload");
-    if (!r.success) return err({ kind: "cdp_error", message: r.error.message });
+    const r = await cdpCall(client, "Page.reload", {});
+    if (!r.success) return r;
     const info = await client.pageInfo();
     if (!info.success) return err({ kind: "cdp_error", message: info.error.message });
     if ("dialog" in info.data) {