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

package/README.md

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

package/dist/index.js

@@ -125029,8 +125029,8 @@ function buildGoogleAdsDiagnosisCollectAgentHint(snapDir) {
     "Google Ads \u8BCA\u65AD collect \u5DF2\u5B8C\u6210\uFF08\u4EC5\u4E8B\u5B9E\u6570\u636E\uFF0C\u4E0D\u542B\u5EFA\u8BAE\u6027\u6587\u6848\uFF09\u3002",
     `1) Read ${dir}/${GOOGLE_ADS_DIAGNOSIS_COLLECT_BASENAME}\uFF08reportData + agentBrief\uFF09\uFF1B`,
     "2) Read references/report-templates/google-ads-diagnosis.md\uFF0C\u7531 Agent \u64B0\u5199\u5168\u90E8 analysis/suggestions\u3001diagnosisOverview\u3001summary\u3001accountInfo.businessModel/industry\u3001budgetCompetitiveness[].strategy\u3001newFeatures[].optimizerRecommendation\u3001adCreativeOptimization.items[].suggestion \u7B49\uFF1B",
-    `3) \u5C06 reportData \u4E0E\u53D9\u4E8B\u5B57\u6BB5\u5408\u5E76\u5199\u5165 ${dir}/${GOOGLE_ADS_DIAGNOSIS_REPORT_BASENAME}\uFF1B`,
-    `4) siluzan-tso google-ads-diagnosis render --data ${dir}/${GOOGLE_ADS_DIAGNOSIS_REPORT_BASENAME} --out ${dir}/google-ads-diagnosis-report.html\u3002`,
+    `3) \u5C06 reportData \u4E0E\u53D9\u4E8B\u5B57\u6BB5\u5408\u5E76\u5199\u5165 ${dir}/${GOOGLE_ADS_DIAGNOSIS_REPORT_BASENAME}\uFF08**\u7981\u6B62\u6539\u5199** campaigns/geographic/keywords \u7684 items \u884C\uFF0C\u53EA\u586B analysis/suggestions\uFF09\uFF1B`,
+    `4) siluzan-tso google-ads-diagnosis render --data ${dir}/${GOOGLE_ADS_DIAGNOSIS_REPORT_BASENAME} --out ${dir}/google-ads-diagnosis-report.html\uFF08\u9ED8\u8BA4\u540C\u76EE\u5F55 collect \u81EA\u52A8\u6062\u590D\u88AB\u6539\u574F\u7684 items\uFF09\u3002`,
     "\u7981\u6B62\u5728\u672A\u7ECF\u8FC7 Agent \u64B0\u5199\u7684\u60C5\u51B5\u4E0B\u76F4\u63A5 render collect \u4EA7\u7269\uFF1B\u7F3A\u4EFB\u4E00\u5EFA\u8BAE\u5B57\u6BB5 render \u4F1A\u5931\u8D25\u3002"
   ].join("\n");
 }
@@ -126155,13 +126155,90 @@ function formatGoogleAdsDiagnosisContentErrors(check) {
   return parts.join("\n");
 }
 
