nolo-cli 0.148.0-alpha.1 → 0.151.0-alpha.2

package/{chunk-YUNJN43V.js → chunk-BU2YQBV4.js}

@@ -1,17 +1,14 @@
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
-
-// packages/desktop-chrome-connector/chromeConnector.ts
-import { existsSync as existsSync2, readFileSync } from "node:fs";
-import { resolve as resolve2 } from "node:path";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 
 // packages/desktop-chrome-connector/uploadSecurity.mjs
-import { existsSync, realpathSync, statSync } from "node:fs";
-import { isAbsolute, relative, resolve } from "node:path";
+import { existsSync, lstatSync, mkdirSync, realpathSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, join, relative, resolve } from "node:path";
 var DEFAULT_MAX_FILE_BYTES = 25 * 1024 * 1024;
 var DEFAULT_MAX_FILES = 10;
 var UploadSecurityError = class extends Error {
@@ -28,22 +25,106 @@ 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 [];
+var DEFAULT_UPLOAD_ROOT_SUFFIX = join(".nolo", "uploads");
+function resolveDefaultUploadRoot(env = process.env) {
+  let home;
+  try {
+    home = env?.HOME || homedir();
+  } catch (err) {
+    throw createUploadSecurityError(
+      "path_not_allowed",
+      `Could not determine the home directory for the default upload root: ${err instanceof Error ? err.message : String(err)}`
+    );
   }
-  return raw.split(",").map((entry) => entry.trim()).filter(Boolean).filter((entry) => isAbsolute(entry)).map((entry) => {
-    const resolved = resolve(entry);
-    if (existsSync(resolved)) {
+  if (typeof home !== "string" || !isAbsolute(home)) {
+    throw createUploadSecurityError(
+      "path_not_allowed",
+      `Home directory '${String(home)}' must be an absolute path to derive the default upload root '${DEFAULT_UPLOAD_ROOT_SUFFIX}'.`
+    );
+  }
+  return resolve(join(home, DEFAULT_UPLOAD_ROOT_SUFFIX));
+}
+function splitConfiguredRoots(raw) {
+  const entries = typeof raw === "string" ? raw.split(",").map((entry) => entry.trim()).filter(Boolean) : [];
+  const absolute = [];
+  const dropped = [];
+  for (const entry of entries) {
+    (isAbsolute(entry) ? absolute : dropped).push(entry);
+  }
+  return { absolute, dropped };
+}
+function resolveUploadRoots(env = process.env) {
+  const raw = env?.NOLO_CHROME_UPLOAD_ROOTS;
+  if (raw !== void 0) {
+    const { absolute, dropped } = splitConfiguredRoots(raw);
+    const roots = absolute.map((entry) => {
+      const resolved = resolve(entry);
+      if (!existsSync(resolved)) {
+        return resolved;
+      }
       try {
         return realpathSync(resolved);
       } catch {
         return resolved;
       }
+    });
+    return { configured: true, isDefault: false, roots, dropped };
+  }
+  const defaultDir = resolveDefaultUploadRoot(env);
+  return {
+    configured: false,
+    isDefault: true,
+    roots: [existsSync(defaultDir) ? inspectDefaultUploadRoot(defaultDir) : defaultDir],
+    dropped: []
+  };
+}
+function ensureDefaultUploadRoot(env = process.env) {
+  if (env?.NOLO_CHROME_UPLOAD_ROOTS !== void 0) {
+    return resolveUploadRoots(env);
+  }
+  const defaultDir = resolveDefaultUploadRoot(env);
+  if (!existsSync(defaultDir)) {
+    try {
+      mkdirSync(defaultDir, { recursive: true, mode: 448 });
+    } catch (err) {
+      throw createUploadSecurityError(
+        "path_not_allowed",
+        `Default upload root '${defaultDir}' could not be created: ${err instanceof Error ? err.message : String(err)}`
+      );
     }
-    return resolved;
-  });
+  }
+  return { configured: false, isDefault: true, roots: [inspectDefaultUploadRoot(defaultDir)], dropped: [] };
+}
+function inspectDefaultUploadRoot(defaultDir) {
+  let lst;
+  try {
+    lst = lstatSync(defaultDir);
+  } catch (err) {
+    throw createUploadSecurityError(
+      "path_not_allowed",
+      `Default upload root '${defaultDir}' could not be inspected: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  if (lst.isSymbolicLink()) {
+    throw createUploadSecurityError(
+      "path_not_allowed",
+      `Default upload root '${defaultDir}' is a symbolic link, which is not permitted. Set NOLO_CHROME_UPLOAD_ROOTS to the real directory if you need a custom location.`
+    );
+  }
+  if (!lst.isDirectory()) {
+    throw createUploadSecurityError(
+      "path_not_allowed",
+      `Default upload root '${defaultDir}' is not a directory.`
+    );
+  }
+  try {
+    return realpathSync(defaultDir);
+  } catch (err) {
+    throw createUploadSecurityError(
+      "path_not_allowed",
+      `Default upload root '${defaultDir}' canonical path could not be resolved: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
 }
 function validateUploadFiles(options = {}) {
   const {
@@ -61,11 +142,14 @@ function validateUploadFiles(options = {}) {
       `Too many files: ${files.length} provided, maximum allowed is ${maxFiles}.`
     );
   }
-  const allowedRoots = parseAllowedRoots(env);
+  const rootsInfo = ensureDefaultUploadRoot(env);
+  const allowedRoots = rootsInfo.roots;
   if (allowedRoots.length === 0) {
+    const dropped = rootsInfo.dropped ?? [];
+    const droppedHint = dropped.length ? ` Ignored entries: ${dropped.map((entry) => `'${entry}'`).join(", ")} (only absolute paths are accepted; '~' and relative paths are never expanded).` : "";
     throw createUploadSecurityError(
       "path_not_allowed",
-      "Upload roots not configured in NOLO_CHROME_UPLOAD_ROOTS; all uploads are refused."
+      `NOLO_CHROME_UPLOAD_ROOTS is set but contains no usable absolute path; all uploads are refused.${droppedHint}`
     );
   }
   const fileStats = [];
@@ -135,6 +219,8 @@ function logUploadAudit(entry, logFn = console.warn) {
 }
 
 // packages/desktop-chrome-connector/chromeConnector.ts
+import { existsSync as existsSync2, readFileSync } from "node:fs";
+import { resolve as resolve2 } from "node:path";
 var NOLO_CHROME_CONNECTOR_EXTENSION_ID = "ahpdoopadkamnglhlacfjdfnonpjdplg";
 var NOLO_FIREFOX_CONNECTOR_EXTENSION_ID = "nolo-browser-connector@nolo.chat";
 var NOLO_CONNECTOR_EXTENSION_IDS = [
@@ -142,6 +228,20 @@ var NOLO_CONNECTOR_EXTENSION_IDS = [
   NOLO_FIREFOX_CONNECTOR_EXTENSION_ID
 ];
 var NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION = "2";
+var NOLO_CHROME_CONNECTOR_DEFAULT_PORTS = {
+  chrome: 38947,
+  firefox: 38948
+};
+var CONNECTOR_BROWSER_EXTENSION_IDS = {
+  chrome: NOLO_CHROME_CONNECTOR_EXTENSION_ID,
+  firefox: NOLO_FIREFOX_CONNECTOR_EXTENSION_ID
+};
+function connectorEndpointForBrowser(browser, env = process.env) {
+  const explicitUrl = env.NOLO_CHROME_CONNECTOR_RPC_URL;
+  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`;
+}
 function defaultTokenPath() {
   return resolve2(
     process.env.HOME || "",
@@ -217,7 +317,8 @@ function errorPayload(error) {
   };
 }
 var TARGET_REQUIRED_ACTIONS = /* @__PURE__ */ new Set(["click", "type", "set_files"]);
-var TAB_ID_REQUIRED_ACTIONS = /* @__PURE__ */ new Set(["close_tab", "detach", "set_files"]);
+var TAB_ID_REQUIRED_ACTIONS = /* @__PURE__ */ new Set(["close_tab", "detach", "set_files", "prepare_browser_action"]);
+var ALLOWED_PREPARE_SUB_ACTIONS = /* @__PURE__ */ new Set(["click", "type", "press"]);
 function validateChromeConnectorPayload(action, payload) {
   if (TAB_ID_REQUIRED_ACTIONS.has(action)) {
     const raw = payload.tabId;
@@ -228,7 +329,56 @@ function validateChromeConnectorPayload(action, payload) {
         `Provide the tabId from browser_list_tabs before calling ${action}.`
       );
     }
-    if (!TARGET_REQUIRED_ACTIONS.has(action)) return;
+  }
+  for (const credentialKey of ["challengeId", "prepareId", "preparedActionId", "grantTicket"]) {
+    if (payload[credentialKey] !== void 0) {
+      const val = payload[credentialKey];
+      if (typeof val !== "string" || !val.trim()) {
+        throw createConnectorError(
+          "INVALID_ARGUMENTS",
+          `Consent credential ${credentialKey} must be a non-empty string.`
+        );
+      }
+    }
+  }
+  if (action === "prepare_browser_action") {
+    const rawAction = typeof payload.action === "string" ? payload.action.trim().toLowerCase() : "";
+    if (!ALLOWED_PREPARE_SUB_ACTIONS.has(rawAction)) {
+      throw createConnectorError(
+        "UNSUPPORTED_ACTION",
+        `Action '${rawAction || "empty"}' is not supported for preparation; must be click, type, or press.`
+      );
+    }
+    if (payload.ref !== void 0 || payload.elementRef !== void 0) {
+      throw createConnectorError(
+        "UNSUPPORTED_TARGET_KIND",
+        "elementRef targeting is not supported for action preparation; use selector or active."
+      );
+    }
+    const hasActive = payload.active === true;
+    const hasSelector = typeof payload.selector === "string" && payload.selector.trim().length > 0;
+    if (!hasActive && !hasSelector && rawAction !== "press") {
+      throw createConnectorError(
+        "MISSING_TARGET_SELECTOR",
+        "Target selector or active flag is required for action preparation."
+      );
+    }
+    if (rawAction === "type") {
+      if (typeof payload.text !== "string") {
+        throw createConnectorError(
+          "INVALID_ARGUMENTS",
+          "Provide --text for type action preparation."
+        );
+      }
+    } else if (rawAction === "press") {
+      if (typeof payload.key !== "string" || !payload.key.trim()) {
+        throw createConnectorError(
+          "INVALID_ARGUMENTS",
+          "Provide --key for press action preparation."
+        );
+      }
+    }
+    return;
   }
   if (!TARGET_REQUIRED_ACTIONS.has(action)) return;
   const rawRef = typeof payload.elementRef === "string" ? payload.elementRef : typeof payload.ref === "string" ? payload.ref : "";
@@ -267,8 +417,8 @@ function validateChromeConnectorPayload(action, payload) {
 }
 function createChromeConnectorClient(args) {
   if (args?.request) return { request: args.request };
-  const defaultPort = process.env.NOLO_CHROME_CONNECTOR_PORT || "38947";
-  const endpoint = args?.endpoint ?? process.env.NOLO_CHROME_CONNECTOR_RPC_URL ?? `http://127.0.0.1:${defaultPort}/rpc`;
+  const browser = args?.browser ?? "chrome";
+  const endpoint = args?.endpoint ?? connectorEndpointForBrowser(browser);
   const fetchImpl = args?.fetchImpl ?? fetch;
   const token = args?.token ?? readConnectorToken(args?.tokenPath);
   return {
@@ -319,15 +469,37 @@ var REQUIRED_CHROME_CONNECTOR_FEATURES = {
   read_console: ["browser_debug"],
   read_network: ["browser_debug"],
   detach: ["browser_debug"],
-  set_files: ["compact_observation_v2", "file_upload"]
+  set_files: ["compact_observation_v2", "file_upload"],
+  prepare_browser_action: ["prepare_browser_action"]
 };
 function requiredFeaturesForConnectorAction(action) {
   return [...REQUIRED_CHROME_CONNECTOR_FEATURES[action] ?? []];
 }
+function createChromeConnectorClientResolver(args) {
+  const cache = /* @__PURE__ */ new Map();
+  const overrides = args?.clients;
+  const resolve3 = (selector) => {
+    const existing = cache.get(selector);
+    if (existing) return existing;
+    let client;
+    if (selector === "chrome" || selector === "firefox") {
+      const inner = overrides?.[selector] ?? createChromeConnectorClient({ browser: selector });
+      client = createVerifiedChromeConnectorClient({
+        client: inner,
+        expectedBrowser: selector
+      });
+    } else {
+      client = overrides?.default ?? createVerifiedChromeConnectorClient({ client: createChromeConnectorClient() });
+    }
+    cache.set(selector, client);
+    return client;
+  };
+  return resolve3;
+}
 function createVerifiedChromeConnectorClient(args) {
   const client = args?.client ?? createChromeConnectorClient();
   const expectedExtensionIds = new Set(
-    args?.expectedExtensionIds ?? (args?.expectedExtensionId ? [args.expectedExtensionId] : NOLO_CONNECTOR_EXTENSION_IDS)
+    args?.expectedExtensionIds ?? (args?.expectedBrowser ? [CONNECTOR_BROWSER_EXTENSION_IDS[args.expectedBrowser]] : args?.expectedExtensionId ? [args.expectedExtensionId] : NOLO_CONNECTOR_EXTENSION_IDS)
   );
   let verified = null;
   let negotiatedFeatures = [];
@@ -399,9 +571,21 @@ async function executeChromeConnectorTool(args) {
     };
   }
   try {
-    const { target: _ignoredTarget, ...payload } = parseArguments(args.call.arguments);
+    const { target: rawTarget, ...payload } = parseArguments(args.call.arguments);
+    const target = typeof rawTarget === "string" && rawTarget.trim().length > 0 ? rawTarget.trim().toLowerCase() : void 0;
+    if (target !== void 0 && target !== "chrome" && target !== "firefox") {
+      throw createConnectorError(
+        "INVALID_BROWSER_TARGET",
+        `browser target must be "chrome" or "firefox", received "${rawTarget}".`,
+        { receivedTarget: rawTarget }
+      );
+    }
     validateChromeConnectorPayload(action, payload);
-    const result = await (args.client ?? createChromeConnectorClient()).request(action, payload);
+    const client = args.clientForTarget?.(target) ?? (target ? createVerifiedChromeConnectorClient({
+      client: createChromeConnectorClient({ browser: target }),
+      expectedBrowser: target
+    }) : args.client ?? createVerifiedChromeConnectorClient({ client: createChromeConnectorClient() }));
+    const result = await client.request(action, payload);
     return {
       content: JSON.stringify({ ok: true, result }),
       metadata: {
@@ -424,12 +608,15 @@ async function executeChromeConnectorTool(args) {
 var CHROME_CONNECTOR_TOOL_ACTIONS = { ...CHROME_TOOL_ACTIONS };
 
 export {
+  resolveUploadRoots,
   NOLO_CHROME_CONNECTOR_EXTENSION_ID,
   NOLO_FIREFOX_CONNECTOR_EXTENSION_ID,
   NOLO_CONNECTOR_EXTENSION_IDS,
   NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION,
+  NOLO_CHROME_CONNECTOR_DEFAULT_PORTS,
   createChromeConnectorClient,
   REQUIRED_CHROME_CONNECTOR_FEATURES,
+  createChromeConnectorClientResolver,
   createVerifiedChromeConnectorClient,
   executeChromeConnectorTool
 };

package/{chunk-XPRWFQQK.js → chunk-CBHGZRCE.js}

@@ -1,21 +1,24 @@
+import {
+  normalizeMediaConfirmExecutionRevision
+} from "./chunk-QYPE3TS3.js";
 import {
   getActiveDialogKey
-} from "./chunk-B6SAMB33.js";
+} from "./chunk-OWYYDMGJ.js";
+import {
+  selectIdentityToken
+} from "./chunk-SEJ5OS6F.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
 import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
-import {
-  selectIdentityToken
-} from "./chunk-SEJ5OS6F.js";
+  extractCustomId
+} from "./chunk-M2EJHDJP.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
 import {
-  extractCustomId
-} from "./chunk-M2EJHDJP.js";
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
 
 // packages/ai/tools/toolApiClient.ts
 var MAIN_SERVER = "https://nolo.chat";
@@ -115,18 +118,31 @@ var ToolApiError = class extends Error {
   status;
   code;
   details;
+  upperCredits;
+  /**
+   * 服务端在本次 409 里下发的执行代次（扁平 error.executionRevision，旧形状兼容
+   * error.details.executionRevision）。只转述服务端本次的值，绝不另行 GET 补齐。
+   * 真值判据复用 normalizeMediaConfirmExecutionRevision（缺失/非法一律缺席，不造值）。
+   */
+  executionRevision;
   constructor(message, options) {
     super(message);
     this.name = "ToolApiError";
     this.status = options?.status;
     this.code = options?.code;
     this.details = options?.details;
+    this.upperCredits = options?.upperCredits;
+    this.executionRevision = normalizeMediaConfirmExecutionRevision(
+      options?.executionRevision
+    );
   }
 };
 var buildToolRequestHeaders = (thunkApi, options = {}) => {
   const { withAuth = false, agentKey } = options;
   const { token } = getRequestConfig(thunkApi);
-  const headers = { "Content-Type": "application/json" };
+  const headers = {
+    "Content-Type": "application/json"
+  };
   if (withAuth && token) {
     headers["Authorization"] = `Bearer ${token}`;
   }
@@ -150,10 +166,12 @@ async function callToolApi(thunkApi, path, body, options = {}) {
   if (!baseUrl) throw new Error("\u65E0\u6CD5\u83B7\u53D6\u5DE5\u5177\u670D\u52A1\u5668\u5730\u5740\u3002");
   const url = `${baseUrl}${path}`;
   const headers = buildToolRequestHeaders(thunkApi, options);
+  const method = options.method ?? "POST";
   const response = await fetch(url, {
-    method: "POST",
+    method,
     headers,
-    body: JSON.stringify(maybeAttachDialogId(thunkApi, body))
+    ...options.signal ? { signal: options.signal } : {},
+    ...method === "GET" ? {} : { body: JSON.stringify(maybeAttachDialogId(thunkApi, body)) }
   });
   const contentType = response.headers.get("content-type");
   const responseText = await response.text();
@@ -161,6 +179,8 @@ async function callToolApi(thunkApi, path, body, options = {}) {
     let errorMessage = `API \u8BF7\u6C42\u5931\u8D25\uFF0C\u72B6\u6001\u7801: ${response.status}`;
     let errorCode;
     let errorDetails;
+    let upperCredits;
+    let errorExecutionRevision;
     try {
       const errorData = JSON.parse(responseText);
       const err = errorData?.error;
@@ -168,6 +188,10 @@ async function callToolApi(thunkApi, path, body, options = {}) {
         errorMessage += `: ${err.message ?? JSON.stringify(err)}`;
         errorCode = typeof err.code === "string" ? err.code : void 0;
         errorDetails = err.details;
+        if (typeof err.upperCredits === "number") {
+          upperCredits = err.upperCredits;
+        }
+        errorExecutionRevision = err.executionRevision ?? err.details?.executionRevision;
       }
     } catch {
       errorCode = looksLikeHtmlResponse(responseText, contentType) ? "HTML_ERROR_RESPONSE" : "NON_JSON_ERROR_RESPONSE";
@@ -182,7 +206,9 @@ async function callToolApi(thunkApi, path, body, options = {}) {
     throw new ToolApiError(errorMessage, {
       status: response.status,
       code: errorCode,
-      details: errorDetails
+      details: errorDetails,
+      upperCredits,
+      executionRevision: errorExecutionRevision
     });
   }
   try {