nolo-cli 0.90.0-alpha.1 → 0.91.1

package/{chunk-QCZX4FTW.js → chunk-OY5IJI2N.js}

@@ -6,19 +6,151 @@ import {
 } from "./chunk-KUG52IAP.js";
 
 // packages/desktop-chrome-connector/chromeConnector.ts
-import { existsSync, readFileSync } from "node:fs";
-import { resolve } from "node:path";
+import { existsSync as existsSync2, readFileSync } from "node:fs";
+import { resolve as resolve2 } from "node:path";
+
+// packages/desktop-chrome-connector/uploadSecurity.mjs
+import { existsSync, realpathSync, statSync } from "node:fs";
+import { isAbsolute, relative, resolve } from "node:path";
+var DEFAULT_MAX_FILE_BYTES = 25 * 1024 * 1024;
+var DEFAULT_MAX_FILES = 10;
+var UploadSecurityError = class extends Error {
+  constructor(code, message) {
+    super(message);
+    this.name = "UploadSecurityError";
+    this.code = code;
+  }
+};
+function createUploadSecurityError(code, message) {
+  return new UploadSecurityError(code, message);
+}
+function isSubpath(parent, child) {
+  const rel = relative(parent, child);
+  return !rel.startsWith("..") && !isAbsolute(rel);
+}
+function parseAllowedRoots(env = process.env) {
+  const raw = env?.NOLO_CHROME_UPLOAD_ROOTS;
+  if (!raw || typeof raw !== "string") {
+    return [];
+  }
+  return raw.split(",").map((entry) => entry.trim()).filter(Boolean).filter((entry) => isAbsolute(entry)).map((entry) => {
+    const resolved = resolve(entry);
+    if (existsSync(resolved)) {
+      try {
+        return realpathSync(resolved);
+      } catch {
+        return resolved;
+      }
+    }
+    return resolved;
+  });
+}
+function validateUploadFiles(options = {}) {
+  const {
+    files,
+    env = process.env,
+    maxFiles = DEFAULT_MAX_FILES,
+    maxFileBytes = DEFAULT_MAX_FILE_BYTES
+  } = options;
+  if (!Array.isArray(files) || files.length === 0) {
+    throw createUploadSecurityError("no_files", "Provide at least one file to upload.");
+  }
+  if (files.length > maxFiles) {
+    throw createUploadSecurityError(
+      "too_many_files",
+      `Too many files: ${files.length} provided, maximum allowed is ${maxFiles}.`
+    );
+  }
+  const allowedRoots = parseAllowedRoots(env);
+  if (allowedRoots.length === 0) {
+    throw createUploadSecurityError(
+      "path_not_allowed",
+      "Upload roots not configured in NOLO_CHROME_UPLOAD_ROOTS; all uploads are refused."
+    );
+  }
+  const fileStats = [];
+  const canonicalFiles = [];
+  let totalBytes = 0;
+  for (const rawFile of files) {
+    if (typeof rawFile !== "string" || !rawFile.trim()) {
+      throw createUploadSecurityError("path_not_allowed", "File path must be a non-empty string.");
+    }
+    const trimmed = rawFile.trim();
+    const resolvedCandidate = resolve(trimmed);
+    if (!existsSync(resolvedCandidate)) {
+      throw createUploadSecurityError("path_not_allowed", `File not found or inaccessible: ${rawFile}`);
+    }
+    let real;
+    try {
+      real = realpathSync(resolvedCandidate);
+    } catch {
+      throw createUploadSecurityError("path_not_allowed", `Could not resolve canonical path for: ${rawFile}`);
+    }
+    let st;
+    try {
+      st = statSync(real);
+    } catch {
+      throw createUploadSecurityError("path_not_allowed", `Could not stat file: ${rawFile}`);
+    }
+    if (!st.isFile()) {
+      throw createUploadSecurityError("path_not_allowed", `Target path is not a regular file: ${rawFile}`);
+    }
+    if (st.size > maxFileBytes) {
+      throw createUploadSecurityError(
+        "too_large",
+        `File size ${st.size} bytes exceeds maximum allowed limit of ${maxFileBytes} bytes: ${rawFile}`
+      );
+    }
+    const realInside = allowedRoots.some((root) => isSubpath(root, real));
+    if (!realInside) {
+      throw createUploadSecurityError(
+        "path_not_allowed",
+        `Path '${rawFile}' (resolved: '${real}') is not within allowed upload roots.`
+      );
+    }
+    canonicalFiles.push(real);
+    fileStats.push({ path: real, bytes: st.size });
+    totalBytes += st.size;
+  }
+  return {
+    ok: true,
+    files: canonicalFiles,
+    fileStats,
+    totalBytes
+  };
+}
+function formatUploadAuditLog(entry = {}) {
+  const ts = entry.timestamp || (/* @__PURE__ */ new Date()).toISOString();
+  const safeTabId = String(entry.tabId ?? "").replace(/[\x00-\x1f\x7f-\x9f]+/g, " ");
+  const safeTarget = String(entry.target ?? "").replace(/[\x00-\x1f\x7f-\x9f]+/g, " ");
+  const files = Array.isArray(entry.files) ? entry.files : [];
+  const totalBytes = files.reduce((sum, f) => sum + (Number(f.bytes) || 0), 0);
+  const fileDetails = files.map((f) => `${String(f.path || "").replace(/[\x00-\x1f\x7f-\x9f]+/g, " ")}(${f.bytes || 0}B)`).join(", ");
+  return `[chrome-upload] ${ts} tabId=${safeTabId} target=${safeTarget} files=[${fileDetails}] totalBytes=${totalBytes}`;
+}
+function logUploadAudit(entry, logFn = console.warn) {
+  const line = formatUploadAuditLog(entry);
+  logFn(line);
+  return line;
+}
+
+// packages/desktop-chrome-connector/chromeConnector.ts
 var NOLO_CHROME_CONNECTOR_EXTENSION_ID = "ahpdoopadkamnglhlacfjdfnonpjdplg";