-// src/commands/google-ads-diagnosis/render-report.ts
+// src/commands/google-ads-diagnosis/merge-collect-facts.ts
+var GOOGLE_ADS_DIAGNOSIS_COMPARISON_MODULES = [
+  "campaigns",
+  "geographic",
+  "keywords"
+];
 function asRecord6(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return null;
+}
+function isValidRateChange(value) {
+  if (value === null || value === void 0) return true;
+  return typeof value === "number" && Number.isFinite(value);
+}
+function isComparisonTableRowValid(row) {
+  const rec = asRecord6(row);
+  if (!rec) return false;
+  if (!String(rec.title ?? "").trim()) return false;
+  if (!Number.isFinite(Number(rec.currentCost))) return false;
+  if (!Number.isFinite(Number(rec.currentClicks))) return false;
+  if (!Number.isFinite(Number(rec.currentCvr))) return false;
+  if (!isValidRateChange(rec.costRateChange)) return false;
+  if (!isValidRateChange(rec.clicksRateChange)) return false;
+  if (!isValidRateChange(rec.cvrRateChange)) return false;
+  return true;
+}
+function moduleItemsNeedRestore(items) {
+  if (!Array.isArray(items) || items.length === 0) return false;
+  return items.some((row) => !isComparisonTableRowValid(row));
+}
+function getComparisonTableErrors(data) {
+  const errors = [];
+  for (const mod of GOOGLE_ADS_DIAGNOSIS_COMPARISON_MODULES) {
+    const block = asRecord6(data[mod]);
+    const items = block?.items;
+    if (!Array.isArray(items) || items.length === 0) continue;
+    for (let i = 0; i < items.length; i++) {
+      if (!isComparisonTableRowValid(items[i])) {
+        errors.push(
+          `${mod}.items[${i}] \u7F3A\u5C11 title/currentCost/currentClicks \u6216\u73AF\u6BD4\u5B57\u6BB5\u88AB\u5199\u6210\u5B57\u7B26\u4E32\uFF08\u987B\u4FDD\u7559 collect \u4E8B\u5B9E\u884C\uFF0C\u4EC5\u7531 Agent \u586B\u5199 analysis/suggestions\uFF09`
+        );
+      }
+    }
+  }
+  return errors;
+}
+function mergeComparisonItemsFromCollect(finalData, collectReportData) {
+  const data = { ...finalData };
+  const restoredModules = [];
+  for (const mod of GOOGLE_ADS_DIAGNOSIS_COMPARISON_MODULES) {
+    const finalBlock = asRecord6(data[mod]);
+    const collectBlock = asRecord6(collectReportData[mod]);
+    const finalItems = finalBlock?.items;
+    const collectItems = collectBlock?.items;
+    if (!moduleItemsNeedRestore(finalItems)) continue;
+    if (!Array.isArray(collectItems) || collectItems.length === 0) continue;
+    data[mod] = {
+      ...finalBlock ?? {},
+      items: collectItems
+    };
+    restoredModules.push(mod);
+  }
+  return { data, restoredModules };
+}
+
+// src/commands/google-ads-diagnosis/render-report.ts
+function asRecord7(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
   throw new Error("\u8BCA\u65AD\u6570\u636E\u987B\u4E3A JSON \u5BF9\u8C61");
 }
