nolo-cli 0.90.0-alpha.1 → 0.91.1

package/{chromeCommands-VOIRNJBL.js → chromeCommands-NKU3OWKH.js}

@@ -3,7 +3,7 @@ import {
   NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION,
   REQUIRED_CHROME_CONNECTOR_FEATURES,
   createChromeConnectorClient
-} from "./chunk-QCZX4FTW.js";
+} from "./chunk-OY5IJI2N.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -21,6 +21,7 @@ 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 +41,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,16 +71,18 @@ 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");
   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,
@@ -77,12 +95,13 @@ function installNativeHostManifest({
   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() : "";
@@ -97,12 +116,18 @@ NOLO_CHROME_CONNECTOR_TOKEN=${JSON.stringify(token)} exec ${JSON.stringify(resol
   );
   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
@@ -253,7 +278,7 @@ function resolveStatusNextStep(report) {
     return "nolo chrome install (the installed manifest does not point at this checkout's wrapper / extension id, which Chrome 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 (Developer mode), or install the Nolo Browser Connector from https://nolo.chat/downloads (Chrome or Firefox), 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\`.`;
@@ -451,7 +476,7 @@ async function runChromeInstallCommand(args, deps = {}) {
         `  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 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")
     );
@@ -480,7 +505,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;

package/{chromeOpsCommands-M7DPCX2T.js → chromeOpsCommands-OQDJGD4Y.js}

@@ -1,6 +1,6 @@
 import {
   createChromeConnectorClient
-} from "./chunk-QCZX4FTW.js";
+} from "./chunk-OY5IJI2N.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -23,6 +23,18 @@ function wantsHelp(args) {
 function readTrimmedOption(args, flag) {
   return (readOption(args, flag) ?? "").trim();
 }
+function readAllOptions(args, flag) {
+  const values = [];
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === flag && i + 1 < args.length) {
+      const val = args[i + 1].trim();
+      if (val && !val.startsWith("--")) {
+        values.push(val);
+      }
+    }
+  }
+  return values;
+}
 function readIntOption(args, flag, usage) {
   const raw = readOption(args, flag);
   if (raw === void 0) return void 0;
@@ -112,6 +124,24 @@ var CHROME_OPS_SUBCOMMANDS = {
       };
     }
   },
+  upload: {
+    action: "set_files",
+    usage: "nolo chrome upload --tab <id> (--ref <elementRef> | --selector <css>) --file <path> [--file <path>...]",
+    payload: (args, usage) => {
+      const files = readAllOptions(args, "--file");
+      if (files.length === 0) {
+        throw new Error(`Missing required --file <path>. Usage: ${usage}`);
+      }
+      const target = requireTarget(args, usage);
+      const tabId = requireTabId(args, usage);
+      return {
+        tabId,
+        ...target,
+        ...target.elementRef ? { ref: target.elementRef } : {},
+        files
+      };
+    }
+  },
   press: {
     action: "press",
     usage: "nolo chrome press --tab <id> --key <key>",