siluzan-tso-cli 1.1.20-beta.19 → 1.1.20-beta.21

package/README.md

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

package/dist/index.js

@@ -103992,6 +103992,22 @@ async function fetchTikTokAccountByMediaCustomerId(config, mediaCustomerId, verb
   const match = items.find((it) => String(it.ma?.mediaCustomerId ?? "") === id);
   return match ?? null;
 }
+async function fetchGoogleAccountByMediaCustomerId(config, mediaCustomerId, verbose) {
+  const cfg = PLATFORM_CONFIG.Google;
+  const params = new URLSearchParams();
+  for (const [k, v] of Object.entries(cfg.fixedParams)) {
+    params.set(k, String(v));
+  }
+  params.set(cfg.pageParam, "1");
+  params.set("pageSize", "50");
+  params.set(cfg.idSearchParam, mediaCustomerId.trim());
+  const url = `${config.apiBaseUrl}${cfg.path}?${params}`;
+  const res = await apiFetchWithHeaders2(url, config, {}, verbose);
+  const items = Array.isArray(res.data) ? res.data : [];
+  const id = mediaCustomerId.trim();
+  const match = items.find((it) => String(it.ma?.mediaCustomerId ?? "") === id);
+  return match ?? null;
+}
 
 // src/commands/list-accounts/printers.ts
 init_cli_table();
@@ -110229,6 +110245,8 @@ var VALID_STATUS_V2 = ["Enabled", "Paused"];
 var VALID_CHANNEL_V2 = ["SEARCH", "DISPLAY", "VIDEO", "SHOPPING", "MULTI_CHANNEL"];
 var URL_REGEX = /^https?:\/\/.+/;
 var DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
+var PATH_SEGMENT_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
+var RSA_PATH_BACKEND_HINT = "\u540E\u7AEF GoogleAdsAcctMgmtServiceProviderV2.BuildResponsiveSearchAd \u4F1A\u5C06 Path1 \u5199\u5165 Google Ads SDK\uFF1BJSON \u7F3A\u5B57\u6BB5\u6216\u4E3A null \u65F6\u53CD\u5E8F\u5217\u5316\u4E3A null\uFF0C\u89E6\u53D1 ArgumentNullException\uFF08Parameter 'value'\uFF09\uFF0C\u6574\u5305 BatchJob \u5931\u8D25";
 function pushErr2(errors, msg) {
   errors.push(msg);
 }
@@ -110247,6 +110265,61 @@ function calcGoogleCharLength(text) {
   }
   return len;
 }
+function validateRsaDisplayPath(prefix, ad, errors) {
+  const jsonHint = `\u5728 ${prefix} \u589E\u52A0 "Path1"\u3001"Path2"\uFF08PascalCase\uFF0C\u52FF\u7528 path1/path2\uFF1B\u6A21\u677F\u89C1 assets/campaign-create-template.json\uFF09`;
+  if (ad["path1"] !== void 0 && ad["Path1"] === void 0) {
+    pushErr2(
+      errors,
+      `${prefix} \u68C0\u6D4B\u5230\u5C0F\u5199 path1="${String(ad["path1"])}"\uFF0C\u540E\u7AEF\u5951\u7EA6\u5B57\u6BB5\u4E3A Path1\uFF08PascalCase\uFF09\uFF0C\u5F53\u524D\u63D0\u4EA4\u4E0D\u4F1A\u751F\u6548`
+    );
+  }
+  if (ad["path2"] !== void 0 && ad["Path2"] === void 0) {
+    pushErr2(
+      errors,
+      `${prefix} \u68C0\u6D4B\u5230\u5C0F\u5199 path2="${String(ad["path2"])}"\uFF0C\u540E\u7AEF\u5951\u7EA6\u5B57\u6BB5\u4E3A Path2\uFF08PascalCase\uFF09\uFF0C\u5F53\u524D\u63D0\u4EA4\u4E0D\u4F1A\u751F\u6548`
+    );
+  }
+  for (const [field, label, example] of [
+    ["Path1", "\u663E\u793A\u8DEF\u5F84\u7B2C 1 \u6BB5", '"Path1": "products"'],
+    ["Path2", "\u663E\u793A\u8DEF\u5F84\u7B2C 2 \u6BB5", '"Path2": "steel"']
+  ]) {
+    const raw = ad[field];
+    if (raw === void 0) {
+      pushErr2(
+        errors,
+        `${prefix}.${field} \u5B57\u6BB5\u7F3A\u5931\uFF08RSA \u5FC5\u586B\uFF09\u3002${label}\uFF0C\u5C55\u793A\u4E3A finalUrl \u57DF\u540D\u540E\u7684\u8DEF\u5F84\u6BB5\uFF08\u226415 \u5B57\u7B26\uFF0CCJK \u6309 2 \u8BA1\uFF09\u3002${RSA_PATH_BACKEND_HINT}\u3002${jsonHint}\u3002\u793A\u4F8B\uFF1A${example}`
+      );
+      continue;
+    }
+    if (raw === null) {
+      pushErr2(
+        errors,
+        `${prefix}.${field} \u4E3A null\uFF08RSA \u5FC5\u586B\uFF0C\u987B\u4E3A\u5B57\u7B26\u4E32\uFF0C\u53EF\u586B ""\uFF09\u3002${RSA_PATH_BACKEND_HINT}\u3002${jsonHint}\u3002\u793A\u4F8B\uFF1A${example}`
+      );
+      continue;
+    }
+    if (typeof raw !== "string") {
+      pushErr2(
+        errors,
+        `${prefix}.${field} \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\uFF0C\u5F53\u524D\u7C7B\u578B\u4E3A ${typeof raw}\u3002${jsonHint}`
+      );
+      continue;
+    }
+    const len = calcGoogleCharLength(raw);
+    if (len > 15) {
+      pushErr2(
+        errors,
+        `${prefix}.${field} \u8D85\u8FC7 15 \u5B57\u7B26\uFF08\u5F53\u524D ${len}\uFF0CCJK \u6309 2 \u8BA1\uFF09\uFF1A"${raw}"`
+      );
+    }
+    if (raw.length > 0 && !PATH_SEGMENT_REGEX.test(raw)) {
+      pushErr2(
+        errors,
+        `${prefix}.${field} \u542B\u975E\u6CD5\u5B57\u7B26\u6216\u683C\u5F0F\uFF08\u4EC5\u5141\u8BB8\u5C0F\u5199 a-z\u30010-9\u3001\u8FDE\u5B57\u7B26\uFF0C\u4E14\u4E0D\u80FD\u4EE5\u8FDE\u5B57\u7B26\u5F00\u5934/\u7ED3\u5C3E\uFF09\uFF1A"${raw}"`
+      );
+    }
+  }
+}
 function validateRsaAd(prefix, ad, errors, warnings) {
   const h1 = ad["headlinePart1"];
   const h2 = ad["headlinePart2"];
@@ -110293,14 +110366,7 @@ function validateRsaAd(prefix, ad, errors, warnings) {
       pushErr2(errors, `${prefix} \u63CF\u8FF0[${i}] \u8D85\u8FC7 90 \u5B57\u7B26\uFF08\u5F53\u524D ${len}\uFF09\uFF1A"${descriptions[i].slice(0, 40)}"`);
     }
   }