+async function tryLoadCollectReportData(collectPath) {
+  try {
+    const raw = JSON.parse(await fs18.readFile(collectPath, "utf8"));
+    const root = asRecord7(raw);
+    const reportData = asRecord7(root?.reportData);
+    return reportData ?? root;
+  } catch {
+    return null;
+  }
+}
 async function runGoogleAdsDiagnosisRender(opts) {
   const dataPath = path23.resolve(opts.dataFile);
   let dataRaw;
@@ -126173,7 +126250,39 @@ async function runGoogleAdsDiagnosisRender(opts) {
 `);
     process.exit(1);
   }
-  const data = asRecord6(dataRaw);
+  let data = asRecord7(dataRaw);
+  if (!opts.noMergeCollect) {
+    const collectPath = path23.resolve(
+      opts.collectFile ?? path23.join(path23.dirname(dataPath), GOOGLE_ADS_DIAGNOSIS_COLLECT_BASENAME)
+    );
+    const collectReportData = await tryLoadCollectReportData(collectPath);
+    if (collectReportData) {
+      const { data: merged, restoredModules } = mergeComparisonItemsFromCollect(
+        data,
+        collectReportData
+      );
+      data = merged;
+      if (restoredModules.length > 0) {
+        console.log(
+          `
+\u2139\uFE0F  \u5DF2\u4ECE collect \u6062\u590D \xA73.5 \u5BF9\u6BD4\u8868 items\uFF08${restoredModules.join("\u3001")}\uFF09\uFF1BAgent \u53EA\u5E94\u586B\u5199 analysis/suggestions\uFF0C\u52FF\u6539\u5199 items \u884C\u6570\u636E\u3002
+   \u6765\u6E90\uFF1A${collectPath}
+`
+        );
+      }
+    }
+  }
+  const comparisonErrors = getComparisonTableErrors(data);
+  if (comparisonErrors.length > 0) {
+    console.error("\n\u274C \u5BF9\u6BD4\u8868 items \u4E0D\u5B8C\u6574\uFF0CHTML \u4E2D\u7CFB\u5217/\u5730\u57DF/\u5173\u952E\u8BCD\u8868\u4F1A\u663E\u793A\u4E3A\u7A7A\uFF1A\n");
+    for (const err of comparisonErrors) {
+      console.error(`   \xB7 ${err}`);
+    }
+    console.error(
+      "\n   \u4FEE\u590D\uFF1A\u540C\u76EE\u5F55\u4FDD\u7559 google-ads-diagnosis-collect.json \u540E\u91CD\u65B0 render\uFF08\u9ED8\u8BA4\u81EA\u52A8\u5408\u5E76\uFF09\uFF1B\u6216\u624B\u52A8\u4ECE collect.reportData \u590D\u5236 campaigns/geographic/keywords.items\u3002\n"
+    );
+    process.exit(1);
+  }
   const contentCheck = validateGoogleAdsDiagnosisContent(data);
   if (!contentCheck.ok) {
     console.error(`
@@ -126264,13 +126373,20 @@ function registerGoogleAdsDiagnosisCommands(program2) {
   );
   root.command("render").description(
     "\u5C06 google-ads-diagnosis.json \u6CE8\u5165 GoogleAdsDiagnosisReport.html\uFF0C\u8F93\u51FA\u4E0E MarkAI \u4E00\u81F4\u7684 HTML \u7EC8\u7A3F"
-  ).requiredOption("--data <file>", "Agent \u4EA7\u51FA\u7684\u8BCA\u65AD JSON\uFF08\u4E0E MarkAI sectionData \u540C\u7ED3\u6784\uFF09").option("--out <file>", "\u8F93\u51FA HTML \u8DEF\u5F84\uFF08\u9ED8\u8BA4\u540C --data \u76EE\u5F55\uFF09").option("--lenient", "\u7ED3\u6784\u8B66\u544A\uFF08\u5982\u7F3A analysis\uFF09\u65F6\u4E0D\u963B\u65AD\u6E32\u67D3", false).action(async (opts) => {
-    await runGoogleAdsDiagnosisRender({
-      dataFile: opts.data,
-      out: opts.out,
-      lenient: opts.lenient
-    });
-  });
+  ).requiredOption("--data <file>", "Agent \u4EA7\u51FA\u7684\u8BCA\u65AD JSON\uFF08\u4E0E MarkAI sectionData \u540C\u7ED3\u6784\uFF09").option("--out <file>", "\u8F93\u51FA HTML \u8DEF\u5F84\uFF08\u9ED8\u8BA4\u540C --data \u76EE\u5F55\uFF09").option(
+    "--collect <file>",
+    "collect JSON \u8DEF\u5F84\uFF08\u9ED8\u8BA4\u540C --data \u76EE\u5F55\u7684 google-ads-diagnosis-collect.json\uFF0C\u7528\u4E8E\u6062\u590D\u5BF9\u6BD4\u8868 items\uFF09"
+  ).option("--no-merge-collect", "\u4E0D\u4ECE collect \u81EA\u52A8\u6062\u590D campaigns/geographic/keywords.items", false).option("--lenient", "\u7ED3\u6784\u8B66\u544A\uFF08\u5982\u7F3A analysis\uFF09\u65F6\u4E0D\u963B\u65AD\u6E32\u67D3", false).action(
+    async (opts) => {
+      await runGoogleAdsDiagnosisRender({
+        dataFile: opts.data,
+        out: opts.out,
+        collectFile: opts.collect,
+        noMergeCollect: opts.noMergeCollect,
+        lenient: opts.lenient
+      });
+    }
+  );
 }
 
 // src/index.ts
