nolo-cli 0.107.0-alpha.3 → 0.107.0

package/{chromeCommands-FZYAU75D.js → chromeCommands-AU5ZJXBG.js}

@@ -1,9 +1,12 @@
 import {
   NOLO_CHROME_CONNECTOR_EXTENSION_ID,
   NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION,
+  NOLO_CONNECTOR_EXTENSION_IDS,
+  NOLO_FIREFOX_CONNECTOR_EXTENSION_ID,
   REQUIRED_CHROME_CONNECTOR_FEATURES,
-  createChromeConnectorClient
-} from "./chunk-SH43IESU.js";
+  createChromeConnectorClient,
+  resolveUploadRoots
+} from "./chunk-GGC55Q32.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -11,16 +14,18 @@ import "./chunk-KUG52IAP.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/cli/chromeCommands.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, statSync } from "node:fs";
+import { spawnSync } from "node:child_process";
+import { existsSync as existsSync2, readFileSync as readFileSync2, statSync as statSync2 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
 
 // packages/desktop-chrome-connector/nativeHostInstall.mjs
-import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { createHash, randomBytes } from "node:crypto";
 import { dirname, resolve } from "node:path";
 import { execFileSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 var DEFAULT_CONNECTOR_ROOT = dirname(fileURLToPath(import.meta.url));
+var FIREFOX_EXTENSION_ID = "nolo-browser-connector@nolo.chat";
 function extensionIdFromPublicKey(publicKeyBase64) {
   const digest = createHash("sha256").update(Buffer.from(publicKeyBase64, "base64")).digest();
   return Array.from(
@@ -40,8 +45,23 @@ function resolveNodePath() {
 }
 function nativeMessagingHostsDir({
   home = process.env.HOME || "",
-  platform = process.platform
+  platform = process.platform,
+  browser = "chrome"
 } = {}) {
+  if (browser === "firefox") {
+    if (platform === "darwin") {
+      return resolve(home, "Library/Application Support/Mozilla/NativeMessagingHosts");
+    }
+    if (platform === "linux") {
+      return resolve(home, ".mozilla/native-messaging-hosts");
+    }
+    throw new Error(
+      `Firefox native host installation is not implemented for platform "${platform}". Windows needs a registry value under HKCU\\Software\\Mozilla\\NativeMessagingHosts pointing at the manifest file.`
+    );
+  }
+  if (browser !== "chrome") {
+    throw new Error(`Unknown native messaging browser target: "${browser}".`);
+  }
   if (platform === "darwin") {
     return resolve(home, "Library/Application Support/Google/Chrome/NativeMessagingHosts");
   }
@@ -55,54 +75,71 @@ function nativeMessagingHostsDir({
 function resolveNativeHostInstallPaths({
   home = process.env.HOME || "",
   connectorRoot = DEFAULT_CONNECTOR_ROOT,
-  platform = process.platform
+  platform = process.platform,
+  browser = "chrome"
 } = {}) {
   const supportDir = resolve(home, "Library/Application Support/Nolo/ChromeConnector");
+  const wrapperName = browser === "firefox" ? "nolo-firefox-native-host" : "nolo-chrome-native-host";
   return {
     connectorRoot,
+    browser,
     extensionManifestPath: resolve(connectorRoot, "extension", "manifest.json"),
     hostPath: resolve(connectorRoot, "native-host", "nolo-chrome-native-host.mjs"),
     templatePath: resolve(connectorRoot, "native-host", "com.nolo.chrome_connector.json"),
     nativeManifestPath: resolve(
-      nativeMessagingHostsDir({ home, platform }),
+      nativeMessagingHostsDir({ home, platform, browser }),
       "com.nolo.chrome_connector.json"
     ),
     supportDir,
     tokenPath: resolve(supportDir, "token"),
-    wrapperPath: resolve(supportDir, "nolo-chrome-native-host")
+    wrapperPath: resolve(supportDir, wrapperName)
   };
 }
+function connectorPortForBrowser({ browser = "chrome", env = process.env } = {}) {
+  if (browser === "firefox") {
+    return Number(env.NOLO_FIREFOX_CONNECTOR_PORT || 38948);
+  }
+  return Number(env.NOLO_CHROME_CONNECTOR_PORT || 38947);
+}
 function installNativeHostManifest({
   home = process.env.HOME || "",
   connectorRoot = DEFAULT_CONNECTOR_ROOT,
   platform = process.platform,
   extensionId,
-  nodePath
+  nodePath,
+  browser = "chrome"
 } = {}) {
-  const paths = resolveNativeHostInstallPaths({ home, connectorRoot, platform });
+  const paths = resolveNativeHostInstallPaths({ home, connectorRoot, platform, browser });
   const manifest = JSON.parse(readFileSync(paths.templatePath, "utf8"));
   const extensionManifest = JSON.parse(readFileSync(paths.extensionManifestPath, "utf8"));
-  const resolvedExtensionId = extensionId || extensionIdFromPublicKey(extensionManifest.key);
+  const resolvedExtensionId = extensionId || (browser === "firefox" ? FIREFOX_EXTENSION_ID : extensionIdFromPublicKey(extensionManifest.key));
   const resolvedNodePath = nodePath || resolveNodePath();
   mkdirSync(paths.supportDir, { recursive: true });
   const existingToken = existsSync(paths.tokenPath) ? readFileSync(paths.tokenPath, "utf8").trim() : "";
   const token = existingToken || randomBytes(32).toString("hex");
   writeFileSync(paths.tokenPath, `${token}
 `, { mode: 384 });
+  const port = connectorPortForBrowser({ browser });
   writeFileSync(
     paths.wrapperPath,
     `#!/bin/sh
-NOLO_CHROME_CONNECTOR_TOKEN=${JSON.stringify(token)} exec ${JSON.stringify(resolvedNodePath)} ${JSON.stringify(paths.hostPath)}
+NOLO_CHROME_CONNECTOR_BROWSER=${JSON.stringify(browser)} NOLO_CHROME_CONNECTOR_TOKEN=${JSON.stringify(token)} ${browser === "firefox" ? `NOLO_FIREFOX_CONNECTOR_PORT=${JSON.stringify(String(port))} ` : ""}exec ${JSON.stringify(resolvedNodePath)} ${JSON.stringify(paths.hostPath)}
 `
   );
   chmodSync(paths.wrapperPath, 493);
   manifest.path = paths.wrapperPath;
-  manifest.allowed_origins = [`chrome-extension://${resolvedExtensionId}/`];
+  if (browser === "firefox") {
+    delete manifest.allowed_origins;
+    manifest.allowed_extensions = [FIREFOX_EXTENSION_ID];
+  } else {
+    manifest.allowed_origins = [`chrome-extension://${resolvedExtensionId}/`];
+  }
   mkdirSync(dirname(paths.nativeManifestPath), { recursive: true });
   writeFileSync(paths.nativeManifestPath, `${JSON.stringify(manifest, null, 2)}
 `);
   return {
     extensionId: resolvedExtensionId,
+    browser,
     nodePath: resolvedNodePath,
     tokenPath: paths.tokenPath,
     ...paths
@@ -119,6 +156,79 @@ var CLI_CONNECTOR_ROOT_CANDIDATES = [
 var FULL_SUPPORT_CHROME_FEATURES = [
   ...new Set(Object.values(REQUIRED_CHROME_CONNECTOR_FEATURES).flat())
 ].sort();
+var FIREFOX_UNAVAILABLE_FEATURES = ["browser_debug", "file_upload"];
+function resolveConnectorBrowser(extensionId) {
+  if (!extensionId) return null;
+  if (extensionId === NOLO_FIREFOX_CONNECTOR_EXTENSION_ID) return "firefox";
+  if (NOLO_CONNECTOR_EXTENSION_IDS.includes(extensionId)) return "chrome";
+  return null;
+}
+function expectedFeaturesForBrowser(browser) {
+  return browser === "firefox" ? FULL_SUPPORT_CHROME_FEATURES.filter(
+    (feature) => !FIREFOX_UNAVAILABLE_FEATURES.includes(feature)
+  ) : FULL_SUPPORT_CHROME_FEATURES;
+}
+function browserLabel(browser) {
+  return browser === "firefox" ? "Firefox" : browser === "chrome" ? "Chrome" : "browser";
+}
+async function fetchOnlineBuildSha(fetchImpl = fetch, timeoutMs = 3e3) {
+  try {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    const res = await fetchImpl("https://us.nolo.chat/public/latest-assets.json", {
+      signal: controller.signal
+    }).finally(() => clearTimeout(timer));
+    if (!res.ok) return null;
+    const data = await res.json();
+    return typeof data?.buildSha === "string" ? data.buildSha : null;
+  } catch {
+    return null;
+  }
+}
+function resolveLocalHeadSha() {
+  try {
+    const result = spawnSync("git", ["rev-parse", "HEAD"], {
+      encoding: "utf8",
+      timeout: 3e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    if (result.status === 0 && typeof result.stdout === "string") {
+      const sha = result.stdout.trim();
+      return sha.length >= 7 ? sha : null;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function compareDeployShas(localSha, onlineSha) {
+  if (!localSha || !onlineSha) return "unknown";
+  if (localSha === onlineSha || localSha.slice(0, 7) === onlineSha.slice(0, 7)) {
+    return "in sync";
+  }
+  try {
+    const localAhead = spawnSync("git", ["merge-base", "--is-ancestor", onlineSha, localSha], {
+      timeout: 3e3,
+      stdio: ["ignore", "ignore", "ignore"]
+    });
+    if (localAhead.status === 0) return "local ahead";
+    const onlineAhead = spawnSync("git", ["merge-base", "--is-ancestor", localSha, onlineSha], {
+      timeout: 3e3,
+      stdio: ["ignore", "ignore", "ignore"]
+    });
+    if (onlineAhead.status === 0) return "online ahead";
+    const objCheck = spawnSync("git", ["cat-file", "-e", `${onlineSha}^{commit}`], {
+      timeout: 3e3,
+      stdio: ["ignore", "ignore", "ignore"]
+    });
+    if (objCheck.status === 0) {
+      return "diverged";
+    }
+    return "unknown";
+  } catch {
+    return "unknown";
+  }
+}
 function pickCliConnectorRoot(candidates) {
   for (const candidate of candidates) {
     if (existsSync2(resolve2(candidate, "extension", "manifest.json"))) return candidate;
@@ -158,7 +268,7 @@ function detectWorktreeCheckout(connectorRoot) {
     if (existsSync2(gitEntry)) {
       let isGitFile = null;
       try {
-        isGitFile = statSync(gitEntry).isFile();
+        isGitFile = statSync2(gitEntry).isFile();
       } catch {
       }
       if (isGitFile === true) {
@@ -233,9 +343,13 @@ async function probeConnectorRpc(requestChrome) {
   }
 }
 function resolveStatusNextStep(report) {
+  const targetBrowser = report.rpc.browser ?? report.nativeHost.browser;
+  const installCmd = targetBrowser === "firefox" ? "nolo chrome install --browser firefox" : "nolo chrome install";
+  const connectedLabel = browserLabel(targetBrowser);
+  const browserText = connectedLabel === "browser" ? "the browser" : connectedLabel;
   if (!report.connectorRoot) {
     if (report.rpc.online && report.rpc.protocolVersion === report.rpc.expectedProtocolVersion) {
-      return "Chrome connector is online, but this CLI cannot see a connector checkout, so `nolo chrome install` / manifest checks are unavailable here. Set NOLO_CHROME_CONNECTOR_ROOT (or run the CLI from a repo checkout) to enable them.";
+      return "The Nolo Browser Connector is online, but this CLI cannot see a connector checkout, so `nolo chrome install` / manifest checks are unavailable here. Set NOLO_CHROME_CONNECTOR_ROOT (or run the CLI from a repo checkout) to enable them.";
     }
     return "Run the CLI from a repo checkout that contains packages/desktop-chrome-connector, or set NOLO_CHROME_CONNECTOR_ROOT to one, then rerun `nolo chrome status`.";
   }
@@ -243,20 +357,20 @@ function resolveStatusNextStep(report) {
     return `This platform has no supported native messaging host install (Chrome looks the host up through a registry value on Windows), so non-interactive install is not available: ${report.nativeHost.platformError ?? "unsupported platform"}`;
   }
   if (!report.nativeHost.installed || !report.token.present) {
-    return "nolo chrome install";
+    return installCmd;
   }
   if (!report.nativeHost.wrapperPathMatches || !report.nativeHost.allowedOriginMatches) {
     const installedWrapperPath = report.nativeHost.installedWrapperPath;
     if (!report.nativeHost.wrapperPathMatches && installedWrapperPath && installedWrapperPath !== report.nativeHost.wrapperPath && existsSync2(installedWrapperPath)) {
-      return `Native host is installed for a different checkout (${installedWrapperPath}); this CLI is looking at ${report.connectorRoot}. Run \`nolo chrome status\` from the checkout that installed it, or run \`nolo chrome install\` from here only if Chrome should switch to this one.`;
+      return `Native host is installed for a different checkout (${installedWrapperPath}); this CLI is looking at ${report.connectorRoot}. Run \`nolo chrome status\` from the checkout that installed it, or run \`${installCmd}\` from here only if ${browserText} should switch to this one.`;
     }
-    return "nolo chrome install (the installed manifest does not point at this checkout's wrapper / extension id, which Chrome silently ignores)";
+    return `${installCmd} (the installed manifest does not point at this checkout's wrapper / extension id, which ${browserText} silently ignores)`;
   }
   if (!report.rpc.online) {
-    return `Load the unpacked extension from ${report.extension.path} in chrome://extensions (Developer mode) or install it from the Chrome Web Store, then rerun \`nolo chrome status\`.`;
+    return `Load the unpacked extension from ${report.extension.path} in chrome://extensions (Chrome) or about:debugging#/runtime/this-firefox (Firefox), or install the Nolo Browser Connector from https://nolo.chat/downloads, then rerun \`nolo chrome status\`.`;
   }
-  if (report.rpc.extensionId && report.rpc.extensionId !== report.extension.expectedId) {
-    return `The connected extension (${report.rpc.extensionId}) is not the connector at ${report.extension.path}; remove the other copy and rerun \`nolo chrome status\`.`;
+  if (report.rpc.extensionId && report.rpc.browser === null) {
+    return `The connected extension (${report.rpc.extensionId}) is not a recognized Nolo Browser Connector build; reload it (\`nolo chrome reload\`) or remove the other copy, then rerun \`nolo chrome status\`.`;
   }
   if (report.rpc.protocolVersion !== report.rpc.expectedProtocolVersion) {
     return `nolo chrome reload (the running extension does not speak protocol ${report.rpc.expectedProtocolVersion}; a reload restarts the worker with the files on disk)`;
@@ -264,12 +378,13 @@ function resolveStatusNextStep(report) {
   if (report.rpc.missingFeatures.length > 0) {
     return `nolo chrome reload (the running extension is missing ${report.rpc.missingFeatures.join(", ")}); if that persists, the checkout's extension is older than the CLI expects.`;
   }
-  return "Chrome connector is online: chrome_* tools execute against this Chrome profile.";
+  return `The Nolo Browser Connector is online (${connectedLabel}): connector tools execute against this ${connectedLabel} profile.`;
 }
 async function buildChromeConnectorStatus(args = {}) {
   const env = args.env ?? process.env;
   const home = args.home ?? env.HOME ?? "";
   const platform = args.platform ?? process.platform;
+  const browserTarget = args.browser;
   let connectorRoot = args.connectorRoot ?? null;
   let rootError = null;
   if (!connectorRoot) {
@@ -295,38 +410,112 @@ async function buildChromeConnectorStatus(args = {}) {
       wrapperPath: null,
       installedWrapperPath: null,
       wrapperPathMatches: false,
-      allowedOriginMatches: false
+      allowedOriginMatches: false,
+      browser: null
     },
     token: { path: null, present: false },
+    uploadRoots: { roots: [], isDefault: false },
+    deploy: {
+      localSha: null,
+      onlineSha: null,
+      sync: "unknown"
+    },
     rpc: {
       online: false,
       extensionId: null,
       protocolVersion: null,
       features: [],
+      browser: null,
       missingFeatures: [...FULL_SUPPORT_CHROME_FEATURES],
       expectedProtocolVersion: NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION
     },
     nextStep: ""
   };
-  const requestChrome = args.requestChrome ?? createChromeConnectorClient().request;
+  try {
+    const rootsInfo = resolveUploadRoots({ ...env, ...home ? { HOME: home } : {} });
+    report.uploadRoots = {
+      roots: rootsInfo.roots,
+      isDefault: rootsInfo.isDefault
+    };
+  } catch (error) {
+    report.uploadRoots = {
+      roots: [],
+      isDefault: false,
+      error: toErrorMessage(error)
+    };
+  }
+  let localHeadSha = null;
+  try {
+    localHeadSha = (args.resolveLocalHeadSha ?? resolveLocalHeadSha)();
+  } catch {
+    localHeadSha = null;
+  }
+  let onlineBuildSha = null;
+  try {
+    onlineBuildSha = await (args.fetchOnlineBuildSha ?? fetchOnlineBuildSha)();
+  } catch {
+    onlineBuildSha = null;
+  }
+  let sync = "unknown";
+  try {
+    const compareShas = args.compareDeployShas ?? compareDeployShas;
+    sync = compareShas(localHeadSha, onlineBuildSha);
+  } catch {
+    sync = "unknown";
+  }
+  report.deploy = {
+    localSha: localHeadSha,
+    onlineSha: onlineBuildSha,
+    sync
+  };
+  const requestChrome = args.requestChrome ?? createChromeConnectorClient({ browser: browserTarget }).request;
   const probe = await probeConnectorRpc(requestChrome);
   report.rpc.online = probe.online;
   report.rpc.extensionId = probe.extensionId;
   report.rpc.protocolVersion = probe.protocolVersion;
   report.rpc.features = probe.features;
-  report.rpc.missingFeatures = FULL_SUPPORT_CHROME_FEATURES.filter(
+  report.rpc.browser = probe.online ? resolveConnectorBrowser(probe.extensionId) ?? (probe.extensionId === expectedId ? "chrome" : null) : null;
+  report.rpc.missingFeatures = expectedFeaturesForBrowser(report.rpc.browser).filter(
     (feature) => !probe.features.includes(feature)
   );
   if (!probe.online) report.rpc.error = probe.error;
   if (!connectorRoot) {
     if (rootError) report.connectorRootError = rootError;
-    report.ok = report.rpc.online && probe.extensionId === expectedId && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
+    report.nativeHost.browser = report.rpc.browser;
+    report.ok = report.rpc.online && report.rpc.browser !== null && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
     report.nextStep = resolveStatusNextStep(report);
     return report;
   }
+  let manifestBrowser = browserTarget ?? (report.rpc.browser === "firefox" ? "firefox" : "chrome");
+  if (!report.rpc.browser) {
+    try {
+      const chromeManifestPath = resolveNativeHostInstallPaths({
+        home,
+        connectorRoot,
+        platform,
+        browser: "chrome"
+      }).nativeManifestPath;
+      const firefoxManifestPath = resolveNativeHostInstallPaths({
+        home,
+        connectorRoot,
+        platform,
+        browser: "firefox"
+      }).nativeManifestPath;
+      if (!existsSync2(chromeManifestPath) && existsSync2(firefoxManifestPath)) {
+        manifestBrowser = "firefox";
+      }
+    } catch {
+    }
+  }
+  report.nativeHost.browser = manifestBrowser;
   let paths = null;
   try {
-    paths = resolveNativeHostInstallPaths({ home, connectorRoot, platform });
+    paths = resolveNativeHostInstallPaths({
+      home,
+      connectorRoot,
+      platform,
+      browser: manifestBrowser
+    });
   } catch (error) {
     report.nativeHost.supported = false;
     report.nativeHost.platformError = toErrorMessage(error);
@@ -340,8 +529,7 @@ async function buildChromeConnectorStatus(args = {}) {
   report.nativeHost.installed = installedManifest !== null;
   report.nativeHost.installedWrapperPath = typeof installedManifest?.path === "string" ? installedManifest.path : null;
   report.nativeHost.wrapperPathMatches = report.nativeHost.installedWrapperPath === paths.wrapperPath;
-  const expectedOrigin = `chrome-extension://${expectedId}/`;
-  report.nativeHost.allowedOriginMatches = Array.isArray(installedManifest?.allowed_origins) && installedManifest.allowed_origins.includes(expectedOrigin);
+  report.nativeHost.allowedOriginMatches = manifestBrowser === "firefox" ? Array.isArray(installedManifest?.allowed_extensions) && installedManifest.allowed_extensions.includes(NOLO_FIREFOX_CONNECTOR_EXTENSION_ID) : Array.isArray(installedManifest?.allowed_origins) && installedManifest.allowed_origins.includes(`chrome-extension://${expectedId}/`);
   if (existsSync2(paths.tokenPath)) {
     try {
       report.token.present = readFileSync2(paths.tokenPath, "utf8").trim().length > 0;
@@ -349,7 +537,7 @@ async function buildChromeConnectorStatus(args = {}) {
       report.token.present = false;
     }
   }
-  report.ok = report.nativeHost.supported && report.nativeHost.installed && report.nativeHost.wrapperPathMatches && report.nativeHost.allowedOriginMatches && report.token.present && probe.online && probe.extensionId === expectedId && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
+  report.ok = report.nativeHost.supported && report.nativeHost.installed && report.nativeHost.wrapperPathMatches && report.nativeHost.allowedOriginMatches && report.token.present && probe.online && report.rpc.browser !== null && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
   report.nextStep = resolveStatusNextStep(report);
   return report;
 }
@@ -357,7 +545,7 @@ function yesNo(value) {
   return value ? "ok" : "mismatch";
 }
 function formatChromeConnectorStatus(report) {
-  const lines = ["Nolo Chrome connector"];
+  const lines = ["Nolo Browser Connector"];
   lines.push(
     `  connector source : ${report.connectorRoot ?? "(not found)"}`
   );
@@ -374,10 +562,21 @@ function formatChromeConnectorStatus(report) {
   lines.push(
     `  token            : ${report.token.present ? "present" : "missing"}${report.token.path ? ` ${report.token.path}` : ""}`
   );
+  if (report.uploadRoots.error) {
+    lines.push(`  upload roots     : error (${report.uploadRoots.error})`);
+  } else if (report.uploadRoots.roots.length > 0) {
+    const originLabel = report.uploadRoots.isDefault ? "default" : "configured";
+    lines.push(`  upload roots     : ${report.uploadRoots.roots.join(", ")} (${originLabel})`);
+  } else {
+    lines.push(`  upload roots     : (none)`);
+  }
+  const localShort = report.deploy.localSha ? report.deploy.localSha.slice(0, 7) : "unknown";
+  const onlineShort = report.deploy.onlineSha ? report.deploy.onlineSha.slice(0, 7) : "unknown";
+  lines.push(`  deploy status    : local ${localShort}  online ${onlineShort} (${report.deploy.sync})`);
   const rpc = report.rpc;
   if (rpc.online) {
     lines.push(
-      `  RPC              : online  extension ${rpc.extensionId ?? "unknown"}  protocolVersion ${rpc.protocolVersion ?? "unknown"}  features ${rpc.features.length > 0 ? rpc.features.join(", ") : "(none)"}`
+      `  RPC              : online  browser ${rpc.browser ?? "unrecognized"}  extension ${rpc.extensionId ?? "unknown"}  protocolVersion ${rpc.protocolVersion ?? "unknown"}  features ${rpc.features.length > 0 ? rpc.features.join(", ") : "(none)"}`
     );
   } else {
     lines.push(
@@ -390,9 +589,14 @@ function formatChromeConnectorStatus(report) {
 }
 async function runChromeStatusCommand(args, deps = {}) {
   const output = deps.output ?? process.stdout;
+  const browser = readBrowserOption(args);
+  if (browser === null) {
+    output.write('[nolo] Chrome connector status failed: --browser must be "chrome" or "firefox".\n');
+    return 1;
+  }
   let report;
   try {
-    report = await buildChromeConnectorStatus(deps);
+    report = await buildChromeConnectorStatus({ ...deps, browser });
   } catch (error) {
     output.write(`[nolo] Chrome connector status failed: ${toErrorMessage(error)}
 `);
@@ -406,9 +610,26 @@ async function runChromeStatusCommand(args, deps = {}) {
   }
   return report.ok ? 0 : 1;
 }
+function readBrowserOption(args) {
+  const equalsForm = args.find((arg) => arg.startsWith("--browser="));
+  const index = args.indexOf("--browser");
+  const raw = equalsForm !== void 0 ? equalsForm.slice("--browser=".length) : index >= 0 ? args[index + 1] : void 0;
+  if (raw === void 0) return void 0;
+  const value = raw.trim();
+  if (value === "chrome" || value === "firefox") return value;
+  return null;
+}
 async function runChromeInstallCommand(args, deps = {}) {
   const env = deps.env ?? process.env;
   const output = deps.output ?? process.stdout;
+  const parsed = readBrowserOption(args);
+  if (parsed === null) {
+    output.write(
+      '[nolo] Chrome native host install failed: --browser must be "chrome" or "firefox".\n'
+    );
+    return 1;
+  }
+  const browser = parsed ?? "chrome";
   const install = deps.installNativeHost ?? installNativeHostManifest;
   let connectorRoot;
   try {
@@ -432,6 +653,7 @@ async function runChromeInstallCommand(args, deps = {}) {
     result = install({
       home: deps.home ?? env.HOME ?? "",
       connectorRoot,
+      browser,
       ...deps.platform ? { platform: deps.platform } : {},
       ...deps.nodePath ? { nodePath: deps.nodePath } : {}
     });
@@ -446,12 +668,12 @@ async function runChromeInstallCommand(args, deps = {}) {
   } else {
     output.write(
       [
-        "Nolo Chrome connector native host installed.",
+        `Nolo Browser Connector native host installed (${browser}).`,
         `  manifest : ${result.nativeManifestPath}`,
         `  wrapper  : ${result.wrapperPath} -> ${result.nodePath}`,
         `  token    : ${result.tokenPath} (an existing token is kept, so reruns are idempotent)`,
         `  extension: ${result.extensionId}`,
-        `Next step: load the unpacked extension from ${resolve2(connectorRoot, "extension")} in chrome://extensions (Developer mode) or install it from the Chrome Web Store, then run \`nolo chrome status\`.`,
+        `Next step: load the unpacked extension from ${resolve2(connectorRoot, "extension")} in ` + (browser === "firefox" ? "about:debugging#/runtime/this-firefox, or install the signed Nolo Browser Connector add-on from https://nolo.chat/downloads, then run `nolo chrome status`." : "chrome://extensions (Developer mode), or install the Nolo Browser Connector from https://nolo.chat/downloads (Chrome or Firefox), then run `nolo chrome status`."),
         ""
       ].join("\n")
     );
@@ -460,8 +682,32 @@ async function runChromeInstallCommand(args, deps = {}) {
 }
 async function runChromeReloadCommand(args, deps = {}) {
   const output = deps.output ?? process.stdout;
-  const requestChrome = deps.requestChrome ?? createChromeConnectorClient().request;
+  const browser = readBrowserOption(args);
+  if (browser === null) {
+    output.write('[nolo] Chrome connector reload failed: --browser must be "chrome" or "firefox".\n');
+    return 1;
+  }
+  const requestChrome = deps.requestChrome ?? createChromeConnectorClient({ browser }).request;
   try {
+    if (browser) {
+      try {
+        const info = await requestChrome("connector_info", {});
+        const connectedBrowser = resolveConnectorBrowser(
+          typeof info?.extensionId === "string" ? info.extensionId : null
+        );
+        if (connectedBrowser !== null && connectedBrowser !== browser) {
+          const mismatch = new Error(
+            `the connector on this endpoint answers as ${browserLabel(connectedBrowser)}, not ${browserLabel(browser)} \u2014 refusing to reload the wrong browser. Check NOLO_CHROME_CONNECTOR_RPC_URL / the per-browser port overrides.`
+          );
+          mismatch.code = "CHROME_CONNECTOR_EXTENSION_MISMATCH";
+          throw mismatch;
+        }
+      } catch (error) {
+        if (error?.code === "CHROME_CONNECTOR_EXTENSION_MISMATCH") {
+          throw error;
+        }
+      }
+    }
     const result = await requestChrome("reload_extension", {});
     if (args.includes("--json")) {
       output.write(`${JSON.stringify({ ok: true, result }, null, 2)}
@@ -480,7 +726,7 @@ The connector service worker restarts within ~1s; verify with \`nolo chrome stat
 `);
     if (code === "CHROME_CONNECTOR_UNAVAILABLE") {
       output.write(
-        "The native host is not reachable: load the unpacked connector extension in chrome://extensions (or start Chrome), then rerun `nolo chrome reload`.\n"
+        "The native host is not reachable: open Chrome or Firefox with the Nolo Browser Connector extension enabled, or install it from https://nolo.chat/downloads (or load the unpacked connector extension in chrome://extensions), then rerun `nolo chrome reload`.\n"
       );
     }
     return 1;
@@ -488,11 +734,17 @@ The connector service worker restarts within ~1s; verify with \`nolo chrome stat
 }
 export {
   CLI_CONNECTOR_ROOT_CANDIDATES,
+  FIREFOX_UNAVAILABLE_FEATURES,
   FULL_SUPPORT_CHROME_FEATURES,
   buildChromeConnectorStatus,
+  compareDeployShas,
   detectWorktreeCheckout,
+  expectedFeaturesForBrowser,
+  fetchOnlineBuildSha,
   formatChromeConnectorStatus,
   resolveCliConnectorRoot,
+  resolveConnectorBrowser,
+  resolveLocalHeadSha,
   runChromeInstallCommand,
   runChromeReloadCommand,
   runChromeStatusCommand