siluzan-tso-cli 1.1.20-beta.15 → 1.1.20-beta.17

package/README.md

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

package/dist/index.js

@@ -100938,12 +100938,12 @@ var init_http_retry = __esm({
 // src/utils/batch-manifest.ts
 import * as fs12 from "fs/promises";
 import * as path17 from "path";
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 function generateRunId(now = /* @__PURE__ */ new Date()) {
   const pad = (n) => String(n).padStart(2, "0");
   const date = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}`;
   const time = `${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
-  const rand = randomUUID3().slice(0, 4);
+  const rand = randomUUID2().slice(0, 4);
   return `run-${date}-${time}-${rand}`;
 }
 function isValidRunId(id) {
@@ -100987,7 +100987,7 @@ function sanitizeAccountSegment(accountId) {
 async function atomicWriteFile(target, content) {
   const dir = path17.dirname(target);
   await fs12.mkdir(dir, { recursive: true });
-  const tmp = path17.join(dir, `.tmp-${randomUUID3()}-${path17.basename(target)}`);
+  const tmp = path17.join(dir, `.tmp-${randomUUID2()}-${path17.basename(target)}`);
   try {
     await fs12.writeFile(tmp, content, "utf8");
     await fs12.rename(tmp, target);
@@ -109460,11 +109460,140 @@ function requireGoogleApi(config) {
 
 // src/commands/ad/campaign.ts
 init_auth();
-import { randomUUID as randomUUID2 } from "crypto";
 init_cli_json_snapshot();
 init_strip_legacy_google_fields();
 init_cli_table();
 
+// src/commands/ad/campaign-extensions.ts
+var SITELINK_DESCRIPTION_MAX_LEN = 25;
+function pushErr(errors, msg) {
+  errors.push(msg);
+}
+function pushWarn(warnings, msg) {
+  warnings.push(msg);
+}
+function extensionType(ext) {
+  return String(ext.typeV2 ?? ext.TypeV2 ?? ext.AssetFieldType ?? "").toUpperCase();
+}
+function coercePropertiesFromRaw(raw) {
+  const props = {};
+  for (const [k, v] of Object.entries(raw)) {
+    if (v == null) continue;
+    if (k === "FinalUrls" && Array.isArray(v)) {
+      const url = v.find((u) => typeof u === "string" && u.trim());
+      if (typeof url === "string") props.DestinationUrl = url.trim();
+      continue;
+    }
+    if (typeof v === "string" && v.trim() !== "") props[k] = v.trim();
+    else if (typeof v === "number" || typeof v === "boolean") props[k] = String(v);
+  }
+  return props;
+}
+function normalizeSitelinkProperties(props) {
+  const trimSitelinkDesc = (s) => s.length <= SITELINK_DESCRIPTION_MAX_LEN ? s : `${s.slice(0, SITELINK_DESCRIPTION_MAX_LEN - 1)}\u2026`;
+  if (props.LinkText && !props.Text) props.Text = props.LinkText;
+  const d1 = props.Description1 ?? props.Line2 ?? props.Text ?? props.LinkText;
+  const d2 = props.Description2 ?? props.Line3;
+  props.Line2 = trimSitelinkDesc((d1 ?? "").trim() || props.Text || " ");
+  props.Line3 = trimSitelinkDesc((d2 ?? "").trim() || props.Line2);
+  delete props.LinkText;
+  delete props.Description1;
+  delete props.Description2;
+  delete props.FinalUrls;
+  return props;
+}
+function normalizeExtensionsForBatchJob(extensions) {
+  return extensions.map((ext) => {
+    const raw = ext.Properties ?? {};
+    let props = coercePropertiesFromRaw(raw);
+    if (extensionType(ext) === "SITELINK") {
+      props = normalizeSitelinkProperties(props);
+    }
+    const out = { ...ext, Properties: props };
+    if (typeof ext.level === "string" && !out.Level) out.Level = ext.level;
+    return out;
+  });
+}
+function validateSitelinkProperties(prefix, raw, errors, warnings) {
+  if (Array.isArray(raw["FinalUrls"])) {
+    pushErr(
+      errors,
+      `${prefix}.Properties.FinalUrls \u4E0D\u80FD\u4E3A\u6570\u7EC4\uFF08\u4F1A\u5BFC\u81F4 TSO \u65E0\u6CD5\u53CD\u5E8F\u5217\u5316 body\uFF09\uFF1B\u8BF7\u6539\u4E3A DestinationUrl \u5B57\u7B26\u4E32`
+    );
+  }
+  for (const [k, v] of Object.entries(raw)) {
+    if (v == null) continue;
+    if (Array.isArray(v) || typeof v === "object" && k !== "FinalUrls") {
+      pushErr(errors, `${prefix}.Properties.${k} \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\uFF0C\u4E0D\u80FD\u4E3A\u6570\u7EC4\u6216\u5BF9\u8C61`);
+    }
+  }
+  const props = coercePropertiesFromRaw(raw);
+  if (!props.Text?.trim() && !props.LinkText?.trim()) {
+    pushErr(errors, `${prefix}.Properties \u7F3A\u5C11\u94FE\u63A5\u6587\u5B57\uFF08\u8BF7\u586B Text \u6216 LinkText\uFF09`);
+  }
+  if (!props.DestinationUrl?.trim()) {
+    pushErr(
+      errors,
+      `${prefix}.Properties \u7F3A\u5C11\u843D\u5730\u9875\uFF08\u8BF7\u586B DestinationUrl\uFF0C\u52FF\u4EC5\u7528 FinalUrls \u6570\u7EC4\uFF09`
+    );
+  } else if (!/^https?:\/\/.+/i.test(props.DestinationUrl)) {
+    pushErr(errors, `${prefix}.Properties.DestinationUrl \u683C\u5F0F\u4E0D\u6B63\u786E\uFF1A${props.DestinationUrl}`);
+  }
+  const line1 = (props.Description1 ?? props.Line2 ?? props.Text ?? props.LinkText ?? "").trim();
+  const line2Raw = props.Description2 ?? props.Line3;
+  const line2 = typeof line2Raw === "string" ? line2Raw.trim() : "";
+  if (line1.length > SITELINK_DESCRIPTION_MAX_LEN) {
+    pushErr(
+      errors,
+      `${prefix}.Properties \u63CF\u8FF0\u884C 1 \u8D85\u8FC7 ${SITELINK_DESCRIPTION_MAX_LEN} \u5B57\u7B26\uFF08\u5F53\u524D ${line1.length}\uFF09\uFF1A"${line1.slice(0, 40)}${line1.length > 40 ? "\u2026" : ""}"`
+    );
+  }
+  if (line2.length > SITELINK_DESCRIPTION_MAX_LEN) {
+    pushErr(
+      errors,
+      `${prefix}.Properties \u63CF\u8FF0\u884C 2 \u8D85\u8FC7 ${SITELINK_DESCRIPTION_MAX_LEN} \u5B57\u7B26\uFF08\u5F53\u524D ${line2.length}\uFF09\uFF1A"${line2.slice(0, 40)}${line2.length > 40 ? "\u2026" : ""}"`
+    );
+  }
+  const rawDesc2 = raw["Description2"];
+  const rawLine3 = raw["Line3"];
+  const desc2Empty = typeof rawDesc2 === "string" && rawDesc2.trim() === "" || rawDesc2 === null;
+  const line3Missing = rawLine3 === void 0 || rawLine3 === null || typeof rawLine3 === "string" && rawLine3.trim() === "";
+  if (desc2Empty && line3Missing && line1) {
+    pushWarn(
+      warnings,
+      `${prefix}.Properties.Description2 \u4E3A\u7A7A\u4E14\u65E0 Line3\uFF0C\u63D0\u4EA4\u65F6\u5C06\u7528\u63CF\u8FF0\u884C 1 \u56DE\u586B\u63CF\u8FF0\u884C 2\uFF08\u907F\u514D Google null\uFF09`
+    );
+  }
+}
+function validateCampaignExtensionsForBatchJob(campaign, errors, warnings) {
+  const extensions = campaign["ExtensionsForBatchJob"];
+  if (extensions === void 0) return;
+  if (!Array.isArray(extensions)) {
+    pushErr(errors, "campaign.ExtensionsForBatchJob \u5FC5\u987B\u662F\u6570\u7EC4");
+    return;
+  }
+  for (let i = 0; i < extensions.length; i++) {
+    const ext = extensions[i];
+    const prefix = `campaign.ExtensionsForBatchJob[${i}]`;
+    if (!ext || typeof ext !== "object" || Array.isArray(ext)) {
+      pushErr(errors, `${prefix} \u5FC5\u987B\u662F\u5BF9\u8C61`);
+      continue;
+    }
+    const rec = ext;
+    const type = extensionType(rec);
+    const props = rec["Properties"];
+    if (props !== void 0 && (typeof props !== "object" || props === null || Array.isArray(props))) {
+      pushErr(errors, `${prefix}.Properties \u5FC5\u987B\u662F\u5BF9\u8C61`);
+      continue;
+    }
+    if (type === "SITELINK" && props && typeof props === "object") {
+      validateSitelinkProperties(prefix, props, errors, warnings);
+    } else if (type === "SITELINK") {
+      pushErr(errors, `${prefix}\uFF08SITELINK\uFF09\u7F3A\u5C11 Properties`);
+    }
+  }
+}
+
 // src/commands/ad/keyword.ts
 init_auth();
 init_cli_json_snapshot();
@@ -110086,292 +110215,6 @@ function validateCampaignRsaCrossGroupHeadlines(campaign, errors) {
   }
 }
 
-// src/commands/ad/campaign-launch-strategy.ts
-import { readFileSync as readFileSync4 } from "fs";
-var KEYWORD_TIERS = ["core", "longtail"];
-var KEYWORD_CLASSES = [
-  "product",
-  "service",
-  "pain",
-  "competitor",
-  "industry",
-  "scenario",
-  "geo",
-  "tech",
-  "question"
-];
-var CORE_MIN = 5;
-var CORE_MAX = 15;
-var LONGTAIL_MIN = 10;
-var LONGTAIL_MAX = 25;
-var EXACT_MIN = 2;
-var EXACT_MAX = 8;
-var PHRASE_MIN = 3;
-var PHRASE_MAX = 10;
-var BROAD_MIN = 1;
-var BROAD_MAX = 3;
-var NEGATIVE_MIN = 20;
-var AD_GROUP_MAX = 20;
-var EXACT_RATIO_MIN = 0.3;
-var EXACT_RATIO_MAX = 0.4;
-var PHRASE_RATIO_MIN = 0.5;
-var PHRASE_RATIO_MAX = 0.6;
-var BROAD_RATIO_MIN = 0.1;
-var BROAD_RATIO_MAX = 0.2;
-function normalizeGroupKey(name) {
-  return name.trim().toLowerCase();
-}
-function pushErr(errors, msg) {
-  errors.push(msg);
-}
-function isValidTier(t) {
-  return typeof t === "string" && KEYWORD_TIERS.includes(t);
-}
-function isValidClass(c) {
-  return typeof c === "string" && KEYWORD_CLASSES.includes(c);
-}
-function keywordStemFromDisplay(text) {
-  return unwrapKeywordDisplayTextForEdit(text).trim().toLowerCase();
-}
-function countNegatives(campaign) {
-  const neg = campaign["NegativeKeywordsForBatchJob"];
-  if (!Array.isArray(neg)) return 0;
-  const seen = /* @__PURE__ */ new Set();
-  for (const block of neg) {
-    const texts = block?.["KeywordText"];
-    if (!Array.isArray(texts)) continue;
-    for (const t of texts) {
-      if (typeof t !== "string") continue;
-      const stem = keywordStemFromDisplay(t);
-      if (stem) seen.add(stem);
-    }
-  }
-  return seen.size;
-}
-function countMatchTypeInGroup(kws) {
-  let exact = 0;
-  let phrase = 0;
-  let broad = 0;
-  const stems = /* @__PURE__ */ new Set();
-  if (!Array.isArray(kws)) return { exact, phrase, broad, stems };
-  for (const block of kws) {
-    const b = block;
-    const mt = String(b["MatchTypeV2"] ?? "").toUpperCase();
-    const texts = b["KeywordText"];
-    if (!Array.isArray(texts)) continue;
-    for (const raw of texts) {
-      if (typeof raw !== "string") continue;
-      const stem = keywordStemFromDisplay(raw);
-      if (!stem) continue;
-      stems.add(stem);
-      if (mt === "EXACT") exact++;
-      else if (mt === "PHRASE") phrase++;
-      else broad++;
-    }
-  }
-  return { exact, phrase, broad, stems };
-}
-function parseV2ByGroup(v2) {
-  const map = /* @__PURE__ */ new Map();
-  if (!Array.isArray(v2)) return map;
-  for (const entry of v2) {
-    const key = typeof entry?.Key === "string" ? normalizeGroupKey(entry.Key) : "";
-    if (!key) continue;
-    let core = 0;
-    let longtail = 0;
-    const stems = /* @__PURE__ */ new Set();
-    const values = entry.Value;
-    if (!Array.isArray(values)) {
-      map.set(key, { core: 0, longtail: 0, stems });
-      continue;
-    }
-    for (const item of values) {
-      const row = item;
-      const kw = typeof row["keyword"] === "string" ? row["keyword"].trim() : "";
-      if (!kw) continue;
-      stems.add(kw.toLowerCase());
-      const tier = row["tier"];
-      if (tier === "core") core++;
-      else if (tier === "longtail") longtail++;
-    }
-    map.set(key, { core, longtail, stems });
-  }
-  return map;
-}
-function validateCampaignLaunchStrategy(cfg, errors, options = {}) {
-  const stats = {
-    adGroups: 0,
-    core: 0,
-    longtail: 0,
-    exact: 0,
-    phrase: 0,
-    broad: 0,
-    negatives: 0
-  };
-  if (!cfg.campaign || typeof cfg.campaign !== "object" || Array.isArray(cfg.campaign)) {
-    return stats;
-  }
-  const campaign = cfg.campaign;
-  stats.negatives = countNegatives(campaign);
-  if (stats.negatives < NEGATIVE_MIN) {
-    pushErr(
-      errors,
-      `campaign.NegativeKeywordsForBatchJob \u53BB\u91CD\u540E\u987B \u2265 ${NEGATIVE_MIN} \u6761\uFF08\u5F53\u524D ${stats.negatives}\uFF09`
-    );
-  }
-  const v2 = cfg.KeywordRecommendationsV2;
-  if (!Array.isArray(v2) || v2.length === 0) {
-    pushErr(
-      errors,
-      "\u7F3A\u5C11\u9876\u5C42 KeywordRecommendationsV2\uFF08\u987B\u6309\u5E7F\u544A\u7EC4\u586B\u5199 tier=core|longtail \u4E0E class\uFF09"
-    );
-    return stats;
-  }
-  const v2ByGroup = parseV2ByGroup(v2);
-  const adGroups = campaign["AdGroupsForBatchJob"];
-  if (!Array.isArray(adGroups)) return stats;
-  stats.adGroups = adGroups.length;
-  if (adGroups.length > AD_GROUP_MAX) {
-    pushErr(
-      errors,
-      `campaign.AdGroupsForBatchJob \u6570\u91CF\u987B\u5728 1\u2013${AD_GROUP_MAX}\uFF08\u5F53\u524D ${adGroups.length}\uFF09`
-    );
-  }
-  for (let i = 0; i < adGroups.length; i++) {
-    const g = adGroups[i];
-    const gPrefix = `campaign.AdGroupsForBatchJob[${i}]`;
-    const gName = typeof g["Name"] === "string" ? g["Name"].trim() : "";
-    if (!gName) continue;
-    const gKey = normalizeGroupKey(gName);
-    const v2Row = v2ByGroup.get(gKey);
-    if (!v2Row) {
-      pushErr(
-        errors,
-        `${gPrefix}\uFF08${gName}\uFF09\u5728 KeywordRecommendationsV2 \u4E2D\u7F3A\u5C11 Key \u6761\u76EE`
-      );
-      continue;
-    }
-    if (v2Row.stems.size === 0) {
-      pushErr(errors, `KeywordRecommendationsV2 Key="${gName}" \u7684 Value \u4E0D\u80FD\u4E3A\u7A7A`);
-      continue;
-    }
-    stats.core += v2Row.core;
-    stats.longtail += v2Row.longtail;
-    if (v2Row.core < CORE_MIN || v2Row.core > CORE_MAX) {
-      pushErr(
-        errors,
-        `${gPrefix} \u6838\u5FC3\u8BCD\uFF08tier=core\uFF09\u987B ${CORE_MIN}\u2013${CORE_MAX} \u6761\uFF08\u5F53\u524D ${v2Row.core}\uFF09`
-      );
-    }
-    if (v2Row.longtail < LONGTAIL_MIN || v2Row.longtail > LONGTAIL_MAX) {
-      pushErr(
-        errors,
-        `${gPrefix} \u957F\u5C3E\u8BCD\uFF08tier=longtail\uFF09\u987B ${LONGTAIL_MIN}\u2013${LONGTAIL_MAX} \u6761\uFF08\u5F53\u524D ${v2Row.longtail}\uFF09`
-      );
-    }
-    for (const entry of v2) {
-      if (normalizeGroupKey(String(entry.Key)) !== gKey) continue;
-      const values = entry.Value;
-      if (!Array.isArray(values)) break;
-      for (let vi = 0; vi < values.length; vi++) {
-        const row = values[vi];
-        if (!isValidTier(row["tier"])) {
-          pushErr(
-            errors,
-            `KeywordRecommendationsV2["${gName}"].Value[${vi}].tier \u987B\u4E3A core | longtail`
-          );
-        }
-        if (row["class"] !== void 0 && !isValidClass(row["class"])) {
-          pushErr(
-            errors,
-            `KeywordRecommendationsV2["${gName}"].Value[${vi}].class \u65E0\u6548\uFF08\u89C1 google-ads-keyword-taxonomy.md\uFF09`
-          );
-        }
-      }
-      break;
-    }
-    const { exact, phrase, broad, stems } = countMatchTypeInGroup(g["KeywordsForBatchJob"]);
-    stats.exact += exact;
-    stats.phrase += phrase;
-    stats.broad += broad;
-    if (exact < EXACT_MIN || exact > EXACT_MAX) {
-      pushErr(
-        errors,
-        `${gPrefix} EXACT \u5173\u952E\u8BCD\u987B ${EXACT_MIN}\u2013${EXACT_MAX} \u6761\uFF08\u5F53\u524D ${exact}\uFF09`
-      );
-    }
-    if (phrase < PHRASE_MIN || phrase > PHRASE_MAX) {
-      pushErr(
-        errors,
-        `${gPrefix} PHRASE \u5173\u952E\u8BCD\u987B ${PHRASE_MIN}\u2013${PHRASE_MAX} \u6761\uFF08\u5F53\u524D ${phrase}\uFF09`
-      );
-    }
-    if (broad < BROAD_MIN || broad > BROAD_MAX) {
-      pushErr(
-        errors,
-        `${gPrefix} BROAD \u5173\u952E\u8BCD\u987B ${BROAD_MIN}\u2013${BROAD_MAX} \u6761\uFF08\u5F53\u524D ${broad}\uFF09`
-      );
-    }
-    const total = exact + phrase + broad;
-    if (total > 0) {
-      const er = exact / total;
-      const pr = phrase / total;
-      const br = broad / total;
-      if (er < EXACT_RATIO_MIN || er > EXACT_RATIO_MAX) {
-        pushErr(
-          errors,
-          `${gPrefix} EXACT \u5360\u6BD4\u987B\u5728 ${EXACT_RATIO_MIN * 100}\u2013${EXACT_RATIO_MAX * 100}%\uFF08\u5F53\u524D ${(er * 100).toFixed(1)}%\uFF09`
-        );
-      }
-      if (pr < PHRASE_RATIO_MIN || pr > PHRASE_RATIO_MAX) {
-        pushErr(
-          errors,
-          `${gPrefix} PHRASE \u5360\u6BD4\u987B\u5728 ${PHRASE_RATIO_MIN * 100}\u2013${PHRASE_RATIO_MAX * 100}%\uFF08\u5F53\u524D ${(pr * 100).toFixed(1)}%\uFF09`
-        );
-      }
-      if (br < BROAD_RATIO_MIN || br > BROAD_RATIO_MAX) {
-        pushErr(
-          errors,
-          `${gPrefix} BROAD \u5360\u6BD4\u987B\u5728 ${BROAD_RATIO_MIN * 100}\u2013${BROAD_RATIO_MAX * 100}%\uFF08\u5F53\u524D ${(br * 100).toFixed(1)}%\uFF09`
-        );
-      }
-    }
-    for (const stem of v2Row.stems) {
-      if (!stems.has(stem)) {
-        pushErr(
-          errors,
-          `${gPrefix} KeywordsForBatchJob \u672A\u5305\u542B KeywordRecommendationsV2 \u8BCD\u5E72\uFF1A${stem}`
-        );
-      }
-    }
-  }
-  if (!options.skipManifest && options.manifestPath) {
-    validateManifestRoles(options.manifestPath, errors);
-  }
-  return stats;
-}
-function validateManifestRoles(manifestPath, errors) {
-  let raw;
-  try {
-    raw = JSON.parse(readFileSync4(manifestPath, "utf8"));
-  } catch {
-    pushErr(errors, `\u65E0\u6CD5\u8BFB\u53D6 campaign-manifest\uFF1A${manifestPath}`);
-    return;
-  }
-  const m = raw;
-  if (!m?.campaigns || !Array.isArray(m.campaigns)) {
-    pushErr(errors, "campaign-manifest \u987B\u5305\u542B campaigns \u6570\u7EC4");
-    return;
-  }
-  const roles = new Set(m.campaigns.map((c) => c.role?.toLowerCase()).filter(Boolean));
-  if (!roles.has("brand")) {
-    pushErr(errors, "campaign-manifest \u987B\u81F3\u5C11\u5305\u542B role=brand \u7684\u7CFB\u5217");
-  }
-  if (!roles.has("competitor")) {
-    pushErr(errors, "campaign-manifest \u987B\u81F3\u5C11\u5305\u542B role=competitor \u7684\u7CFB\u5217");
-  }
-}
-
 // src/commands/ad/campaign-create-validate.ts
 var VALID_BIDDING_STRATEGIES = [
   "TARGET_SPEND",
@@ -110389,7 +110232,7 @@ var DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
 function pushErr2(errors, msg) {
   errors.push(msg);
 }
-function pushWarn(warnings, msg) {
+function pushWarn2(warnings, msg) {
   warnings.push(msg);
 }
 function calcGoogleCharLength(text) {
@@ -110423,7 +110266,7 @@ function validateRsaAd(prefix, ad, errors, warnings) {
   } else if (headlines.length > 15) {
     pushErr2(errors, `${prefix} \u6807\u9898\u6700\u591A 15 \u6761\uFF08\u542B AddtionalHeadlines\uFF09\uFF0C\u5F53\u524D ${headlines.length} \u6761`);
   } else if (headlines.length < 12) {
-    pushWarn(warnings, `${prefix} \u6807\u9898\u63A8\u8350 12\u201315 \u6761\uFF08\u5F53\u524D ${headlines.length} \u6761\uFF09\uFF0C\u66F4\u591A\u7EC4\u5408\u53EF\u63D0\u5347\u6295\u653E\u8868\u73B0`);
+    pushWarn2(warnings, `${prefix} \u6807\u9898\u63A8\u8350 12\u201315 \u6761\uFF08\u5F53\u524D ${headlines.length} \u6761\uFF09\uFF0C\u66F4\u591A\u7EC4\u5408\u53EF\u63D0\u5347\u6295\u653E\u8868\u73B0`);
   }
   for (let i = 0; i < headlines.length; i++) {
     const len = calcGoogleCharLength(headlines[i]);
@@ -110442,7 +110285,7 @@ function validateRsaAd(prefix, ad, errors, warnings) {
   } else if (descriptions.length > 4) {
     pushErr2(errors, `${prefix} \u63CF\u8FF0\u6700\u591A 4 \u6761\uFF0C\u5F53\u524D ${descriptions.length} \u6761`);
   } else if (descriptions.length < 4) {
-    pushWarn(warnings, `${prefix} \u63CF\u8FF0\u63A8\u8350 4 \u6761\uFF08\u5F53\u524D ${descriptions.length} \u6761\uFF09`);
+    pushWarn2(warnings, `${prefix} \u63CF\u8FF0\u63A8\u8350 4 \u6761\uFF08\u5F53\u524D ${descriptions.length} \u6761\uFF09`);
   }
   for (let i = 0; i < descriptions.length; i++) {
     const len = calcGoogleCharLength(descriptions[i]);
@@ -110476,6 +110319,10 @@ function validateCampaignCreateConfigCore(cfg) {
   if (!cfg.customerName?.trim()) {
     pushErr2(errors, "customerName \u4E0D\u80FD\u4E3A\u7A7A\uFF08\u540E\u7AEF\uFF1Acustomer name is null or empty\uFF09");
   }
+  const accountNum = Number(cfg.account);
+  if (!Number.isFinite(accountNum) || accountNum <= 0) {
+    pushErr2(errors, "account \u5FC5\u987B\u662F\u53EF\u89E3\u6790\u4E3A\u6B63\u6570\u7684\u5A92\u4F53\u8D26\u6237 ID\uFF08\u63D0\u4EA4\u65F6 customerId \u4E3A number\uFF09");
+  }
   if (!cfg.campaign || typeof cfg.campaign !== "object" || Array.isArray(cfg.campaign)) {
     pushErr2(errors, "campaign \u5BF9\u8C61\u4E0D\u80FD\u4E3A\u7A7A\uFF08\u540E\u7AEF\uFF1Acampaign is null\uFF09");
     return { errors, warnings };
@@ -110512,6 +110359,11 @@ function validateCampaignCreateConfigCore(cfg) {
   const name = campaign["Name"];
   if (typeof name !== "string" || !name.trim()) {
     pushErr2(errors, "campaign.Name \u4E0D\u80FD\u4E3A\u7A7A");
+  } else if (cfg.name?.trim() && cfg.name.trim() !== name.trim()) {
+    pushWarn2(
+      warnings,
+      `\u5916\u5C42 name\uFF08${cfg.name}\uFF09\u4E0E campaign.Name\uFF08${name}\uFF09\u4E0D\u4E00\u81F4\uFF1B\u63D0\u4EA4\u65F6 campaignName \u4F18\u5148\u53D6\u5916\u5C42 name`
+    );
   }
   const budget = campaign["Budget"];
   if (typeof budget !== "number" || !Number.isFinite(budget) || budget <= 0) {
@@ -110566,7 +110418,7 @@ function validateCampaignCreateConfigCore(cfg) {
       if (typeof roas !== "number" || !Number.isFinite(roas) || roas <= 0) {
         pushErr2(errors, "TARGET_ROAS \u51FA\u4EF7\u7B56\u7565\u4E0B campaign.TargetRoas \u5FC5\u987B\u4E3A\u6B63\u6570");
       } else if (roas > 1e3) {
-        pushWarn(
+        pushWarn2(
           warnings,
           `campaign.TargetRoas=${roas} \u5F02\u5E38\u504F\u5927\uFF08250% ROAS \u5E94\u586B 2.5\uFF0C\u800C\u975E 250\uFF09`
         );
@@ -110653,19 +110505,15 @@ function validateCampaignCreateConfigCore(cfg) {
     }
     validateCampaignRsaCrossGroupHeadlines(campaign, errors);
   }
+  validateCampaignExtensionsForBatchJob(campaign, errors, warnings);
   return { errors, warnings };
 }
-function runCampaignCreateValidation(cfg, options = {}) {
-  const { errors, warnings } = validateCampaignCreateConfigCore(cfg);
-  const stats = validateCampaignLaunchStrategy(cfg, errors, {
-    manifestPath: options.manifestPath,
-    skipManifest: options.skipManifest
-  });
-  return { errors, warnings, stats };
+function runCampaignCreateValidation(cfg) {
+  return validateCampaignCreateConfigCore(cfg);
 }
 
 // src/commands/ad/campaign-load.ts
-import { readFileSync as readFileSync5 } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 function stripMetaKeys(value) {
   if (Array.isArray(value)) {
     return value.map((item) => stripMetaKeys(item));
@@ -110696,7 +110544,7 @@ function loadCampaignCreateConfig(configFile) {
 function tryLoadCampaignCreateConfig(configFile) {
   let raw;
   try {
-    raw = JSON.parse(readFileSync5(configFile, "utf8"));
+    raw = JSON.parse(readFileSync4(configFile, "utf8"));
   } catch {
     return null;
   }
@@ -110908,20 +110756,34 @@ async function runAdCampaignCreate(opts) {
     process.exit(1);
   }
   const campaignWithCents = convertBatchMoneyTreeFromYuan(cfg.campaign);
+  const ext = campaignWithCents.ExtensionsForBatchJob;
+  if (Array.isArray(ext) && ext.length > 0) {
+    campaignWithCents.ExtensionsForBatchJob = normalizeExtensionsForBatchJob(
+      ext
+    );
+  }
+  const adGroupsForBatchJob = campaignWithCents["AdGroupsForBatchJob"] ?? [];
+  const keywordRecommendationsV2 = adGroupsForBatchJob.filter((g) => typeof g.Name === "string" && g.Name.trim().length > 0).map((g) => ({ Key: g.Name, Value: [] }));
+  const customerIdNum = Number(cfg.account);
+  if (!Number.isFinite(customerIdNum) || customerIdNum <= 0) {
+    console.error(`
+\u274C account\uFF08customerId\uFF09\u65E0\u6548\uFF1A${cfg.account}
+`);
+    process.exit(1);
+  }
   const body = {
-    customerId: cfg.account,
+    // 与 Web AICreation 一致：customerId 为 number；智投 ID 可空字符串
+    customerId: customerIdNum,
     customerName: cfg.customerName,
     campaignName: cfg.name ?? cfg.campaign["Name"],
     url: cfg.url ?? "",
     locations: cfg.locations ?? [],
     productWords: cfg.productWords ?? [],
-    GoogleDataRecordId: cfg.googleDataRecordId ?? randomUUID2(),
+    GoogleDataRecordId: cfg.googleDataRecordId ?? "",
     DraftStatus: cfg.draft ? "Draft" : "Published",
+    KeywordRecommendationsV2: keywordRecommendationsV2,
     campaign: campaignWithCents
   };
-  if (cfg.KeywordRecommendationsV2 !== void 0) {
-    body["KeywordRecommendationsV2"] = cfg.KeywordRecommendationsV2;
-  }
   const url = `${config.apiBaseUrl}/command/campaign-creation-record/campaign-batch-asyncs`;
   let data;
   try {
@@ -113220,10 +113082,7 @@ async function runAiCreationUpdate(opts) {
 import { writeFileSync as writeFileSync3 } from "fs";
 async function runAdCampaignValidate(opts) {
   const cfg = loadCampaignCreateConfig(opts.configFile);
-  const { errors, warnings, stats } = runCampaignCreateValidation(cfg, {
-    manifestPath: opts.manifestFile,
-    skipManifest: opts.skipManifest
-  });
+  const { errors, warnings } = runCampaignCreateValidation(cfg);
   if (opts.writeNormalized) {
     const toWrite = stripMetaKeysForExport(cfg);
     writeFileSync3(opts.writeNormalized, `${JSON.stringify(toWrite, null, 2)}
@@ -113235,8 +113094,7 @@ async function runAdCampaignValidate(opts) {
         {
           ok: errors.length === 0,
           errors,
-          warnings,
-          stats
+          warnings
         },
         null,
         2
@@ -113250,17 +113108,10 @@ async function runAdCampaignValidate(opts) {
     if (errors.length > 0) {
       console.error("\n\u274C \u6295\u653E\u914D\u7F6E\u6821\u9A8C\u5931\u8D25\uFF1A");
       for (const e of errors) console.error(`   \u2022 ${e}`);
-      console.error(
-        `
-   \u7EDF\u8BA1\uFF1A\u5E7F\u544A\u7EC4 ${stats.adGroups} | \u6838\u5FC3 ${stats.core} | \u957F\u5C3E ${stats.longtail} | Exact ${stats.exact} | Phrase ${stats.phrase} | Broad ${stats.broad} | \u5426\u8BCD ${stats.negatives}
-`
-      );
+      console.error();
       process.exit(1);
     }
     console.log("\n\u2705 \u6295\u653E\u914D\u7F6E\u6821\u9A8C\u901A\u8FC7");
-    console.log(
-      `   \u5E7F\u544A\u7EC4 ${stats.adGroups} | \u6838\u5FC3 ${stats.core} | \u957F\u5C3E ${stats.longtail} | Exact ${stats.exact} | Phrase ${stats.phrase} | Broad ${stats.broad} | \u5426\u8BCD ${stats.negatives}`
-    );
     if (opts.writeNormalized) {
       console.log(`   \u5DF2\u5199\u5165\u89C4\u8303\u5316 JSON\uFF1A${opts.writeNormalized}`);
     }
@@ -113618,16 +113469,14 @@ function register20(program2) {
     }
   );
   adCmd.command("campaign-validate").description(
-    "\u6821\u9A8C campaign-create JSON\uFF08\u8BCD\u9762\u89C4\u8303\u5316 + \u540E\u7AEF\u786C\u7EA6\u675F + \u6295\u653E\u7ED3\u6784\u7B56\u7565\uFF1B\u4E0D\u8C03\u7528 API\uFF09\n\n  \u7528\u6CD5\uFF1A\n    siluzan-tso ad campaign-validate --config-file ./campaign.json\n    siluzan-tso ad campaign-validate --config-file ./campaign.json --write-normalized ./campaign.normalized.json"
-  ).requiredOption("--config-file <path>", "campaign-create JSON \u8DEF\u5F84").option("--manifest-file <path>", "\u591A\u7CFB\u5217 campaign-manifest.json\uFF08\u6821\u9A8C brand/competitor \u89D2\u8272\uFF09").option("--skip-manifest", "\u8DF3\u8FC7\u591A\u7CFB\u5217 manifest \u89D2\u8272\u68C0\u67E5", false).option(
+    "\u6821\u9A8C campaign-create JSON\uFF08\u8BCD\u9762\u89C4\u8303\u5316 + \u540E\u7AEF\u786C\u7EA6\u675F\uFF1B\u4E0D\u8C03\u7528 API\uFF09\n\n  \u7528\u6CD5\uFF1A\n    siluzan-tso ad campaign-validate --config-file ./campaign.json\n    siluzan-tso ad campaign-validate --config-file ./campaign.json --write-normalized ./campaign.normalized.json"
+  ).requiredOption("--config-file <path>", "campaign-create JSON \u8DEF\u5F84").option(
     "--write-normalized <path>",
     "\u5C06\u89C4\u8303\u5316\u540E\u7684 JSON \u5199\u5165\u8BE5\u8DEF\u5F84\uFF08\u5173\u952E\u8BCD\u8BCD\u9762\u5DF2\u4FEE\u6B63\uFF09"
-  ).option("--json", "\u8F93\u51FA { ok, errors, warnings, stats }", false).option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
+  ).option("--json", "\u8F93\u51FA { ok, errors, warnings }", false).option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
     async (opts) => {
       await runAdCampaignValidate({
         configFile: opts.configFile,
-        manifestFile: opts.manifestFile,
-        skipManifest: opts.skipManifest,
         writeNormalized: opts.writeNormalized,
         json: opts.json,
         verbose: opts.verbose

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.20-beta.15",
-  "publishedAt": 1779268611318
+  "version": "1.1.20-beta.17",
+  "publishedAt": 1779278285269
 }

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

@@ -1,12 +1,15 @@
 # `ad campaign-create` JSON 配置说明
 
-`siluzan-tso ad campaign-create` **仅**接受 `--config-file` 指向的 JSON 文件。该 JSON 的字段名与后端 `POST /command/campaign-creation-record/campaign-batch-asyncs` 的请求体 **完全一致**（PascalCase）：外层是 `CampaignCreationRecord`，内层 `campaign` 直接对齐 `Samm.Domain.AdsAcctMgmt.Campaign`。
+`siluzan-tso ad campaign-create` **仅**接受 `--config-file` 指向的 JSON 文件
 
-**CLI 不做结构转换、字段重命名或默认值填充**，只做三件事：
+**JSON 字段名保持 PascalCase**，与后端 `Campaign` / `CampaignCreationRecord` 契约一致；`ad campaign-validate` 阶段**不**改词面与结构。
+
+**`ad campaign-create` 提交前**，CLI 在 JSON 原文之外额外处理（不影响 validate 读到的「元」口径）：
 
 1. 剥除以 `_` 开头的注解键（如 `_meta`、`_comment_budget`）；
-2. 缺失 `googleDataRecordId` 时生成 UUID；
-3. 把 `campaign` 子树内的金额字段从主币种「元」深遍历换算为「分」（×100，与后端 `Campaign.Budget`、`MaxCPCAmount` 等字段单位一致）。
+2. 外层 body：`account` → 数字 `customerId`；补全 `KeywordRecommendationsV2`（按广告组名，`Value` 可为 `[]`）；`googleDataRecordId` 缺省为 `""`（与 Web 智投一致）；
+3. `campaign` 金额字段「元」→「分」（×100）；
+4. `ExtensionsForBatchJob` 中 SITELINK 的 `Properties` 规范化（见下文「SITELINK」）。
 
 JSON 模板：同目录 [`campaign-create-template.json`](campaign-create-template.json)。
 
@@ -24,17 +27,18 @@ JSON 模板：同目录 [`campaign-create-template.json`](campaign-create-templa
 
 | 字段                   | 类型                | 必填 | 说明                                                                                                   |
 | ---------------------- | ------------------- | :--: | ------------------------------------------------------------------------------------------------------ |
-| `account`              | string              |  ✅  | 顶层 `customerId`（Google 媒体账户 ID）                                                                |
-| `customerName`         | string              |  ✅  | 必须与 `list-accounts` 返回的 `mediaAccountName` **完全一致**（后端拒绝：customer name error）         |
-| `name`                 | string              |      | 智投展示用 `campaignName`；缺省时 CLI 用 `campaign.Name` 补齐                                          |
+| `account`              | string              |  ✅  | 媒体账户 ID；提交时转为数字 `customerId`（勿依赖引号字符串）                                            |
+| `customerName`         | string              |  ✅  | 须与 `list-accounts` 的 `mediaAccountName` **完全一致**，否则 `customer name error`                    |
+| `name`                 | string              |      | 智投 `campaignName`；缺省取 `campaign.Name`；账户内不得与已有在投/暂停系列重名，否则 BatchJob 系列创建失败 |
 | `url`                  | string              |      | 智投展示用 URL；后端只读，用于回显                                                                     |
 | `locations`            | string[]            |      | 展示用地区名（后端只读，可空数组）                                                                     |
 | `productWords`         | string[]            |      | 智投/推荐用产品核心词                                                                                  |
-| `googleDataRecordId`   | string \| null      |      | 智投记录 UUID；省略由 CLI 生成                                                                         |
+| `googleDataRecordId`   | string \| null      |      | 智投记录 ID；省略时提交 `""`（与 Web 智投一致）                                                        |
 | `draft`                | boolean             |      | `false`（默认）立即发布到 Google；`true` 仅保存草稿，需后续 `ad batch publish`                         |
-| `KeywordRecommendationsV2` | object[]        |  ✅(方案轨) | 每广告组一条：`{ Key: <AdGroup.Name>, Value: [{ keyword, tier: core\|longtail, class, montlySearch? }] }`；**validate 必填**，见 `google-ads-keyword-taxonomy.md` |
 | `campaign`             | object              |  ✅  | 内层 Campaign 对象，见下表                                                                             |
 
+> 提交时 CLI 另附 `KeywordRecommendationsV2`：`[{ Key: <广告组 Name>, Value: [] }, …]`，与 Web `/advertising/AICreation` 结构一致；JSON 文件内无需手写。
+
 ---
 
 ## 内层字段（`campaign` 对象）
@@ -46,7 +50,7 @@ JSON 模板：同目录 [`campaign-create-template.json`](campaign-create-templa
 
 | 字段                            | 类型                  | 必填 | 说明                                                                  |
 | ------------------------------- | --------------------- | :--: | --------------------------------------------------------------------- |
-| `Name`                          | string                |  ✅  | 广告系列名                                                            |
+| `Name`                          | string                |  ✅  | 广告系列名；须与外层 `name` 一致；账户内唯一（在投/暂停不可重名）                                      |
 | `StatusV2`                      | "Enabled" \| "Paused" |      | 默认 `Enabled`                                                        |
 | `ChannelTypeV2`                 | string                |      | 搜索系列填 `SEARCH`                                                   |
 
@@ -101,7 +105,18 @@ JSON 模板：同目录 [`campaign-create-template.json`](campaign-create-templa
 | ------------------------------- | -------- | ----------------------------------------------------------------------------- |
 | `AdGroupsForBatchJob`           | object[] | **至少 1 组**；见下                                                           |
 | `NegativeKeywordsForBatchJob`   | object[] | 系列级否词；元素：`{ KeywordText: string[], MatchTypeV2: "BROAD", FinalURL: "" }` |
-| `ExtensionsForBatchJob`         | object[] | 附加信息（CALL / SITELINK / STRUCTURED_SNIPPET 等）                           |
+| `ExtensionsForBatchJob`         | object[] | 附加信息；`Properties` 须 **string→string**（勿用数组值）。SITELINK 见下表 |
+
+#### SITELINK（`ExtensionsForBatchJob[i]`，`typeV2` / `AssetFieldType` = `SITELINK`）
+
+| 字段 | 类型 | 说明 |
+| ---- | ---- | ---- |
+| `level` / `Level` | string | 系列级填 `Campaign` |
+| `Properties` | object | 键值均为字符串；见下表 |
+| `Properties.Text` | string | 链接文字（必填）。可写 `LinkText`，提交前会映射为 `Text` |
+| `Properties.Line2` | string | 描述行 1，**≤ 25 字符**。可写 `Description1`，提交前映射为 `Line2` |
+| `Properties.Line3` | string | 描述行 2，**≤ 25 字符**；**不可省略或空字符串**（Google V20 不允许 null，空时 CLI 用 `Line2` 回填）。可写 `Description2` |
+| `Properties.DestinationUrl` | string | 落地页 URL（必填）。**勿**写 `FinalUrls` 数组——会导致 TSO 无法反序列化整包 body（`campaign creation record is null`） |
 
 ---
 
@@ -109,7 +124,7 @@ JSON 模板：同目录 [`campaign-create-template.json`](campaign-create-templa
 
 | 字段                  | 类型                  | 必填 | 说明                                                                            |
 | --------------------- | --------------------- | :--: | ------------------------------------------------------------------------------- |
-| `Name`                | string                |  ✅  | 组名                                                                            |
+| `Name`                | string                |  ✅  | 组名；用于提交体 `KeywordRecommendationsV2[].Key`                             |
 | `StatusV2`            | "Enabled" \| "Paused" |      | 默认 Enabled                                                                    |
 | `TypeV2`              | string                |      | 搜索系列填 `SEARCH_STANDARD`                                                    |
 | `RotationModeV2`      | string                |      | 一般 `Unspecified`                                                              |
@@ -147,7 +162,7 @@ JSON 模板：同目录 [`campaign-create-template.json`](campaign-create-templa
 | ------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------- |
 | `CampaignCommandController.CreateCampaignAsync`                                            | `customerName` 非空 / `campaign` 非空                                                              |
 | `CampaignCommandController` 行 94–106                                                      | `campaign.TargetPartnerSearchNetwork` 必须 false；`!TargetGoogleSearch && TargetSearchNetwork` 拒绝 |
-| Google Ads BatchJob                                                                         | RSA 字段数与字符上限；关键词词面非空                                                                |
+| Google Ads BatchJob                                                                         | RSA 字段数与字符上限；关键词词面非空；SITELINK `Line2`/`Line3` ≤25 字且不可 null；系列名不可与在投/暂停系列重名 |
 | CLI 实务                                                                                    | `Budget > 0`、地理/语言至少 1 项、日期格式与先后、出价策略与配套字段                                |
 
-任一 error 都会阻断提交；warning 仅提示。
+`ad campaign-validate` 通过不保证 BatchJob 成功。异步结果用 `ad batch get` 轮询；`HasFailed` / 部分失败时用 `ad batch diff` 对照 JSON 补缺，系列级失败时改 JSON 重提，勿在半成品上反复整包创建。写操作须 `--commit`，见 `references/google-ads.md` § ad campaign-create。

package/dist/skill/references/google-ads-campaign-plan.md

@@ -4,42 +4,12 @@
 
 ---
 
-## 逻辑总览
-
-```mermaid
-flowchart TB
-  subgraph input [输入]
-    A[用户已有结构化计划]
-    B[仅口述/官网]
-  end
-  subgraph build [构建]
-    RAG[rag 可选]
-    KW[keyword 拓词]
-    V2[KeywordRecommendationsV2]
-    KFJ[KeywordsForBatchJob]
-    JSON[campaign-create JSON]
-  end
-  subgraph gate [门禁]
-    VAL[ad campaign-validate]
-  end
-  subgraph deliver [交付]
-    MD[Markdown 投影]
-    OK[用户确认]
-    CC[ad campaign-create]
-    POLL[ad batch get / diff]
-  end
-  A --> JSON
-  B --> RAG --> KW --> V2 --> KFJ --> JSON
-  JSON --> VAL
-  VAL -->|通过| MD --> OK --> CC --> POLL
-```
-
 | 轨 | 条件 | 动作 |
 |----|------|------|
 | **直读直写** | 用户已给账户/预算/组/词/RSA 等结构化数据 | 整理为 PascalCase JSON → validate → 确认 → create |
 | **方案先行** | 无完整结构，或要求「先出方案」 | 读本文件 + 必读规则 → 生成 JSON → validate → Markdown → 确认 → create |
 
-**硬约束（SKILL 与 CLI 一致）**
+**硬约束**
 
 - 可执行真相只有 **JSON**（`assets/campaign-create-template.json` 同构）；Markdown 只读投影。
 - 改需求 **只改 JSON**，再 `campaign-validate`，再刷新 Markdown。
@@ -48,19 +18,24 @@ flowchart TB
 
 ---
 
-## 标准流水线（7 步）
+## 标准流水线
 
 | 步 | 动作 | 文档/命令 |
 |----|------|-----------|
 | 1 | `list-accounts` 锁定 `account` / `customerName` / 币种 | `references/currency.md` |
 | 2 | 可选 `rag query`；`keyword` / `keyword geo-list` 拓词 | `references/keyword-planner-workflows.md` |
-| 3 | 填 `KeywordRecommendationsV2`（tier/class）→ 投影 `KeywordsForBatchJob`（Exact/Phrase/Broad） | `google-ads-rules/google-ads-keyword-taxonomy.md` |
+| 3 | 按分层规则写入 `KeywordsForBatchJob`（Exact/Phrase/Broad） | `google-ads-rules/google-ads-keyword-taxonomy.md`（参考，非 CLI 强制） |
 | 4 | 填 `campaign`（预算/出价/地域/否词≥20/RSA/附加信息） | `assets/campaign-create-template.md` |
 | 5 | **`ad campaign-validate --config-file <json>`**（失败只改 JSON） | 下文「校验」 |
 | 6 | 输出：**JSON 代码块** → **Markdown**（`google-ads-launch-plan-template.md` 正文）→ 待确认 | — |
-| 7 | 用户确认后 **`ad campaign-create`** → `ad batch get` → 成功则 **`ad batch diff`** | `google-ads.md` § batch |
+| 7 | 用户确认后 **`ad campaign-create`** | `google-ads.md`|
+| 8 | 每隔5s 获取创建结果| `ad batch get --id <taskId> --config-file ./campaign.json` |
+| 9 | 创建失败根据失败原因修改json重新走创建流程，部分成功/成功/部分失败：都调用来做最后一步调整 `ad batch diff --batch-id <taskId> --config-file ./campaign.json` | |
+| 10 | 输出所有失败的内容与原因，并询问用户是否需要修改后单独添加到系列中如果用户要求是则读取 `references\google-ads.md` 来获取对应缺失部分的创建命令 |
+
+
 
-多系列：每系列一个 JSON；可选 `campaign-manifest.json`（`role: brand|competitor|generic`），validate 时 `--manifest-file`。
+多系列：每系列一个 JSON；可选 `campaign-manifest.json`（`role: brand|competitor|generic`）仅作文件组织参考。
 
 ---
 
@@ -70,7 +45,7 @@ flowchart TB
 
 | 文档 | 用途 |
 |------|------|
-| `google-ads-rules/google-ads-keyword-taxonomy.md` | 核心/长尾数量、匹配块、V2 字段、validate 规则 |
+| `google-ads-rules/google-ads-keyword-taxonomy.md` | 核心/长尾与匹配块**建议**（Agent 参考，CLI 不强制） |
 | `google-ads-rules/google-ads-compliance.md` | 词与文案合规 |
 | `google-ads-rules/sensitive-industries.md` | 敏感行业（若相关） |
 | `google-ads-rules/google-ads-launch-plan-template.md` | 用户可见 Markdown 结构与 RSA/否词表 |
@@ -98,13 +73,13 @@ flowchart TB
 
 ```bash
 siluzan-tso ad campaign-validate --config-file ./campaign.json [--json] [--write-normalized <path>]
-siluzan-tso ad campaign-validate --config-file ./campaign.json --manifest-file ./manifest.json
 siluzan-tso ad campaign-create --config-file ./campaign.json
 siluzan-tso ad batch get --id <taskId> --config-file ./campaign.json
 siluzan-tso ad batch diff --batch-id <taskId> --config-file ./campaign.json
+siluzan-tso ad geo search
 ```
 
-validate 与 create **共用** `runCampaignCreateValidation`（词面规范化 + 后端硬约束 + taxonomy 策略，策略项为 **error**）。细则仅维护在 `google-ads-keyword-taxonomy.md`。
+validate 与 create **共用** `runCampaignCreateValidation`：词面规范化 + 后端/Google 硬约束（预算、RSA、匹配符号与 `MatchTypeV2` 对齐、搜索网络等）。**不含**关键词分层数量、匹配占比、否词条数下限。
 
 ---
 

package/dist/skill/references/google-ads-rules/google-ads-campaign-optimization.md

@@ -484,21 +484,7 @@ DDA 最低要求：~300 转化 + ~3,000 广告互动/30 天。
 siluzan-tso ad geo search -a <CID> -q "United States"
 
 # 2. 一体化创建（系列 + 广告组 + 关键词 + 广告）
-siluzan-tso ad campaign-create \
-  -a <CID> \
-  --customer-name "账户名" \
-  --name "Search_LeadGen_CRM_US" \
-  --budget 100 \
-  --bidding TARGET_SPEND \
-  --location-ids 2840 \
-  --adgroup-name "核心词_CRM" \
-  --max-cpc 5 \
-  --url "https://www.example.com" \
-  --keywords "[CRM software],[project management tool],\"best CRM\",business software" \
-  --headlines "H1,H2,H3,..." \
-  --descriptions "D1,D2" \
-  --final-url "https://www.example.com/crm" \
-  --path1 "CRM" --path2 "Free-Trial"
+siluzan-tso ad campaign-create
 
 # 3. 查看创建进度
 siluzan-tso ad batch get --id <taskId>

package/dist/skill/references/google-ads-rules/google-ads-keyword-taxonomy.md

@@ -1,21 +1,7 @@
-# Google 搜索广告关键词分层与数量规范
+# Google 搜索广告关键词分层与数量规范（Agent 参考）
 
-> 所属 skill：`siluzan-tso`。`ad campaign-validate` 对本文件的数字规则做 **error** 校验。  
-> 全流程（JSON 单源、7 步、必读文档列表）见 `references/google-ads-campaign-plan.md`。
-
----
-
-## KeywordRecommendationsV2 字段
-
-| 字段 | 说明 |
-|------|------|
-| `Key` | 与 `AdGroupsForBatchJob[].Name` 一致（校验时忽略大小写/首尾空格） |
-| `Value[].keyword` | 词干（英文小写书写，无匹配符号） |
-| `Value[].tier` | `core` \| `longtail` |
-| `Value[].class` | 见下表 `class` 列 |
-| `Value[].montlySearch` 等 | 可选；来自 `siluzan-tso keyword` Planner |
-
-`KeywordsForBatchJob` 中**每个** V2 词干须至少出现一次（规范化后比对）；匹配符号由 `MatchTypeV2` 决定。
+> 所属 skill：`siluzan-tso`。本文为**方案撰写参考**，**不由** `ad campaign-validate` / `ad campaign-create` 强制执行。  
+> 建户 JSON 契约与 CLI 硬约束见 `assets/campaign-create-template.md`、`references/google-ads-campaign-plan.md`。
 
 ---
 
@@ -24,13 +10,13 @@
 | 模块 | 规则 | 建议数量 | 示例 |
 |------|------|----------|------|
 | Campaign | 按产品线拆分 | 3–10 个系列（多文件 + `campaign-manifest.json`） | Payment Gateway / CRM |
-| Ad Group | 一个搜索意图一组 | 每组 5–20 个词（V2 合计） | Payment API Integration |
-| 核心词（core） | 高商业意图 | 每组 **5–15** | payment api pricing |
-| 长尾词（longtail） | 场景明确的长 query | 每组 **10–25** | crm for manufacturing |
+| Ad Group | 一个搜索意图一组 | 每组 5–20 个词 | Payment API Integration |
+| 核心词 | 高商业意图 | 每组 **5–15** | payment api pricing |
+| 长尾词 | 场景明确的长 query | 每组 **10–25** | crm for manufacturing |
 | Exact Match | 核心高转化 | 每组 **2–8** 条 | [stripe alternative] |
 | Phrase Match | 主流量 | 每组 **3–10** 条 | "payment solution" |
 | Broad Match | 少量测试 | 每组 **1–3** 条 | payment platform |
-| 否定关键词 | 基础否词库 | 系列级去重后 **≥20** | free / jobs / tutorial |
+| 否定关键词 | 基础否词库 | 系列级建议 **≥20** | free / jobs / tutorial |
 | 品牌系列 | 独立 Campaign | manifest `role: brand` | company crm |
 | 竞品系列 | 独立 Campaign | manifest `role: competitor` | stripe alternative |
 | Search Terms | 运营节奏 | 每周检查 | `ad search-terms` |
@@ -43,9 +29,11 @@
 | Phrase | 50%–60% | 主流量 |
 | Broad | 10%–20% | 扩量测试 |
 
+关键词写入 JSON 的 **`campaign.AdGroupsForBatchJob[].KeywordsForBatchJob`**（`MatchTypeV2` + `KeywordText` 词面）；无顶层 `KeywordRecommendationsV2` 字段。
+
 ---
 
-## 核心词生成规则（tier=core）
+## 核心词生成规则
 
 | 类型 | 规则 | 示例 |
 |------|------|------|
@@ -55,11 +43,9 @@
 | 竞品词 | competitor + alternative | stripe alternative |
 | 行业术语 | 专业词汇/缩写 | merchant acquiring |
 
-`class` 取值：`product` | `service` | `pain` | `competitor` | `industry`。
-
 ---
 
-## 长尾词生成规则（tier=longtail）
+## 长尾词生成规则
 
 | 类型 | 规则 | 示例 |
 |------|------|------|
@@ -68,13 +54,11 @@
 | 技术词 | api/sdk/integration | payment sdk integration |
 | 问题词 | how to + 问题 | how to reduce failed payments |
 
-`class` 取值：`scenario` | `geo` | `tech` | `question`。
-
 拓词编排见 `references/keyword-planner-workflows.md`；Planner 出价用 `*USD` 与 `*CNY`，根级 `bidAmountCurrency` / `usdToCnyExchangeRate`。
 
 ---
 
-## 多系列 manifest（可选）
+## 多系列 manifest（可选，仅组织多份 JSON）
 
 ```json
 {
@@ -88,12 +72,9 @@
 }
 ```
 
-校验：`ad campaign-validate --config-file ./campaign-generic.json --manifest-file ./campaign-manifest.json`  
-单系列草稿：`--skip-manifest`。
-
 ---
 
-## 搜索网络（硬约束）
+## 搜索网络（`campaign-validate` / `campaign-create` 硬约束）
 
 JSON 中必须为：
 

package/dist/skill/references/google-ads-rules/google-ads-launch-plan-template.md

@@ -6,7 +6,7 @@
 > 触发：用户要投放方案/确认稿；**先完成 JSON + validate，再填本模板正文**。
 >
 > 字段契约：`assets/campaign-create-template.json` + `campaign-create-template.md`  
-> 关键词数量与 V2：`google-ads-keyword-taxonomy.md`（勿在本文件重复记数字规则）
+> 关键词数量建议：`google-ads-keyword-taxonomy.md`（Agent 参考，CLI 不强制）
 
 ---
 
@@ -44,7 +44,7 @@
 | 语言                   | `campaign.targetedLanguages: [{ id: 1000 }]`（英语 1000 / 中文 1017）                                  |
 | 起止日期               | `campaign.StartTime`、`campaign.EndTime`（YYYY-MM-DD）                                                |
 | 落地页                 | 外层 `url`；广告组级 `KeywordsForBatchJob[].FinalURL`、创意级 `AdsForBatchJob[].Finalurl`              |
-| 关键词分层元数据       | `KeywordRecommendationsV2: [{ Key: <广告组名>, Value: [{ keyword, tier, class, ... }] }]`          |
+| 关键词                 | `campaign.AdGroupsForBatchJob[].KeywordsForBatchJob`（`MatchTypeV2` + `KeywordText`）                  |
 | 否定词                 | `campaign.NegativeKeywordsForBatchJob: [{ KeywordText: [...], MatchTypeV2: "BROAD", FinalURL: "" }]`  |
 | 附加信息               | `campaign.ExtensionsForBatchJob`                                                                       |
 | 广告组                 | `campaign.AdGroupsForBatchJob[]`：`Name`、`MaxCPCAmount`、`KeywordsForBatchJob`、`AdsForBatchJob`       |
@@ -140,7 +140,7 @@ AI 生成计划时，**先写好 JSON，再按以下格式输出说明**。`{{
 
 ### 3.3 广告组（Ad Group）与关键词矩阵
 
-**原则**：每一个广告组内的关键词**意图必须高度一致**；匹配符号：`[完全]`、`"词组"`、广泛无括号。Markdown 表列须含 **词面 | tier | class | MatchTypeV2 | FinalURL**（均来自 JSON）。每组须满足 `google-ads-keyword-taxonomy.md` 数量与 `ad campaign-validate` 规则。
+**原则**：每一个广告组内的关键词**意图必须高度一致**；匹配符号：`[完全]`、`"词组"`、广泛无括号。Markdown 表列建议含 **词面 | 分层(tier) | 类型(class) | MatchTypeV2 | FinalURL**（分层列可来自方案笔记，写入 JSON 的仅为 `KeywordsForBatchJob`）。数量建议见 `google-ads-keyword-taxonomy.md`。
 
 #### 系列 1：{{系列名称}}
 
@@ -326,7 +326,7 @@ Display URL：`{{domain}}/{{path1}}/{{path2}}`（Path1/Path2 各 ≤ 15 字符
 
 在生成计划前，至少确认以下信息（缺失则向用户询问）：
 
-| 必须 | 信息                             | 用途                                                                                                                            |
+| 必须 | 信息                             | 用途                                                            zz                                                                |
 | ---- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
 | ✅   | 广告账户 ID                      | 关联投放账户（执行时由助手使用，勿向用户解释命令行）                                                                            |
 | ✅   | 推广的产品/服务                  | 决定关键词和文案方向                                                                                                            |
@@ -347,7 +347,7 @@ Display URL：`{{domain}}/{{path1}}/{{path2}}`（Path1/Path2 各 ≤ 15 字符
 | 系列命名           | 遵循 `[类型]_[目标]_[定向]_[地域]_[匹配]` 规范（参考 `google-ads-campaign-optimization.md` 2.1 节）；可与业务名并用（如「B2B 源头寻源」）                                                                                                          |
 | 出价策略（首月）   | **产品默认**：核心系列用 **Manual CPC**，且**关闭 eCPC**，写明建议 CPC 上限区间；测流/爆款系列可用 **Maximize Clicks + 最高 CPC**；与 `TARGET_SPEND` 等等价映射以实际 CLI/API 可选值为准时在助手侧转换，**用户可见正文始终用 Google Ads 界面用语** |
 | 出价策略（次月）   | **产品默认**：近 **30 天满 30 个**约定转化（如表单）后切换 **tCPA**；无足够数据则延续人工或 Max Clicks 并写明条件                                                                                                                                  |
-| 关键词（每广告组） | 数量、匹配块、V2 分层以 **`google-ads-keyword-taxonomy.md`** 为准（validate 为 error）；组内意图一致；符号 `[完全]` / `"词组"` / 广泛；策略争议见 `google-ads-keyword-strategy.md` |
+| 关键词（每广告组） | 数量与匹配块建议见 **`google-ads-keyword-taxonomy.md`**；组内意图一致；符号 `[完全]` / `"词组"` / 广泛；策略争议见 `google-ads-keyword-strategy.md` |
 | 否定词             | **账户级 5 类词包**填满模板表；系列级补充 5–10 条；上线后搜索词**每日**迭代                                                                                                                                                                        |
 | RSA                | **12–15** 标题、**4** 描述；**至少 H1、H2 与 D1** 在表中标注【固定📌】及目标位置与理由；字符合规见第十一章字数≤30                                                                                                                                  |
 | 附加信息           | Sitelink **6–8**（可含 OEM/验厂/报价/目录/联系）；Callout **6–8**；Snippet **≥1 组、每组 ≥4 值**；**Lead Form** 线索业务建议填标题与必填字段                                                                                                       |

package/dist/skill/references/google-ads.md

@@ -273,7 +273,7 @@ siluzan-tso keyword geo-list [--country-code <US,CN,...>] [--name-contains <text
 
 ## ad campaign-validate — 投放 JSON 校验
 
-不提交 API；方案阶段**必跑**。命令、选项、与 create 共用校验逻辑见 **`references/google-ads-campaign-plan.md`** § 校验与创建；策略规则见 `google-ads-rules/google-ads-keyword-taxonomy.md`。
+不提交 API；创建系列前**建议**跑。命令、选项、与 create 共用校验逻辑见 **`references/google-ads-campaign-plan.md`** § 校验与创建（后端/Google 硬约束，不含关键词分层占比）。
 
 ---
 
@@ -337,7 +337,7 @@ siluzan-tso ad batch diff --batch-id <taskId> --config-file ./campaign.json
 2. 缺失 `googleDataRecordId` 时生成 UUID；
 3. 把 `campaign` 子树内金额字段（`Budget`、`MaxCPCAmount`、`TargetSpend_BidCeilingAmount`、`TargetCpa_BidingAmount`、`MaxCpmAmount`、`MaxCPVAmount`、`TargetCpaAmount`、`MaxCPC`）从「元」深遍历 ×100 转为「分」。
 
-**字段校验：**提交前自动执行 `runCampaignCreateValidation`（与 `ad campaign-validate` 相同）：后端镜像硬约束 + `google-ads-keyword-taxonomy.md` 策略表（含 `KeywordRecommendationsV2`、匹配块、否词数量、搜索网络）。
+**字段校验：**提交前自动执行 `runCampaignCreateValidation`（与 `ad campaign-validate` 相同）：后端镜像硬约束 + 词面/RSA/搜索网络等；关键词分层与匹配占比见 `google-ads-keyword-taxonomy.md`（仅 Agent 参考，CLI 不校验）。
 
 **广告组：** 写在 `campaign.AdGroupsForBatchJob` 数组中（至少 1 项），字段名严格 PascalCase（`Name` / `MaxCPCAmount` / `KeywordsForBatchJob` / `AdsForBatchJob`）。详见 `campaign-create-template.md`。
 

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

@@ -162,7 +162,7 @@ siluzan-tso keyword -k "structural adhesive,SG-200,curtain wall bonding" --url "
 
 ### 6）词包 → campaign-create JSON
 
-拓词落盘结果 + `google-ads-keyword-taxonomy.md` 分层规则 → 填 JSON（V2、`KeywordsForBatchJob`、validate、Markdown 投影、create）见 **`references/google-ads-campaign-plan.md`** § 标准流水线 **步 3–7**。
+拓词落盘结果 + `google-ads-keyword-taxonomy.md` 分层建议 → 填 JSON（`KeywordsForBatchJob`、`campaign-validate`、`campaign-create`）见 **`references/google-ads-campaign-plan.md`** § 标准流水线 **步 3–7**。
 
 ### 7）拓词结果标准化导出
 

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.15'
+$PKG_VERSION = '1.1.20-beta.17'
 $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.15"
+readonly PKG_VERSION="1.1.20-beta.17"
 readonly CLI_BIN="siluzan-tso"
 readonly SKILL_LABEL="Siluzan TSO"
 readonly INSTALL_CMD="npm install -g siluzan-tso-cli@beta"

package/eval/cases/uj-ad-campaign-validate-before-create-stub.scenario.json

@@ -4,7 +4,7 @@
   "turns": [
     "账户 6326027735，客户名从 list-accounts 取。为 B2B payment API 做一条美国搜索系列方案 JSON，含 1 个广告组、核心词与长尾词分层，落盘后请先校验再让我确认是否创建。"
   ],
-  "judgeExpectation": "路径：生成 campaign-create JSON 后应调用 ad campaign-validate（可用 stub），通过后再提议 campaign-create；不得跳过 validate。\n输出：JSON 含 KeywordRecommendationsV2；核心/长尾数量符合 taxonomy；须提及 validate 门禁。",
+  "judgeExpectation": "路径：生成 campaign-create JSON 后应调用 ad campaign-validate（可用 stub），通过后再提议 campaign-create；不得跳过 validate。\n输出：JSON 含 KeywordsForBatchJob；须提及 validate 门禁（硬约束，非 taxonomy 数量强制）。",
   "skillMapping": "references/google-ads-campaign-plan.md",
   "judgeReferencePaths": [
     "references/google-ads-campaign-plan.md"

package/eval/cases/uj-ad-keywords-camping-tent-outdoor-plan.scenario.json

@@ -4,6 +4,6 @@
   "turns": [
     "针对关键词「camping tent, outdoor gear, hiking equipment」生成一个完整的 Google 广告投放方案，包括系列与广告组结构。"
   ],
-  "judgeExpectation": "路径：应引用关键词策略/匹配方式/否定词等规则文档思路，给出分层与预算分配，用户确认前不执行写命令。\n输出：campaign-create JSON + Markdown 说明；含 KeywordRecommendationsV2；说明 validate 步骤；不要求真实 create。",
+  "judgeExpectation": "路径：应引用关键词策略/匹配方式/否定词等规则文档思路，给出分层与预算分配，用户确认前不执行写命令。\n输出：campaign-create JSON + Markdown 说明；含 KeywordsForBatchJob；说明 validate 步骤；不要求真实 create。",
   "skillMapping": "references/google-ads-rules/google-ads-keyword-strategy.md"
 }

package/eval/cases/uj-ad-outdoor-campgear-search-plan.scenario.json

@@ -4,7 +4,7 @@
   "turns": [
     "我卖户外露营装备，主要面向美国和欧洲市场，网站是 https://www.campgear.com ，每天预算 3000 美金，帮我规划一套 Google 搜索广告方案。先出方案别直接开户投钱。"
   ],
-  "judgeExpectation": "路径：应先阅读 google-ads.md 规则流程，再输出可确认的投放方案（地域/语言/预算/系列结构），不得跳过合规与确认直接执行 campaign-create。\n输出：须含可执行的 campaign-create JSON（唯一数据源）+ 从 JSON 推导的 Markdown 说明；JSON 须含 KeywordRecommendationsV2（tier/class）；方案阶段应说明须 ad campaign-validate 通过后再 create。",
+  "judgeExpectation": "路径：应先阅读 google-ads.md 规则流程，再输出可确认的投放方案（地域/语言/预算/系列结构），不得跳过合规与确认直接执行 campaign-create。\n输出：须含可执行的 campaign-create JSON（唯一数据源）+ 从 JSON 推导的 Markdown 说明；关键词在 KeywordsForBatchJob；方案阶段应说明须 ad campaign-validate 通过后再 create。",
   "skillMapping": "references/google-ads-campaign-plan.md；google-ads-rules",
   "judgeReferencePaths": [
     "references/google-ads-campaign-plan.md"

package/package.json

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