@optima-chat/browser-cli 0.17.0 → 0.18.1

package/dist/index.js

@@ -4,6 +4,9 @@
 import { createRequire } from "module";
 import { Command } from "commander";
 
+// src/api.ts
+import { createHash } from "crypto";
+
 // src/config.ts
 import { readFileSync, existsSync } from "fs";
 import { join } from "path";
@@ -77,26 +80,41 @@ function getCurrentEnv() {
   }
   return "development";
 }
+function resolveToken(required) {
+  for (const key of ["BROWSER_TOKEN", "OPTIMA_TOKEN"]) {
+    const value = process.env[key]?.trim();
+    if (value) return { token: value, source: key, required };
+  }
+  const noEnv = "\u672A\u8BBE\u7F6E BROWSER_TOKEN / OPTIMA_TOKEN";
+  const file = readOptimaToken();
+  if (!file?.access_token) {
+    return { token: null, source: null, required, missingReason: `${noEnv}\uFF0C~/.optima/token.json \u4E0D\u5B58\u5728\u6216\u6CA1\u6709 access_token` };
+  }
+  const expiresAt = typeof file.expires_at === "number" && Number.isFinite(file.expires_at) ? file.expires_at : void 0;
+  if (expiresAt !== void 0 && expiresAt <= Date.now()) {
+    return {
+      token: null,
+      source: null,
+      required,
+      missingReason: `${noEnv}\uFF0C~/.optima/token.json \u7684\u7968\u5DF2\u4E8E ${new Date(expiresAt).toISOString()} \u8FC7\u671F`
+    };
+  }
+  return { token: file.access_token, source: "token.json", expiresAt, required };
+}
 function loadConfig() {
   const apiUrlOverride = process.env.BROWSER_API_URL;
   const env = apiUrlOverride ? void 0 : getCurrentEnv();
   const apiUrl = apiUrlOverride ?? ENV_CONFIG[env].apiUrl;
-  let token = process.env.BROWSER_TOKEN || null;
-  if (!token) {
-    const optimaToken = readOptimaToken();
-    if (optimaToken?.access_token) {
-      token = optimaToken.access_token;
-    }
-  }
+  const auth = resolveToken(env !== void 0 && env !== "development");
   return {
     apiUrl,
-    token,
+    auth,
     env
   };
 }
 var config = loadConfig();
 var BROWSER_API_URL = config.apiUrl;
-var ACCESS_TOKEN = config.token;
+var AUTH = config.auth;
 
 // src/api.ts
 var BrowserAPIError = class extends Error {
@@ -117,15 +135,34 @@ function toAPIError(status, statusText, body) {
   }
   return new BrowserAPIError(status, "unknown", `HTTP ${status}: ${statusText}`);
 }
