@optima-chat/browser-cli 0.20.0 → 0.22.0

package/dist/index.js

@@ -789,10 +789,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 +822,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 +987,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 +1064,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 +1104,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));
@@ -1422,8 +1449,8 @@ function registerFeikuaCommands(program2) {
 function formatVideoList(videos) {
   if (videos.length === 0) {
     return `No videos found. Videos are listed from your OptimaConnect folder:
-  macOS/Linux: ~/Downloads/OptimaConnect/<\u5E73\u53F0>/<\u8D27\u54C1>/\u89C6\u9891/  (older files: ~/Downloads/OptimaConnect/videos)
-  Windows: C:\\Users\\<\u7528\u6237\u540D>\\Downloads\\OptimaConnect\\<\u5E73\u53F0>\\<\u8D27\u54C1>\\\u89C6\u9891\\  (older files: ...\\OptimaConnect\\videos)
+  macOS/Linux: ~/Downloads/OptimaConnect/<\u5E73\u53F0>/<\u8D27\u54C1>/videos/  (older files: ~/Downloads/OptimaConnect/videos)
+  Windows: C:\\Users\\<\u7528\u6237\u540D>\\Downloads\\OptimaConnect\\<\u5E73\u53F0>\\<\u8D27\u54C1>\\videos\\  (older files: ...\\OptimaConnect\\videos)
 Then try again.`;
   }
   return videos.map((v) => {
@@ -1433,12 +1460,26 @@ Then try again.`;
   }).join("\n");
 }
 function mediaRefLine(result) {
-  return result.media_ref ? `media_ref: ${result.media_ref}  (\u4E0A\u4F20\u53C2\u6570\u586B\u8FD9\u4E2A)` : null;
+  if (!result.media_ref) return null;
+  return `\u4E0A\u4F20\u53C2\u6570\u586B\u4E0B\u4E00\u884C\u5F15\u53F7\u91CC\u7684\u5B8C\u6574\u503C(\u53EF\u80FD\u542B\u7A7A\u683C,\u522B\u81EA\u5DF1\u62FC\u6216\u8865\u6269\u5C55\u540D):
+media_ref=${JSON.stringify(result.media_ref)}`;
+}
+function collisionWarning(dest, localPath) {
+  const wanted = dest.split(/[\\/]/).pop();
+  const landed = localPath.split(/[\\/]/).pop();
+  if (wanted === landed) return null;
+  return `\u6CE8\u610F:\u672C\u673A\u5DF2\u6709\u540C\u540D\u6587\u4EF6 ${wanted}(\u65E7\u6587\u4EF6,\u4E0D\u662F\u8FD9\u6B21\u9001\u7684),\u8FD9\u6B21\u843D\u4E3A ${landed}\u3002\u5F15\u7528\u8FD9\u6B21\u7684\u6587\u4EF6\u522B\u7528 ${wanted}\u3002`;
 }
 function registerFileCommands(program2) {
-  program2.command("send-file").description("Send a file from your workspace to your local download folder").requiredOption("--src <path>", "Source path in your workspace (e.g. ~/output/report.pdf)").requiredOption("--dest <path>", "Destination path relative to the download folder").action(async (opts) => {
+  program2.command("send-file").description("Send a file from your workspace to your local download folder").requiredOption("--src <path>", "Source path in your workspace (e.g. ~/output/report.pdf)").requiredOption("--dest <path>", "Destination path relative to the download folder").option("--json", "Print {local_path, media_ref} as JSON \u2014 read media_ref from here instead of parsing text").action(async (opts) => {
     try {
       const result = await api.sendFile(opts.src, opts.dest);
+      const warning = collisionWarning(opts.dest, result.local_path);
+      if (warning) console.error(warning);
+      if (opts.json) {
+        console.log(JSON.stringify(result));
+        return;
+      }
       console.log(result.local_path);
       const hint = mediaRefLine(result);
       if (hint) console.error(hint);

package/package.json

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