siluzan-tso-cli 1.1.20-beta.24 → 1.1.20-beta.25

package/README.md

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

package/dist/index.js

@@ -109507,6 +109507,7 @@ function formatLengthViolationsReport(violations) {
 
 // src/commands/ad/campaign-extensions.ts
 var SITELINK_DESCRIPTION_MAX_LEN = 25;
+var CALLOUT_TEXT_MAX_LEN = 25;
 function pushErr(errors, msg) {
   errors.push(msg);
 }
@@ -109546,8 +109547,14 @@ function normalizeExtensionsForBatchJob(extensions) {
   return extensions.map((ext) => {
     const raw = ext.Properties ?? {};
     let props = coercePropertiesFromRaw(raw);
-    if (extensionType(ext) === "SITELINK") {
+    const type = extensionType(ext);
+    if (type === "SITELINK") {
       props = normalizeSitelinkProperties(props);
+    } else if (type === "CALLOUT") {
+      if (props.CalloutText && !props.Text) {
+        props.Text = props.CalloutText;
+        delete props.CalloutText;
+      }
     }
     const out = { ...ext, Properties: props };
     if (typeof ext.level === "string" && !out.Level) out.Level = ext.level;
@@ -109623,6 +109630,87 @@ function validateSitelinkProperties(prefix, raw, errors, warnings, lengthViolati
     );
   }
 }
+function validateCalloutProperties(prefix, rec, errors, _warnings, lengthViolations) {
+  const props = rec["Properties"];
+  if (!props || typeof props !== "object" || Array.isArray(props)) {
+    pushErr(errors, `${prefix}\uFF08CALLOUT\uFF09\u7F3A\u5C11 Properties`);
+    return;
+  }
+  const raw = props;
+  if (raw["CalloutText"] !== void 0 && raw["Text"] === void 0) {
+    pushErr(
+      errors,
+      `${prefix}.Properties \u4F7F\u7528\u4E86\u9519\u8BEF\u5B57\u6BB5\u540D "CalloutText"\uFF08\u540E\u7AEF ExtensionConstants.CalloutText = "Text"\uFF0CProperties key \u5FC5\u987B\u662F "Text"\uFF09\u3002\u8BF7\u5C06 "CalloutText" \u6539\u4E3A "Text"\uFF0C\u5426\u5219\u540E\u7AEF CreateCalloutFeedItem \u8BFB\u5230 null \u2192 ArgumentNullException`
+    );
+    return;
+  }
+  const text = raw["Text"];
+  if (typeof text !== "string" || !text.trim()) {
+    pushErr(
+      errors,
+      `${prefix}.Properties.Text \u4E0D\u80FD\u4E3A\u7A7A\uFF08CALLOUT \u5FC5\u586B\uFF0C\u540E\u7AEF CreateCalloutFeedItem \u8BFB\u53D6 Properties["Text"]\uFF09`
+    );
+    return;
+  }
+  if (text.length > CALLOUT_TEXT_MAX_LEN) {
+    pushLengthViolation(lengthViolations, {
+      path: `${prefix}.Properties.Text`,
+      field: "Text",
+      kind: "callout_text",
+      limit: CALLOUT_TEXT_MAX_LEN,
+      actual: text.length,
+      countMode: "ascii",
+      text
+    });
+    pushErr(
+      errors,
+      `${prefix}.Properties.Text \u8D85\u8FC7 ${CALLOUT_TEXT_MAX_LEN} \u5B57\u7B26\uFF08\u5F53\u524D ${text.length}\uFF0CGoogle \u786C\u7EA6\u675F\uFF09\uFF1A"${text}"`
+    );
+  }
+}
+function validateCallProperties(prefix, rec, errors) {
+  const props = rec["Properties"];
+  if (!props || typeof props !== "object" || Array.isArray(props)) {
+    pushErr(errors, `${prefix}\uFF08CALL\uFF09\u7F3A\u5C11 Properties`);
+    return;
+  }
+  const raw = props;
+  if (raw["CountryCode"] !== void 0 && raw["ContryCode"] === void 0) {
+    pushErr(
+      errors,
+      `${prefix}.Properties \u4F7F\u7528\u4E86 "CountryCode"\uFF0C\u4F46\u540E\u7AEF ExtensionConstants.CallCountryCode = "ContryCode"\uFF08\u540E\u7AEF typo\uFF0C\u7F3A\u4E00\u4E2A u\uFF09\u3002\u8BF7\u5C06\u5B57\u6BB5\u540D\u6539\u4E3A "ContryCode"\uFF0C\u5426\u5219\u540E\u7AEF\u8BFB\u5230 null \u2192 ArgumentNullException`
+    );
+  } else if (!raw["ContryCode"] || typeof raw["ContryCode"] !== "string" || !raw["ContryCode"].trim()) {
+    pushErr(
+      errors,
+      `${prefix}.Properties.ContryCode \u4E0D\u80FD\u4E3A\u7A7A\uFF08CALL \u5FC5\u586B\uFF0C\u6CE8\u610F\u540E\u7AEF typo\uFF1AContryCode \u975E CountryCode\uFF09`
+    );
+  }
+  if (!raw["PhoneNumber"] || typeof raw["PhoneNumber"] !== "string" || !raw["PhoneNumber"].trim()) {
+    pushErr(errors, `${prefix}.Properties.PhoneNumber \u4E0D\u80FD\u4E3A\u7A7A\uFF08CALL \u5FC5\u586B\uFF09`);
+  }
+}
+function validateStructuredSnippetExtension(prefix, rec, errors) {
+  const ssv = rec["StructuredSnippetHeaderValue"];
+  if (ssv === void 0 || ssv === null) {
+    pushErr(
+      errors,
+      `${prefix}\uFF08STRUCTURED_SNIPPET\uFF09\u7F3A\u5C11\u9876\u5C42\u5B57\u6BB5 StructuredSnippetHeaderValue\uFF08\u683C\u5F0F\uFF1A{ "Key": "Services", "Value": ["item1", "item2"] }\uFF09\u3002\u540E\u7AEF CreateStructuredSnippetFeedItem \u4E0D\u8D70 Properties\uFF0CStructuredSnippetHeaderValue \u4E3A null \u65F6\u8FD4\u56DE null Asset`
+    );
+    return;
+  }
+  if (typeof ssv !== "object" || Array.isArray(ssv)) {
+    pushErr(errors, `${prefix}.StructuredSnippetHeaderValue \u5FC5\u987B\u662F\u5BF9\u8C61 { Key: string; Value: string[] }`);
+    return;
+  }
+  const sv = ssv;
+  if (typeof sv["Key"] !== "string" || !sv["Key"].trim()) {
+    pushErr(errors, `${prefix}.StructuredSnippetHeaderValue.Key \u4E0D\u80FD\u4E3A\u7A7A\uFF08\u7247\u6BB5\u6807\u9898\uFF0C\u5982 "Services"\uFF09`);
+  }
+  if (!Array.isArray(sv["Value"]) || sv["Value"].length === 0) {
+    pushErr(errors, `${prefix}.StructuredSnippetHeaderValue.Value \u4E0D\u80FD\u4E3A\u7A7A\u6570\u7EC4\uFF08\u81F3\u5C11\u586B\u4E00\u4E2A\u7247\u6BB5\u503C\uFF09`);
+  }
+}
 function validateCampaignExtensionsForBatchJob(campaign, errors, warnings, lengthViolations = []) {
   const extensions = campaign["ExtensionsForBatchJob"];
   if (extensions === void 0) return;
@@ -109639,21 +109727,23 @@ function validateCampaignExtensionsForBatchJob(campaign, errors, warnings, lengt
     }
     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,
-        lengthViolations
-      );
-    } else if (type === "SITELINK") {
-      pushErr(errors, `${prefix}\uFF08SITELINK\uFF09\u7F3A\u5C11 Properties`);
+    if (type === "SITELINK") {
+      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 (props && typeof props === "object") {
+        validateSitelinkProperties(prefix, props, errors, warnings, lengthViolations);
+      } else {
+        pushErr(errors, `${prefix}\uFF08SITELINK\uFF09\u7F3A\u5C11 Properties`);
+      }
+    } else if (type === "CALLOUT") {
+      validateCalloutProperties(prefix, rec, errors, warnings, lengthViolations);
+    } else if (type === "CALL") {
+      validateCallProperties(prefix, rec, errors);
+    } else if (type === "STRUCTURED_SNIPPET") {
+      validateStructuredSnippetExtension(prefix, rec, errors);
     }
   }
 }
@@ -110476,7 +110566,12 @@ function validateRsaAd(prefix, ad, errors, warnings, lengthViolations) {
   }
   validateRsaDisplayPath(prefix, ad, errors, lengthViolations);
   const finalUrl = ad["Finalurl"] ?? ad["DestinationUrl"];
-  if (typeof finalUrl === "string" && finalUrl.length > 0 && !URL_REGEX.test(finalUrl)) {
+  if (!finalUrl || typeof finalUrl !== "string" || !finalUrl.trim()) {
+    pushErr2(
+      errors,
+      `${prefix} Finalurl\uFF08\u843D\u5730\u9875 URL\uFF09\u4E0D\u80FD\u4E3A\u7A7A\uFF08\u540E\u7AEF BuildResponsiveSearchAd \u5199\u5165 FinalUrls\uFF0C\u4E3A\u7A7A Google \u62D2\u7EDD\uFF09`
+    );
+  } else if (!URL_REGEX.test(finalUrl)) {
     pushErr2(errors, `${prefix} Finalurl \u683C\u5F0F\u4E0D\u6B63\u786E\uFF08\u5E94\u4EE5 http(s):// \u5F00\u5934\uFF09\uFF1A${finalUrl}`);
   }
   validateRsaHeadlinesWithinAd(prefix, ad, errors);
@@ -110622,6 +110717,16 @@ function validateCampaignCreateConfigCore(cfg) {
   const targetedLanguages = campaign["targetedLanguages"];
   if (!Array.isArray(targetedLanguages) || targetedLanguages.length === 0) {
     pushErr2(errors, "campaign.targetedLanguages \u4E0D\u80FD\u4E3A\u7A7A\uFF08\u82F1\u8BED id=1000\uFF0C\u4E2D\u6587 id=1017\uFF09");
+  } else {
+    for (let i = 0; i < targetedLanguages.length; i++) {
+      const lang = targetedLanguages[i];
+      if (!lang || lang["id"] === void 0 && lang["Id"] === void 0) {
+        pushErr2(
+          errors,
+          `campaign.targetedLanguages[${i}] \u7F3A\u5C11 id \u5B57\u6BB5\uFF08\u540E\u7AEF BuildCampaignCriterion \u8BFB domainCriterion.Id \u6784\u5EFA ResourceNames.LanguageConstant\uFF09`
+        );
+      }
+    }
   }
   const start = campaign["StartTime"];
   const end = campaign["EndTime"];
@@ -110636,6 +110741,48 @@ function validateCampaignCreateConfigCore(cfg) {
       pushErr2(errors, `campaign.EndTime\uFF08${end}\uFF09\u5FC5\u987B\u665A\u4E8E StartTime\uFF08${start}\uFF09`);
     }
   }
+  const VALID_DAY_OF_WEEK_V2 = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+  const VALID_MINUTE_OF_HOUR_V2 = ["Zero", "Fifteen", "Thirty", "FortyFive"];
+  const adSchedules = campaign["AdSchedules"];
+  if (Array.isArray(adSchedules) && adSchedules.length > 0) {
+    for (let i = 0; i < adSchedules.length; i++) {
+      const s = adSchedules[i];
+      const sPrefix = `campaign.AdSchedules[${i}]`;
+      if (!s || typeof s !== "object") {
+        pushErr2(errors, `${sPrefix} \u5FC5\u987B\u662F\u5BF9\u8C61`);
+        continue;
+      }
+      const dow = s["DayOfWeekV2"];
+      if (dow === void 0 || dow === null || typeof dow === "string" && !VALID_DAY_OF_WEEK_V2.includes(dow)) {
+        pushErr2(
+          errors,
+          `${sPrefix}.DayOfWeekV2 \u65E0\u6548\uFF08${String(dow)}\uFF09\uFF0C\u5408\u6CD5\u503C\uFF1A${VALID_DAY_OF_WEEK_V2.join(" | ")}`
+        );
+      }
+      const startHour = s["StartHour"];
+      const endHour = s["EndHour"];
+      if (typeof startHour !== "number" || startHour < 0 || startHour > 23) {
+        pushErr2(errors, `${sPrefix}.StartHour \u5FC5\u987B\u662F 0\u201323 \u7684\u6574\u6570`);
+      }
+      if (typeof endHour !== "number" || endHour < 1 || endHour > 24) {
+        pushErr2(errors, `${sPrefix}.EndHour \u5FC5\u987B\u662F 1\u201324 \u7684\u6574\u6570\uFF0824 \u8868\u793A\u5168\u5929\u7ED3\u675F\uFF09`);
+      }
+      const startMin = s["StartMinuteV2"];
+      const endMin = s["EndMinuteV2"];
+      if (startMin !== void 0 && typeof startMin === "string" && !VALID_MINUTE_OF_HOUR_V2.includes(startMin)) {
+        pushErr2(
+          errors,
+          `${sPrefix}.StartMinuteV2 \u65E0\u6548\uFF08${startMin}\uFF09\uFF0C\u5408\u6CD5\u503C\uFF1A${VALID_MINUTE_OF_HOUR_V2.join(" | ")}`
+        );
+      }
+      if (endMin !== void 0 && typeof endMin === "string" && !VALID_MINUTE_OF_HOUR_V2.includes(endMin)) {
+        pushErr2(
+          errors,
+          `${sPrefix}.EndMinuteV2 \u65E0\u6548\uFF08${endMin}\uFF09\uFF0C\u5408\u6CD5\u503C\uFF1A${VALID_MINUTE_OF_HOUR_V2.join(" | ")}`
+        );
+      }
+    }
+  }
   if (cfg.url !== void 0 && cfg.url !== "" && !URL_REGEX.test(cfg.url)) {
     pushErr2(errors, `url\uFF08${cfg.url}\uFF09\u683C\u5F0F\u4E0D\u6B63\u786E\uFF0C\u5E94\u4EE5 http(s):// \u5F00\u5934`);
   }
@@ -110654,6 +110801,15 @@ function validateCampaignCreateConfigCore(cfg) {
       if (typeof gName !== "string" || !gName.trim()) {
         pushErr2(errors, `${gPrefix}.Name \u4E0D\u80FD\u4E3A\u7A7A`);
       }
+      const gTypeV2 = g["TypeV2"];
+      if (gTypeV2 === void 0 || gTypeV2 === null) {
+        pushErr2(
+          errors,
+          `${gPrefix}.TypeV2 \u4E0D\u80FD\u4E3A\u7A7A\uFF08\u641C\u7D22\u5E7F\u544A\u586B "SEARCH_STANDARD"\uFF0C\u540E\u7AEF BuildAdGroupOperations \u5F3A\u8F6C AdGroupTypeV2 enum\uFF09`
+        );
+      } else if (typeof gTypeV2 === "string" && (gTypeV2.toUpperCase() === "UNSPECIFIED" || gTypeV2.toUpperCase() === "UNKNOWN")) {
+        pushErr2(errors, `${gPrefix}.TypeV2 \u4E0D\u80FD\u4E3A "${gTypeV2}"\uFF08\u4F1A\u5BFC\u81F4 Google \u62D2\u7EDD\u5E7F\u544A\u7EC4\uFF09`);
+      }
       const mc = g["MaxCPCAmount"];
       if (mc !== void 0 && (typeof mc !== "number" || !Number.isFinite(mc) || mc < 0)) {
         pushErr2(errors, `${gPrefix}.MaxCPCAmount \u5FC5\u987B\u4E3A\u975E\u8D1F\u6570\u5B57\uFF08\u5355\u4F4D\u300C\u5143\u300D\uFF09`);
@@ -110677,8 +110833,21 @@ function validateCampaignCreateConfigCore(cfg) {
         for (let j = 0; j < kws.length; j++) {
           const block = kws[j];
           const texts = block?.["KeywordText"];
-          if (!Array.isArray(texts) || texts.length === 0) {
-            pushErr2(errors, `${gPrefix}.KeywordsForBatchJob[${j}].KeywordText \u4E0D\u80FD\u4E3A\u7A7A\u6570\u7EC4`);
+          const items = block?.["Items"];
+          const hasTexts = Array.isArray(texts) && texts.length > 0;
+          const hasItems = Array.isArray(items) && items.length > 0;
+          if (!hasTexts && !hasItems) {
+            pushErr2(
+              errors,
+              `${gPrefix}.KeywordsForBatchJob[${j}] KeywordText \u6570\u7EC4\u548C Items \u6570\u7EC4\u4E0D\u80FD\u540C\u65F6\u4E3A\u7A7A\uFF08\u540E\u7AEF GetAdGroupCriterionOperations \u8981\u6C42\u81F3\u5C11\u4E00\u4E2A\u975E\u7A7A\uFF09`
+            );
+          } else if (hasTexts) {
+            for (let k = 0; k < texts.length; k++) {
+              const kw = texts[k];
+              if (typeof kw !== "string" || !kw.trim()) {
+                pushErr2(errors, `${gPrefix}.KeywordsForBatchJob[${j}].KeywordText[${k}] \u4E0D\u80FD\u4E3A\u7A7A\u5B57\u7B26\u4E32`);
+              }
+            }
           }
         }
       }

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.20-beta.24",
-  "publishedAt": 1779360784218
+  "version": "1.1.20-beta.25",
+  "publishedAt": 1779364196042
 }

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