siluzan-tso-cli 1.1.28-beta.2 → 1.1.28-beta.3

package/README.md

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

package/dist/index.js

@@ -106072,6 +106072,55 @@ async function writeReportAnalysisSnapshot(params) {
 
 // src/commands/report/main.ts
 init_version();
+
+// src/commands/facebook-analysis/fetch.ts
+init_auth();
+function normalizeFacebookAccountId(raw) {
+  const t = raw.trim();
+  if (!t) {
+    console.error("\n\u274C --account \u4E0D\u80FD\u4E3A\u7A7A\u3002\n");
+    process.exit(1);
+  }
+  const digits = t.startsWith("act_") ? t.slice(4) : t;
+  if (!/^\d+$/.test(digits)) {
+    console.error(
+      "\n\u274C --account \u987B\u4E3A Facebook \u5E7F\u544A\u8D26\u6237 ID\uFF08\u6570\u5B57 mediaCustomerId\uFF0C\u6216 act_<\u6570\u5B57>\uFF0C\u4E0E list-accounts -m MetaAd \u4E00\u81F4\uFF09\u3002\n"
+    );
+    process.exit(1);
+  }
+  return { apiId: `act_${digits}`, manifestId: digits };
+}
+function resolveFacebookDateRange(start, end) {
+  if (start && end) return { startDate: start, endDate: end };
+  if (!start && !end) {
+    const endD = /* @__PURE__ */ new Date();
+    endD.setDate(endD.getDate() - 1);
+    const startD = new Date(endD);
+    startD.setDate(startD.getDate() - 6);
+    const fmt2 = (d) => d.toISOString().slice(0, 10);
+    return { startDate: fmt2(startD), endDate: fmt2(endD) };
+  }
+  console.error("\n\u274C --start \u4E0E --end \u987B\u540C\u65F6\u4F20\u5165\uFF0C\u6216\u540C\u65F6\u7701\u7565\u4EE5\u4F7F\u7528\u9ED8\u8BA4\u8FD1 7 \u5929\uFF08\u622A\u81F3\u6628\u5929\uFF09\u3002\n");
+  process.exit(1);
+}
+function facebookReportingUrl(config, apiId, segment, query) {
+  const q = query ? query.startsWith("?") ? query : `?${query}` : "";
+  return `${config.apiBaseUrl}/reporting/media-account/FacebookAds/${encodeURIComponent(apiId)}/${segment}${q}`;
+}
+async function fetchFacebookSectionPayload(def, opts, config, apiId) {
+  const { startDate, endDate } = resolveFacebookDateRange(opts.start, opts.end);
+  const params = new URLSearchParams({ startDate, endDate });
+  if (def.countryLimitOption && opts.limit !== void 0 && Number.isFinite(opts.limit)) {
+    params.set("limit", String(Math.max(1, Math.floor(opts.limit))));
+  }
+  const url = facebookReportingUrl(config, apiId, def.segment, params.toString());
+  return apiFetch2(url, config, {}, opts.verbose ?? false);
+}
+function endpointHintForFacebookSection(def, apiId) {
+  return `GET \u2026/FacebookAds/${apiId}/${def.segment}`;
+}
+
+// src/commands/report/main.ts
 async function runReportList(opts) {
   if (!VALID_MEDIA_TYPES5.includes(opts.media)) {
     console.error(`
@@ -106173,30 +106222,61 @@ function fmtNum2(n, digits = 2) {
   parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
   return parts.join(".");
 }
+function metaOverviewManifestId(raw) {
+  const t = raw.trim();
+  if (t.startsWith("act_")) return t.slice(4);
+  return t;
+}
+function buildMetaOverviewUrl(config, accountId, mediaAccountType, startDate, endDate) {
+  const { apiId, manifestId } = normalizeFacebookAccountId(accountId);
+  const params = new URLSearchParams({ startDate, endDate }).toString();
+  if (mediaAccountType === "FacebookAds") {
+    return facebookReportingUrl(config, apiId, "OverviewSectionData", params);
+  }
+  return `${config.apiBaseUrl}/reporting/media-account/MetaAd/${manifestId}/OverviewSectionData?${params}`;
+}
 async function runReportMetaOverview(opts) {
-  const id = opts.account.trim();
-  if (!/^\d+$/.test(id)) {
-    console.error("\n\u274C --account \u987B\u4E3A\u6570\u5B57 mediaCustomerId\uFF08\u4E0E list-accounts \u4E00\u81F4\uFF09\u3002\n");
+  const rawAccount = opts.account.trim();
+  let manifestId;
+  try {
+    manifestId = normalizeFacebookAccountId(rawAccount).manifestId;
+  } catch {
+    console.error(
+      "\n\u274C --account \u987B\u4E3A\u6570\u5B57 mediaCustomerId \u6216 act_<\u6570\u5B57>\uFF08\u4E0E list-accounts -m MetaAd \u4E00\u81F4\uFF09\u3002\n"
+    );
     process.exit(1);
   }
   const { startDate, endDate } = resolveMetaOverviewDateRange(opts.startDate, opts.endDate);
   const config = loadConfig(opts.token);
-  const params = new URLSearchParams({ startDate, endDate });
-  const url = `${config.apiBaseUrl}/reporting/media-account/MetaAd/${id}/OverviewSectionData?${params}`;
+  const accountDetail = await lookupMetaAccountForOverview(config, manifestId, opts.verbose);
+  const mediaAccountType = accountDetail?.mediaAccountType ?? "FacebookAds";
+  const url = buildMetaOverviewUrl(config, rawAccount, mediaAccountType, startDate, endDate);
   let data;
   try {
     data = await apiFetch2(url, config, {}, opts.verbose);
   } catch (err) {
-    console.error(`
-\u274C \u8BF7\u6C42\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg.includes("403")) {
+      console.error(
+        `
+\u274C \u8BF7\u6C42\u5931\u8D25\uFF1AHTTP 403
+   \u8D26\u6237 ${manifestId} \u7684 mediaAccountType=${mediaAccountType ?? "\u672A\u77E5"}\u3002
+   Facebook \u6388\u6743\u8D26\u6237\uFF08FacebookAds\uFF09\u987B\u8D70 FacebookAds/act_ \u8DEF\u5F84\uFF1B\u4E1D\u8DEF\u8D5E Meta \u5F00\u6237\u8D70 MetaAd \u8DEF\u5F84\u3002
+   \u5468\u671F/\u591A\u7EF4\u5EA6\u62A5\u544A\u8BF7\u6539\u7528\uFF1Asiluzan-tso facebook-analysis -a ${manifestId} --sections overview --json-out <dir>
+`
+      );
+    } else {
+      console.error(`
+\u274C \u8BF7\u6C42\u5931\u8D25\uFF1A${msg}
 `);
+    }
     process.exit(1);
   }
   if (opts.jsonOut) {
     const summary = await writeReportAnalysisSnapshot({
       snapshotDir: opts.jsonOut,
       section: "meta-overview",
-      accountId: id,
+      accountId: manifestId,
       dateRange: { start: startDate, end: endDate },
       payload: data,
       cliVersion: getCurrentVersion2()
@@ -106211,7 +106291,7 @@ async function runReportMetaOverview(opts) {
   const optRaw = row.optimizationScore;
   const optPct = typeof optRaw === "number" && optRaw <= 1 && optRaw >= 0 ? (optRaw * 100).toFixed(0) : typeof optRaw === "number" ? String(optRaw) : "\u2014";
   console.log(`
-\u2705 Meta \u8D26\u6237\u603B\u89C8  ${id}  \u533A\u95F4 ${startDate} ~ ${endDate}
+\u2705 Meta \u8D26\u6237\u603B\u89C8  ${manifestId}  \u533A\u95F4 ${startDate} ~ ${endDate}
 `);
   console.log(
     `   \u8D27\u5E01 ${currency}  \u4F18\u5316\u5F97\u5206 ${optPct}${typeof optRaw === "number" && optRaw <= 1 ? "%\uFF080\u20131 \u5DF2\u6362\u7B97\uFF09" : ""}  \u603B\u6D88\u8017 ${fmtNum2(typeof row.totalCost === "number" ? row.totalCost : cur.spend)}  \u4F59\u989D ${fmtNum2(typeof row.remainingAccountBudget === "number" ? row.remainingAccountBudget : void 0)}  \u6D3B\u8DC3\u5929\u6570 ${row.activeDays ?? "\u2014"}  \u65E5\u5747\u6D88\u8017 ${fmtNum2(typeof row.averageDailyCost === "number" ? row.averageDailyCost : void 0)}
@@ -106227,6 +106307,42 @@ async function runReportMetaOverview(opts) {
 function toSlashDate(date) {
   return date.replace(/-/g, "/");
 }
+async function lookupMetaAccountForOverview(config, manifestId, verbose = false) {
+  for (const idCandidate of [manifestId, `act_${manifestId}`]) {
+    const params = new URLSearchParams({
+      MediaTypes: "MetaAd|FacebookAds",
+      advStatus: "",
+      mediaAccountState: "Approved,Linked",
+      isForce: "false",
+      pageNum: "1",
+      pageSize: "20",
+      mediaCustomerIds: idCandidate
+    });
+    try {
+      const data = await apiFetch2(
+        `${config.apiBaseUrl}/query/media-account/SearchMediaAcountByCriteria?${params}`,
+        config,
+        {},
+        verbose
+      );
+      for (const item of data?.mas ?? []) {
+        const ma = item.ma ?? {};
+        const cidDigits = metaOverviewManifestId(String(ma.mediaCustomerId ?? ""));
+        if (cidDigits === manifestId) {
+          return {
+            entityId: String(ma.entityId ?? ""),
+            mediaCustomerId: String(ma.mediaCustomerId ?? ""),
+            mediaCustomerName: String(ma.mediaCustomerName ?? ""),
+            mediaAccountType: String(ma.mediaAccountType ?? ""),
+            mediaAccountGroupId: String(ma.mediaAccountGroupId ?? "")
+          };
+        }
+      }
+    } catch {
+    }
+  }
+  return void 0;
+}
 async function lookupAccountsByCustomerIds(apiBaseUrl, config, mediaType, customerIds, verbose = false) {
   const params = new URLSearchParams({
     MediaType: mediaType,
@@ -106239,14 +106355,17 @@ async function lookupAccountsByCustomerIds(apiBaseUrl, config, mediaType, custom
     {},
     verbose
   );
-  const idSet = new Set(customerIds.map((id) => id.trim()));
+  const idSet = new Set(
+    customerIds.map((id) => metaOverviewManifestId(id.trim())).filter(Boolean)
+  );
   const result = /* @__PURE__ */ new Map();
   const items = Array.isArray(data) ? data : [];
   for (const item of items) {
     const ma = item.ma ?? {};
     const cid = String(ma.mediaCustomerId ?? "");
-    if (idSet.has(cid)) {
-      result.set(cid, {
+    const cidDigits = metaOverviewManifestId(cid);
+    if (idSet.has(cidDigits)) {
+      result.set(cidDigits, {
         entityId: String(ma.entityId ?? ""),
         mediaCustomerId: cid,
         mediaCustomerName: String(ma.mediaCustomerName ?? ""),
@@ -107480,7 +107599,9 @@ function register13(program2) {
       verbose: opts.verbose
     });
   });
-  reportCmd.command("meta-overview").description("Meta \u8D26\u6237\u5206\u6790\u603B\u89C8\uFF08OverviewSectionData\uFF0C\u9700 tsoApiBaseUrl \u9274\u6743\uFF09").requiredOption("-a, --account <id>", "Meta \u5E7F\u544A\u8D26\u6237 mediaCustomerId").option("--start <date>", "\u5F00\u59CB\u65E5\u671F YYYY-MM-DD\uFF08\u4E0E --end \u540C\u4F20\u6216\u540C\u7701\u7565\uFF09").option("--end <date>", "\u7ED3\u675F\u65E5\u671F YYYY-MM-DD").option("--token <token>", "Auth Token").option(
+  reportCmd.command("meta-overview").description(
+    "Meta \u8D26\u6237\u5206\u6790\u603B\u89C8\uFF08OverviewSectionData\uFF1BFacebookAds \u6388\u6743\u6237\u8D70 FacebookAds/act_\uFF0CMetaAd \u5F00\u6237\u8D70 MetaAd\uFF09"
+  ).requiredOption("-a, --account <id>", "Meta \u5E7F\u544A\u8D26\u6237 mediaCustomerId\uFF08\u6570\u5B57\u6216 act_<\u6570\u5B57>\uFF09").option("--start <date>", "\u5F00\u59CB\u65E5\u671F YYYY-MM-DD\uFF08\u4E0E --end \u540C\u4F20\u6216\u540C\u7701\u7565\uFF09").option("--end <date>", "\u7ED3\u675F\u65E5\u671F YYYY-MM-DD").option("--token <token>", "Auth Token").option(
     "--json-out <path>",
     "\u843D\u76D8\u76EE\u5F55\u5E76\u66F4\u65B0 report-manifest[-<accountId>].json\uFF1B\u6587\u4EF6\u540D\u4E3A `<section>[-<accountId>].json`\uFF1Bstdout \u4E00\u884C\u6458\u8981 JSON\uFF0C\u542B outlineFile\uFF08TS \u5F0F\u7C7B\u578B\u5728 `*.outline.txt`\uFF09"
   ).option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(async (opts) => {
@@ -122431,53 +122552,6 @@ var FACEBOOK_SECTION_ALIASES = {
   videos: "material"
 };
 
-// src/commands/facebook-analysis/fetch.ts
-init_auth();
-function normalizeFacebookAccountId(raw) {
-  const t = raw.trim();
-  if (!t) {
-    console.error("\n\u274C --account \u4E0D\u80FD\u4E3A\u7A7A\u3002\n");
-    process.exit(1);
-  }
-  const digits = t.startsWith("act_") ? t.slice(4) : t;
-  if (!/^\d+$/.test(digits)) {
-    console.error(
-      "\n\u274C --account \u987B\u4E3A Facebook \u5E7F\u544A\u8D26\u6237 ID\uFF08\u6570\u5B57 mediaCustomerId\uFF0C\u6216 act_<\u6570\u5B57>\uFF0C\u4E0E list-accounts -m MetaAd \u4E00\u81F4\uFF09\u3002\n"
-    );
-    process.exit(1);
-  }
-  return { apiId: `act_${digits}`, manifestId: digits };
-}
-function resolveFacebookDateRange(start, end) {
-  if (start && end) return { startDate: start, endDate: end };
-  if (!start && !end) {
-    const endD = /* @__PURE__ */ new Date();
-    endD.setDate(endD.getDate() - 1);
-    const startD = new Date(endD);
-    startD.setDate(startD.getDate() - 6);
-    const fmt2 = (d) => d.toISOString().slice(0, 10);
-    return { startDate: fmt2(startD), endDate: fmt2(endD) };
-  }
-  console.error("\n\u274C --start \u4E0E --end \u987B\u540C\u65F6\u4F20\u5165\uFF0C\u6216\u540C\u65F6\u7701\u7565\u4EE5\u4F7F\u7528\u9ED8\u8BA4\u8FD1 7 \u5929\uFF08\u622A\u81F3\u6628\u5929\uFF09\u3002\n");
-  process.exit(1);
-}
-function facebookReportingUrl(config, apiId, segment, query) {
-  const q = query ? query.startsWith("?") ? query : `?${query}` : "";
-  return `${config.apiBaseUrl}/reporting/media-account/FacebookAds/${encodeURIComponent(apiId)}/${segment}${q}`;
-}
-async function fetchFacebookSectionPayload(def, opts, config, apiId) {
-  const { startDate, endDate } = resolveFacebookDateRange(opts.start, opts.end);
-  const params = new URLSearchParams({ startDate, endDate });
-  if (def.countryLimitOption && opts.limit !== void 0 && Number.isFinite(opts.limit)) {
-    params.set("limit", String(Math.max(1, Math.floor(opts.limit))));
-  }
-  const url = facebookReportingUrl(config, apiId, def.segment, params.toString());
-  return apiFetch2(url, config, {}, opts.verbose ?? false);
-}
-function endpointHintForFacebookSection(def, apiId) {
-  return `GET \u2026/FacebookAds/${apiId}/${def.segment}`;
-}
-
 // src/commands/facebook-analysis/register-cli.ts
 import { Command } from "commander";
 

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.28-beta.2",
-  "publishedAt": 1780907501825
+  "version": "1.1.28-beta.3",
+  "publishedAt": 1780909080666
 }

package/dist/skill/references/analytics/account-analytics.md

@@ -265,7 +265,7 @@ const data = d.record ?? d.items; // record 非空=汇总维度；否则=列表
 
 > 周期/诊断报告：**`facebook-analysis`**（`FacebookAds` 路径，7 Section，对齐 Google 周期报告能 cover 的部分）。  
 > 撰写与 Google 对照表：**`references/analytics/facebook-analysis-guide.md`**（必读）。  
-> `report meta-overview` 仅为遗留单维总览（`MetaAd` 路径）。
+> `report meta-overview` 仅为遗留单维总览：按 `list-accounts` 的 `mediaAccountType` 自动选路径——**FacebookAds**（OAuth 授权）→ `FacebookAds/act_<id>`；**MetaAd**（丝路赞开户）→ `MetaAd/<id>`。多维度请用 `facebook-analysis`。
 
 ### 周期报告（默认 6 维，等同 Google 周期报告主流程）
 

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.28-beta.2'
+$PKG_VERSION = '1.1.28-beta.3'
 $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.28-beta.2"
+readonly PKG_VERSION="1.1.28-beta.3"
 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.28-beta.2",
+  "version": "1.1.28-beta.3",
   "description": "Siluzan 广告账户管理 CLI — 查询账户、余额、消耗数据，管理绑定关系与充值。",
   "keywords": [
     "ad-account",