@optima-chat/browser-cli 0.22.0 → 0.24.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) {
@@ -819,8 +833,18 @@ function parseWaitTimeout(raw) {
   return n;
 }
 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 secondsSince = (iso) => {
+    const t = iso ? Date.parse(iso) : Number.NaN;
+    return Number.isFinite(t) ? Math.max(0, Math.round((nowMs - t) / 1e3)) : null;
+  };
+  const created = secondsSince(task.created_at);
+  let elapsed;
+  if (task.queue?.queued) {
+    elapsed = `queued, ${task.queue.ahead} task(s) of this user ahead` + (created !== null ? `, created ${created}s ago` : "");
+  } else {
+    const ran = secondsSince(task.queue?.started_at) ?? created;
+    elapsed = ran !== null ? `running for ${ran}s` : `waited ${waitedS}s`;
+  }
   const step = task.total_steps ? `, step ${task.current_step}/${task.total_steps}` : "";
   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

package/package.json

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