nolo-cli 0.149.0-alpha.1 → 0.151.0-alpha.3

package/{authCommands-H6WKKCRW.js → authCommands-77CHYBGF.js}

@@ -7,22 +7,25 @@ import {
   runLogoutCommand,
   runWhoamiCommand,
   saveTokenLogin
-} from "./chunk-IVZJWTDI.js";
-import "./chunk-ESHYE7WU.js";
-import "./chunk-ZOVKKMF6.js";
+} from "./chunk-36OMEXXR.js";
+import "./chunk-TY3TIUJK.js";
+import "./chunk-S73EPYNC.js";
+import "./chunk-ZEZC7IIM.js";
+import "./chunk-OW765XBU.js";
+import "./chunk-5EMSBTQ6.js";
+import "./chunk-I42VC5KR.js";
+import "./chunk-U6VC4MU4.js";
+import "./chunk-WWC7I6TA.js";
+import "./chunk-3EUW3WEO.js";
+import "./chunk-FY4SDK2E.js";
 import "./chunk-GLKOYSRU.js";
-import "./chunk-JBTJAPUF.js";
 import "./chunk-A7GB5UGH.js";
 import "./chunk-OLZBQWZU.js";
-import "./chunk-TNIX77YM.js";
-import "./chunk-3AH7LNUB.js";
-import "./chunk-WWC7I6TA.js";
-import "./chunk-3EUW3WEO.js";
-import "./chunk-U6VC4MU4.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import "./chunk-G3SUCT4W.js";
+import "./chunk-TNIX77YM.js";
 import "./chunk-4VNS5WPM.js";
 export {
   LOGIN_HELP_TEXT,

package/{builtinSkillRegistry-ZMF6YGNO.js → builtinSkillRegistry-TDQ6JB2E.js}

@@ -7,20 +7,22 @@ import {
   resolveBuiltinSkillEntry,
   resolveBuiltinSkillPage,
   resolveBuiltinSkillSlug
-} from "./chunk-B2XUQXQX.js";
-import "./chunk-6TPOEJMQ.js";
-import "./chunk-AUDNYVRC.js";
-import "./chunk-KHCLMKZZ.js";
-import "./chunk-XUWRURDF.js";
-import "./chunk-5J3PYNUP.js";
-import "./chunk-QDSINZM3.js";
-import "./chunk-3AH7LNUB.js";
-import "./chunk-WWC7I6TA.js";
-import "./chunk-BNGW5ASC.js";
+} from "./chunk-HIQ4GF53.js";
+import "./chunk-JZX2XLKC.js";
+import "./chunk-EUGTFFO6.js";
+import "./chunk-XETG4RIX.js";
+import "./chunk-GKXCHNTE.js";
+import "./chunk-5EBLANFT.js";
+import "./chunk-NYYFIKHI.js";
+import "./chunk-EZVK3N5L.js";
 import "./chunk-M2EJHDJP.js";
-import "./chunk-3EUW3WEO.js";
+import "./chunk-5EMSBTQ6.js";
+import "./chunk-I42VC5KR.js";
 import "./chunk-U6VC4MU4.js";
+import "./chunk-WWC7I6TA.js";
+import "./chunk-3EUW3WEO.js";
 import "./chunk-G3SUCT4W.js";