@@ -126627,7 +126743,7 @@ function ensureScorecardFromSnapshot(healthDiagnosis, merged) {
 }
 
 // src/commands/facebook-analysis/merge-snapshot.ts
-function asRecord7(value) {
+function asRecord8(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -126676,7 +126792,7 @@ async function readManifest(snapshotDir) {
 async function loadSectionFile(snapshotDir, file) {
   try {
     const raw = await fs21.readFile(path28.join(snapshotDir, file), "utf8");
-    return asRecord7(JSON.parse(raw));
+    return asRecord8(JSON.parse(raw));
   } catch {
     return null;
   }
@@ -126724,7 +126840,7 @@ async function mergeFacebookSnapshotIntoReport(payload, snapshotDir) {
     if (data) sectionMap.set(art.section, data);
   }
   const overview = sectionMap.get("overview");
-  const current = asRecord7(overview?.currentPeriod);
+  const current = asRecord8(overview?.currentPeriod);
   const accountName = typeof overview?.accountName === "string" ? overview.accountName : void 0;
   const accountId = manifest.accountId ?? (typeof overview?.accountId === "string" ? overview.accountId : void 0);
   const kpis = { ...payload.kpis ?? {} };
@@ -126846,7 +126962,7 @@ function isFiniteNumber(value) {
 function asArray2(value) {
   return Array.isArray(value) ? value : [];
 }
-function asRecord8(value) {
+function asRecord9(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -126858,26 +126974,26 @@ function pushMissing(missing, id, chapter, dimension, hint) {
 function countAdSetsWithSpend(tables) {
   const rows = asArray2(tables?.adSets);
   return rows.filter((row) => {
-    const r = asRecord8(row);
+    const r = asRecord9(row);
     const spend = r?.spend;
     return isFiniteNumber(spend) && spend > 0;
   }).length;
 }
 function chartLabels(chart) {
-  const c = asRecord8(chart);
+  const c = asRecord9(chart);
   return asArray2(c?.labels).length;
 }
 function validateMetaPeriodReportContent(data) {
   const missing = [];
-  const meta = asRecord8(data.meta) ?? {};
-  const kpis = asRecord8(data.kpis) ?? {};
-  const narrative = asRecord8(data.narrative) ?? {};
-  const tables = asRecord8(data.tables);
-  const charts = asRecord8(data.charts);
-  const sections = asRecord8(data.sections);
-  const health = asRecord8(data.healthDiagnosis);
-  const priorityPlan = asRecord8(data.priorityPlan);
-  const actionChecklist = asRecord8(data.actionChecklist);
+  const meta = asRecord9(data.meta) ?? {};
+  const kpis = asRecord9(data.kpis) ?? {};
+  const narrative = asRecord9(data.narrative) ?? {};
+  const tables = asRecord9(data.tables);
+  const charts = asRecord9(data.charts);
+  const sections = asRecord9(data.sections);
+  const health = asRecord9(data.healthDiagnosis);
+  const priorityPlan = asRecord9(data.priorityPlan);
+  const actionChecklist = asRecord9(data.actionChecklist);
   const adSetsWithSpend2 = countAdSetsWithSpend(tables ?? void 0);
   const regionalNarratives = asArray2(narrative.regional).length;
   const recommendations = asArray2(narrative.recommendations);
@@ -126949,7 +127065,7 @@ function validateMetaPeriodReportContent(data) {
       "charts.audience.labels \u81F3\u5C11 1 \u9879"
     );
   }
-  const funnel = asRecord8(charts?.funnel);
+  const funnel = asRecord9(charts?.funnel);
   if (!isFiniteNumber(funnel?.reach)) {
     pushMissing(
       missing,
@@ -127013,7 +127129,7 @@ function validateMetaPeriodReportContent(data) {
     );
   } else {
     for (let i = 0; i < regionalNarratives; i++) {
-      const row = asRecord8(asArray2(narrative.regional)[i]);
+      const row = asRecord9(asArray2(narrative.regional)[i]);
       if (textLen2(row?.text) < 80) {
         pushMissing(
           missing,
@@ -127043,7 +127159,7 @@ function validateMetaPeriodReportContent(data) {
       "\u5FC5\u987B\u6070\u597D 4 \u6761\uFF08\u7B80\u5316\u8868\u5355/\u533A\u57DF\u8C03\u6574/\u9884\u7B97\u91CD\u6784/\u7D20\u6750\u5EFA\u8BAE\uFF09"
     );
   } else {
-    const titles = recommendations.map((r) => asRecord8(r)?.title);
+    const titles = recommendations.map((r) => asRecord9(r)?.title);
     for (const title of RECOMMENDATION_TITLES) {
       if (!titles.includes(title)) {
         pushMissing(
@@ -127056,7 +127172,7 @@ function validateMetaPeriodReportContent(data) {
       }
     }
     for (let i = 0; i < recommendations.length; i++) {
-      const rec = asRecord8(recommendations[i]);
+      const rec = asRecord9(recommendations[i]);
       if (textLen2(rec?.content) < 150) {
         pushMissing(
           missing,
@@ -127078,7 +127194,7 @@ function validateMetaPeriodReportContent(data) {
     );
   } else {
     for (let i = 0; i < supplementary.length; i++) {
-      const row = asRecord8(supplementary[i]);
+      const row = asRecord9(supplementary[i]);
       if (!textLen2(row?.dimension) || !textLen2(row?.issue)) {
         pushMissing(
           missing,
@@ -127160,7 +127276,7 @@ function validateMetaPeriodReportContent(data) {
     );
   } else {
     for (let i = 0; i < fourQuestions.length; i++) {
-      const q = asRecord8(fourQuestions[i]);
+      const q = asRecord9(fourQuestions[i]);
       const evidence = asArray2(q?.evidence).filter((e) => textLen2(e) > 0);
       if (evidence.length < 2) {
         pushMissing(
@@ -127184,7 +127300,7 @@ function validateMetaPeriodReportContent(data) {
   }
   let scorecardValidRows = 0;
   for (let i = 0; i < scorecard.length; i++) {
-    const row = asRecord8(scorecard[i]);
+    const row = asRecord9(scorecard[i]);
     const itemOk = textLen2(row?.item) > 0;
     const dataOk = textLen2(row?.data) > 0;
     const signalOk = SCORECARD_SIGNALS.includes(row?.signal);
@@ -127226,7 +127342,7 @@ function validateMetaPeriodReportContent(data) {
     );
   }
   for (const key of ["platform", "country", "adSets"]) {
-    const insight = textLen2(asRecord8(sections?.[key])?.insight);
+    const insight = textLen2(asRecord9(sections?.[key])?.insight);
     if (insight < 200) {
       pushMissing(
         missing,
@@ -127237,7 +127353,7 @@ function validateMetaPeriodReportContent(data) {
       );
     }
   }
-  const audience = asRecord8(sections?.audience);
+  const audience = asRecord9(sections?.audience);
   if (asArray2(audience?.goldenProfile).filter((s) => textLen2(s) > 0).length < 3) {
     pushMissing(
       missing,
@@ -127265,7 +127381,7 @@ function validateMetaPeriodReportContent(data) {
       "\u2265150 \u5B57"
     );
   }
-  const landingRows = asArray2(asRecord8(sections?.landingPage)?.rows);
+  const landingRows = asArray2(asRecord9(sections?.landingPage)?.rows);
   if (landingRows.length < 3) {
     pushMissing(
       missing,
@@ -127350,7 +127466,7 @@ async function readJsonFile2(filePath) {
     throw new Error(`\u65E0\u6CD5\u89E3\u6790 JSON\uFF1A${filePath}`);
   }
 }
-function asRecord9(value) {
+function asRecord10(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -127365,7 +127481,7 @@ function injectReportData2(html, payload) {
 }
 async function runFacebookAnalysisRender(opts) {
   const dataPath = path29.resolve(opts.dataFile);
-  let data = asRecord9(await readJsonFile2(dataPath));
+  let data = asRecord10(await readJsonFile2(dataPath));
   if (opts.snapshotDir?.trim()) {
     data = await mergeFacebookSnapshotIntoReport(data, path29.resolve(opts.snapshotDir));
   }

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.33-beta.2",
-  "publishedAt": 1782876066592
+  "version": "1.1.33-beta.3",
+  "publishedAt": 1782887114389
 }

package/dist/skill/references/report-templates/google-ads-diagnosis.md

@@ -33,6 +33,9 @@ siluzan-tso google-ads-diagnosis render \
 | `collect` | 拉 google-analysis + 可选 Lighthouse；输出 `google-ads-diagnosis-collect.json` |
 | `render`  | 读取 Agent 产出的 `google-ads-diagnosis.json`，注入 `GoogleAdsDiagnosisReport.html` |
 
+- **render 自动合并（默认开启）**：若同目录存在 `google-ads-diagnosis-collect.json`，且 Agent 改坏了 `campaigns` / `geographic` / `keywords` 的 `items`（缺 `title`/`currentCost` 或环比写成字符串），CLI **自动从 collect.reportData 恢复 items**，保留 Agent 的 `analysis`/`suggestions`。可用 `--no-merge-collect` 关闭；`--collect <file>` 指定 collect 路径。
+- **render 硬校验**：合并后对比表仍不完整则 **exit 1**（避免 HTML 表体全空）。
+
 - **禁止**在 `collect` 阶段生成或写入 `analysis` / `suggestions` / `diagnosisOverview` / `summary` 等建议性文案。
 - **禁止**跳过 Agent 直接 `render` collect 产物（`render` 会校验全部叙事 / 建议字段；调试可加 `--lenient`）。
 - JSON 顶层结构须与 MarkAI `sectionData.js` / `fetchData` 输出一致（见下文各 `section-*` 数据对象）。
@@ -204,6 +207,7 @@ siluzan-tso google-ads-diagnosis render \
 - 指标列：花费(上期/本期/环比)、点击(上期/本期/环比)、转化率(上期/本期/环比)
 - **数据**：`campaigns.items`（`title`、`previousCost`、`currentCost`、`costRateChange`、`previousClicks`、`currentClicks`、`clicksRateChange`、`previousCvr`、`currentCvr`、`cvrRateChange`）
 - **分析 / 建议**：`campaigns.analysis`、`campaigns.suggestions`
+- **Agent 禁止改写 `items` 行**（须原样保留 collect `reportData`）；`render` 会从同目录 collect 自动恢复被改坏的 items
 
 #### 国家地区分析
 

package/dist/skill/report-templates/GoogleAdsDiagnosisReport.html

@@ -4296,6 +4296,75 @@
             const labels = items.map((item, index) =>
               formatDateLabel(item?.date, index),
             );
+            const totalConversions = items.reduce(
+              (sum, item) => sum + (Number(item?.conversions) || 0),
+              0,
+            );
+            // 零转化账户：CPA/转化折线全为 0 视觉上像空图，改展示消耗 + 点击按日趋势
+            const useCostClickTrend = totalConversions === 0;
+
+            if (useCostClickTrend) {
+              const costData = items.map((item) => Number(item?.cost) || 0);
+              const clicksData = items.map((item) => Number(item?.clicks) || 0);
+              return {
+                type: "line",
+                data: {
+                  labels,
+                  datasets: [
+                    {
+                      label: "消耗",
+                      data: costData,
+                      borderColor: "#3b82f6",
+                      backgroundColor: "rgba(59, 130, 246, 0.12)",
+                      tension: 0.3,
+                      yAxisID: "y1",
+                      pointRadius: 3,
+                    },
+                    {
+                      label: "点击次数",
+                      data: clicksData,
+                      borderColor: "#10b981",
+                      backgroundColor: "rgba(16, 185, 129, 0.12)",
+                      tension: 0.3,
+                      yAxisID: "y2",
+                      pointRadius: 3,
+                    },
+                  ],
+                },
+                options: {
+                  responsive: true,
+                  maintainAspectRatio: false,
+                  interaction: { mode: "index", intersect: false },
+                  stacked: false,
+                  plugins: {
+                    legend: { labels: { font: { size: 12 } } },
+                  },
+                  scales: {
+                    y1: {
+                      type: "linear",
+                      position: "left",
+                      beginAtZero: true,
+                      ticks: { font: { size: 11 } },
+                      title: { display: true, text: "消耗", font: { size: 12 } },
+                    },
+                    y2: {
+                      type: "linear",
+                      position: "right",
+                      beginAtZero: true,
+                      ticks: { font: { size: 11 } },
+                      grid: { drawOnChartArea: false },
+                      title: {
+                        display: true,
+                        text: "点击次数",
+                        font: { size: 12 },
+                      },
+                    },
+                    x: { ticks: { font: { size: 11 } } },
+                  },
+                },
+              };
+            }
+
             const cpaData = items.map((item) => Number(item?.cpa) || 0);
             const conversionsData = items.map((item) =>
               Number(item?.conversions ?? 0),
@@ -4401,6 +4470,40 @@
           };
         };
 
+        const buildConversionCostDailyTableHtml = (items) => {
+          const rows = Array.isArray(items) ? items : [];
+          if (!rows.length) {
+            return '<tr><td colspan="5" class="empty-row">暂无按日趋势数据</td></tr>';
+          }
+          return rows
+            .map((item) => {
+              const rawDate = item?.date;
+              let dateLabel = rawDate;
+              const parsed = new Date(rawDate);
+              if (!Number.isNaN(parsed.getTime())) {
+                dateLabel = parsed.toISOString().slice(0, 10);
+              }
+              const cost = Number(item?.cost);
+              const clicks = Number(item?.clicks);
+              const conversions = Number(item?.conversions ?? 0);
+              const cpa = Number(item?.cpa);
+              const cpaDisplay =
+                conversions > 0 && Number.isFinite(cpa)
+                  ? formatNumber(cpa, 2)
+                  : "—";
+              return `
+                <tr>
+                  <td data-label="日期">${escapeHtml(String(dateLabel || "—"))}</td>
+                  <td data-label="消耗">${escapeHtml(formatNumber(cost, 2))}</td>
+                  <td data-label="点击">${escapeHtml(formatNumber(clicks, 0))}</td>
+                  <td data-label="转化">${escapeHtml(formatNumber(conversions, 0))}</td>
+                  <td data-label="CPA">${escapeHtml(cpaDisplay)}</td>
+                </tr>
+              `;
+            })
+            .join("");
+        };
+
         const createAccountInfoSection = () => {
           const reportMain = document.getElementById("report-main");
           if (!reportMain) return null;
@@ -4883,17 +4986,47 @@
           const conversionTrendSuggestionsList = toArray(
             conversionCost.suggestions,
           ).map((item) => `<li class="insight-item">${escapeHtml(item)}</li>`);
+          const conversionCostDailyItems = Array.isArray(conversionCost.items)
+            ? conversionCost.items
+            : [];
+          const conversionDailyTableHtml = buildConversionCostDailyTableHtml(
+            conversionCostDailyItems,
+          );
           const conversionTrendContent =
             (chartConfig ||
+              conversionCostDailyItems.length ||
               conversionTrendAnalysisList.length ||
               conversionTrendSuggestionsList.length) &&
             `
               <div class="analysis-dimension conversion-trend-section">
                 <h4 class="dimension-title">转化成本与转化趋势优化</h4>
                 <div class="dimension-content">
+                  <div class="table-block" data-table-key="conversion-cost-daily">
+                    <table class="data-table">
+                      <thead>
+                        <tr>
+                          <th>日期</th>
+                          <th>消耗</th>
+                          <th>点击</th>
+                          <th>转化</th>
+                          <th>CPA</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        ${conversionDailyTableHtml}
+                      </tbody>
+                    </table>
+                  </div>
                   ${
                     chartConfig
                       ? `
+                          <p class="conversion-trend-chart-note" style="margin:12px 0 8px;font-size:13px;color:#64748b;">${
+                            conversionCostDailyItems.every(
+                              (item) => !(Number(item?.conversions) > 0),
+                            ) && conversionCostDailyItems.length
+                              ? "本期无转化记录，下图展示消耗与点击按日趋势。"
+                              : "下图展示 CPA 与转化次数按日趋势。"
+                          }</p>
                           <div class="chart-card conversion-trend-chart">
                             <div style="height: 280px;">
                               <canvas id="${chartId}" height="260"></canvas>

package/dist/skill/report-templates/google-ads-diagnosis.md

@@ -33,6 +33,9 @@ siluzan-tso google-ads-diagnosis render \
 | `collect` | 拉 google-analysis + 可选 Lighthouse；输出 `google-ads-diagnosis-collect.json` |
 | `render`  | 读取 Agent 产出的 `google-ads-diagnosis.json`，注入 `GoogleAdsDiagnosisReport.html` |
 
+- **render 自动合并（默认开启）**：若同目录存在 `google-ads-diagnosis-collect.json`，且 Agent 改坏了 `campaigns` / `geographic` / `keywords` 的 `items`（缺 `title`/`currentCost` 或环比写成字符串），CLI **自动从 collect.reportData 恢复 items**，保留 Agent 的 `analysis`/`suggestions`。可用 `--no-merge-collect` 关闭；`--collect <file>` 指定 collect 路径。
+- **render 硬校验**：合并后对比表仍不完整则 **exit 1**（避免 HTML 表体全空）。
+
 - **禁止**在 `collect` 阶段生成或写入 `analysis` / `suggestions` / `diagnosisOverview` / `summary` 等建议性文案。
 - **禁止**跳过 Agent 直接 `render` collect 产物（`render` 会校验全部叙事 / 建议字段；调试可加 `--lenient`）。
 - JSON 顶层结构须与 MarkAI `sectionData.js` / `fetchData` 输出一致（见下文各 `section-*` 数据对象）。
@@ -204,6 +207,7 @@ siluzan-tso google-ads-diagnosis render \
 - 指标列：花费(上期/本期/环比)、点击(上期/本期/环比)、转化率(上期/本期/环比)
 - **数据**：`campaigns.items`（`title`、`previousCost`、`currentCost`、`costRateChange`、`previousClicks`、`currentClicks`、`clicksRateChange`、`previousCvr`、`currentCvr`、`cvrRateChange`）
 - **分析 / 建议**：`campaigns.analysis`、`campaigns.suggestions`
+- **Agent 禁止改写 `items` 行**（须原样保留 collect `reportData`）；`render` 会从同目录 collect 自动恢复被改坏的 items
 
 #### 国家地区分析
 

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.33-beta.2'
+$PKG_VERSION = '1.1.33-beta.3'
 $CLI_BIN     = 'siluzan-tso'
 $SKILL_LABEL = 'Siluzan TSO'
 $INSTALL_CMD = 'npm install -g siluzan-tso-cli@beta'

package/dist/skill/scripts/install.sh

@@ -9,7 +9,7 @@ set -euo pipefail
 # -- Package info (injected at build time) ------------------------------------
 readonly PKG_NAME="siluzan-tso-cli"
 # PKG_VERSION 锁定到与本脚本同批构建产物一致的版本，避免与 dist/skill 错位
-readonly PKG_VERSION="1.1.33-beta.2"
+readonly PKG_VERSION="1.1.33-beta.3"
 readonly CLI_BIN="siluzan-tso"
 readonly SKILL_LABEL="Siluzan TSO"
 readonly INSTALL_CMD="npm install -g siluzan-tso-cli@beta"

package/package.json

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