-  const p1 = ad["Path1"];
-  const p2 = ad["Path2"];
-  if (typeof p1 === "string" && calcGoogleCharLength(p1) > 15) {
-    pushErr2(errors, `${prefix} Path1 \u8D85\u8FC7 15 \u5B57\u7B26\uFF08CJK \u8BA1 2\uFF09\uFF1A"${p1}"`);
-  }
-  if (typeof p2 === "string" && calcGoogleCharLength(p2) > 15) {
-    pushErr2(errors, `${prefix} Path2 \u8D85\u8FC7 15 \u5B57\u7B26\uFF08CJK \u8BA1 2\uFF09\uFF1A"${p2}"`);
-  }
+  validateRsaDisplayPath(prefix, ad, errors);
   const finalUrl = ad["Finalurl"] ?? ad["DestinationUrl"];
   if (typeof finalUrl === "string" && finalUrl.length > 0 && !URL_REGEX.test(finalUrl)) {
     pushErr2(errors, `${prefix} Finalurl \u683C\u5F0F\u4E0D\u6B63\u786E\uFF08\u5E94\u4EE5 http(s):// \u5F00\u5934\uFF09\uFF1A${finalUrl}`);
@@ -114027,11 +114093,19 @@ function parseGeoTargetConstantIds(raw) {
   }
   return [...new Set(ids)];
 }
