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

package/README.md

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

package/dist/index.js

@@ -4503,17 +4503,57 @@ var init_currency_display = __esm({
   }
 });
 
+// src/commands/google-analysis/daily-metrics-range.ts
+function pad2(n) {
+  return String(n).padStart(2, "0");
+}
+function formatChinaOffsetDateTime(d) {
+  const sh = new Date(d.getTime() + CHINA_OFFSET_MS);
+  return `${sh.getUTCFullYear()}-${pad2(sh.getUTCMonth() + 1)}-${pad2(sh.getUTCDate())}T${pad2(sh.getUTCHours())}:${pad2(sh.getUTCMinutes())}:${pad2(sh.getUTCSeconds())}+08:00`;
+}
+function defaultChinaDateRange(now = /* @__PURE__ */ new Date()) {
+  const chinaNow = new Date(now.getTime() + CHINA_OFFSET_MS);
+  chinaNow.setUTCDate(chinaNow.getUTCDate() - 1);
+  const endY = chinaNow.getUTCFullYear();
+  const endM = chinaNow.getUTCMonth();
+  const endD = chinaNow.getUTCDate();
+  const startChina = new Date(Date.UTC(endY, endM, endD - 6));
+  const endChina = new Date(Date.UTC(endY, endM, endD));
+  const fmt = (utcCal) => `${utcCal.getUTCFullYear()}-${pad2(utcCal.getUTCMonth() + 1)}-${pad2(utcCal.getUTCDate())}`;
+  return { startDate: fmt(startChina), endDate: fmt(endChina) };
+}
+function resolveDailyMetricsQueryTimes(startDate, endDate, now = /* @__PURE__ */ new Date()) {
+  const startInstant = `${startDate}T00:00:00+08:00`;
+  const endOfDay = /* @__PURE__ */ new Date(`${endDate}T23:59:59+08:00`);
+  const endInstant = endOfDay.getTime() > now.getTime() ? formatChinaOffsetDateTime(now) : formatChinaOffsetDateTime(endOfDay);
+  return { startInstant, endInstant };
+}
+function resolveChinaQueryTimes(startDate, endDate, _now = /* @__PURE__ */ new Date()) {
+  return { startInstant: startDate, endInstant: endDate };
+}
+var CHINA_OFFSET_MS;
+var init_daily_metrics_range = __esm({
+  "src/commands/google-analysis/daily-metrics-range.ts"() {
+    "use strict";
+    CHINA_OFFSET_MS = 8 * 36e5;
+  }
+});
+
 // src/utils/balance.ts
