@mozilla/firefox-devtools-mcp 0.9.3 → 0.9.5

package/README.md

@@ -1,6 +1,6 @@
 # Firefox DevTools MCP
 
-[![npm version](https://badge.fury.io/js/firefox-devtools-mcp.svg)](https://www.npmjs.com/package/firefox-devtools-mcp)
+[![npm version](https://badge.fury.io/js/@mozilla%2Ffirefox-devtools-mcp.svg)](https://www.npmjs.com/package/mozilla/firefox-devtools-mcp)
 [![CI](https://github.com/mozilla/firefox-devtools-mcp/workflows/CI/badge.svg)](https://github.com/mozilla/firefox-devtools-mcp/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/mozilla/firefox-devtools-mcp/branch/main/graph/badge.svg)](https://codecov.io/gh/mozilla/firefox-devtools-mcp)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE-MIT) [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE-APACHE)
@@ -11,7 +11,7 @@ Model Context Protocol server for automating Firefox via WebDriver BiDi (through
 
 Repository: https://github.com/mozilla/firefox-devtools-mcp
 
-> **Note**: This MCP server requires a local Firefox browser installation and cannot run on cloud hosting services like glama.ai. Use `npx firefox-devtools-mcp@latest` to run locally, or use Docker with the provided Dockerfile.
+> **Note**: This MCP server requires a local Firefox browser installation and cannot run on cloud hosting services like glama.ai. Use `npx @mozilla/firefox-devtools-mcp@latest` to run locally, or use Docker with the provided Dockerfile.
 
 ## Security
 
@@ -35,17 +35,17 @@ Recommended: use npx so you always run the latest published version from npm.
 Option A — Claude Code CLI
 
 ```bash
-claude mcp add firefox-devtools npx firefox-devtools-mcp@latest
+claude mcp add firefox-devtools npx @mozilla/firefox-devtools-mcp@latest
 ```
 
 Pass options either as args or env vars. Examples:
 
 ```bash
 # Headless + viewport via args
-claude mcp add firefox-devtools npx firefox-devtools-mcp@latest -- --headless --viewport 1280x720
+claude mcp add firefox-devtools npx @mozilla/firefox-devtools-mcp@latest -- --headless --viewport 1280x720
 
 # Or via environment variables
-claude mcp add firefox-devtools npx firefox-devtools-mcp@latest \
+claude mcp add firefox-devtools npx @mozilla/firefox-devtools-mcp@latest \
   --env START_URL=https://example.com \
   --env FIREFOX_HEADLESS=true
 ```
@@ -63,9 +63,9 @@ Add to your Claude Code config file:
   "mcpServers": {
     "firefox-devtools": {
       "command": "npx",
-      "args": ["-y", "firefox-devtools-mcp@latest", "--headless", "--viewport", "1280x720"],
+      "args": ["-y", "@mozilla/firefox-devtools-mcp@latest", "--headless", "--viewport", "1280x720"],
       "env": {
-        "START_URL": "about:home"
+        "START_URL": "about:blank"
       }
     }
   }
@@ -82,7 +82,7 @@ npm run setup
 ## Try it with MCP Inspector
 
 ```bash
-npx @modelcontextprotocol/inspector npx firefox-devtools-mcp@latest --start-url https://example.com --headless
+npx @modelcontextprotocol/inspector npx @mozilla/firefox-devtools-mcp@latest --start-url https://example.com --headless
 ```
 
 Then call tools like:
@@ -108,9 +108,31 @@ You can pass flags or environment variables (names on the right):
 - `--pref name=value` — set Firefox preference at startup via `moz:firefoxOptions` (repeatable)
 - `--enable-script` — enable the `evaluate_script` tool, which executes arbitrary JavaScript in the page context (`ENABLE_SCRIPT=true`)
 - `--enable-privileged-context` — enable privileged context tools: list/select privileged contexts, evaluate privileged scripts, get/set Firefox prefs, and list extensions. Requires `MOZ_REMOTE_ALLOW_SYSTEM_ACCESS=1` (`ENABLE_PRIVILEGED_CONTEXT=true`)
+- `--android-device` — enable Firefox for Android mode; value is the ADB device serial (e.g. `emulator-5554`). Run `adb devices` to list connected devices. Omit the value or use `auto` to select the single connected device automatically.
+- `--android-package` — Android app package name, default `org.mozilla.firefox`. Other packages: `org.mozilla.firefox_beta` for Firefox Beta, `org.mozilla.fenix` for Firefox Nightly, `org.mozilla.fenix.debug` for Firefox Nightly Debug, `org.mozilla.geckoview_example` for geckoview (`ANDROID_PACKAGE`)
 
 > **Note on `--pref`:** When Firefox runs in automation, it applies [RecommendedPreferences](https://searchfox.org/firefox-main/source/remote/shared/RecommendedPreferences.sys.mjs) that modify browser behavior for testing. The `--pref` option allows overriding these defaults when needed.
 
+### Firefox for Android
+
+Use `--android-device` to automate Firefox running on an Android device. Requires `adb` on your PATH and geckodriver, which is managed automatically.
+
+```bash
+# List connected devices
+adb devices
+
+# Launch Firefox for Android on the single connected device
+npx @mozilla/firefox-devtools-mcp --android-device auto
+
+# Target a specific device
+npx @mozilla/firefox-devtools-mcp --android-device <serial>
+
+# Use Firefox Nightly instead
+npx @mozilla/firefox-devtools-mcp --android-device <serial> --android-package org.mozilla.fenix
+```
+
+Port forwarding between the host and device is handled automatically by geckodriver.
+
 ### Connect to existing Firefox
 
 Use `--connect-existing` to automate your real browsing session — with cookies, logins, and open tabs intact:
@@ -120,7 +142,7 @@ Use `--connect-existing` to automate your real browsing session — with cookies
 firefox --marionette
 
 # Run the MCP server
-npx firefox-devtools-mcp --connect-existing --marionette-port 2828
+npx @mozilla/firefox-devtools-mcp --connect-existing --marionette-port 2828
 ```
 
 Or set `marionette.enabled` to `true` in `about:config` (or `user.js`) to enable Marionette on every launch.
@@ -186,7 +208,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more details on local development, te
     "mcpServers": {
       "firefox-devtools": {
         "command": "cmd",
-        "args": ["/c", "npx", "-y", "firefox-devtools-mcp@latest"]
+        "args": ["/c", "npx", "-y", "@mozilla/firefox-devtools-mcp@latest"]
       }
     }
     ```
@@ -197,7 +219,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more details on local development, te
     "mcpServers": {
       "firefox-devtools": {
         "command": "C:\\nvm4w\\nodejs\\npx.ps1",
-        "args": ["-y", "firefox-devtools-mcp@latest"]
+        "args": ["-y", "@mozilla/firefox-devtools-mcp@latest"]
       }
     }
     ```

package/dist/index.js

@@ -128,8 +128,8 @@ var init_cli = __esm({
       },
       startUrl: {
         type: "string",
-        description: "URL to open when Firefox starts (default: about:home)",
-        default: process.env.START_URL ?? "about:home"
+        description: "URL to open when Firefox starts (default: about:blank)",
+        default: process.env.START_URL ?? "about:blank"
       },
       connectExisting: {
         type: "boolean",
@@ -155,6 +155,15 @@ var init_cli = __esm({
         description: "Set Firefox preference at startup via moz:firefoxOptions (format: name=value). Can be specified multiple times.",
         alias: "p"
       },
+      androidDevice: {
+        type: "string",
+        description: "Android device serial for launching Firefox for Android via ADB. Omit to auto-select the single connected device. Requires adb on PATH."
+      },
+      androidPackage: {
+        type: "string",
+        description: "Android app package name (default: org.mozilla.firefox). Use org.mozilla.fenix for Nightly.",
+        default: process.env.ANDROID_PACKAGE ?? "org.mozilla.firefox"
+      },
       enableScript: {
         type: "boolean",
         description: "Enable the evaluate_script tool, which allows executing arbitrary JavaScript in the page context.",
@@ -5172,8 +5181,8 @@ var init_regexes = __esm({
     _emoji = `^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$`;
     ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
     ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
-    mac = (delimiter) => {
-      const escapedDelim = escapeRegex(delimiter ?? ":");
+    mac = (delimiter2) => {
+      const escapedDelim = escapeRegex(delimiter2 ?? ":");
       return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
     };
     cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -17753,6 +17762,9 @@ var require_utils = __commonJS({
     "use strict";
     var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
     var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
+    var isHexPair = RegExp.prototype.test.bind(/^[\da-f]{2}$/iu);
+    var isUnreserved = RegExp.prototype.test.bind(/^[\da-z\-._~]$/iu);
+    var isPathCharacter = RegExp.prototype.test.bind(/^[\da-z\-._~!$&'()*+,;=:@/]$/iu);
     function stringArrayToHexStripped(input) {
       let acc = "";
       let code = 0;
@@ -17945,27 +17957,77 @@ var require_utils = __commonJS({
       }
       return output.join("");
     }
-    function normalizeComponentEncoding(component, esc2) {
-      const func = esc2 !== true ? escape : unescape;
-      if (component.scheme !== void 0) {
-        component.scheme = func(component.scheme);
-      }
-      if (component.userinfo !== void 0) {
-        component.userinfo = func(component.userinfo);
-      }
-      if (component.host !== void 0) {
-        component.host = func(component.host);
+    var HOST_DELIMS = { "@": "%40", "/": "%2F", "?": "%3F", "#": "%23", ":": "%3A" };
+    var HOST_DELIM_RE = /[@/?#:]/g;
+    var HOST_DELIM_NO_COLON_RE = /[@/?#]/g;
+    function reescapeHostDelimiters(host, isIP) {
+      const re = isIP ? HOST_DELIM_NO_COLON_RE : HOST_DELIM_RE;
+      re.lastIndex = 0;
+      return host.replace(re, (ch) => HOST_DELIMS[ch]);
+    }
+    function normalizePercentEncoding(input, decodeUnreserved = false) {
+      if (input.indexOf("%") === -1) {
+        return input;
       }
-      if (component.path !== void 0) {
-        component.path = func(component.path);
+      let output = "";
+      for (let i = 0; i < input.length; i++) {
+        if (input[i] === "%" && i + 2 < input.length) {
+          const hex3 = input.slice(i + 1, i + 3);
+          if (isHexPair(hex3)) {
+            const normalizedHex = hex3.toUpperCase();
+            const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
+            if (decodeUnreserved && isUnreserved(decoded)) {
+              output += decoded;
+            } else {
+              output += "%" + normalizedHex;
+            }
+            i += 2;
+            continue;
+          }
+        }
+        output += input[i];
       }
-      if (component.query !== void 0) {
-        component.query = func(component.query);
+      return output;
+    }
+    function normalizePathEncoding(input) {
+      let output = "";
+      for (let i = 0; i < input.length; i++) {
+        if (input[i] === "%" && i + 2 < input.length) {
+          const hex3 = input.slice(i + 1, i + 3);
+          if (isHexPair(hex3)) {
+            const normalizedHex = hex3.toUpperCase();
+            const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
+            if (decoded !== "." && isUnreserved(decoded)) {
+              output += decoded;
+            } else {
+              output += "%" + normalizedHex;
+            }
+            i += 2;
+            continue;
+          }
+        }
+        if (isPathCharacter(input[i])) {
+          output += input[i];
+        } else {
+          output += escape(input[i]);
+        }
       }
-      if (component.fragment !== void 0) {
-        component.fragment = func(component.fragment);
+      return output;
+    }
+    function escapePreservingEscapes(input) {
+      let output = "";
+      for (let i = 0; i < input.length; i++) {
+        if (input[i] === "%" && i + 2 < input.length) {
+          const hex3 = input.slice(i + 1, i + 3);
+          if (isHexPair(hex3)) {
+            output += "%" + hex3.toUpperCase();
+            i += 2;
+            continue;
+          }
+        }
+        output += escape(input[i]);
       }
-      return component;
+      return output;
     }
     function recomposeAuthority(component) {
       const uriTokens = [];
@@ -17980,7 +18042,7 @@ var require_utils = __commonJS({
           if (ipV6res.isIPV6 === true) {
             host = `[${ipV6res.escapedHost}]`;
           } else {
-            host = component.host;
+            host = reescapeHostDelimiters(host, false);
           }
         }
         uriTokens.push(host);
@@ -17994,7 +18056,10 @@ var require_utils = __commonJS({
     module.exports = {
       nonSimpleDomain,
       recomposeAuthority,
-      normalizeComponentEncoding,
+      reescapeHostDelimiters,
+      normalizePercentEncoding,
+      normalizePathEncoding,
+      escapePreservingEscapes,
       removeDotSegments,
       isIPv4,
       isUUID,
@@ -18218,12 +18283,12 @@ var require_schemes = __commonJS({
 var require_fast_uri = __commonJS({
   "node_modules/fast-uri/index.js"(exports, module) {
     "use strict";
-    var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils();
+    var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils();
     var { SCHEMES, getSchemeHandler } = require_schemes();
     function normalize(uri, options) {
       if (typeof uri === "string") {
         uri = /** @type {T} */
-        serialize(parse3(uri, options), options);
+        normalizeString(uri, options);
       } else if (typeof uri === "object") {
         uri = /** @type {T} */
         parse3(serialize(uri, options), options);
@@ -18290,19 +18355,9 @@ var require_fast_uri = __commonJS({
       return target;
     }
     function equal(uriA, uriB, options) {
-      if (typeof uriA === "string") {
-        uriA = unescape(uriA);
-        uriA = serialize(normalizeComponentEncoding(parse3(uriA, options), true), { ...options, skipEscape: true });
-      } else if (typeof uriA === "object") {
-        uriA = serialize(normalizeComponentEncoding(uriA, true), { ...options, skipEscape: true });
-      }
-      if (typeof uriB === "string") {
-        uriB = unescape(uriB);
-        uriB = serialize(normalizeComponentEncoding(parse3(uriB, options), true), { ...options, skipEscape: true });
-      } else if (typeof uriB === "object") {
-        uriB = serialize(normalizeComponentEncoding(uriB, true), { ...options, skipEscape: true });
-      }
-      return uriA.toLowerCase() === uriB.toLowerCase();
+      const normalizedA = normalizeComparableURI(uriA, options);
+      const normalizedB = normalizeComparableURI(uriB, options);
+      return normalizedA !== void 0 && normalizedB !== void 0 && normalizedA.toLowerCase() === normalizedB.toLowerCase();
     }
     function serialize(cmpts, opts) {
       const component = {
@@ -18327,12 +18382,12 @@ var require_fast_uri = __commonJS({
       if (schemeHandler && schemeHandler.serialize) schemeHandler.serialize(component, options);
       if (component.path !== void 0) {
         if (!options.skipEscape) {
-          component.path = escape(component.path);
+          component.path = escapePreservingEscapes(component.path);
           if (component.scheme !== void 0) {
             component.path = component.path.split("%3A").join(":");
           }
         } else {
-          component.path = unescape(component.path);
+          component.path = normalizePercentEncoding(component.path);
         }
       }
       if (options.reference !== "suffix" && component.scheme) {
@@ -18367,7 +18422,16 @@ var require_fast_uri = __commonJS({
       return uriTokens.join("");
     }
     var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
-    function parse3(uri, opts) {
+    function getParseError(parsed, matches) {
+      if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
+        return 'URI path must start with "/" when authority is present.';
+      }
+      if (typeof parsed.port === "number" && (parsed.port < 0 || parsed.port > 65535)) {
+        return "URI port is malformed.";
+      }
+      return void 0;
+    }
+    function parseWithStatus(uri, opts) {
       const options = Object.assign({}, opts);
       const parsed = {
         scheme: void 0,
@@ -18378,6 +18442,7 @@ var require_fast_uri = __commonJS({
         query: void 0,
         fragment: void 0
       };
+      let malformedAuthorityOrPort = false;
       let isIP = false;
       if (options.reference === "suffix") {
         if (options.scheme) {
@@ -18398,6 +18463,11 @@ var require_fast_uri = __commonJS({
         if (isNaN(parsed.port)) {
           parsed.port = matches[5];
         }
+        const parseError = getParseError(parsed, matches);
+        if (parseError !== void 0) {
+          parsed.error = parsed.error || parseError;
+          malformedAuthorityOrPort = true;
+        }
         if (parsed.host) {
           const ipv4result = isIPv4(parsed.host);
           if (ipv4result === false) {
@@ -18436,14 +18506,18 @@ var require_fast_uri = __commonJS({
               parsed.scheme = unescape(parsed.scheme);
             }
             if (parsed.host !== void 0) {
-              parsed.host = unescape(parsed.host);
+              parsed.host = reescapeHostDelimiters(unescape(parsed.host), isIP);
             }
           }
           if (parsed.path) {
-            parsed.path = escape(unescape(parsed.path));
+            parsed.path = normalizePathEncoding(parsed.path);
           }
           if (parsed.fragment) {
-            parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
+            try {
+              parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
+            } catch {
+              parsed.error = parsed.error || "URI malformed";
+            }
           }
         }
         if (schemeHandler && schemeHandler.parse) {
@@ -18452,7 +18526,29 @@ var require_fast_uri = __commonJS({
       } else {
         parsed.error = parsed.error || "URI can not be parsed.";
       }
-      return parsed;
+      return { parsed, malformedAuthorityOrPort };
+    }
+    function parse3(uri, opts) {
+      return parseWithStatus(uri, opts).parsed;
+    }
+    function normalizeString(uri, opts) {
+      return normalizeStringWithStatus(uri, opts).normalized;
+    }
+    function normalizeStringWithStatus(uri, opts) {
+      const { parsed, malformedAuthorityOrPort } = parseWithStatus(uri, opts);
+      return {
+        normalized: malformedAuthorityOrPort ? uri : serialize(parsed, opts),
+        malformedAuthorityOrPort
+      };
+    }
+    function normalizeComparableURI(uri, opts) {
+      if (typeof uri === "string") {
+        const { normalized, malformedAuthorityOrPort } = normalizeStringWithStatus(uri, opts);
+        return malformedAuthorityOrPort ? void 0 : normalized;
+      }
+      if (typeof uri === "object") {
+        return serialize(uri, opts);
+      }
     }
     var fastUri = {
       SCHEMES,
@@ -28049,49 +28145,60 @@ var init_profile = __esm({
 // src/firefox/core.ts
 import { Builder, Browser, Capabilities } from "selenium-webdriver";
 import firefox from "selenium-webdriver/firefox.js";
-import { mkdirSync as mkdirSync2, openSync, closeSync } from "fs";
+import { mkdirSync as mkdirSync2, openSync, closeSync, existsSync as existsSync2, readdirSync, statSync } from "fs";
 import { homedir } from "os";
-import { join as join2 } from "path";
-async function findGeckodriver() {
-  const path = await import("path");
-  const { execFileSync } = await import("child_process");
+import { join as join2, delimiter } from "path";
+function findGeckodriverInPath(binaryName) {
+  for (const dir of (process.env.PATH ?? "").split(delimiter)) {
+    if (!dir) {
+      continue;
+    }
+    const candidate = join2(dir, binaryName);
+    if (existsSync2(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function findGeckodriverInSeleniumCache(binaryName) {
+  const cacheBase = join2(homedir(), ".cache/selenium/geckodriver");
   try {
-    const { createRequire } = await import("module");
-    const require2 = createRequire(import.meta.url);
-    const swPkg = require2.resolve("selenium-webdriver/package.json");
-    const swDir = path.dirname(swPkg);
-    const platform = process.platform === "win32" ? "windows" : process.platform === "darwin" ? "macos" : "linux";
-    const ext = process.platform === "win32" ? ".exe" : "";
-    const smBin = path.join(swDir, "bin", platform, `selenium-manager${ext}`);
-    const result = JSON.parse(
-      execFileSync(smBin, ["--driver", "geckodriver", "--output", "json"], { encoding: "utf-8" })
-    );
-    return result.result.driver_path;
-  } catch {
-    const os = await import("os");
-    const fs = await import("fs");
-    const cacheBase = path.join(os.homedir(), ".cache/selenium/geckodriver");
-    const ext = process.platform === "win32" ? ".exe" : "";
-    const binaryName = `geckodriver${ext}`;
-    try {
-      if (fs.existsSync(cacheBase)) {
-        for (const platformDir of fs.readdirSync(cacheBase)) {
-          const platformPath = path.join(cacheBase, platformDir);
-          if (!fs.statSync(platformPath).isDirectory()) {
-            continue;
-          }
-          for (const versionDir of fs.readdirSync(platformPath).sort().reverse()) {
-            const candidate = path.join(platformPath, versionDir, binaryName);
-            if (fs.existsSync(candidate)) {
-              return candidate;
-            }
-          }
+    if (!existsSync2(cacheBase)) {
+      return null;
+    }
+    for (const platformDir of readdirSync(cacheBase)) {
+      const platformPath = join2(cacheBase, platformDir);
+      if (!statSync(platformPath).isDirectory()) {
+        continue;
+      }
+      for (const versionDir of readdirSync(platformPath).sort().reverse()) {
+        const candidate = join2(platformPath, versionDir, binaryName);
+        if (existsSync2(candidate)) {
+          return candidate;
         }
       }
-    } catch {
     }
-    throw new Error("Cannot find geckodriver binary. Ensure selenium-webdriver is installed.");
+  } catch {
   }
+  return null;
+}
+async function findGeckodriverInNpmPackage() {
+  try {
+    const { download } = await import("geckodriver");
+    log("geckodriver not found in PATH or selenium cache, downloading via npm package...");
+    return await download();
+  } catch {
+    return null;
+  }
+}
+async function findGeckodriver() {
+  const ext = process.platform === "win32" ? ".exe" : "";
+  const binaryName = `geckodriver${ext}`;
+  const found = findGeckodriverInPath(binaryName) ?? findGeckodriverInSeleniumCache(binaryName) ?? await findGeckodriverInNpmPackage();
+  if (!found) {
+    throw new Error("Cannot find geckodriver binary. Ensure geckodriver is in PATH.");
+  }
+  return found;
 }
 var FirefoxCore;
 var init_core3 = __esm({
@@ -28113,12 +28220,35 @@ var init_core3 = __esm({
        * Launch Firefox (or connect to an existing instance) and establish BiDi connection
        */
       async connect() {
-        if (this.options.connectExisting) {
+        const isAndroid = this.options.androidDevice !== void 0;
+        if (isAndroid) {
+          log("Launching Firefox for Android via ADB...");
+        } else if (this.options.connectExisting) {
           log("Connecting to existing Firefox via Marionette...");
         } else {
           log("Launching Firefox via Selenium WebDriver BiDi...");
         }
-        if (this.options.connectExisting) {
+        if (isAndroid) {
+          const geckodriverPath = await findGeckodriver();
+          logDebug(`Using geckodriver: ${geckodriverPath}`);
+          const pkg = this.options.androidPackage ?? "org.mozilla.firefox";
+          const mozOptions = { androidPackage: pkg };
+          const deviceSerial = this.options.androidDevice;
+          if (deviceSerial && deviceSerial !== "auto") {
+            mozOptions.androidDeviceSerial = deviceSerial;
+          }
+          if (this.options.prefs) {
+            mozOptions.prefs = this.options.prefs;
+          }
+          const caps = new Capabilities();
+          caps.set("webSocketUrl", true);
+          caps.set("moz:firefoxOptions", mozOptions);
+          if (this.options.acceptInsecureCerts) {
+            caps.set("acceptInsecureCerts", true);
+          }
+          const serviceBuilder = new firefox.ServiceBuilder(geckodriverPath);
+          this.driver = firefox.Driver.createSession(caps, serviceBuilder.build());
+        } else if (this.options.connectExisting) {
           const port = this.options.marionettePort ?? 2828;
           const geckodriverPath = await findGeckodriver();
           logDebug(`Using geckodriver: ${geckodriverPath}`);
@@ -28177,7 +28307,14 @@ var init_core3 = __esm({
               firefoxOptions.setPreference(name, value);
             }
           }
-          const serviceBuilder = new firefox.ServiceBuilder();
+          let serviceBuilder;
+          if (process.platform === "win32") {
+            const geckodriverPath = await findGeckodriver();
+            logDebug(`Using geckodriver: ${geckodriverPath}`);
+            serviceBuilder = new firefox.ServiceBuilder(geckodriverPath);
+          } else {
+            serviceBuilder = new firefox.ServiceBuilder();
+          }
           if (this.logFilePath) {
             this.logFileFd = openSync(this.logFilePath, "a");
             serviceBuilder.setStdio(["ignore", this.logFileFd, this.logFileFd]);
@@ -29051,22 +29188,41 @@ var init_dom = __esm({
 });
 
 // src/firefox/pages.ts
-var PageManagement;
+function isCommonScheme(url2) {
+  try {
+    return COMMON_URL_SCHEMES.includes(new URL(url2).protocol);
+  } catch {
+    return false;
+  }
+}
+var COMMON_URL_SCHEMES, PageManagement;
 var init_pages = __esm({
   "src/firefox/pages.ts"() {
     "use strict";
     init_logger();
+    COMMON_URL_SCHEMES = ["http:", "https:", "data:", "blob:", "file:"];
     PageManagement = class {
-      constructor(driver, getCurrentContextId, setCurrentContextId) {
+      constructor(driver, getCurrentContextId, setCurrentContextId, sendBiDiCommand) {
         this.driver = driver;
         this.getCurrentContextId = getCurrentContextId;
         this.setCurrentContextId = setCurrentContextId;
+        this.sendBiDiCommand = sendBiDiCommand;
       }
       /**
-       * Navigate to URL
+       * Navigate to URL using BiDi
        */
       async navigate(url2) {
-        await this.driver.get(url2);
+        const contextId = this.getCurrentContextId();
+        if (!contextId) {
+          throw new Error(`Cannot navigate: no browsing context ID`);
+        }
+        const wait = isCommonScheme(url2) ? "interactive" : "none";
+        await this.sendBiDiCommand("browsingContext.navigate", {
+          context: contextId,
+          url: url2,
+          wait
+        });
+        logDebug(`BiDi navigate (wait:${wait}) to: ${url2}`);
         log(`Navigated to: ${url2}`);
       }
       /**
@@ -29188,7 +29344,7 @@ var init_pages = __esm({
         const newIdx = handles.length - 1;
         this.setCurrentContextId(handles[newIdx]);
         this.cachedSelectedIdx = newIdx;
-        await this.driver.get(url2);
+        await this.navigate(url2);
         return newIdx;
       }
       /**
@@ -29673,7 +29829,8 @@ var init_firefox = __esm({
         this.pages = new PageManagement(
           driver,
           () => this.core.getCurrentContextId(),
-          (id) => this.core.setCurrentContextId(id)
+          (id) => this.core.setCurrentContextId(id),
+          (method, params) => this.core.sendBiDiCommand(method, params)
         );
         if (this.consoleEvents) {
           try {
@@ -31586,7 +31743,7 @@ var init_utilities = __esm({
 });
 
 // src/tools/firefox-management.ts
-import { readFileSync as readFileSync2, existsSync as existsSync2, statSync } from "fs";
+import { readFileSync as readFileSync2, existsSync as existsSync3, statSync as statSync2 } from "fs";
 async function handleGetFirefoxLogs(input) {
   try {
     const {
@@ -31601,11 +31758,11 @@ async function handleGetFirefoxLogs(input) {
         "No output capture configured. Use --env to set environment variables or --output-file to enable output capture."
       );
     }
-    if (!existsSync2(logFilePath)) {
+    if (!existsSync3(logFilePath)) {
       return successResponse(`Output file not found: ${logFilePath}`);
     }
     if (since !== void 0) {
-      const stats = statSync(logFilePath);
+      const stats = statSync2(logFilePath);
       const ageSeconds = (Date.now() - stats.mtimeMs) / 1e3;
       if (ageSeconds > since) {
         return successResponse(
@@ -31674,8 +31831,8 @@ async function handleGetFirefoxInfo(_input) {
     if (logFilePath) {
       info.push("");
       info.push(`Output File: ${logFilePath}`);
-      if (existsSync2(logFilePath)) {
-        const stats = statSync(logFilePath);
+      if (existsSync3(logFilePath)) {
+        const stats = statSync2(logFilePath);
         const sizeMB = (stats.size / 1024 / 1024).toFixed(2);
         info.push(`  Size: ${sizeMB} MB`);
         info.push(`  Last Modified: ${stats.mtime.toISOString()}`);
@@ -31712,7 +31869,7 @@ async function handleRestartFirefox(input) {
         profilePath: profilePath ?? currentOptions.profilePath,
         env: newEnv !== void 0 ? newEnv : currentOptions.env,
         headless: headless !== void 0 ? headless : currentOptions.headless,
-        startUrl: startUrl ?? currentOptions.startUrl ?? "about:home",
+        startUrl: startUrl ?? currentOptions.startUrl ?? "about:blank",
         prefs: mergedPrefs
       };
       setNextLaunchOptions(newOptions);
@@ -31766,7 +31923,7 @@ ${changes.join("\n")}`
         profilePath: profilePath ?? args.profilePath ?? void 0,
         env: newEnv,
         headless: headless ?? false,
-        startUrl: startUrl ?? "about:home"
+        startUrl: startUrl ?? "about:blank"
       };
       setNextLaunchOptions(newOptions);
       const config2 = [`Binary: ${resolvedFirefoxPath}`];
@@ -31857,7 +32014,7 @@ var init_firefox_management = __esm({
           },
           startUrl: {
             type: "string",
-            description: "URL to navigate to after restart (optional, uses about:home if not specified)"
+            description: "URL to navigate to after restart (optional, uses about:blank if not specified)"
           },
           prefs: {
             type: "object",
@@ -32577,7 +32734,9 @@ async function getFirefox() {
       marionettePort: args.marionettePort,
       env: envVars,
       logFile: args.outputFile ?? void 0,
-      prefs
+      prefs,
+      androidDevice: args.androidDevice ?? void 0,
+      androidPackage: args.androidPackage ?? void 0
     };
   }
   firefox2 = new FirefoxClient(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mozilla/firefox-devtools-mcp",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "Model Context Protocol (MCP) server for Firefox DevTools automation",
   "author": "Mozilla",
   "license": "MIT OR Apache-2.0",
@@ -15,6 +15,7 @@
     "build": "tsup",
     "build:moz": "node scripts/generate-moz-package.mjs && tsup --config tsup.config.moz.ts",
     "build:all": "npm run build && npm run build:moz",
+    "publish:moz": "node scripts/publish-moz-package.mjs",
     "start": "node dist/index.js",
     "setup": "node scripts/setup-mcp-config.js",
     "clean": "rm -rf dist",