+import "./chunk-KHCLMKZZ.js";
 import "./chunk-4VNS5WPM.js";
 export {
   CAPABILITY_SLUG_COLLISIONS,

package/{chromeCommands-2N6MEWRU.js → chromeCommands-OBBNJCLS.js}

@@ -1,18 +1,21 @@
 import {
+  NOLO_CHROME_CONNECTOR_DEFAULT_PORTS,
   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-YUNJN43V.js";
+  createChromeConnectorClient,
+  resolveUploadRoots
+} from "./chunk-BU2YQBV4.js";
+import "./chunk-KUG52IAP.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import "./chunk-KUG52IAP.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/cli/chromeCommands.ts
+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";
 
@@ -77,6 +80,7 @@ function resolveNativeHostInstallPaths({
   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,
@@ -89,9 +93,15 @@ function resolveNativeHostInstallPaths({
     ),
     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,
@@ -110,10 +120,11 @@ function installNativeHostManifest({
   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);
@@ -161,6 +172,64 @@ function expectedFeaturesForBrowser(browser) {
 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;
@@ -249,6 +318,12 @@ function readJsonFile(path) {
     return null;
   }
 }
+function resolveConnectorEndpoint(browser, env) {
+  const explicitUrl = (env.NOLO_CHROME_CONNECTOR_RPC_URL ?? "").trim();
+  if (explicitUrl) return explicitUrl;
+  const port = browser === "firefox" ? env.NOLO_FIREFOX_CONNECTOR_PORT : env.NOLO_CHROME_CONNECTOR_PORT;
+  return `http://127.0.0.1:${port || NOLO_CHROME_CONNECTOR_DEFAULT_PORTS[browser]}/rpc`;
+}
 async function probeConnectorRpc(requestChrome) {
   try {
     const connectorInfo = await requestChrome("connector_info", {}) ?? {};
@@ -274,6 +349,90 @@ async function probeConnectorRpc(requestChrome) {
     };
   }
 }
+var CONNECTOR_BROWSER_ORDER = ["chrome", "firefox"];
+var notProbedRequest = async () => {
+  throw Object.assign(new Error("endpoint not probed (a shared request override pins the other one)"), {
+    code: "CHROME_CONNECTOR_UNAVAILABLE"
+  });
+};
+function expectedExtensionIdFor(browser, chromeExtensionId) {
+  return browser === "firefox" ? NOLO_FIREFOX_CONNECTOR_EXTENSION_ID : chromeExtensionId;
+}
+async function probeBrowserStatuses(args) {
+  const entries = await Promise.all(
+    CONNECTOR_BROWSER_ORDER.map(async (browser) => {
+      const probe = await probeConnectorRpc(args.requestFor(browser));
+      const build = probe.online ? resolveConnectorBrowser(probe.extensionId) : null;
+      const status = {
+        browser,
+        endpoint: resolveConnectorEndpoint(browser, args.env),
+        expectedExtensionId: expectedExtensionIdFor(browser, args.chromeExtensionId),
+        nativeHost: {
+          manifestPath: null,
+          installed: false,
+          wrapperPathMatches: false,
+          allowedOriginMatches: false
+        },
+        token: { path: null, present: false },
+        rpc: {
+          online: probe.online,
+          extensionId: probe.extensionId,
+          build,
+          protocolVersion: probe.protocolVersion,
+          features: probe.features,
+          ...probe.online ? {} : { error: probe.error }
+        },
+        usable: probe.online
+      };
+      return [browser, status];
+    })
+  );
+  return Object.fromEntries(entries);
+}
+function summarizeBrowsers(statuses, explicit) {
+  const online = CONNECTOR_BROWSER_ORDER.filter((browser) => statuses[browser].usable);
+  const requiresExplicitBrowser = online.length > 1;
+  const autoSelected = requiresExplicitBrowser ? null : online[0] ?? null;
+  return {
+    chrome: statuses.chrome,
+    firefox: statuses.firefox,
+    online: [...online],
+    autoSelected,
+    requiresExplicitBrowser,
+    explicit,
+    // Falls back to Chrome only to keep the legacy single-browser fields non-null-shaped (the old
+    // report always described the Chrome endpoint when nothing was connected).
+    selected: explicit ?? autoSelected ?? "chrome"
+  };
+}
+function fillBrowserInstallFacts(status, args) {
+  try {
+    const paths = resolveNativeHostInstallPaths({
+      home: args.home,
+      connectorRoot: args.connectorRoot,
+      platform: args.platform,
+      browser: status.browser
+    });
+    const installedManifest = existsSync2(paths.nativeManifestPath) ? readJsonFile(paths.nativeManifestPath) : null;
+    status.nativeHost = {
+      manifestPath: paths.nativeManifestPath,
+      installed: installedManifest !== null,
+      wrapperPathMatches: typeof installedManifest?.path === "string" && installedManifest.path === paths.wrapperPath,
+      allowedOriginMatches: status.browser === "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://${args.chromeExtensionId}/`
+      )
+    };
+    status.token = { path: paths.tokenPath, present: false };
+    if (existsSync2(paths.tokenPath)) {
+      try {
+        status.token.present = readFileSync2(paths.tokenPath, "utf8").trim().length > 0;
+      } catch {
+        status.token.present = false;
+      }
+    }
+  } catch {
+  }
+}
 function resolveStatusNextStep(report) {
   const targetBrowser = report.rpc.browser ?? report.nativeHost.browser;
   const installCmd = targetBrowser === "firefox" ? "nolo chrome install --browser firefox" : "nolo chrome install";
@@ -310,12 +469,16 @@ 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.`;
   }
+  if (report.browsers.requiresExplicitBrowser) {
+    return `Both Chrome and Firefox connectors are online, so every unqualified \`nolo browser <op>\` call fails with MULTIPLE_BROWSERS_AVAILABLE: pass --browser chrome or --browser firefox. The single-browser lines above describe ${browserLabel(report.browsers.selected)} (--browser, else Chrome).`;
+  }
   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) {
@@ -327,6 +490,19 @@ async function buildChromeConnectorStatus(args = {}) {
   }
   const extensionManifest = connectorRoot ? readExtensionManifest(connectorRoot) : null;
   const expectedId = extensionManifest && typeof extensionManifest.key === "string" ? extensionIdFromPublicKey(extensionManifest.key) : NOLO_CHROME_CONNECTOR_EXTENSION_ID;
+  const sharedOverrideTarget = browserTarget ?? "chrome";
+  const requestFor = (browser) => {
+    const perBrowser = args.requestChromeFor?.(browser);
+    if (perBrowser) return perBrowser;
+    if (!args.requestChrome) return createChromeConnectorClient({ browser }).request;
+    return browser === sharedOverrideTarget ? args.requestChrome : notProbedRequest;
+  };
+  const browserStatuses = await probeBrowserStatuses({
+    env,
+    chromeExtensionId: expectedId,
+    requestFor
+  });
+  const browsersReport = summarizeBrowsers(browserStatuses, browserTarget ?? null);
   const report = {
     ok: false,
     connectorRoot,
@@ -345,6 +521,12 @@ async function buildChromeConnectorStatus(args = {}) {
       browser: null
     },
     token: { path: null, present: false },
+    uploadRoots: { roots: [], isDefault: false },
+    deploy: {
+      localSha: null,
+      onlineSha: null,
+      sync: "unknown"
+    },
     rpc: {
       online: false,
       extensionId: null,
@@ -354,10 +536,48 @@ async function buildChromeConnectorStatus(args = {}) {
       missingFeatures: [...FULL_SUPPORT_CHROME_FEATURES],
       expectedProtocolVersion: NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION
     },
+    browsers: browsersReport,
     nextStep: ""
   };
-  const requestChrome = args.requestChrome ?? createChromeConnectorClient().request;
-  const probe = await probeConnectorRpc(requestChrome);
+  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 selectedBrowser = browsersReport.selected ?? "chrome";
+  const probe = browserStatuses[selectedBrowser].rpc;
   report.rpc.online = probe.online;
   report.rpc.extensionId = probe.extensionId;
   report.rpc.protocolVersion = probe.protocolVersion;
@@ -374,7 +594,7 @@ async function buildChromeConnectorStatus(args = {}) {
     report.nextStep = resolveStatusNextStep(report);
     return report;
   }
-  let manifestBrowser = report.rpc.browser === "firefox" ? "firefox" : "chrome";
+  let manifestBrowser = browserTarget ?? (report.rpc.browser === "firefox" ? "firefox" : "chrome");
   if (!report.rpc.browser) {
     try {
       const chromeManifestPath = resolveNativeHostInstallPaths({
@@ -413,6 +633,16 @@ async function buildChromeConnectorStatus(args = {}) {
   report.nativeHost.manifestPath = paths.nativeManifestPath;
   report.nativeHost.wrapperPath = paths.wrapperPath;
   report.token.path = paths.tokenPath;
+  if (connectorRoot) {
+    for (const browser of CONNECTOR_BROWSER_ORDER) {
+      fillBrowserInstallFacts(browserStatuses[browser], {
+        home,
+        connectorRoot,
+        platform,
+        chromeExtensionId: expectedId
+      });
+    }
+  }
   const installedManifest = existsSync2(paths.nativeManifestPath) ? readJsonFile(paths.nativeManifestPath) : null;
   report.nativeHost.installed = installedManifest !== null;
   report.nativeHost.installedWrapperPath = typeof installedManifest?.path === "string" ? installedManifest.path : null;
@@ -432,6 +662,29 @@ async function buildChromeConnectorStatus(args = {}) {
 function yesNo(value) {
   return value ? "ok" : "mismatch";
 }
+function endpointPort(endpoint) {
+  try {
+    return new URL(endpoint).port || "(default)";
+  } catch {
+    return endpoint;
+  }
+}
+function formatBrowserStatusLine(status) {
+  const rpcText = status.rpc.online ? `RPC online  build ${status.rpc.build ?? "unrecognized"}  extension ${status.rpc.extensionId ?? "unknown"}  protocolVersion ${status.rpc.protocolVersion ?? "unknown"}` : `RPC offline  ${status.rpc.error ? `${status.rpc.error.code}: ${status.rpc.error.message}` : "(no detail)"}`;
+  const installText = status.nativeHost.manifestPath ? `manifest ${status.nativeHost.installed ? "installed" : "missing"}  token ${status.token.present ? "present" : "missing"}` : "manifest (not resolved)";
+  const verdict = !status.usable ? "unusable" : status.rpc.build && status.rpc.build !== status.browser ? `usable, but answers as the ${browserLabel(status.rpc.build)} build` : "usable";
+  return `${rpcText}  port ${endpointPort(status.endpoint)}  ${installText}  -> ${verdict}`;
+}
+function describeBrowserSelection(browsers) {
+  const explicitNote = browsers.explicit ? `  [--browser ${browsers.explicit} pins this report]` : "";
+  if (browsers.requiresExplicitBrowser) {
+    return `none \u2014 both Chrome and Firefox are online, so pass --browser chrome|firefox (an unqualified call fails with MULTIPLE_BROWSERS_AVAILABLE)${explicitNote}`;
+  }
+  if (browsers.autoSelected) {
+    return `${browsers.autoSelected} \u2014 only ${browserLabel(browsers.autoSelected)} answered, so a bare \`nolo browser <op>\` routes to it${explicitNote}`;
+  }
+  return `none \u2014 no connector answered, so a bare \`nolo browser <op>\` fails with CHROME_CONNECTOR_UNAVAILABLE${explicitNote}`;
+}
 function formatChromeConnectorStatus(report) {
   const lines = ["Nolo Browser Connector"];
   lines.push(
@@ -450,6 +703,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})`);
+  for (const browser of CONNECTOR_BROWSER_ORDER) {
+    lines.push(`  ${`${browserLabel(browser)}${browser === "chrome" ? " " : ""}`.padEnd(16)}: ${formatBrowserStatusLine(report.browsers[browser])}`);
+  }
+  lines.push(`  auto selection   : ${describeBrowserSelection(report.browsers)}`);
   const rpc = report.rpc;
   if (rpc.online) {
     lines.push(
@@ -466,9 +734,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)}
 `);
@@ -486,7 +759,7 @@ 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 "chrome";
+  if (raw === void 0) return void 0;
   const value = raw.trim();
   if (value === "chrome" || value === "firefox") return value;
   return null;
@@ -494,13 +767,14 @@ function readBrowserOption(args) {
 async function runChromeInstallCommand(args, deps = {}) {
   const env = deps.env ?? process.env;
   const output = deps.output ?? process.stdout;
-  const browser = readBrowserOption(args);
-  if (browser === null) {
+  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 {
@@ -553,8 +827,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)}
@@ -584,11 +882,14 @@ export {
   FIREFOX_UNAVAILABLE_FEATURES,
   FULL_SUPPORT_CHROME_FEATURES,
   buildChromeConnectorStatus,
+  compareDeployShas,
   detectWorktreeCheckout,
   expectedFeaturesForBrowser,
+  fetchOnlineBuildSha,
   formatChromeConnectorStatus,
   resolveCliConnectorRoot,
   resolveConnectorBrowser,
+  resolveLocalHeadSha,
   runChromeInstallCommand,
   runChromeReloadCommand,
   runChromeStatusCommand