siluzan-tso-cli 1.1.33-beta.1 → 1.1.33-beta.2

package/README.md

@@ -51,7 +51,7 @@ siluzan-tso init -d /path/to/skills  # 写入自定义目录
 siluzan-tso init --force             # 强制覆盖已存在文件
 ```
 
-> **注意**：当前为测试版（1.1.33-beta.1），供内部测试使用。正式发布后安装命令将改为 `npm install -g siluzan-tso-cli`。
+> **注意**：当前为测试版（1.1.33-beta.2），供内部测试使用。正式发布后安装命令将改为 `npm install -g siluzan-tso-cli`。
 
 | 助手                    | 建议 `--ai`                          |
 | ----------------------- | ------------------------------------ |

package/dist/index.js

@@ -4329,6 +4329,44 @@ function groupAccountIdsByOverviewRoute(cliMedia, accountIds, accountMediaTypes)
   }
   return groups;
 }
+function routeToBalanceMedia(route) {
+  if (route === "FacebookAds") return "MetaAd";
+  if (BALANCE_SUPPORTED_MEDIA.includes(route)) {
+    return route;
+  }
+  return null;
+}
+function applyRealtimeBalanceIfNeeded(item, bal) {
+  if (bal == null || typeof bal.remainingAccountBudget !== "number") return;
+  if (bal.remainingAccountBudget > 0) {
+    item.remainingAccountBudget = bal.remainingAccountBudget;
+  }
+  if (bal.currencyCode) item.currencyCode = bal.currencyCode;
+  if (bal.status) item.status = bal.status;
+}
+async function overlayRealtimeBalanceOnOverviewMap(route, overviewMap, config, verbose) {
+  const media = routeToBalanceMedia(route);
+  if (!media || overviewMap.size === 0) return;
+  const ids = [...overviewMap.keys()];
+  const balanceMap = await fetchBalanceMap(media, ids, config, void 0, void 0, verbose);
+  for (const [id, item] of overviewMap) {
+    applyRealtimeBalanceIfNeeded(item, balanceMap.get(id));
+  }
+}
+async function enrichOverviewRecordWithRealtimeBalance(media, accountId, config, record, verbose) {
+  if (!BALANCE_SUPPORTED_MEDIA.includes(media)) {
+    return record;
+  }
+  const balanceMap = await fetchBalanceMap(media, [accountId], config, void 0, void 0, verbose);
+  const bal = balanceMap.get(accountId);
+  if (bal == null) return record;
+  const out = { ...record };
+  applyRealtimeBalanceIfNeeded(out, bal);
+  if (bal.name && out["accountName"] == null && out["mediaCustomerName"] == null) {
+    out["mediaCustomerName"] = bal.name;
+  }
+  return out;
+}
 async function fetchBalanceMap(media, accountIds, config, startDate, endDate, verbose) {
   const result = /* @__PURE__ */ new Map();
   if (accountIds.length === 0) return result;
@@ -4462,70 +4500,73 @@ async function fetchOverviewMap(route, accountIds, config, startDate, endDate, v
       for (const row of rows) {
         result.set(row.mediaAccountId, row);
       }
-      return result;
-    }
-    const fetchLegacyBatch = async (ids) => {
-      const batch = /* @__PURE__ */ new Map();
-      const params = new URLSearchParams({
-        period: "true",
-        startDate: start,
-        endDate: end,
-        mediaCustomerIds: ids.join(",")
-      });
-      const url = `${config.apiBaseUrl}/report/media-account/${route}/accountsoverview?${params}`;
-      const raw = await apiFetch2(url, config, {}, verbose);
-      const items = Array.isArray(raw) ? raw : [];
-      for (const item of items) {
-        if (item.mediaAccountId != null) {
-          batch.set(String(item.mediaAccountId), item);
+    } else {
+      const fetchLegacyBatch = async (ids) => {
+        const batch = /* @__PURE__ */ new Map();
+        const params = new URLSearchParams({
+          period: "true",
+          startDate: start,
+          endDate: end,
+          mediaCustomerIds: ids.join(",")
+        });
+        const url = `${config.apiBaseUrl}/report/media-account/${route}/accountsoverview?${params}`;
+        const raw = await apiFetch2(url, config, {}, verbose);
+        const items = Array.isArray(raw) ? raw : [];
+        for (const item of items) {
+          if (item.mediaAccountId != null) {
+            batch.set(String(item.mediaAccountId), item);
+          }
         }
-      }
-      return batch;
-    };
-    const mergeOverview = (batch) => {
-      for (const [k, v] of batch) result.set(k, v);
-    };
-    if (accountIds.length === 1) {
-      mergeOverview(await fetchLegacyBatch(accountIds));
-      return result;
-    }
-    try {
-      const batch = await fetchLegacyBatch(accountIds);
-      mergeOverview(batch);
-      if (batch.size === 0) {
-        for (const id of accountIds) {
-          try {
-            mergeOverview(await fetchLegacyBatch([id]));
-          } catch (singleErr) {
-            if (verbose) {
-              process.stderr.write(
-                `[fetchOverviewMap] \u9010\u6237\u91CD\u8BD5\u5931\u8D25 ${id}\uFF1A${singleErr instanceof Error ? singleErr.message : String(singleErr)}
+        return batch;
+      };
+      const mergeOverview = (batch) => {
+        for (const [k, v] of batch) result.set(k, v);
+      };
+      if (accountIds.length === 1) {
+        mergeOverview(await fetchLegacyBatch(accountIds));
+      } else {
+        try {
+          const batch = await fetchLegacyBatch(accountIds);
+          mergeOverview(batch);
+          if (batch.size === 0) {
+            for (const id of accountIds) {
+              try {
+                mergeOverview(await fetchLegacyBatch([id]));
+              } catch (singleErr) {
+                if (verbose) {
+                  process.stderr.write(
+                    `[fetchOverviewMap] \u9010\u6237\u91CD\u8BD5\u5931\u8D25 ${id}\uFF1A${singleErr instanceof Error ? singleErr.message : String(singleErr)}
 `
-              );
+                  );
+                }
+              }
             }
           }
-        }
-      }
-    } catch (err) {
-      if (verbose) {
-        process.stderr.write(
-          `[fetchOverviewMap] \u6279\u91CF\u5F02\u5E38\uFF0C\u9010\u6237\u91CD\u8BD5\uFF1A${err instanceof Error ? err.message : String(err)}
-`
-        );
-      }
-      for (const id of accountIds) {
-        try {
-          mergeOverview(await fetchLegacyBatch([id]));
-        } catch (singleErr) {
+        } catch (err) {
           if (verbose) {
             process.stderr.write(
-              `[fetchOverviewMap] \u9010\u6237\u91CD\u8BD5\u5931\u8D25 ${id}\uFF1A${singleErr instanceof Error ? singleErr.message : String(singleErr)}
+              `[fetchOverviewMap] \u6279\u91CF\u5F02\u5E38\uFF0C\u9010\u6237\u91CD\u8BD5\uFF1A${err instanceof Error ? err.message : String(err)}
 `
             );
           }
+          for (const id of accountIds) {
+            try {
+              mergeOverview(await fetchLegacyBatch([id]));
+            } catch (singleErr) {
+              if (verbose) {
+                process.stderr.write(
+                  `[fetchOverviewMap] \u9010\u6237\u91CD\u8BD5\u5931\u8D25 ${id}\uFF1A${singleErr instanceof Error ? singleErr.message : String(singleErr)}
+`
+                );
+              }
+            }
+          }
         }
       }
     }
+    if (result.size > 0) {
+      await overlayRealtimeBalanceOnOverviewMap(route, result, config, verbose);
+    }
   } catch (err) {
     if (verbose) {
       process.stderr.write(
@@ -106210,11 +106251,15 @@ async function runStats(opts) {
         }
       }
     } else {
-      const params = new URLSearchParams({ startDate, endDate, period: "true" });
-      params.set("mediaCustomerIds", ids.join(","));
-      const url = `${config.apiBaseUrl}/report/media-account/${opts.media}/accountsoverview?${params.toString()}`;
-      const raw = await apiFetch2(url, config, {}, opts.verbose);
-      items = Array.isArray(raw) ? raw : raw.items ?? [];
+      const map = await fetchOverviewMap(
+        opts.media,
+        ids,
+        config,
+        startDate,
+        endDate,
+        opts.verbose
+      );
+      items = [...map.values()];
     }
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -107748,6 +107793,7 @@ async function fetchBingJson(config, url, verbose) {
 
 // src/commands/report-bing-analysis/run.ts
 init_auth();
+init_balance();
 async function runReportBingOverview(opts) {
   const id = assertBingAccountId(opts.account);
   const { startDate, endDate } = resolveBingDateRange(opts.start, opts.end);
@@ -107755,7 +107801,14 @@ async function runReportBingOverview(opts) {
   const params = new URLSearchParams({ startDate, endDate });
   const url = reportingUrl2(config, id, "OverviewSectionData", params.toString());
   try {
-    const data = await fetchBingJson(config, url, !!opts.verbose);
+    const raw = await fetchBingJson(config, url, !!opts.verbose);
+    const data = raw && typeof raw === "object" && !Array.isArray(raw) ? await enrichOverviewRecordWithRealtimeBalance(
+      "BingV2",
+      id,
+      config,
+      raw,
+      opts.verbose
+    ) : raw;
     if (opts.jsonOut) {
       await emitBingSnapshot(opts, "bing-overview", id, startDate, endDate, data);
       return;
@@ -121000,6 +121053,27 @@ async function runAccountAuth(opts) {
     tryOpenBrowser: tryOpenHttpsUrlInBrowser
   });
 }
+async function runAccountReauth(opts) {
+  if (!opts.id && (!opts.ids || opts.ids.length === 0)) {
+    console.error(
+      "\n\u274C \u91CD\u65B0\u6388\u6743\u987B\u6307\u5B9A\u8981\u89E3\u7ED1\u7684\u8D26\u6237 entityId\uFF1A--id <entityId> \u6216 --ids id1,id2\n   entityId \u6765\u81EA list-accounts --json-out \u7684 ma.entityId\uFF08\u4E0D\u662F mediaCustomerId\uFF09\n"
+    );
+    process.exit(1);
+  }
+  console.log("\n\u6B65\u9AA4 1/2\uFF1A\u65AD\u5F00\u5173\u8054\uFF08\u91CD\u65B0\u6388\u6743\u524D\u5FC5\u987B\u5148\u89E3\u7ED1\uFF0C\u5BF9\u9F50\u7F51\u9875\u300C\u91CD\u65B0\u6388\u6743\u300D\uFF09\u2026\n");
+  await runAccountDelink({
+    token: opts.token,
+    id: opts.id,
+    ids: opts.ids,
+    verbose: opts.verbose
+  });
+  console.log("\u6B65\u9AA4 2/2\uFF1A\u53D1\u8D77 OAuth \u6388\u6743\u2026\n");
+  await runAccountAuth({
+    token: opts.token,
+    media: opts.media,
+    verbose: opts.verbose
+  });
+}
 
 // src/commands/account-manage/google-mcc.ts
 init_auth();
@@ -121959,12 +122033,30 @@ function register23(program2) {
       });
     }
   );
-  accountCmd.command("auth").description("\u6DFB\u52A0\u6388\u6743\uFF1A\u53D1\u8D77\u5A92\u4F53 OAuth\uFF0C\u6D4F\u89C8\u5668\u6253\u5F00\u6388\u6743\u9875\uFF08\u7F51\u9875 manageAccounts\u300C\u6DFB\u52A0\u6388\u6743\u300D\uFF09").requiredOption(
+  accountCmd.command("auth").description(
+    "\u6DFB\u52A0\u6388\u6743\uFF1A\u9996\u6B21\u7ED1\u5B9A\u5A92\u4F53\u8D26\u6237 OAuth\uFF08\u7F51\u9875 manageAccounts\u300C\u6DFB\u52A0\u6388\u6743\u300D\uFF09\uFF1BOAuth \u5931\u6548\u8BF7\u7528 reauth"
+  ).requiredOption(
     "-m, --media <type>",
     "\u5A92\u4F53\u7C7B\u578B\uFF1AGoogle | TikTok | Meta | Yandex | BingV2 | Kwai"
   ).option("-t, --token <token>", "Auth Token").option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(async (opts) => {
     await runAccountAuth({ token: opts.token, media: opts.media, verbose: opts.verbose });
   });
+  accountCmd.command("reauth").description(
+    "\u91CD\u65B0\u6388\u6743\uFF1A\u5148\u89E3\u7ED1\u518D OAuth\uFF08\u7F51\u9875 manageAccounts\u300C\u91CD\u65B0\u6388\u6743\u300D\uFF1BinvalidOAuthToken \u5931\u6548\u65F6\u5FC5\u8D70\u6B64\u547D\u4EE4\uFF09"
+  ).requiredOption(
+    "-m, --media <type>",
+    "\u5A92\u4F53\u7C7B\u578B\uFF1AGoogle | TikTok | Meta | Yandex | BingV2 | Kwai"
+  ).option("--id <entityId>", "\u5355\u4E2A\u8D26\u6237 entityId\uFF08\u6765\u81EA list-accounts \u7684 ma.entityId\uFF09").option("--ids <entityIds>", "\u6279\u91CF entityId\uFF0C\u9017\u53F7\u5206\u9694\uFF08\u4E0E --id \u4E8C\u9009\u4E00\uFF0C\u53EF\u540C\u65F6\u4F20\uFF09").option("-t, --token <token>", "Auth Token").option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
+    async (opts) => {
+      await runAccountReauth({
+        token: opts.token,
+        media: opts.media,
+        id: opts.id,
+        ids: opts.ids ? opts.ids.split(",").map((s) => s.trim()).filter(Boolean) : void 0,
+        verbose: opts.verbose
+      });
+    }
+  );
   accountCmd.command("mcc-bind").description("Google\uFF1A\u5C06\u5B50\u8D26\u6237\u7ED1\u5B9A\u5230\u7ECF\u7406\u8D26\u6237\uFF08MCC\uFF09\uFF0C\u9700\u5DF2\u914D\u7F6E googleApiUrl").requiredOption(
     "--customers <ids>",
     "\u5B50\u8D26\u6237 mediaCustomerId\uFF0C\u591A\u4E2A\u9017\u53F7\u5206\u9694\uFF08\u6765\u81EA list-accounts \u7684 ma.mediaCustomerId\uFF09"

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.33-beta.1",
-  "publishedAt": 1782810997774
+  "version": "1.1.33-beta.2",
+  "publishedAt": 1782876066592
 }

package/dist/skill/references/accounts/accounts.md

@@ -307,9 +307,11 @@ siluzan-tso account me --check-phone 15130150466 --json-out ./snap-me
 
 ---
 
-### auth — 添加媒体平台 OAuth 授权
+### auth — 添加媒体平台 OAuth 授权（首次绑定）
 
-在浏览器中打开对应媒体的 OAuth 授权页面，授权后账户自动绑定到丝路赞。
+在浏览器中打开对应媒体的 OAuth 授权页面，授权后账户自动绑定到丝路赞。对应网页 **「添加授权」**。
+
+> **OAuth 已失效**（`invalidOAuthToken=true`）时**不要**用本命令，须走下方 **`reauth`**（重新授权必须先解绑）。
 
 ```bash
 siluzan-tso account auth -m <媒体类型>
@@ -322,13 +324,13 @@ siluzan-tso account auth -m <媒体类型>
 **示例：**
 
 ```bash
-# 授权 Google Ads 账户
+# 首次授权 Google Ads 账户
 siluzan-tso account auth -m Google
 
-# 授权 TikTok Ads 账户
+# 首次授权 TikTok Ads 账户
 siluzan-tso account auth -m TikTok
 
-# 授权 Meta（Facebook）Ads 账户
+# 首次授权 Meta（Facebook）Ads 账户
 siluzan-tso account auth -m Meta
 ```
 
@@ -336,6 +338,38 @@ siluzan-tso account auth -m Meta
 
 ---
 
+### reauth — 重新授权（先解绑再 OAuth）
+
+OAuth 失效时恢复授权。对齐 TSO 网页 **「重新授权」**：程序会先 **delink** 断开关联，再跳转媒体 OAuth。**禁止**对失效账户跳过解绑直接用 `account auth`。
+
+```bash
+siluzan-tso account reauth -m <媒体类型> --id <entityId>
+siluzan-tso account reauth -m Google --ids <id1,id2>
+```
+
+| 选项                 | 说明                                                                     |
+| -------------------- | ------------------------------------------------------------------------ |
+| `-m, --media <type>` | 媒体类型（必填）                                                         |
+| `--id <entityId>`    | 单个账户 `entityId`（来自 `list-accounts` 的 `ma.entityId`）             |
+| `--ids <id1,id2>`    | 批量 `entityId`，逗号分隔（与 `--id` 二选一）                            |
+
+**示例：**
+
+```bash
+# 1. 查失效账户的 entityId
+siluzan-tso list-accounts -m Google --json-out ./snap
+
+# 2. 重新授权（内置 delink → OAuth）
+siluzan-tso account reauth -m Google --id abc123def456
+
+# 3. 验证
+siluzan-tso list-accounts -m Google
+```
+
+> 手动两步等价于 `reauth`：`account delink --id …` → `account auth -m …`（须用户确认解绑风险）。
+
+---
+
 ### delink — 解除授权 / 断开账户关联
 
 从当前丝路赞账号下移除媒体账户绑定。

package/dist/skill/references/core/agent-conventions.md

@@ -219,7 +219,7 @@
 ## 十一、常见 HTTP 状态码
 
 - **400**：参数错误，查看对应 reference 或 `-h`
-- **401**：平台方返回则需用户重新授权；**我方凭据失效**则优先 `send-login-code` + `login --phone --code`，见 `references/core/setup.md`
+- **401**：媒体 OAuth 失效 → `account reauth -m <媒体> --id <entityId>`（须先 delink，见 W9）；**丝路赞登录凭据失效** → `send-login-code` + `login --phone --code`，见 `references/core/setup.md`
 - **500**：服务可能正在部署/升级，建议反馈 Siluzan 相关人员
 
 ---

package/dist/skill/references/core/workflows.md

@@ -152,7 +152,8 @@
 - **步骤（按场景）**：
   - **分享**：`list-accounts --json-out` 取 `entityId` → `account share --id <entityId> --phone <手机号>`；查 `account share-detail --customer-id <mediaCustomerId>`；取消 `account unshare --id <entityId> --account-id <userId>`。
   - **解绑**：`account delink --id <entityId>` / `--ids id1,id2`。
-  - **OAuth 重授权**：`invalidOAuthToken=true` → `account auth -m <媒体>`（浏览器授权）→ `list-accounts` 验证。
+  - **OAuth 重授权**：`invalidOAuthToken=true` → `list-accounts --json-out` 取 `ma.entityId` → **`account reauth -m <媒体> --id <entityId>`**（内置先 delink 再 OAuth，对齐网页「重新授权」）→ `list-accounts` 验证。**禁止**对失效账户直接用 `account auth`（首次「添加授权」专用）。
+  - **首次 OAuth 添加授权**：`account auth -m <媒体>`（无需先 delink）。
   - **MCC**：`account mcc-bind --customers <mediaCustomerId,...> --mcc <MCC客户ID>` / `mcc-unbind`（走 `googleApiUrl`，先 `config show`）。
   - **BC（TikTok）**：`account bc-bind --customers <id> --bc-ids <id>` / `bc-unbind --bc-id <id>`（解绑一次一个）。
   - **BM（Meta）**：`account bm-bind --account-id <mediaCustomerId> --bm-id <bmId>`。

package/dist/skill/references/report-templates/bing-period-report.md

@@ -18,6 +18,7 @@
 ## 1. 执行摘要（总览）
 
 - **CLI**：`siluzan-tso report bing-overview -a <mediaCustomerId> [--start … --end …] --json-out <dir>`
+- **余额**：若 `OverviewSectionData` 误返 `remainingAccountBudget: 0`，CLI 会自动用 `GetMediaAccountInfo` 实时余额回填（与 Web 账户列表一致）；**仍建议**单查余额用 `balance -m BingV2`。
 
 ## 2. 设备与地域
 

package/dist/skill/report-templates/bing-period-report.md

@@ -18,6 +18,7 @@
 ## 1. 执行摘要（总览）
 
 - **CLI**：`siluzan-tso report bing-overview -a <mediaCustomerId> [--start … --end …] --json-out <dir>`
+- **余额**：若 `OverviewSectionData` 误返 `remainingAccountBudget: 0`，CLI 会自动用 `GetMediaAccountInfo` 实时余额回填（与 Web 账户列表一致）；**仍建议**单查余额用 `balance -m BingV2`。
 
 ## 2. 设备与地域
 

package/dist/skill/scripts/install.ps1

@@ -9,7 +9,7 @@ $ErrorActionPreference = 'Stop'
 # -- Package info (injected at build time) ------------------------------------
 $PKG_NAME    = 'siluzan-tso-cli'
 # PKG_VERSION 锁定到与本脚本同批构建产物一致的版本，避免与 dist/skill 错位
-$PKG_VERSION = '1.1.33-beta.1'
+$PKG_VERSION = '1.1.33-beta.2'
 $CLI_BIN     = 'siluzan-tso'
 $SKILL_LABEL = 'Siluzan TSO'
 $INSTALL_CMD = 'npm install -g siluzan-tso-cli@beta'

package/dist/skill/scripts/install.sh

@@ -9,7 +9,7 @@ set -euo pipefail
 # -- Package info (injected at build time) ------------------------------------
 readonly PKG_NAME="siluzan-tso-cli"
 # PKG_VERSION 锁定到与本脚本同批构建产物一致的版本，避免与 dist/skill 错位
-readonly PKG_VERSION="1.1.33-beta.1"
+readonly PKG_VERSION="1.1.33-beta.2"
 readonly CLI_BIN="siluzan-tso"
 readonly SKILL_LABEL="Siluzan TSO"
 readonly INSTALL_CMD="npm install -g siluzan-tso-cli@beta"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "siluzan-tso-cli",
-  "version": "1.1.33-beta.1",
+  "version": "1.1.33-beta.2",
   "description": "Siluzan 广告账户管理 CLI — 查询账户、余额、消耗数据，管理绑定关系与充值。",
   "keywords": [
     "ad-account",