@canaryai/cli 0.2.12 → 0.2.14

package/dist/{chunk-MSMC6UXW.js → chunk-6IAPGYZQ.js}

@@ -38199,7 +38199,7 @@ function setSnapshotAnalyzerLogger(l) {
   logger = l;
 }
 function extractSnapshotYaml(mcpResponse) {
-  const text = typeof mcpResponse === "string" ? mcpResponse : mcpResponse != null && typeof mcpResponse === "object" && "text" in mcpResponse && typeof mcpResponse.text === "string" ? mcpResponse.text : String(mcpResponse);
+  const text = typeof mcpResponse === "string" ? mcpResponse : mcpResponse !== null && mcpResponse !== void 0 && typeof mcpResponse === "object" && "text" in mcpResponse && typeof mcpResponse.text === "string" ? mcpResponse.text : String(mcpResponse);
   const yamlMatch = text.match(/Page Snapshot:\s*```yaml\s*([\s\S]*?)```/);
   if (yamlMatch) {
     return yamlMatch[1].trim();
@@ -38568,9 +38568,18 @@ var INTERACTIVE_LEAF_ROLES = /* @__PURE__ */ new Set([
   "switch",
   "svg-shape"
 ]);
-var FORM_INPUT_ROLES = /* @__PURE__ */ new Set(["combobox", "textbox", "searchbox", "spinbutton", "slider"]);
+var FORM_INPUT_ROLES = /* @__PURE__ */ new Set([
+  "combobox",
+  "textbox",
+  "searchbox",
+  "spinbutton",
+  "slider"
+]);
 var INTERACTIVE_CONTAINER_ROLES = /* @__PURE__ */ new Set(["menu", "menubar", "tablist", "listbox"]);
-var INTERACTIVE_ROLES = /* @__PURE__ */ new Set([...INTERACTIVE_LEAF_ROLES, ...INTERACTIVE_CONTAINER_ROLES]);
+var INTERACTIVE_ROLES = /* @__PURE__ */ new Set([
+  ...INTERACTIVE_LEAF_ROLES,
+  ...INTERACTIVE_CONTAINER_ROLES
+]);
 var STRUCTURAL_ROLES = /* @__PURE__ */ new Set([
   "banner",
   "navigation",
@@ -38596,15 +38605,16 @@ var TEXT_CARRYING_ROLES = /* @__PURE__ */ new Set([
   "caption"
 ]);
 var VISUAL_HEADING_MAX_LENGTH = 60;
-var STATUS_WORDS = /* @__PURE__ */ new Set(["favorable", "unfavorable", "success", "error", "warning", "pending"]);
-var BLANK_PATTERNS = [
-  /\s*\(Blank\)\s*/gi,
-  /\s*\(blank\)\s*/gi
-];
-var MENU_TRIGGER_PATTERNS = [
-  /^Open menu for /i,
-  /^Show more options$/i
-];
+var STATUS_WORDS = /* @__PURE__ */ new Set([
+  "favorable",
+  "unfavorable",
+  "success",
+  "error",
+  "warning",
+  "pending"
+]);
+var BLANK_PATTERNS = [/\s*\(Blank\)\s*/gi, /\s*\(blank\)\s*/gi];
+var MENU_TRIGGER_PATTERNS = [/^Open menu for /i, /^Show more options$/i];
 var SECTION_BOUNDARY_ROLES = /* @__PURE__ */ new Set([
   "dialog",
   "alertdialog",
@@ -38617,7 +38627,7 @@ var SECTION_BOUNDARY_ROLES = /* @__PURE__ */ new Set([
 ]);
 var FRAMEWORK_NOISE_RE = /^(ng-binding|ng-scope|ng-pristine|ng-dirty|ng-valid|ng-invalid|ng-untouched|ng-touched|v-enter|v-leave)$/;
 function normalizeSearchText(text) {
-  return text.toLowerCase().replace(/[-_.,;:!?'"()\[\]{}\/\\@#$%^&*+=<>~`|]/g, "").replace(/\s+/g, " ").trim();
+  return text.toLowerCase().replace(/[-_.,;:!?'"()[\]{}/\\@#$%^&*+=<>~`|]/g, "").replace(/\s+/g, " ").trim();
 }
 function isActiveElement(element) {
   return element.attributes["active"] !== void 0 || element.rawLine.includes("[active]");
@@ -38694,7 +38704,8 @@ function getDisplayText(element, options) {
   return normalizeIconLabelText(element.role, rawTextSource);
 }
 function hasInteractiveDescendants(element) {
-  if (element.ref && (INTERACTIVE_ROLES.has(element.role) || isClickableByAttribute(element))) return true;
+  if (element.ref && (INTERACTIVE_ROLES.has(element.role) || isClickableByAttribute(element)))
+    return true;
   for (const child of element.children) {
     if (hasInteractiveDescendants(child)) return true;
   }
@@ -39621,7 +39632,8 @@ function shouldCollapse(section) {
   if (section.hasSearchMatch) return false;
   if (section.isBackground) return true;
   if (section.role === "dialog" || section.role === "alertdialog") return false;
-  if (section.role === "navigation" || section.role === "menubar" || section.role === "menu") return false;
+  if (section.role === "navigation" || section.role === "menubar" || section.role === "menu")
+    return false;
   if (section.role === "banner") return false;
   if (section.role === "form") return false;
   if (section.elementCount >= MIN_ELEMENTS_TO_COLLAPSE) return true;
@@ -39674,7 +39686,12 @@ function collectInteractiveElements(element, elements, subsections, depth, inher
   if ((INTERACTIVE_LEAF_ROLES.has(element.role) || isClickableByAttribute(element)) && element.ref) {
     const effectiveFieldLabel = shouldDropInheritedFieldLabel(element, inheritedFieldLabel) ? void 0 : inheritedFieldLabel;
     if (INTERACTIVE_LEAF_ROLES.has(element.role) && isExpandedWithActionableChildren(element)) {
-      elements.push(formatElement(element, { overrideLabel: composeTriggerLabel(element), fieldLabel: effectiveFieldLabel }));
+      elements.push(
+        formatElement(element, {
+          overrideLabel: composeTriggerLabel(element),
+          fieldLabel: effectiveFieldLabel
+        })
+      );
       collectExpandedChildren(element, elements);
       return;
     }
@@ -39730,7 +39747,9 @@ function collectInteractiveElements(element, elements, subsections, depth, inher
       const fieldLabel = shouldDropInheritedFieldLabel(child, rawFieldLabel) ? void 0 : rawFieldLabel;
       if (!isMenuTriggerNoise(child)) {
         if (INTERACTIVE_LEAF_ROLES.has(child.role) && isExpandedWithActionableChildren(child)) {
-          elements.push(formatElement(child, { overrideLabel: composeTriggerLabel(child), fieldLabel }));
+          elements.push(
+            formatElement(child, { overrideLabel: composeTriggerLabel(child), fieldLabel })
+          );
           collectExpandedChildren(child, elements);
         } else {
           elements.push(formatElement(child, { fieldLabel }));
@@ -39803,7 +39822,9 @@ function buildSection(element, depth) {
     } else if ((INTERACTIVE_LEAF_ROLES.has(child.role) || isClickableByAttribute(child)) && child.ref) {
       const fieldLabel = findFieldLabelInContext(child, children2, ci);
       if (INTERACTIVE_LEAF_ROLES.has(child.role) && isExpandedWithActionableChildren(child)) {
-        interactiveElements.push(formatElement(child, { overrideLabel: composeTriggerLabel(child), fieldLabel }));
+        interactiveElements.push(
+          formatElement(child, { overrideLabel: composeTriggerLabel(child), fieldLabel })
+        );
         collectExpandedChildren(child, interactiveElements);
       } else {
         if (!isMenuTriggerNoise(child)) {
@@ -39811,13 +39832,25 @@ function buildSection(element, depth) {
         }
         if (!INTERACTIVE_LEAF_ROLES.has(child.role) && isClickableByAttribute(child)) {
           for (const grandchild of child.children) {
-            collectInteractiveElements(grandchild, interactiveElements, subsections, depth + 1, fieldLabel);
+            collectInteractiveElements(
+              grandchild,
+              interactiveElements,
+              subsections,
+              depth + 1,
+              fieldLabel
+            );
           }
         }
       }
     } else {
       const containerLabel = resolveContainerFieldLabel(child) ?? findFieldLabelFromSiblings(children2, ci);
-      collectInteractiveElements(child, interactiveElements, subsections, depth + 1, containerLabel);
+      collectInteractiveElements(
+        child,
+        interactiveElements,
+        subsections,
+        depth + 1,
+        containerLabel
+      );
     }
   }
   if (isClickableByAttribute(element) && element.ref && !INTERACTIVE_ROLES.has(element.role)) {
@@ -40070,11 +40103,15 @@ function formatSectionOutput(section, indent, showCollapsed) {
   const focusedPart = section.isFocused ? " [FOCUSED]" : "";
   const backgroundPart = section.isBackground ? " [BACKGROUND]" : "";
   const activePart = section.containsActive && !section.isFocused ? " \u2190 ACTIVE" : "";
-  lines.push(`${indentStr}${headingPrefix}${section.heading}${refPart}${focusedPart}${backgroundPart}${activePart}`);
+  lines.push(
+    `${indentStr}${headingPrefix}${section.heading}${refPart}${focusedPart}${backgroundPart}${activePart}`
+  );
   if (section.collapsed && !showCollapsed) {
     if (section.isBackground) {
       if (section.ref) {
-        lines.push(`${indentStr}  (${section.elementCount} elements - use expand="${section.ref}" to see content)`);
+        lines.push(
+          `${indentStr}  (${section.elementCount} elements - use expand="${section.ref}" to see content)`
+        );
       } else {
         lines.push(`${indentStr}  (${section.elementCount} elements)`);
       }
@@ -40453,7 +40490,7 @@ function gridInfoToRows(grid) {
   }
   const rows = [];
   for (const row of grid.rows) {
-    const values = new Array(columns.length).fill("");
+    const values = Array.from({ length: columns.length }).fill("");
     for (const cell of row.cells) {
       const idx = columnIndex.get(cell.column);
       if (idx !== void 0) {
@@ -41412,9 +41449,14 @@ var BrowserToolExecutor = class {
     this.autoSnapshotAfterAction = options?.autoSnapshotAfterAction !== false;
     this.includeScreenshotWithSnapshot = options?.includeScreenshotWithSnapshot !== false;
     if (!options?.workspaceDir && !options?.tmpBaseDir) {
-      options?.logger?.debug?.("[BrowserToolExecutor] No tmpBaseDir provided, using flat canary dir (not org-scoped)");
+      options?.logger?.debug?.(
+        "[BrowserToolExecutor] No tmpBaseDir provided, using flat canary dir (not org-scoped)"
+      );
     }
-    this.workspaceDir = options?.workspaceDir ?? path2.join(options?.tmpBaseDir ?? getCanaryTmpDir(), `browser-workspace-${Date.now()}-${crypto2.randomUUID().slice(0, 8)}`);
+    this.workspaceDir = options?.workspaceDir ?? path2.join(
+      options?.tmpBaseDir ?? getCanaryTmpDir(),
+      `browser-workspace-${Date.now()}-${crypto2.randomUUID().slice(0, 8)}`
+    );
     this.logger = options?.logger;
     fs2.mkdir(this.workspaceDir, { recursive: true }).catch(() => {
     });
@@ -41482,10 +41524,14 @@ Viewport: ${viewportSize.width}x${viewportSize.height} | Image: ~${imgWidth}x${i
 ` + buildResolutionNote(viewportSize, maxImageDim, this.logger) + `
 ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from grid labels.\n" : ""}Click coordinates should be in viewport space (0-${viewportSize.width}, 0-${viewportSize.height}).
 `;
-        return withRecoveryNoticeMCP(this.client, {
-          text: scaleInfo + (rawTextContent || ""),
-          images: result.images
-        }, this.logger);
+        return withRecoveryNoticeMCP(
+          this.client,
+          {
+            text: scaleInfo + (rawTextContent || ""),
+            images: result.images
+          },
+          this.logger
+        );
       }
       return withRecoveryNoticeMCP(this.client, rawTextContent, this.logger);
     }
@@ -41498,10 +41544,14 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
           this.maxImageDimension,
           this.logger
         );
-        return withRecoveryNoticeMCP(this.client, {
-          text: resolutionNote + "\n" + semanticText2,
-          images: result.images
-        }, this.logger);
+        return withRecoveryNoticeMCP(
+          this.client,
+          {
+            text: resolutionNote + "\n" + semanticText2,
+            images: result.images
+          },
+          this.logger
+        );
       }
       return withRecoveryNoticeMCP(this.client, semanticText2, this.logger);
     }
@@ -41551,7 +41601,9 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
     let probeResult;
     if (opts.probeAt && searchTerms.length === 0 && this.client.probeAtCoordinates) {
       try {
-        const probe = await this.client.probeAtCoordinates(opts.probeAt.x, opts.probeAt.y, { signal: this.signal });
+        const probe = await this.client.probeAtCoordinates(opts.probeAt.x, opts.probeAt.y, {
+          signal: this.signal
+        });
         if (probe) {
           probeResult = probe;
           if (hasImages && probe.boundingBox) {
@@ -41635,10 +41687,14 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
         this.maxImageDimension,
         this.logger
       );
-      return withRecoveryNoticeMCP(this.client, {
-        text: resolutionNote + "\n" + semanticText,
-        images: result.images
-      }, this.logger);
+      return withRecoveryNoticeMCP(
+        this.client,
+        {
+          text: resolutionNote + "\n" + semanticText,
+          images: result.images
+        },
+        this.logger
+      );
     }
     return withRecoveryNoticeMCP(this.client, semanticText, this.logger);
   }
@@ -41657,10 +41713,7 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
     if (img) {
       const base64Match = img.match(/^data:image\/(png|jpeg);base64,(.+)$/);
       if (base64Match) {
-        const downsampledBase64 = await downsampleImage(
-          base64Match[2],
-          this.maxImageDimension
-        );
+        const downsampledBase64 = await downsampleImage(base64Match[2], this.maxImageDimension);
         return {
           text: `Screenshot captured${opts?.label ? ` (${opts.label})` : ""}`,
           images: [{ data: downsampledBase64, mimeType: "image/jpeg" }]
@@ -41721,18 +41774,32 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
     if (dialogMsg) {
       result = result + "\n\n" + dialogMsg;
     }
-    return withRecoveryNoticeMCP(this.client, composeActionResult(result, autoSnapshot), this.logger);
+    return withRecoveryNoticeMCP(
+      this.client,
+      composeActionResult(result, autoSnapshot),
+      this.logger
+    );
   }
   async type(opts) {
     const submitNote = opts.submit ? " and submitted" : "";
     const actionDesc = `Typed "${opts.text}" into "${opts.element}"${submitNote}`;
     if (opts.submit) {
       const { diffText, autoSnapshot } = await this.withSemanticDiff(actionDesc, async () => {
-        await this.client.type(opts.ref, opts.text, opts.element, opts.submit, { delay: opts.delay, signal: this.signal });
+        await this.client.type(opts.ref, opts.text, opts.element, opts.submit, {
+          delay: opts.delay,
+          signal: this.signal
+        });
       });
-      return withRecoveryNoticeMCP(this.client, composeActionResult(diffText, autoSnapshot), this.logger);
+      return withRecoveryNoticeMCP(
+        this.client,
+        composeActionResult(diffText, autoSnapshot),
+        this.logger
+      );
     }
-    await this.client.type(opts.ref, opts.text, opts.element, opts.submit, { delay: opts.delay, signal: this.signal });
+    await this.client.type(opts.ref, opts.text, opts.element, opts.submit, {
+      delay: opts.delay,
+      signal: this.signal
+    });
     return withRecoveryNotice(this.client, actionDesc, this.logger);
   }
   async hover(opts) {
@@ -41753,9 +41820,18 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
     const actionDesc = useCoordinates ? `Dragged from (${opts.startX}, ${opts.startY}) to (${opts.endX}, ${opts.endY})` : `Dragged "${opts.startElement}" to "${opts.endElement}"`;
     const { diffText, autoSnapshot } = await this.withSemanticDiff(actionDesc, async () => {
       if (useCoordinates) {
-        await this.client.dragCoordinates(opts.startX, opts.startY, opts.endX, opts.endY, opts.startElement, { signal: this.signal });
+        await this.client.dragCoordinates(
+          opts.startX,
+          opts.startY,
+          opts.endX,
+          opts.endY,
+          opts.startElement,
+          { signal: this.signal }
+        );
       } else {
-        await this.client.drag(opts.startRef, opts.startElement, opts.endRef, opts.endElement, { signal: this.signal });
+        await this.client.drag(opts.startRef, opts.startElement, opts.endRef, opts.endElement, {
+          signal: this.signal
+        });
       }
     });
     return composeActionResult(diffText, autoSnapshot);
@@ -41766,7 +41842,11 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
       const { diffText, autoSnapshot } = await this.withSemanticDiff(`Pressed ${key}`, async () => {
         await this.client.pressKey(key, { signal: this.signal });
       });
-      return withRecoveryNoticeMCP(this.client, composeActionResult(diffText, autoSnapshot), this.logger);
+      return withRecoveryNoticeMCP(
+        this.client,
+        composeActionResult(diffText, autoSnapshot),
+        this.logger
+      );
     }
     await this.client.pressKey(key, { signal: this.signal });
     return withRecoveryNotice(this.client, `Pressed ${key}`, this.logger);
@@ -41796,7 +41876,13 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
   // ==================== Scroll ====================
   async scroll(opts) {
     if (opts.toRef) {
-      const result2 = await this.client.scroll(opts.direction, opts.amount, opts.withinRef, opts.toRef, { signal: this.signal });
+      const result2 = await this.client.scroll(
+        opts.direction,
+        opts.amount,
+        opts.withinRef,
+        opts.toRef,
+        { signal: this.signal }
+      );
       const scrollDesc2 = `Scrolled to element ${opts.toRef}`;
       if (isMCPContentWithImages(result2)) {
         return {
@@ -41807,7 +41893,13 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
       return scrollDesc2;
     }
     if (opts.x !== void 0 && opts.y !== void 0) {
-      const result2 = await this.client.scrollAtCoordinates(opts.x, opts.y, opts.direction, opts.amount, { signal: this.signal });
+      const result2 = await this.client.scrollAtCoordinates(
+        opts.x,
+        opts.y,
+        opts.direction,
+        opts.amount,
+        { signal: this.signal }
+      );
       const scrollDesc2 = `Scrolled ${opts.direction} at (${opts.x}, ${opts.y})${opts.amount ? ` (intensity ${opts.amount})` : ""}`;
       if (isMCPContentWithImages(result2)) {
         return {
@@ -41817,7 +41909,13 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
       }
       return scrollDesc2;
     }
-    const result = await this.client.scroll(opts.direction, opts.amount, opts.withinRef, void 0, { signal: this.signal });
+    const result = await this.client.scroll(
+      opts.direction,
+      opts.amount,
+      opts.withinRef,
+      void 0,
+      { signal: this.signal }
+    );
     const scrollDesc = `Scrolled ${opts.direction}${opts.amount ? ` (intensity ${opts.amount})` : ""}`;
     if (isMCPContentWithImages(result)) {
       return {
@@ -41829,7 +41927,9 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
   }
   // ==================== Dialogs ====================
   async handleDialog(opts) {
-    const result = await this.client.handleDialog(opts.action, opts.promptText, { signal: this.signal });
+    const result = await this.client.handleDialog(opts.action, opts.promptText, {
+      signal: this.signal
+    });
     return typeof result === "string" ? result : `Dialog ${opts.action}ed`;
   }
   async dismissOverlay(opts) {
@@ -41859,7 +41959,9 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
             break;
           }
           case "backdrop":
-            await this.client.clickAtCoordinates(10, 10, "backdrop/outside modal", { signal: this.signal });
+            await this.client.clickAtCoordinates(10, 10, "backdrop/outside modal", {
+              signal: this.signal
+            });
             break;
         }
         await this.client.waitFor({ timeSec: 0.5, signal: this.signal });
@@ -41870,7 +41972,12 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
         if (!afterModal) {
           const afterState2 = captureSnapshotState(afterUrl2, afterYaml2);
           const diff3 = compareSnapshots(beforeState, afterState2);
-          return formatSemanticDiff(diff3, `Dismissed overlay using ${strategy}`, void 0, (/* @__PURE__ */ new Date()).toISOString());
+          return formatSemanticDiff(
+            diff3,
+            `Dismissed overlay using ${strategy}`,
+            void 0,
+            (/* @__PURE__ */ new Date()).toISOString()
+          );
         }
       } catch (err) {
         this.logger?.debug?.(`[BrowserTools] Dismiss strategy ${strategy} failed`, {
@@ -41886,7 +41993,12 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
     const diff2 = compareSnapshots(beforeState, afterState);
     return `Could not dismiss overlay with strategies: ${strategies.join(", ")}. Modal may require specific interaction.
 
-` + formatSemanticDiff(diff2, "Dismiss overlay attempted (failed)", void 0, (/* @__PURE__ */ new Date()).toISOString());
+` + formatSemanticDiff(
+      diff2,
+      "Dismiss overlay attempted (failed)",
+      void 0,
+      (/* @__PURE__ */ new Date()).toISOString()
+    );
   }
   // ==================== Waiting ====================
   async waitFor(opts) {
@@ -41925,7 +42037,7 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
       `Size: ${result.sizeBytes} bytes`,
       `Type: ${result.mimeType}`
     ];
-    if (result.textContent != null) {
+    if (result.textContent !== null && result.textContent !== void 0) {
       lines.push("", "--- Content ---", result.textContent);
     } else {
       lines.push("", "[Binary file \u2014 content cannot be displayed as text]");
@@ -42015,7 +42127,11 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
           await fs2.writeFile(snapshotFilePath, afterYaml, "utf-8");
         } catch {
         }
-        const semanticText = formatSemanticSnapshot(afterYaml, { snapshotFilePath, currentTime: now, capturedToasts: this.client.getCapturedToasts?.() ?? [] });
+        const semanticText = formatSemanticSnapshot(afterYaml, {
+          snapshotFilePath,
+          currentTime: now,
+          capturedToasts: this.client.getCapturedToasts?.() ?? []
+        });
         const afterImages = isMCPContentWithImages(afterResult) ? afterResult.images : void 0;
         if (afterImages?.length && this.onScreenshot) {
           const img = afterImages[0];
@@ -42056,7 +42172,11 @@ ${effectiveShowCoordinateGrid ? "Coordinate grid enabled - read coordinates from
       await fs2.writeFile(snapshotFilePath, yaml, "utf-8");
     } catch {
     }
-    const semanticText = formatSemanticSnapshot(yaml, { snapshotFilePath, currentTime: (/* @__PURE__ */ new Date()).toISOString(), capturedToasts: this.client.getCapturedToasts?.() ?? [] });
+    const semanticText = formatSemanticSnapshot(yaml, {
+      snapshotFilePath,
+      currentTime: (/* @__PURE__ */ new Date()).toISOString(),
+      capturedToasts: this.client.getCapturedToasts?.() ?? []
+    });
     const yamlBlockPattern = /- Page Snapshot:\n```yaml\n[\s\S]*?```/;
     if (yamlBlockPattern.test(result)) {
       return result.replace(yamlBlockPattern, `- Page Snapshot (semantic):
@@ -42176,52 +42296,624 @@ function getBrowserToolDefinitions() {
       }
     },
     {
-      name: "browser_network_requests",
-      description: "Get network requests made by the page",
+      name: "browser_network_requests",
+      description: "Get network requests made by the page",
+      inputSchema: {
+        type: "object",
+        properties: {}
+      }
+    },
+    {
+      name: "browser_click",
+      description: "Click an element on the page. Provide EITHER a ref from the snapshot OR coordinates (x, y).\n- **ref**: Uses Playwright locator - handles scrolling into view and actionability checks automatically.\n- **coordinates**: Clicks at exact pixel position - useful when ref-based clicking fails due to overlays.\nAlways describe what you are clicking in the element parameter.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          ref: {
+            type: "string",
+            description: "Element reference from snapshot (optional if x/y coordinates provided)"
+          },
+          x: { type: "number", description: "X coordinate on the page (use with y)" },
+          y: { type: "number", description: "Y coordinate on the page (use with x)" },
+          element: { type: "string", description: "Description of what you are clicking" },
+          doubleClick: { type: "boolean", description: "Perform a double click" },
+          button: {
+            type: "string",
+            description: "Mouse button to click: left, right, middle"
+          },
+          modifiers: {
+            type: "array",
+            items: { type: "string" },
+            description: "Keyboard modifiers: Alt, Control, Meta, Shift"
+          }
+        },
+        required: ["element"]
+      }
+    },
+    {
+      name: "browser_hover",
+      description: "Hover over an element to reveal hidden content (dropdowns, tooltips, submenus). This does NOT click - use browser_click after hovering to interact with revealed items.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          ref: { type: "string", description: "The element reference from snapshot" },
+          element: { type: "string", description: "Description of what you are hovering over" }
+        },
+        required: ["ref", "element"]
+      }
+    },
+    {
+      name: "browser_drag",
+      description: "Drag between two points. Provide EITHER refs OR coordinates.\n- **refs**: startRef + endRef \u2014 uses Playwright locators for drag-and-drop.\n- **coordinates**: startX, startY, endX, endY \u2014 drags between exact pixel positions.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          startRef: { type: "string", description: "Starting element reference" },
+          startElement: { type: "string", description: "Description of starting element" },
+          endRef: { type: "string", description: "Target element reference" },
+          endElement: { type: "string", description: "Description of target element" },
+          startX: { type: "number", description: "Start X coordinate" },
+          startY: { type: "number", description: "Start Y coordinate" },
+          endX: { type: "number", description: "End X coordinate" },
+          endY: { type: "number", description: "End Y coordinate" }
+        },
+        required: ["startElement", "endElement"]
+      }
+    },
+    {
+      name: "browser_type",
+      description: 'Type text into an input field and optionally submit the form. WARNING: For date inputs (type="date"), use ISO format (YYYY-MM-DD) with browser_fill_form instead.',
+      inputSchema: {
+        type: "object",
+        properties: {
+          ref: { type: "string", description: "The element reference from snapshot" },
+          text: { type: "string", description: "The text to type" },
+          element: { type: "string", description: "Description of the input field" },
+          submit: { type: "boolean", description: "Whether to submit the form after typing" },
+          delay: { type: "number", description: "Delay between keystrokes in milliseconds" }
+        },
+        required: ["ref", "text", "element"]
+      }
+    },
+    {
+      name: "browser_press_key",
+      description: "Press a keyboard key",
+      inputSchema: {
+        type: "object",
+        properties: {
+          key: {
+            type: "string",
+            description: 'Key to press (e.g., "Enter", "Escape", "ArrowDown")'
+          }
+        },
+        required: ["key"]
+      }
+    },
+    {
+      name: "browser_fill_form",
+      description: "Fill multiple form fields at once",
+      inputSchema: {
+        type: "object",
+        properties: {
+          fields: {
+            type: "array",
+            items: {
+              type: "object",
+              properties: {
+                ref: { type: "string", description: "Element reference" },
+                element: { type: "string", description: "Element description" },
+                value: { type: "string", description: "Value to fill" }
+              },
+              required: ["ref", "value"]
+            },
+            description: "Array of form fields to fill"
+          }
+        },
+        required: ["fields"]
+      }
+    },
+    {
+      name: "browser_select_option",
+      description: "Select an option from a dropdown",
+      inputSchema: {
+        type: "object",
+        properties: {
+          ref: { type: "string", description: "Select element reference" },
+          value: { type: "string", description: "Option value to select" },
+          element: { type: "string", description: "Description of the dropdown" }
+        },
+        required: ["ref", "value", "element"]
+      }
+    },
+    {
+      name: "browser_file_upload",
+      description: "Upload one or multiple files",
+      inputSchema: {
+        type: "object",
+        properties: {
+          paths: {
+            type: "array",
+            items: { type: "string" },
+            description: "Array of file paths to upload"
+          }
+        },
+        required: ["paths"]
+      }
+    },
+    {
+      name: "browser_scroll",
+      description: "Scroll the page. Returns a screenshot showing the new viewport. Three modes:\n1. **Scroll at coordinates**: Use x + y to scroll at a specific point\n2. **Scroll by amount**: Use direction + amount to scroll up/down/left/right\n3. **Scroll to element**: Use toRef to scroll so that element is centered in the viewport",
+      inputSchema: {
+        type: "object",
+        properties: {
+          direction: {
+            type: "string",
+            enum: ["up", "down", "left", "right"],
+            description: "Direction to scroll (ignored if toRef is provided)"
+          },
+          amount: {
+            type: "number",
+            description: "Scroll intensity from 1-10 (default 3). Ignored if toRef is provided."
+          },
+          withinRef: {
+            type: "string",
+            description: "Scroll within this scrollable element instead of the page"
+          },
+          toRef: {
+            type: "string",
+            description: "Scroll the page so this element is centered in the viewport. Handles both vertical and horizontal scrolling automatically \u2014 works for grid columns that are horizontally off-screen."
+          },
+          x: {
+            type: "number",
+            description: "X coordinate for visual scroll origin."
+          },
+          y: {
+            type: "number",
+            description: "Y coordinate for visual scroll origin."
+          }
+        },
+        required: ["direction"]
+      }
+    },
+    {
+      name: "browser_handle_dialog",
+      description: 'Pre-register how to handle the next browser dialog (alert, confirm, prompt). Call this with action "accept" BEFORE re-clicking the button that triggered the dialog.',
+      inputSchema: {
+        type: "object",
+        properties: {
+          action: {
+            type: "string",
+            enum: ["accept", "dismiss"],
+            description: "Action to take on the dialog"
+          },
+          promptText: { type: "string", description: "Text to enter in prompt dialog" }
+        },
+        required: ["action"]
+      }
+    },
+    {
+      name: "browser_dismiss_overlay",
+      description: "Systematically attempt to dismiss any modal, overlay, or dialog blocking the page. Tries multiple strategies: Escape key, close button, backdrop click.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          preferredStrategy: {
+            type: "string",
+            enum: ["escape", "close_button", "backdrop", "auto"],
+            description: 'Preferred dismissal method. "auto" (default) tries all strategies.'
+          }
+        }
+      }
+    },
+    {
+      name: "browser_wait_for",
+      description: "Wait for a condition or time period",
+      inputSchema: {
+        type: "object",
+        properties: {
+          time: { type: "number", description: "Time to wait in seconds" },
+          text: { type: "string", description: "Text to wait for to appear" },
+          textGone: { type: "string", description: "Text to wait for to disappear" },
+          selector: { type: "string", description: "CSS selector to wait for" },
+          state: {
+            type: "string",
+            description: "State to wait for (visible, hidden, attached, detached)"
+          },
+          timeout: { type: "number", description: "Maximum wait time in milliseconds" }
+        }
+      }
+    },
+    {
+      name: "browser_close",
+      description: "Close the current page",
+      inputSchema: {
+        type: "object",
+        properties: {}
+      }
+    },
+    {
+      name: "browser_resize",
+      description: "Resize the browser viewport",
+      inputSchema: {
+        type: "object",
+        properties: {
+          width: { type: "number", description: "Viewport width in pixels" },
+          height: { type: "number", description: "Viewport height in pixels" }
+        },
+        required: ["width", "height"]
+      }
+    },
+    {
+      name: "browser_tabs",
+      description: "List, create, close, or select a browser tab",
+      inputSchema: {
+        type: "object",
+        properties: {
+          action: {
+            type: "string",
+            enum: ["list", "new", "close", "select"],
+            description: "Operation to perform"
+          },
+          index: {
+            type: "number",
+            description: "Tab index for close/select operations"
+          }
+        },
+        required: ["action"]
+      }
+    },
+    {
+      name: "browser_list_downloads",
+      description: "List all files downloaded during this browser session.",
+      inputSchema: {
+        type: "object",
+        properties: {}
+      }
+    },
+    {
+      name: "browser_read_download",
+      description: "Read the content of a downloaded file. For PDFs, extracts text. For text formats, reads as text. Binary files return metadata only.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          downloadId: {
+            type: "number",
+            description: "ID of the download to read. Defaults to most recent."
+          }
+        }
+      }
+    },
+    {
+      name: "browser_pdf_read",
+      description: "Fetch a PDF from a URL and extract its text content using the browser's authenticated session.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          url: {
+            type: "string",
+            description: "The URL of the PDF to fetch and extract text from"
+          }
+        },
+        required: ["url"]
+      }
+    }
+  ];
+}
+var BROWSER_LIFECYCLE_TOOLS = ["browser_start", "browser_stop"];
+function getBrowserToolDefinitionsWithLifecycle() {
+  return [
+    {
+      name: "browser_start",
+      description: "Launch a local browser for direct automation. Returns when browser is ready. The browser opens in headed mode so you can watch it.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          headless: {
+            type: "boolean",
+            description: "Run browser headless (default: false \u2014 headed so you can watch)"
+          },
+          storageStatePath: {
+            type: "string",
+            description: "Path to Playwright storage state JSON for pre-authenticated sessions"
+          }
+        }
+      }
+    },
+    {
+      name: "browser_stop",
+      description: "Stop the local browser and clean up resources.",
+      inputSchema: {
+        type: "object",
+        properties: {}
+      }
+    },
+    ...getBrowserToolDefinitions()
+  ];
+}
+
+// ../browser-core/src/tools/dispatcher.ts
+async function dispatchBrowserTool(executor, toolName, args) {
+  switch (toolName) {
+    case "browser_navigate":
+      return executor.navigate(args.url);
+    case "browser_navigate_back":
+      return executor.navigateBack();
+    case "browser_snapshot":
+      return executor.snapshot({
+        mode: args.mode,
+        expand: args.expand,
+        search: args.search,
+        showCoordinateGrid: args.showCoordinateGrid,
+        probeAt: args.probeAt
+      });
+    case "browser_screenshot":
+      return executor.screenshot({
+        fullPage: args.fullPage,
+        element: args.element,
+        ref: args.ref,
+        label: args.label,
+        returnImage: args.returnImage
+      });
+    case "browser_evaluate":
+      return executor.evaluate({
+        expression: args.function,
+        element: args.element,
+        ref: args.ref
+      });
+    case "browser_console_messages":
+      return executor.consoleMessages({
+        onlyErrors: args.onlyErrors
+      });
+    case "browser_network_requests":
+      return executor.networkRequests();
+    case "browser_click":
+      return executor.click({
+        ref: args.ref,
+        x: args.x,
+        y: args.y,
+        element: args.element,
+        doubleClick: args.doubleClick,
+        button: args.button,
+        modifiers: args.modifiers
+      });
+    case "browser_hover":
+      return executor.hover({
+        ref: args.ref,
+        element: args.element
+      });
+    case "browser_drag":
+      return executor.drag({
+        startRef: args.startRef,
+        endRef: args.endRef,
+        startElement: args.startElement,
+        endElement: args.endElement,
+        startX: args.startX,
+        startY: args.startY,
+        endX: args.endX,
+        endY: args.endY
+      });
+    case "browser_type":
+      return executor.type({
+        ref: args.ref,
+        text: args.text,
+        element: args.element,
+        submit: args.submit,
+        delay: args.delay
+      });
+    case "browser_press_key":
+      return executor.pressKey(args.key);
+    case "browser_fill_form":
+      return executor.fillForm(
+        args.fields
+      );
+    case "browser_select_option":
+      return executor.selectOption({
+        ref: args.ref,
+        value: args.value,
+        element: args.element
+      });
+    case "browser_file_upload":
+      return executor.fileUpload(args.paths);
+    case "browser_scroll":
+      return executor.scroll({
+        direction: args.direction,
+        amount: args.amount,
+        withinRef: args.withinRef,
+        toRef: args.toRef,
+        x: args.x,
+        y: args.y
+      });
+    case "browser_handle_dialog":
+      return executor.handleDialog({
+        action: args.action,
+        promptText: args.promptText
+      });
+    case "browser_dismiss_overlay":
+      return executor.dismissOverlay({
+        preferredStrategy: args.preferredStrategy
+      });
+    case "browser_wait_for":
+      return executor.waitFor({
+        timeSec: args.time,
+        text: args.text,
+        textGone: args.textGone,
+        selector: args.selector,
+        state: args.state,
+        timeout: args.timeout
+      });
+    case "browser_close":
+      return executor.close();
+    case "browser_resize":
+      return executor.resize(args.width, args.height);
+    case "browser_tabs":
+      return executor.tabs({
+        action: args.action,
+        index: args.index
+      });
+    case "browser_list_downloads":
+      return executor.listDownloads();
+    case "browser_read_download":
+      return executor.readDownload(args.downloadId);
+    case "browser_pdf_read":
+      return executor.fetchPdfText(args.url);
+    default:
+      throw new Error(`Unknown browser tool: ${toolName}`);
+  }
+}
+
+// ../browser-core/src/tools/consolidated-definitions.ts
+function getConsolidatedBrowserToolDefinitions() {
+  return [
+    // --- Navigation ---
+    {
+      name: "browser_navigate",
+      description: 'Navigate to a URL in the browser. Use url "back" to go to the previous page.',
+      inputSchema: {
+        type: "object",
+        properties: {
+          url: {
+            type: "string",
+            description: 'The URL to navigate to. Use "back" to go to the previous page.'
+          }
+        },
+        required: ["url"]
+      }
+    },
+    // --- Page Inspection ---
+    {
+      name: "browser_snapshot",
+      description: 'Get a snapshot of the page accessibility tree. Use search="term" to find elements near your current focus. Search returns ONLY relevant matches within your working context (the dialog, form, or section containing the active element). Results are highlighted in frontmatter with coordinates and on screenshot.',
+      inputSchema: {
+        type: "object",
+        properties: {
+          mode: {
+            type: "string",
+            enum: ["both", "screenshot", "tree"],
+            description: 'What to return: "both" (default) = tree + screenshot, "screenshot" = screenshot only (use coordinate-based clicking), "tree" = tree only'
+          },
+          expand: {
+            type: "string",
+            description: "Ref of a collapsed section to expand and show full details"
+          },
+          search: {
+            type: "string",
+            description: 'Search for 1-2 specific terms to LOCATE elements for your next action. Terms are OR-matched (use "|"), case-insensitive, and ignore punctuation. Results filtered to your current working context (not the whole page). IMPORTANT: Search overlays can obscure subtle UI states. Use search to LOCATE elements, not to VALIDATE visual states. If search results are confusing, take a snapshot without search for a clearer view. Example: "Save" or "Email|Username"'
+          },
+          showCoordinateGrid: {
+            type: "boolean",
+            description: "Overlay a coordinate grid showing pixel positions. Helps estimate click coordinates when using coordinate-based interaction."
+          },
+          probeAt: {
+            type: "object",
+            properties: {
+              x: { type: "number", description: "X coordinate in viewport pixels" },
+              y: { type: "number", description: "Y coordinate in viewport pixels" }
+            },
+            required: ["x", "y"],
+            description: 'RECOMMENDED before any coordinate-based click. Probes what element is at a pixel position. Returns the full tree with a PROBE RESULT in frontmatter showing the ref, role, and label of the element at those coordinates. If the probe returns a ref, prefer browser_action action="click" ref=... over coordinate clicking. Mutually exclusive with search.'
+          }
+        }
+      }
+    },
+    {
+      name: "browser_screenshot",
+      description: "Take a screenshot of the current page or a specific element. Optionally provide a human-readable label to reference this screenshot later.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          fullPage: {
+            type: "boolean",
+            description: "Whether to capture the full page or just viewport"
+          },
+          element: { type: "string", description: "Human-readable element description" },
+          ref: { type: "string", description: "Exact element reference from snapshot" },
+          label: {
+            type: "string",
+            description: "Human-readable label to reference this screenshot later"
+          },
+          returnImage: {
+            type: "boolean",
+            description: "When true, returns the image data so the model can see it. Use sparingly as images consume many tokens."
+          }
+        }
+      }
+    },
+    // --- Code Execution ---
+    {
+      name: "browser_evaluate",
+      description: "Execute JavaScript in the page context and return the result",
+      inputSchema: {
+        type: "object",
+        properties: {
+          function: {
+            type: "string",
+            description: 'JavaScript function to execute (e.g., "() => window.location.href")'
+          },
+          element: {
+            type: "string",
+            description: "Human-readable element description to evaluate on"
+          },
+          ref: { type: "string", description: "Exact element reference to evaluate on" }
+        },
+        required: ["function"]
+      }
+    },
+    {
+      name: "browser_run_code",
+      description: "Execute Playwright Node.js code with `page` object access. Runs in Node.js, NOT in the browser.",
       inputSchema: {
         type: "object",
-        properties: {}
+        properties: {
+          code: {
+            type: "string",
+            description: 'Playwright code to run with access to `page` object (e.g., `await page.getByRole("button", { name: "Submit" }).click();`)'
+          }
+        },
+        required: ["code"]
       }
     },
+    // --- Consolidated: browser_action (click + hover + type) ---
     {
-      name: "browser_click",
-      description: "Click an element on the page. Provide EITHER a ref from the snapshot OR coordinates (x, y).\n- **ref**: Uses Playwright locator - handles scrolling into view and actionability checks automatically.\n- **coordinates**: Clicks at exact pixel position - useful when ref-based clicking fails due to overlays.\nAlways describe what you are clicking in the element parameter.",
+      name: "browser_action",
+      description: 'Interact with a page element. Use action="click" to click, "hover" to reveal dropdowns/tooltips, "type" to enter text.\n- **click**: Provide ref OR coordinates (x, y). Always describe what you are clicking in element.\n- **hover**: Provide ref. Reveals hidden content without clicking.\n- **type**: Provide ref + text. Types into an input field. For date inputs, use browser_fill_form instead.',
       inputSchema: {
         type: "object",
         properties: {
+          action: {
+            type: "string",
+            enum: ["click", "hover", "type"],
+            description: "The interaction to perform"
+          },
           ref: {
             type: "string",
-            description: "Element reference from snapshot (optional if x/y coordinates provided)"
+            description: "Element reference from snapshot"
           },
-          x: { type: "number", description: "X coordinate on the page (use with y)" },
-          y: { type: "number", description: "Y coordinate on the page (use with x)" },
-          element: { type: "string", description: "Description of what you are clicking" },
-          doubleClick: { type: "boolean", description: "Perform a double click" },
+          element: {
+            type: "string",
+            description: "Description of the element you are interacting with"
+          },
+          // click-specific
+          x: { type: "number", description: "X coordinate on the page (click only, use with y)" },
+          y: { type: "number", description: "Y coordinate on the page (click only, use with x)" },
+          doubleClick: { type: "boolean", description: "Perform a double click (click only)" },
           button: {
             type: "string",
-            description: "Mouse button to click: left, right, middle"
+            description: "Mouse button: left, right, middle (click only)"
           },
           modifiers: {
             type: "array",
             items: { type: "string" },
-            description: "Keyboard modifiers: Alt, Control, Meta, Shift"
-          }
-        },
-        required: ["element"]
-      }
-    },
-    {
-      name: "browser_hover",
-      description: "Hover over an element to reveal hidden content (dropdowns, tooltips, submenus). This does NOT click - use browser_click after hovering to interact with revealed items.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          ref: { type: "string", description: "The element reference from snapshot" },
-          element: { type: "string", description: "Description of what you are hovering over" }
+            description: "Keyboard modifiers: Alt, Control, Meta, Shift (click only)"
+          },
+          // type-specific
+          text: { type: "string", description: "The text to type (type only)" },
+          submit: { type: "boolean", description: "Submit the form after typing (type only)" },
+          delay: { type: "number", description: "Delay between keystrokes in ms (type only)" }
         },
-        required: ["ref", "element"]
+        required: ["action", "element"]
       }
     },
+    // --- Kept separate ---
     {
       name: "browser_drag",
       description: "Drag between two points. Provide EITHER refs OR coordinates.\n- **refs**: startRef + endRef \u2014 uses Playwright locators for drag-and-drop.\n- **coordinates**: startX, startY, endX, endY \u2014 drags between exact pixel positions.",
@@ -42240,21 +42932,6 @@ function getBrowserToolDefinitions() {
         required: ["startElement", "endElement"]
       }
     },
-    {
-      name: "browser_type",
-      description: 'Type text into an input field and optionally submit the form. WARNING: For date inputs (type="date"), use ISO format (YYYY-MM-DD) with browser_fill_form instead.',
-      inputSchema: {
-        type: "object",
-        properties: {
-          ref: { type: "string", description: "The element reference from snapshot" },
-          text: { type: "string", description: "The text to type" },
-          element: { type: "string", description: "Description of the input field" },
-          submit: { type: "boolean", description: "Whether to submit the form after typing" },
-          delay: { type: "number", description: "Delay between keystrokes in milliseconds" }
-        },
-        required: ["ref", "text", "element"]
-      }
-    },
     {
       name: "browser_press_key",
       description: "Press a keyboard key",
@@ -42341,50 +43018,14 @@ function getBrowserToolDefinitions() {
           },
           toRef: {
             type: "string",
-            description: "Scroll the page so this element is centered in the viewport. Handles both vertical and horizontal scrolling automatically \u2014 works for grid columns that are horizontally off-screen."
+            description: "Scroll the page so this element is centered in the viewport. Handles both vertical and horizontal scrolling automatically."
           },
-          x: {
-            type: "number",
-            description: "X coordinate for visual scroll origin."
-          },
-          y: {
-            type: "number",
-            description: "Y coordinate for visual scroll origin."
-          }
+          x: { type: "number", description: "X coordinate for visual scroll origin." },
+          y: { type: "number", description: "Y coordinate for visual scroll origin." }
         },
         required: ["direction"]
       }
     },
-    {
-      name: "browser_handle_dialog",
-      description: 'Pre-register how to handle the next browser dialog (alert, confirm, prompt). Call this with action "accept" BEFORE re-clicking the button that triggered the dialog.',
-      inputSchema: {
-        type: "object",
-        properties: {
-          action: {
-            type: "string",
-            enum: ["accept", "dismiss"],
-            description: "Action to take on the dialog"
-          },
-          promptText: { type: "string", description: "Text to enter in prompt dialog" }
-        },
-        required: ["action"]
-      }
-    },
-    {
-      name: "browser_dismiss_overlay",
-      description: "Systematically attempt to dismiss any modal, overlay, or dialog blocking the page. Tries multiple strategies: Escape key, close button, backdrop click.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          preferredStrategy: {
-            type: "string",
-            enum: ["escape", "close_button", "backdrop", "auto"],
-            description: 'Preferred dismissal method. "auto" (default) tries all strategies.'
-          }
-        }
-      }
-    },
     {
       name: "browser_wait_for",
       description: "Wait for a condition or time period",
@@ -42403,14 +43044,6 @@ function getBrowserToolDefinitions() {
         }
       }
     },
-    {
-      name: "browser_close",
-      description: "Close the current page",
-      inputSchema: {
-        type: "object",
-        properties: {}
-      }
-    },
     {
       name: "browser_resize",
       description: "Resize the browser viewport",
@@ -42442,45 +43075,70 @@ function getBrowserToolDefinitions() {
         required: ["action"]
       }
     },
+    // --- Consolidated: browser_dialog (replaces browser_handle_dialog) ---
     {
-      name: "browser_list_downloads",
-      description: "List all files downloaded during this browser session.",
+      name: "browser_dialog",
+      description: 'Pre-register how to handle the next browser dialog (alert, confirm, prompt). Call this with action "accept" BEFORE re-clicking the button that triggered the dialog.',
       inputSchema: {
         type: "object",
-        properties: {}
+        properties: {
+          action: {
+            type: "string",
+            enum: ["accept", "dismiss"],
+            description: "Action to take on the dialog"
+          },
+          promptText: { type: "string", description: "Text to enter in prompt dialog" }
+        },
+        required: ["action"]
       }
     },
+    // --- Consolidated: browser_devtools (console + network) ---
     {
-      name: "browser_read_download",
-      description: "Read the content of a downloaded file. For PDFs, extracts text. For text formats, reads as text. Binary files return metadata only.",
+      name: "browser_devtools",
+      description: 'Access browser developer tools data. Use target="console" to get console messages, target="network" to get network requests.',
       inputSchema: {
         type: "object",
         properties: {
-          downloadId: {
-            type: "number",
-            description: "ID of the download to read. Defaults to most recent."
+          target: {
+            type: "string",
+            enum: ["console", "network"],
+            description: 'What to inspect: "console" for console messages, "network" for network requests'
+          },
+          onlyErrors: {
+            type: "boolean",
+            description: "Only return error messages (console target only)"
           }
-        }
+        },
+        required: ["target"]
       }
     },
+    // --- Consolidated: browser_download (list + read + pdf) ---
     {
-      name: "browser_pdf_read",
-      description: "Fetch a PDF from a URL and extract its text content using the browser's authenticated session.",
+      name: "browser_download",
+      description: `Manage downloaded files. Use action="list" to list downloads, "read" to read a download's content, "pdf" to fetch and extract text from a PDF URL using the browser's authenticated session.`,
       inputSchema: {
         type: "object",
         properties: {
+          action: {
+            type: "string",
+            enum: ["list", "read", "pdf"],
+            description: 'Operation: "list" downloads, "read" a download, or fetch a "pdf" from URL'
+          },
+          downloadId: {
+            type: "number",
+            description: 'ID of the download to read (for action="read"). Defaults to most recent.'
+          },
           url: {
             type: "string",
-            description: "The URL of the PDF to fetch and extract text from"
+            description: 'URL of the PDF to fetch (for action="pdf")'
           }
         },
-        required: ["url"]
+        required: ["action"]
       }
     }
   ];
 }
-var BROWSER_LIFECYCLE_TOOLS = ["browser_start", "browser_stop"];
-function getBrowserToolDefinitionsWithLifecycle() {
+function getConsolidatedBrowserToolDefinitionsWithLifecycle() {
   return [
     {
       name: "browser_start",
@@ -42507,17 +43165,23 @@ function getBrowserToolDefinitionsWithLifecycle() {
         properties: {}
       }
     },
-    ...getBrowserToolDefinitions()
+    ...getConsolidatedBrowserToolDefinitions()
   ];
 }
 
-// ../browser-core/src/tools/dispatcher.ts
-async function dispatchBrowserTool(executor, toolName, args) {
+// ../browser-core/src/tools/consolidated-dispatcher.ts
+async function dispatchConsolidatedBrowserTool(executor, toolName, args) {
   switch (toolName) {
+    // --- Navigation ---
     case "browser_navigate":
+      if (args.url === "back") {
+        return executor.navigateBack();
+      }
       return executor.navigate(args.url);
+    // Legacy alias
     case "browser_navigate_back":
       return executor.navigateBack();
+    // --- Page Inspection (unchanged) ---
     case "browser_snapshot":
       return executor.snapshot({
         mode: args.mode,
@@ -42534,18 +43198,45 @@ async function dispatchBrowserTool(executor, toolName, args) {
         label: args.label,
         returnImage: args.returnImage
       });
+    // --- Code Execution (unchanged) ---
     case "browser_evaluate":
       return executor.evaluate({
         expression: args.function,
         element: args.element,
         ref: args.ref
       });
-    case "browser_console_messages":
-      return executor.consoleMessages({
-        onlyErrors: args.onlyErrors
-      });
-    case "browser_network_requests":
-      return executor.networkRequests();
+    // --- Consolidated: browser_action (click + hover + type) ---
+    case "browser_action": {
+      const action = args.action;
+      switch (action) {
+        case "click":
+          return executor.click({
+            ref: args.ref,
+            x: args.x,
+            y: args.y,
+            element: args.element,
+            doubleClick: args.doubleClick,
+            button: args.button,
+            modifiers: args.modifiers
+          });
+        case "hover":
+          return executor.hover({
+            ref: args.ref,
+            element: args.element
+          });
+        case "type":
+          return executor.type({
+            ref: args.ref,
+            text: args.text,
+            element: args.element,
+            submit: args.submit,
+            delay: args.delay
+          });
+        default:
+          throw new Error(`Unknown browser_action action: ${action}`);
+      }
+    }
+    // Legacy aliases for browser_action
     case "browser_click":
       return executor.click({
         ref: args.ref,
@@ -42561,6 +43252,15 @@ async function dispatchBrowserTool(executor, toolName, args) {
         ref: args.ref,
         element: args.element
       });
+    case "browser_type":
+      return executor.type({
+        ref: args.ref,
+        text: args.text,
+        element: args.element,
+        submit: args.submit,
+        delay: args.delay
+      });
+    // --- Kept separate (unchanged) ---
     case "browser_drag":
       return executor.drag({
         startRef: args.startRef,
@@ -42572,14 +43272,6 @@ async function dispatchBrowserTool(executor, toolName, args) {
         endX: args.endX,
         endY: args.endY
       });
-    case "browser_type":
-      return executor.type({
-        ref: args.ref,
-        text: args.text,
-        element: args.element,
-        submit: args.submit,
-        delay: args.delay
-      });
     case "browser_press_key":
       return executor.pressKey(args.key);
     case "browser_fill_form":
@@ -42603,15 +43295,6 @@ async function dispatchBrowserTool(executor, toolName, args) {
         x: args.x,
         y: args.y
       });
-    case "browser_handle_dialog":
-      return executor.handleDialog({
-        action: args.action,
-        promptText: args.promptText
-      });
-    case "browser_dismiss_overlay":
-      return executor.dismissOverlay({
-        preferredStrategy: args.preferredStrategy
-      });
     case "browser_wait_for":
       return executor.waitFor({
         timeSec: args.time,
@@ -42621,8 +43304,6 @@ async function dispatchBrowserTool(executor, toolName, args) {
         state: args.state,
         timeout: args.timeout
       });
-    case "browser_close":
-      return executor.close();
     case "browser_resize":
       return executor.resize(args.width, args.height);
     case "browser_tabs":
@@ -42630,12 +43311,64 @@ async function dispatchBrowserTool(executor, toolName, args) {
         action: args.action,
         index: args.index
       });
+    // --- Consolidated: browser_dialog ---
+    case "browser_dialog":
+      return executor.handleDialog({
+        action: args.action,
+        promptText: args.promptText
+      });
+    // Legacy alias
+    case "browser_handle_dialog":
+      return executor.handleDialog({
+        action: args.action,
+        promptText: args.promptText
+      });
+    // --- Consolidated: browser_devtools ---
+    case "browser_devtools": {
+      const target = args.target;
+      if (target === "console") {
+        return executor.consoleMessages({
+          onlyErrors: args.onlyErrors
+        });
+      }
+      return executor.networkRequests();
+    }
+    // Legacy aliases
+    case "browser_console_messages":
+      return executor.consoleMessages({
+        onlyErrors: args.onlyErrors
+      });
+    case "browser_network_requests":
+      return executor.networkRequests();
+    // --- Consolidated: browser_download ---
+    case "browser_download": {
+      const downloadAction = args.action;
+      switch (downloadAction) {
+        case "list":
+          return executor.listDownloads();
+        case "read":
+          return executor.readDownload(args.downloadId);
+        case "pdf":
+          return executor.fetchPdfText(args.url);
+        default:
+          throw new Error(`Unknown browser_download action: ${downloadAction}`);
+      }
+    }
+    // Legacy aliases
     case "browser_list_downloads":
       return executor.listDownloads();
     case "browser_read_download":
       return executor.readDownload(args.downloadId);
     case "browser_pdf_read":
       return executor.fetchPdfText(args.url);
+    // Legacy: browser_close (dropped but kept for compat)
+    case "browser_close":
+      return executor.close();
+    // Legacy: browser_dismiss_overlay (dropped but kept for compat)
+    case "browser_dismiss_overlay":
+      return executor.dismissOverlay({
+        preferredStrategy: args.preferredStrategy
+      });
     default:
       throw new Error(`Unknown browser tool: ${toolName}`);
   }
@@ -44668,7 +45401,9 @@ function formatMcpResponse(input) {
     for (const toast of input.capturedToasts) {
       const remaining = toast.snapshotsRemaining ?? 1;
       const placementHint = toast.placement ? ` [visible at (${toast.placement.x}, ${toast.placement.y}), ${toast.placement.width}\xD7${toast.placement.height}px]` : "";
-      lines.push(`- [${toast.role}] ${toast.text}${placementHint} (expires in ${remaining} snapshot${remaining !== 1 ? "s" : ""})`);
+      lines.push(
+        `- [${toast.role}] ${toast.text}${placementHint} (expires in ${remaining} snapshot${remaining !== 1 ? "s" : ""})`
+      );
     }
     lines.push("");
   }
@@ -44678,7 +45413,7 @@ function formatMcpResponse(input) {
   if (completedNew.length > 0) {
     lines.push("### Downloads");
     for (const dl of completedNew) {
-      const size = dl.sizeBytes != null ? ` (${formatFileSize(dl.sizeBytes)})` : "";
+      const size = dl.sizeBytes !== null && dl.sizeBytes !== void 0 ? ` (${formatFileSize(dl.sizeBytes)})` : "";
       lines.push(
         `- [${dl.id}] ${dl.suggestedFilename}${size} \u2014 use browser_read_download to view content`
       );
@@ -44892,7 +45627,9 @@ var PlaywrightClient = class _PlaywrightClient {
     this.screencastEncoderFactory = options?.screencastEncoderFactory ?? null;
     this.cursorOverlay = new CursorOverlay({ enabled: false });
     if (!options?.tmpBaseDir) {
-      this.logger.debug("[PlaywrightClient] No tmpBaseDir provided, using flat canary dir (not org-scoped)");
+      this.logger.debug(
+        "[PlaywrightClient] No tmpBaseDir provided, using flat canary dir (not org-scoped)"
+      );
     }
     this.tmpBaseDir = options?.tmpBaseDir ?? getCanaryTmpDir();
   }
@@ -44912,10 +45649,7 @@ var PlaywrightClient = class _PlaywrightClient {
     return Promise.race([
       operation,
       new Promise(
-        (_, reject2) => setTimeout(
-          () => reject2(new Error(`${label} timed out after ${timeoutMs}ms`)),
-          timeoutMs
-        )
+        (_, reject2) => setTimeout(() => reject2(new Error(`${label} timed out after ${timeoutMs}ms`)), timeoutMs)
       )
     ]);
   }
@@ -45215,8 +45949,8 @@ var PlaywrightClient = class _PlaywrightClient {
       acceptDownloads: true
     };
     const mergedHeaders = {
-      ...this.lastConnectOptions?.extraHTTPHeaders ?? {},
-      ...options.extraHTTPHeaders ?? {}
+      ...this.lastConnectOptions?.extraHTTPHeaders,
+      ...options.extraHTTPHeaders
     };
     if (Object.keys(mergedHeaders).length > 0) {
       contextOptions.extraHTTPHeaders = mergedHeaders;
@@ -45491,13 +46225,10 @@ var PlaywrightClient = class _PlaywrightClient {
         const candidate = path4.join(cacheDir, dir, relativeBinaryPath);
         try {
           await fs4.access(candidate);
-          logger2.warn(
-            "[DirectPlaywright] Using fallback Chromium binary (version mismatch)",
-            {
-              expected: defaultPath,
-              using: candidate
-            }
-          );
+          logger2.warn("[DirectPlaywright] Using fallback Chromium binary (version mismatch)", {
+            expected: defaultPath,
+            using: candidate
+          });
           return candidate;
         } catch {
           continue;
@@ -45679,7 +46410,10 @@ var PlaywrightClient = class _PlaywrightClient {
     });
     this.lastKnownUrl = url;
     await this.stabilize("navigation");
-    const [snapshotYaml, title] = await Promise.all([this.captureSnapshotInternal(), page.title()]);
+    const [snapshotYaml, title] = await Promise.all([
+      this.captureSnapshotInternal(),
+      this.getPage().then((p) => p.title())
+    ]);
     return this.formatMCPResponse(
       `Navigated to ${url}`,
       snapshotYaml,
@@ -45695,7 +46429,10 @@ var PlaywrightClient = class _PlaywrightClient {
     this.logger.debug("[DirectPlaywright] Navigating back");
     await page.goBack({ timeout: opts?.timeoutMs ?? TIMEOUTS.NAVIGATE });
     await this.stabilize("navigation");
-    const [snapshotYaml, title] = await Promise.all([this.captureSnapshotInternal(), page.title()]);
+    const [snapshotYaml, title] = await Promise.all([
+      this.captureSnapshotInternal(),
+      this.getPage().then((p) => p.title())
+    ]);
     return this.formatMCPResponse("Navigated back", snapshotYaml, "await page.goBack();", title);
   }
   // ================ PAGE INSPECTION ================
@@ -45741,14 +46478,14 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
     }
     const [rawSnapshotYaml, title] = await Promise.all([
       this.captureSnapshotInternal(),
-      page.title()
+      this.getPage().then((p) => p.title())
     ]);
     const snapshotYaml = this.filterSnapshot(
       rawSnapshotYaml,
       opts?.depth,
       opts?.filterToInteractive
     );
-    let snapshotText = this.formatMCPResponse("", snapshotYaml, void 0, title);
+    const snapshotText = this.formatMCPResponse("", snapshotYaml, void 0, title);
     const DOM_COMPLEXITY_THRESHOLD = 3e4;
     const estimatedTokens = estimateTextTokens(snapshotText);
     const refCount = (snapshotYaml.match(/\[ref=/g) || []).length;
@@ -45924,7 +46661,9 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
     try {
       await page.waitForLoadState("networkidle", { timeout: timeoutMs });
     } catch {
-      this.logger.debug("[DirectPlaywright] waitForNetworkIdle timed out, proceeding", { timeoutMs });
+      this.logger.debug("[DirectPlaywright] waitForNetworkIdle timed out, proceeding", {
+        timeoutMs
+      });
     }
   }
   getPendingNetworkInfo() {
@@ -46790,19 +47529,22 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
   async probeAtCoordinates(x2, y2, _opts) {
     try {
       const page = await this.getPage();
-      const elementInfo = await page.evaluate(({ px, py }) => {
-        const el = document.elementFromPoint(px, py);
-        if (!el) return null;
-        el.setAttribute("data-probe-target", "true");
-        return {
-          tagName: el.tagName.toLowerCase(),
-          id: el.id || void 0,
-          className: typeof el.className === "string" ? el.className || void 0 : void 0,
-          ariaLabel: el.getAttribute("aria-label") || void 0,
-          textContent: el.textContent?.trim().slice(0, 100) || void 0,
-          role: el.getAttribute("role") || void 0
-        };
-      }, { px: x2, py: y2 });
+      const elementInfo = await page.evaluate(
+        ({ px, py }) => {
+          const el = document.elementFromPoint(px, py);
+          if (!el) return null;
+          el.setAttribute("data-probe-target", "true");
+          return {
+            tagName: el.tagName.toLowerCase(),
+            id: el.id || void 0,
+            className: typeof el.className === "string" ? el.className || void 0 : void 0,
+            ariaLabel: el.getAttribute("aria-label") || void 0,
+            textContent: el.textContent?.trim().slice(0, 100) || void 0,
+            role: el.getAttribute("role") || void 0
+          };
+        },
+        { px: x2, py: y2 }
+      );
       if (!elementInfo) return null;
       let ref;
       let label;
@@ -46981,10 +47723,13 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
           });
           await new Promise((resolve2) => setTimeout(resolve2, 200 * attempt));
         } else {
-          this.logger.warn("[DirectPlaywright] All snapshot attempts failed, using empty fallback", {
-            attempts: maxRetries,
-            error: err instanceof Error ? err.message : String(err)
-          });
+          this.logger.warn(
+            "[DirectPlaywright] All snapshot attempts failed, using empty fallback",
+            {
+              attempts: maxRetries,
+              error: err instanceof Error ? err.message : String(err)
+            }
+          );
         }
       }
     }
@@ -47174,7 +47919,10 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
       return;
     }
     if (!this.screencastManager) {
-      this.screencastManager = new CdpScreencastManager(options, this.screencastEncoderFactory ?? void 0);
+      this.screencastManager = new CdpScreencastManager(
+        options,
+        this.screencastEncoderFactory ?? void 0
+      );
     }
     this.screencastHandler = onFrame;
     await this.screencastManager.start(this.page, onFrame);
@@ -47707,21 +48455,37 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
         }
       };
       if (this.extensionsEnabled && this.context) {
-        this.logger.warn("[DirectPlaywright] Restoring page in existing persistent context", {
-          reason
-        });
-        await this.createPageWithListeners(this.context, reason);
-        await this.restoreUrlAfterRecovery(urlToRestore, crashType);
-        await restartScreencastIfNeeded();
-        return;
+        try {
+          this.logger.warn("[DirectPlaywright] Restoring page in existing persistent context", {
+            reason
+          });
+          await this.createPageWithListeners(this.context, reason);
+          await this.restoreUrlAfterRecovery(urlToRestore, crashType);
+          await restartScreencastIfNeeded();
+          return;
+        } catch (err) {
+          this.logger.warn(
+            "[DirectPlaywright] Persistent context unusable, falling through to full recreation",
+            { reason, error: err instanceof Error ? err.message : String(err) }
+          );
+          this.context = null;
+        }
       }
       const reuseContext = this.browser?.isConnected() && this.context;
       if (reuseContext) {
-        this.logger.warn("[DirectPlaywright] Restoring page in existing context", { reason });
-        await this.createPageWithListeners(this.context, reason);
-        await this.restoreUrlAfterRecovery(urlToRestore, crashType);
-        await restartScreencastIfNeeded();
-        return;
+        try {
+          this.logger.warn("[DirectPlaywright] Restoring page in existing context", { reason });
+          await this.createPageWithListeners(this.context, reason);
+          await this.restoreUrlAfterRecovery(urlToRestore, crashType);
+          await restartScreencastIfNeeded();
+          return;
+        } catch (err) {
+          this.logger.warn(
+            "[DirectPlaywright] Context unusable despite connected browser, falling through",
+            { reason, error: err instanceof Error ? err.message : String(err) }
+          );
+          this.context = null;
+        }
       }
       if (this.browserLease) {
         this.logger.warn("[DirectPlaywright] Recovering via pool lease", {
@@ -47730,7 +48494,11 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
         });
         const newLease = await this.browserLease.recover();
         this.browserLease = newLease;
-        const { storageStatePath: ssp, recordVideo: rv, extraHTTPHeaders: headers } = connectOptions;
+        const {
+          storageStatePath: ssp,
+          recordVideo: rv,
+          extraHTTPHeaders: headers
+        } = connectOptions;
         const videoConfig2 = this.resolveVideoConfig(rv);
         this.videoEnabled = !!videoConfig2;
         this.videoDir = videoConfig2?.dir ?? null;
@@ -48001,7 +48769,7 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
     }
     const lines = [`${this._capturedDownloads.length} download(s):`];
     for (const dl of this._capturedDownloads) {
-      const size = dl.sizeBytes != null ? ` (${this.formatFileSize(dl.sizeBytes)})` : "";
+      const size = dl.sizeBytes !== null && dl.sizeBytes !== void 0 ? ` (${this.formatFileSize(dl.sizeBytes)})` : "";
       let status;
       if (dl.completed) {
         status = "completed";
@@ -48018,7 +48786,7 @@ Use coordinate-based clicking (x, y) to interact with elements visible in the sc
     if (this._capturedDownloads.length === 0) {
       throw new Error("No downloads captured during this session.");
     }
-    const target = downloadId != null ? this._capturedDownloads.find((d) => d.id === downloadId) : this._capturedDownloads[this._capturedDownloads.length - 1];
+    const target = downloadId !== null && downloadId !== void 0 ? this._capturedDownloads.find((d) => d.id === downloadId) : this._capturedDownloads[this._capturedDownloads.length - 1];
     if (!target) {
       throw new Error(
         `Download #${downloadId} not found. Use browser_list_downloads to see available downloads.`
@@ -48190,6 +48958,9 @@ export {
   BROWSER_LIFECYCLE_TOOLS,
   getBrowserToolDefinitionsWithLifecycle,
   dispatchBrowserTool,
+  getConsolidatedBrowserToolDefinitions,
+  getConsolidatedBrowserToolDefinitionsWithLifecycle,
+  dispatchConsolidatedBrowserTool,
   extractSemanticHint,
   PlaywrightClient
 };
@@ -48472,4 +49243,4 @@ playwright-extra/dist/index.esm.js:
    * @license MIT
    *)
 */
-//# sourceMappingURL=chunk-MSMC6UXW.js.map
+//# sourceMappingURL=chunk-6IAPGYZQ.js.map