@optima-chat/browser-cli 0.13.0 → 0.14.0

package/dist/index.js

@@ -219,8 +219,20 @@ var BrowserAPI = class {
   async getFeikuaProfiles() {
     return request("/api/user/feikua-profiles");
   }
+  /** true = 后端确实关了它;false = 它本来就没了(idle reaper 已经收走)。
+   *
+   *  「已经没了」不是错误。抛出去的话调用方连本地记录都不敢清,下一次 close 再撞
+   *  同一堵墙 —— 而 close 是 SKILL.md 写给 agent 的标准恢复动作,必须幂等(#225)。 */
   async closeSession(sessionId) {
-    await request(`/api/sessions/${sessionId}`, { method: "DELETE" });
+    try {
+      await request(`/api/sessions/${sessionId}`, { method: "DELETE" });
+      return true;
+    } catch (err) {
+      if (err instanceof BrowserAPIError && err.errorCode === "session_not_found") {
+        return false;
+      }
+      throw err;
+    }
   }
   async getStatus(sessionId) {
     return request(`/api/sessions/${sessionId}/status`);
@@ -404,15 +416,17 @@ function loadSessionId() {
   }
   if (!existsSync2(SESSION_FILE)) {
     throw new Error(
-      "No active browser session. Run 'browser-cli launch' first."
+      "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() {
-  if (existsSync2(SESSION_FILE)) {
-    unlinkSync(SESSION_FILE);
+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
@@ -435,12 +449,19 @@ function formatLaunch(state) {
 function formatClose(sessionId) {
   return `\u2713 Browser closed (session: ${sessionId})`;
 }
+function formatAlreadyClosed(sessionId) {
+  return `\u2713 Session ${sessionId} was already closed (local record cleared)`;
+}
 function formatStatus(status) {
   const lines = [];
   lines.push(`Session: ${status.session_id}`);
   lines.push(`Status: ${status.status}`);
   lines.push(`Created: ${status.created_at}`);
   lines.push(`Idle: ${status.idle_seconds}s`);
+  if (status.execution) {
+    const where = status.execution === "sidecar" ? "user's machine" : "server-driven";
+    lines.push(`Execution: ${status.execution} (${where})`);
+  }
   return lines.join("\n");
 }
 function formatScreenshot(filePath) {
@@ -507,9 +528,9 @@ function registerLifecycleCommands(program2) {
   program2.command("close").description("Close the active browser session").action(async () => {
     try {
       const sessionId = loadSessionId();
-      await api.closeSession(sessionId);
-      clearSessionId();
-      console.log(formatClose(sessionId));
+      const closed = await api.closeSession(sessionId);
+      clearSessionId(sessionId);
+      console.log(closed ? formatClose(sessionId) : formatAlreadyClosed(sessionId));
     } catch (err) {
       console.error(formatError(err));
       process.exit(1);
@@ -870,7 +891,6 @@ function registerScriptCommands(program2) {
         }
       }
       if (opts.out) params.out_path = resolve(opts.out);
-      clearSessionId();
       const task = await api.runScript(name, params, opts.connector, opts.ziniaoProfile, opts.bitbrowserProfile, opts.feikuaProfile);
       console.log(`Script started (task: ${task.id})`);
       if (!opts.poll) {
@@ -1100,6 +1120,7 @@ function registerZiNiaoCommands(program2) {
 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);
@@ -1115,16 +1136,23 @@ async function runExport(script, params, out, timeoutMs) {
   console.log(`Saved ${result.filename} -> ${outPath} (${result.size} bytes)`);
 }
 function registerRecipeCommands(program2) {
-  program2.command("export-ad-report").description("Export TikTok Shop last-7-days video ad data 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("--out <path>", "Output CSV path", "./tt_video_ad_7d.csv").action(async (opts) => {
-    try {
-      const params = { ziniao_profile_id: opts.ziniaoProfile };
-      if (opts.reportUrl) params.report_url = opts.reportUrl;
-      await runExport("tiktok_video_ad_export", params, opts.out, 36e4);
-    } catch (err) {
-      console.error(formatError(err));
-      process.exit(1);
+  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 };

package/package.json

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