siluzan-tso-cli 1.1.49-beta.3 → 1.1.49-beta.4

package/README.md

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

package/dist/index.js

@@ -117511,6 +117511,35 @@ function liveAdHasHeadline(ad, headline) {
   if (!h) return false;
   return collectRsaHeadlines(ad).includes(h);
 }
+function overlapHeadlineCount(planned, live) {
+  const liveSet = new Set(collectRsaHeadlines(live));
+  let n = 0;
+  for (const h of planned) {
+    const key = h.trim().toLowerCase();
+    if (key && liveSet.has(key)) n += 1;
+  }
+  return n;
+}
+function pickLiveAdForPlannedRsa(plannedHeadlines, primary, unmatchedLiveAds) {
+  if (unmatchedLiveAds.length === 0) return null;
+  const primaryKey = primary.trim().toLowerCase();
+  let bestIdx = -1;
+  let bestScore = 0;
+  for (let i = 0; i < unmatchedLiveAds.length; i++) {
+    const live = unmatchedLiveAds[i];
+    const overlap = overlapHeadlineCount(plannedHeadlines, live);
+    if (overlap <= 0) continue;
+    const hasPrimary = primaryKey.length > 0 && liveAdHasHeadline(live, primary);
+    const score = (hasPrimary ? 1e3 : 0) + overlap;
+    if (score > bestScore) {
+      bestScore = score;
+      bestIdx = i;
+    }
+  }
+  if (bestIdx < 0) return null;
+  const [picked] = unmatchedLiveAds.splice(bestIdx, 1);
+  return picked ?? null;
+}
 function livePoolHasText(pool, text2) {
   const t = text2.trim().toLowerCase();
   return t.length > 0 && pool.has(t);
@@ -117768,12 +117797,7 @@ function compareCampaignCreateToLive(cfg, campaignId, live, meta) {
       const liveAdsInGroup = live.ads.filter(
         (a) => belongsToCampaign(a, campaignId, campaignName) && belongsToAdGroup(a, groupName, liveGroupId)
       );
-      const liveHeadlinePool = /* @__PURE__ */ new Set();
-      const liveDescPool = /* @__PURE__ */ new Set();
-      for (const la of liveAdsInGroup) {
-        for (const h of collectRsaHeadlines(la)) liveHeadlinePool.add(h);
-        for (const d of collectRsaDescriptions(la)) liveDescPool.add(d);
-      }
+      const unmatchedLiveAds = [...liveAdsInGroup];
       const ads = g["AdsForBatchJob"];
       if (Array.isArray(ads)) {
         for (let ai = 0; ai < ads.length; ai++) {
@@ -117783,11 +117807,14 @@ function compareCampaignCreateToLive(cfg, campaignId, live, meta) {
           const primary = pickString2(ad["headlinePart1"], ad["AdTitle"]);
           const finalUrl = pickString2(ad["Finalurl"], ad["DestinationUrl"], ad["finalUrl"]);
           const rsaAssets = listPlannedRsaAssets(ad, groupPath, ai, groupName);
+          const plannedHeadlines = rsaAssets.filter((a) => a.kind === "headline").map((a) => a.text);
+          const adLabel = primary || `AdsForBatchJob[${ai}]`;
           if (groupAbsent) {
             pushItem(items3, {
               layer: "ad",
               path: path50,
               adGroupName: groupName,
+              adLabel,
               plannedContent: primary ? `RSA \u9996\u6807\u9898: ${primary}${finalUrl ? `  |  \u843D\u5730\u9875: ${finalUrl}` : ""}` : `AdsForBatchJob[${ai}]\uFF08\u7F3A\u5C11 headlinePart1\uFF09`,
               status: "skipped",
               liveNote: "\u5E7F\u544A\u7EC4\u672A\u521B\u5EFA\uFF0C\u8DF3\u8FC7\u521B\u610F\u6BD4\u5BF9",
@@ -117799,6 +117826,7 @@ function compareCampaignCreateToLive(cfg, campaignId, live, meta) {
                 layer: "ad",
                 path: asset.path,
                 adGroupName: groupName,
+                adLabel,
                 plannedContent: `${label}: ${asset.text}`,
                 status: "skipped",
                 liveNote: "\u5E7F\u544A\u7EC4\u672A\u521B\u5EFA\uFF0C\u8DF3\u8FC7\u6587\u6848\u6BD4\u5BF9",
@@ -117807,11 +117835,15 @@ function compareCampaignCreateToLive(cfg, campaignId, live, meta) {
             }
             continue;
           }
+          const matchedLive = pickLiveAdForPlannedRsa(plannedHeadlines, primary, unmatchedLiveAds);
+          const liveHeadlineSet = new Set(matchedLive ? collectRsaHeadlines(matchedLive) : []);
+          const liveDescSet = new Set(matchedLive ? collectRsaDescriptions(matchedLive) : []);
           if (!primary) {
             pushItem(items3, {
               layer: "ad",
               path: path50,
               adGroupName: groupName,
+              adLabel,
               plannedContent: `AdsForBatchJob[${ai}]\uFF08\u7F3A\u5C11 headlinePart1\uFF0C\u65E0\u6CD5\u6BD4\u5BF9\u6574\u6761 RSA\uFF09`,
               status: "missing",
               liveNote: `\u540C\u7EC4\u5DF2\u6709 ${liveAdsInGroup.length} \u6761\u521B\u610F`,
@@ -117819,41 +117851,44 @@ function compareCampaignCreateToLive(cfg, campaignId, live, meta) {
             });
             for (const asset of rsaAssets) {
               const label = asset.kind === "headline" ? "\u6807\u9898" : "\u63CF\u8FF0";
-              const pool = asset.kind === "headline" ? liveHeadlinePool : liveDescPool;
+              const pool = asset.kind === "headline" ? liveHeadlineSet : liveDescSet;
               const found = livePoolHasText(pool, asset.text);
               pushItem(items3, {
                 layer: "ad",
                 path: asset.path,
                 adGroupName: groupName,
+                adLabel,
                 plannedContent: `${label}: ${asset.text}`,
                 status: found ? "ok" : "missing",
-                liveNote: found ? `\u540C\u7EC4 RSA \u6587\u6848\u6C60\u5DF2\u542B\u6B64${label}` : `\u540C\u7EC4 RSA \u6587\u6848\u6C60\u672A\u89C1\u6B64${label}`,
+                liveNote: found ? `\u5DF2\u5728\u5BF9\u5E94 RSA \u4E0A\u627E\u5230\u6B64${label}` : `\u5BF9\u5E94 RSA \u672A\u89C1\u6B64${label}`,
                 summary: found ? `RSA ${label}\u5DF2\u751F\u6548\uFF1A${asset.text}` : `RSA ${label}\u672A\u751F\u6548\uFF1A${asset.text}`
               });
             }
             continue;
           }
-          const rsaFound = liveAdsInGroup.some((la) => liveAdHasHeadline(la, primary));
+          const rsaFound = matchedLive != null && liveAdHasHeadline(matchedLive, primary);
           pushItem(items3, {
             layer: "ad",
             path: path50,
             adGroupName: groupName,
+            adLabel,
             plannedContent: `RSA \u9996\u6807\u9898: ${primary}${finalUrl ? `  |  \u843D\u5730\u9875: ${finalUrl}` : ""}`,
             status: rsaFound ? "ok" : "missing",
-            liveNote: rsaFound ? `\u540C\u7EC4\u5DF2\u5339\u914D\u9996\u6807\u9898\uFF08\u5171 ${liveAdsInGroup.length} \u6761 RSA\uFF09` : `\u540C\u7EC4\u5DF2\u6709 ${liveAdsInGroup.length} \u6761 RSA\uFF0C\u65E0\u6B64\u9996\u6807\u9898`,
-            summary: rsaFound ? `RSA \u5DF2\u521B\u5EFA\uFF08\u9996\u6761\u6807\u9898\u300C${primary}\u300D\uFF09` : `RSA \u672A\u521B\u5EFA\uFF08\u9996\u6761\u6807\u9898\u300C${primary}\u300D\u5728\u8D26\u6237\u5185\u672A\u627E\u5230\uFF09`
+            liveNote: rsaFound ? `\u5DF2\u4E00\u5BF9\u4E00\u5339\u914D\u5230\u540C\u7EC4 RSA\uFF08\u6807\u9898\u91CD\u53E0 ${overlapHeadlineCount(plannedHeadlines, matchedLive)}\uFF09` : `\u540C\u7EC4 ${liveAdsInGroup.length} \u6761 RSA \u4E2D\u65E0\u6B64\u9996\u6807\u9898\uFF0C\u6216\u5DF2\u88AB\u5176\u5B83\u8BA1\u5212\u5E7F\u544A\u8BA4\u9886`,
+            summary: rsaFound ? `RSA \u5DF2\u521B\u5EFA\uFF08\u9996\u6761\u6807\u9898\u300C${primary}\u300D\uFF09` : `RSA \u672A\u521B\u5EFA\uFF08\u9996\u6761\u6807\u9898\u300C${primary}\u300D\u5728\u5BF9\u5E94\u5E7F\u544A\u4E0A\u672A\u627E\u5230\uFF09`
           });
           for (const asset of rsaAssets) {
             const label = asset.kind === "headline" ? "\u6807\u9898" : "\u63CF\u8FF0";
-            const pool = asset.kind === "headline" ? liveHeadlinePool : liveDescPool;
+            const pool = asset.kind === "headline" ? liveHeadlineSet : liveDescSet;
             const found = livePoolHasText(pool, asset.text);
             pushItem(items3, {
               layer: "ad",
               path: asset.path,
               adGroupName: groupName,
+              adLabel,
               plannedContent: `${label}: ${asset.text}`,
               status: found ? "ok" : "missing",
-              liveNote: found ? `\u540C\u7EC4 RSA \u6587\u6848\u6C60\u5DF2\u542B\u6B64${label}` : `\u540C\u7EC4 RSA \u6587\u6848\u6C60\u672A\u89C1\u6B64${label}\uFF08\u6C60\u5185 ${pool.size} \u6761\uFF09`,
+              liveNote: found ? `\u5DF2\u5728\u5BF9\u5E94 RSA \u4E0A\u627E\u5230\u6B64${label}` : `\u5BF9\u5E94 RSA \u672A\u89C1\u6B64${label}\uFF08\u8BE5\u5E7F\u544A\u6587\u6848 ${pool.size} \u6761\uFF09`,
               summary: found ? `RSA ${label}\u5DF2\u751F\u6548\uFF1A${asset.text}` : `RSA ${label}\u672A\u751F\u6548\uFF1A${asset.text}`
             });
           }
@@ -118035,6 +118070,7 @@ async function fetchLiveSnapshotForCampaign(config, accountId, campaignId, campa
   const params = new URLSearchParams();
   params.set("startDate", toGoogleDate(void 0, -30));
   params.set("endDate", toGoogleDate(void 0, 0));
+  params.set("newest", "true");
   const qs = params.toString();
   const [campaigns, adGroups, keywords, negativeKeywords, ads, extensions, targetedLocations] = await Promise.all([
     fetchList(
@@ -118353,13 +118389,31 @@ function buildCampaignCreateStatusMarkdown(result) {
         byGroup.set(key, list);
       }
       for (const [groupName, groupItems] of byGroup) {
-        const title = layer === "keyword" ? `## \u5E7F\u544A\u7EC4\u300C${groupName}\u300D\xB7 \u5173\u952E\u8BCD` : `## \u5E7F\u544A\u7EC4\u300C${groupName}\u300D\xB7 RSA \u6587\u6848`;
-        lines.push(title, ``);
-        lines.push(`| \u72B6\u6001 | \u8BA1\u5212\u5185\u5BB9 |`, `| --- | --- |`);
+        if (layer === "keyword") {
+          lines.push(`## \u5E7F\u544A\u7EC4\u300C${groupName}\u300D\xB7 \u5173\u952E\u8BCD`, ``);
+          lines.push(`| \u72B6\u6001 | \u8BA1\u5212\u5185\u5BB9 |`, `| --- | --- |`);
+          for (const item of groupItems) {
+            lines.push(`| ${statusLabel(item.status)} | ${mdCell(item.plannedContent)} |`);
+          }
+          lines.push(``);
+          continue;
+        }
+        lines.push(`## \u5E7F\u544A\u7EC4\u300C${groupName}\u300D\xB7 RSA \u6587\u6848`, ``);
+        const byAd = /* @__PURE__ */ new Map();
         for (const item of groupItems) {
-          lines.push(`| ${statusLabel(item.status)} | ${mdCell(item.plannedContent)} |`);
+          const key = item.adLabel ?? "\u2014";
+          const list = byAd.get(key) ?? [];
+          list.push(item);
+          byAd.set(key, list);
+        }
+        for (const [adLabel, adItems] of byAd) {
+          lines.push(`### \u5E7F\u544A\u300C${adLabel}\u300D`, ``);
+          lines.push(`| \u72B6\u6001 | \u8BA1\u5212\u5185\u5BB9 |`, `| --- | --- |`);
+          for (const item of adItems) {
+            lines.push(`| ${statusLabel(item.status)} | ${mdCell(item.plannedContent)} |`);
+          }
+          lines.push(``);
         }
-        lines.push(``);
       }
       continue;
     }
@@ -136974,19 +137028,30 @@ function mapAdGroupRows(payload) {
     ])
   );
 }
+function displayAdTitle(row) {
+  const raw = String(row.adTitle ?? "").trim();
+  if (raw) return { adTitle: raw, adTitleFallback: false };
+  const camp = String(row.campaignName ?? "").trim();
+  const group = String(row.adGroupName ?? "").trim();
+  const fallback = [camp, group].filter(Boolean).join(" / ");
+  return { adTitle: fallback, adTitleFallback: fallback.length > 0 };
+}
 function mapAdRows(payload) {
-  return asRows2(payload).map(
-    (r) => pickMetrics(r, [
+  return asRows2(payload).map((r) => {
+    const mapped = pickMetrics(r, [
       "campaignId",
       "campaignName",
       "adGroupId",
       "adGroupName",
       "adId",
-      "adTitle",
       "adType",
       "adStatus"
-    ])
-  );
+    ]);
+    const title = displayAdTitle(r);
+    mapped.adTitle = title.adTitle;
+    mapped.adTitleFallback = title.adTitleFallback;
+    return mapped;
+  });
 }
 function mapKeywordRows(payload) {
   return asRows2(payload).map((r) => {

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.49-beta.3",
-  "publishedAt": 1788247766399
+  "version": "1.1.49-beta.4",
+  "publishedAt": 1788313426269
 }

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

@@ -55,7 +55,7 @@ siluzan-tso bing-analysis render \
   - `audienceGender[]`：`{gender, spend, impressions, clicks, ctr, averageCpc, conversions}`
   - `campaigns[]`：`{campaignName, campaignStatus, campaignStatusDisplay, spend, impressions, clicks, ctr, conversions, costPerConversion}`
   - `adGroups[]`：`{adGroupName, campaignName, qualityScore, spend, clicks, ctr, conversions, costPerConversion}`
-  - `ads[]`：`{adTitle, adGroupName, adType, spend, clicks, ctr, conversions}`（RSA 常 `adTitle=""`，HTML 整列为空则不渲染该列并在表上方提醒）
+  - `ads[]`：`{adTitle, adGroupName, adType, spend, clicks, ctr, conversions}`（RSA 的报表 `adTitle` 常为空，`render` 用「系列 / 广告组」兜底展示并在表上方注明）
   - `keywords[]`：`{keyword, matchType, qualityScore, spend, ctr, averageCpc, conversions, costPerConversion}`
   - `searchTerms[]`：`{searchQuery, keyword, deliveredMatchType, spend, ctr, conversions, costPerConversion}`
 - `narrative`（**Agent 必填，唯一由 Agent 撰写的叙事内容**）：
@@ -225,7 +225,7 @@ Bing 网关常不返回 `averageDailyCost`、`activeDays`（或为 0）。CLI
 | 广告组 | `bing-analysis --sections ad-groups` | `ad-groups-*.json`           |
 | 广告   | `bing-analysis --sections ads`       | `ads-*.json`                 |
 
-**数据呈现**：各表按消耗降序；系列含 `campaignStatus`；广告组可含质量分相关字段（以 outline 为准）。写入 JSON `tables.campaigns[]` / `tables.adGroups[]` / `tables.ads[]`。RSA 的 `adTitle` 常为空串，HTML 不展示空标题列。
+**数据呈现**：各表按消耗降序；系列含 `campaignStatus`；广告组可含质量分相关字段（以 outline 为准）。写入 JSON `tables.campaigns[]` / `tables.adGroups[]` / `tables.ads[]`。RSA 无创意标题时 HTML 仍展示「广告标题」列，内容为「系列 / 广告组」。
 
 **分析（必写，三个子块各写一段，不可合并为一句带过）**：
 

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

@@ -1025,14 +1025,14 @@
           const currency = currencyOf(data);
           const section = data.narrative?.sections?.ads;
           const sorted = topBySpend(rows, 10);
-          const showTitle = sorted.some((r) => String(r.adTitle || "").trim() !== "");
-          const titleNotice = !showTitle && sorted.length > 0
-            ? `<div class="empty-note">Bing 响应式搜索广告的报表不返回单条标题，本表不展示「广告标题」列。</div>`
+          const usedFallback = sorted.some((r) => r.adTitleFallback);
+          const titleNotice = usedFallback
+            ? `<div class="empty-note">Bing 响应式搜索广告的报表不返回创意标题，本列用「系列 / 广告组」名称代替。</div>`
             : "";
           const body = sorted
             .map(
               (r) => `<tr>
-  ${showTitle ? `<td>${escapeHtml(r.adTitle || "—")}</td>` : ""}
+  <td>${escapeHtml(r.adTitle || "—")}</td>
   <td>${escapeHtml(r.adGroupName || "—")}</td>
   <td>${escapeHtml(r.adType || "—")}</td>
   <td class="num">${money(r.spend, currency)}</td>
@@ -1047,7 +1047,7 @@
               ? `<div class="card-title-row"><h3>广告 Top 10</h3><span class="hint">共 ${rows.length} 条广告，按消耗排序</span></div>
 ${titleNotice}
 <div class="table-wrap"><table>
-  <thead><tr>${showTitle ? "<th>广告标题</th>" : ""}<th>广告组</th><th>广告类型</th><th class="num">消耗</th><th class="num">点击</th><th class="num">CTR</th><th class="num">转化</th></tr></thead>
+  <thead><tr><th>广告标题</th><th>广告组</th><th>广告类型</th><th class="num">消耗</th><th class="num">点击</th><th class="num">CTR</th><th class="num">转化</th></tr></thead>
   <tbody>${body}</tbody>
 </table></div>`
               : emptyNoteHtml();

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

@@ -55,7 +55,7 @@ siluzan-tso bing-analysis render \
   - `audienceGender[]`：`{gender, spend, impressions, clicks, ctr, averageCpc, conversions}`
   - `campaigns[]`：`{campaignName, campaignStatus, campaignStatusDisplay, spend, impressions, clicks, ctr, conversions, costPerConversion}`
   - `adGroups[]`：`{adGroupName, campaignName, qualityScore, spend, clicks, ctr, conversions, costPerConversion}`
-  - `ads[]`：`{adTitle, adGroupName, adType, spend, clicks, ctr, conversions}`（RSA 常 `adTitle=""`，HTML 整列为空则不渲染该列并在表上方提醒）
+  - `ads[]`：`{adTitle, adGroupName, adType, spend, clicks, ctr, conversions}`（RSA 的报表 `adTitle` 常为空，`render` 用「系列 / 广告组」兜底展示并在表上方注明）
   - `keywords[]`：`{keyword, matchType, qualityScore, spend, ctr, averageCpc, conversions, costPerConversion}`
   - `searchTerms[]`：`{searchQuery, keyword, deliveredMatchType, spend, ctr, conversions, costPerConversion}`
 - `narrative`（**Agent 必填，唯一由 Agent 撰写的叙事内容**）：
@@ -225,7 +225,7 @@ Bing 网关常不返回 `averageDailyCost`、`activeDays`（或为 0）。CLI
 | 广告组 | `bing-analysis --sections ad-groups` | `ad-groups-*.json`           |
 | 广告   | `bing-analysis --sections ads`       | `ads-*.json`                 |
 
-**数据呈现**：各表按消耗降序；系列含 `campaignStatus`；广告组可含质量分相关字段（以 outline 为准）。写入 JSON `tables.campaigns[]` / `tables.adGroups[]` / `tables.ads[]`。RSA 的 `adTitle` 常为空串，HTML 不展示空标题列。
+**数据呈现**：各表按消耗降序；系列含 `campaignStatus`；广告组可含质量分相关字段（以 outline 为准）。写入 JSON `tables.campaigns[]` / `tables.adGroups[]` / `tables.ads[]`。RSA 无创意标题时 HTML 仍展示「广告标题」列，内容为「系列 / 广告组」。
 
 **分析（必写，三个子块各写一段，不可合并为一句带过）**：
 

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