+function appendGeoTargetConstantIdsQuery(baseUrl, geoTargetConstantIds) {
+  if (geoTargetConstantIds.length === 0) return baseUrl;
+  const qs = geoTargetConstantIds.map((id) => `geoTargetConstantIds=${encodeURIComponent(String(id))}`).join("&");
+  return `${baseUrl}?${qs}`;
+}
 function buildKeywordIdeaGoogleUrl(googleApiUrl, geoTargetConstantIds) {
   const base = `${googleApiUrl.replace(/\/$/, "")}/keywordidea/google`;
-  if (geoTargetConstantIds.length === 0) return base;
-  const qs = geoTargetConstantIds.map((id) => `geoTargetConstantIds=${encodeURIComponent(String(id))}`).join("&");
-  return `${base}?${qs}`;
+  return appendGeoTargetConstantIdsQuery(base, geoTargetConstantIds);
+}
+function buildKeywordRecommendationGoogleUrl(googleApiUrl, mediaCustomerId, geoTargetConstantIds) {
+  const id = encodeURIComponent(mediaCustomerId.trim());
+  const base = `${googleApiUrl.replace(/\/$/, "")}/keywordrecommendation/recommend/${id}/google`;
+  return appendGeoTargetConstantIdsQuery(base, geoTargetConstantIds);
 }
 function geoTargetConstantsListPath(googleApiUrl) {
   return `${googleApiUrl.replace(/\/$/, "")}/geotargetmanagement/GeoTargetConstans`;
@@ -114074,22 +114148,37 @@ var KEYWORD_SUGGEST_BID_AMOUNT_CURRENCY = "USD";
 function applyUsdBidAmountsInCny(item, usdToCnyRate) {
   return {
     ...item,
-    averageCpcCNY: convertUsdToCny(item.averageCpcUSD, usdToCnyRate),
-    lowTopOfPageBidCNY: convertUsdToCny(item.lowTopOfPageBidUSD, usdToCnyRate),
-    highTopOfPageBidCNY: convertUsdToCny(item.highTopOfPageBidUSD, usdToCnyRate)
+    averageCpcCNY: convertUsdToCny(item.averageCpc, usdToCnyRate),
+    lowTopOfPageBidCNY: convertUsdToCny(item.lowTopOfPageBid, usdToCnyRate),
+    highTopOfPageBidCNY: convertUsdToCny(item.highTopOfPageBid, usdToCnyRate)
+  };
+}
+function withUsdFieldAliases(item) {
+  return {
+    ...item,
+    averageCpcUSD: item.averageCpc,
+    lowTopOfPageBidUSD: item.lowTopOfPageBid,
+    highTopOfPageBidUSD: item.highTopOfPageBid
   };
 }
 function buildKeywordSuggestJsonPayload(items, opts) {
-  let usdItems = items.map(microsItemToUSD);
-  const rate = opts?.usdToCnyRate;
-  if (rate != null && Number.isFinite(rate) && rate > 0) {
-    usdItems = usdItems.map((row) => applyUsdBidAmountsInCny(row, rate));
-  }
-  const n = usdItems.length;
+  const currency = opts.bidAmountCurrency.toUpperCase();
+  let normalized = items.map((row) => ({
+    ...microsItemToBidAmounts(row),
+    bidAmountCurrency: currency
+  }));
+  const rate = opts.usdToCnyRate;
+  const isUsdPlanner = currency === KEYWORD_SUGGEST_BID_AMOUNT_CURRENCY;
+  if (isUsdPlanner && rate != null && Number.isFinite(rate) && rate > 0) {
+    normalized = normalized.map((row) => withUsdFieldAliases(applyUsdBidAmountsInCny(row, rate)));
+  } else if (isUsdPlanner) {
+    normalized = normalized.map(withUsdFieldAliases);
+  }
+  const n = normalized.length;
   return {
-    ...wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items: usdItems }),
-    bidAmountCurrency: KEYWORD_SUGGEST_BID_AMOUNT_CURRENCY,
-    ...rate != null && Number.isFinite(rate) && rate > 0 ? { usdToCnyExchangeRate: rate } : {}
+    ...wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items: normalized }),
+    bidAmountCurrency: currency,
+    ...isUsdPlanner && rate != null && Number.isFinite(rate) && rate > 0 ? { usdToCnyExchangeRate: rate } : {}
   };
 }
 async function fetchUrlKeywords(url, keywords, verbose) {
@@ -114204,7 +114293,41 @@ async function runKeywordSuggest(opts) {
 `);
     process.exit(1);
   }
-  const apiUrl = buildKeywordIdeaGoogleUrl(googleApiUrl, geoTargetConstantIds);
+  const accountId = opts.account?.trim() ?? "";
+  let bidAmountCurrency = KEYWORD_SUGGEST_BID_AMOUNT_CURRENCY;
+  let apiUrl;
+  if (accountId) {
+    const acct = await fetchGoogleAccountByMediaCustomerId(config, accountId, opts.verbose);
+    if (!acct) {
+      console.error(
+        `
+\u274C \u672A\u627E\u5230 Google \u8D26\u6237 mediaCustomerId=${accountId}\u3002
+   \u8BF7\u5148\u6267\u884C\uFF1Asiluzan-tso list-accounts -m Google -k ` + accountId + "\n"
+      );
+      process.exit(1);
+    }
+    const code = acct.ma?.currencyCode?.trim();
+    if (!code) {
+      console.error(
+        `
+\u274C \u8D26\u6237 ${accountId} \u7F3A\u5C11 currencyCode\uFF0C\u65E0\u6CD5\u6807\u6CE8\u51FA\u4EF7\u5E01\u79CD\u3002
+   \u8BF7\u7528 list-accounts -m Google -k ` + accountId + " --json \u786E\u8BA4\u8D26\u6237\u6570\u636E\u3002\n"
+      );
+      process.exit(1);
+    }
+    bidAmountCurrency = code.toUpperCase();
+    apiUrl = buildKeywordRecommendationGoogleUrl(googleApiUrl, accountId, geoTargetConstantIds);
+    if (opts.verbose) {
+      console.error(
+        `  [keyword] account=${accountId} bidAmountCurrency=${bidAmountCurrency} api=keywordrecommendation/recommend/.../google`
+      );
+    }
+  } else {
+    apiUrl = buildKeywordIdeaGoogleUrl(googleApiUrl, geoTargetConstantIds);
+    if (opts.verbose) {
+      console.error(`  [keyword] api=keywordidea/google (shared MCC, USD)`);
+    }
+  }
   if (opts.verbose && geoTargetConstantIds.length > 0) {
     console.error(`  [keyword] geoTargetConstantIds=${geoTargetConstantIds.join(",")}`);
   }
@@ -114244,9 +114367,13 @@ async function runKeywordSuggest(opts) {
     });
   }
   const n = items.length;
-  const usdToCnyRate = await getUsdToCnyExchangeRate(config, opts.verbose);
-  const kwPayload = buildKeywordSuggestJsonPayload(items, { usdToCnyRate });
-  const usdItems = kwPayload.items;
+  const isUsdPlanner = bidAmountCurrency === KEYWORD_SUGGEST_BID_AMOUNT_CURRENCY;
+  const usdToCnyRate = isUsdPlanner ? await getUsdToCnyExchangeRate(config, opts.verbose) : null;
+  const kwPayload = buildKeywordSuggestJsonPayload(items, {
+    bidAmountCurrency,
+    usdToCnyRate
+  });
+  const displayItems = kwPayload.items;
   if (await emitCliJsonOrSnapshot(opts, {
     section: "keyword-suggest",
     commandLabel: "keyword suggest",
@@ -114262,36 +114389,37 @@ async function runKeywordSuggest(opts) {
     return;
   }
   const fmtAmt = (v) => v != null && Number.isFinite(v) ? v.toFixed(2) : "\u2014";
-  const hasCny = usdToCnyRate != null && usdToCnyRate > 0;
-  const cols = hasCny ? [
+  const cur = bidAmountCurrency;
+  const hasCnyRef = isUsdPlanner && usdToCnyRate != null && usdToCnyRate > 0;
+  const cols = hasCnyRef ? [
     { key: "keyword", header: "\u5173\u952E\u8BCD" },
     { key: "montlySearch", header: "\u6708\u5747\u641C\u7D22" },
-    { key: "cpcUsd", header: "\u5E73\u5747CPC(USD)" },
-    { key: "cpcCny", header: "\u5E73\u5747CPC(CNY)" },
-    { key: "bidRangeUsd", header: "\u9875\u9996\u51FA\u4EF7(USD)" },
-    { key: "bidRangeCny", header: "\u9875\u9996\u51FA\u4EF7(CNY)" },
+    { key: "cpcMain", header: `\u5E73\u5747CPC(${cur})` },
+    { key: "cpcCny", header: "\u5E73\u5747CPC(CNY\u53C2\u8003)" },
+    { key: "bidRangeMain", header: `\u9875\u9996\u51FA\u4EF7(${cur})` },
+    { key: "bidRangeCny", header: "\u9875\u9996\u51FA\u4EF7(CNY\u53C2\u8003)" },
     { key: "competition", header: "\u7ADE\u4E89\u5EA6" }
   ] : [
     { key: "keyword", header: "\u5173\u952E\u8BCD" },
     { key: "montlySearch", header: "\u6708\u5747\u641C\u7D22" },
-    { key: "cpcUsd", header: "\u5E73\u5747CPC(USD)" },
-    { key: "bidRangeUsd", header: "\u9875\u9996\u51FA\u4EF7(USD)" },
+    { key: "cpcMain", header: `\u5E73\u5747CPC(${cur})` },
+    { key: "bidRangeMain", header: `\u9875\u9996\u51FA\u4EF7(${cur})` },
     { key: "competition", header: "\u7ADE\u4E89\u5EA6" }
   ];
-  const rows = usdItems.map((item) => {
-    const cpcUsd = fmtAmt(item.averageCpcUSD);
-    const lowUsd = fmtAmt(item.lowTopOfPageBidUSD);
-    const highUsd = fmtAmt(item.highTopOfPageBidUSD);
-    const bidRangeUsd = lowUsd === "\u2014" && highUsd === "\u2014" ? "\u2014" : `${lowUsd} ~ ${highUsd}`;
+  const rows = displayItems.map((item) => {
+    const cpcMain = fmtAmt(item.averageCpc);
+    const lowMain = fmtAmt(item.lowTopOfPageBid);
+    const highMain = fmtAmt(item.highTopOfPageBid);
+    const bidRangeMain = lowMain === "\u2014" && highMain === "\u2014" ? "\u2014" : `${lowMain} ~ ${highMain}`;
     const competitionDisplay = item.competitionV2 ?? (item.competition != null ? item.competition.toFixed(2) : "\u2014");
     const row = {
       keyword: item.keyword ?? "",
       montlySearch: String(item.montlySearch ?? "\u2014"),
-      cpcUsd,
-      bidRangeUsd,
+      cpcMain,
+      bidRangeMain,
       competition: competitionDisplay
     };
-    if (hasCny) {
+    if (hasCnyRef) {
       const cpcCny = fmtAmt(item.averageCpcCNY);
       const lowCny = fmtAmt(item.lowTopOfPageBidCNY);
       const highCny = fmtAmt(item.highTopOfPageBidCNY);
@@ -114301,14 +114429,19 @@ async function runKeywordSuggest(opts) {
     return row;
   });
   printCliTable(rows, cols);
-  if (hasCny) {
-    console.log(`  \uFF08USD\u2192CNY \u6C47\u7387 ${usdToCnyRate}\uFF0C\u7F13\u5B58 10 \u5206\u949F\uFF1BJSON \u542B averageCpcCNY \u7B49\u5B57\u6BB5\uFF09
+  if (hasCnyRef) {
+    console.log(
+      `  \uFF08\u51FA\u4EF7\u5E01\u79CD ${cur}\uFF1BCNY \u4E3A\u6C47\u7387 ${usdToCnyRate} \u6362\u7B97\u53C2\u8003\uFF0C\u975E Google \u8D26\u6237\u5E01\u79CD\u53E3\u5F84\uFF09
+`
+    );
+  } else if (accountId) {
+    console.log(`  \uFF08\u51FA\u4EF7\u5E01\u79CD\uFF1A${cur}\uFF0C\u4E0E\u8D26\u6237 currencyCode \u4E00\u81F4\uFF09
 `);
   } else {
     console.log();
   }
 }
-function microsToUSD(v) {
+function microsToAmount(v) {
   if (v == null) return null;
   const n = Number(v);
   if (!Number.isFinite(n)) return null;
@@ -114320,7 +114453,7 @@ function legacyUsdAmount(...candidates) {
   }
   return null;
 }
-function microsItemToUSD(item) {
+function microsItemToBidAmounts(item) {
   const {
     averageCpc: _legacyCpc,
     lowTopOfPageBidMicros: _legacyLow,
@@ -114344,20 +114477,20 @@ function microsItemToUSD(item) {
   } = item;
   return {
     ...rest,
-    averageCpcUSD: legacyUsdAmount(
-      microsToUSD(_legacyCpc),
+    averageCpc: legacyUsdAmount(
+      microsToAmount(_legacyCpc),
       _existingCpcUsd,
       _legacyCpcDollar,
       _legacyCpcYuan
     ),
-    lowTopOfPageBidUSD: legacyUsdAmount(
-      microsToUSD(_legacyLow),
+    lowTopOfPageBid: legacyUsdAmount(
+      microsToAmount(_legacyLow),
       _existingLowUsd,
       _legacyLowDollar,
       _legacyLowYuan
     ),
-    highTopOfPageBidUSD: legacyUsdAmount(
-      microsToUSD(_legacyHigh),
+    highTopOfPageBid: legacyUsdAmount(
+      microsToAmount(_legacyHigh),
       _existingHighUsd,
       _legacyHighDollar,
       _legacyHighYuan
@@ -114372,15 +114505,19 @@ function splitKeywordSeeds(raw) {
 }
 function register21(program2) {
   const keywordCmd = program2.command("keyword").description(
-    "Google \u5173\u952E\u5B57\u63A8\u8350\uFF08\u5171\u4EAB MCC\uFF0C\u65E0\u9700\u7ED1\u8D26\u6237\uFF1B\u53EF\u6307\u5B9A geoTargetConstant \u9650\u5B9A\u5E02\u573A\u5730\u533A\uFF09"
+    "Google \u5173\u952E\u5B57\u63A8\u8350\uFF08\u53EF\u9009 -a \u8D26\u6237 ID \u6309\u8D26\u6237\u5E01\u79CD\u51FA\u4EF7\uFF1B\u5426\u5219\u5171\u4EAB MCC/USD\uFF1B\u53EF --geo \u9650\u5B9A\u5E02\u573A\uFF09"
   );
   attachBaseCliOptions(keywordCmd);
   keywordCmd.requiredOption("-k, --keyword <words>", "\u641C\u7D22\u8BCD\uFF0C\u591A\u4E2A\u9017\u53F7\u5206\u9694").option(
+    "-a, --account <id>",
+    "Google mediaCustomerId\uFF1B\u4F20\u5165\u5219\u8D70\u8D26\u6237\u7EA7\u63A8\u8350\u5E76\u6309 list-accounts \u7684 currencyCode \u5C55\u793A\u51FA\u4EF7"
+  ).option(
     "--geo <ids>",
     "geoTargetConstant ID\uFF08\u5148 keyword geo-list\uFF1B\u4F8B 2840=\u7F8E\u56FD\uFF09\u3002\u591A\u4E2A ID \u4E3A\u6C47\u603B\u6307\u6807\uFF1B\u5206\u5E02\u573A\u987B\u591A\u6B21\u8C03\u7528\u3001\u6BCF\u6B21\u53EA\u4F20\u4E00\u4E2A"
   ).option("--url <url>", "\u516C\u53F8/\u4EA7\u54C1\u7F51\u5740\uFF08\u586B\u5199\u540E\u89E6\u53D1\u7F51\u5740\u62D3\u8BCD\uFF1B\u4E0E --google-only \u4E92\u65A5\uFF09").option("--google-only", "\u4EC5 Google Keyword Planner\uFF0C\u4E0D\u53E0\u52A0\u7F51\u5740\u62D3\u8BCD").option("--include <words>", "\u7ED3\u679C\u5FC5\u987B\u5305\u542B\u7684\u8BCD\uFF0C\u9017\u53F7\u6216\u7A7A\u683C\u5206\u9694").option("--exclude <words>", "\u7ED3\u679C\u4E0D\u5305\u542B\u7684\u8BCD\uFF0C\u9017\u53F7\u6216\u7A7A\u683C\u5206\u9694").action(async (opts) => {
     await runKeywordSuggest({
       token: opts.token,
+      account: opts.account,
       keywords: splitKeywordSeeds(opts.keyword),
       geo: opts.geo,
       url: opts.url,

package/dist/skill/SKILL.md

@@ -152,7 +152,7 @@ Windows 注意：部分 Agent 客户端通过 PowerShell / cmd 代执行命令
   - `ad campaigns --json/--json-out` → `budget`（元，与 `campaign-edit --budget` 同口径）
   - `ad groups --json` → `maxCPCAmountYuan` / `targetCpaAmountYuan`（元）
   - `google-analysis campaigns-*.json` → `budgetAmountYuan` / `campaignTargetCpaYuan` / `maximizeConversionsTargetCpaYuan` / `spend` / `averageCpc` / `costPerConversion`（均元）
-  - `keyword --json` → 美元 `averageCpcUSD` / `lowTopOfPageBidUSD` / `highTopOfPageBidUSD`；人民币同名 CNY 字段；根级 `usdToCnyExchangeRate`、`bidAmountCurrency:"USD"`；限定市场用 `keyword geo-list` + `--geo <id>`（**多 id 一次调用 = 汇总指标**；分市场对比须多次调用、每次只传一个 `--geo`，见 `references/keyword-planner-workflows.md`）
+  - `keyword --json` → `averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid` + 每条 `bidAmountCurrency`（无 `-a` 为 USD，可选 `averageCpcCNY` 汇率参考；有 `-a` 为账户 `currencyCode`，勿用汇率换算）；`-a <mediaCustomerId>` 走账户级推荐接口；限定市场用 `keyword geo-list` + `--geo <id>`（**多 id = 汇总指标**；分市场须多次调用、每次一个 `--geo`，见 `references/keyword-planner-workflows.md`）
 - **品牌名优先级**：(1) 用户明确提供 → (2) `list-accounts.mag.advertiserName` → (3) 用户提供网址 → 域名占位并标注 `[待确认品牌名]`。**严禁**把英文域名翻译为虚构中文品牌。
 - 完整字段表见 `references/currency.md`。
 

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.20-beta.19",
-  "publishedAt": 1779333530583
+  "version": "1.1.20-beta.21",
+  "publishedAt": 1779348843065
 }

package/dist/skill/assets/campaign-create-template.md

@@ -65,7 +65,7 @@ for ag in camp.get("AdGroupsForBatchJob", []):
 ```bash
 siluzan-tso ad campaign-validate --config-file ./campaign.json
 # 用户确认方案后：
-siluzan-tso ad campaign-create --config-file ./campaign.json --json-out ./snap-campaign
+siluzan-tso ad campaign-create --config-file ./campaign.json --commit '<campaign create description>'
 siluzan-tso ad batch get --id <taskId> --config-file ./campaign.json --json-out ./snap-campaign
 siluzan-tso ad batch diff --batch-id <taskId> --config-file ./campaign.json --json-out ./snap-campaign
 ```
@@ -218,7 +218,7 @@ siluzan-tso ad batch diff --batch-id <taskId> --config-file ./campaign.json --js
 | `DestinationUrl`              | string   |  ✅  | 展示/编辑用落地页 URL                         |
 | `Finalurl`                    | string   |  ✅  | **后端 BatchJob 必填**；与 `DestinationUrl` 填**相同** URL。勿只写前者——validate 可能仍通过，create 会失败 |
 | `AdTitle`                     | null \| string |  | 可选；无标题时写 `null`（与 Web 智投一致）   |
-| `Path1` / `Path2`             | string   |      | 显示路径，**≤ 15 字符**（CJK 按 2 计）        |
+| `Path1` / `Path2`             | string   |  ✅  | 显示路径（**必填**，缺/null 会导致后端 BatchJob `ArgumentNullException`）；**≤ 15 字符**（CJK 按 2 计）；小写 a-z、数字、连字符 |
 | `headlinePart1/2/3`           | string   |  ✅  | 前 3 条标题；**每条 ≤ 30 字符**（CJK 按 2 计） |
 | `AddtionalHeadlines`          | string[] |      | 第 4–15 条标题（合计 ≤ 15）                   |
 | `adDescription` / `adDescription2` | string |  ✅  | 前 2 条描述；**每条 ≤ 90 字符**            |
@@ -232,7 +232,7 @@ siluzan-tso ad batch diff --batch-id <taskId> --config-file ./campaign.json --js
 | ------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------- |
 | `CampaignCommandController.CreateCampaignAsync`                                            | `customerName` 非空 / `campaign` 非空                                                              |
 | `CampaignCommandController` 行 94–106                                                      | `campaign.TargetPartnerSearchNetwork` 必须 false；`!TargetGoogleSearch && TargetSearchNetwork` 拒绝 |
-| Google Ads BatchJob                                                                         | RSA 字段数与字符上限；关键词词面非空；SITELINK `Line2`/`Line3` ≤25 字且不可 null；系列名不可与在投/暂停系列重名 |
+| Google Ads BatchJob                                                                         | RSA `Path1`/`Path2` 必填（缺/null → 后端 ArgumentNullException）；字段数与字符上限；关键词词面非空；SITELINK `Line2`/`Line3` ≤25 字且不可 null |
 | CLI 实务                                                                                    | `Budget > 0`、地理/语言至少 1 项、日期格式与先后、出价策略与配套字段                                |
 
 `ad campaign-validate` 通过不保证 BatchJob 成功（例如仅写 `DestinationUrl` 未写 `Finalurl` 时 validate 仍可能 ✅）。异步结果用 `ad batch get` 轮询；`HasFailed` / 部分失败时用 `ad batch diff` 对照 JSON 补缺，系列级失败时改 JSON 重提，勿在半成品上反复整包创建。写操作须 `--commit`，见 `references/google-ads.md` § ad campaign-create。

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

@@ -83,7 +83,7 @@ CLI 出口的所有 JSON / 表格金额已统一为**元**，关键字段：
 | `ad campaigns --json`                               | `budget`（元，与 `--budget` 写参同口径）                                                                                                  |
 | `ad groups --json`                                  | `maxCPCAmountYuan`、`targetCpaAmountYuan`                                                                                                 |
 | `google-analysis campaigns` 落盘 `campaigns-*.json` | `budgetAmountYuan`、`campaignTargetCpaYuan`、`maximizeConversionsTargetCpaYuan`；同行 `spend` / `averageCpc` / `costPerConversion` 也是元 |
-| `keyword suggest --json`                            | `averageCpcUSD`、`lowTopOfPageBidUSD`、`highTopOfPageBidUSD`；`averageCpcCNY`                                            |
+| `keyword suggest --json`                            | `averageCpc`、`lowTopOfPageBid`、`highTopOfPageBid`；`bidAmountCurrency`（有 `-a` 为账户币；无 `-a` 为 USD，可选 `averageCpcCNY` 参考） |
 | `balance` 等账户余额接口                            | `remainingAccountBudget`（元）                                                                                                            |
 
 旧字段 `budgetAmount`（分）、`maxCPCAmountDisplay`、`*Micros`（微元）**已不再落盘**，下游脚本无需做单位换算。金额保留 2 位小数，带货币代码（如 `￥50.00 CNY`、`$50.00 USD`），`currencyCode` 从响应读取，跨币种账户分表；细则见 `references/currency.md`。

package/dist/skill/references/currency.md

@@ -46,7 +46,7 @@
 
 ## 金额单位约定
 
-- **CLI 出口的大多数 JSON / 表格金额以「元」为单位**：`budget`、`*Yuan` 后缀（`budgetAmountYuan`、`maxCPCAmountYuan` 等）、`spend` / `averageCpc` / `costPerConversion` 等。**例外**：`keyword suggest` 的 Planner 出价为美元，字段名为 `averageCpcUSD` / `lowTopOfPageBidUSD` / `highTopOfPageBidUSD`，并可选附带 `averageCpcCNY` 等换算值。
+- **CLI 出口的大多数 JSON / 表格金额以「元」为单位**：`budget`、`*Yuan` 后缀（`budgetAmountYuan`、`maxCPCAmountYuan` 等）、`spend` / `averageCpc` / `costPerConversion` 等。**`keyword suggest`**：`averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid` 的币种见根级与每条 **`bidAmountCurrency`**（传 `-a` 时为账户 `currencyCode`；无 `-a` 时为 **USD**，可选 `averageCpcCNY` 为汇率参考、非 Google 账户口径）。
 - **写 CLI 参数**（`--budget`、`--max-cpc`、`--target-cpa`、`--amount` 等）：同样传**主币种元**，与账户 `currencyCode` 一致；CLI 内部按需 ×100 / ×1_000_000 写后端。
 - 旧版网关字段（`budgetAmount` 分、`*Micros` 微元、`maxCPCAmountDisplay` 等）**已不再落盘到 CLI 输出**，下游脚本无需做单位换算。
 

package/dist/skill/references/keyword-planner-workflows.md

@@ -2,7 +2,7 @@
 
 > **拓词命令**读本文；**建户 JSON + validate + create** 读 `references/google-ads-campaign-plan.md`。关键词数量规则：`google-ads-rules/google-ads-keyword-taxonomy.md`。
 >
-> **数据口径**：`siluzan-tso keyword` 走网关 `keywordidea/google`（Google Keyword Planner 市场指标）；可选 `--url` 叠加 **网址拓词**（`websitereco`，非 Google API）。与账户内 **`google-analysis` 投放表现**不是同一套数据，文档与回复中须区分「市场参考」与「账户实际花费/转化」。
+> **数据口径**：`siluzan-tso keyword` 默认走 `keywordidea/google`（共享 MCC，出价 **USD**）；传 **`-a <mediaCustomerId>`** 时走 `keywordrecommendation/recommend/{id}/google`，出价币种为 `list-accounts` 的 **`currencyCode`**（如 CNY）。可选 `--url` 叠加 **网址拓词**（`websitereco`）。与 **`google-analysis` 投放表现**不是同一套数据。
 
 
 ---
@@ -14,7 +14,7 @@
 | 来源                | 典型做法                                                                          | 是否含 `montlySearch` / CPC 等 Google 指标             |
 | ------------------- | --------------------------------------------------------------------------------- | ------------------------------------------------------ |
 | **A. 宿主联网搜索** | 助手用 WebSearch / 公开网页归纳行业词、竞品词、长尾变体，再写入词包               | ❌ 无，须再调 `keyword` 补指标或单独标注「无市场数据」 |
-| **B. Google API**   | `siluzan-tso keyword -k "种子,..."`（网关 `keywordidea/google`；可选 `--geo` 限定国家市场） | ✅ 有                                                  |
+| **B. Google API**   | `siluzan-tso keyword -k "种子,..."`（无 `-a`：`keywordidea/google`/USD；有 `-a`：账户接口/账户币；可选 `--geo`） | ✅ 有                                                  |
 | **C. 网址拓词**     | `keyword` 带 `--url`（`websitereco` 轮询，与 Web `/tool/keyword` 填网址分支一致） | 通常仅词面，**无**完整 Planner 指标                    |
 
 ### 分支 A — 混合拓词
@@ -23,7 +23,7 @@
 
 1. （可选）宿主 **联网搜索** 或 `rag query` 归纳 **2–8 个英文种子词**（RAG 见 §0，联网搜索勿与 Google 指标混写在同一列）。
 2. `siluzan-tso keyword -k "种子1,种子2,..." [--url "<落地页或竞品站>"] --json-out ./snap-kw`
-3. 对落盘 `items`：以 **`keyword` 返回行为准**（有 `montlySearch` / `averageCpcUSD` 等）；联网搜索得到的词若无对应行，可并入词包但须标注 **「无 Google 市场数据」**，或丢弃。
+3. 对落盘 `items`：以 **`keyword` 返回行为准**（有 `montlySearch` / `averageCpc` 等，币种见 `bidAmountCurrency`）；联网搜索得到的词若无对应行，可并入词包但须标注 **「无 Google 市场数据」**，或丢弃。
 
 ### 分支 B — 仅 Google 市场数据（默认）
 
@@ -179,7 +179,7 @@ siluzan-tso keyword -k "structural adhesive,SG-200,curtain wall bonding" --url "
 ### 5）高商业意图粗筛（出价 + 竞争度 + 搜索量）
 
 1. `siluzan-tso keyword -k "..." --json-out ./snap-kw`
-2. 对落盘 `items` 按 `averageCpcUSD`（CLI 出口已 ÷1,000,000，货币见根级 **`bidAmountCurrency: "USD"`**）、`competition` / `competitionV2`、`montlySearch` 综合排序截断；此外 `lowTopOfPageBidUSD` / `highTopOfPageBidUSD`（页首出价 20/80 分位，**美元**）可用于评估合理出价区间。
+2. 对落盘 `items` 按 `averageCpc`（CLI 出口已 ÷1,000,000，货币见 **`bidAmountCurrency`**）、`competition` / `competitionV2`、`montlySearch` 综合排序截断；此外 `lowTopOfPageBid` / `highTopOfPageBid`（页首出价 20/80 分位，与 `bidAmountCurrency` 一致）可用于评估合理出价区间。
 
 ### 6）词包 → campaign-create JSON
 
@@ -197,12 +197,14 @@ siluzan-tso keyword -k "structural adhesive,SG-200,curtain wall bonding" --url "
 ## 单命令速查
 
 ```bash
-siluzan-tso keyword -k "<必填，逗号分隔多词>" [--geo <id[,id...]>] [--url <url>] [--google-only] [--include <words>] [--exclude <words>] [--json] [--json-out <dir>] [--verbose]
+siluzan-tso keyword -k "<必填，逗号分隔多词>" [-a <mediaCustomerId>] [--geo <id[,id...]>] [--url <url>] [--google-only] [--include <words>] [--exclude <words>] [--json] [--json-out <dir>] [--verbose]
 siluzan-tso keyword geo-list [--country-code <codes>] [--name-contains <text>] [--json] [--json-out <dir>]
 ```
 
-`--google-only`：只调 `keywordidea/google`，不叠加 `--url` 的网址拓词；**分支 B（仅 Google）必加**。
+`-a`：走 `keywordrecommendation/recommend/{id}/google`；先 `list-accounts -m Google -k <id>` 确认账户与 **`currencyCode`**；出价金额字段为 `averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid`（**账户币种「元」**，非汇率换算）。
 
-**返回字段**（与后端 `Samm.Core.Service.KeywordRecommendation` 对齐）：根级 `bidAmountCurrency: "USD"`、`usdToCnyExchangeRate`（可选）；每条 `averageCpcUSD` / `lowTopOfPageBidUSD` / `highTopOfPageBidUSD`（**美元**）及对应 `averageCpcCNY` / `lowTopOfPageBidCNY` / `highTopOfPageBidCNY`（CLI 换算）；另有 `keyword` / `montlySearch` / `competition` / `competitionV2` / `source` 等。金额已由网关微元 ÷1,000,000。
+`--google-only`：只调 Google 推荐主接口（有 `-a` 为账户接口，无 `-a` 为 `keywordidea/google`），不叠加 `--url` 的网址拓词；**分支 B（仅 Google）必加**。
+
+**返回字段**（与后端 `Samm.Core.Service.KeywordRecommendation` 对齐）：根级与每条 **`bidAmountCurrency`**（无账户=`USD`；有账户=`list-accounts` 的 `currencyCode`）；`averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid`（微元 ÷1,000,000，**与 `bidAmountCurrency` 一致**）。无账户 USD 时可选 `usdToCnyExchangeRate` 与 `averageCpcCNY` 等**参考**字段（非 Google 账户币种口径）。另有 `keyword` / `montlySearch` / `competition` / `competitionV2` / `source` 等。
 
 与只读账户关键词列表、否词 CRUD 的对照仍归 **`references/google-ads.md`** 中 `ad keywords` / `ad keyword-*` 各节。

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