@optima-chat/browser-cli 0.21.0 → 0.23.0

package/dist/index.js

@@ -116,6 +116,48 @@ var config = loadConfig();
 var BROWSER_API_URL = config.apiUrl;
 var AUTH = config.auth;
 
+// src/session.ts
+import { readFileSync as readFileSync2, writeFileSync, unlinkSync, existsSync as existsSync2, mkdirSync } from "fs";
+import { join as join2 } from "path";
+import { homedir as homedir2 } from "os";
+var OPTIMA_DIR = join2(homedir2(), ".optima");
+function conversationId() {
+  const raw = process.env.SESSION_ID;
+  return raw ? raw.replace(/[^A-Za-z0-9_-]/g, "_") : null;
+}
+function sessionFile() {
+  const conv = conversationId();
+  return join2(OPTIMA_DIR, conv ? `browser-session-id.${conv}` : "browser-session-id");
+}
+var _sessionOverride = null;
+function setSessionOverride(id) {
+  _sessionOverride = id;
+}
+function saveSessionId(id) {
+  mkdirSync(OPTIMA_DIR, { recursive: true });
+  writeFileSync(sessionFile(), id, "utf-8");
+}
+function loadSessionId() {
+  if (_sessionOverride) {
+    return _sessionOverride;
+  }
+  const file = sessionFile();
+  if (!existsSync2(file)) {
+    throw new Error(
+      "No active browser session. Run 'browser-cli launch' first. (If the backend says you already have one, close it by id: browser-cli --session <id> close)"
+    );
+  }
+  return readFileSync2(file, "utf-8").trim();
+}
+function clearSessionId(onlyIfEquals) {
+  const file = sessionFile();
+  if (!existsSync2(file)) return;
+  if (onlyIfEquals !== void 0 && readFileSync2(file, "utf-8").trim() !== onlyIfEquals) {
+    return;
+  }
+  unlinkSync(file);
+}
+
 // src/api.ts
 var BrowserAPIError = class extends Error {
   constructor(statusCode, errorCode, message) {
@@ -153,6 +195,10 @@ function withAuthContext(err) {
   err.message += `\uFF08\u51ED\u8BC1\u6765\u6E90 ${AUTH.source}${exp}\uFF0Cfp=${fp}\uFF09`;
   return err;
 }
+function conversationHeader() {
+  const conv = conversationId();
+  return conv ? { "X-Optima-Conversation": conv } : {};
+}
 async function request(path, options = {}) {
   const url = `${BROWSER_API_URL}${path}`;
   const auth = authHeader();
@@ -163,6 +209,7 @@ async function request(path, options = {}) {
       headers: {
         "Content-Type": "application/json",
         ...auth,
+        ...conversationHeader(),
         ...options.headers
       }
     });
@@ -195,7 +242,7 @@ async function requestBinary(path) {
   let response;
   try {
     response = await fetch(url, {
-      headers: auth
+      headers: { ...auth, ...conversationHeader() }
     });
   } catch {
     throw new Error(
@@ -411,39 +458,6 @@ var BrowserAPI = class {
 };
 var api = new BrowserAPI();
 
-// src/session.ts
-import { readFileSync as readFileSync2, writeFileSync, unlinkSync, existsSync as existsSync2, mkdirSync } from "fs";
-import { join as join2 } from "path";
-import { homedir as homedir2 } from "os";
-var OPTIMA_DIR = join2(homedir2(), ".optima");
-var SESSION_FILE = join2(OPTIMA_DIR, "browser-session-id");
-var _sessionOverride = null;
-function setSessionOverride(id) {
-  _sessionOverride = id;
-}
-function saveSessionId(id) {
-  mkdirSync(OPTIMA_DIR, { recursive: true });
-  writeFileSync(SESSION_FILE, id, "utf-8");
-}
-function loadSessionId() {
-  if (_sessionOverride) {
-    return _sessionOverride;
-  }
-  if (!existsSync2(SESSION_FILE)) {
-    throw new Error(
-      "No active browser session. Run 'browser-cli launch' first. (If the backend says you already have one, close it by id: browser-cli --session <id> close)"
-    );
-  }
-  return readFileSync2(SESSION_FILE, "utf-8").trim();
-}
-function clearSessionId(onlyIfEquals) {
-  if (!existsSync2(SESSION_FILE)) return;
-  if (onlyIfEquals !== void 0 && readFileSync2(SESSION_FILE, "utf-8").trim() !== onlyIfEquals) {
-    return;
-  }
-  unlinkSync(SESSION_FILE);
-}
-
 // src/formatter.ts
 var URL_STALE_WARNING = "\u26A0 URL/title may be stale: the live page probe failed, values above are cached. Verify with a screenshot before concluding a navigation failed.";
 function formatPageState(state) {
@@ -789,10 +803,21 @@ var WAIT_DEFAULT_TIMEOUT_S = 90;
 var WAIT_MAX_TIMEOUT_S = 570;
 var EXIT_TASK_STOPPED = 2;
 var EXIT_STILL_RUNNING = 3;
-async function waitForScriptTask(taskId, timeoutMs, first) {
+var EXIT_WAITING_HUMAN = 4;
+function waitingHumanLine(task) {
+  const w = task.waiting_human;
+  if (!w) return null;
+  return `WAITING_HUMAN kind=${w.kind} since=${w.since} message=${JSON.stringify(w.message)}`;
+}
+function waitingHumanMessage(task) {
+  return `${waitingHumanLine(task)}
+The script is paused waiting for the store owner to act in their browser. Tell the owner now, then call as a separate command: browser-cli script-task ${task.id} --wait --through-human`;
+}
+async function waitForScriptTask(taskId, timeoutMs, first, throughHuman = false) {
   const deadline = Date.now() + timeoutMs;
   let task = first ?? await api.getScriptTask(taskId);
   while (task.status === "running") {
+    if (task.waiting_human && !throughHuman) return { task, timedOut: false, waitingHuman: true };
     const left = deadline - Date.now();
     if (left <= 0) return { task, timedOut: true };
     await sleep(Math.min(POLL_INTERVAL_MS, left));
@@ -811,7 +836,9 @@ function stillRunningMessage(task, waitedS, nowMs = Date.now()) {
   const started = task.created_at ? Date.parse(task.created_at) : Number.NaN;
   const elapsed = Number.isFinite(started) ? `running for ${Math.max(0, Math.round((nowMs - started) / 1e3))}s` : `waited ${waitedS}s`;
   const step = task.total_steps ? `, step ${task.current_step}/${task.total_steps}` : "";
-  return `Still running (${elapsed}${step}). Call again as a separate command: browser-cli script-task ${task.id} --wait`;
+  const waiting = waitingHumanLine(task);
+  return `Still running (${elapsed}${step}). Call again as a separate command: browser-cli script-task ${task.id} --wait` + (waiting ? ` --through-human
+${waiting}` : "");
 }
 var REQUIRED_ARG_FLAG = {
   ziniao_profile_id: "--ziniao-profile <id>",
@@ -974,6 +1001,8 @@ function formatScriptTask(task) {
     }
     lines.push(...haltOutputFields(task));
   } else {
+    const waiting = waitingHumanLine(task);
+    if (waiting) lines.push(waiting);
     lines.push(`Script status: ${task.status} (step ${task.current_step}/${task.total_steps})`);
   }
   return lines.join("\n");
@@ -1049,7 +1078,12 @@ function registerScriptCommands(program2) {
         console.log(`Wait with: browser-cli script-task ${task.id} --wait`);
         return;
       }
-      const { task: result, timedOut } = await waitForScriptTask(task.id, POLL_TIMEOUT_MS, task);
+      const { task: result, timedOut, waitingHuman } = await waitForScriptTask(task.id, POLL_TIMEOUT_MS, task);
+      if (waitingHuman) {
+        console.log(waitingHumanMessage(result));
+        process.exit(EXIT_WAITING_HUMAN);
+        return;
+      }
       if (timedOut) {
         console.log(`Polling timed out. Task ${task.id} still running.`);
         console.log(`Wait with: browser-cli script-task ${task.id} --wait`);
@@ -1084,18 +1118,25 @@ ${downloadHint(result)}`);
   });
   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").option(
     "--wait",
-    `Block until the task finishes (completed / failed / needs_fallback), at most --timeout seconds. Exit code: 0 completed, 2 failed / needs_fallback, 3 still running (call again), 1 error`
-  ).option("--timeout <seconds>", `With --wait: max seconds to wait (default ${WAIT_DEFAULT_TIMEOUT_S}, max ${WAIT_MAX_TIMEOUT_S})`).action(async (taskId, opts) => {
+    `Block until the task finishes (completed / failed / needs_fallback), at most --timeout seconds. Exit code: 0 completed, 2 failed / needs_fallback, 3 still running (call again), 4 waiting for the store owner (e.g. captcha; tell them, then --wait --through-human), 1 error`
+  ).option("--through-human", "With --wait: keep waiting while the script waits for the store owner (exit 4 otherwise)").option("--timeout <seconds>", `With --wait: max seconds to wait (default ${WAIT_DEFAULT_TIMEOUT_S}, max ${WAIT_MAX_TIMEOUT_S})`).action(async (taskId, opts) => {
     try {
       if (opts.json && opts.download !== void 0) {
         throw new Error("--json \u4E0E --download \u53EA\u80FD\u7ED9\u4E00\u4E2A");
       }
       if (opts.timeout !== void 0 && !opts.wait) throw new Error("--timeout \u53EA\u80FD\u548C --wait \u4E00\u8D77\u7528");
+      if (opts.throughHuman && !opts.wait) throw new Error("--through-human \u53EA\u80FD\u548C --wait \u4E00\u8D77\u7528");
       const timeoutS = opts.timeout === void 0 ? WAIT_DEFAULT_TIMEOUT_S : parseWaitTimeout(opts.timeout);
       let task;
       if (opts.wait) {
-        const waited = await waitForScriptTask(taskId, timeoutS * 1e3);
+        const waited = await waitForScriptTask(taskId, timeoutS * 1e3, void 0, opts.throughHuman);
         task = waited.task;
+        if (waited.waitingHuman) {
+          if (opts.json) console.log(JSON.stringify(task, null, 2));
+          (opts.json ? console.error : console.log)(waitingHumanMessage(task));
+          process.exit(EXIT_WAITING_HUMAN);
+          return;
+        }
         if (waited.timedOut) {
           if (opts.json) console.log(JSON.stringify(task, null, 2));
           (opts.json ? console.error : console.log)(stillRunningMessage(task, timeoutS));

package/package.json

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