+function authHeader() {
+  if (AUTH.token) return { Authorization: `Bearer ${AUTH.token}` };
+  if (AUTH.required) {
+    throw new Error(`\u65E0\u53EF\u7528\u51ED\u8BC1\uFF1A${AUTH.missingReason}\u3002\u8FD9\u662F Optima \u5E73\u53F0\u51ED\u8BC1\uFF0C\u4E0E\u5E97\u94FA/\u6D4F\u89C8\u5668\u7684\u767B\u5F55\u65E0\u5173\u3002`);
+  }
+  return {};
+}
+function withAuthContext(err) {
+  if (err.statusCode !== 401) return err;
+  if (!AUTH.token) {
+    err.message += `\uFF08\u672A\u5E26\u51ED\u8BC1\uFF1A${AUTH.missingReason}\uFF09`;
+    return err;
+  }
+  const fp = createHash("sha256").update(AUTH.token).digest("hex").slice(0, 12);
+  const exp = AUTH.expiresAt !== void 0 ? `\uFF0Cexpires_at=${new Date(AUTH.expiresAt).toISOString()}` : "";
+  err.message += `\uFF08\u51ED\u8BC1\u6765\u6E90 ${AUTH.source}${exp}\uFF0Cfp=${fp}\uFF09`;
+  return err;
+}
 async function request(path, options = {}) {
   const url = `${BROWSER_API_URL}${path}`;
+  const auth = authHeader();
   let response;
   try {
     response = await fetch(url, {
       ...options,
       headers: {
         "Content-Type": "application/json",
-        ...ACCESS_TOKEN ? { Authorization: `Bearer ${ACCESS_TOKEN}` } : {},
+        ...auth,
         ...options.headers
       }
     });
@@ -139,13 +176,13 @@ async function request(path, options = {}) {
     try {
       body = await response.json();
     } catch {
-      throw new BrowserAPIError(
+      throw withAuthContext(new BrowserAPIError(
         response.status,
         "unknown",
         `HTTP ${response.status}: ${response.statusText}`
-      );
+      ));
     }
-    throw toAPIError(response.status, response.statusText, body);
+    throw withAuthContext(toAPIError(response.status, response.statusText, body));
   }
   if (response.status === 204) {
     return void 0;
@@ -154,12 +191,11 @@ async function request(path, options = {}) {
 }
 async function requestBinary(path) {
   const url = `${BROWSER_API_URL}${path}`;
+  const auth = authHeader();
   let response;
   try {
     response = await fetch(url, {
-      headers: {
-        ...ACCESS_TOKEN ? { Authorization: `Bearer ${ACCESS_TOKEN}` } : {}
-      }
+      headers: auth
     });
   } catch {
     throw new Error(
@@ -171,13 +207,13 @@ async function requestBinary(path) {
     try {
       body = await response.json();
     } catch {
-      throw new BrowserAPIError(
+      throw withAuthContext(new BrowserAPIError(
         response.status,
         "unknown",
         `HTTP ${response.status}: ${response.statusText}`
-      );
+      ));
     }
-    throw toAPIError(response.status, response.statusText, body);
+    throw withAuthContext(toAPIError(response.status, response.statusText, body));
   }
   const arrayBuffer = await response.arrayBuffer();
   return Buffer.from(arrayBuffer);
@@ -823,6 +859,34 @@ function formatScriptList(scripts) {
   }
   return lines.join("\n").trimEnd();
 }
+var HALT_RENDERED_ELSEWHERE = /* @__PURE__ */ new Set(["completed_steps", "remaining_steps", "error"]);
+var ARTIFACT_KEYS = /* @__PURE__ */ new Set(["artifact_path", "filename", "size"]);
+var FIELD_MAX_CHARS = 2e3;
+function formatFieldValue(v, taskId) {
+  if (v === null || v === void 0 || v === "") return null;
+  const s = typeof v === "string" ? v : typeof v === "number" || typeof v === "boolean" ? String(v) : JSON.stringify(v);
+  const cps = Array.from(s);
+  return cps.length > FIELD_MAX_CHARS ? `${cps.slice(0, FIELD_MAX_CHARS).join("")}\u2026 (truncated, ${cps.length} chars; full: browser-cli script-task ${taskId} --json)` : s;
+}
+function haltOutputFields(task) {
+  const output = task.output ?? {};
+  const staged = typeof output.artifact_path === "string" && output.artifact_path !== "";
+  const lines = [];
+  for (const [k, v] of Object.entries(output)) {
+    if (HALT_RENDERED_ELSEWHERE.has(k)) continue;
+    if (staged && ARTIFACT_KEYS.has(k)) continue;
+    if (k === "snapshot") {
+      if (v !== null && v !== void 0 && v !== "") {
+        const n = Array.from(typeof v === "string" ? v : JSON.stringify(v)).length;
+        lines.push(`snapshot: (omitted, ${n} chars; full: browser-cli script-task ${task.id} --json)`);
+      }
+      continue;
+    }
+    const s = formatFieldValue(v, task.id);
+    if (s !== null) lines.push(`${k}: ${s}`);
+  }
+  return lines;
+}
 function formatScriptTask(task) {
   const lines = [];
   if (task.status === "completed") {
@@ -860,12 +924,27 @@ function formatScriptTask(task) {
       }
       lines.push("");
     }
+    const fields = haltOutputFields(task);
+    if (fields.length > 0) {
+      lines.push(...fields);
+      lines.push("");
+    }
     const sid = task.session_id;
     lines.push(
       sid ? `Session ${sid} may still be open \u2014 continue with browser-cli --session ${sid} dom/click/input, or free it with browser-cli --session ${sid} close` : "Session id not reported \u2014 if one remains, close it by id: browser-cli --session <id> close"
     );
   } else if (task.status === "failed") {
     lines.push(`\u2717 Script failed: ${task.error ?? "unknown error"}`);
+    const output = task.output ?? {};
+    const completed = output.completed_steps ?? [];
+    const remaining = output.remaining_steps ?? [];
+    if (completed.length > 0) {
+      lines.push(`\u2713 Completed: ${completed.map((s) => s.id).join(", ")}`);
+    }
+    if (remaining.length > 0) {
+      lines.push(`\u2717 Stopped at step [${completed.length + 1}] ${remaining[0].id}`);
+    }
+    lines.push(...haltOutputFields(task));
   } else {
     lines.push(`Script status: ${task.status} (step ${task.current_step}/${task.total_steps})`);
   }
@@ -980,10 +1059,17 @@ ${downloadHint(result)}`);
       process.exit(1);
     }
   });
-  program2.command("script-task").argument("<task-id>", "Task ID").description("Check script task status").option("--download [path]", "Save the task's exported file (default: ./<filename>)").action(async (taskId, opts) => {
+  program2.command("script-task").argument("<task-id>", "Task ID").description("Check script task status").option("--download [path]", "Save the task's exported file (default: ./<filename>)").option("--json", "Print the raw task (status / error / full output) as JSON").action(async (taskId, opts) => {
     try {
+      if (opts.json && opts.download !== void 0) {
+        throw new Error("--json \u4E0E --download \u53EA\u80FD\u7ED9\u4E00\u4E2A");
+      }
       const task = await api.getScriptTask(taskId);
       if (task.status === "needs_fallback" && task.session_id) saveSessionId(task.session_id);
+      if (opts.json) {
+        console.log(JSON.stringify(task, null, 2));
+        return;
+      }
       if (opts.download === void 0) {
         console.log(formatScriptTask(task));
         if (hasStagedArtifact(task)) console.log(downloadHint(task));
@@ -1018,16 +1104,20 @@ var BOSS_GUIDANCE = [
   "  3. \u4E3A\u8BE5\u8D26\u53F7\u6388\u6743\u9700\u8981\u64CD\u4F5C\u7684\u5E97\u94FA\u3002",
   `\u53C2\u8003\u6587\u6863: ${ZINIAO_WEBDRIVER_DOC_URL}`
 ].join("\n");
+var SELF_EXPLANATORY = /正在运行.{0,4}但未开启\s*WebDriver\s*模式/;
+var NOT_READY_HINT = "\u7D2B\u9E1F\u6CA1\u80FD\u5728 15 \u79D2\u5185\u8FDB\u5165 WebDriver \u6A21\u5F0F\uFF08\u4E0D\u662F\u6743\u9650\u95EE\u9898\uFF09\u3002\u2460 \u5148\u786E\u8BA4\u7D2B\u9E1F\u5DF2**\u5B8C\u5168\u9000\u51FA**\uFF08\u542B\u6258\u76D8/\u540E\u53F0\u8FDB\u7A0B\uFF09\u2014\u2014 \u5B83\u4EE5\u666E\u901A\u6A21\u5F0F\u8DD1\u7740\u65F6\u6211\u4EEC\u8D77\u4E0D\u4E86 WebDriver \u6A21\u5F0F\uFF1B\u2461 \u7136\u540E\u8BA9\u6211\u8FD9\u8FB9\u518D\u62C9\u4E00\u6B21\uFF08Windows \u4E0A\u82E5\u5B89\u88C5\u8DEF\u5F84\u662F\u63A2\u6D4B\u6765\u7684\uFF0C\u5931\u8D25\u90A3\u6B21\u4F1A\u6E05\u6389\u5B83\u5E76\u91CD\u67E5\u6CE8\u518C\u8868\uFF0C\u7B2C\u4E8C\u6B21\u5E38\u5E38\u5C31\u6210\uFF09\uFF1B\u2462 \u8FD8\u4E0D\u884C\u5C31\u95EE\u5E97\u4E3B\uFF1A\u7D2B\u9E1F\u88C5\u5728\u54EA\u3001\u662F\u4E0D\u662F\u8FD8\u88C5\u7740\u3002";
 function ziniaoErrorHint(message) {
-  if (/webdriver|开通|权限|permission/i.test(message)) {
-    return `\u7591\u4F3C\u672A\u5F00\u901A Webdriver \u6743\u9650\u6216\u8D26\u53F7\u6743\u9650\u4E0D\u8DB3\u3002${BOSS_GUIDANCE}`;
-  }
+  if (SELF_EXPLANATORY.test(message)) return null;
+  if (/Failed to start ZiNiao WebDriver/i.test(message)) return NOT_READY_HINT;
   if (/错误次数太多/.test(message)) {
     return "\u7D2B\u9E1F\u98CE\u63A7\u5DF2\u4E34\u65F6\u9501\u5B9A\uFF0C\u8BF7\u7B49\u5F85\u7EA6 10 \u5206\u949F\u540E\u91CD\u8BD5\uFF08\u7EE7\u7EED\u5931\u8D25\u4F1A\u5EF6\u957F\u9501\u5B9A\uFF09\u3002";
   }
   if (/用户名或密码错误|密码错误/.test(message)) {
     return "\u8BF7\u6838\u5BF9\u51ED\u636E\uFF08company=\u4F01\u4E1A\u540D\u79F0\uFF0Cusername/password=\u6210\u5458\u8D26\u53F7\uFF0C\u63A8\u8350 robot \u8D26\u53F7\uFF09\uFF0C\u7136\u540E\u7528 browser-cli ziniao set \u91CD\u65B0\u914D\u7F6E\u3002";
   }
+  if (/开通|权限|permission|授权|未开启|未启用|not enabled/i.test(message)) {
+    return `\u7591\u4F3C\u672A\u5F00\u901A Webdriver \u6743\u9650\u6216\u8D26\u53F7\u6743\u9650\u4E0D\u8DB3\u3002${BOSS_GUIDANCE}`;
+  }
   return null;
 }
 async function runZiNiaoDoctor(client) {
@@ -1265,7 +1355,7 @@ function registerFeikuaCommands(program2) {
           return;
         }
         console.log(
-          'No paired shop browsers. Open the desktop app tray and choose "Pair a Shop Browser", then follow the on-screen code.'
+          'No paired shop browsers. In the desktop app tray, click \u300C\u914D\u5BF9\u98DE\u8DE8\u6D4F\u89C8\u5668\u2026\u300D/ "Pair a Feikua Browser\u2026" (older desktop versions: \u300C\u914D\u5BF9\u65B0\u5E97\u94FA\u6D4F\u89C8\u5668\u2026\u300D/ "Pair a Shop Browser\u2026"), then follow the on-screen code.'
         );
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optima-chat/browser-cli",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {