@optima-chat/browser-cli 0.16.0 → 0.18.0

package/dist/index.js

@@ -291,33 +291,6 @@ var BrowserAPI = class {
   async getScreenshot(sessionId) {
     return requestBinary(`/api/sessions/${sessionId}/screenshot`);
   }
-  async runRecipeScript(name, params, pollMs = 2e3, timeoutMs = 36e4, timeoutHint) {
-    const started = await request(`/api/scripts/${name}/run`, {
-      method: "POST",
-      body: JSON.stringify({ params })
-    });
-    const deadline = Date.now() + timeoutMs;
-    for (; ; ) {
-      const task = await request(`/api/script-tasks/${started.id}`);
-      if (task.status === "completed") {
-        if (!task.output) {
-          throw new Error(
-            `recipe ${name} reported completed but returned no output (task ${started.id})`
-          );
-        }
-        return task.output;
-      }
-      if (task.status === "failed" || task.status === "needs_fallback") {
-        throw new Error(task.error || task.output?.error || `recipe ${task.status}`);
-      }
-      if (Date.now() >= deadline) {
-        throw new Error(
-          `recipe ${name} did not finish within ${Math.round(timeoutMs / 1e3)}s (task ${started.id})` + (timeoutHint ? ` \u2014\u2014 ${timeoutHint}` : "")
-        );
-      }
-      await new Promise((r) => setTimeout(r, pollMs));
-    }
-  }
   async fetchArtifact(artifactPath) {
     return requestBinary(artifactPath);
   }
@@ -850,6 +823,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") {
@@ -887,12 +888,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})`);
   }
@@ -1007,10 +1023,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));
@@ -1033,7 +1056,7 @@ Each artifact can be fetched once; if runscript printed "Saved ->", the file is
   });
 }
 function sleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 
 // src/ziniao-doctor.ts
@@ -1045,16 +1068,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) {
@@ -1247,114 +1274,6 @@ function registerChromeCommands(program2) {
   });
 }
 
-// src/commands/recipes.ts
-import { writeFileSync as writeFileSync4 } from "fs";
-import { resolve as resolve2 } from "path";
-var PUBLISH_TIMEOUT_MS = 18e5;
-var AD_REPORT_TIMEOUT_MS = 132e4;
-var PUBLISH_TIMEOUT_HINT = "\u4EFB\u52A1\u4ECD\u5728\u540E\u7AEF\u8FD0\u884C,\u89C6\u9891\u53EF\u80FD\u5DF2\u7ECF\u53D1\u51FA\u53BB\u4E86\u3002\u53D1\u5E03\u72B6\u6001\u672A\u77E5 \u2014\u2014 \u8BF7\u5230\u5356\u5BB6\u540E\u53F0\u786E\u8BA4,\u4E0D\u8981\u91CD\u8DD1\u672C\u547D\u4EE4(\u4F1A\u53D1\u51FA\u91CD\u590D\u89C6\u9891)\u3002";
-async function runExport(script, params, out, timeoutMs) {
-  const outPath = resolve2(out);
-  const result = await api.runRecipeScript(script, { ...params, out_path: outPath }, 2e3, timeoutMs);
-  if (!result.path) {
-    if (!result.artifact_path) {
-      throw new Error(
-        `Script ${script} finished but delivered no file \u2014 no workspace path and no staged artifact. Nothing was written to ${outPath}.`
-      );
-    }
-    writeFileSync4(outPath, await api.fetchArtifact(result.artifact_path));
-  }
-  console.log(`Saved ${result.filename} -> ${outPath} (${result.size} bytes)`);
-}
-function registerRecipeCommands(program2) {
-  program2.command("export-ad-report").description("Export TikTok Shop ad data (per-creative by default) into the session workspace").requiredOption("--ziniao-profile <id>", "ZiNiao browser profile ID").option("--report-url <url>", "Ad dashboard URL (default: TikTok Shop MY local site)").option("--days <n>", "Date range: 7 / 30 / 90 / 180 / 365 (default: 7)").option(
-    "--scope <scope>",
-    "creative = per-creative rows (default) | daily = account-level daily totals"
-  ).option("--out <path>", "Output CSV path", "./tt_ad_report.csv").action(
-    async (opts) => {
-      try {
-        const params = { ziniao_profile_id: opts.ziniaoProfile };
-        if (opts.reportUrl) params.report_url = opts.reportUrl;
-        if (opts.days) params.days = opts.days;
-        if (opts.scope) params.scope = opts.scope;
-        await runExport("tiktok_video_ad_export", params, opts.out, AD_REPORT_TIMEOUT_MS);
-      } catch (err) {
-        console.error(formatError(err));
-        process.exit(1);
-      }
-    }
-  );
-  program2.command("export-order-report").description("Export TikTok Shop order data into the session workspace").requiredOption("--ziniao-profile <id>", "ZiNiao browser profile ID").option("--report-url <url>", "Order list URL (default: TikTok Shop MY local site)").option("--days <n>", "Export the last N days (default: 7, max 365)").option("--out <path>", "Output CSV path", "./tt_orders.csv").action(async (opts) => {
-    try {
-      const params = { ziniao_profile_id: opts.ziniaoProfile };
-      if (opts.reportUrl) params.report_url = opts.reportUrl;
-      if (opts.days) params.days = opts.days;
-      await runExport("tiktok_order_export", params, opts.out, 54e4);
-    } catch (err) {
-      console.error(formatError(err));
-      process.exit(1);
-    }
-  });
-  program2.command("publish-video-global").description("Publish one shoppable video to a TikTok Shop CROSS-BORDER store (one region per run)").requiredOption("--ziniao-profile <id>", "ZiNiao browser profile ID").requiredOption("--video <name>", "Video file name (from list-videos)").requiredOption("--account <username>", "Publishing account username; it also picks the region (one region per run)").requiredOption("--product-query <keyword>", "Product search keyword or product ID, narrow enough to hit exactly one product (ask the user)").requiredOption(
-    "--product-name <text>",
-    "Display name on the video: max 30 chars, letters/digits/spaces only (ask the user)"
-  ).requiredOption("--caption <text>", "Video caption").option("--dry-run", "Fill everything, run the pre-publish checks, then STOP before clicking publish (nothing is published; the browser window stays open for you to inspect)").option("--hashtags <text>", "Comma-separated hashtags, bare words (the page adds the # itself)").option("--publish-url <url>", "Video publish page URL (include the right ?shop_region=)").action(async (opts) => {
-    try {
-      const params = {
-        ziniao_profile_id: opts.ziniaoProfile,
-        video: opts.video,
-        account: opts.account,
-        product_query: opts.productQuery,
-        product_name: opts.productName,
-        caption: opts.caption
-      };
-      if (opts.dryRun) params.dry_run = "1";
-      if (opts.hashtags) params.hashtags = opts.hashtags;
-      if (opts.publishUrl) params.publish_url = opts.publishUrl;
-      const result = await api.runRecipeScript(
-        "tiktok_video_publish_global",
-        params,
-        2e3,
-        PUBLISH_TIMEOUT_MS,
-        PUBLISH_TIMEOUT_HINT
-      );
-      console.log(result.detail);
-    } catch (err) {
-      console.error(formatError(err));
-      process.exit(1);
-    }
-  });
-  program2.command("publish-video").description("Publish one shoppable video to TikTok Shop").requiredOption("--ziniao-profile <id>", "ZiNiao browser profile ID").requiredOption("--video <name>", "Video file name (from list-videos)").requiredOption("--product-query <keyword>", "Product search keyword, narrow enough to hit exactly one product (ask the user)").requiredOption(
-    "--product-name <text>",
-    "Display name on the video: max 30 chars, letters/digits/spaces only (ask the user)"
-  ).requiredOption("--caption <text>", "Video caption").option("--account <username>", "Publishing account username (default: the shop's official account; pass a marketing sub-account to post as it)").option("--dry-run", "Fill everything, run the pre-publish checks, then STOP before clicking publish (nothing is published; the browser window stays open for you to inspect)").option("--hashtags <text>", "Comma-separated hashtags, bare words (the page adds the # itself)").option("--publish-url <url>", "Video publish page URL").action(async (opts) => {
-    try {
-      const params = {
-        ziniao_profile_id: opts.ziniaoProfile,
-        video: opts.video,
-        product_query: opts.productQuery,
-        product_name: opts.productName,
-        caption: opts.caption
-      };
-      if (opts.account) params.account = opts.account;
-      if (opts.dryRun) params.dry_run = "1";
-      if (opts.hashtags) params.hashtags = opts.hashtags;
-      if (opts.publishUrl) params.publish_url = opts.publishUrl;
-      const result = await api.runRecipeScript(
-        "tiktok_video_publish",
-        params,
-        2e3,
-        PUBLISH_TIMEOUT_MS,
-        PUBLISH_TIMEOUT_HINT
-      );
-      console.log(result.detail);
-    } catch (err) {
-      console.error(formatError(err));
-      process.exit(1);
-    }
-  });
-}
-
 // src/commands/bitbrowser.ts
 function registerBitBrowserCommands(program2) {
   const bitbrowser = program2.command("bitbrowser").description("Manage BitBrowser (\u6BD4\u7279\u6D4F\u89C8\u5668) anti-detect browser");
@@ -1400,7 +1319,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;
       }
@@ -1471,7 +1390,6 @@ registerTabCommands(program);
 registerScriptCommands(program);
 registerZiNiaoCommands(program);
 registerChromeCommands(program);
-registerRecipeCommands(program);
 registerBitBrowserCommands(program);
 registerFeikuaCommands(program);
 registerFileCommands(program);

package/package.json

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