+var NOLO_FIREFOX_CONNECTOR_EXTENSION_ID = "nolo-browser-connector@nolo.chat";
+var NOLO_CONNECTOR_EXTENSION_IDS = [
+  NOLO_CHROME_CONNECTOR_EXTENSION_ID,
+  NOLO_FIREFOX_CONNECTOR_EXTENSION_ID
+];
 var NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION = "2";
 function defaultTokenPath() {
-  return resolve(
+  return resolve2(
     process.env.HOME || "",
     "Library/Application Support/Nolo/ChromeConnector/token"
   );
 }
 function readConnectorToken(tokenPath = defaultTokenPath()) {
   if (process.env.NOLO_CHROME_CONNECTOR_TOKEN) return process.env.NOLO_CHROME_CONNECTOR_TOKEN;
-  if (!existsSync(tokenPath)) return "";
+  if (!existsSync2(tokenPath)) return "";
   return readFileSync(tokenPath, "utf8").trim();
 }
 var CHROME_TOOL_ACTIONS = {
@@ -32,7 +164,10 @@ var CHROME_TOOL_ACTIONS = {
   chrome_scroll: "scroll",
   chrome_screenshot: "screenshot",
   chrome_read_console: "read_console",
-  chrome_read_network: "read_network"
+  chrome_read_network: "read_network",
+  chrome_set_files: "set_files",
+  chrome_upload_file: "set_files",
+  chrome_upload: "set_files"
 };
 function createConnectorError(code, message, details) {
   const error = new Error(message);
@@ -53,14 +188,18 @@ function parseArguments(raw) {
   }
 }
 function errorPayload(error) {
+  const code = error?.code ?? "CHROME_CONNECTOR_ERROR";
   return {
-    code: error?.code ?? "CHROME_CONNECTOR_ERROR",
+    code,
     message: toErrorMessage(error),
+    ...code === "CHROME_CONNECTOR_UNAVAILABLE" ? {
+      hint: "The Nolo Browser Connector is not reachable. It runs inside the user's own Chrome or Firefox \u2014 ask the user to open their browser with the Nolo Browser Connector extension enabled, or install it from https://nolo.chat/downloads (Firefox can install the signed .xpi directly), then retry."
+    } : {},
     ...error?.details !== void 0 ? { details: error.details } : {}
   };
 }
-var TARGET_REQUIRED_ACTIONS = /* @__PURE__ */ new Set(["click", "type"]);
-var TAB_ID_REQUIRED_ACTIONS = /* @__PURE__ */ new Set(["close_tab", "detach"]);
+var TARGET_REQUIRED_ACTIONS = /* @__PURE__ */ new Set(["click", "type", "set_files"]);
+var TAB_ID_REQUIRED_ACTIONS = /* @__PURE__ */ new Set(["close_tab", "detach", "set_files"]);
 function validateChromeConnectorPayload(action, payload) {
   if (TAB_ID_REQUIRED_ACTIONS.has(action)) {
     const raw = payload.tabId;
@@ -71,16 +210,42 @@ function validateChromeConnectorPayload(action, payload) {
         `Provide the tabId from chrome_list_tabs before calling ${action}.`
       );
     }
-    return;
+    if (!TARGET_REQUIRED_ACTIONS.has(action)) return;
   }
   if (!TARGET_REQUIRED_ACTIONS.has(action)) return;
-  const elementRef = typeof payload.elementRef === "string" ? payload.elementRef.trim() : "";
+  const rawRef = typeof payload.elementRef === "string" ? payload.elementRef : typeof payload.ref === "string" ? payload.ref : "";
+  const elementRef = rawRef.trim();
   const selector = typeof payload.selector === "string" ? payload.selector.trim() : "";
-  if (elementRef || selector) return;
-  throw createConnectorError(
-    "ELEMENT_TARGET_REQUIRED",
-    "Provide elementRef from chrome_read_page or a CSS selector."
-  );
+  if (!elementRef && !selector) {
+    throw createConnectorError(
+      "ELEMENT_TARGET_REQUIRED",
+      "Provide elementRef from chrome_read_page or a CSS selector."
+    );
+  }
+  if (action === "set_files") {
+    if (!Array.isArray(payload.files) || payload.files.length === 0) {
+      throw createConnectorError(
+        "no_files",
+        "Provide at least one file path in files array."
+      );
+    }
+    try {
+      const validated = validateUploadFiles({
+        files: payload.files,
+        env: process.env
+      });
+      payload.files = validated.files;
+      const targetStr = elementRef ? `ref:${elementRef}` : `selector:${selector}`;
+      logUploadAudit({
+        tabId: String(payload.tabId),
+        target: targetStr,
+        files: validated.fileStats
+      });
+    } catch (err) {
+      const code = err?.code ?? "path_not_allowed";
+      throw createConnectorError(code, toErrorMessage(err));
+    }
+  }
 }
 function createChromeConnectorClient(args) {
   if (args?.request) return { request: args.request };
@@ -90,6 +255,7 @@ function createChromeConnectorClient(args) {
   const token = args?.token ?? readConnectorToken(args?.tokenPath);
   return {
     async request(action, payload) {
+      validateChromeConnectorPayload(action, payload);
       let response;
       try {
         response = await fetchImpl(endpoint, {
@@ -128,27 +294,34 @@ var REQUIRED_CHROME_CONNECTOR_FEATURES = {
   type: ["compact_observation_v2", "action_gate"],
   press: ["compact_observation_v2", "action_gate"],
   scroll: ["compact_observation_v2"],
-  screenshot: ["browser_debug"],
+  // Both browsers advertise the dedicated `screenshot` feature: Chrome serves it through
+  // Page.captureScreenshot (browser_debug-adjacent) while Firefox falls back to
+  // tabs.captureVisibleTab, so gating on browser_debug would wrongly refuse Firefox.
+  screenshot: ["screenshot"],
   read_console: ["browser_debug"],
   read_network: ["browser_debug"],
-  detach: ["browser_debug"]
+  detach: ["browser_debug"],
+  set_files: ["compact_observation_v2", "file_upload"]
 };
 function requiredFeaturesForConnectorAction(action) {
   return [...REQUIRED_CHROME_CONNECTOR_FEATURES[action] ?? []];
 }
 function createVerifiedChromeConnectorClient(args) {
   const client = args?.client ?? createChromeConnectorClient();
-  const expectedExtensionId = args?.expectedExtensionId ?? NOLO_CHROME_CONNECTOR_EXTENSION_ID;
+  const expectedExtensionIds = new Set(
+    args?.expectedExtensionIds ?? (args?.expectedExtensionId ? [args.expectedExtensionId] : NOLO_CONNECTOR_EXTENSION_IDS)
+  );
   let verified = null;
   let negotiatedFeatures = [];
   const verify = async () => {
     const connectorInfo = await client.request("connector_info", {});
     const receivedExtensionId = connectorInfo?.extensionId;
-    if (receivedExtensionId !== expectedExtensionId) {
+    if (typeof receivedExtensionId !== "string" || !expectedExtensionIds.has(receivedExtensionId)) {
+      const expectedList = [...expectedExtensionIds].join(", ");
       throw createConnectorError(
         "CHROME_CONNECTOR_EXTENSION_MISMATCH",
-        `Chrome connector extension id mismatch: expected ${expectedExtensionId}, received ${typeof receivedExtensionId === "string" ? receivedExtensionId : "unknown"}.`,
-        { expectedExtensionId, receivedExtensionId }
+        `Chrome connector extension id mismatch: expected one of ${expectedList}, received ${typeof receivedExtensionId === "string" ? receivedExtensionId : "unknown"}.`,
+        { expectedExtensionIds: [...expectedExtensionIds], receivedExtensionId }
       );
     }
     const receivedProtocolVersion = connectorInfo?.protocolVersion;