-function fmt(d) {
-  return d.toISOString().slice(0, 10);
+function pad22(n) {
+  return String(n).padStart(2, "0");
 }
-function dateRangeLastNDays(n) {
+function dateRangeLastNDays(n, now = /* @__PURE__ */ new Date()) {
   const days = Math.max(1, Math.floor(Number(n) || 1));
-  const end = /* @__PURE__ */ new Date();
-  end.setDate(end.getDate() - 1);
-  const start = new Date(end);
-  start.setDate(start.getDate() - (days - 1));
-  return { startDate: fmt(start), endDate: fmt(end) };
+  const chinaNow = new Date(now.getTime() + CHINA_OFFSET_MS2);
+  chinaNow.setUTCDate(chinaNow.getUTCDate() - 1);
+  const endY = chinaNow.getUTCFullYear();
+  const endM = chinaNow.getUTCMonth();
+  const endD = chinaNow.getUTCDate();
+  const startChina = new Date(Date.UTC(endY, endM, endD - (days - 1)));
+  const endChina = new Date(Date.UTC(endY, endM, endD));
+  const fmtChina = (utcCal) => `${utcCal.getUTCFullYear()}-${pad22(utcCal.getUTCMonth() + 1)}-${pad22(utcCal.getUTCDate())}`;
+  return { startDate: fmtChina(startChina), endDate: fmtChina(endChina) };
 }
 function defaultDateRange() {
   return dateRangeLastNDays(7);
@@ -4709,9 +4749,10 @@ async function fetchOverviewMap(route, accountIds, config, startDate, endDate, v
   const end = endDate ?? range.endDate;
   try {
     if (route === "Google") {
+      const { startInstant, endInstant } = resolveDailyMetricsQueryTimes(start, end);
       const params = new URLSearchParams({
-        startDate: start,
-        endDate: end,
+        startDate: startInstant,
+        endDate: endInstant,
         mediaCustomerIds: accountIds.join("|")
       });
       const url = `${config.apiBaseUrl}/report/media-account/google/account-spend-overview?${params}`;
@@ -4797,10 +4838,11 @@ async function fetchOverviewMap(route, accountIds, config, startDate, endDate, v
   }
   return result;
 }
-var BALANCE_SUPPORTED_MEDIA;
+var BALANCE_SUPPORTED_MEDIA, CHINA_OFFSET_MS2;
 var init_balance = __esm({
   "src/utils/balance.ts"() {
     "use strict";
+    init_daily_metrics_range();
     init_auth();
     BALANCE_SUPPORTED_MEDIA = [
       "Google",
@@ -4810,6 +4852,7 @@ var init_balance = __esm({
       "Kwai",
       "MetaAd"
     ];
+    CHINA_OFFSET_MS2 = 8 * 36e5;
   }
 });
 
@@ -5525,42 +5568,6 @@ var init_accounts_digest2 = __esm({
   }
 });
 
-// src/commands/google-analysis/daily-metrics-range.ts
-function pad2(n) {
-  return String(n).padStart(2, "0");
-}
-function formatChinaOffsetDateTime(d) {
-  const sh = new Date(d.getTime() + CHINA_OFFSET_MS);
-  return `${sh.getUTCFullYear()}-${pad2(sh.getUTCMonth() + 1)}-${pad2(sh.getUTCDate())}T${pad2(sh.getUTCHours())}:${pad2(sh.getUTCMinutes())}:${pad2(sh.getUTCSeconds())}+08:00`;
-}
-function defaultChinaDateRange(now = /* @__PURE__ */ new Date()) {
-  const chinaNow = new Date(now.getTime() + CHINA_OFFSET_MS);
-  chinaNow.setUTCDate(chinaNow.getUTCDate() - 1);
-  const endY = chinaNow.getUTCFullYear();
-  const endM = chinaNow.getUTCMonth();
-  const endD = chinaNow.getUTCDate();
-  const startChina = new Date(Date.UTC(endY, endM, endD - 6));
-  const endChina = new Date(Date.UTC(endY, endM, endD));
-  const fmt2 = (utcCal) => `${utcCal.getUTCFullYear()}-${pad2(utcCal.getUTCMonth() + 1)}-${pad2(utcCal.getUTCDate())}`;
-  return { startDate: fmt2(startChina), endDate: fmt2(endChina) };
-}
-function resolveDailyMetricsQueryTimes(startDate, endDate, now = /* @__PURE__ */ new Date()) {
-  const startInstant = `${startDate}T00:00:00+08:00`;
-  const endOfDay = /* @__PURE__ */ new Date(`${endDate}T23:59:59+08:00`);
-  const endInstant = endOfDay.getTime() > now.getTime() ? formatChinaOffsetDateTime(now) : formatChinaOffsetDateTime(endOfDay);
-  return { startInstant, endInstant };
-}
-function resolveChinaQueryTimes(startDate, endDate, _now = /* @__PURE__ */ new Date()) {
-  return { startInstant: startDate, endInstant: endDate };
-}
-var CHINA_OFFSET_MS;
-var init_daily_metrics_range = __esm({
-  "src/commands/google-analysis/daily-metrics-range.ts"() {
-    "use strict";
-    CHINA_OFFSET_MS = 8 * 36e5;
-  }
-});
-
 // src/utils/snapshot/async-lock.ts
 async function withAsyncLock(key, fn) {
   const prev = chains.get(key) ?? Promise.resolve();
@@ -108630,8 +108637,8 @@ function resolveFacebookDateRange(start, end) {
     endD.setDate(endD.getDate() - 1);
     const startD = new Date(endD);
     startD.setDate(startD.getDate() - 6);
-    const fmt2 = (d) => d.toISOString().slice(0, 10);
-    return { startDate: fmt2(startD), endDate: fmt2(endD) };
+    const fmt = (d) => d.toISOString().slice(0, 10);
+    return { startDate: fmt(startD), endDate: fmt(endD) };
   }
   console.error("\n\u274C --start \u4E0E --end \u987B\u540C\u65F6\u4F20\u5165\uFF0C\u6216\u540C\u65F6\u7701\u7565\u4EE5\u4F7F\u7528\u9ED8\u8BA4\u8FD1 7 \u5929\uFF08\u622A\u81F3\u6628\u5929\uFF09\u3002\n");
   process.exit(1);
@@ -108729,8 +108736,8 @@ function resolveMetaOverviewDateRange(start, end) {
     endD.setDate(endD.getDate() - 1);
     const startD = new Date(endD);
     startD.setDate(startD.getDate() - 6);
-    const fmt2 = (d) => d.toISOString().slice(0, 10);
-    return { startDate: fmt2(startD), endDate: fmt2(endD) };
+    const fmt = (d) => d.toISOString().slice(0, 10);
+    return { startDate: fmt(startD), endDate: fmt(endD) };
   }
   console.error("\n\u274C --start \u4E0E --end \u987B\u540C\u65F6\u4F20\u5165\uFF0C\u6216\u540C\u65F6\u7701\u7565\u4EE5\u4F7F\u7528\u9ED8\u8BA4\u8FD1 7 \u5929\uFF08\u622A\u81F3\u6628\u5929\uFF09\u3002\n");
   process.exit(1);
@@ -133252,8 +133259,8 @@ function resolveDateRange2(start, end) {
     endD.setDate(endD.getDate() - 1);
     const startD = new Date(endD);
     startD.setDate(startD.getDate() - 6);
-    const fmt2 = (d) => d.toISOString().slice(0, 10);
-    return { startDate: fmt2(startD), endDate: fmt2(endD) };
+    const fmt = (d) => d.toISOString().slice(0, 10);
+    return { startDate: fmt(startD), endDate: fmt(endD) };
   }
   console.error("\n\u274C --start \u4E0E --end \u987B\u540C\u65F6\u4F20\u5165\uFF0C\u6216\u540C\u65F6\u7701\u7565\u4EE5\u4F7F\u7528\u9ED8\u8BA4\u8FD1 7 \u5929\uFF08\u622A\u81F3\u6628\u5929\uFF09\u3002\n");
   process.exit(1);
@@ -134320,6 +134327,7 @@ function asRecord26(value) {
   return null;
 }
 function num10(value) {
+  if (value === null || value === void 0 || value === "") return void 0;
   const n = Number(value);
   return Number.isFinite(n) ? n : void 0;
 }

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.45-beta.2",
-  "publishedAt": 1786612533558
+  "version": "1.1.45-beta.3",
+  "publishedAt": 1786677354676
 }

package/dist/skill/references/accounts/accounts-balance-stats.md

@@ -24,7 +24,7 @@ siluzan-tso balance-scan -m <媒体类型> [选项]
 | `-m, --media <type>`                  | 必填：`Google \| TikTok \| Yandex \| MetaAd \| BingV2 \| Kwai`                       | —            |
 | `-a, --accounts <ids>`                | 指定 `mediaCustomerId`（逗号分隔）；**跳过清单翻页**，对这些 ID 拉数后全部输出 | —            |
 | `--threshold-days <n>`                | 剩余续航天数阈值                                                                     | `7`          |
-| `--spend-days <n>`                    | 日均消耗回看自然日数（截至昨天不含今天；日均 = 窗口合计 / N）                        | `7`          |
+| `--spend-days <n>`                    | 日均消耗回看自然日数（截至昨天不含今天，**北京时间**；日均 = 窗口合计 / N）          | `7`          |
 | `--min-balance <n>`                   | 绝对余额阈值（与 threshold 取并集）                                                  | —            |
 | `--min-daily-spend <n>`               | 日均消耗低于此值视为僵尸账户，不做续航估算                                           | `0.01`       |
 | `--target-days <n>`                   | 建议充值目标续航天数                                                                 | `30`         |
@@ -47,7 +47,7 @@ siluzan-tso balance-scan -m BingV2 -a id1,id2,id3 --json-out ./snap-p2-subset
 siluzan-tso balance-scan -m MetaAd --json-out ./snap-p2-meta
 ```
 
-**读盘要点**：先看 `meta.dataIssue`（非空则失败）。`data.items` = **全部已检查账户**（OAuth 失效户不在 items，见 `meta.skippedInvalidOAuth`）；`meta.hitCount` = 触阈值条数。预警筛 `hitReason !== "none"`；`hitReason="none"` 表示已检查但未触阈值。按 `remainingDays` 升序交付。用 **`dailySpend`** 做日均（口径见 `meta.spendDays` / `meta.spendWindow`），勿把 `stats` 区间合计 `spend` 当「每天消耗」。与 `balance` / `accounts-digest` 分工见 `references/core/agent-conventions.md` §八。
+**读盘要点**：先看 `meta.dataIssue`（非空则失败）。`data.items` = **全部已检查账户**（OAuth 失效户不在 items，见 `meta.skippedInvalidOAuth`）；`meta.hitCount` = 触阈值条数。预警筛 `hitReason !== "none"`；`hitReason="none"` 表示已检查但未触阈值。按 `remainingDays` 升序交付。用 **`dailySpend`** 做日均（口径见 `meta.spendDays` / `meta.spendWindow`），勿把 `stats` 区间合计 `spend` 当「每天消耗」。Google 消耗走 `account-spend-overview`，`startDate`/`endDate` 带东八区墙钟（`…T00:00:00+08:00` / `…T23:59:59+08:00`），与 `stats` 同口径。与 `balance` / `accounts-digest` 分工见 `references/core/agent-conventions.md` §八。
 
 ---
 

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

@@ -27,7 +27,7 @@
 | `google-analysis --sections overview`（Google 网关 `OverviewSectionData`）                                                                                                            | **实时**；请求起止为 **YYYY-MM-DD**（不附加时区）                                                                                                      | ✅ 可查当天                       | 当天/今日消耗、当天高消耗账号排行                |
 | `google-analysis --sections campaign-types`（`types-summary`）                                                                                                                        | **实时**                                                                                                                                               | ✅ 可查当天                       | 当天系列类型分布                                 |
 | `google-analysis` 其他 range 维度（`campaigns` / `keywords` / `devices` / `geographic` / `daily-metrics` / …）                                                                        | 实时（受 Google Ads API 同步延迟影响）；**一律 YYYY-MM-DD**（不附加时区；与 `stats` 的 UTC+8 不同）                                                    | 可查当天，但当天可能尚未结算      | 周期分析、报告                                   |
-| `stats -m Google` / `balance-scan -m Google` / `accounts-digest -m Google` / `list-accounts -m Google` 合并消耗（TSO `account-spend-overview`，2026-05 起）                           | **后端自动分流**：窗口完全在历史 → `database`；含今天 → `googleCombined`。**`stats` 请求起止按 UTC+8 墙钟**（`…T00:00:00+08:00` ~ `…T23:59:59+08:00`） | ✅ 可查当天（含今天时切实时聚合） | 历史回溯、巡检、周报 KPI、余额续航估算           |
+| `stats -m Google` / `balance-scan -m Google` / `accounts-digest -m Google` / `list-accounts -m Google` 合并消耗（TSO `account-spend-overview`，2026-05 起）                           | **后端自动分流**：窗口完全在历史 → `database`；含今天 → `googleCombined`。**凡走本接口的请求起止一律东八区墙钟**（`…T00:00:00+08:00` ~ `…T23:59:59+08:00`） | ✅ 可查当天（含今天时切实时聚合） | 历史回溯、巡检、周报 KPI、余额续航估算           |
 | `stats` / `balance-scan` / `accounts-digest` / `list-accounts` 的 **TikTok / Yandex / BingV2 / Kwai / MetaAd** 合并消耗（TSO `accountsoverview`；MetaAd OAuth 户走 `FacebookAds` 段） | **每日同步昨天**                                                                                                                                       | ❌ 查今天会全为 0                 | 历史回溯、巡检、余额续航估算（口径为"截至昨天"） |
 | `balance`（`GetMediaAccountInfo`）                                                                                                                                                    | 实时                                                                                                                                                   | —                                 | 仅当前余额，不反映消耗                           |
 

package/dist/skill/references/operations/hosted-automation-monitoring-json.md

@@ -22,7 +22,7 @@ siluzan-tso balance-scan -m Google [--threshold-days <n>] [--min-balance <n>] [-
 | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | 账户                                                       | `data.items[].mediaCustomerId`、`data.items[].name`、`data.items[].advertiserName`                                                                           |
 | 余额（主币种金额，与平台余额接口一致）                     | **`data.items[].balance`**（由 `remainingAccountBudget` 计算而来）                                                                                           |
-| 近 7 日估算日均消耗                                        | **`data.items[].dailySpend`** = 近 7 日总消耗 / 7（窗口为 **[T-7, T-1]**，即截至昨天的 7 个自然日，**不含当天**，避免拉到当天未结算数据）                    |
+| 近 7 日估算日均消耗                                        | **`data.items[].dailySpend`** = 近 7 日总消耗 / 7（窗口为 **[T-7, T-1]**，北京时间截至昨天的 7 个自然日，**不含当天**；Google 请求带 `+08:00`）              |
 | 按余额÷日均估算的续航天数                                  | **`data.items[].remainingDays`** = `balance / dailySpend`（消耗过低 < `minDailySpend` 时为 `null`）                                                          |
 | 建议充值额（按 `meta.thresholds.targetDaysForTopup` 目标） | **`data.items[].recommendedTopup`**                                                                                                                          |
 | 命中原因（阈值逻辑）                                       | **`data.items[].hitReason`**：`low-days` \| `low-balance` \| `both` \| `none`（已检查但未触阈值）。`data.items` 含全部已检查账户；预警筛 `hitReason !== "none"`。`meta.hitCount` 为触阈值条数 |

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

@@ -180,46 +180,14 @@
     }
   </style>
     <style>
-
-    .insight {
-      margin-top: 12px;
-      padding: 12px 14px;
-      border-radius: 12px;
-      background: #f7f3ea;
-      border: 1px solid rgba(28, 27, 25, 0.08);
-    }
-    .insight strong { display: block; margin-bottom: 6px; }
-    .insight ul { margin: 0; padding-left: 1.1em; }
-    .insight li { margin: 0.25em 0; }
-    .insight.suggestion { background: #eef6f1; border-color: rgba(31, 122, 78, 0.18); }
+    /* 补充：开发样例未覆盖的极少数辅助样式（其余全部复用样例的 .panel/.narrative/.issue-card/.todo-item/.badge） */
     .empty-note {
       color: var(--muted);
       padding: 18px;
       text-align: center;
       font-size: 13px;
     }
-    .todo-list { margin: 0; padding-left: 1.2em; }
-    .todo-list li { margin: 0.35em 0; }
-    .panel table { width: 100%; border-collapse: collapse; font-size: 13px; }
-    .panel th, .panel td {
-      padding: 8px 10px;
-      border-bottom: 1px solid rgba(28, 27, 25, 0.08);
-      text-align: left;
-      vertical-align: top;
-    }
-    .panel th { color: var(--muted); font-weight: 600; white-space: nowrap; }
-    .panel td.num, .panel th.num { text-align: right; font-variant-numeric: tabular-nums; }
-    .fold summary {
-      cursor: pointer;
-      font-weight: 600;
-      padding: 8px 0;
-      list-style: none;
-    }
-    .fold summary::-webkit-details-marker { display: none; }
-    .nav a.active { background: rgba(252, 62, 57, 0.12); color: var(--yandex); }
-    .hero h1 { margin: 8px 0 12px; font-size: clamp(1.4rem, 2.5vw, 1.9rem); }
-    .issues { margin: 12px 0; padding: 12px 14px; border-left: 3px solid var(--yandex); background: #fff6f5; }
-
+    .panel > .table-wrap:first-child table { margin-top: 0; }
     </style>
   </head>
   <body>
@@ -262,14 +230,24 @@
       .replace(/"/g, "&quot;");
   }
 
-  function int(v) {
+  /**
+   * 统一的“有效数字”判定：null / undefined / "" 一律视为无数据（返回 undefined），
+   * 避免 `Number(null) === 0` 把「无转化时 CPA 为空」误显示成 "$0.00" / "0.00%"。
+   */
+  function toNum(v) {
+    if (v === null || v === undefined || v === "") return undefined;
     const n = Number(v);
-    return Number.isFinite(n) ? Math.round(n).toLocaleString("en-US") : "—";
+    return Number.isFinite(n) ? n : undefined;
+  }
+
+  function int(v) {
+    const n = toNum(v);
+    return n === undefined ? "—" : Math.round(n).toLocaleString("en-US");
   }
 
   function money(v, currency) {
-    const n = Number(v);
-    if (!Number.isFinite(n)) return "—";
+    const n = toNum(v);
+    if (n === undefined) return "—";
     const c = currency || "USD";
     if (c === "USD" || c === "RUB" || c === "EUR") {
       try {
@@ -284,14 +262,14 @@
   }
 
   function pct(v) {
-    const n = Number(v);
-    if (!Number.isFinite(n)) return "—";
+    const n = toNum(v);
+    if (n === undefined) return "—";
     return (n * 100).toFixed(2) + "%";
   }
 
   function num2(v) {
-    const n = Number(v);
-    return Number.isFinite(n) ? n.toFixed(2) : "—";
+    const n = toNum(v);
+    return n === undefined ? "—" : n.toFixed(2);
   }
 
   function asArr(v) {
@@ -302,13 +280,17 @@
     return data.meta?.currency || data.kpis?.currency || "USD";
   }
 
+  /**
+   * 分析 + 建议区块——样式对齐开发样例的 `.narrative`（badge「叙述」/「建议」+ ul），
+   * 而不是本文件之前自造的 `.insight` 盒子。
+   */
   function analysisBlock(section) {
     const analysis = asArr(section?.analysis).filter((x) => String(x || "").trim());
     const suggestions = asArr(section?.suggestions).filter((x) => String(x || "").trim());
     const parts = [];
     if (analysis.length) {
       parts.push(
-        '<div class="insight"><strong>总结</strong><ul>' +
+        '<div class="narrative"><h3><span class="badge b-info">叙述</span> 数据解读</h3><ul>' +
           analysis.map((a) => "<li>" + escapeHtml(a) + "</li>").join("") +
           "</ul></div>"
       );
@@ -317,7 +299,7 @@
     }
     if (suggestions.length) {
       parts.push(
-        '<div class="insight suggestion"><strong>建议</strong><ul>' +
+        '<div class="narrative"><h3><span class="badge b-warn">建议</span> 优化建议</h3><ul>' +
           suggestions.map((s) => "<li>" + escapeHtml(s) + "</li>").join("") +
           "</ul></div>"
       );
@@ -330,15 +312,16 @@
       '<div class="section-head"><div><h2>' +
       escapeHtml(title) +
       "</h2>" +
-      (desc ? '<p class="muted">' + escapeHtml(desc) + "</p>" : "") +
+      (desc ? '<p>' + escapeHtml(desc) + "</p>" : "") +
       "</div></div>"
     );
   }
 
+  /** 仅返回 `.table-wrap`（不含外层 `.panel`），供调用方与叙述区块共用同一个 `.panel` 容器，对齐开发样例结构。 */
   function tableHtml(headers, rowsHtml) {
     if (!rowsHtml) return '<div class="empty-note">' + EMPTY_NOTE + "</div>";
     return (
-      '<div class="panel" style="overflow:auto"><table><thead><tr>' +
+      '<div class="table-wrap"><table><thead><tr>' +
       headers
         .map(function (h) {
           const cls = h.num ? ' class="num"' : "";
@@ -375,11 +358,14 @@
       '</td><td class="num">' +
       num2(r.conversions) +
       '</td><td class="num">' +
+      pct(r.conversionRate) +
+      '</td><td class="num">' +
       money(r.costPerConversion, currency) +
       "</td>"
     );
   }
 
+  /** 对齐开发样例关键词/搜索词/地域/设备表格的列集合（含 cr% 转化率）。 */
   const METRIC_HEADERS = [
     { label: "消耗", num: true },
     { label: "展示", num: true },
@@ -387,6 +373,7 @@
     { label: "CTR", num: true },
     { label: "CPC", num: true },
     { label: "转化", num: true },
+    { label: "转化率", num: true },
     { label: "CPA", num: true },
   ];
 
@@ -443,6 +430,7 @@
         ? int(kpis.activeDays) + " 个有效投放日"
         : "";
 
+    // 对齐开发样例：5 张 KPI 卡（余额/消耗/日均消耗/点击-CTR/转化-CPA），展示量并入「点击 / CTR」的 delta 文案。
     const kpiCards = [
       {
         label: "账户余额" + (balAsOf ? "（截至 " + balAsOf + "）" : ""),
@@ -452,7 +440,7 @@
       {
         label: "本期消耗",
         value: money(kpis.spend, currency),
-        delta: "",
+        delta: activeHint,
       },
       {
         label: "日均消耗",
@@ -462,12 +450,12 @@
       {
         label: "点击 / CTR",
         value: int(kpis.clicks),
-        delta: "CTR " + pct(kpis.ctr) + " · CPC " + money(kpis.averageCpc, currency),
-      },
-      {
-        label: "展示",
-        value: int(kpis.impressions),
-        delta: "",
+        delta:
+          "CTR " +
+          pct(kpis.ctr) +
+          " · CPC " +
+          money(kpis.averageCpc, currency) +
+          (kpis.impressions != null ? " · 展示 " + int(kpis.impressions) : ""),
       },
       {
         label: "转化 / CPA",
@@ -506,6 +494,8 @@
             '</td><td class="num">' +
             money(r.spend, currency) +
             '</td><td class="num">' +
+            int(r.impressions) +
+            '</td><td class="num">' +
             int(r.clicks) +
             '</td><td class="num">' +
             pct(r.ctr) +
@@ -523,6 +513,7 @@
           { label: "区间" },
           { label: "天数", num: true },
           { label: "消耗", num: true },
+          { label: "展示", num: true },
           { label: "点击", num: true },
           { label: "CTR", num: true },
           { label: "CPC", num: true },
@@ -557,7 +548,7 @@
         })
         .join("");
       dailyFold =
-        '<details class="fold panel" style="margin-top:14px;padding:12px 14px"><summary>展开每日明细（' +
+        '<details class="fold"><summary>每日消费数据概览（点击展开，共 ' +
         daily.length +
         " 天）</summary>" +
         tableHtml(
@@ -614,57 +605,85 @@
       '<div class="kpi-grid" style="margin-bottom:14px">' +
       kpiCards +
       "</div>" +
-      (weeklyTable
-        ? '<h3 style="margin:18px 0 10px;font-size:15px">周报汇总</h3>' + weeklyTable
-        : "") +
-      dailyFold +
+      '<div class="panel">' +
       (exec
-        ? '<div class="panel" style="margin-top:14px;padding:14px"><strong>一句话数据概况</strong>' +
+        ? '<div style="padding:14px 16px 0; font-weight:600; font-size:14px;">一句话数据概况</div><div style="padding:6px 16px 0">' +
           exec +
           "</div>"
         : "") +
+      (weeklyTable
+        ? '<div style="padding:14px 16px 0; font-weight:600; font-size:14px;">汇总数据概览（周）</div>' +
+          weeklyTable
+        : "") +
+      dailyFold +
       analysisBlock(sec) +
+      nextNarrative(data) +
+      "</div>" +
       "</div></section>"
     );
   }
 
-  function renderNext(data) {
+  /** 将 priority（P0/P1/P2 或 high/medium/low）归一为开发样例的徽标文案 + 颜色类。 */
+  function priorityBadge(pri, idx) {
+    const raw = String(pri || "").trim().toLowerCase();
+    if (raw === "high" || raw === "p0") return { label: "P0", cls: "b-danger" };
+    if (raw === "low" || raw === "p2") return { label: "P2", cls: "b-info" };
+    if (raw === "medium" || raw === "p1" || !raw) return { label: "P1", cls: "b-warn" };
+    return { label: String(pri), cls: "b-warn" };
+  }
+
+  /**
+   * 「后续优化动作」——对齐开发样例：不是独立 `<section>`，而是嵌在「账户总览」
+   * 同一个 `.panel` 内、紧跟数据概述之后的第二个 `.narrative`（id="next" 供导航锚点定位）。
+   */
+  function nextNarrative(data) {
     const recs = asArr((data.narrative || {}).recommendations);
     if (!recs.length) {
       return (
-        '<section id="next"><div class="wrap">' +
-        sectionHead("后续优化动作") +
+        '<div class="narrative" id="next"><h3><span class="badge b-warn">待办</span> 后续优化动作与展望</h3>' +
         '<div class="empty-note">' +
         EMPTY_NOTE +
-        "</div></div></section>"
+        "</div></div>"
       );
     }
+    // 对齐开发样例的 `.todo-item`（badge + 文案 + 锚点链接三栏网格），而非普通 <li> 列表。
     const items = recs
       .map(function (r, i) {
         if (typeof r === "string") {
-          return "<li><strong>P" + (i + 1) + "</strong> " + escapeHtml(r) + "</li>";
+          const b = priorityBadge(null, i);
+          return (
+            '<div class="todo-item"><span class="badge ' +
+            b.cls +
+            '">' +
+            b.label +
+            "</span><div>" +
+            escapeHtml(r) +
+            "</div><span></span></div>"
+          );
         }
-        const pri = r.priority || "P" + (i + 1);
+        const b = priorityBadge(r.priority, i);
         const text = r.text || r.content || "";
         const anchor = r.anchor
-          ? ' <a href="' + escapeHtml(r.anchor) + '">→</a>'
-          : "";
+          ? '<a href="' + escapeHtml(r.anchor) + '">→</a>'
+          : "<span></span>";
         return (
-          "<li><strong>" +
-          escapeHtml(pri) +
-          "</strong> " +
+          '<div class="todo-item"><span class="badge ' +
+          b.cls +
+          '">' +
+          b.label +
+          "</span><div>" +
           escapeHtml(text) +
+          "</div>" +
           anchor +
-          "</li>"
+          "</div>"
         );
       })
       .join("");
     return (
-      '<section id="next"><div class="wrap">' +
-      sectionHead("后续优化动作", "跨维度优先级建议（来自 narrative.recommendations）") +
-      '<div class="panel" style="padding:14px"><ol class="todo-list">' +
+      '<div class="narrative" id="next"><h3><span class="badge b-warn">待办</span> 后续优化动作与展望</h3>' +
+      '<div class="todo-list">' +
       items +
-      "</ol></div></div></section>"
+      "</div></div>"
     );
   }
 
@@ -672,7 +691,9 @@
     const data = opts.data;
     const currency = currencyOf(data);
     const sec = ((data.narrative || {}).sections || {})[opts.narrativeKey] || {};
-    const rows = topBySpend(data.tables?.[opts.tableKey], opts.limit || 20);
+    const allRows = asArr(data.tables?.[opts.tableKey]);
+    const limit = opts.limit || 20;
+    const rows = topBySpend(allRows, limit);
     let body = "";
     if (rows.length) {
       const rowHtml = rows
@@ -696,13 +717,23 @@
     } else {
       body = '<div class="empty-note">' + EMPTY_NOTE + "</div>";
     }
+    // 行数提示：明确区分「共 N 行仅显示 Top M」与「本维度确实无数据」，避免误判为报告漏了该维度。
+    const countHint =
+      allRows.length > rows.length
+        ? "共 " + allRows.length + " 行，按消耗降序显示 Top " + rows.length + "。"
+        : allRows.length > 0
+          ? "共 " + allRows.length + " 行。"
+          : "";
+    const desc = [opts.desc, countHint].filter(Boolean).join(" ");
     return (
       '<section id="' +
       opts.id +
       '"><div class="wrap">' +
-      sectionHead(opts.title, opts.desc) +
+      sectionHead(opts.title, desc) +
+      '<div class="panel">' +
       body +
       analysisBlock(sec) +
+      "</div>" +
       "</div></section>"
     );
   }
@@ -793,13 +824,17 @@
 
     return (
       '<section id="daily"><div class="wrap">' +
-      sectionHead("日报表", "tables.daily（来自 yandex-analysis daily）") +
+      sectionHead("日报表", "按日消耗/展示/点击/转化明细") +
+      '<div class="panel">' +
       dailyBody +
       analysisBlock(sec) +
+      "</div>" +
       "</div></section>" +
       '<section id="weekly"><div class="wrap">' +
-      sectionHead("周报表", "由 daily 本地聚合（后端无独立 weekly 接口）") +
+      sectionHead("周报表", "由每日数据按 ISO 周本地聚合") +
+      '<div class="panel">' +
       weeklyBody +
+      "</div>" +
       "</div></section>"
     );
   }
@@ -809,15 +844,14 @@
     const parts = [];
     parts.push(renderHero(data));
     parts.push(renderOverview(data));
-    parts.push(renderNext(data));
     parts.push(
       dimSection({
         data: data,
         id: "search",
         narrativeKey: "search",
         tableKey: "search",
-        title: "搜索网络 · Search",
-        desc: "AdNetworkType=SEARCH 汇总（tables.search）",
+        title: "广告类型 · Search",
+        desc: "搜索网络（Search）投放汇总",
         nameLabel: "网络",
         nameOf: function (r) {
           return r.network || "SEARCH";
@@ -831,7 +865,7 @@
         narrativeKey: "campaigns",
         tableKey: "campaigns",
         title: "Campaign",
-        desc: "按消耗 Top 系列（tables.campaigns）",
+        desc: "按消耗排序的系列明细",
         nameLabel: "系列",
         nameOf: function (r) {
           return r.campaignName || r.campaignId || "—";
@@ -856,7 +890,7 @@
         narrativeKey: "keywords",
         tableKey: "keywords",
         title: "关键词",
-        desc: "按消耗 Top 关键词（tables.keywords）",
+        desc: "按消耗排序的关键词明细",
         nameLabel: "关键词",
         nameOf: function (r) {
           return r.keyword || "—";
@@ -881,7 +915,7 @@
         narrativeKey: "searchTerms",
         tableKey: "searchTerms",
         title: "搜索词",
-        desc: "按消耗 Top 搜索词（tables.searchTerms；仅近 180 天）",
+        desc: "按消耗排序的搜索词明细（仅近 180 天数据）",
         nameLabel: "搜索词",
         nameOf: function (r) {
           return r.searchQuery || "—";
@@ -906,10 +940,16 @@
         narrativeKey: "geo",
         tableKey: "geo",
         title: "地域",
-        desc: "tables.geo",
+        desc: "按消耗排序的地域明细",
         nameLabel: "地域",
         nameOf: function (r) {
-          return r.locationName || r.targetingLocationName || "—";
+          return (
+            r.locationName ||
+            r.targetingLocationName ||
+            r.location ||
+            r.name ||
+            (r.locationId != null ? "地域 " + r.locationId : "—")
+          );
         },
         limit: 30,
       })
@@ -921,7 +961,7 @@
         narrativeKey: "devices",
         tableKey: "devices",
         title: "设备",
-        desc: "tables.devices",
+        desc: "按消耗排序的设备明细",
         nameLabel: "设备",
         nameOf: function (r) {
           return r.device || "—";

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